fix: can not squash and fixup until first picked/edit/reword commit in interactive rebase exists list (#1362)

love-linger · love-linger · commit ac26d5bb06be · 2025-05-25T13:46:27.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
@@ -35,7 +35,7 @@ public bool CanSquashOrFixup
         public Models.InteractiveRebaseAction Action
         {
             get => _action;
-            private set => SetProperty(ref _action, value);
+            set => SetProperty(ref _action, value);
         }
 
         public string Subject
@@ -68,11 +68,6 @@ public InteractiveRebaseItem(Models.Commit c, string message, bool canSquashOrFi
             CanSquashOrFixup = canSquashOrFixup;
         }
 
-        public void SetAction(object param)
-        {
-            Action = (Models.InteractiveRebaseAction)param;
-        }
-
         private Models.InteractiveRebaseAction _action = Models.InteractiveRebaseAction.Pick;
         private string _subject;
         private string _fullMessage;
@@ -158,10 +153,8 @@ public void MoveItemUp(InteractiveRebaseItem item)
                 var prev = Items[idx - 1];
                 Items.RemoveAt(idx - 1);
                 Items.Insert(idx, prev);
-                
-                item.CanSquashOrFixup = true;
-                prev.CanSquashOrFixup = idx < Items.Count - 1;
                 SelectedItem = item;
+                UpdateItems();
             }
         }
 
@@ -173,11 +166,21 @@ public void MoveItemDown(InteractiveRebaseItem item)
                 var next = Items[idx + 1];
                 Items.RemoveAt(idx + 1);
                 Items.Insert(idx, next);
-
-                item.CanSquashOrFixup = idx < Items.Count - 2;
-                next.CanSquashOrFixup = true;
                 SelectedItem = item;
+                UpdateItems();
+            }
+        }
+
+        public void ChangeAction(InteractiveRebaseItem item, Models.InteractiveRebaseAction action)
+        {
+            if (!item.CanSquashOrFixup)
+            {
+                if (action == Models.InteractiveRebaseAction.Squash || action == Models.InteractiveRebaseAction.Fixup)
+                    return;
             }
+            
+            item.Action = action;
+            UpdateItems();
         }
 
         public Task<bool> Start()
@@ -210,6 +213,27 @@ public Task<bool> Start()
             });
         }
 
+        private void UpdateItems()
+        {
+            if (Items.Count == 0)
+                return;
+
+            var hasValidParent = false;
+            for (var i = Items.Count - 1; i >= 0; i--)
+            {
+                var item = Items[i];
+                if (hasValidParent)
+                {
+                    item.CanSquashOrFixup = true;
+                }
+                else
+                {
+                    item.CanSquashOrFixup = false;
+                    hasValidParent = item.Action != Models.InteractiveRebaseAction.Drop;
+                }
+            }
+        }
+
         private Repository _repo = null;
         private bool _isLoading = false;
         private InteractiveRebaseItem _selectedItem = null;
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
@@ -107,7 +107,7 @@
                 <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent">
                   <Button.Flyout>
                     <MenuFlyout Placement="BottomEdgeAlignedLeft" VerticalOffset="-4">
-                      <MenuItem InputGesture="P" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Pick}">
+                      <MenuItem InputGesture="P" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Pick}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="Green"/>
                         </MenuItem.Icon>
@@ -119,7 +119,7 @@
                         </MenuItem.Header>
                       </MenuItem>
 
-                      <MenuItem InputGesture="E" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Edit}">
+                      <MenuItem InputGesture="E" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Edit}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="Orange"/>
                         </MenuItem.Icon>
@@ -131,7 +131,7 @@
                         </MenuItem.Header>
                       </MenuItem>
 
-                      <MenuItem InputGesture="R" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Reword}">
+                      <MenuItem InputGesture="R" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Reword}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="Orange"/>
                         </MenuItem.Icon>
@@ -143,7 +143,7 @@
                         </MenuItem.Header>
                       </MenuItem>
 
-                      <MenuItem InputGesture="S" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Squash}" IsVisible="{Binding CanSquashOrFixup}">
+                      <MenuItem InputGesture="S" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Squash}" IsVisible="{Binding CanSquashOrFixup}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="LightGray"/>
                         </MenuItem.Icon>
@@ -155,7 +155,7 @@
                         </MenuItem.Header>
                       </MenuItem>
 
-                      <MenuItem InputGesture="F" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Fixup}" IsVisible="{Binding CanSquashOrFixup}">
+                      <MenuItem InputGesture="F" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Fixup}" IsVisible="{Binding CanSquashOrFixup}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="LightGray"/>
                         </MenuItem.Icon>
@@ -167,7 +167,7 @@
                         </MenuItem.Header>
                       </MenuItem>
 
-                      <MenuItem InputGesture="D" Command="{Binding SetAction}" CommandParameter="{x:Static m:InteractiveRebaseAction.Drop}">
+                      <MenuItem InputGesture="D" Click="OnChangeRebaseAction" Tag="{x:Static m:InteractiveRebaseAction.Drop}">
                         <MenuItem.Icon>
                           <Ellipse Width="14" Height="14" Fill="Red"/>
                         </MenuItem.Icon>
@@ -280,7 +280,7 @@
                    Minimum="0"
                    Maximum="100"
                    IsVisible="False"/>
-      <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="StartJobs"/>
+      <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="OnStartJobs"/>
       <Button Grid.Column="2" Classes="flat" Margin="8,0,0,0" MinWidth="80" Content="{DynamicResource Text.Cancel}" Click="CloseWindow"/>
     </Grid>
   </Grid>
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
@@ -29,32 +29,32 @@ protected override void OnKeyDown(KeyEventArgs e)
 
             if (e.Key == Key.P)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Pick);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Pick);
                 e.Handled = true;
             }
             else if (e.Key == Key.E)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Edit);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Edit);
                 e.Handled = true;
             }
             else if (e.Key == Key.R)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Reword);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Reword);
                 e.Handled = true;
             }
             else if (e.Key == Key.S)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Squash);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Squash);
                 e.Handled = true;
             }
             else if (e.Key == Key.F)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Fixup);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Fixup);
                 e.Handled = true;
             }
             else if (e.Key == Key.D)
             {
-                item.SetAction(Models.InteractiveRebaseAction.Drop);
+                vm.ChangeAction(item, Models.InteractiveRebaseAction.Drop);
                 e.Handled = true;
             }
             else if (e.KeyModifiers == KeyModifiers.Alt && e.Key == Key.Up)
@@ -153,8 +153,21 @@ private void OnMoveItemDown(object sender, RoutedEventArgs e)
                 e.Handled = true;
             }
         }
+        
+        private void OnChangeRebaseAction(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.InteractiveRebase vm &&
+                sender is Control
+                {
+                    DataContext: ViewModels.InteractiveRebaseItem item,
+                    Tag: Models.InteractiveRebaseAction action
+                })
+                vm.ChangeAction(item, action);
+
+            e.Handled = true;
+        }
 
-        private async void StartJobs(object _1, RoutedEventArgs _2)
+        private async void OnStartJobs(object _1, RoutedEventArgs _2)
         {
             var vm = DataContext as ViewModels.InteractiveRebase;
             if (vm == null)

Original file line number	Diff line number	Diff line change
`@@ -29,32 +29,32 @@ protected override void OnKeyDown(KeyEventArgs e)`
`29`	`29`
`30`	`30`	`if (e.Key == Key.P)`
`31`	`31`	`{`
`32`		`- item.SetAction(Models.InteractiveRebaseAction.Pick);`
	`32`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Pick);`
`33`	`33`	`e.Handled = true;`
`34`	`34`	`}`
`35`	`35`	`else if (e.Key == Key.E)`
`36`	`36`	`{`
`37`		`- item.SetAction(Models.InteractiveRebaseAction.Edit);`
	`37`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Edit);`
`38`	`38`	`e.Handled = true;`
`39`	`39`	`}`
`40`	`40`	`else if (e.Key == Key.R)`
`41`	`41`	`{`
`42`		`- item.SetAction(Models.InteractiveRebaseAction.Reword);`
	`42`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Reword);`
`43`	`43`	`e.Handled = true;`
`44`	`44`	`}`
`45`	`45`	`else if (e.Key == Key.S)`
`46`	`46`	`{`
`47`		`- item.SetAction(Models.InteractiveRebaseAction.Squash);`
	`47`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Squash);`
`48`	`48`	`e.Handled = true;`
`49`	`49`	`}`
`50`	`50`	`else if (e.Key == Key.F)`
`51`	`51`	`{`
`52`		`- item.SetAction(Models.InteractiveRebaseAction.Fixup);`
	`52`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Fixup);`
`53`	`53`	`e.Handled = true;`
`54`	`54`	`}`
`55`	`55`	`else if (e.Key == Key.D)`
`56`	`56`	`{`
`57`		`- item.SetAction(Models.InteractiveRebaseAction.Drop);`
	`57`	`+ vm.ChangeAction(item, Models.InteractiveRebaseAction.Drop);`
`58`	`58`	`e.Handled = true;`
`59`	`59`	`}`
`60`	`60`	`else if (e.KeyModifiers == KeyModifiers.Alt && e.Key == Key.Up)`
`@@ -153,8 +153,21 @@ private void OnMoveItemDown(object sender, RoutedEventArgs e)`
`153`	`153`	`e.Handled = true;`
`154`	`154`	`}`
`155`	`155`	`}`
	`156`	`+`
	`157`	`+ private void OnChangeRebaseAction(object sender, RoutedEventArgs e)`
	`158`	`+ {`
	`159`	`+ if (DataContext is ViewModels.InteractiveRebase vm &&`
	`160`	`+ sender is Control`
	`161`	`+ {`
	`162`	`+ DataContext: ViewModels.InteractiveRebaseItem item,`
	`163`	`+ Tag: Models.InteractiveRebaseAction action`
	`164`	`+ })`
	`165`	`+ vm.ChangeAction(item, action);`
	`166`	`+`
	`167`	`+ e.Handled = true;`
	`168`	`+ }`
`156`	`169`
`157`		`- private async void StartJobs(object _1, RoutedEventArgs _2)`
	`170`	`+ private async void OnStartJobs(object _1, RoutedEventArgs _2)`
`158`	`171`	`{`
`159`	`172`	`var vm = DataContext as ViewModels.InteractiveRebase;`
`160`	`173`	`if (vm == null)`