add tab keybindings

Will be integrated with another

.circleci/config.yml

@@ -1,62 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/golang:1.14
-    environment:
-      GO111MODULE: "on"
-    working_directory: /go/src/github.com/jesseduffield/lazygit
-    steps:
-      - checkout
-      - run:
-          name: Run gofmt -s
-          command: |
-            if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
-             find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
-             exit 1;
-            fi
-      - restore_cache:
-          keys:
-            - pkg-cache-{{ checksum "go.sum" }}-v5
-      - run:
-          name: Run tests
-          command: |
-            ./test.sh
-      - run:
-          name: Push on codecov result
-          command: |
-            bash <(curl -s https://codecov.io/bash)
-      - run:
-          name: Compile project on every platform
-          command: |
-            go get github.com/mitchellh/gox
-            GOFLAGS=-mod=vendor gox -parallel 10 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"
-      - save_cache:
-          key: pkg-cache-{{ checksum "go.sum" }}-v5
-          paths:
-            - ~/.cache/go-build
-
-  release:
-    docker:
-      - image: circleci/golang:1.14
-    working_directory: /go/src/github.com/jesseduffield/lazygit
-    steps:
-      - checkout
-      - run:
-          name: Run gorelease
-          command: |
-            curl -sL https://git.io/goreleaser | bash
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - build
-  release:
-    jobs:
-      - release:
-          filters:
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*/
-            branches:
-              ignore: /.*/

.github/workflows/cd.yml

@@ -0,0 +1,34 @@
+name: Continuous Delivery
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Unshallow repo
+        run: git fetch --prune --unshallow
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14.x
+      - name: Run goreleaser
+        uses: goreleaser/goreleaser-action@v1
+        with:
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_API_TOKEN}}
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+      - name: Bump Homebrew
+        uses: dawidd6/action-homebrew-bump-formula@v1
+        with:
+          token: ${{secrets.GITHUB_API_TOKEN}}
+          formula: lazygit
+          url: "https://github.com/${{github.repository}}/archive/${{steps.tag.outputs.tag}}.tar.gz"

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: Continuous Integration
+
+on: push
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    env:
+      GOFLAGS: -mod=vendor
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.14.x
+      - name: Cache build
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/go-build
+          key: ${{runner.os}}-go-${{hashFiles('**/go.sum')}}
+          restore-keys: |
+            ${{runner.os}}-go-
+      - name: Format code
+        run: |
+          if [ $(find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;|wc -l) -gt 0 ]; then
+           find . ! -path "./vendor/*" -name "*.go" -exec gofmt -s -d {} \;
+           exit 1
+          fi
+      - name: Test code
+        run: |
+          ./test.sh
+      - name: Build binaries
+        run: |
+          go get github.com/mitchellh/gox
+          export PATH="$(go env GOPATH)/bin:$PATH"
+          gox -parallel 4 -os "linux freebsd netbsd windows" -osarch "darwin/i386 darwin/amd64"

.github/workflows/homebrew.yml

@@ -1,20 +0,0 @@
-name: Bump Homebrew formula
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get tag
-        id: tag
-        run: echo "::set-output name=tag::${GITHUB_REF##*/}"
-      - name: Bump Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v1.1.0
-        with:
-          token: ${{secrets.GITHUB_API_TOKEN}}
-          formula: lazygit
-          url: "https://github.com/${{github.repository}}/archive/${{steps.tag.outputs.tag}}.tar.gz"

.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 [![CircleCI](https://circleci.com/gh/jesseduffield/lazygit.svg?style=svg)](https://circleci.com/gh/jesseduffield/lazygit) [![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/Config.md

@@ -128,6 +128,7 @@ Default path for the config file:
       tagCommit: 'T'
       toggleDiffCommit: 'i'
       checkoutCommit: '<space>'
+      resetCherryPick: '<c-R>'
     stash:
       popStash: 'g'
     commitFiles:

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.go

@@ -8,4 +8,5 @@ type Branch struct {
 	Pushables    string
 	Pullables    string
 	UpstreamName string
+	Head         bool
 }

pkg/commands/branch_list_builder.go

@@ -43,7 +43,7 @@ func (b *BranchListBuilder) obtainCurrentBranchName() string {
 }
 
 func (b *BranchListBuilder) obtainBranches() []*Branch {
-	cmdStr := `git branch --format="%(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,42 +51,48 @@ func (b *BranchListBuilder) obtainBranches() []*Branch {
 
 	trimmedOutput := strings.TrimSpace(output)
 	outputLines := strings.Split(trimmedOutput, "\n")
-	if len(outputLines) <= 1 {
-		return []*Branch{}
-	}
-	branches := make([]*Branch, len(outputLines)-1)
-	for i, line := range outputLines[1:] {
-		split := strings.Split(line, SEPARATION_CHAR)
-
-		name := split[0]
-		branches[i] = &Branch{
-			Name:      name,
-			Pullables: "?",
-			Pushables: "?",
-		}
-		upstreamName := split[1]
-		if upstreamName == "" {
+	branches := make([]*Branch, 0, len(outputLines))
+	for _, line := range outputLines {
+		if line == "" {
 			continue
 		}
 
-		branches[i].UpstreamName = upstreamName
+		split := strings.Split(line, SEPARATION_CHAR)
 
-		track := split[2]
+		name := split[1]
+		branch := &Branch{
+			Name:      name,
+			Pullables: "?",
+			Pushables: "?",
+			Head:      split[0] == "*",
+		}
+
+		upstreamName := split[2]
+		if upstreamName == "" {
+			branches = append(branches, branch)
+			continue
+		}
+
+		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
@@ -96,6 +102,7 @@ func (b *BranchListBuilder) obtainBranches() []*Branch {
 func (b *BranchListBuilder) Build() []*Branch {
 	currentBranchName := b.obtainCurrentBranchName()
 	branches := b.obtainBranches()
+
 	reflogBranches := b.obtainReflogBranches()
 
 	// loop through reflog branches. If there is a match, merge them, then remove it from the branches and keep it in the reflog branches
@@ -103,6 +110,9 @@ func (b *BranchListBuilder) Build() []*Branch {
 outer:
 	for _, reflogBranch := range reflogBranches {
 		for j, branch := range branches {
+			if branch.Head {
+				continue
+			}
 			if strings.EqualFold(reflogBranch.Name, branch.Name) {
 				branch.Recency = reflogBranch.Recency
 				branchesWithRecency = append(branchesWithRecency, branch)
@@ -114,21 +124,21 @@ outer:
 
 	branches = append(branchesWithRecency, branches...)
 
-	// if it's the current branch we need to pull it up to the top
+	foundHead := false
 	for i, branch := range branches {
-		if branch.Name == currentBranchName {
+		if branch.Head {
+			foundHead = true
+			branch.Name = currentBranchName
+			branch.Recency = "  *"
 			branches = append(branches[0:i], branches[i+1:]...)
 			branches = append([]*Branch{branch}, branches...)
 			break
 		}
 	}
-
-	if len(branches) == 0 || branches[0].Name != currentBranchName {
-		branches = append([]*Branch{{Name: currentBranchName}}, branches...)
+	if !foundHead {
+		branches = append([]*Branch{{Name: currentBranchName, Head: true, Recency: "  *"}}, branches...)
 	}
 
-	branches[0].Recency = "  *"
-
 	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/config/app_config.go

@@ -360,6 +360,7 @@ keybinding:
     tagCommit: 'T'
     toggleDiffCommit: 'i'
     checkoutCommit: '<space>'
+    resetCherryPick: '<c-R>'
   stash:
     popStash: 'g'
   commitFiles:

pkg/gui/commits_panel.go

@@ -642,3 +642,8 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
 
 	return gui.handleOpenSearch(gui.g, v)
 }
+
+func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error {
+	gui.State.CherryPickedCommits = []*commands.Commit{}
+	return gui.refreshCommits(gui.g)
+}

pkg/gui/gui.go

@@ -213,6 +213,7 @@ type guiState struct {
 	Ptmx                 *os.File
 	PrevMainWidth        int
 	PrevMainHeight       int
+	OldInformation       string
 }
 
 // for now the split view will always be on
@@ -494,6 +495,9 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		donate := color.New(color.FgMagenta, color.Underline).Sprint(gui.Tr.SLocalize("Donate"))
 		information = donate + " " + information
 	}
+	if len(gui.State.CherryPickedCommits) > 0 {
+		information = utils.ColoredString(fmt.Sprintf("%d commits copied", len(gui.State.CherryPickedCommits)), color.FgCyan)
+	}
 
 	minimumHeight := 9
 	minimumWidth := 10
@@ -760,13 +764,14 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 		}
 	}
 
-	if v, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0); err != nil {
+	informationView, err := g.SetView("information", optionsVersionBoundary-1, height-2, width, height, 0)
+	if err != nil {
 		if err.Error() != "unknown view" {
 			return err
 		}
-		v.BgColor = gocui.ColorDefault
-		v.FgColor = gocui.ColorGreen
-		v.Frame = false
+		informationView.BgColor = gocui.ColorDefault
+		informationView.FgColor = gocui.ColorGreen
+		informationView.Frame = false
 		gui.renderString(g, "information", information)
 
 		// doing this here because it'll only happen once
@@ -774,6 +779,10 @@ func (gui *Gui) layout(g *gocui.Gui) error {
 			return err
 		}
 	}
+	if gui.State.OldInformation != information {
+		gui.setViewContent(g, informationView, information)
+		gui.State.OldInformation = information
+	}
 
 	if gui.g.CurrentView() == nil {
 		if _, err := gui.g.SetCurrentView(gui.getFilesView().Name()); err != nil {

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",
@@ -840,6 +844,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Handler:     gui.handleTagCommit,
 			Description: gui.Tr.SLocalize("tagCommit"),
 		},
+		{
+			ViewName:    "commits",
+			Contexts:    []string{"branch-commits"},
+			Key:         gui.getKey("commits.resetCherryPick"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleResetCherryPick,
+			Description: gui.Tr.SLocalize("resetCherryPick"),
+		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{"reflog-commits"},
@@ -1466,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

@@ -1032,6 +1032,15 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "closeMenu",
 			Other: "close menu",
+		}, &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",
 		},
 	)
 }