feature: support to choose the start point of git-flow topic branch (#2538)

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Commands/GitFlow.cs

@@ -47,24 +47,32 @@ public async Task<bool> InitAsync(string production, string develop, string feat
             return await ExecAsync().ConfigureAwait(false);
         }
 
-        public async Task<bool> StartAsync(Models.GitFlowBranchType type, string name)
+        public async Task<bool> StartAsync(Models.GitFlowBranchType type, string name, Models.Branch based)
         {
+            var builder = new StringBuilder();
+            builder.Append("flow ");
+
             switch (type)
             {
                 case Models.GitFlowBranchType.Feature:
-                    Args = $"flow feature start {name}";
+                    builder.Append("feature");
                     break;
                 case Models.GitFlowBranchType.Release:
-                    Args = $"flow release start {name}";
+                    builder.Append("release");
                     break;
                 case Models.GitFlowBranchType.Hotfix:
-                    Args = $"flow hotfix start {name}";
+                    builder.Append("hotfix");
                     break;
                 default:
                     RaiseException("Bad git-flow branch type!!!");
                     return false;
             }
 
+            builder.Append(" start ").Append(name);
+            if (based != null)
+                builder.Append(' ').Append(based.Name);
+
+            Args = builder.ToString();
             return await ExecAsync().ConfigureAwait(false);
         }
 

src/ViewModels/GitFlowStart.cs

@@ -1,4 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -11,12 +13,18 @@ public Models.GitFlowBranchType Type
             private set;
         }
 
-        public string StartPoint
+        public List<Models.Branch> LocalBranches
         {
             get;
             private set;
         }
 
+        public Models.Branch StartPoint
+        {
+            get => _startPoint;
+            set => SetProperty(ref _startPoint, value);
+        }
+
         public string Prefix
         {
             get;
@@ -38,11 +46,21 @@ public GitFlowStart(Repository repo, Models.GitFlowBranchType type)
 
             Type = type;
             Prefix = _repo.GitFlow.GetPrefix(type);
-            StartPoint = type switch
+            LocalBranches = new List<Models.Branch>();
+
+            foreach (var b in _repo.Branches)
+            {
+                if (b.IsLocal && !b.IsDetachedHead)
+                    LocalBranches.Add(b);
+            }
+
+            var defBranch = type switch
             {
                 Models.GitFlowBranchType.Hotfix => _repo.GitFlow.ProductionBranch,
                 _ => _repo.GitFlow.DevelopmentBranch,
             };
+
+            StartPoint = LocalBranches.Find(b => b.Name.Equals(defBranch, StringComparison.Ordinal));
         }
 
         public static ValidationResult ValidateBranchName(string name, ValidationContext ctx)
@@ -70,13 +88,14 @@ public override async Task<bool> Sure()
 
             var succ = await new Commands.GitFlow(_repo.FullPath)
                 .Use(log)
-                .StartAsync(Type, _name);
+                .StartAsync(Type, _name, _startPoint);
 
             log.Complete();
             return succ;
         }
 
         private readonly Repository _repo;
         private string _name = null;
+        private Models.Branch _startPoint = null;
     }
 }

src/Views/GitFlowStart.axaml

@@ -33,13 +33,12 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.GitFlow.StartAt}"/>
-      <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
-        <Path Width="14" Height="14"
-              Data="{StaticResource Icons.Branch}"/>
-        <TextBlock Margin="8,0,0,0"
-                   VerticalAlignment="Center"
-                   Text="{Binding StartPoint, Mode=OneWay}"/>
-      </StackPanel>
+      <v:BranchSelector Grid.Row="0" Grid.Column="1"
+                        Height="28"
+                        VerticalAlignment="Center"
+                        Branches="{Binding LocalBranches, Mode=OneWay}"
+                        SelectedBranch="{Binding StartPoint, Mode=TwoWay}"
+                        UsePureName="True"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"