From 9c57444adc69c60fa2d106abcb287637a3d66369 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Tue, 11 Jul 2023 13:48:18 +0200 Subject: [PATCH] Remove the old experimentalShowBranchHeads mechanism and config We are going to replace it with a better one later in this branch. --- docs/Config.md | 1 - pkg/config/user_config.go | 88 +++++++++---------- pkg/gui/presentation/commits.go | 2 - ...ommit_with_update_ref_show_branch_heads.go | 62 ------------- pkg/integration/tests/test_list.go | 1 - 5 files changed, 43 insertions(+), 111 deletions(-) delete mode 100644 pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go diff --git a/docs/Config.md b/docs/Config.md index bc4b5b92b..447ccae5f 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -62,7 +62,6 @@ gui: showListFooter: true # for seeing the '5 of 20' message in list panels showRandomTip: true showBranchCommitHash: false # show commit hashes alongside branch names - experimentalShowBranchHeads: false # visualize branch heads with (*) in commits list showBottomLine: true # for hiding the bottom information line (unless it has important information to tell you) showCommandLog: true showIcons: false # deprecated: use nerdFontsVersion instead diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 6ac64b2b5..a5121f0c5 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -27,36 +27,35 @@ type RefresherConfig struct { } type GuiConfig struct { - AuthorColors map[string]string `yaml:"authorColors"` - BranchColors map[string]string `yaml:"branchColors"` - ScrollHeight int `yaml:"scrollHeight"` - ScrollPastBottom bool `yaml:"scrollPastBottom"` - MouseEvents bool `yaml:"mouseEvents"` - SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"` - SkipStashWarning bool `yaml:"skipStashWarning"` - SidePanelWidth float64 `yaml:"sidePanelWidth"` - ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"` - MainPanelSplitMode string `yaml:"mainPanelSplitMode"` - Language string `yaml:"language"` - TimeFormat string `yaml:"timeFormat"` - ShortTimeFormat string `yaml:"shortTimeFormat"` - Theme ThemeConfig `yaml:"theme"` - CommitLength CommitLengthConfig `yaml:"commitLength"` - SkipNoStagedFilesWarning bool `yaml:"skipNoStagedFilesWarning"` - ShowListFooter bool `yaml:"showListFooter"` - ShowFileTree bool `yaml:"showFileTree"` - ShowRandomTip bool `yaml:"showRandomTip"` - ShowCommandLog bool `yaml:"showCommandLog"` - ShowBottomLine bool `yaml:"showBottomLine"` - ShowIcons bool `yaml:"showIcons"` - NerdFontsVersion string `yaml:"nerdFontsVersion"` - ShowBranchCommitHash bool `yaml:"showBranchCommitHash"` - ExperimentalShowBranchHeads bool `yaml:"experimentalShowBranchHeads"` - CommandLogSize int `yaml:"commandLogSize"` - SplitDiff string `yaml:"splitDiff"` - SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"` - WindowSize string `yaml:"windowSize"` - Border string `yaml:"border"` + AuthorColors map[string]string `yaml:"authorColors"` + BranchColors map[string]string `yaml:"branchColors"` + ScrollHeight int `yaml:"scrollHeight"` + ScrollPastBottom bool `yaml:"scrollPastBottom"` + MouseEvents bool `yaml:"mouseEvents"` + SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"` + SkipStashWarning bool `yaml:"skipStashWarning"` + SidePanelWidth float64 `yaml:"sidePanelWidth"` + ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"` + MainPanelSplitMode string `yaml:"mainPanelSplitMode"` + Language string `yaml:"language"` + TimeFormat string `yaml:"timeFormat"` + ShortTimeFormat string `yaml:"shortTimeFormat"` + Theme ThemeConfig `yaml:"theme"` + CommitLength CommitLengthConfig `yaml:"commitLength"` + SkipNoStagedFilesWarning bool `yaml:"skipNoStagedFilesWarning"` + ShowListFooter bool `yaml:"showListFooter"` + ShowFileTree bool `yaml:"showFileTree"` + ShowRandomTip bool `yaml:"showRandomTip"` + ShowCommandLog bool `yaml:"showCommandLog"` + ShowBottomLine bool `yaml:"showBottomLine"` + ShowIcons bool `yaml:"showIcons"` + NerdFontsVersion string `yaml:"nerdFontsVersion"` + ShowBranchCommitHash bool `yaml:"showBranchCommitHash"` + CommandLogSize int `yaml:"commandLogSize"` + SplitDiff string `yaml:"splitDiff"` + SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"` + WindowSize string `yaml:"windowSize"` + Border string `yaml:"border"` } type ThemeConfig struct { @@ -436,21 +435,20 @@ func GetDefaultConfig() *UserConfig { UnstagedChangesColor: []string{"red"}, DefaultFgColor: []string{"default"}, }, - CommitLength: CommitLengthConfig{Show: true}, - SkipNoStagedFilesWarning: false, - ShowListFooter: true, - ShowCommandLog: true, - ShowBottomLine: true, - ShowFileTree: true, - ShowRandomTip: true, - ShowIcons: false, - NerdFontsVersion: "", - ExperimentalShowBranchHeads: false, - ShowBranchCommitHash: false, - CommandLogSize: 8, - SplitDiff: "auto", - SkipRewordInEditorWarning: false, - Border: "single", + CommitLength: CommitLengthConfig{Show: true}, + SkipNoStagedFilesWarning: false, + ShowListFooter: true, + ShowCommandLog: true, + ShowBottomLine: true, + ShowFileTree: true, + ShowRandomTip: true, + ShowIcons: false, + NerdFontsVersion: "", + ShowBranchCommitHash: false, + CommandLogSize: 8, + SplitDiff: "auto", + SkipRewordInEditorWarning: false, + Border: "single", }, Git: GitConfig{ Paging: PagingConfig{ diff --git a/pkg/gui/presentation/commits.go b/pkg/gui/presentation/commits.go index 4da03f02f..53d3aaf0d 100644 --- a/pkg/gui/presentation/commits.go +++ b/pkg/gui/presentation/commits.go @@ -289,8 +289,6 @@ func displayCommit( } else { if len(commit.Tags) > 0 { tagString = theme.DiffTerminalColor.SetBold().Sprint(strings.Join(commit.Tags, " ")) + " " - } else if common.UserConfig.Gui.ExperimentalShowBranchHeads && commit.ExtraInfo != "" { - tagString = style.FgMagenta.SetBold().Sprint("(*)") + " " } } diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go deleted file mode 100644 index b8cd41055..000000000 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref_show_branch_heads.go +++ /dev/null @@ -1,62 +0,0 @@ -package interactive_rebase - -import ( - "github.com/jesseduffield/lazygit/pkg/config" - . "github.com/jesseduffield/lazygit/pkg/integration/components" -) - -var DropTodoCommitWithUpdateRefShowBranchHeads = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Drops a commit during interactive rebase when there is an update-ref in the git-rebase-todo file (with experimentalShowBranchHeads on)", - ExtraCmdArgs: []string{}, - Skip: false, - GitVersion: AtLeast("2.38.0"), - SetupConfig: func(config *config.AppConfig) { - config.UserConfig.Gui.ExperimentalShowBranchHeads = true - }, - SetupRepo: func(shell *Shell) { - shell. - CreateNCommits(3). - NewBranch("mybranch"). - CreateNCommitsStartingAt(3, 4) - - shell.SetConfig("rebase.updateRefs", "true") - }, - Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Commits(). - Focus(). - Lines( - Contains("(*) commit 06").IsSelected(), - Contains("commit 05"), - Contains("commit 04"), - Contains("(*) commit 03"), - Contains("commit 02"), - Contains("commit 01"), - ). - NavigateToLine(Contains("commit 01")). - Press(keys.Universal.Edit). - Focus(). - Lines( - Contains("pick").Contains("(*) commit 06"), - Contains("pick").Contains("commit 05"), - Contains("pick").Contains("commit 04"), - Contains("update-ref").Contains("master"), - Contains("pick").Contains("(*) commit 03"), - Contains("pick").Contains("commit 02"), - Contains("<-- YOU ARE HERE --- commit 01"), - ). - NavigateToLine(Contains("commit 05")). - Press(keys.Universal.Remove) - - t.Common().ContinueRebase() - - t.Views().Commits(). - IsFocused(). - Lines( - Contains("(*) commit 06"), - Contains("commit 04"), - Contains("(*) commit 03"), - Contains("commit 02"), - Contains("commit 01"), - ) - }, -}) diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index bdd2a2bfd..fa58676f2 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -117,7 +117,6 @@ var tests = []*components.IntegrationTest{ interactive_rebase.AmendMerge, interactive_rebase.AmendNonHeadCommitDuringRebase, interactive_rebase.DropTodoCommitWithUpdateRef, - interactive_rebase.DropTodoCommitWithUpdateRefShowBranchHeads, interactive_rebase.DropWithCustomCommentChar, interactive_rebase.EditFirstCommit, interactive_rebase.EditNonTodoCommitDuringRebase,