Skip to content

Adds title on branch commit counts #34869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 1, 2025
+11 −3
Merged

Adds title on branch commit counts #34869

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b19d3b2
Adds title on branch commit counts
ajmeese7 Jun 26, 2025
f1e7fff
fix: transition to `data-tooltip-content`
ajmeese7 Jun 29, 2025
556fcf7
fix: use translations
ajmeese7 Jun 29, 2025
465f42e
fix: requested changes
ajmeese7 Jun 30, 2025
a6a4a50
fine tune
wxiaoguang Jul 1, 2025
d622da7
use "ahead of"
wxiaoguang Jul 1, 2025
2635c00
Merge branch 'main' into feat/commit-count-title
ajmeese7 Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2769,6 +2769,10 @@ branch.new_branch_from = Create new branch from "%s"
branch.renamed = Branch %s was renamed to %s.
branch.rename_default_or_protected_branch_error = Only admins can rename default or protected branches.
branch.rename_protected_branch_failed = This branch is protected by glob-based protection rules.
branch.commits_ahead_1 = %d commit ahead of %s
branch.commits_ahead_n = %d commits ahead of %s
branch.commits_behind_1 = %d commit behind %s
branch.commits_behind_n = %d commits behind %s

tag.create_tag = Create tag %s
tag.create_tag_operation = Create tag
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/branch/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@
{{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}}
<div class="commit-divergence">
<div class="bar-group">
<div class="count count-behind">{{.CommitsBehind}}</div>
<div class="count count-behind" data-tooltip-content="{{if eq .CommitsBehind 1}}{{ctx.Locale.Tr "repo.branch.commits_behind_1" .CommitsBehind $.DefaultBranchBranch.DBBranch.Name}}{{else}}{{ctx.Locale.Tr "repo.branch.commits_behind_n" .CommitsBehind $.DefaultBranchBranch.DBBranch.Name}}{{end}}">{{.CommitsBehind}}</div>
{{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}}
<div class="bar bar-behind" style="width: {{Eval 100 "*" .CommitsBehind "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
</div>
<div class="bar-group">
<div class="count count-ahead">{{.CommitsAhead}}</div>
<div class="count count-ahead" data-tooltip-content="{{if eq .CommitsAhead 1}}{{ctx.Locale.Tr "repo.branch.commits_ahead_1" .CommitsAhead $.DefaultBranchBranch.DBBranch.Name}}{{else}}{{ctx.Locale.Tr "repo.branch.commits_ahead_n" .CommitsAhead $.DefaultBranchBranch.DBBranch.Name}}{{end}}">{{.CommitsAhead}}</div>
<div class="bar bar-ahead" style="width: {{Eval 100 "*" .CommitsAhead "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
</div>
</div>
Expand Down