sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Add section headers for rebase todos, cherry-picks, reverts, and actual commits

Browse Source
This commit is contained in:
Stefan Haller
2025-04-04 18:26:33 +02:00
parent 98c19feccf
commit 6cbc1e0ace
46 changed files with 231 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,50 +34,60 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
NavigateToLine(Contains("first commit to edit")).
Press(keys.Universal.Edit).
Lines(
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 ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit").IsSelected(),
Contains("initial commit"),
).
SelectPreviousItem().
Press(keys.Commits.SquashDown).
Lines(
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 ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
Press(keys.Universal.Edit).
Lines(
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 ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
Press(keys.Universal.Remove).
Lines(
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 ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
Press(keys.Commits.MarkCommitAsFixup).
Lines(
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 ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("initial commit"),
).
@ -85,8 +95,10 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
t.Common().ContinueRebase()
}).
Lines(
Contains("--- Pending rebase todos ---"),
MatchesRegexp("fixup.*commit to fixup").IsSelected(),
MatchesRegexp("drop.*commit to drop"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*second commit to edit"),
MatchesRegexp("first commit to edit"),
Contains("initial commit"),