diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-05-05 18:25:25 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-05 19:25:25 +0300 |
| commit | 55a8e12d85bd59314416bb026e84d258004a5071 (patch) | |
| tree | 8735a97000a66f013b5da8407501995e63ec16f8 /modules/git/repo.go | |
| parent | c1da790cee96f1e2d15dded7748da5bc81022042 (diff) | |
| download | gitea-55a8e12d85bd59314416bb026e84d258004a5071.tar.gz gitea-55a8e12d85bd59314416bb026e84d258004a5071.zip | |
Number of commits ahead/behind in branch overview (#6695)
* Call Git API to determine divergence of a branch and its base branch
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Show commit divergance in branch list
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adds missing comment
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adds test for diverging commits
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Try comparing commits instead of branches
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Removes test as CI can't run it
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adjusts signature of percentage function to allow providing multiple integers as numerator
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Moves CountDivergingCommits function into repofiles module
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
Diffstat (limited to 'modules/git/repo.go')
| -rw-r--r-- | modules/git/repo.go | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/modules/git/repo.go b/modules/git/repo.go index f86c4aae5c..8355f8811f 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -9,9 +9,11 @@ import ( "bytes" "container/list" "errors" + "fmt" "os" "path" "path/filepath" + "strconv" "strings" "time" @@ -306,3 +308,40 @@ func GetLatestCommitTime(repoPath string) (time.Time, error) { commitTime := strings.TrimSpace(stdout) return time.Parse(GitTimeLayout, commitTime) } + +// DivergeObject represents commit count diverging commits +type DivergeObject struct { + Ahead int + Behind int +} + +func checkDivergence(repoPath string, baseBranch string, targetBranch string) (int, error) { + branches := fmt.Sprintf("%s..%s", baseBranch, targetBranch) + cmd := NewCommand("rev-list", "--count", branches) + stdout, err := cmd.RunInDir(repoPath) + if err != nil { + return -1, err + } + outInteger, errInteger := strconv.Atoi(strings.Trim(stdout, "\n")) + if errInteger != nil { + return -1, errInteger + } + return outInteger, nil +} + +// GetDivergingCommits returns the number of commits a targetBranch is ahead or behind a baseBranch +func GetDivergingCommits(repoPath string, baseBranch string, targetBranch string) (DivergeObject, error) { + // $(git rev-list --count master..feature) commits ahead of master + ahead, errorAhead := checkDivergence(repoPath, baseBranch, targetBranch) + if errorAhead != nil { + return DivergeObject{}, errorAhead + } + + // $(git rev-list --count feature..master) commits behind master + behind, errorBehind := checkDivergence(repoPath, targetBranch, baseBranch) + if errorBehind != nil { + return DivergeObject{}, errorBehind + } + + return DivergeObject{ahead, behind}, nil +} |