Skip to content

Show number of commits a branch is ahead or behind the default branch #5339

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

Closed
wants to merge 10 commits into from
Closed

Show number of commits a branch is ahead or behind the default branch #5339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
38e2fc1
Show number of commits a branch is ahead or behind default
adelowo Nov 15, 2018
8903f23
simplify translation and switch to reusable function
adelowo May 5, 2019
ca36a18
fix translation
adelowo May 5, 2019
ea6d231
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
adelowo May 14, 2019
4bf4155
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
adelowo May 14, 2019
cdd221a
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
adelowo May 15, 2019
ae26ae2
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
adelowo May 19, 2019
6b33b31
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
adelowo Nov 2, 2019
2f7c5e0
Merge remote-tracking branch 'origin' into show_commit_diffs_btw_curr…
adelowo Jan 11, 2020
24c2ed1
Merge branch 'master' into show_commit_diffs_btw_current_branch_and_m…
zeripath Oct 20, 2020
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
5 changes: 5 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 @@ -898,6 +898,11 @@ commits.signed_by = Signed by
commits.signed_by_untrusted_user = Signed by untrusted user
commits.signed_by_untrusted_user_unmatched = Signed by untrusted user who does not match committer
commits.gpg_key_id = GPG Key ID
commits.count.ahead_1 = This branch is 1 commit ahead of %s.
commits.count.behind_1 = This branch is 1 commit behind %s.
commits.count.ahead_n = This branch is %d commits ahead of %s.
commits.count.behind_n = This branch is %d commits behind %s.
commits.count.even = This branch is even with %s.

ext_issues = Ext. Issues
ext_issues.desc = Link to an external issue tracker.
Expand Down
35 changes: 35 additions & 0 deletions routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/repofiles"
"code.gitea.io/gitea/modules/setting"
)

Expand Down Expand Up @@ -677,6 +678,40 @@ func renderCode(ctx *context.Context) {
ctx.Data["TreeLink"] = treeLink
ctx.Data["TreeNames"] = treeNames
ctx.Data["BranchLink"] = branchLink

if ctx.Repo.BranchName != ctx.Repo.Repository.DefaultBranch {

divergence, err := repofiles.CountDivergingCommits(ctx.Repo.Repository, ctx.Repo.BranchName)
if err != nil {
ctx.ServerError("CountDivergingCommits", err)
return
}

var msg string

if divergence.Ahead == 0 && divergence.Behind == 0 {
msg = ctx.Tr("repo.commits.count.even", ctx.Repo.Repository.DefaultBranch)
}

if divergence.Ahead > 0 {
if divergence.Ahead == 1 {
msg = ctx.Tr("repo.commits.count.ahead_1", ctx.Repo.Repository.DefaultBranch)
} else {
msg = ctx.Tr("repo.commits.count.ahead_n", divergence.Ahead, ctx.Repo.Repository.DefaultBranch)
}
}

if divergence.Behind > 0 {
if divergence.Behind == 1 {
msg = ctx.Tr("repo.commits.count.behind_1", ctx.Repo.Repository.DefaultBranch)
} else {
msg = ctx.Tr("repo.commits.count.behind_n", divergence.Behind, ctx.Repo.Repository.DefaultBranch)
}
}

ctx.Flash.Info(msg)
}

ctx.HTML(200, tplRepoHome)
}

Expand Down