Section headers for rebase todos and actual commits

[stefanhaller]

• PR Description

During interactive rebase, or when stopping with conflicts in a cherry-pick or revert, show section headers for the todo items and the actual commits. This makes it much clearer where the current head commit is. Get rid of the "<-- YOU ARE HERE" marker that we would previously show; it is no longer needed. (We still show the "<-- CONFLICT" marker though.)

For example:

╭─[4]─Commits - Reflog───────────────────────────╮
│--- Pending rebase todos ---                    │
│6562f903 pick  CI commit 03                     │
│--- Commits ---                                 │
│56a04448       CI ◯ commit 02                   │
│6d0c0e41       CI ◯ commit 01                   │

• Please check if the PR fulfills these requirements

• Cheatsheets are up-to-date (run go generate ./...)
• Code has been formatted (see here)
• Tests have been added/updated (see here for the integration test guide)
• Text is internationalised (see here)
• If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
• Docs have been updated if necessary
• You've read through your own file changes for silly mistakes etc

[stefanhaller]

Marking as a draft because two integration tests are failing.

[codacy-production]

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
Report missing for 0dab37a1	✅ 98.21%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (0dab37a)	Report Missing	Report Missing	Report Missing
Head commit (74054c9)	55129	47887	86.86%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#4463)	223	219	98.21%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Footnotes

1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct. ↩

[stefanhaller]

I added a fix for the failing tests; we can discuss if the fix is good enough. Opening for review.

[ruudk]

Nice, could we also use these markers to indicatie where a branch branched of the default branch (main)? That's something I miss in Lazygit.

[stefanhaller]

Nice, could we also use these markers to indicatie where a branch branched of the default branch (main)? That's something I miss in Lazygit.

You can tell by the colors of the hashes; main branch hashes are green, the ones in your branch are either yellow or red, depending on whether they are pushed. I do realize that 10% of the population is color blind in some way, but I feel that section headers would be a bit too strong in this case.

[stefanhaller]

I found a better fix for the failing integration tests (1c107fd), so I dropped the previous band-aid fix (for reference: it was 3a84492).

[jesseduffield]

LGTM!