Implement suggestions by @wxiaoguang

Author: delvh

modules/git/repo_ref.go

@@ -6,6 +6,8 @@ package git
 import (
 	"context"
 	"strings"
+
+	"code.gitea.io/gitea/modules/util"
 )
 
 // GetRefs returns all references of the repository.
@@ -16,18 +18,41 @@ 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)
+	}
 	stdout, _, err := NewCommand(ctx, ToTrustedCmdArgs([]string{refType, "--no-color", "--sort=-creatordate", "--contains"})...).AddDynamicArguments(commitSHA).RunStdString(&RunOpts{Dir: repo.Path})
+	if err != nil {
+		return nil, err
+	}
 
 	refs := strings.Split(strings.TrimSpace(stdout), "\n")
+	if refType == "branch" {
+		return parseBranches(refs), nil
+	}
+	return parseTags(refs), nil
+}
+
+func parseBranches(refs []string) []string {
 	results := make([]string, 0, len(refs))
 	for _, ref := range refs {
-		if strings.HasPrefix(ref, "* ") { // main branch
+		if strings.HasPrefix(ref, "* ") { // current branch (main branch)
 			results = append(results, ref[len("* "):])
 		} else if strings.HasPrefix(ref, "  ") { // all other branches
 			results = append(results, ref[len("  "):])
-		} else if ref != "" { // tags
+		} else if ref != "" {
+			results = append(results, ref)
+		}
+	}
+	return results
+}
+
+func parseTags(refs []string) []string {
+	results := make([]string, 0, len(refs))
+	for _, ref := range refs {
+		if ref != "" {
 			results = append(results, ref)
 		}
 	}
-	return results, err
+	return results
 }

services/repository/commit.go

@@ -20,7 +20,7 @@ type ContainedLinks struct { // TODO: better name?
 
 type namedLink struct { // TODO: better name?
 	Name    string `json:"name"`
-	WebLink string `json:"web_url"`
+	WebLink string `json:"web_link"`
 }
 
 // CreateNewBranch creates a new repository branch

templates/repo/commit_load_branches_and_tags.tmpl

@@ -4,10 +4,10 @@
 	<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-flex-wrap gt-hidden" data-defaultbranch-tooltip="{{.locale.Tr "repo.commit.contained_in_default_branch"}}"></div>
+		<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-flex-wrap gt-hidden"></div>
+		<div class="tag-area gt-df gt-ac gt-fw gt-hidden"></div>
 	</div>
 </div>

web_src/css/helpers.css

@@ -77,13 +77,12 @@ Gitea's private styles use `g-` prefix.
 .gt-overflow-x-auto { overflow-x: auto !important; }
 .gt-overflow-x-scroll { overflow-x: scroll !important; }
 .gt-overflow-y-hidden { overflow-y: hidden !important; }
-.gt-flex-wrap { flex-wrap: wrap !important; }
 
 .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*/
+.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; }

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

@@ -1,15 +1,12 @@
-const {csrfToken} = window.config;
+import {showElem} from '../utils/dom.js';
 
 async function loadBranchesAndTags(loadingButton, addHere) {
-  loadingButton.setAttribute('disabled', 'disabled');
+  loadingButton.classList.add('disabled')
   let res;
   try {
-    res = await fetch(loadingButton.getAttribute('data-fetch-url'), {
-      method: 'GET',
-      headers: {'X-Csrf-Token': csrfToken},
-    });
+    res = await fetch(loadingButton.getAttribute('data-fetch-url'), { method: 'GET', });
   } finally {
-    loadingButton.removeAttribute('disabled');
+  loadingButton.classList.remove('disabled')
   }
 
   if (!res.ok) {
@@ -28,19 +25,19 @@ async function loadBranchesAndTags(loadingButton, addHere) {
 function addTags(tags, addHere) {
   if (tags.length > 0) showAreas('.tag-area,.tag-area-parent');
   for (const tag of tags) {
-    addLink(tag.web_url, tag.name, addHere);
+    addLink(tag.web_link, tag.name, addHere);
   }
 }
 
 function addBranches(branches, defaultBranch, defaultBranchTooltip, addHere) {
   if (branches.length > 0) showAreas('.branch-area,.branch-area-parent');
   for (const branch of branches) {
-    addLink(branch.web_url, branch.name, addHere, defaultBranch === branch.name ? defaultBranchTooltip : undefined);
+    addLink(branch.web_link, branch.name, addHere, defaultBranch === branch.name ? defaultBranchTooltip : undefined);
   }
 }
 
 function showAreas(selector) {
-  for (const branchArea of document.querySelectorAll(selector)) branchArea.classList.remove('gt-hidden');
+  for (const branchArea of document.querySelectorAll(selector)) showElem(branchArea);
 }
 
 function addLink(href, text, addHere, tooltip) {