feature: supports to overwrite existing branch while creating new branch (#1349)

love-linger · love-linger · commit 76a197aae760 · 2025-05-23T11:27:45.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/Branch.cs b/src/Commands/Branch.cs
@@ -1,4 +1,6 @@
-﻿namespace SourceGit.Commands
+﻿using System.Text;
+
+namespace SourceGit.Commands
 {
     public static class Branch
     {
@@ -11,12 +13,20 @@ public static string ShowCurrent(string repo)
             return cmd.ReadToEnd().StdOut.Trim();
         }
 
-        public static bool Create(string repo, string name, string basedOn, Models.ICommandLog log)
+        public static bool Create(string repo, string name, string basedOn, bool force, Models.ICommandLog log)
         {
+            var builder = new StringBuilder();
+            builder.Append("branch ");
+            if (force)
+                builder.Append("-f ");
+            builder.Append(name);
+            builder.Append(" ");
+            builder.Append(basedOn);
+
             var cmd = new Command();
             cmd.WorkingDirectory = repo;
             cmd.Context = repo;
-            cmd.Args = $"branch {name} {basedOn}";
+            cmd.Args = builder.ToString();
             cmd.Log = log;
             return cmd.Exec();
         }
@@ -31,16 +41,6 @@ public static bool Rename(string repo, string name, string to, Models.ICommandLo
             return cmd.Exec();
         }
 
-        public static bool ResetWithoutCheckout(string repo, string name, string to, Models.ICommandLog log)
-        {
-            var cmd = new Command();
-            cmd.WorkingDirectory = repo;
-            cmd.Context = repo;
-            cmd.Args = $"branch -f {name} {to}";
-            cmd.Log = log;
-            return cmd.Exec();
-        }
-
         public static bool SetUpstream(string repo, string name, string upstream, Models.ICommandLog log)
         {
             var cmd = new Command();
diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs
@@ -13,15 +13,28 @@ public Checkout(string repo)
 
         public bool Branch(string branch, bool force)
         {
-            var option = force ? "--force" : string.Empty;
-            Args = $"checkout {option} --progress {branch}";
+            var builder = new StringBuilder();
+            builder.Append("checkout --progress ");
+            if (force)
+                builder.Append("--force ");
+            builder.Append(branch);
+
+            Args = builder.ToString();
             return Exec();
         }
 
-        public bool Branch(string branch, string basedOn, bool force)
+        public bool Branch(string branch, string basedOn, bool force, bool allowOverwrite)
         {
-            var option = force ? "--force" : string.Empty;
-            Args = $"checkout --progress -b {branch} {basedOn}";
+            var builder = new StringBuilder();
+            builder.Append("checkout --progress ");
+            builder.Append(allowOverwrite ? "-B " : "-b ");
+            if (force)
+                builder.Append("--force ");
+            builder.Append(branch);
+            builder.Append(" ");
+            builder.Append(basedOn);
+
+            Args = builder.ToString();
             return Exec();
         }
 
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -217,6 +217,7 @@
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">Enter branch name.</x:String>
   <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">Spaces will be replaced with dashes.</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">Create Local Branch</x:String>
+  <x:String x:Key="Text.CreateBranch.OverwriteExisting" xml:space="preserve">Overwrite existing branch</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">Create Tag...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">New Tag At:</x:String>
   <x:String x:Key="Text.CreateTag.GPGSign" xml:space="preserve">GPG signing</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
@@ -221,6 +221,7 @@
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">填写分支名称。</x:String>
   <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">空格将被替换为'-'符号</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">创建本地分支</x:String>
+  <x:String x:Key="Text.CreateBranch.OverwriteExisting" xml:space="preserve">允许重置已存在的分支</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">新建标签 ...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">标签位于 ：</x:String>
   <x:String x:Key="Text.CreateTag.GPGSign" xml:space="preserve">使用GPG签名</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
@@ -221,6 +221,7 @@
   <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">輸入分支名稱。</x:String>
   <x:String x:Key="Text.CreateBranch.Name.WarnSpace" xml:space="preserve">空格將以英文破折號取代</x:String>
   <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">建立本機分支</x:String>
+  <x:String x:Key="Text.CreateBranch.OverwriteExisting" xml:space="preserve">允許覆寫現有分支</x:String>
   <x:String x:Key="Text.CreateTag" xml:space="preserve">新增標籤...</x:String>
   <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">標籤位於:</x:String>
   <x:String x:Key="Text.CreateTag.GPGSign" xml:space="preserve">使用 GPG 簽章</x:String>
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
@@ -43,6 +43,16 @@ public bool IsBareRepository
             get => _repo.IsBare;
         }
 
+        public bool AllowOverwrite
+        {
+            get => _allowOverwrite;
+            set
+            {
+                if (SetProperty(ref _allowOverwrite, value))
+                    ValidateProperty(_name, nameof(Name));
+            }
+        }
+
         public bool IsRecurseSubmoduleVisible
         {
             get => _repo.Submodules.Count > 0;
@@ -88,18 +98,24 @@ public CreateBranch(Repository repo, Models.Tag tag)
 
         public static ValidationResult ValidateBranchName(string name, ValidationContext ctx)
         {
-            var creator = ctx.ObjectInstance as CreateBranch;
-            if (creator == null)
-                return new ValidationResult("Missing runtime context to create branch!");
+            if (ctx.ObjectInstance is CreateBranch creator)
+            {
+                if (!creator._allowOverwrite)
+                {
+                    var fixedName = creator.FixName(name);
+                    foreach (var b in creator._repo.Branches)
+                    {
+                        if (b.FriendlyName == fixedName)
+                            return new ValidationResult("A branch with same name already exists!");
+                    }
+                }
 
-            var fixedName = creator.FixName(name);
-            foreach (var b in creator._repo.Branches)
+                return ValidationResult.Success;
+            }
+            else
             {
-                if (b.FriendlyName == fixedName)
-                    return new ValidationResult("A branch with same name already exists!");
+                return new ValidationResult("Missing runtime context to create branch!");
             }
-
-            return ValidationResult.Success;
         }
 
         public override Task<bool> Sure()
@@ -119,7 +135,7 @@ public override Task<bool> Sure()
                     var needPopStash = false;
                     if (DiscardLocalChanges)
                     {
-                        succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, true);
+                        succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, true, _allowOverwrite);
                     }
                     else
                     {
@@ -137,7 +153,7 @@ public override Task<bool> Sure()
                             needPopStash = true;
                         }
 
-                        succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, false);
+                        succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, false, _allowOverwrite);
                     }
 
                     if (succ)
@@ -155,7 +171,7 @@ public override Task<bool> Sure()
                 }
                 else
                 {
-                    succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision, log);
+                    succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision, _allowOverwrite, log);
                 }
 
                 log.Complete();
@@ -201,5 +217,6 @@ private string FixName(string name)
         private readonly Repository _repo = null;
         private string _name = null;
         private readonly string _baseOnRevision = null;
+        private bool _allowOverwrite = false;
     }
 }
diff --git a/src/ViewModels/InitGitFlow.cs b/src/ViewModels/InitGitFlow.cs
@@ -116,7 +116,7 @@ public override Task<bool> Sure()
                 var masterBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_master, StringComparison.Ordinal));
                 if (masterBranch == null)
                 {
-                    succ = Commands.Branch.Create(_repo.FullPath, _master, current.Head, log);
+                    succ = Commands.Branch.Create(_repo.FullPath, _master, current.Head, true, log);
                     if (!succ)
                     {
                         log.Complete();
@@ -128,7 +128,7 @@ public override Task<bool> Sure()
                 var developBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_develop, StringComparison.Ordinal));
                 if (developBranch == null)
                 {
-                    succ = Commands.Branch.Create(_repo.FullPath, _develop, current.Head, log);
+                    succ = Commands.Branch.Create(_repo.FullPath, _develop, current.Head, true, log);
                     if (!succ)
                     {
                         log.Complete();
diff --git a/src/ViewModels/ResetWithoutCheckout.cs b/src/ViewModels/ResetWithoutCheckout.cs
@@ -40,7 +40,7 @@ public override Task<bool> Sure()
 
             return Task.Run(() =>
             {
-                var succ = Commands.Branch.ResetWithoutCheckout(_repo.FullPath, Target.Name, _revision, log);
+                var succ = Commands.Branch.Create(_repo.FullPath, Target.Name, _revision, true, log);
                 log.Complete();
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return succ;
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
@@ -14,7 +14,7 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.CreateBranch.Title}"/>
-    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,Auto,Auto,Auto" ColumnDefinitions="140,*">
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32,Auto,32,Auto,Auto,Auto" ColumnDefinitions="140,*">
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
@@ -80,11 +80,16 @@
       </Border>
 
       <CheckBox Grid.Row="4" Grid.Column="1"
+                Content="{DynamicResource Text.CreateBranch.OverwriteExisting}"
+                IsChecked="{Binding AllowOverwrite, Mode=TwoWay}"
+                ToolTip.Tip="checkout -B or branch -f"/>
+
+      <CheckBox Grid.Row="5" Grid.Column="1"
                 Content="{DynamicResource Text.CreateBranch.Checkout}"
                 IsChecked="{Binding CheckoutAfterCreated, Mode=TwoWay}"
                 IsVisible="{Binding !IsBareRepository}"/>
 
-      <CheckBox Grid.Row="5" Grid.Column="1"
+      <CheckBox Grid.Row="6" Grid.Column="1"
                 Content="{DynamicResource Text.Checkout.RecurseSubmodules}"
                 IsChecked="{Binding RecurseSubmodules, Mode=TwoWay}"
                 ToolTip.Tip="--recurse-submodules">

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,16 @@ public bool IsBareRepository`
`43`	`43`	`get => _repo.IsBare;`
`44`	`44`	`}`
`45`	`45`
	`46`	`+ public bool AllowOverwrite`
	`47`	`+ {`
	`48`	`+ get => _allowOverwrite;`
	`49`	`+ set`
	`50`	`+ {`
	`51`	`+ if (SetProperty(ref _allowOverwrite, value))`
	`52`	`+ ValidateProperty(_name, nameof(Name));`
	`53`	`+ }`
	`54`	`+ }`
	`55`	`+`
`46`	`56`	`public bool IsRecurseSubmoduleVisible`
`47`	`57`	`{`
`48`	`58`	`get => _repo.Submodules.Count > 0;`
`@@ -88,18 +98,24 @@ public CreateBranch(Repository repo, Models.Tag tag)`
`88`	`98`
`89`	`99`	`public static ValidationResult ValidateBranchName(string name, ValidationContext ctx)`
`90`	`100`	`{`
`91`		`- var creator = ctx.ObjectInstance as CreateBranch;`
`92`		`- if (creator == null)`
`93`		`- return new ValidationResult("Missing runtime context to create branch!");`
	`101`	`+ if (ctx.ObjectInstance is CreateBranch creator)`
	`102`	`+ {`
	`103`	`+ if (!creator._allowOverwrite)`
	`104`	`+ {`
	`105`	`+ var fixedName = creator.FixName(name);`
	`106`	`+ foreach (var b in creator._repo.Branches)`
	`107`	`+ {`
	`108`	`+ if (b.FriendlyName == fixedName)`
	`109`	`+ return new ValidationResult("A branch with same name already exists!");`
	`110`	`+ }`
	`111`	`+ }`
`94`	`112`
`95`		`- var fixedName = creator.FixName(name);`
`96`		`- foreach (var b in creator._repo.Branches)`
	`113`	`+ return ValidationResult.Success;`
	`114`	`+ }`
	`115`	`+ else`
`97`	`116`	`{`
`98`		`- if (b.FriendlyName == fixedName)`
`99`		`- return new ValidationResult("A branch with same name already exists!");`
	`117`	`+ return new ValidationResult("Missing runtime context to create branch!");`
`100`	`118`	`}`
`101`		`-`
`102`		`- return ValidationResult.Success;`
`103`	`119`	`}`
`104`	`120`
`105`	`121`	`public override Task<bool> Sure()`
`@@ -119,7 +135,7 @@ public override Task<bool> Sure()`
`119`	`135`	`var needPopStash = false;`
`120`	`136`	`if (DiscardLocalChanges)`
`121`	`137`	`{`
`122`		`- succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, true);`
	`138`	`+ succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, true, _allowOverwrite);`
`123`	`139`	`}`
`124`	`140`	`else`
`125`	`141`	`{`
`@@ -137,7 +153,7 @@ public override Task<bool> Sure()`
`137`	`153`	`needPopStash = true;`
`138`	`154`	`}`
`139`	`155`
`140`		`- succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, false);`
	`156`	`+ succ = new Commands.Checkout(_repo.FullPath).Use(log).Branch(fixedName, _baseOnRevision, false, _allowOverwrite);`
`141`	`157`	`}`
`142`	`158`
`143`	`159`	`if (succ)`
`@@ -155,7 +171,7 @@ public override Task<bool> Sure()`
`155`	`171`	`}`
`156`	`172`	`else`
`157`	`173`	`{`
`158`		`- succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision, log);`
	`174`	`+ succ = Commands.Branch.Create(_repo.FullPath, fixedName, _baseOnRevision, _allowOverwrite, log);`
`159`	`175`	`}`
`160`	`176`
`161`	`177`	`log.Complete();`
`@@ -201,5 +217,6 @@ private string FixName(string name)`
`201`	`217`	`private readonly Repository _repo = null;`
`202`	`218`	`private string _name = null;`
`203`	`219`	`private readonly string _baseOnRevision = null;`
	`220`	`+ private bool _allowOverwrite = false;`
`204`	`221`	`}`
`205`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public override Task<bool> Sure()`
`116`	`116`	`var masterBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_master, StringComparison.Ordinal));`
`117`	`117`	`if (masterBranch == null)`
`118`	`118`	`{`
`119`		`- succ = Commands.Branch.Create(_repo.FullPath, _master, current.Head, log);`
	`119`	`+ succ = Commands.Branch.Create(_repo.FullPath, _master, current.Head, true, log);`
`120`	`120`	`if (!succ)`
`121`	`121`	`{`
`122`	`122`	`log.Complete();`
`@@ -128,7 +128,7 @@ public override Task<bool> Sure()`
`128`	`128`	`var developBranch = _repo.Branches.Find(x => x.IsLocal && x.Name.Equals(_develop, StringComparison.Ordinal));`
`129`	`129`	`if (developBranch == null)`
`130`	`130`	`{`
`131`		`- succ = Commands.Branch.Create(_repo.FullPath, _develop, current.Head, log);`
	`131`	`+ succ = Commands.Branch.Create(_repo.FullPath, _develop, current.Head, true, log);`
`132`	`132`	`if (!succ)`
`133`	`133`	`{`
`134`	`134`	`log.Complete();`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public override Task<bool> Sure()`
`40`	`40`
`41`	`41`	`return Task.Run(() =>`
`42`	`42`	`{`
`43`		`- var succ = Commands.Branch.ResetWithoutCheckout(_repo.FullPath, Target.Name, _revision, log);`
	`43`	`+ var succ = Commands.Branch.Create(_repo.FullPath, Target.Name, _revision, true, log);`
`44`	`44`	`log.Complete();`
`45`	`45`	`CallUIThread(() => _repo.SetWatcherEnabled(true));`
`46`	`46`	`return succ;`