ux: allow interrupting in-progress push operation in dialog

src/ViewModels/LauncherPage.cs

@@ -107,9 +107,15 @@ public async Task ProcessPopupAsync()
 
         public void CancelPopup()
         {
-            if (_popup == null || _popup.InProgress)
+            if (_popup == null)
                 return;
 
+            if (_popup.InProgress)
+            {
+                _popup.Cancel();
+                return;
+            }
+
             _popup?.Cleanup();
             Popup = null;
         }

src/ViewModels/Popup.cs

@@ -34,7 +34,7 @@ public void OnReceiveCommandLog(string data)
                 ProgressDescription = desc;
         }
 
-        public void Cleanup()
+        public virtual void Cleanup()
         {
             _log?.Unsubscribe(this);
         }
@@ -44,6 +44,18 @@ public virtual bool CanStartDirectly()
             return true;
         }
 
+        /// <summary>
+        /// Indicates the in-progress operation of this popup can be interrupted.
+        /// </summary>
+        public virtual bool CanCancel => false;
+
+        /// <summary>
+        /// Interrupts the in-progress operation of this popup.
+        /// </summary>
+        public virtual void Cancel()
+        {
+        }
+
         public virtual Task<bool> Sure()
         {
             return null;

src/ViewModels/Push.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -190,6 +191,9 @@ public override async Task<bool> Sure()
         {
             using var lockWatcher = _repo.LockWatcher();
 
+            _cts?.Cancel();
+            _cts = new CancellationTokenSource();
+
             var remoteBranchName = _selectedRemoteBranch.Name;
             ProgressDescription = $"Push {_selectedLocalBranch.Name} -> {_selectedRemote.Name}/{remoteBranchName} ...";
 
@@ -204,12 +208,26 @@ public override async Task<bool> Sure()
                 PushAllTags,
                 _repo.Submodules.Count > 0 && CheckSubmodules,
                 _isSetTrackOptionVisible && _tracking,
-                ForcePush).Use(log).RunAsync();
+                ForcePush).Use(log).WithCancellation(_cts.Token).RunAsync();
 
             log.Complete();
             return succ;
         }
 
+        public override bool CanCancel => true;
+
+        public override void Cancel()
+        {
+            _cts?.Cancel();
+        }
+
+        public override void Cleanup()
+        {
+            base.Cleanup();
+            _cts?.Dispose();
+            _cts = null;
+        }
+
         private void AutoSelectBranchByRemote()
         {
             if (_selectedRemote == null || _selectedLocalBranch == null)
@@ -266,5 +284,6 @@ private void AutoSelectBranchByRemote()
         private Models.Branch _selectedRemoteBranch = null;
         private bool _isSetTrackOptionVisible = false;
         private bool _tracking = true;
+        private CancellationTokenSource _cts = null;
     }
 }

src/Views/LauncherPage.axaml

@@ -113,8 +113,8 @@
                     <v:PopupRunningStatus Margin="12,8"
                                           Focusable="False"
                                           Description="{Binding ProgressDescription}"
-                                          IsVisible="{Binding InProgress}"
-                                          IsHitTestVisible="False"/>
+                                          CanCancel="{Binding CanCancel}"
+                                          IsVisible="{Binding InProgress}"/>
                   </StackPanel>
                 </DataTemplate>
               </ContentControl.DataTemplates>

src/Views/PopupRunningStatus.axaml

@@ -13,6 +13,15 @@
     <StackPanel Orientation="Horizontal" Margin="0,8">
       <ContentPresenter x:Name="Icon" Width="12" Height="12"/>
       <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
+      <Button Classes="flat"
+              Width="100" Height="28"
+              Margin="12,0,0,0"
+              Padding="0"
+              HorizontalContentAlignment="Center"
+              VerticalContentAlignment="Center"
+              Content="{DynamicResource Text.Cancel}"
+              Click="OnCancelRequested"
+              IsVisible="{Binding #ThisControl.CanCancel}"/>
     </StackPanel>
 
     <TextBlock HorizontalAlignment="Stretch"

src/Views/PopupRunningStatus.axaml.cs

@@ -19,6 +19,18 @@ public string Description
             set => SetAndRaise(DescriptionProperty, ref _description, value);
         }
 
+        public static readonly DirectProperty<PopupRunningStatus, bool> CanCancelProperty =
+            AvaloniaProperty.RegisterDirect<PopupRunningStatus, bool>(
+                nameof(CanCancel),
+                static o => o.CanCancel,
+                static (o, v) => o.CanCancel = v);
+
+        public bool CanCancel
+        {
+            get => _canCancel;
+            set => SetAndRaise(CanCancelProperty, ref _canCancel, value);
+        }
+
         public PopupRunningStatus()
         {
             InitializeComponent();
@@ -52,6 +64,14 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             }
         }
 
+        private void OnCancelRequested(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is ViewModels.Popup popup)
+                popup.Cancel();
+
+            e.Handled = true;
+        }
+
         private void StartAnim()
         {
             Icon.Content = new Path() { Classes = { "waiting" } };
@@ -67,6 +87,7 @@ private void StopAnim()
         }
 
         private string _description = string.Empty;
+        private bool _canCancel = false;
         private bool _isUnloading = false;
     }
 }