Switch between multiple log views

docs/Config.md

@@ -122,6 +122,7 @@ git:
  fetchAll: true # Pass --all flag when running git fetch. Set to false to fetch only origin (or the current branch's upstream remote if there is one)
  branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --'
  allBranchesLogCmd: 'git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium'
+ allBranchesLogCmds: [] # a list of your favorite log commands (pressing 'a' in the status panel will cycle between them)
  overrideGpg: false # prevents lazygit from spawning a separate process when using GPG
  disableForcePushing: false
  parseEmoji: false

docs/keybindings/Keybindings_en.md

@@ -307,7 +307,7 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` e `` | Edit config file | Open file in external editor. |
 | `` u `` | Check for update | |
 | `` <enter> `` | Switch to a recent repo | |
-| `` a `` | Show all branch logs | |
+| `` a `` | Show/cycle all branch logs | |
 
 ## Sub-commits
 

pkg/commands/git_commands/branch.go

@@ -7,10 +7,12 @@ import (
  "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
  "github.com/jesseduffield/lazygit/pkg/utils"
  "github.com/mgutz/str"
+ "github.com/samber/lo"
 )
 
 type BranchCommands struct {
  *GitCommon
+ allBranchesLogCmdIndex uint8 // keeps track of current all branches log command
 }
 
 func NewBranchCommands(gitCommon *GitCommon) *BranchCommands {
@@ -219,5 +221,17 @@ func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
 }
 
 func (self *BranchCommands) AllBranchesLogCmdObj() oscommands.ICmdObj {
- return self.cmd.New(str.ToArgv(self.UserConfig.Git.AllBranchesLogCmd)).DontLog()
+ // Only choose between non-empty, non-identical commands
+ candidates := lo.Uniq(lo.WithoutEmpty(append([]string{
+ self.UserConfig.Git.AllBranchesLogCmd,
+ },
+ self.UserConfig.Git.AllBranchesLogCmds...,
+ )))
+
+ n := len(candidates)
+
+ i := self.allBranchesLogCmdIndex
+ self.allBranchesLogCmdIndex = uint8((int(i) + 1) % n)
+
+ return self.cmd.New(str.ToArgv(candidates[i])).DontLog()
 }

pkg/config/user_config.go

@@ -196,6 +196,8 @@ type GitConfig struct {
  BranchLogCmd string `yaml:"branchLogCmd"`
  // Command used to display git log of all branches in the main window
  AllBranchesLogCmd string `yaml:"allBranchesLogCmd"`
+ // Commands used to display git log of all branches in the main window, they will be cycled in order of appearance
+ AllBranchesLogCmds []string `yaml:"allBranchesLogCmds"`
  // If true, do not spawn a separate process when using GPG
  OverrideGpg bool `yaml:"overrideGpg"`
  // If true, do not allow force pushes

pkg/i18n/english.go

@@ -1168,7 +1168,7 @@ func EnglishTranslationSet() TranslationSet {
  MergeBranchTooltip: "Merge selected branch into currently checked out branch.",
  ConfirmQuit: `Are you sure you want to quit?`,
  SwitchRepo: `Switch to a recent repo`,
- AllBranchesLogGraph: `Show all branch logs`,
+ AllBranchesLogGraph: `Show/cycle all branch logs`,
  UnsupportedGitService: `Unsupported git service`,
  CreatePullRequest: `Create pull request`,
  CopyPullRequestURL: `Copy pull request URL to clipboard`,

pkg/integration/tests/status/log_cmd.go

@@ -0,0 +1,33 @@
+package status
+
+import (
+ "github.com/jesseduffield/lazygit/pkg/config"
+ . "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var LogCmd = NewIntegrationTest(NewIntegrationTestArgs{
+ Description: "Cycle between two different log commands in the Status view",
+ ExtraCmdArgs: []string{},
+ Skip: false,
+ SetupConfig: func(config *config.AppConfig) {
+ config.UserConfig.Git.AllBranchesLogCmd = `echo "view1"`
+ config.UserConfig.Git.AllBranchesLogCmds = []string{`echo "view2"`}
+ },
+ SetupRepo: func(shell *Shell) {},
+ Run: func(t *TestDriver, keys config.KeybindingConfig) {
+ t.Views().Status().
+ Focus().
+ Press(keys.Status.AllBranchesLogGraph)
+ 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

@@ -23,6 +23,7 @@ import (
  "github.com/jesseduffield/lazygit/pkg/integration/tests/reflog"
  "github.com/jesseduffield/lazygit/pkg/integration/tests/staging"
  "github.com/jesseduffield/lazygit/pkg/integration/tests/stash"
+ "github.com/jesseduffield/lazygit/pkg/integration/tests/status"
  "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule"
  "github.com/jesseduffield/lazygit/pkg/integration/tests/sync"
  "github.com/jesseduffield/lazygit/pkg/integration/tests/tag"
@@ -246,6 +247,7 @@ var tests = []*components.IntegrationTest{
  stash.StashIncludingUntrackedFiles,
  stash.StashStaged,
  stash.StashUnstaged,
+ status.LogCmd,
  submodule.Add,
  submodule.Enter,
  submodule.EnterNested,

schema/config.json

@@ -481,6 +481,13 @@
  "description": "Command used to display git log of all branches in the main window",
  "default": "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium"
  },
+ "allBranchesLogCmds": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array",
+ "description": "Commands used to display git log of all branches in the main window, they will be cycled in order of appearance"
+ },
  "overrideGpg": {
  "type": "boolean",
  "description": "If true, do not spawn a separate process when using GPG"