sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

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

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