mirrors/git-get
6
0
Fork 0
mirror of https://github.com/grdl/git-get.git synced 2026-02-06 12:47:58 +00:00
Code Activity

Add upstream info to branch status, simplify unit tests

Browse Source
This commit is contained in:
Grzegorz Dlugoszewski
2020-05-19 10:24:25 +02:00
parent ad7c3a4afc
commit 17ec470340
2 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
branch.go
View File

@@ -33,7 +33,7 @@ func Branches(repo *git.Repository) ([]BranchStatus, error) {
var statuses []BranchStatus
for _, branch := range branches {
status, err := NewBranchStatus(branch)
status, err := NewBranchStatus(repo, branch)
if err != nil {
// TODO: handle error
continue
@@ -44,7 +44,7 @@ func Branches(repo *git.Repository) ([]BranchStatus, error) {
return statuses, nil
}
func NewBranchStatus(branch *git.Branch) (BranchStatus, error) {
func NewBranchStatus(repo *git.Repository, branch *git.Branch) (BranchStatus, error) {
var status BranchStatus
name, err := branch.Name()
@@ -55,12 +55,28 @@ func NewBranchStatus(branch *git.Branch) (BranchStatus, error) {
status.IsRemote = branch.IsRemote()
_, err = branch.Upstream()
if err != nil {
if git.IsErrorCode(err, git.ErrNotFound) {
status.HasUpstream = false
} else {
return status, errors.Wrap(err, "Failed getting branch upstream")
upstream, err := branch.Upstream()
if err != nil && !git.IsErrorCode(err, git.ErrNotFound) {
return status, errors.Wrap(err, "Failed getting branch upstream")
}
if upstream != nil {
status.HasUpstream = true
ahead, behind, err := repo.AheadBehind(branch.Target(), upstream.Target())
if err != nil {
return status, errors.Wrap(err, "Failed getting ahead/behind information")
}
status.Ahead = ahead
status.Behind = behind
if ahead > 0 {
status.NeedsPush = true
}
if behind > 0 {
status.NeedsPull = true
}
}