feature: cherry-pick multiple commits (#418)

src/Commands/CherryPick.cs

@@ -2,12 +2,12 @@
 {
     public class CherryPick : Command
     {
-        public CherryPick(string repo, string commit, bool noCommit)
+        public CherryPick(string repo, string commits, bool noCommit)
         {
             var mode = noCommit ? "-n" : "--ff";
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"cherry-pick {mode} {commit}";
+            Args = $"cherry-pick {mode} {commits}";
         }
     }
 }

src/Resources/Locales/de_DE.axaml

@@ -82,10 +82,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Verwerfen</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nichts tun</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stashen &amp; wieder anwenden</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">Diesen Commit cherry-picken</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit:</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Alle Änderungen committen</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Stashes löschen</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Du versuchst alle Stashes zu löschen. Möchtest du wirklich fortfahren?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">Remote Repository klonen</x:String>

src/Resources/Locales/en_US.axaml

@@ -79,10 +79,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Do Nothing</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit:</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit all changes</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Clear Stashes</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">You are trying to clear all stashes. Are you sure to continue?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">Clone Remote Repository</x:String>
@@ -95,6 +94,7 @@
   <x:String x:Key="Text.Close" xml:space="preserve">CLOSE</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Cherry-Pick ...</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout Commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Compare with HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>

src/Resources/Locales/fr_FR.axaml

@@ -83,10 +83,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Rejeter</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Ne rien faire</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash et Réappliquer</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick ce commit</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit :</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s) :</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit tous les changements</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Vider les Stashes</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Voulez-vous vider tous les stashes. Êtes-vous sûr de vouloir continuer ?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">Cloner le dépôt distant</x:String>

src/Resources/Locales/pt_BR.axaml

@@ -82,10 +82,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Descartar</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">Nada</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reaplicar</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick Este Commit</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit:</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commitar todas as alterações</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">Cherry-Pick</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">Limpar Stashes</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">Você está tentando limpar todas as stashes. Tem certeza que deseja continuar?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">Clonar Repositório Remoto</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -82,10 +82,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">丢弃更改</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做处理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏并自动恢复</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选提交</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交ID ：</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交列表 ：</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交变化</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">挑选提交</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">丢弃贮藏确认</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">您正在丢弃所有的贮藏，一经操作，无法回退，是否继续？</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">克隆远程仓库</x:String>
@@ -98,6 +97,7 @@
   <x:String x:Key="Text.Close" xml:space="preserve">关闭</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">提交信息编辑器</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">挑选(cherry-pick)...</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">检出此提交</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">与当前HEAD比较</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -82,10 +82,9 @@
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">捨棄變更</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.DoNothing" xml:space="preserve">不做處理</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">擱置變更並自動復原</x:String>
-  <x:String x:Key="Text.CherryPick" xml:space="preserve">揀選 (cherry-pick) 此提交</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">揀選提交</x:String>
-  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交編號:</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交列表:</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交變更</x:String>
-  <x:String x:Key="Text.CherryPick.Title" xml:space="preserve">揀選提交</x:String>
   <x:String x:Key="Text.ClearStashes" xml:space="preserve">捨棄擱置變更確認</x:String>
   <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">您正在捨棄所有的擱置變更，一經操作便無法復原，是否繼續?</x:String>
   <x:String x:Key="Text.Clone" xml:space="preserve">複製 (clone) 遠端存放庫</x:String>
@@ -98,6 +97,7 @@
   <x:String x:Key="Text.Close" xml:space="preserve">關閉</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">提交訊息編輯器</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">揀選 (cherry-pick) 此提交</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">揀選 (cherry-pick) ...</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">簽出 (checkout) 此提交</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">與目前 HEAD 比較</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>

src/ViewModels/CherryPick.cs

@@ -1,10 +1,12 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
     public class CherryPick : Popup
     {
-        public Models.Commit Target
+        public List<Models.Commit> Targets
         {
             get;
             private set;
@@ -16,10 +18,10 @@ namespace SourceGit.ViewModels
             set;
         }
 
-        public CherryPick(Repository repo, Models.Commit target)
+        public CherryPick(Repository repo, List<Models.Commit> targets)
         {
             _repo = repo;
-            Target = target;
+            Targets = targets;
             AutoCommit = true;
             View = new Views.CherryPick() { DataContext = this };
         }
@@ -27,11 +29,16 @@ namespace SourceGit.ViewModels
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
-            ProgressDescription = $"Cherry-Pick commit '{Target.SHA}' ...";
+            ProgressDescription = $"Cherry-Pick commit(s) ...";
 
             return Task.Run(() =>
             {
-                var succ = new Commands.CherryPick(_repo.FullPath, Target.SHA, !AutoCommit).Exec();
+                // Get commit SHAs reverted
+                var builder = new StringBuilder();
+                for (int i = Targets.Count - 1; i >= 0; i--)
+                    builder.Append($"{Targets[i].SHA} ");
+
+                var succ = new Commands.CherryPick(_repo.FullPath, builder.ToString(), !AutoCommit).Exec();
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return succ;
             });

src/ViewModels/Histories.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using Avalonia.VisualTree;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -182,13 +182,73 @@ namespace SourceGit.ViewModels
 
         public ContextMenu MakeContextMenu(ListBox list)
         {
-            if (list.SelectedItems.Count != 1)
-                return null;
-
             var current = _repo.CurrentBranch;
             if (current == null)
                 return null;
 
+            if (list.SelectedItems.Count > 1)
+            {
+                var selected = new List<Models.Commit>();
+                var canCherryPick = true;
+                foreach (var item in list.SelectedItems)
+                {
+                    if (item is Models.Commit c)
+                    {
+                        selected.Add(c);
+
+                        if (c.IsMerged || c.Parents.Count > 1)
+                            canCherryPick = false;
+                    }
+                }
+
+                var multipleMenu = new ContextMenu();
+
+                if (canCherryPick)
+                {
+                    var cherryPickMultiple = new MenuItem();
+                    cherryPickMultiple.Header = App.Text("CommitCM.CherryPickMultiple");
+                    cherryPickMultiple.Icon = App.CreateMenuIcon("Icons.CherryPick");
+                    cherryPickMultiple.Click += (_, e) =>
+                    {
+                        if (PopupHost.CanCreatePopup())
+                            PopupHost.ShowPopup(new CherryPick(_repo, selected));
+                        e.Handled = true;
+                    };
+                    multipleMenu.Items.Add(cherryPickMultiple);
+                    multipleMenu.Items.Add(new MenuItem() { Header = "-" });
+                }
+
+                var copyMultipleSHAs = new MenuItem();
+                copyMultipleSHAs.Header = App.Text("CommitCM.CopySHA");
+                copyMultipleSHAs.Icon = App.CreateMenuIcon("Icons.Copy");
+                copyMultipleSHAs.Click += (_, e) =>
+                {
+                    var builder = new StringBuilder();
+                    foreach (var c in selected)
+                        builder.AppendLine(c.SHA);
+
+                    App.CopyText(builder.ToString());
+                    e.Handled = true;
+                };
+                multipleMenu.Items.Add(copyMultipleSHAs);
+
+                var copyMultipleInfo = new MenuItem();
+                copyMultipleInfo.Header = App.Text("CommitCM.CopyInfo");
+                copyMultipleInfo.Icon = App.CreateMenuIcon("Icons.Copy");
+                copyMultipleInfo.Click += (_, e) =>
+                {
+                    var builder = new StringBuilder();
+                    foreach (var c in selected)
+                        builder.AppendLine($"{c.SHA.Substring(0, 10)} - {c.Subject}");
+
+                    App.CopyText(builder.ToString());
+                    e.Handled = true;
+                };
+                multipleMenu.Items.Add(copyMultipleInfo);
+
+                return multipleMenu;
+            }
+
             var commit = (list.SelectedItem as Models.Commit)!;
             var menu = new ContextMenu();
             var tags = new List<Models.Tag>();
@@ -324,7 +384,7 @@ namespace SourceGit.ViewModels
                 cherryPick.Click += (_, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowPopup(new CherryPick(_repo, commit));
+                        PopupHost.ShowPopup(new CherryPick(_repo, [commit]));
                     e.Handled = true;
                 };
                 menu.Items.Add(cherryPick);

src/Views/CherryPick.axaml

@@ -2,6 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -11,17 +12,51 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CherryPick}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="100,*">
+    <Grid Margin="0,16,0,0" ColumnDefinitions="100,*">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto"/>
+        <RowDefinition Height="32"/>
+      </Grid.RowDefinitions>
+      
       <TextBlock Grid.Row="0" Grid.Column="0"
-                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 HorizontalAlignment="Right" VerticalAlignment="Top"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.CherryPick.Commit}"/>
 
-      <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
+      <ListBox Grid.Row="0" Grid.Column="1"
+               MinHeight="32" MaxHeight="100"
+               ItemsSource="{Binding Targets}"
+               Background="{DynamicResource Brush.Contents}"
+               BorderThickness="1"
+               BorderBrush="{DynamicResource Brush.Border2}"
+               Padding="4"
+               CornerRadius="4"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+               ScrollViewer.VerticalScrollBarVisibility="Auto">
+        <ListBox.Styles>
+          <Style Selector="ListBoxItem">
+            <Setter Property="Padding" Value="4,0"/>
+            <Setter Property="Height" Value="26"/>
+            <Setter Property="CornerRadius" Value="4"/>
+          </Style>
+        </ListBox.Styles>
+
+        <ListBox.ItemsPanel>
+          <ItemsPanelTemplate>
+            <StackPanel Orientation="Vertical"/>
+          </ItemsPanelTemplate>
+        </ListBox.ItemsPanel>
+
+        <ListBox.ItemTemplate>
+          <DataTemplate DataType="m:Commit">
+            <Grid ColumnDefinitions="14,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="6,0,4,0"/>
-        <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
+              <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" TextTrimming="CharacterEllipsis"/>
             </Grid>
+          </DataTemplate>
+        </ListBox.ItemTemplate>
+      </ListBox>      
 
       <CheckBox Grid.Row="1" Grid.Column="1"
                 Content="{DynamicResource Text.CherryPick.CommitChanges}"

src/Views/Histories.axaml.cs

@@ -661,7 +661,7 @@ namespace SourceGit.Views
 
         private void OnCommitListContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.Histories histories && sender is ListBox list)
+            if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems: { Count: > 0 } } list)
             {
                 var menu = histories.MakeContextMenu(list);
                 list.OpenContextMenu(menu);