Split behavior of rendering allBranchesLogCmd and switching to next cmd

This now allows for leaving the status panel and returning back to the
same command. When you have StatusPanelView = allBranchesLog, this means
you can easily toggle back and forth to other views. When you have
StatusPanelView = dashboard, the situation is a bit more complex.
Previous behavior would _always_ rotate the index of the active allBranchesLogCmds
in the background. Interestingly, it would do so in the background, so when
you first pressed `a`, you would see the first item in your list, but the
actual index being stored was that of your 2nd item. Now, we have
flipped the order so that when you see the first item in your list, the
actual index being stored is still `0`. The rotation then only happens
when you click `a` for the 2nd time, and then you will see the 2nd item
in your list.

It is possible that some users were relying on the odd behavior. In that
they might go:
* Press `1`
* Press `a`
* See their first log command
* Press `2`
* Press `a`
* See their second log command

Now, their behavior would be:
* Press `1`
* Press `a`
* See their first log command
* Press `2`
* Press `a`
* See their first log command

I think in most cases, this new behavior is preferable. It makes more
sense that their first `a` click is a "switch views" directive, and
their later clicks a "rotate through the commands".

There is no way out of this without changing some behavior. If `a`
_always_ rotates, then it _must_ rotate prior to rendering the view,
otherwise users of allBranchesLog will see nothing happen on their
first `a` press. If it rotates prior to rendering the view, then users
of SatusPanelView = dashboard will see their 2nd list item on their
first `a` click, which seems worse than this new behavior.

Author: Chris McDonnell

pkg/commands/git_commands/branch.go

@@ -255,16 +255,22 @@ func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
 	return self.cmd.New(cmdArgs).Run()
 }
 
+// Only choose between non-empty, non-identical commands
+func (self *BranchCommands) allBranchesLogCandidates() []string {
+	return lo.Uniq(lo.WithoutEmpty(self.UserConfig().Git.AllBranchesLogCmds))
+}
+
 func (self *BranchCommands) AllBranchesLogCmdObj() *oscommands.CmdObj {
-	// Only choose between non-empty, non-identical commands
-	candidates := lo.Uniq(lo.WithoutEmpty(self.UserConfig().Git.AllBranchesLogCmds))
+	candidates := self.allBranchesLogCandidates()
 
-	n := len(candidates)
+	i := self.allBranchesLogCmdIndex
+	return self.cmd.New(str.ToArgv(candidates[i])).DontLog()
+}
 
+func (self *BranchCommands) RotateAllBranchesLogIdx() {
+	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) IsBranchMerged(branch *models.Branch, mainBranches *MainBranches) (bool, error) {

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.switchToOrRotateAllBranchesLogs(); return nil },
 			Description: self.c.Tr.AllBranchesLogGraph,
 		},
 	}
@@ -190,6 +190,18 @@ func (self *StatusController) showAllBranchLogs() {
 	})
 }
 
+// Switches to the all branches view, or, if already on that view,
+// rotates to the next command in the list, and then renders it.
+func (self *StatusController) switchToOrRotateAllBranchesLogs() {
+	// A bit of a hack to ensure we only rotate to the next branch log command
+	// if we currently are looking at a branch log. Otherwise, we should just show
+	// the current index (if we are coming from the dashboard).
+	if self.c.Views().Main.Title == self.c.Tr.LogTitle {
+		self.c.Git().Branch.RotateAllBranchesLogIdx()
+	}
+	self.showAllBranchLogs()
+}
+
 func (self *StatusController) showDashboard() {
 	versionStr := "master"
 	version, err := types.ParseVersionNumber(self.c.GetConfig().GetVersion())

pkg/integration/tests/status/log_cmd_status_panel_all_branches_log.go

@@ -0,0 +1,40 @@
+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"))
+
+		// We head to the branches view and return
+		t.Views().Branches().
+			Focus()
+		t.Views().Status().
+			Focus()
+
+		t.Views().Main().Content(Contains("view1").DoesNotContain("view2"))
+
+		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,