mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove the "YOU ARE HERE" marker

Browse source 
Now that we have sections, it is no longer needed.

Keep the "<-- CONFLICTS" marker though.
This commit is contained in:
Stefan Haller 2025-04-05 13:43:50 +02:00
parent 6cbc1e0ace
commit 74054c9d70
37 changed files with 75 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/gui/context/local_commits_context.go
View file

@ -41,7 +41,6 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
}
}
showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh.CanShowTodos()
hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs()
return presentation.GetCommitListDisplayStrings(
@ -63,7 +62,6 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
endIdx,
shouldShowGraph(c),
c.Model().BisectInfo,
showYouAreHereLabel,
)
}

1
pkg/gui/context/sub_commits_context.go
View file

@ -77,7 +77,6 @@ func NewSubCommitsContext(
endIdx,
shouldShowGraph(c),
git_commands.NewNullBisectInfo(),
false,
)
}

18
pkg/gui/presentation/commits.go
View file

@ -56,7 +56,6 @@ func GetCommitListDisplayStrings(
endIdx int,
showGraph bool,
bisectInfo *git_commands.BisectInfo,
showYouAreHereLabel bool,
) [][]string {
mutex.Lock()
defer mutex.Unlock()
@ -185,11 +184,6 @@ func GetCommitListDisplayStrings(
for i, commit := range filteredCommits {
unfilteredIdx := i + startIdx
bisectStatus = getBisectStatus(unfilteredIdx, commit.Hash, bisectInfo, bisectBounds)
isYouAreHereCommit := false
if showYouAreHereLabel && (commit.Status == models.StatusConflicted || unfilteredIdx == rebaseOffset) {
isYouAreHereCommit = true
showYouAreHereLabel = false
}
isMarkedBaseCommit := commit.Hash != "" && commit.Hash == markedBaseCommit
if isMarkedBaseCommit {
willBeRebased = true
@ -211,7 +205,6 @@ func GetCommitListDisplayStrings(
fullDescription,
bisectStatus,
bisectInfo,
isYouAreHereCommit,
))
}
return lines
@ -364,7 +357,6 @@ func displayCommit(
fullDescription bool,
bisectStatus BisectStatus,
bisectInfo *git_commands.BisectInfo,
isYouAreHereCommit bool,
) []string {
bisectString := getBisectStatusText(bisectStatus, bisectInfo)
@ -427,14 +419,8 @@ func displayCommit(
}
mark := ""
if isYouAreHereCommit {
color := style.FgYellow
text := common.Tr.YouAreHere
if commit.Status == models.StatusConflicted {
color = style.FgRed
text = common.Tr.ConflictLabel
}
youAreHere := color.Sprintf("<-- %s ---", text)
if commit.Status == models.StatusConflicted {
youAreHere := style.FgRed.Sprintf("<-- %s ---", common.Tr.ConflictLabel)
mark = fmt.Sprintf("%s ", youAreHere)
} else if isMarkedBaseCommit {
rebaseFromHere := style.FgYellow.Sprint(common.Tr.MarkedCommitMarker)

39
pkg/gui/presentation/commits_test.go
View file

@ -40,7 +40,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
endIdx int
showGraph bool
bisectInfo *git_commands.BisectInfo
showYouAreHereLabel bool
expected string
focus bool
}{
@ -223,12 +222,11 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash1 pick commit1
hash2 pick commit2
hash3 ◯ <-- YOU ARE HERE --- commit3
hash3 ◯ commit3
hash4 ◯ commit4
hash5 ◯ commit5
`),
@ -247,11 +245,10 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash2 pick commit2
hash3 ◯ <-- YOU ARE HERE --- commit3
hash3 ◯ commit3
hash4 ◯ commit4
hash5 ◯ commit5
`),
@ -270,7 +267,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash4 ◯ commit4
@ -291,7 +287,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash1 pick commit1
@ -312,7 +307,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash5 ◯ commit5
@ -332,33 +326,12 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: true,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash1 pick commit1
hash2 pick commit2
`),
},
{
testName: "don't show YOU ARE HERE label when not asked for (e.g. in branches panel)",
commits: []*models.Commit{
{Name: "commit1", Hash: "hash1", Parents: []string{"hash2"}, Action: todo.Pick},
{Name: "commit2", Hash: "hash2", Parents: []string{"hash3"}},
{Name: "commit3", Hash: "hash3", Parents: []string{"hash4"}},
},
startIdx: 0,
endIdx: 3,
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
hash1 pick commit1
hash2 ◯ commit2
hash3 ◯ commit3
`),
},
{
testName: "graph in divergence view - all commits visible",
commits: []*models.Commit{
@ -376,7 +349,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↓ hash1r ◯ commit1
@ -406,7 +378,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↓ hash3r ◯ │ commit3
@ -434,7 +405,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↓ hash1r ◯ commit1
@ -461,7 +431,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↑ hash2l ⏣─╮ commit2
@ -487,7 +456,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↓ hash1r ◯ commit1
@ -508,7 +476,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↑ hash1l ◯ commit1
@ -530,7 +497,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
showGraph: true,
bisectInfo: git_commands.NewNullBisectInfo(),
cherryPickedCommitHashSet: set.New[string](),
showYouAreHereLabel: false,
now: time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC),
expected: formatExpected(`
↓ hash1r ◯ commit1
@ -596,7 +562,6 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
s.endIdx,
s.showGraph,
s.bisectInfo,
s.showYouAreHereLabel,
)
renderedLines, _ := utils.RenderDisplayStrings(result, nil)

2
pkg/i18n/english.go
View file

@ -348,7 +348,6 @@ type TranslationSet struct {
PullRequestNoUpstream string
ErrorOccurred string
NoRoom string
YouAreHere string
ConflictLabel string
PendingRebaseTodosSectionHeader string
PendingCherryPicksSectionHeader string
@ -1421,7 +1420,6 @@ func EnglishTranslationSet() *TranslationSet {
PullRequestNoUpstream: "Cannot open a pull request for a branch with no upstream",
ErrorOccurred: "An error occurred! Please create an issue at",
NoRoom: "Not enough room",
YouAreHere: "YOU ARE HERE",
ConflictLabel: "CONFLICT",
PendingRebaseTodosSectionHeader: "Pending rebase todos",
PendingCherryPicksSectionHeader: "Pending cherry-picks",

4
pkg/integration/tests/cherry_pick/cherry_pick_during_rebase.go
View file

@ -62,7 +62,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("pick CI two"),
Contains("--- Commits ---"),
Contains(" CI <-- YOU ARE HERE --- one").IsSelected(),
Contains(" CI one").IsSelected(),
Contains(" CI base"),
).
Press(keys.Commits.PasteCommits).
@ -79,7 +79,7 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("pick CI two"),
Contains("--- Commits ---"),
Contains(" CI <-- YOU ARE HERE --- three"),
Contains(" CI three"),
Contains(" CI one"),
Contains(" CI base"),
).

6
pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go
View file

@ -48,7 +48,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains(TOP_COMMIT),
Contains("--- Commits ---"),
Contains(BASE_COMMIT).Contains("YOU ARE HERE"),
Contains(BASE_COMMIT),
).
NavigateToLine(Contains(TOP_COMMIT)).
Press(keys.Universal.Edit).
@ -56,7 +56,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains(TOP_COMMIT).Contains("edit"),
Contains("--- Commits ---"),
Contains(BASE_COMMIT).Contains("YOU ARE HERE"),
Contains(BASE_COMMIT),
).
Tap(func() {
t.Common().ContinueRebase()
@ -64,7 +64,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
Lines(
Contains("--- Pending rebase todos ---"),
Contains("--- Commits ---"),
Contains(TOP_COMMIT).Contains("YOU ARE HERE"),
Contains(TOP_COMMIT),
Contains(BASE_COMMIT),
)
},

4
pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go
View file

@ -27,7 +27,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
)
@ -53,7 +53,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
)

2
pkg/integration/tests/interactive_rebase/amend_non_head_commit_during_rebase.go
View file

@ -27,7 +27,7 @@ var AmendNonHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02"),
Contains("commit 02"),
Contains("commit 01"),
)

4
pkg/integration/tests/interactive_rebase/delete_update_ref_todo.go
View file

@ -34,7 +34,7 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03"),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
Contains("CI ◯ commit 01"),
).
NavigateToLine(Contains("update-ref")).
Press(keys.Universal.Remove).
@ -52,7 +52,7 @@ var DeleteUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03").IsSelected(),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
Contains("CI ◯ commit 01"),
).
NavigateToLine(Contains("commit 02")).
Press(keys.Universal.Remove).

2
pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go
View file

@ -49,7 +49,7 @@ var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{
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("CI <-- YOU ARE HERE --- commit 04"),
Contains("CI commit 04"),
Contains("CI commit 03"),
Contains("CI * commit 02"), // this star is fine though
Contains("CI commit 01"),

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

@ -47,7 +47,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 04"),
Contains("pick").Contains("CI commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("CI commit 02").IsSelected(),
Contains("CI commit 01"),
).
Tap(func() {

2
pkg/integration/tests/interactive_rebase/edit_and_auto_amend.go
View file

@ -28,7 +28,7 @@ var EditAndAutoAmend = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
)

2
pkg/integration/tests/interactive_rebase/edit_first_commit.go
View file

@ -27,7 +27,7 @@ var EditFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 02"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*commit 01").IsSelected(),
Contains("commit 01").IsSelected(),
).
Tap(func() {
t.Common().ContinueRebase()

2
pkg/integration/tests/interactive_rebase/edit_last_commit_of_stacked_branch.go
View file

@ -42,7 +42,7 @@ var EditLastCommitOfStackedBranch = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 04"),
Contains("update-ref").Contains("branch1"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- * commit 03").IsSelected(),
Contains("CI * commit 03").IsSelected(),
Contains("CI commit 02"),
Contains("CI commit 01"),
)

2
pkg/integration/tests/interactive_rebase/edit_non_todo_commit_during_rebase.go
View file

@ -25,7 +25,7 @@ var EditNonTodoCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Lines(
Contains("--- Pending rebase todos ---"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02"),
Contains("commit 02"),
Contains("commit 01"),
).
NavigateToLine(Contains("commit 01")).

2
pkg/integration/tests/interactive_rebase/edit_range_select_down_to_merge_outside_rebase.go
View file

@ -31,7 +31,7 @@ var EditRangeSelectDownToMergeOutsideRebase = NewIntegrationTest(NewIntegrationT
Contains("edit CI commit 02").IsSelected(),
Contains("edit CI commit 01").IsSelected(),
Contains("--- Commits ---").IsSelected(),
Contains(" CI ⏣─╮ <-- YOU ARE HERE --- Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
Contains(" CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
Contains(" CI │ ◯ * second-change-branch unrelated change"),
Contains(" CI │ ◯ second change"),
Contains(" CI ◯ │ first change"),

2
pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go
View file

@ -44,7 +44,7 @@ var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("edit CI second change").IsSelected(),
Contains("edit CI * original").IsSelected(),
Contains("--- Commits ---").IsSelected(),
Contains(" CI ◯ <-- YOU ARE HERE --- three").IsSelected(),
Contains(" CI ◯ three").IsSelected(),
Contains(" CI ◯ two"),
Contains(" CI ◯ one"),
)

2
pkg/integration/tests/interactive_rebase/interactive_rebase_of_copied_branch.go
View file

@ -37,7 +37,7 @@ var InteractiveRebaseOfCopiedBranch = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03"),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI <-- YOU ARE HERE --- commit 01"),
Contains("CI commit 01"),
)
},
})

26
pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go
View file

@ -31,7 +31,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 07"),
Contains("pick").Contains("commit 06"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
Contains("commit 05").IsSelected(),
Contains("commit 04"),
).
SelectPreviousItem().
@ -45,7 +45,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 07").IsSelected(),
Contains("pick").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.MarkCommitAsFixup).
@ -57,7 +57,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("fixup").Contains("commit 07").IsSelected(),
Contains("fixup").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.PickCommit).
@ -69,7 +69,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 07").IsSelected(),
Contains("pick").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Universal.Edit).
@ -81,7 +81,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("edit").Contains("commit 07").IsSelected(),
Contains("edit").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.SquashDown).
@ -93,7 +93,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("squash").Contains("commit 07").IsSelected(),
Contains("squash").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.MoveDownCommit).
@ -105,7 +105,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("squash").Contains("commit 07").IsSelected(),
Contains("squash").Contains("commit 06").IsSelected(),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Tap(func() {
@ -120,7 +120,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("squash").Contains("commit 06").IsSelected(),
Contains("pick").Contains("commit 08"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.MoveUpCommit).
@ -132,7 +132,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 09"),
Contains("pick").Contains("commit 08"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.MoveUpCommit).
@ -144,7 +144,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 09"),
Contains("pick").Contains("commit 08"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
Press(keys.Commits.MoveUpCommit).
@ -159,7 +159,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 09"),
Contains("pick").Contains("commit 08"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 05"),
Contains("commit 05"),
Contains("commit 04"),
).
// Verify we can't perform an action on a range that includes both
@ -174,7 +174,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 09"),
Contains("pick").Contains("commit 08").IsSelected(),
Contains("--- Commits ---").IsSelected(),
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
Contains("commit 05").IsSelected(),
Contains("commit 04"),
).
Press(keys.Commits.MarkCommitAsFixup).
@ -189,7 +189,7 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("commit 09"),
Contains("pick").Contains("commit 08").IsSelected(),
Contains("--- Commits ---").IsSelected(),
Contains("<-- YOU ARE HERE --- commit 05").IsSelected(),
Contains("commit 05").IsSelected(),
Contains("commit 04"),
).
// continue the rebase

18
pkg/integration/tests/interactive_rebase/move_in_rebase.go
View file

@ -30,7 +30,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 03"),
Contains("commit 02"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01").IsSelected(),
Contains("commit 01").IsSelected(),
).
SelectPreviousItem().
Press(keys.Commits.MoveUpCommit).
@ -40,7 +40,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 02").IsSelected(),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
Press(keys.Commits.MoveUpCommit).
Lines(
@ -49,7 +49,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 04"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
// assert we can't move past the top
Press(keys.Commits.MoveUpCommit).
@ -62,7 +62,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 04"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
Press(keys.Commits.MoveDownCommit).
Lines(
@ -71,7 +71,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 02").IsSelected(),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
Press(keys.Commits.MoveDownCommit).
Lines(
@ -80,7 +80,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 03"),
Contains("commit 02").IsSelected(),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
// assert we can't move past the bottom
Press(keys.Commits.MoveDownCommit).
@ -93,7 +93,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 03"),
Contains("commit 02").IsSelected(),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
// move it back up one so that we land in a different order than we started with
Press(keys.Commits.MoveUpCommit).
@ -103,7 +103,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 02").IsSelected(),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
).
Tap(func() {
t.Common().ContinueRebase()
@ -112,7 +112,7 @@ var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit 04"),
Contains("commit 02").IsSelected(),
Contains("commit 03"),
DoesNotContain("YOU ARE HERE").Contains("commit 01"),
Contains("commit 01"),
)
},
})

4
pkg/integration/tests/interactive_rebase/move_update_ref_todo.go
View file

@ -34,7 +34,7 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03"),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
Contains("CI ◯ commit 01"),
).
NavigateToLine(Contains("update-ref")).
Press(keys.Commits.MoveUpCommit).
@ -48,7 +48,7 @@ var MoveUpdateRefTodo = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03"),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 01"),
Contains("CI ◯ commit 01"),
).
Tap(func() {
t.Common().ContinueRebase()

4
pkg/integration/tests/interactive_rebase/pick_rescheduled.go
View file

@ -30,7 +30,7 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("three"),
Contains("pick").Contains("two"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- one").IsSelected(),
Contains("one").IsSelected(),
).
Tap(func() {
t.Shell().CreateFile("file3", "other content\n")
@ -44,7 +44,7 @@ var PickRescheduled = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("pick").Contains("three"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- two"),
Contains("two"),
Contains("one"),
)
},

4
pkg/integration/tests/interactive_rebase/quick_start.go
View file

@ -77,7 +77,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
Contains("feature-branch two").IsSelected(),
Contains("feature-branch one"),
Contains("--- Commits ---"),
Contains("last main commit").Contains("YOU ARE HERE"),
Contains("last main commit"),
Contains("initial commit"),
).
// Try again, verify we fail because we're already rebasing
@ -109,7 +109,7 @@ var QuickStart = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("branch-with-merge three").IsSelected(),
Contains("--- Commits ---"),
Contains("Merge branch 'branch-to-merge'").Contains("YOU ARE HERE"),
Contains("Merge branch 'branch-to-merge'"),
Contains("branch-to-merge two"),
Contains("branch-to-merge one"),
Contains("branch-with-merge two"),

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

@ -48,7 +48,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
Contains("pick").Contains("CI commit 03"),
Contains("CI commit 02").IsSelected(),
Contains("--- Commits ---"),
Contains("CI <-- YOU ARE HERE --- commit 01"),
Contains("CI commit 01"),
)
},
})

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

@ -53,7 +53,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
Contains("CI commit 03").IsSelected(),
Contains("CI commit 02").IsSelected(),
Contains("--- Commits ---"),
Contains("CI <-- YOU ARE HERE --- commit 01"),
Contains("CI commit 01"),
)
},
})

12
pkg/integration/tests/interactive_rebase/rebase.go
View file

@ -40,7 +40,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("pick.*second commit to edit"),
MatchesRegexp("pick.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit").IsSelected(),
Contains("first commit to edit").IsSelected(),
Contains("initial commit"),
).
SelectPreviousItem().
@ -52,7 +52,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("pick.*second commit to edit"),
MatchesRegexp("squash.*commit to squash").IsSelected(),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -64,7 +64,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit").IsSelected(),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -76,7 +76,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit"),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -88,7 +88,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit"),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
Tap(func() {
@ -99,7 +99,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("fixup.*commit to fixup").IsSelected(),
MatchesRegexp("drop.*commit to drop"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*second commit to edit"),
Contains("second commit to edit"),
MatchesRegexp("first commit to edit"),
Contains("initial commit"),
).

4
pkg/integration/tests/interactive_rebase/revert_during_rebase_when_stopped_on_edit.go
View file

@ -33,7 +33,7 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA
Contains("--- Pending rebase todos ---"),
Contains("pick").Contains("commit 04"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 03").IsSelected(),
Contains("commit 03").IsSelected(),
Contains("commit 02"),
Contains("commit 01"),
Contains("master commit 2"),
@ -52,7 +52,7 @@ var RevertDuringRebaseWhenStoppedOnEdit = NewIntegrationTest(NewIntegrationTestA
Contains("--- Pending rebase todos ---"),
Contains("pick").Contains("commit 04"),
Contains("--- Commits ---"),
Contains(`<-- YOU ARE HERE --- Revert "commit 01"`),
Contains(`Revert "commit 01"`),
Contains(`Revert "commit 02"`),
Contains("commit 03"),
Contains("commit 02").IsSelected(),

2
pkg/integration/tests/interactive_rebase/revert_multiple_commits_in_interactive_rebase.go
View file

@ -87,7 +87,7 @@ var RevertMultipleCommitsInInteractiveRebase = NewIntegrationTest(NewIntegration
Contains("pick").Contains("CI unrelated change 3"),
Contains("pick").Contains("CI unrelated change 2"),
Contains("--- Commits ---"),
Contains(`CI ◯ <-- YOU ARE HERE --- Revert "unrelated change 1"`),
Contains(`CI ◯ Revert "unrelated change 1"`),
Contains(`CI ◯ Revert "add first line"`),
Contains("CI ◯ add second line"),
Contains("CI ◯ add first line"),

2
pkg/integration/tests/interactive_rebase/revert_single_commit_in_interactive_rebase.go
View file

@ -88,7 +88,7 @@ var RevertSingleCommitInInteractiveRebase = NewIntegrationTest(NewIntegrationTes
Contains("pick").Contains("CI unrelated change 2"),
Contains("pick").Contains("CI unrelated change 1"),
Contains("--- Commits ---"),
Contains(`CI ◯ <-- YOU ARE HERE --- Revert "add first line"`),
Contains(`CI ◯ Revert "add first line"`),
Contains("CI ◯ add second line"),
Contains("CI ◯ add first line"),
Contains("CI ◯ add empty file"),

2
pkg/integration/tests/interactive_rebase/reword_commit_with_editor_and_fail.go
View file

@ -36,7 +36,7 @@ var RewordCommitWithEditorAndFail = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
)

4
pkg/integration/tests/interactive_rebase/reword_you_are_here_commit.go
View file

@ -28,7 +28,7 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
).
Press(keys.Commits.RenameCommit).
@ -44,7 +44,7 @@ var RewordYouAreHereCommit = NewIntegrationTest(NewIntegrationTestArgs{
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- renamed 02").IsSelected(),
Contains("renamed 02").IsSelected(),
Contains("commit 01"),
)
},

4
pkg/integration/tests/interactive_rebase/reword_you_are_here_commit_with_editor.go
View file

@ -30,7 +30,7 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
Contains("commit 02").IsSelected(),
Contains("commit 01"),
).
Press(keys.Commits.RenameCommitWithEditor).
@ -44,7 +44,7 @@ var RewordYouAreHereCommitWithEditor = NewIntegrationTest(NewIntegrationTestArgs
Contains("--- Pending rebase todos ---"),
Contains("commit 03"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- renamed 02").IsSelected(),
Contains("renamed 02").IsSelected(),
Contains("commit 01"),
)
},

4
pkg/integration/tests/interactive_rebase/show_exec_todos.go
View file

@ -35,7 +35,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{
Contains("exec").Contains("false"),
Contains("pick").Contains("CI commit 03"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 02"),
Contains("CI ◯ commit 02"),
Contains("CI ◯ commit 01"),
).
Tap(func() {
@ -45,7 +45,7 @@ var ShowExecTodos = NewIntegrationTest(NewIntegrationTestArgs{
Lines(
Contains("--- Pending rebase todos ---"),
Contains("--- Commits ---"),
Contains("CI ◯ <-- YOU ARE HERE --- commit 03"),
Contains("CI ◯ commit 03"),
Contains("CI ◯ commit 02"),
Contains("CI ◯ commit 01"),
).

4
pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
View file

@ -33,7 +33,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit three"),
Contains("commit two"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit one").IsSelected(),
Contains("commit one").IsSelected(),
).
SelectPreviousItem().
Press(keys.Commits.MoveUpCommit).
@ -42,7 +42,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit two").IsSelected(),
Contains("commit three"),
Contains("--- Commits ---"),
Contains("YOU ARE HERE").Contains("commit one"),
Contains("commit one"),
).
Tap(func() {
t.Common().ContinueRebase()

4
pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict_and_edit.go
View file

@ -33,7 +33,7 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit three"),
Contains("commit two"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit one").IsSelected(),
Contains("commit one").IsSelected(),
).
NavigateToLine(Contains("commit two")).
Press(keys.Commits.MoveUpCommit).
@ -42,7 +42,7 @@ var SwapInRebaseWithConflictAndEdit = NewIntegrationTest(NewIntegrationTestArgs{
Contains("commit two").IsSelected(),
Contains("commit three"),
Contains("--- Commits ---"),
Contains("<-- YOU ARE HERE --- commit one"),
Contains("commit one"),
).
NavigateToLine(Contains("commit three")).
Press(keys.Universal.Edit).

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

@ -33,7 +33,7 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{
Contains("update-ref").Contains("branch1"),
Contains("pick").Contains("CI commit 02"),
Contains("--- Commits ---"),
Contains("CI <-- YOU ARE HERE --- commit 01"),
Contains("CI commit 01"),
).
Press(keys.Universal.GoInto)