dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-07 20:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-23 11:27:45 +08:00
parent 594ffc0d1a
commit 76a197aae7
No known key found for this signature in database
9 changed files with 74 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/ViewModels/CreateBranch.cs
View file

@ -43,6 +43,16 @@ namespace SourceGit.ViewModels
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 @@ namespace SourceGit.ViewModels
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!");
var fixedName = creator.FixName(name);
foreach (var b in creator._repo.Branches)
if (ctx.ObjectInstance is CreateBranch creator)
{
if (b.FriendlyName == fixedName)
return new ValidationResult("A branch with same name already exists!");
}
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!");
}
}
return ValidationResult.Success;
return ValidationResult.Success;
}
else
{
return new ValidationResult("Missing runtime context to create branch!");
}
}
public override Task<bool> Sure()
@ -119,7 +135,7 @@ namespace SourceGit.ViewModels
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 @@ namespace SourceGit.ViewModels
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 @@ namespace SourceGit.ViewModels
}
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 @@ namespace SourceGit.ViewModels
private readonly Repository _repo = null;
private string _name = null;
private readonly string _baseOnRevision = null;
private bool _allowOverwrite = false;
}
}

4
src/ViewModels/InitGitFlow.cs
View file

@ -116,7 +116,7 @@ namespace SourceGit.ViewModels
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 @@ namespace SourceGit.ViewModels
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();

2
src/ViewModels/ResetWithoutCheckout.cs
View file

@ -40,7 +40,7 @@ namespace SourceGit.ViewModels
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;