mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-12 04:45:47 +02:00
Remove the old experimentalShowBranchHeads mechanism and config
We are going to replace it with a better one later in this branch.
This commit is contained in:
Stefan Haller
parent
7b8ebfa27e
commit
9c57444adc
5 changed files with 43 additions and 111 deletions
|
|
@ -62,7 +62,6 @@ gui:
|
||||||
showListFooter: true # for seeing the '5 of 20' message in list panels
|
showListFooter: true # for seeing the '5 of 20' message in list panels
|
||||||
showRandomTip: true
|
showRandomTip: true
|
||||||
showBranchCommitHash: false # show commit hashes alongside branch names
|
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)
|
showBottomLine: true # for hiding the bottom information line (unless it has important information to tell you)
|
||||||
showCommandLog: true
|
showCommandLog: true
|
||||||
showIcons: false # deprecated: use nerdFontsVersion instead
|
showIcons: false # deprecated: use nerdFontsVersion instead
|
||||||
|
|
|
||||||
|
|
@ -27,36 +27,35 @@ type RefresherConfig struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
type GuiConfig struct {
|
type GuiConfig struct {
|
||||||
AuthorColors map[string]string `yaml:"authorColors"`
|
AuthorColors map[string]string `yaml:"authorColors"`
|
||||||
BranchColors map[string]string `yaml:"branchColors"`
|
BranchColors map[string]string `yaml:"branchColors"`
|
||||||
ScrollHeight int `yaml:"scrollHeight"`
|
ScrollHeight int `yaml:"scrollHeight"`
|
||||||
ScrollPastBottom bool `yaml:"scrollPastBottom"`
|
ScrollPastBottom bool `yaml:"scrollPastBottom"`
|
||||||
MouseEvents bool `yaml:"mouseEvents"`
|
MouseEvents bool `yaml:"mouseEvents"`
|
||||||
SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
|
SkipDiscardChangeWarning bool `yaml:"skipDiscardChangeWarning"`
|
||||||
SkipStashWarning bool `yaml:"skipStashWarning"`
|
SkipStashWarning bool `yaml:"skipStashWarning"`
|
||||||
SidePanelWidth float64 `yaml:"sidePanelWidth"`
|
SidePanelWidth float64 `yaml:"sidePanelWidth"`
|
||||||
ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"`
|
ExpandFocusedSidePanel bool `yaml:"expandFocusedSidePanel"`
|
||||||
MainPanelSplitMode string `yaml:"mainPanelSplitMode"`
|
MainPanelSplitMode string `yaml:"mainPanelSplitMode"`
|
||||||
Language string `yaml:"language"`
|
Language string `yaml:"language"`
|
||||||
TimeFormat string `yaml:"timeFormat"`
|
TimeFormat string `yaml:"timeFormat"`
|
||||||
ShortTimeFormat string `yaml:"shortTimeFormat"`
|
ShortTimeFormat string `yaml:"shortTimeFormat"`
|
||||||
Theme ThemeConfig `yaml:"theme"`
|
Theme ThemeConfig `yaml:"theme"`
|
||||||
CommitLength CommitLengthConfig `yaml:"commitLength"`
|
CommitLength CommitLengthConfig `yaml:"commitLength"`
|
||||||
SkipNoStagedFilesWarning bool `yaml:"skipNoStagedFilesWarning"`
|
SkipNoStagedFilesWarning bool `yaml:"skipNoStagedFilesWarning"`
|
||||||
ShowListFooter bool `yaml:"showListFooter"`
|
ShowListFooter bool `yaml:"showListFooter"`
|
||||||
ShowFileTree bool `yaml:"showFileTree"`
|
ShowFileTree bool `yaml:"showFileTree"`
|
||||||
ShowRandomTip bool `yaml:"showRandomTip"`
|
ShowRandomTip bool `yaml:"showRandomTip"`
|
||||||
ShowCommandLog bool `yaml:"showCommandLog"`
|
ShowCommandLog bool `yaml:"showCommandLog"`
|
||||||
ShowBottomLine bool `yaml:"showBottomLine"`
|
ShowBottomLine bool `yaml:"showBottomLine"`
|
||||||
ShowIcons bool `yaml:"showIcons"`
|
ShowIcons bool `yaml:"showIcons"`
|
||||||
NerdFontsVersion string `yaml:"nerdFontsVersion"`
|
NerdFontsVersion string `yaml:"nerdFontsVersion"`
|
||||||
ShowBranchCommitHash bool `yaml:"showBranchCommitHash"`
|
ShowBranchCommitHash bool `yaml:"showBranchCommitHash"`
|
||||||
ExperimentalShowBranchHeads bool `yaml:"experimentalShowBranchHeads"`
|
CommandLogSize int `yaml:"commandLogSize"`
|
||||||
CommandLogSize int `yaml:"commandLogSize"`
|
SplitDiff string `yaml:"splitDiff"`
|
||||||
SplitDiff string `yaml:"splitDiff"`
|
SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"`
|
||||||
SkipRewordInEditorWarning bool `yaml:"skipRewordInEditorWarning"`
|
WindowSize string `yaml:"windowSize"`
|
||||||
WindowSize string `yaml:"windowSize"`
|
Border string `yaml:"border"`
|
||||||
Border string `yaml:"border"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type ThemeConfig struct {
|
type ThemeConfig struct {
|
||||||
|
|
@ -436,21 +435,20 @@ func GetDefaultConfig() *UserConfig {
|
||||||
UnstagedChangesColor: []string{"red"},
|
UnstagedChangesColor: []string{"red"},
|
||||||
DefaultFgColor: []string{"default"},
|
DefaultFgColor: []string{"default"},
|
||||||
},
|
},
|
||||||
CommitLength: CommitLengthConfig{Show: true},
|
CommitLength: CommitLengthConfig{Show: true},
|
||||||
SkipNoStagedFilesWarning: false,
|
SkipNoStagedFilesWarning: false,
|
||||||
ShowListFooter: true,
|
ShowListFooter: true,
|
||||||
ShowCommandLog: true,
|
ShowCommandLog: true,
|
||||||
ShowBottomLine: true,
|
ShowBottomLine: true,
|
||||||
ShowFileTree: true,
|
ShowFileTree: true,
|
||||||
ShowRandomTip: true,
|
ShowRandomTip: true,
|
||||||
ShowIcons: false,
|
ShowIcons: false,
|
||||||
NerdFontsVersion: "",
|
NerdFontsVersion: "",
|
||||||
ExperimentalShowBranchHeads: false,
|
ShowBranchCommitHash: false,
|
||||||
ShowBranchCommitHash: false,
|
CommandLogSize: 8,
|
||||||
CommandLogSize: 8,
|
SplitDiff: "auto",
|
||||||
SplitDiff: "auto",
|
SkipRewordInEditorWarning: false,
|
||||||
SkipRewordInEditorWarning: false,
|
Border: "single",
|
||||||
Border: "single",
|
|
||||||
},
|
},
|
||||||
Git: GitConfig{
|
Git: GitConfig{
|
||||||
Paging: PagingConfig{
|
Paging: PagingConfig{
|
||||||
|
|
|
||||||
|
|
@ -289,8 +289,6 @@ func displayCommit(
|
||||||
} else {
|
} else {
|
||||||
if len(commit.Tags) > 0 {
|
if len(commit.Tags) > 0 {
|
||||||
tagString = theme.DiffTerminalColor.SetBold().Sprint(strings.Join(commit.Tags, " ")) + " "
|
tagString = theme.DiffTerminalColor.SetBold().Sprint(strings.Join(commit.Tags, " ")) + " "
|
||||||
} else if common.UserConfig.Gui.ExperimentalShowBranchHeads && commit.ExtraInfo != "" {
|
|
||||||
tagString = style.FgMagenta.SetBold().Sprint("(*)") + " "
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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"),
|
|
||||||
)
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
@ -117,7 +117,6 @@ var tests = []*components.IntegrationTest{
|
||||||
interactive_rebase.AmendMerge,
|
interactive_rebase.AmendMerge,
|
||||||
interactive_rebase.AmendNonHeadCommitDuringRebase,
|
interactive_rebase.AmendNonHeadCommitDuringRebase,
|
||||||
interactive_rebase.DropTodoCommitWithUpdateRef,
|
interactive_rebase.DropTodoCommitWithUpdateRef,
|
||||||
interactive_rebase.DropTodoCommitWithUpdateRefShowBranchHeads,
|
|
||||||
interactive_rebase.DropWithCustomCommentChar,
|
interactive_rebase.DropWithCustomCommentChar,
|
||||||
interactive_rebase.EditFirstCommit,
|
interactive_rebase.EditFirstCommit,
|
||||||
interactive_rebase.EditNonTodoCommitDuringRebase,
|
interactive_rebase.EditNonTodoCommitDuringRebase,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue