Rebase onto: Display only the current branch to make selection easier

gitextensions · Oct 25, 2021 · 3fa48a2 · 3fa48a2
1 parent 9f8c00c
commit 3fa48a2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/GitUI/CommandsDialogs/FormRebase.cs b/GitUI/CommandsDialogs/FormRebase.cs
@@ -337,10 +337,23 @@ private void chkUseFromOnto_CheckedChanged(object sender, EventArgs e)
 
         private void btnChooseFromRevision_Click(object sender, EventArgs e)
         {
-            using FormChooseCommit chooseForm = new(UICommands, txtFrom.Text);
-            if (chooseForm.ShowDialog(this) == DialogResult.OK && chooseForm.SelectedRevision is not null)
+            var previousValueBranchFilterEnabled = AppSettings.BranchFilterEnabled;
+            var previousValueShowCurrentBranchOnly = AppSettings.ShowCurrentBranchOnly;
+            var previousValueShowReflogReferences = AppSettings.ShowReflogReferences;
+
+            try
+            {
+                using FormChooseCommit chooseForm = new(UICommands, txtFrom.Text, showCurrentBranchOnly: true);
+                if (chooseForm.ShowDialog(this) == DialogResult.OK && chooseForm.SelectedRevision is not null)
+                {
+                    txtFrom.Text = chooseForm.SelectedRevision.ObjectId.ToShortString();
+                }
+            }
+            finally
             {
-                txtFrom.Text = chooseForm.SelectedRevision.ObjectId.ToShortString();
+                AppSettings.BranchFilterEnabled = previousValueBranchFilterEnabled;
+                AppSettings.ShowCurrentBranchOnly = previousValueShowCurrentBranchOnly;
+                AppSettings.ShowReflogReferences = previousValueShowReflogReferences;
             }
         }
 

diff --git a/GitUI/HelperDialogs/FormChooseCommit.cs b/GitUI/HelperDialogs/FormChooseCommit.cs
@@ -20,11 +20,15 @@ private FormChooseCommit(GitUICommands commands)
             InitializeComplete();
         }
 
-        public FormChooseCommit(GitUICommands commands, string? preselectCommit, bool showArtificial = false)
+        public FormChooseCommit(GitUICommands commands, string? preselectCommit, bool showArtificial = false, bool showCurrentBranchOnly = false)
             : this(commands)
         {
             revisionGrid.MultiSelect = false;
             revisionGrid.ShowUncommittedChangesIfPossible = showArtificial;
+            if (showCurrentBranchOnly)
+            {
+                revisionGrid.ShowCurrentBranchOnly();
+            }
 
             if (!string.IsNullOrEmpty(preselectCommit))
             {