go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

Merge pull request #1972 from lei4519/feature/display-whole-graph-by-default

Browse Source
This commit is contained in:
Jesse Duffield 2022-06-09 20:17:25 +10:00 committed by GitHub
commit de3114edc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Config.md
View File

@ -75,6 +75,8 @@ git:
# one of always, never, when-maximised # one of always, never, when-maximised
# this determines whether the git graph is rendered in the commits panel # this determines whether the git graph is rendered in the commits panel
showGraph: 'when-maximised' 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 skipHookPrefix: WIP
autoFetch: true autoFetch: true
autoRefresh: true autoRefresh: true

10
pkg/config/user_config.go
View File

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

9
pkg/gui/context/local_commits_context.go
View File

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