feature: allows to re-order multiple commits in Interactive Rebase window (#1675)

love-linger · love-linger · commit 5c75bb86bba0 · 2025-10-23T20:52:48.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
@@ -89,7 +89,6 @@
   <StreamGeometry x:Key="Icons.Minus">M0 512M1024 512M512 0M512 1024M64 576h896V448H64z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Modified">M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z</StreamGeometry>
   <StreamGeometry x:Key="Icons.More">M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM211 448C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.Move">M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.MoveTo">M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z</StreamGeometry>
   <StreamGeometry x:Key="Icons.OpenWith">M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z</StreamGeometry>
   <StreamGeometry x:Key="Icons.OrderByName">M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171 32-85h26l32 85h-90z</StreamGeometry>
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
@@ -64,6 +64,18 @@ public string FullMessage
             }
         }
 
+        public bool IsDropBeforeVisible
+        {
+            get => _isDropBeforeVisible;
+            set => SetProperty(ref _isDropBeforeVisible, value);
+        }
+
+        public bool IsDropAfterVisible
+        {
+            get => _isDropAfterVisible;
+            set => SetProperty(ref _isDropAfterVisible, value);
+        }
+
         public InteractiveRebaseItem(int order, Models.Commit c, string message, bool canSquashOrFixup)
         {
             OriginalOrder = order;
@@ -76,6 +88,8 @@ public InteractiveRebaseItem(int order, Models.Commit c, string message, bool ca
         private string _subject;
         private string _fullMessage;
         private bool _canSquashOrFixup = true;
+        private bool _isDropBeforeVisible = false;
+        private bool _isDropAfterVisible = false;
     }
 
     public class InteractiveRebase : ObservableObject
@@ -188,30 +202,6 @@ public void SelectCommits(List<InteractiveRebaseItem> items)
             }
         }
 
-        public void MoveItemUp(InteractiveRebaseItem item)
-        {
-            var idx = Items.IndexOf(item);
-            if (idx > 0)
-            {
-                var prev = Items[idx - 1];
-                Items.RemoveAt(idx - 1);
-                Items.Insert(idx, prev);
-                UpdateItems();
-            }
-        }
-
-        public void MoveItemDown(InteractiveRebaseItem item)
-        {
-            var idx = Items.IndexOf(item);
-            if (idx < Items.Count - 1)
-            {
-                var next = Items[idx + 1];
-                Items.RemoveAt(idx + 1);
-                Items.Insert(idx, next);
-                UpdateItems();
-            }
-        }
-
         public void ChangeAction(List<InteractiveRebaseItem> selected, Models.InteractiveRebaseAction action)
         {
             if (action == Models.InteractiveRebaseAction.Squash || action == Models.InteractiveRebaseAction.Fixup)
@@ -231,6 +221,41 @@ public void ChangeAction(List<InteractiveRebaseItem> selected, Models.Interactiv
             UpdateItems();
         }
 
+        public void Move(List<InteractiveRebaseItem> commits, int index)
+        {
+            var hashes = new HashSet<string>();
+            foreach (var c in commits)
+                hashes.Add(c.Commit.SHA);
+
+            var before = new List<InteractiveRebaseItem>();
+            var ordered = new List<InteractiveRebaseItem>();
+            var after = new List<InteractiveRebaseItem>();
+
+            for (int i = 0; i < index; i++)
+            {
+                var item = Items[i];
+                if (!hashes.Contains(item.Commit.SHA))
+                    before.Add(item);
+                else
+                    ordered.Add(item);
+            }
+
+            for (int i = index; i < Items.Count; i++)
+            {
+                var item = Items[i];
+                if (!hashes.Contains(item.Commit.SHA))
+                    after.Add(item);
+                else
+                    ordered.Add(item);
+            }
+
+            Items.Clear();
+            Items.AddRange(before);
+            Items.AddRange(ordered);
+            Items.AddRange(after);
+            UpdateItems();
+        }
+
         public async Task<bool> Start()
         {
             using var lockWatcher = _repo.LockWatcher();
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
@@ -38,15 +38,29 @@
     </Grid>
 
     <!-- Operation Information -->
-    <Grid Grid.Row="1" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" Margin="8">
-      <TextBlock Grid.Column="0" Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-      <Path Grid.Column="1" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Current.FriendlyName}" Margin="8,0,0,0"/>
-
-      <TextBlock Grid.Column="3" Margin="48,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-      <Path Grid.Column="4" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Commit}"/>
-      <TextBlock Grid.Column="5" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
-      <TextBlock Grid.Column="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
+    <Grid Grid.Row="1" Margin="8" ColumnDefinitions="*,Auto">
+      <StackPanel Grid.Column="0" Orientation="Horizontal" ClipToBounds="True">
+        <TextBlock Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
+        <Path Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding Current.FriendlyName}" Margin="8,0,0,0"/>
+
+        <TextBlock Margin="16,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
+        <Path Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Commit}"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0"/>
+      </StackPanel>
+
+      <Border Grid.Column="1" Background="Transparent" Width="20" Height="20">
+        <ToolTip.Tip>
+          <TextBlock>
+            <Run Text="{DynamicResource Text.InteractiveRebase.ReorderTip}"/>
+            <Run Text=" "/>
+            <Run Text="{OnPlatform 'Ctrl+Up/Ctrl+Down', macOS='⌘+Up/⌘+Down'}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+          </TextBlock>
+        </ToolTip.Tip>
+
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
+      </Border>
     </Grid>
 
     <!-- Body -->
@@ -81,9 +95,16 @@
 
           <v:InteractiveRebaseListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid Height="26" Margin="8,0" ClipToBounds="True">
+              <Grid Height="26"
+                    Margin="8,0"
+                    Background="Transparent"
+                    ClipToBounds="True"
+                    PointerPressed="OnRowPointerPressed"
+                    DragDrop.AllowDrop="True"
+                    DragDrop.DragOver="OnRowDragOver"
+                    DragDrop.DragLeave="OnRowDragLeave"
+                    DragDrop.Drop="OnRowDrop">
                 <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="16"/>
                   <ColumnDefinition Width="Auto" SharedSizeGroup="CommitOrderColumn"/>
                   <ColumnDefinition Width="110"/>
                   <ColumnDefinition Width="*"/>
@@ -93,42 +114,23 @@
                   <ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
                 </Grid.ColumnDefinitions>
 
-                <!-- Drag & Drop Anchor -->
-                <Border Grid.Column="0" Background="Transparent"
-                        PointerPressed="OnRowHeaderPointerPressed"
-                        DragDrop.AllowDrop="True"
-                        DragDrop.DragOver="OnRowHeaderDragOver">
-                  <ToolTip.Tip>
-                    <TextBlock>
-                      <Run Text="{DynamicResource Text.InteractiveRebase.ReorderTip}"/>
-                      <Run Text=" "/>
-                      <Run Text="{OnPlatform 'Ctrl+Up/Ctrl+Down', macOS='⌘+Up/⌘+Down'}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
-                    </TextBlock>
-                  </ToolTip.Tip>
-                  <Path Width="14" Height="14"
-                        Data="{StaticResource Icons.Move}"
-                        Fill="{DynamicResource Brush.FG2}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"/>
-                </Border>
-
                 <!-- Original Order -->
-                <TextBlock Grid.Column="1"
+                <TextBlock Grid.Column="0"
                            Margin="4,0,0,0"
                            FontFamily="{DynamicResource Fonts.Monospace}"
                            Text="{Binding OriginalOrder, StringFormat='#{0}'}"
                            HorizontalAlignment="Center"/>
                 
                 <!-- Action -->
-                <Button Grid.Column="2" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
+                <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
                   <StackPanel Orientation="Horizontal">
                     <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
                     <TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
                   </StackPanel>
                 </Button>
 
                 <!-- Subject -->
-                <Grid Grid.Column="3" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                <Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
                   <Button Grid.Column="0"
                           Classes="icon_button"
                           Margin="0,0,6,0" Padding="0"
@@ -150,26 +152,40 @@
                 </Grid>
 
                 <!-- Author Avatar -->
-                <v:Avatar Grid.Column="4"
+                <v:Avatar Grid.Column="3"
                           Width="16" Height="16"
                           Margin="8,0,0,0"
                           VerticalAlignment="Center"
                           User="{Binding Commit.Author}"/>
 
                 <!-- Author Name -->
-                <Border Grid.Column="5" ClipToBounds="True">
+                <Border Grid.Column="4" ClipToBounds="True">
                   <TextBlock Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
                 </Border>
 
                 <!-- Commit SHA -->
-                <Border Grid.Column="6" ClipToBounds="True">
+                <Border Grid.Column="5" ClipToBounds="True">
                   <TextBlock Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
                 </Border>
 
                 <!-- Commit Time -->
-                <Border Grid.Column="7">
+                <Border Grid.Column="6">
                   <TextBlock Margin="16,0,8,0" Text="{Binding Commit.CommitterTimeStr}"/>
                 </Border>
+
+                <!-- Drop Indicator -->
+                <Rectangle Grid.Column="0" Grid.ColumnSpan="7"
+                           Height="2"
+                           VerticalAlignment="Top"
+                           Fill="{DynamicResource Brush.Accent}"
+                           IsVisible="{Binding IsDropBeforeVisible, Mode=OneWay}"
+                           IsHitTestVisible="False"/>
+                <Rectangle Grid.Column="0" Grid.ColumnSpan="7"
+                           Height="2"
+                           VerticalAlignment="Bottom"
+                           Fill="{DynamicResource Brush.Accent}"
+                           IsVisible="{Binding IsDropAfterVisible, Mode=OneWay}"
+                           IsHitTestVisible="False"/>
               </Grid>
             </DataTemplate>
           </v:InteractiveRebaseListBox.ItemTemplate>
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
