diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-17 21:22:07 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-18 21:29:06 +1100 |
commit | 1be0ff8da738c706e1aff8111428b36a5efced44 (patch) | |
tree | 3f4b90cea75e3803fa0799f76c8e57e34c8cbbeb /pkg/commands | |
parent | 2169b5109f508a28848ced699f698ca3e4ed2c49 (diff) |
better upstream tracking and allow renaming a branch
Diffstat (limited to 'pkg/commands')
-rw-r--r-- | pkg/commands/branch.go | 9 | ||||
-rw-r--r-- | pkg/commands/branch_list_builder.go | 167 | ||||
-rw-r--r-- | pkg/commands/git.go | 6 |
3 files changed, 100 insertions, 82 deletions
diff --git a/pkg/commands/branch.go b/pkg/commands/branch.go index 8da8918d1..f0f97a331 100644 --- a/pkg/commands/branch.go +++ b/pkg/commands/branch.go @@ -3,8 +3,9 @@ package commands // Branch : A git branch // duplicating this for now type Branch struct { - Name string - Recency string - Pushables string - Pullables string + Name string + Recency string + Pushables string + Pullables string + UpstreamName string } diff --git a/pkg/commands/branch_list_builder.go b/pkg/commands/branch_list_builder.go index 26864d944..553d2f1f9 100644 --- a/pkg/commands/branch_list_builder.go +++ b/pkg/commands/branch_list_builder.go @@ -7,8 +7,6 @@ import ( "github.com/jesseduffield/lazygit/pkg/utils" "github.com/sirupsen/logrus" - - "gopkg.in/src-d/go-git.v4/plumbing" ) // context: @@ -36,111 +34,99 @@ func NewBranchListBuilder(log *logrus.Entry, gitCommand *GitCommand) (*BranchLis }, nil } -func (b *BranchListBuilder) obtainCurrentBranch() *Branch { +func (b *BranchListBuilder) obtainCurrentBranchName() string { branchName, err := b.GitCommand.CurrentBranchName() if err != nil { panic(err.Error()) } - - return &Branch{Name: strings.TrimSpace(branchName)} + return branchName } -func (b *BranchListBuilder) obtainReflogBranches() []*Branch { - branches := make([]*Branch, 0) - // if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string - unescaped := "git reflog --date=relative --pretty='%gd|%gs' --grep-reflog='checkout: moving' HEAD" - rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped) +func (b *BranchListBuilder) obtainBranches() []*Branch { + cmdStr := `git branch --format="%(refname:short)|%(upstream:short)|%(upstream:track)"` + output, err := b.GitCommand.OSCommand.RunCommandWithOutput(cmdStr) if err != nil { - return branches + panic(err) } - branchLines := utils.SplitLines(rawString) - for _, line := range branchLines { - recency, branchName := branchInfoFromLine(line) - if branchName == "" { + trimmedOutput := strings.TrimSpace(output) + outputLines := strings.Split(trimmedOutput, "\n") + branches := make([]*Branch, len(outputLines)) + for i, line := range outputLines { + split := strings.Split(line, SEPARATION_CHAR) + + name := split[0] + branches[i] = &Branch{ + Name: name, + Pullables: "?", + Pushables: "?", + } + upstreamName := split[1] + if upstreamName == "" { continue } - branch := &Branch{Name: branchName, Recency: recency} - branches = append(branches, branch) - } - return uniqueByName(branches) -} -func (b *BranchListBuilder) obtainSafeBranches() []*Branch { - branches := make([]*Branch, 0) - - bIter, err := b.GitCommand.Repo.Branches() - if err != nil { - panic(err) - } - _ = bIter.ForEach(func(b *plumbing.Reference) error { - name := b.Name().Short() - branches = append(branches, &Branch{Name: name}) - return nil - }) + branches[i].UpstreamName = upstreamName - return branches -} - -func (b *BranchListBuilder) appendNewBranches(finalBranches, newBranches, existingBranches []*Branch, included bool) []*Branch { - for _, newBranch := range newBranches { - if included == branchIncluded(newBranch.Name, existingBranches) { - finalBranches = append(finalBranches, newBranch) + track := split[2] + re := regexp.MustCompile(`ahead (\d+)`) + match := re.FindStringSubmatch(track) + if len(match) > 1 { + branches[i].Pushables = match[1] + } else { + branches[i].Pushables = "0" } - } - return finalBranches -} -func sanitisedReflogName(reflogBranch *Branch, safeBranches []*Branch) string { - for _, safeBranch := range safeBranches { - if strings.EqualFold(safeBranch.Name, reflogBranch.Name) { - return safeBranch.Name + re = regexp.MustCompile(`behind (\d+)`) + match = re.FindStringSubmatch(track) + if len(match) > 1 { + branches[i].Pullables = match[1] + } else { + branches[i].Pullables = "0" } } - return reflogBranch.Name + + return branches } // Build the list of branches for the current repo func (b *BranchListBuilder) Build() []*Branch { - branches := make([]*Branch, 0) - head := b.obtainCurrentBranch() - safeBranches := b.obtainSafeBranches() - + currentBranchName := b.obtainCurrentBranchName() + branches := b.obtainBranches() reflogBranches := b.obtainReflogBranches() - for i, reflogBranch := range reflogBranches { - reflogBranches[i].Name = sanitisedReflogName(reflogBranch, safeBranches) - } - branches = b.appendNewBranches(branches, reflogBranches, safeBranches, true) - branches = b.appendNewBranches(branches, safeBranches, branches, false) - - if len(branches) == 0 || branches[0].Name != head.Name { - branches = append([]*Branch{head}, branches...) + // loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches + branchesWithRecency := make([]*Branch, 0) +outer: + for _, reflogBranch := range reflogBranches { + for j, branch := range branches { + if strings.EqualFold(reflogBranch.Name, branch.Name) { + branch.Recency = reflogBranch.Recency + branchesWithRecency = append(branchesWithRecency, branch) + branches = append(branches[0:j], branches[j+1:]...) + continue outer + } + } } - branches[0].Recency = " *" + branches = append(branchesWithRecency, branches...) - return branches -} - -func branchIncluded(branchName string, branches []*Branch) bool { - for _, existingBranch := range branches { - if strings.EqualFold(existingBranch.Name, branchName) { - return true + // if it's the current branch we need to pull it up to the top + for i, branch := range branches { + if branch.Name == currentBranchName { + branches = append(branches[0:i], branches[i+1:]...) + branches = append([]*Branch{branch}, branches...) + break } } - return false -} -func uniqueByName(branches []*Branch) []*Branch { - finalBranches := make([]*Branch, 0) - for _, branch := range branches { - if branchIncluded(branch.Name, finalBranches) { - continue - } - finalBranches = append(finalBranches, branch) + if len(branches) == 0 || branches[0].Name != currentBranchName { + branches = append([]*Branch{{Name: currentBranchName}}, branches...) } - return finalBranches + + branches[0].Recency = " *" + + return branches } // A line will have the form '10 days ago master' so we need to strip out the @@ -172,3 +158,30 @@ func abbreviatedTimeUnit(timeUnit string) string { } return timeUnitMap[timeUnit] } + +func (b *BranchListBuilder) obtainReflogBranches() []*Branch { + branches := make([]*Branch, 0) + // if we directly put this string in RunCommandWithOutput the compiler complains because it thinks it's a format string + unescaped := "git reflog --date=relative --pretty='%gd|%gs' --grep-reflog='checkout: moving' HEAD" + rawString, err := b.GitCommand.OSCommand.RunCommandWithOutput(unescaped) + if err != nil { + return branches + } + + branchNameMap := map[string]bool{} + + branchLines := utils.SplitLines(rawString) + for _, line := range branchLines { + recency, branchName := branchInfoFromLine(line) + if branchName == "" { + continue + } + if _, ok := branchNameMap[branchName]; ok { + continue + } + branchNameMap[branchName] = true + branch := &Branch{Name: branchName, Recency: recency} + branches = append(branches, branch) + } + return branches +} diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 00ec296de..2bd852de8 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -343,7 +343,7 @@ func (c *GitCommand) CurrentBranchName() (string, error) { match := re.FindStringSubmatch(output) branchName = match[1] } - return utils.TrimTrailingNewline(branchName), nil + return strings.TrimSpace(branchName), nil } // DeleteBranch delete branch @@ -1163,3 +1163,7 @@ func (c *GitCommand) GetPager(width int) string { func (c *GitCommand) colorArg() string { return c.Config.GetUserConfig().GetString("git.paging.colorArg") } + +func (c *GitCommand) RenameBranch(oldName string, newName string) error { + return c.OSCommand.RunCommand("git branch --move %s %s", oldName, newName) +} |