ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

Deprecate git.log.showGraph and git.log.order config

Browse Source 
Added identical properties to AppState that should eventually have their defaults set.
This commit is contained in:
Alex March
2024-02-08 17:27:58 +09:00
committed by Stefan Haller
parent b01bad7fad
commit e354a9bb48
18 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/bisect/basic.go
View File

@@ -15,7 +15,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
CreateNCommits(10)
},
SetupConfig: func(cfg *config.AppConfig) {
cfg.UserConfig.Git.Log.ShowGraph = "never"
cfg.AppState.GitLogShowGraph = "never"
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
markCommitAsBad := func() {

2
pkg/integration/tests/bisect/choose_terms.go
View File

@@ -15,7 +15,7 @@ var ChooseTerms = NewIntegrationTest(NewIntegrationTestArgs{
CreateNCommits(10)
},
SetupConfig: func(cfg *config.AppConfig) {
cfg.UserConfig.Git.Log.ShowGraph = "never"
cfg.AppState.GitLogShowGraph = "never"
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
markCommitAsFixed := func() {

2
pkg/integration/tests/bisect/skip.go
View File

@@ -14,7 +14,7 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{
CreateNCommits(10)
},
SetupConfig: func(cfg *config.AppConfig) {
cfg.UserConfig.Git.Log.ShowGraph = "never"
cfg.AppState.GitLogShowGraph = "never"
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().

2
pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go
View File

@@ -10,7 +10,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.

2
pkg/integration/tests/commit/highlight.go
View File

@@ -10,7 +10,7 @@ var Highlight = NewIntegrationTest(NewIntegrationTestArgs{
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.Log.ShowGraph = "always"
config.AppState.GitLogShowGraph = "always"
config.GetUserConfig().Gui.AuthorColors = map[string]string{
"CI": "red",
}

2
pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go
View File

@@ -12,7 +12,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
GitVersion: AtLeast("2.38.0"),
SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.MainBranches = []string{"master"}
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.

2
pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go
View File

@@ -12,7 +12,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
GitVersion: AtLeast("2.38.0"),
SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.MainBranches = []string{"master"}
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.

2
pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go
View File

@@ -12,7 +12,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
GitVersion: AtLeast("2.38.0"),
SetupConfig: func(config *config.AppConfig) {
config.GetUserConfig().Git.MainBranches = []string{"master"}
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.

2
pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go
View File

@@ -11,7 +11,7 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{
Skip: false,
GitVersion: AtLeast("2.38.0"),
SetupConfig: func(config *config.AppConfig) {
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.

2
pkg/integration/tests/reflog/do_not_show_branch_markers_in_reflog_subcommits.go
View File

@@ -10,7 +10,7 @@ var DoNotShowBranchMarkersInReflogSubcommits = NewIntegrationTest(NewIntegration
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {
config.UserConfig.Git.Log.ShowGraph = "never"
config.AppState.GitLogShowGraph = "never"
},
SetupRepo: func(shell *Shell) {
shell.NewBranch("branch1")