Merge pull request jesseduffield#1972 from lei4519/feature/display-wh…

…ole-graph-by-default
bramhoven · Jun 9, 2022 · de3114e · de3114e
2 parents cdec70c + 684ea28
commit de3114e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/docs/Config.md b/docs/Config.md
@@ -75,6 +75,8 @@ git:
     # one of always, never, when-maximised
     # this determines whether the git graph is rendered in the commits panel
     showGraph: 'when-maximised'
+    # displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`)
+    showWholeGraph: false
   skipHookPrefix: WIP
   autoFetch: true
   autoRefresh: true

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -104,8 +104,9 @@ type MergingConfig struct {
 }
 
 type LogConfig struct {
-	Order     string `yaml:"order"`     // one of date-order, author-date-order, topo-order
-	ShowGraph string `yaml:"showGraph"` // one of always, never, when-maximised
+	Order          string `yaml:"order"`     // one of date-order, author-date-order, topo-order
+	ShowGraph      string `yaml:"showGraph"` // one of always, never, when-maximised
+	ShowWholeGraph bool   `yaml:"showWholeGraph"`
 }
 
 type CommitPrefixConfig struct {
@@ -383,8 +384,9 @@ func GetDefaultConfig() *UserConfig {
 				Args:         "",
 			},
 			Log: LogConfig{
-				Order:     "topo-order",
-				ShowGraph: "when-maximised",
+				Order:          "topo-order",
+				ShowGraph:      "when-maximised",
+				ShowWholeGraph: false,
 			},
 			SkipHookPrefix:      "WIP",
 			AutoFetch:           true,

diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go
@@ -24,7 +24,7 @@ func NewLocalCommitsContext(
 
 	c *types.HelperCommon,
 ) *LocalCommitsContext {
-	viewModel := NewLocalCommitsViewModel(getModel)
+	viewModel := NewLocalCommitsViewModel(getModel, c)
 
 	return &LocalCommitsContext{
 		LocalCommitsViewModel: viewModel,
@@ -70,10 +70,11 @@ type LocalCommitsViewModel struct {
 	showWholeGitGraph bool
 }
 
-func NewLocalCommitsViewModel(getModel func() []*models.Commit) *LocalCommitsViewModel {
+func NewLocalCommitsViewModel(getModel func() []*models.Commit, c *types.HelperCommon) *LocalCommitsViewModel {
 	self := &LocalCommitsViewModel{
-		BasicViewModel: NewBasicViewModel(getModel),
-		limitCommits:   true,
+		BasicViewModel:    NewBasicViewModel(getModel),
+		limitCommits:      true,
+		showWholeGitGraph: c.UserConfig.Git.Log.ShowWholeGraph,
 	}
 
 	return self