From 67c81c5b148d6501b1dac31f04c02f3b7043ae23 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 23 Jul 2026 13:12:59 +0200 Subject: [PATCH 1/3] Change default spinner frames and rate I find that this looks a little nicer, and it reduces CPU load by not spinning so fast. --- docs-master/Config.md | 10 +++++----- pkg/config/user_config.go | 4 ++-- pkg/gui/presentation/branches_test.go | 10 +++++----- schema-master/config.json | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs-master/Config.md b/docs-master/Config.md index 1d101be18..b5bf09088 100644 --- a/docs-master/Config.md +++ b/docs-master/Config.md @@ -336,13 +336,13 @@ gui: spinner: # The frames of the spinner animation. frames: - - '|' - - / - - '-' - - \ + - ●∙∙ + - ∙●∙ + - ∙∙● + - ∙●∙ # The "speed" of the spinner in milliseconds. - rate: 50 + rate: 180 # Status panel view. # One of 'dashboard' (default) | 'allBranchesLog' diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 30ce0377d..11c7bcf5f 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -922,8 +922,8 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig { PortraitModeAutoMinHeight: 46, FilterMode: "substring", Spinner: SpinnerConfig{ - Frames: []string{"|", "/", "-", "\\"}, - Rate: 50, + Frames: []string{"●∙∙", "∙●∙", "∙∙●", "∙●∙"}, + Rate: 180, }, StatusPanelView: "dashboard", SwitchToFilesAfterStashPop: true, diff --git a/pkg/gui/presentation/branches_test.go b/pkg/gui/presentation/branches_test.go index b2c19a9ea..339f57cc3 100644 --- a/pkg/gui/presentation/branches_test.go +++ b/pkg/gui/presentation/branches_test.go @@ -162,7 +162,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "", "branch_name Pushing |"}, + expected: []string{"1m", "", "branch_name Pushing ●∙∙"}, }, { branch: &models.Branch{ @@ -282,7 +282,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "", "branc… Pushing |"}, + expected: []string{"1m", "", "bra… Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "abc", Recency: "1m"}, @@ -292,7 +292,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "", "abc Pushing |"}, + expected: []string{"1m", "", "abc Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "ab", Recency: "1m"}, @@ -302,7 +302,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "", "ab Pushing |"}, + expected: []string{"1m", "", "ab Pushing ●∙∙"}, }, { branch: &models.Branch{Name: "a", Recency: "1m"}, @@ -312,7 +312,7 @@ func Test_getBranchDisplayStrings(t *testing.T) { useIcons: false, checkedOutByWorktree: false, showDivergenceCfg: "none", - expected: []string{"1m", "", "a Pushing |"}, + expected: []string{"1m", "", "a Pushing ●∙∙"}, }, { branch: &models.Branch{ diff --git a/schema-master/config.json b/schema-master/config.json index 82dbebb0b..6ff13b5d0 100644 --- a/schema-master/config.json +++ b/schema-master/config.json @@ -3631,17 +3631,17 @@ "type": "array", "description": "The frames of the spinner animation.", "default": [ - "|", - "/", - "-", - "\\" + "●∙∙", + "∙●∙", + "∙∙●", + "∙●∙" ] }, "rate": { "type": "integer", "minimum": 1, "description": "The \"speed\" of the spinner in milliseconds.", - "default": 50 + "default": 180 } }, "additionalProperties": false, From 22db808a017f782a8620f5665437e12791da8b29 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sat, 25 Jul 2026 08:50:00 +0200 Subject: [PATCH 2/3] Add a helper function for formatting list section headers We want to change their design, and we want to do it only in one place. --- pkg/gui/context/list_renderer.go | 5 +++++ pkg/gui/context/local_commits_context.go | 7 +++---- pkg/gui/context/menu_context.go | 2 +- pkg/gui/context/sub_commits_context.go | 5 ++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkg/gui/context/list_renderer.go b/pkg/gui/context/list_renderer.go index b8d036778..35e0b26ef 100644 --- a/pkg/gui/context/list_renderer.go +++ b/pkg/gui/context/list_renderer.go @@ -1,6 +1,7 @@ package context import ( + "fmt" "strings" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -9,6 +10,10 @@ import ( "golang.org/x/exp/slices" ) +func formatListSectionHeader(label string) string { + return fmt.Sprintf("--- %s ---", label) +} + type NonModelItem struct { // Where in the model this should be inserted Index int diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go index a66c720c9..034b2434e 100644 --- a/pkg/gui/context/local_commits_context.go +++ b/pkg/gui/context/local_commits_context.go @@ -1,7 +1,6 @@ package context import ( - "fmt" "log" "strings" "sync/atomic" @@ -72,7 +71,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { if c.Model().WorkingTreeStateAtLastCommitRefresh.Rebasing { result = append(result, &NonModelItem{ Index: 0, - Content: fmt.Sprintf("--- %s ---", c.Tr.PendingRebaseTodosSectionHeader), + Content: formatListSectionHeader(c.Tr.PendingRebaseTodosSectionHeader), }) } @@ -91,7 +90,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { c.Tr.PendingRevertsSectionHeader) result = append(result, &NonModelItem{ Index: firstCherryPickOrRevertTodo, - Content: fmt.Sprintf("--- %s ---", label), + Content: formatListSectionHeader(label), }) } @@ -104,7 +103,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { } result = append(result, &NonModelItem{ Index: firstRealCommit, - Content: fmt.Sprintf("--- %s ---", c.Tr.CommitsSectionHeader), + Content: formatListSectionHeader(c.Tr.CommitsSectionHeader), }) } diff --git a/pkg/gui/context/menu_context.go b/pkg/gui/context/menu_context.go index 9feef1e4c..8129aa420 100644 --- a/pkg/gui/context/menu_context.go +++ b/pkg/gui/context/menu_context.go @@ -198,7 +198,7 @@ func (self *MenuViewModel) GetNonModelItems() []*NonModelItem { result = append(result, &NonModelItem{ Index: i, Column: 1, - Content: style.FgGreen.SetBold().Sprintf("--- %s ---", menuItem.Section.Title), + Content: style.FgGreen.SetBold().Sprint(formatListSectionHeader(menuItem.Section.Title)), }) prevSection = menuItem.Section } diff --git a/pkg/gui/context/sub_commits_context.go b/pkg/gui/context/sub_commits_context.go index 4e05c9594..b0bcee30a 100644 --- a/pkg/gui/context/sub_commits_context.go +++ b/pkg/gui/context/sub_commits_context.go @@ -1,7 +1,6 @@ package context import ( - "fmt" "time" "github.com/jesseduffield/lazygit/pkg/commands/git_commands" @@ -90,7 +89,7 @@ func NewSubCommitsContext( } result = append(result, &NonModelItem{ Index: upstreamIdx, - Content: fmt.Sprintf("--- %s ---", c.Tr.DivergenceSectionHeaderRemote), + Content: formatListSectionHeader(c.Tr.DivergenceSectionHeaderRemote), }) _, localIdx, found := lo.FindIndexOf( @@ -100,7 +99,7 @@ func NewSubCommitsContext( } result = append(result, &NonModelItem{ Index: localIdx, - Content: fmt.Sprintf("--- %s ---", c.Tr.DivergenceSectionHeaderLocal), + Content: formatListSectionHeader(c.Tr.DivergenceSectionHeaderLocal), }) } From 31cbabe48f4a10fd795c8edfafa6bedb33d0d9cc Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 23 Jul 2026 13:43:53 +0200 Subject: [PATCH 3/3] Change list section headers to a slightly more elegant design I'm not a skilled UI designer, so I suspect there may be even better options, but it's definitely already better than the raw ASCII "---" we had before. Put the line only at the beginning because it looks bad if the line after the label is misaligned when labels don't have the same width (e.g. "Remote" vs. "Local" in the divergence view). --- pkg/gui/context/list_renderer.go | 2 +- .../tests/branch/rebase_and_drop.go | 8 +-- .../show_divergence_from_base_branch.go | 4 +- .../branch/show_divergence_from_upstream.go | 4 +- ..._divergence_from_upstream_no_divergence.go | 4 +- .../cherry_pick/cherry_pick_during_rebase.go | 8 +-- ...mend_when_there_are_conflicts_and_amend.go | 4 +- ...end_when_there_are_conflicts_and_cancel.go | 4 +- .../revert_with_conflict_multiple_commits.go | 4 +- .../revert_with_conflict_single_commit.go | 4 +- pkg/integration/tests/commit/shared.go | 4 +- .../tests/filter_and_search/filter_menu.go | 2 +- .../filter_menu_by_keybinding.go | 2 +- .../filter_menu_cancel_filter_with_escape.go | 2 +- .../filter_menu_with_no_keybindings.go | 2 +- .../advanced_interactive_rebase.go | 12 ++--- .../amend_commit_with_conflict.go | 8 +-- .../amend_head_commit_during_rebase.go | 8 +-- .../amend_non_head_commit_during_rebase.go | 4 +- .../delete_update_ref_todo.go | 8 +-- .../dont_show_branch_heads_for_todo_items.go | 4 +- .../drop_todo_commit_with_update_ref.go | 4 +- .../interactive_rebase/edit_and_auto_amend.go | 4 +- .../interactive_rebase/edit_first_commit.go | 4 +- .../edit_last_commit_of_stacked_branch.go | 4 +- .../edit_non_todo_commit_during_rebase.go | 4 +- ...nge_select_down_to_merge_outside_rebase.go | 4 +- .../edit_range_select_outside_rebase.go | 4 +- .../edit_the_confl_commit.go | 4 +- .../fixup_keep_message_rebase.go | 12 ++--- .../interactive_rebase_of_copied_branch.go | 4 +- ...e_rebase_with_conflict_for_edit_command.go | 4 +- .../mid_rebase_range_select.go | 52 +++++++++---------- .../interactive_rebase/move_in_rebase.go | 32 ++++++------ .../move_todo_down_with_rapid_keypresses.go | 4 +- .../move_update_ref_todo.go | 8 +-- .../interactive_rebase/pick_rescheduled.go | 8 +-- .../tests/interactive_rebase/quick_start.go | 8 +-- .../quick_start_keep_selection.go | 4 +- .../quick_start_keep_selection_range.go | 4 +- .../tests/interactive_rebase/rebase.go | 24 ++++----- ...vert_during_rebase_when_stopped_on_edit.go | 8 +-- ..._multiple_commits_in_interactive_rebase.go | 10 ++-- ...ert_single_commit_in_interactive_rebase.go | 10 ++-- .../reword_commit_with_editor_and_fail.go | 4 +- .../reword_you_are_here_commit.go | 8 +-- .../reword_you_are_here_commit_with_editor.go | 8 +-- .../tests/interactive_rebase/shared.go | 4 +- .../interactive_rebase/show_exec_todos.go | 8 +-- .../swap_in_rebase_with_conflict.go | 8 +-- .../swap_in_rebase_with_conflict_and_edit.go | 8 +-- .../view_files_of_todo_entries.go | 4 +- .../sync/pull_rebase_interactive_conflict.go | 4 +- .../pull_rebase_interactive_conflict_drop.go | 8 +-- 54 files changed, 195 insertions(+), 195 deletions(-) diff --git a/pkg/gui/context/list_renderer.go b/pkg/gui/context/list_renderer.go index 35e0b26ef..59a128457 100644 --- a/pkg/gui/context/list_renderer.go +++ b/pkg/gui/context/list_renderer.go @@ -11,7 +11,7 @@ import ( ) func formatListSectionHeader(label string) string { - return fmt.Sprintf("--- %s ---", label) + return fmt.Sprintf("─── %s", label) } type NonModelItem struct { diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index ff17d6417..2e8ef5c39 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -53,11 +53,11 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Focus(). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp(`pick.*to keep`).IsSelected(), MatchesRegexp(`pick.*to remove`), MatchesRegexp(`pick.*CONFLICT.*first change`), - Contains("--- Commits ---"), + Contains("─── Commits"), MatchesRegexp("second-change-branch unrelated change"), MatchesRegexp("second change"), MatchesRegexp("original"), @@ -65,11 +65,11 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Universal.Remove). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp(`pick.*to keep`), MatchesRegexp(`drop.*to remove`).IsSelected(), MatchesRegexp(`pick.*CONFLICT.*first change`), - Contains("--- Commits ---"), + Contains("─── Commits"), MatchesRegexp("second-change-branch unrelated change"), MatchesRegexp("second change"), MatchesRegexp("original"), diff --git a/pkg/integration/tests/branch/show_divergence_from_base_branch.go b/pkg/integration/tests/branch/show_divergence_from_base_branch.go index 2903b7837..1ff9edca0 100644 --- a/pkg/integration/tests/branch/show_divergence_from_base_branch.go +++ b/pkg/integration/tests/branch/show_divergence_from_base_branch.go @@ -37,9 +37,9 @@ var ShowDivergenceFromBaseBranch = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Title(Contains("Commits (feature <-> master)")). Lines( - DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"), Contains("↓").Contains("master 3"), - DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Local"), Contains("↑").Contains("feature 2"), Contains("↑").Contains("feature 1"), ) diff --git a/pkg/integration/tests/branch/show_divergence_from_upstream.go b/pkg/integration/tests/branch/show_divergence_from_upstream.go index 8aff21ca9..91e068cef 100644 --- a/pkg/integration/tests/branch/show_divergence_from_upstream.go +++ b/pkg/integration/tests/branch/show_divergence_from_upstream.go @@ -44,10 +44,10 @@ var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Title(Contains("Commits (master <-> origin/master)")). Lines( - DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Remote"), Contains("↓").Contains("three"), Contains("↓").Contains("two"), - DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"), + DoesNotContainAnyOf("↓", "↑").Contains("─── Local"), Contains("↑").Contains("four"), ) }, diff --git a/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go b/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go index 5b446fcb8..ced13ed20 100644 --- a/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go +++ b/pkg/integration/tests/branch/show_divergence_from_upstream_no_divergence.go @@ -27,8 +27,8 @@ var ShowDivergenceFromUpstreamNoDivergence = NewIntegrationTest(NewIntegrationTe IsFocused(). Title(Contains("Commits (master <-> origin/master)")). Lines( - Contains("--- Remote ---"), - Contains("--- Local ---"), + Contains("─── Remote"), + Contains("─── Local"), ) }, }) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go index a14dbe7c9..e46626360 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go @@ -60,9 +60,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(" CI one").IsSelected(), Contains(" CI base"), ). @@ -77,9 +77,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(DoesNotContain("commit copied")) }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(" CI three"), Contains(" CI one").IsSelected(), Contains(" CI base"), diff --git a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go index acc2f389c..7b8bf1ca1 100644 --- a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go +++ b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go @@ -29,10 +29,10 @@ var AmendWhenThereAreConflictsAndAmend = NewIntegrationTest(NewIntegrationTestAr t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go index f7f5ec2e1..91eff7d59 100644 --- a/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go +++ b/pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go @@ -33,10 +33,10 @@ var AmendWhenThereAreConflictsAndCancel = NewIntegrationTest(NewIntegrationTestA t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go b/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go index cbbd8accd..6e25a8496 100644 --- a/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go +++ b/pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go @@ -44,10 +44,10 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg Confirm() }). Lines( - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI unrelated change"), Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ add second line"), Contains("CI ○ add first line"), Contains("CI ○ unrelated change"), diff --git a/pkg/integration/tests/commit/revert_with_conflict_single_commit.go b/pkg/integration/tests/commit/revert_with_conflict_single_commit.go index 1a0669b10..57679160d 100644 --- a/pkg/integration/tests/commit/revert_with_conflict_single_commit.go +++ b/pkg/integration/tests/commit/revert_with_conflict_single_commit.go @@ -39,9 +39,9 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ add second line"), Contains("CI ○ add first line"), Contains("CI ○ add empty file"), diff --git a/pkg/integration/tests/commit/shared.go b/pkg/integration/tests/commit/shared.go index 918197aaf..e143eb7a0 100644 --- a/pkg/integration/tests/commit/shared.go +++ b/pkg/integration/tests/commit/shared.go @@ -43,10 +43,10 @@ func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) { t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit three"), Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit two"), Contains("file1 changed in master"), Contains("base commit"), diff --git a/pkg/integration/tests/filter_and_search/filter_menu.go b/pkg/integration/tests/filter_and_search/filter_menu.go index e5b6b216e..9b6eed8a1 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu.go +++ b/pkg/integration/tests/filter_and_search/filter_menu.go @@ -26,7 +26,7 @@ var FilterMenu = NewIntegrationTest(NewIntegrationTestArgs{ Filter("Ignore"). Lines( // menu has filtered down to the one item that matches the filter - Contains(`--- Local ---`), + Contains(`─── Local`), Contains(`Ignore`).IsSelected(), ). Confirm() diff --git a/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go b/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go index 957ca5c6a..54105b77e 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_by_keybinding.go @@ -21,7 +21,7 @@ var FilterMenuByKeybinding = NewIntegrationTest(NewIntegrationTestArgs{ Filter("@_"). Lines( // menu has filtered down to the one item that matches the filter - Contains("--- Global ---"), + Contains("─── Global"), Contains("_ Prev screen mode").IsSelected(), ). Confirm() diff --git a/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go b/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go index daf55fd0d..2ed81926e 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go @@ -20,7 +20,7 @@ var FilterMenuCancelFilterWithEscape = NewIntegrationTest(NewIntegrationTestArgs Filter("Ignore"). Lines( // menu has filtered down to the one item that matches the filter - Contains(`--- Local ---`), + Contains(`─── Local`), Contains(`Ignore`).IsSelected(), ) diff --git a/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go b/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go index 522ee7689..66718e822 100644 --- a/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go +++ b/pkg/integration/tests/filter_and_search/filter_menu_with_no_keybindings.go @@ -25,7 +25,7 @@ var FilterMenuWithNoKeybindings = NewIntegrationTest(NewIntegrationTestArgs{ Lines( // menu has filtered down to the one item that matches the // filter, and it doesn't have a keybinding - Equals("--- Global ---"), + Equals("─── Global"), Equals("Toggle whitespace").IsSelected(), ) }, diff --git a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go index 1162a20c7..4936fc38e 100644 --- a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go @@ -45,25 +45,25 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). IsFocused(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains(TOP_COMMIT), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(BASE_COMMIT), ). NavigateToLine(Contains(TOP_COMMIT)). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains(TOP_COMMIT).Contains("edit"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(BASE_COMMIT), ). Tap(func() { t.Common().ContinueRebase() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), Contains(TOP_COMMIT), Contains(BASE_COMMIT), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go b/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go index ef01739dc..497db50d7 100644 --- a/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go @@ -34,10 +34,10 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().AcknowledgeConflicts() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), Contains("fixup").Contains("<-- CONFLICT --- fixup! two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("two"), Contains("one"), ) @@ -68,9 +68,9 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("<-- CONFLICT --- three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("two"), Contains("one"), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go index 0ca3ffaaa..9663a23e5 100644 --- a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go @@ -24,9 +24,9 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ) @@ -50,9 +50,9 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go index 3e4df1404..740407dd5 100644 --- a/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go @@ -24,9 +24,9 @@ var AmendNonHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02"), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go index 86b2ed950..1ae68666d 100644 --- a/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go @@ -26,14 +26,14 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-06"), Contains("pick").Contains("CI commit-05"), Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), Contains("pick").Contains("CI commit-03"), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ commit-01"), ). NavigateToLine(Contains("update-ref")). @@ -45,13 +45,13 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-06"), Contains("pick").Contains("CI commit-05"), Contains("pick").Contains("CI commit-04"), Contains("pick").Contains("CI commit-03").IsSelected(), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ commit-01"), ). NavigateToLine(Contains("commit-02")). diff --git a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go index 1b8674593..da6f9dd85 100644 --- a/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go +++ b/pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go @@ -41,14 +41,14 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-04")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-09"), Contains("pick").Contains("CI commit-08"), Contains("pick").Contains("CI commit-07"), Contains("update-ref").Contains("branch2"), Contains("pick").Contains("CI commit-06"), // no star on this entry, even though branch2 points to it Contains("pick").Contains("CI commit-05"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-04"), Contains("CI commit-03"), Contains("CI * commit-02"), // this star is fine though diff --git a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go index 9fb450afe..90208c95d 100644 --- a/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go +++ b/pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go @@ -39,14 +39,14 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-07"), Contains("pick").Contains("CI commit-06"), Contains("pick").Contains("CI commit-05"), Contains("update-ref").Contains("branch1").DoesNotContain("*"), Contains("pick").Contains("CI commit-04"), Contains("pick").Contains("CI commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-02").IsSelected(), Contains("CI commit-01"), ). diff --git a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go index 3045a5088..c340c83f3 100644 --- a/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go +++ b/pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go @@ -25,9 +25,9 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/edit_first_commit.go b/pkg/integration/tests/interactive_rebase/edit_first_commit.go index 2ba657370..8eca4e772 100644 --- a/pkg/integration/tests/interactive_rebase/edit_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/edit_first_commit.go @@ -24,9 +24,9 @@ var EditFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01").IsSelected(), ). Tap(func() { diff --git a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go index 7db9bb262..87cdf4be1 100644 --- a/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go +++ b/pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go @@ -37,11 +37,11 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-03")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-05"), Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI * commit-03").IsSelected(), Contains("CI commit-02"), Contains("CI commit-01"), diff --git a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go index 00f77594e..bedad3ec9 100644 --- a/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go @@ -23,8 +23,8 @@ var EditNonTodoCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), Contains("commit-02"), Contains("commit-01"), ). diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go index a57ab8acd..e5de3ab38 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go @@ -27,10 +27,10 @@ var EditRangeSelectDownToMergeOutsideRebase = NewIntegrationTest(NewIntegrationT Press(keys.Universal.RangeSelectDown). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("edit CI commit-02").IsSelected(), Contains("edit CI commit-01").IsSelected(), - Contains("--- Commits ---").IsSelected(), + Contains("─── Commits").IsSelected(), Contains(" CI ◎─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(), Contains(" CI │ ○ * second-change-branch unrelated change"), Contains(" CI │ ○ second change"), diff --git a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go index f39ab638c..f38703fc2 100644 --- a/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go +++ b/pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go @@ -37,13 +37,13 @@ var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("merge CI Merge branch 'second-change-branch' into first-change-branch").IsSelected(), Contains("edit CI first change").IsSelected(), Contains("edit CI * second-change-branch unrelated change").IsSelected(), Contains("edit CI second change").IsSelected(), Contains("edit CI * original").IsSelected(), - Contains("--- Commits ---").IsSelected(), + Contains("─── Commits").IsSelected(), Contains(" CI ○ three").IsSelected(), Contains(" CI ○ two"), Contains(" CI ○ one"), diff --git a/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go b/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go index 5e03acdd5..81ddf685a 100644 --- a/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go +++ b/pkg/integration/tests/interactive_rebase/edit_the_confl_commit.go @@ -32,10 +32,10 @@ var EditTheConflCommit = NewIntegrationTest(NewIntegrationTestArgs{ }). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit two"), Contains("pick").Contains("<-- CONFLICT --- commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). NavigateToLine(Contains("<-- CONFLICT --- commit three")). diff --git a/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go b/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go index 595968c17..e040905fe 100644 --- a/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go +++ b/pkg/integration/tests/interactive_rebase/fixup_keep_message_rebase.go @@ -28,20 +28,20 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("First Commit")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("pick CI Second Commit"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit").IsSelected(), ). // Mark second commit as fixup NavigateToLine(Contains("Second Commit")). Press(keys.Commits.MarkCommitAsFixup). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("fixup CI Second Commit").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit"), ). // Now set the -C flag using the SetFixupMessage keybinding @@ -53,10 +53,10 @@ var FixupKeepMessageRebase = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick CI Third Commit"), Contains("fixup -C CI Second Commit").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("First Commit"), ). // Continue the rebase diff --git a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go index de0bb28d0..d0053a5c7 100644 --- a/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go +++ b/pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go @@ -32,11 +32,11 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), // No update-ref todo for branch1 here, even though command-line git would have added it Contains("pick").Contains("CI commit-03"), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go b/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go index 5b341e61c..6771080d2 100644 --- a/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go +++ b/pkg/integration/tests/interactive_rebase/interactive_rebase_with_conflict_for_edit_command.go @@ -52,9 +52,9 @@ var InteractiveRebaseWithConflictForEditCommand = NewIntegrationTest(NewIntegrat t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("edit").Contains("<-- CONFLICT --- this will conflict").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-03"), Contains("commit-02"), Contains("commit-01"), diff --git a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go index 95dab3056..e5ce2387e 100644 --- a/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go +++ b/pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go @@ -24,13 +24,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ // Start a rebase Press(keys.Universal.Edit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("pick").Contains("commit-07"), Contains("pick").Contains("commit-06"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05").IsSelected(), Contains("commit-04"), ). @@ -38,73 +38,73 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ // perform various actions on a range of commits Press(keys.Universal.RangeSelectUp). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("pick").Contains("commit-07").IsSelected(), Contains("pick").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.MarkCommitAsFixup). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("fixup").Contains("commit-07").IsSelected(), Contains("fixup").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.PickCommit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("pick").Contains("commit-07").IsSelected(), Contains("pick").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Universal.Edit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("edit").Contains("commit-07").IsSelected(), Contains("edit").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.SquashDown). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.MoveDownCommit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). @@ -113,37 +113,37 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ }). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), Contains("pick").Contains("commit-08"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-10"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). Press(keys.Commits.MoveUpCommit). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). @@ -152,13 +152,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("squash").Contains("commit-07").IsSelected(), Contains("squash").Contains("commit-06").IsSelected(), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-05"), Contains("commit-04"), ). @@ -167,13 +167,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-08")). Press(keys.Universal.RangeSelectDown). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("squash").Contains("commit-07"), Contains("squash").Contains("commit-06"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08").IsSelected(), - Contains("--- Commits ---").IsSelected(), + Contains("─── Commits").IsSelected(), Contains("commit-05").IsSelected(), Contains("commit-04"), ). @@ -182,13 +182,13 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: When rebasing, this action only works on a selection of TODO commits.")) }). TopLines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("squash").Contains("commit-07"), Contains("squash").Contains("commit-06"), Contains("pick").Contains("commit-10"), Contains("pick").Contains("commit-09"), Contains("pick").Contains("commit-08").IsSelected(), - Contains("--- Commits ---").IsSelected(), + Contains("─── Commits").IsSelected(), Contains("commit-05").IsSelected(), Contains("commit-04"), ). diff --git a/pkg/integration/tests/interactive_rebase/move_in_rebase.go b/pkg/integration/tests/interactive_rebase/move_in_rebase.go index 9138839b6..5e518c1a2 100644 --- a/pkg/integration/tests/interactive_rebase/move_in_rebase.go +++ b/pkg/integration/tests/interactive_rebase/move_in_rebase.go @@ -25,30 +25,30 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-03"), Contains("commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-02").IsSelected(), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-02").IsSelected(), Contains("commit-04"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). // assert we can't move past the top @@ -57,29 +57,29 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-02").IsSelected(), Contains("commit-04"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-02").IsSelected(), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). Press(keys.Commits.MoveDownCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-03"), Contains("commit-02").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). // assert we can't move past the bottom @@ -88,21 +88,21 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectToast(Contains("Disabled: Cannot move any further")) }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-03"), Contains("commit-02").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). // move it back up one so that we land in a different order than we started with Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-02").IsSelected(), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01"), ). Tap(func() { diff --git a/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go b/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go index 16e58e18e..1c1eead5d 100644 --- a/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go +++ b/pkg/integration/tests/interactive_rebase/move_todo_down_with_rapid_keypresses.go @@ -38,11 +38,11 @@ var MoveTodoDownWithRapidKeypresses = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-04"), Contains("commit-03"), Contains("commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-01").IsSelected(), ). NavigateToLine(Contains("commit-04")). diff --git a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go index c730fd995..cd715fa24 100644 --- a/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go +++ b/pkg/integration/tests/interactive_rebase/move_update_ref_todo.go @@ -26,28 +26,28 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-01")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-06"), Contains("pick").Contains("CI commit-05"), Contains("pick").Contains("CI commit-04"), Contains("update-ref").Contains("branch1"), Contains("pick").Contains("CI commit-03"), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ commit-01"), ). NavigateToLine(Contains("update-ref")). Press(keys.Commits.MoveUpCommit). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-06"), Contains("update-ref").Contains("branch1"), Contains("pick").Contains("CI commit-05"), Contains("pick").Contains("CI commit-04"), Contains("pick").Contains("CI commit-03"), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ commit-01"), ). Tap(func() { diff --git a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go index af948b7cd..0822eee14 100644 --- a/pkg/integration/tests/interactive_rebase/pick_rescheduled.go +++ b/pkg/integration/tests/interactive_rebase/pick_rescheduled.go @@ -26,10 +26,10 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), Contains("pick").Contains("two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("one").IsSelected(), ). Tap(func() { @@ -41,9 +41,9 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("two"), Contains("one"), ) diff --git a/pkg/integration/tests/interactive_rebase/quick_start.go b/pkg/integration/tests/interactive_rebase/quick_start.go index 07baa0616..da7020b20 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start.go +++ b/pkg/integration/tests/interactive_rebase/quick_start.go @@ -73,10 +73,10 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ // Verify quick start picks the last commit on the main branch Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("feature-branch two").IsSelected(), Contains("feature-branch one"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("last main commit"), Contains("initial commit"), ). @@ -106,9 +106,9 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("branch-with-merge three").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("Merge branch 'branch-to-merge'"), Contains("branch-to-merge two"), Contains("branch-to-merge one"), diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go index 4d045c8fc..7189e0d37 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go @@ -39,7 +39,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-07"), Contains("pick").Contains("CI commit-06"), Contains("pick").Contains("CI commit-05"), @@ -47,7 +47,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{ Contains("pick").Contains("CI commit-04"), Contains("pick").Contains("CI commit-03"), Contains("CI commit-02").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go index 4d25a883c..1bc7758f8 100644 --- a/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go +++ b/pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go @@ -43,7 +43,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("CI commit-07"), Contains("CI commit-06"), Contains("update-ref").Contains("branch2"), @@ -52,7 +52,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{ Contains("update-ref").Contains("branch1").IsSelected(), Contains("CI commit-03").IsSelected(), Contains("CI commit-02").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-01"), ) }, diff --git a/pkg/integration/tests/interactive_rebase/rebase.go b/pkg/integration/tests/interactive_rebase/rebase.go index e1940ff7a..d829abf9a 100644 --- a/pkg/integration/tests/interactive_rebase/rebase.go +++ b/pkg/integration/tests/interactive_rebase/rebase.go @@ -34,60 +34,60 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("first commit to edit")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("pick.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit").IsSelected(), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Commits.SquashDown). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("pick.*second commit to edit"), MatchesRegexp("squash.*commit to squash").IsSelected(), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("pick.*commit to drop"), MatchesRegexp("edit.*second commit to edit").IsSelected(), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Universal.Remove). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("pick.*commit to fixup"), MatchesRegexp("drop.*commit to drop").IsSelected(), MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). SelectPreviousItem(). Press(keys.Commits.MarkCommitAsFixup). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("fixup.*commit to fixup").IsSelected(), MatchesRegexp("drop.*commit to drop"), MatchesRegexp("edit.*second commit to edit"), MatchesRegexp("squash.*commit to squash"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("first commit to edit"), Contains("initial commit"), ). @@ -95,10 +95,10 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().ContinueRebase() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), MatchesRegexp("fixup.*commit to fixup").IsSelected(), MatchesRegexp("drop.*commit to drop"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("second commit to edit"), MatchesRegexp("first commit to edit"), Contains("initial commit"), diff --git a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go index 44a39200b..3024e39da 100644 --- a/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go +++ b/pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go @@ -30,9 +30,9 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA NavigateToLine(Contains("commit-03")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-04"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-03").IsSelected(), Contains("commit-02"), Contains("commit-01"), @@ -49,9 +49,9 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit-04"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(`Revert "commit-01"`), Contains(`Revert "commit-02"`), Contains("commit-03"), diff --git a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go index 2cb0c05b7..da3285f04 100644 --- a/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go @@ -50,13 +50,13 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("CI unrelated change 3"), Contains("CI unrelated change 2"), - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI unrelated change 1"), Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ add second line"), Contains("CI ○ add first line"), Contains("CI ○ unrelated change 1"), @@ -83,10 +83,10 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI unrelated change 3"), Contains("pick").Contains("CI unrelated change 2"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(`CI ○ Revert "unrelated change 1"`), Contains(`CI ○ Revert "add first line"`), Contains("CI ○ add second line"), diff --git a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go index 2b0ee24b2..722fa95f2 100644 --- a/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go @@ -45,12 +45,12 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes Cancel() // stay in commits panel }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("CI unrelated change 2"), Contains("CI unrelated change 1"), - Contains("--- Pending reverts ---"), + Contains("─── Pending reverts"), Contains("revert").Contains("CI <-- CONFLICT --- add first line"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ add second line"), Contains("CI ○ add first line").IsSelected(), Contains("CI ○ add empty file"), @@ -84,10 +84,10 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI unrelated change 2"), Contains("pick").Contains("CI unrelated change 1"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains(`CI ○ Revert "add first line"`), Contains("CI ○ add second line"), Contains("CI ○ add first line"), diff --git a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go index b8cf20ae8..8a58be2f8 100644 --- a/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go +++ b/pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go @@ -33,9 +33,9 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go index bd58ab083..ef34b1844 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go @@ -25,9 +25,9 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ). @@ -41,9 +41,9 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{ Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("renamed 02").IsSelected(), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go index 5406ed02b..a4a19f42f 100644 --- a/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go +++ b/pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go @@ -27,9 +27,9 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs NavigateToLine(Contains("commit-02")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit-02").IsSelected(), Contains("commit-01"), ). @@ -41,9 +41,9 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("renamed 02").IsSelected(), Contains("commit-01"), ) diff --git a/pkg/integration/tests/interactive_rebase/shared.go b/pkg/integration/tests/interactive_rebase/shared.go index ea6626fd6..d1d80fafb 100644 --- a/pkg/integration/tests/interactive_rebase/shared.go +++ b/pkg/integration/tests/interactive_rebase/shared.go @@ -9,10 +9,10 @@ func handleConflictsFromSwap(t *TestDriver, expectedCommand string) { t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("commit two"), Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ) diff --git a/pkg/integration/tests/interactive_rebase/show_exec_todos.go b/pkg/integration/tests/interactive_rebase/show_exec_todos.go index fad0e44e8..3873f3ab4 100644 --- a/pkg/integration/tests/interactive_rebase/show_exec_todos.go +++ b/pkg/integration/tests/interactive_rebase/show_exec_todos.go @@ -31,10 +31,10 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("Rebasing (2/4)Executing: false")).Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("exec").Contains("false"), Contains("pick").Contains("CI commit-03"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI ○ commit-02"), Contains("CI ○ commit-01"), ). @@ -43,8 +43,8 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("exit status 1")).Confirm() }). Lines( - Contains("--- Pending rebase todos ---"), - Contains("--- Commits ---"), + Contains("─── Pending rebase todos"), + Contains("─── Commits"), Contains("CI ○ commit-03"), Contains("CI ○ commit-02"), Contains("CI ○ commit-01"), diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go index f6653f9b0..20b77c03f 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -29,19 +29,19 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit three"), Contains("commit two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one").IsSelected(), ). SelectPreviousItem(). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit two").IsSelected(), Contains("commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). Tap(func() { diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go index f5beb4374..1e9ff4934 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go @@ -29,19 +29,19 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("commit one")). Press(keys.Universal.Edit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit three"), Contains("commit two"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one").IsSelected(), ). NavigateToLine(Contains("commit two")). Press(keys.Commits.MoveUpCommit). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("commit two").IsSelected(), Contains("commit three"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("commit one"), ). NavigateToLine(Contains("commit three")). diff --git a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go index 3746633c7..607f94eed 100644 --- a/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go +++ b/pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go @@ -28,11 +28,11 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{ Focus(). Press(keys.Commits.StartInteractiveRebase). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("CI commit-03").IsSelected(), Contains("update-ref").Contains("branch1"), Contains("pick").Contains("CI commit-02"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("CI commit-01"), ). Press(keys.Universal.GoInto) diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go index 2bb39e14f..050ae2e2f 100644 --- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go @@ -48,10 +48,10 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("five"), Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"), diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go index ad7a4806f..707564a8d 100644 --- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go @@ -49,20 +49,20 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg t.Views().Commits(). Focus(). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("pick").Contains("five").IsSelected(), Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"), ). Press(keys.Universal.Remove). Lines( - Contains("--- Pending rebase todos ---"), + Contains("─── Pending rebase todos"), Contains("drop").Contains("five").IsSelected(), Contains("pick").Contains("CONFLICT").Contains("four"), - Contains("--- Commits ---"), + Contains("─── Commits"), Contains("three"), Contains("two"), Contains("one"),