Retain index position of allBranchesLogCmd when toggling status panel

docs/keybindings/Keybindings_en.md

@@ -346,6 +346,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | Check for update |  |
 | `` <enter> `` | Switch to a recent repo |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## Sub-commits
 

docs/keybindings/Keybindings_ja.md

@@ -198,6 +198,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | 更新を確認 |  |
 | `` <enter> `` | 最近使用したリポジトリに切り替え |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## タグ
 

docs/keybindings/Keybindings_ko.md

@@ -238,6 +238,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | 업데이트 확인 |  |
 | `` <enter> `` | 최근에 사용한 저장소로 전환 |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## 서브모듈
 

docs/keybindings/Keybindings_nl.md

@@ -346,6 +346,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | Check voor updates |  |
 | `` <enter> `` | Wissel naar een recente repo |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## Sub-commits
 

docs/keybindings/Keybindings_pl.md

@@ -326,6 +326,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | Sprawdź aktualizacje |  |
 | `` <enter> `` | Przełącz na ostatnie repozytorium |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## Sub-commity
 

docs/keybindings/Keybindings_pt.md

@@ -359,6 +359,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | Verificar atualização |  |
 | `` <enter> `` | Mudar para um repositório recente |  |
 | `` a `` | Mostrar/ciclo todos os logs de filiais |  |
+| `` 0 `` | Focus main view |  |
 
 ## Sub-commits
 

docs/keybindings/Keybindings_ru.md

@@ -315,6 +315,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | Проверить обновления |  |
 | `` <enter> `` | Переключиться на последний репозиторий |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## Теги
 

docs/keybindings/Keybindings_zh-CN.md

@@ -349,6 +349,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | 检查更新 |  |
 | `` <enter> `` | 切换到最近的仓库 |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## 确认面板
 

docs/keybindings/Keybindings_zh-TW.md

@@ -371,6 +371,7 @@ Note that this disregards the selection, the new branch is always created either
 | `` u `` | 檢查更新 |  |
 | `` <enter> `` | 切換到最近使用的版本庫 |  |
 | `` a `` | Show/cycle all branch logs |  |
+| `` 0 `` | Focus main view |  |
 
 ## 確認面板
 

pkg/commands/git_commands/branch.go

@@ -255,16 +255,27 @@ func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
 	return self.cmd.New(cmdArgs).Run()
 }
 
-func (self *BranchCommands) AllBranchesLogCmdObj() *oscommands.CmdObj {
-	// Only choose between non-empty, non-identical commands
-	candidates := lo.Uniq(lo.WithoutEmpty(self.UserConfig().Git.AllBranchesLogCmds))
+// Only choose between non-empty, non-identical commands
+func (self *BranchCommands) allBranchesLogCandidates() []string {
+	return lo.Uniq(lo.WithoutEmpty(self.UserConfig().Git.AllBranchesLogCmds))
+}
 
-	n := len(candidates)
+func (self *BranchCommands) CurrentAllBranchesLogCmdObj() *oscommands.CmdObj {
+	candidates := self.allBranchesLogCandidates()
 
+	i := self.allBranchesLogCmdIndex
+	return self.cmd.New(str.ToArgv(candidates[i])).DontLog()
+}
+
+func (self *BranchCommands) rotateAllBranchesIdx() {
+	n := len(self.allBranchesLogCandidates())
 	i := self.allBranchesLogCmdIndex
 	self.allBranchesLogCmdIndex = uint8((int(i) + 1) % n)
+}
 
-	return self.cmd.New(str.ToArgv(candidates[i])).DontLog()
+func (self *BranchCommands) RotateAllBranchesLogCmdObj() *oscommands.CmdObj {
+	self.rotateAllBranchesIdx()
+	return self.CurrentAllBranchesLogCmdObj()
 }
 
 func (self *BranchCommands) IsBranchMerged(branch *models.Branch, mainBranches *MainBranches) (bool, error) {

pkg/commands/git_commands/branch_test.go

@@ -230,7 +230,7 @@ func TestBranchGetAllBranchGraph(t *testing.T) {
 		"log", "--graph", "--all", "--color=always", "--abbrev-commit", "--decorate", "--date=relative", "--pretty=medium",
 	}, "", nil)
 	instance := buildBranchCommands(commonDeps{runner: runner})
-	err := instance.AllBranchesLogCmdObj().Run()
+	err := instance.RotateAllBranchesLogCmdObj().Run()
 	assert.NoError(t, err)
 }
 

pkg/gui/controllers.go

@@ -266,6 +266,7 @@ func (gui *Gui) resetHelpersAndControllers() {
 	}
 
 	for _, context := range []types.Context{
+		gui.State.Contexts.Status,
 		gui.State.Contexts.Files,
 		gui.State.Contexts.Branches,
 		gui.State.Contexts.RemoteBranches,

pkg/gui/controllers/status_controller.go

@@ -60,7 +60,7 @@ func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*type
 		},
 		{
 			Key:         opts.GetKey(opts.Config.Status.AllBranchesLogGraph),
-			Handler:     func() error { self.showAllBranchLogs(); return nil },
+			Handler:     func() error { self.rotateAllBranchesLogs(); return nil },
 			Description: self.c.Tr.AllBranchesLogGraph,
 		},
 	}
@@ -178,7 +178,21 @@ func (self *StatusController) editConfig() error {
 }
 
 func (self *StatusController) showAllBranchLogs() {
-	cmdObj := self.c.Git().Branch.AllBranchesLogCmdObj()
+	cmdObj := self.c.Git().Branch.CurrentAllBranchesLogCmdObj()
+	task := types.NewRunPtyTask(cmdObj.GetCmd())
+
+	self.c.RenderToMainViews(types.RefreshMainOpts{
+		Pair: self.c.MainViewPairs().Normal,
+		Main: &types.ViewUpdateOpts{
+			Title: self.c.Tr.LogTitle,
+			Task:  task,
+		},
+	})
+}
+
+// Switches to the next branch command and renders it onto the screen
+func (self *StatusController) rotateAllBranchesLogs() {
+	cmdObj := self.c.Git().Branch.RotateAllBranchesLogCmdObj()
 	task := types.NewRunPtyTask(cmdObj.GetCmd())
 
 	self.c.RenderToMainViews(types.RefreshMainOpts{

pkg/integration/tests/status/log_cmd.go

@@ -17,16 +17,16 @@ var LogCmd = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Status().
 			Focus().
 			Press(keys.Status.AllBranchesLogGraph)
-		t.Views().Main().Content(Contains("view1"))
+		t.Views().Main().Content(Contains("view2"))
 
 		t.Views().Status().
 			Focus().
 			Press(keys.Status.AllBranchesLogGraph)
-		t.Views().Main().Content(Contains("view2").DoesNotContain("view1"))
+		t.Views().Main().Content(Contains("view1").DoesNotContain("view2"))
 
 		t.Views().Status().
 			Focus().
 			Press(keys.Status.AllBranchesLogGraph)
-		t.Views().Main().Content(Contains("view1").DoesNotContain("view2"))
+		t.Views().Main().Content(Contains("view2").DoesNotContain("view1"))
 	},
 })

pkg/integration/tests/status/log_cmd_status_panel_all_branches_log.go

@@ -0,0 +1,32 @@
+package status
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var LogCmdStatusPanelAllBranchesLog = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Cycle between two different log commands in the Status view when it has status panel AllBranchesLog",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Git.AllBranchesLogCmds = []string{`echo "view1"`, `echo "view2"`}
+		config.GetUserConfig().Gui.StatusPanelView = "allBranchesLog"
+	},
+	SetupRepo: func(shell *Shell) {},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Status().
+			Focus()
+		t.Views().Main().Content(Contains("view1"))
+
+		t.Views().Status().
+			Focus().
+			Press(keys.Status.AllBranchesLogGraph)
+		t.Views().Main().Content(Contains("view2").DoesNotContain("view1"))
+
+		t.Views().Status().
+			Focus().
+			Press(keys.Status.AllBranchesLogGraph)
+		t.Views().Main().Content(Contains("view1").DoesNotContain("view2"))
+	},
+})

pkg/integration/tests/test_list.go

@@ -360,6 +360,7 @@ var tests = []*components.IntegrationTest{
 	status.ClickToFocus,
 	status.ClickWorkingTreeStateToOpenRebaseOptionsMenu,
 	status.LogCmd,
+	status.LogCmdStatusPanelAllBranchesLog,
 	status.ShowDivergenceFromBaseBranch,
 	submodule.Add,
 	submodule.Enter,