Reenable lost rebase onto feature from revision grid

[pmiossec]

introduced in v2.44: 324be37
lost in v3.0: a9b7957

but with some improvements:

• Allow rebase only when one commit is selected
• Allow rebase onto when 2 commits are selected but only through "advanced options..."
• Automatically check "Specific range" checkbox when rebase onto
• Improved logic when using "rebase onto" from the "Commands" menu
  • 1st commit selected is the "from" parameter (that determine the range of commits that will be rebased)
  • 2nd commit selected is the "onto" parameter (on which commit it will be rebased)

Screenshots

Before

When more than one commit selected, we can' rebase (even if some dead code was there to handle it)

After

We can do a rebase onto from menu:

or from contextual menu:

Test methodology

• Manual

Test environment(s)

• Git Extensions 33.33.33
• Build 38e120c
• Git 2.40.0.windows.1
• Microsoft Windows NT 10.0.22621.0
• .NET 6.0.15
• DPI 96dpi (no scaling)
• Microsoft.WindowsDesktop.App Versions

    Microsoft.WindowsDesktop.App 6.0.15 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]
    Microsoft.WindowsDesktop.App 7.0.4 [C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App]

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).

---

✒️ I contribute this code under The Developer Certificate of Origin.

[gerhardol]

How to document this so the rebase onto is not a hidden feature?
Describe at the form rather than for Browse?
https://git-extensions-documentation.readthedocs.io/en/release-4.0/modify_history.html?highlight=rebase#interactive-rebase

[pmiossec]

How to document this so the rebase onto is not a hidden feature? Describe at the form rather than for Browse? https://git-extensions-documentation.readthedocs.io/en/release-4.0/modify_history.html?highlight=rebase#interactive-rebase

I have added some documentation in my fork of the documentation repo. You can include it in your PR if you want. Otherwise I will do another PR.

As I don't have python, I have not tested my changes....

[pmiossec]

Finally, I have used docker to check my changes. I pushed a fix and the docker script...

[gerhardol]

Finally, I have used docker to check my changes. I pushed a fix and the docker script...

Great, will add that in the generic PRR

[mstv]

Suggested change

	rebaseWithAdvOptionsToolStripMenuItem.Enabled = _rebaseOnTopOf is not null && (selectedRevisions.Count == 1
	|| (selectedRevisions.Count == 2 && selectedRevisions.All(r => !r.IsArtificial)));
	rebaseWithAdvOptionsToolStripMenuItem.Enabled = _rebaseOnTopOf is not null
	&& (selectedRevisions.Count == 1
	|| (selectedRevisions.Count == 2 && selectedRevisions.All(r => !r.IsArtificial)));

[pmiossec]

@mstv I have applied your suggestion....
Are wee good to go now?

Side note: I need to have my 2 PRs merged before tomorrow otherwise they will have to wait 1 week (AFKB)

[gerhardol]

I believe this should be merged now

Side note: I need to have my 2 PRs merged before tomorrow otherwise they will have to wait 1 week (AFKB)

or someone else merge

[pmiossec]

or someone else merge

Indeed but I was more thinking about if it needs some changes on my side....