add tab keybindings

.github/workflows/cd.yml

@@ -11,8 +11,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+      - name: Unshallow repo
+        run: git fetch --prune --unshallow
       - name: Setup Go
         uses: actions/setup-go@v1
         with:
@@ -25,7 +25,7 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
       - name: Get tag
         id: tag
-        run: echo "::set-output name=tag::${GITHUB_REF##*/}"
+        uses: dawidd6/action-get-tag@v1
       - name: Bump Homebrew
         uses: dawidd6/action-homebrew-bump-formula@v1
         with:

.goreleaser.yml

@@ -13,6 +13,9 @@ builds:
       - arm
       - arm64
       - 386
+    ignore:
+      - goos: freebsd
+        goarch: arm64
     # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}`.
     ldflags:
       - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.buildSource=binaryRelease

README.md

@@ -1,4 +1,4 @@
-# lazygit ![CI](https://github.com/jesseduffield/lazygit/workflows/Continuous%20Integration/badge.svg) [![codecov](https://codecov.io/gh/jesseduffield/lazygit/branch/master/graph/badge.svg)](https://codecov.io/gh/jesseduffield/lazygit) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GoDoc](https://godoc.org/github.com/jesseduffield/lazygit?status.svg)](http://godoc.org/github.com/jesseduffield/lazygit) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)]() [![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/jesseduffield/lazygit)](https://www.tickgit.com/browse?repo=github.com/jesseduffield/lazygit)
+# lazygit ![CI](https://github.com/jesseduffield/lazygit/workflows/Continuous%20Integration/badge.svg) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GoDoc](https://godoc.org/github.com/jesseduffield/lazygit?status.svg)](http://godoc.org/github.com/jesseduffield/lazygit) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)]() [![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/jesseduffield/lazygit)](https://www.tickgit.com/browse?repo=github.com/jesseduffield/lazygit)
 
 A simple terminal UI for git commands, written in Go with the [gocui](https://github.com/jroimartin/gocui 'gocui') library.
 

docs/keybindings/Keybindings_en.md

@@ -16,6 +16,13 @@
   <kbd>:</kbd>: execute custom command
 </pre>
 
+## Branches Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Branches Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commits Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commits Panel (Reflog Tab)

docs/keybindings/Keybindings_nl.md

@@ -16,6 +16,13 @@
   <kbd>:</kbd>: voor aangepast commando uit
 </pre>
 
+## Branches Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Branches Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commits Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commits Panel (Reflog Tab)

docs/keybindings/Keybindings_pl.md

@@ -16,6 +16,13 @@
   <kbd>:</kbd>: execute custom command
 </pre>
 
+## Gałęzie Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Gałęzie Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commity Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commity Panel (Reflog Tab)

pkg/commands/branch_list_builder.go

@@ -43,7 +43,7 @@ func (b *BranchListBuilder) obtainCurrentBranchName() string {
 }
 
 func (b *BranchListBuilder) obtainBranches() []*Branch {
-	cmdStr := `git branch --format="%(HEAD)|%(refname:short)|%(upstream:short)|%(upstream:track)"`
+	cmdStr := `git for-each-ref --sort=-committerdate --format="%(HEAD)|%(refname:short)|%(upstream:short)|%(upstream:track)" refs/heads`
 	output, err := b.GitCommand.OSCommand.RunCommandWithOutput(cmdStr)
 	if err != nil {
 		panic(err)
@@ -51,40 +51,48 @@ func (b *BranchListBuilder) obtainBranches() []*Branch {
 
 	trimmedOutput := strings.TrimSpace(output)
 	outputLines := strings.Split(trimmedOutput, "\n")
-	branches := make([]*Branch, len(outputLines))
-	for i, line := range outputLines {
+	branches := make([]*Branch, 0, len(outputLines))
+	for _, line := range outputLines {
+		if line == "" {
+			continue
+		}
+
 		split := strings.Split(line, SEPARATION_CHAR)
 
 		name := split[1]
-		branches[i] = &Branch{
+		branch := &Branch{
 			Name:      name,
 			Pullables: "?",
 			Pushables: "?",
 			Head:      split[0] == "*",
 		}
+
 		upstreamName := split[2]
 		if upstreamName == "" {
+			branches = append(branches, branch)
 			continue
 		}
 
-		branches[i].UpstreamName = upstreamName
+		branch.UpstreamName = upstreamName
 
 		track := split[3]
 		re := regexp.MustCompile(`ahead (\d+)`)
 		match := re.FindStringSubmatch(track)
 		if len(match) > 1 {
-			branches[i].Pushables = match[1]
+			branch.Pushables = match[1]
 		} else {
-			branches[i].Pushables = "0"
+			branch.Pushables = "0"
 		}
 
 		re = regexp.MustCompile(`behind (\d+)`)
 		match = re.FindStringSubmatch(track)
 		if len(match) > 1 {
-			branches[i].Pullables = match[1]
+			branch.Pullables = match[1]
 		} else {
-			branches[i].Pullables = "0"
+			branch.Pullables = "0"
 		}
+
+		branches = append(branches, branch)
 	}
 
 	return branches
@@ -116,12 +124,10 @@ outer:
 
 	branches = append(branchesWithRecency, branches...)
 
-	if len(branches) == 0 {
-		branches = append([]*Branch{{Name: currentBranchName}}, branches...)
-	}
-
+	foundHead := false
 	for i, branch := range branches {
 		if branch.Head {
+			foundHead = true
 			branch.Name = currentBranchName
 			branch.Recency = "  *"
 			branches = append(branches[0:i], branches[i+1:]...)
@@ -129,6 +135,9 @@ outer:
 			break
 		}
 	}
+	if !foundHead {
+		branches = append([]*Branch{{Name: currentBranchName, Head: true, Recency: "  *"}}, branches...)
+	}
 
 	return branches
 }

pkg/commands/git.go

@@ -866,7 +866,7 @@ func (c *GitCommand) CherryPickCommits(commits []*Commit) error {
 
 // GetCommitFiles get the specified commit files
 func (c *GitCommand) GetCommitFiles(commitSha string, patchManager *PatchManager) ([]*CommitFile, error) {
-	files, err := c.OSCommand.RunCommandWithOutput("git show --pretty= --name-only --no-renames %s", commitSha)
+	files, err := c.OSCommand.RunCommandWithOutput("git diff-tree --no-commit-id --name-only -r --no-renames %s", commitSha)
 	if err != nil {
 		return nil, err
 	}
@@ -1108,23 +1108,26 @@ func (c *GitCommand) FetchRemote(remoteName string) error {
 func (c *GitCommand) GetReflogCommits() ([]*Commit, error) {
 	output, err := c.OSCommand.RunCommandWithOutput("git reflog --abbrev=20")
 	if err != nil {
-		return nil, err
+		// assume error means we have no reflog
+		return []*Commit{}, nil
 	}
 
 	lines := strings.Split(strings.TrimSpace(output), "\n")
-	commits := make([]*Commit, len(lines))
+	commits := make([]*Commit, 0)
 	re := regexp.MustCompile(`(\w+).*HEAD@\{\d+\}: (.*)`)
-	for i, line := range lines {
+	for _, line := range lines {
 		match := re.FindStringSubmatch(line)
 		if len(match) <= 1 {
 			continue
 		}
 
-		commits[i] = &Commit{
+		commit := &Commit{
 			Sha:    match[1],
 			Name:   match[2],
 			Status: "reflog",
 		}
+
+		commits = append(commits, commit)
 	}
 
 	return commits, nil

pkg/commands/git_test.go

@@ -1907,7 +1907,7 @@ func TestGitCommandGetCommitFiles(t *testing.T) {
 			"123456",
 			test.CreateMockCommand(t, []*test.CommandSwapper{
 				{
-					Expect:  "git show --pretty= --name-only --no-renames 123456",
+					Expect:  "git diff-tree --no-commit-id --name-only -r --no-renames 123456",
 					Replace: "echo 'hello\nworld'",
 				},
 			}),

pkg/gui/keybindings.go

@@ -618,16 +618,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("viewResetOptions"),
 		},
 		{
-			ViewName: "branches",
-			Key:      gui.getKey("universal.nextTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleNextBranchesTab,
+			ViewName:    "branches",
+			Key:         gui.getKey("universal.nextTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleNextBranchesTab,
+			Description: gui.Tr.SLocalize("nextTab"),
 		},
 		{
-			ViewName: "branches",
-			Key:      gui.getKey("universal.prevTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePrevBranchesTab,
+			ViewName:    "branches",
+			Key:         gui.getKey("universal.prevTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handlePrevBranchesTab,
+			Description: gui.Tr.SLocalize("prevTab"),
 		},
 		{
 			ViewName:    "branches",
@@ -654,16 +656,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("fetchRemote"),
 		},
 		{
-			ViewName: "commits",
-			Key:      gui.getKey("universal.nextTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleNextCommitsTab,
+			ViewName:    "commits",
+			Key:         gui.getKey("universal.nextTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleNextCommitsTab,
+			Description: gui.Tr.SLocalize("nextTab"),
 		},
 		{
-			ViewName: "commits",
-			Key:      gui.getKey("universal.prevTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePrevCommitsTab,
+			ViewName:    "commits",
+			Key:         gui.getKey("universal.prevTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handlePrevCommitsTab,
+			Description: gui.Tr.SLocalize("prevTab"),
 		},
 		{
 			ViewName:    "commits",
@@ -1474,7 +1478,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 
 		// we need a specific keybinding for the commits panel beacuse it usually lazyloads commits
 		if listView.viewName != "commits" {
-			bindings = append(bindings, &Binding{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gui.getKey("universal.startSearch"), Modifier: gocui.ModNone, Handler: gui.handleOpenSearch, Description: gui.Tr.SLocalize("startSearch")})
+			bindings = append(bindings, &Binding{
+				ViewName:    listView.viewName,
+				Contexts:    []string{listView.context},
+				Key:         gui.getKey("universal.startSearch"),
+				Modifier:    gocui.ModNone,
+				Handler:     gui.handleOpenSearch,
+				Description: gui.Tr.SLocalize("startSearch"),
+			})
 		}
 	}
 

pkg/i18n/english.go

@@ -1035,6 +1035,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "resetCherryPick",
 			Other: "reset cherry-picked (copied) commits selection",
+		}, &i18n.Message{
+			ID:    "nextTab",
+			Other: "next tab",
+		}, &i18n.Message{
+			ID:    "prevTab",
+			Other: "previous tab",
 		},
 	)
 }