Show branches and tags that contain a commit

modules/context/context_response.go

@@ -166,6 +166,7 @@ func (ctx *Context) serverErrorInternal(logMsg string, logErr error) {
 // NotFoundOrServerError use error check function to determine if the error
 // is about not found. It responds with 404 status code for not found error,
 // or error context description for logging purpose of 500 server error.
+// TODO: remove the "errCheck" and use util.ErrNotFound to check
 func (ctx *Context) NotFoundOrServerError(logMsg string, errCheck func(error) bool, logErr error) {
 	if errCheck(logErr) {
 		ctx.notFoundInternal(logMsg, logErr)

modules/git/repo_ref.go

@@ -18,10 +18,15 @@ func (repo *Repository) GetRefs() ([]*Reference, error) {
 // ListOccurrences lists all refs of the given refType the given commit appears in sorted by creation date DESC
 // refType should only be a literal "branch" or "tag" and nothing else
 func (repo *Repository) ListOccurrences(ctx context.Context, refType, commitSHA string) ([]string, error) {
-	if refType != "branch" && refType != "tag" {
-		return nil, util.NewInvalidArgumentErrorf("Can only use branch or 'tag' as 'refType'. Got '%s'", refType)
+	cmd := NewCommand(ctx)
+	if refType == "branch" {
+		cmd.AddArguments("branch")
+	} else if refType == "tag" {
+		cmd.AddArguments("tag")
+	} else {
+		return nil, util.NewInvalidArgumentErrorf(`can only use "branch" or "tag" for refType, but got %q`, refType)
 	}
-	stdout, _, err := NewCommand(ctx, ToTrustedCmdArgs([]string{refType, "--no-color", "--sort=-creatordate", "--contains"})...).AddDynamicArguments(commitSHA).RunStdString(&RunOpts{Dir: repo.Path})
+	stdout, _, err := cmd.AddArguments("--no-color", "--sort=-creatordate", "--contains").AddDynamicArguments(commitSHA).RunStdString(&RunOpts{Dir: repo.Path})
 	if err != nil {
 		return nil, err
 	}

routers/web/repo/commit.go

@@ -22,7 +22,6 @@ import (
 	"code.gitea.io/gitea/modules/gitgraph"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/gitdiff"
 	git_service "code.gitea.io/gitea/services/repository"
 )
@@ -263,7 +262,7 @@ func LoadBranchesAndTags(ctx *context.Context) {
 		ctx.JSON(http.StatusOK, response)
 		return
 	}
-	ctx.NotFoundOrServerError(fmt.Sprintf("could not load branches and tags the commit %s belongs to", ctx.Params("sha")), func(err error) bool { return errors.Is(err, util.ErrNotExist) }, err)
+	ctx.NotFoundOrServerError(fmt.Sprintf("could not load branches and tags the commit %s belongs to", ctx.Params("sha")), git.IsErrNotExist, err)
 }
 
 // Diff show different from current commit to previous commit

services/repository/commit.go

@@ -12,18 +12,17 @@ import (
 )
 
 type ContainedLinks struct { // TODO: better name?
-	Branches                 []*namedLink `json:"branches"`
-	Tags                     []*namedLink `json:"tags"`
-	ContainedInDefaultBranch bool         `json:"contained_in_default_branch"`
-	DefaultBranch            string       `json:"default_branch"`
+	Branches      []*namedLink `json:"branches"`
+	Tags          []*namedLink `json:"tags"`
+	DefaultBranch string       `json:"default_branch"`
 }
 
 type namedLink struct { // TODO: better name?
 	Name    string `json:"name"`
 	WebLink string `json:"web_link"`
 }
 
-// CreateNewBranch creates a new repository branch
+// LoadBranchesAndTags creates a new repository branch
 func LoadBranchesAndTags(ctx context.Context, baseRepo *gitea_ctx.Repository, commitSHA string) (*ContainedLinks, error) {
 	containedTags, err := baseRepo.GitRepo.ListOccurrences(ctx, "tag", commitSHA)
 	if err != nil {
@@ -35,15 +34,22 @@ func LoadBranchesAndTags(ctx context.Context, baseRepo *gitea_ctx.Repository, co
 	}
 
 	result := &ContainedLinks{
-		ContainedInDefaultBranch: util.SliceContains(containedBranches, baseRepo.Repository.DefaultBranch), DefaultBranch: baseRepo.Repository.DefaultBranch,
-		Branches: make([]*namedLink, 0, len(containedBranches)), Tags: make([]*namedLink, 0, len(containedTags)),
+		DefaultBranch: baseRepo.Repository.DefaultBranch,
+		Branches:      make([]*namedLink, 0, len(containedBranches)),
+		Tags:          make([]*namedLink, 0, len(containedTags)),
 	}
 	for _, tag := range containedTags {
-		result.Tags = append(result.Tags, &namedLink{Name: tag, WebLink: fmt.Sprintf("%s/src/tag/%s", baseRepo.RepoLink, util.PathEscapeSegments(tag))}) // TODO: Use a common method to get the link to a branch/tag instead of hardcoding it here
+		// TODO: Use a common method to get the link to a branch/tag instead of hard-coding it here
+		result.Tags = append(result.Tags, &namedLink{
+			Name:    tag,
+			WebLink: fmt.Sprintf("%s/src/tag/%s", baseRepo.RepoLink, util.PathEscapeSegments(tag)),
+		})
 	}
 	for _, branch := range containedBranches {
-		result.Branches = append(result.Branches, &namedLink{Name: branch, WebLink: fmt.Sprintf("%s/src/branch/%s", baseRepo.RepoLink, util.PathEscapeSegments(branch))})
+		result.Branches = append(result.Branches, &namedLink{
+			Name:    branch,
+			WebLink: fmt.Sprintf("%s/src/branch/%s", baseRepo.RepoLink, util.PathEscapeSegments(branch)),
+		})
 	}
-
 	return result, nil
 }

templates/repo/commit_load_branches_and_tags.tmpl

@@ -1,13 +1,12 @@
-<div class="branch-and-tag-area">
-	<button class="ui button ellipsis-button gt-mt-3 load-tags-and-branches" data-fetch-url="{{.RepoLink}}/commit/{{.CommitID}}/load-branches-and-tags" data-tooltip-content="{{.locale.Tr "repo.commit.load_referencing_branches_and_tags"}}" data-contained-in-text="{{.locale.Tr "repo.commit.contained_in"}}" aria-expanded="false">...</button>
-	<div class="ui divider branch-tag-area-divider gt-hidden"></div>
-	<div class="branch-tag-area-text gt-df"></div>
-	<div class="branch-area-parent gt-df gt-ac gt-my-3 gt-gap-2 gt-hidden">
-		{{svg "octicon-git-branch" 16 "gt-min-w-16"}}
-		<div class="branch-area gt-df gt-ac gt-fw gt-hidden" data-defaultbranch-tooltip="{{.locale.Tr "repo.commit.contained_in_default_branch"}}"></div>
-	</div>
-	<div class="tag-area-parent gt-df gt-ac gt-my-3 gt-gap-2 gt-hidden">
-		{{svg "octicon-tag" 16 "gt-min-w-16"}}
-		<div class="tag-area gt-df gt-ac gt-fw gt-hidden"></div>
+<div class="branch-and-tag-area" data-text-default-branch-tooltip="{{.locale.Tr "repo.commit.contained_in_default_branch"}}">
+	<button class="ui button ellipsis-button load-branches-and-tags gt-mt-3" aria-expanded="false"
+		data-fetch-url="{{.RepoLink}}/commit/{{.CommitID}}/load-branches-and-tags"
+		data-tooltip-content="{{.locale.Tr "repo.commit.load_referencing_branches_and_tags"}}"
+	>...</button>
+	<div class="branch-and-tag-detail gt-hidden">
+		<div class="divider"></div>
+		<div>{{.locale.Tr "repo.commit.contained_in"}}</div>
+		<div class="branch-area flex-text-block gt-mt-3">{{svg "octicon-git-branch"}}</div>
+		<div class="tag-area flex-text-block gt-mt-3">{{svg "octicon-tag"}}</div>
 	</div>
 </div>

templates/repo/commits_list.tmpl

@@ -70,7 +70,7 @@
 							{{end}}
 							</span>
 							{{if IsMultilineCommitMessage .Message}}
-							<button class="ui button ellipsis-js-button ellipsis-button" aria-expanded="false">...</button>
+							<button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
 							{{end}}
 							{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses "root" $}}
 							{{if IsMultilineCommitMessage .Message}}

templates/repo/commits_list_small.tmpl

@@ -40,7 +40,7 @@
 
 		<span class="gt-mono commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
 		{{if IsMultilineCommitMessage .Message}}
-			<button class="ui button ellipsis-js-button ellipsis-button" aria-expanded="false">...</button>
+			<button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
 		{{end}}
 		{{if IsMultilineCommitMessage .Message}}
 			<pre class="commit-body gt-hidden">{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.Link|Escape) $.comment.Issue.PullRequest.BaseRepo.ComposeMetas}}</pre>

templates/repo/view_list.tmpl

@@ -28,7 +28,7 @@
 					{{$commitLink:= printf "%s/commit/%s" .RepoLink (PathEscape .LatestCommit.ID.String)}}
 					<span class="grey commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject $.Context .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
 						{{if IsMultilineCommitMessage .LatestCommit.Message}}
-							<button class="ui button ellipsis-js-button ellipsis-button" aria-expanded="false">...</button>
+							<button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
 							<pre class="commit-body gt-hidden">{{RenderCommitBody $.Context .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
 						{{end}}
 					</span>

web_src/css/helpers.css

@@ -82,9 +82,6 @@ Gitea's private styles use `g-` prefix.
 .gt-w-screen { width: 100vw !important; }
 .gt-h-screen { height: 100vh !important; }
 
-.gt-min-w-0 { min-width: 0 !important; }
-.gt-min-w-16 { min-width: 16px !important; } /*There are some weird bugs with flexboxes and SVGs where the svgs shrink into oblivion*/
-
 .gt-float-left { float: left !important; }
 .gt-float-right { float: right !important; }
 .gt-clear-both { clear: both !important; }

web_src/js/features/load-branches-and-tags.js

@@ -1,77 +1,52 @@
-import {showElem} from '../utils/dom.js';
+import {hideElem, showElem, toggleElem} from '../utils/dom.js';
 
-async function loadBranchesAndTags(loadingButton, addHere) {
+async function loadBranchesAndTags(area, loadingButton) {
   loadingButton.classList.add('disabled');
-  let res;
   try {
-    res = await fetch(loadingButton.getAttribute('data-fetch-url'), {
-      method: 'GET',
-    });
+    const res = await fetch(loadingButton.getAttribute('data-fetch-url'));
+    const data = await res.json();
+    hideElem(loadingButton);
+    addTags(area, data.tags);
+    addBranches(area, data.branches, data.default_branch);
+    showElem(area.querySelectorAll('.branch-and-tag-detail'));
   } finally {
     loadingButton.classList.remove('disabled');
   }
-
-  if (!res.ok) {
-    return;
-  }
-
-  const data = await res.json();
-  showAreas('.branch-tag-area-divider');
-  loadingButton.classList.add('gt-hidden');
-  addHere.querySelector('.branch-tag-area-text').textContent =
-    loadingButton.getAttribute('data-contained-in-text');
-  addTags(data.tags, addHere.querySelector('.tag-area'));
-  const branchArea = addHere.querySelector('.branch-area');
-  addBranches(
-    data.branches,
-    data.default_branch,
-    branchArea.getAttribute('data-defaultbranch-tooltip'),
-    branchArea,
-  );
 }
 
-function addTags(tags, addHere) {
-  if (tags.length > 0) showAreas('.tag-area,.tag-area-parent');
+function addTags(area, tags) {
+  toggleElem(area.querySelectorAll('.tag-area-parent'), tags.length > 0);
+  const tagArea = area.querySelector('.tag-area');
   for (const tag of tags) {
-    addLink(tag.web_link, tag.name, addHere);
+    addLink(tagArea, tag.web_link, tag.name);
   }
 }
 
-function addBranches(branches, defaultBranch, defaultBranchTooltip, addHere) {
-  if (branches.length > 0) showAreas('.branch-area,.branch-area-parent');
+function addBranches(area, branches, defaultBranch) {
+  const defaultBranchTooltip = area.getAttribute('data-text-default-branch-tooltip');
+  toggleElem(area.querySelectorAll('.branch-area-parent'), branches.length > 0);
+  const branchArea = area.querySelector('.branch-area');
   for (const branch of branches) {
-    addLink(
-      branch.web_link,
-      branch.name,
-      addHere,
-      defaultBranch === branch.name ? defaultBranchTooltip : undefined,
-    );
+    const tooltip = defaultBranch === branch.name ? defaultBranchTooltip : null;
+    addLink(branchArea, branch.web_link, branch.name, tooltip);
   }
 }
 
-function showAreas(selector) {
-  for (const branchArea of document.querySelectorAll(selector)) showElem(branchArea);
-}
-
-function addLink(href, text, addHere, tooltip) {
+function addLink(parent, href, text, tooltip) {
   const link = document.createElement('a');
-  link.classList.add('muted', 'gt-px-3', 'gt-rounded');
+  link.classList.add('muted', 'gt-px-2', 'gt-rounded');
+  link.href = href;
+  link.textContent = text;
   if (tooltip) {
     link.classList.add('gt-border-secondary');
     link.setAttribute('data-tooltip-content', tooltip);
   }
-  link.href = href;
-  link.textContent = text;
-  addHere.append(link);
+  parent.append(link);
 }
 
 export function initLoadBranchesAndTagsButton() {
-  for (const loadButton of document.querySelectorAll('.load-tags-and-branches')) {
-    loadButton.addEventListener('click', () => {
-      loadBranchesAndTags(
-        loadButton,
-        document.querySelector('.branch-and-tag-area'),
-      );
-    });
+  for (const area of document.querySelectorAll('.branch-and-tag-area')) {
+    const loadButton = area.querySelector('.load-branches-and-tags');
+    loadButton.addEventListener('click', () => loadBranchesAndTags(area, loadButton));
   }
 }

web_src/js/features/repo-commit.js

@@ -5,7 +5,7 @@ import {toggleElem} from '../utils/dom.js';
 const {csrfToken} = window.config;
 
 export function initRepoEllipsisButton() {
-  $('.ellipsis-js-button').on('click', function (e) {
+  $('.js-toggle-commit-body').on('click', function (e) {
     e.preventDefault();
     const expanded = $(this).attr('aria-expanded') === 'true';
     toggleElem($(this).parent().find('.commit-body'));

web_src/js/features/repo-legacy.js

@@ -459,7 +459,7 @@ async function onEditContent(event) {
 }
 
 export function initRepository() {
-  if ($('.repository').length === 0) {
+  if ($('.page-content.repository').length === 0) {
     return;
   }