michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-25 21:07:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_review: PR #692

Browse source 
* remove unnecessary namespace using
* move `Commands.Branch.HasRemote` to `Commands.Remote.HasBranch`
* remove `Commands.Branch.DeleteRemoteTracking` and check branch in `Commands.Branch.DeleteRemote` directly

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-11-13 10:04:28 +08:00
parent 8935bdd4c9
commit fd5c1f5105
No known key found for this signature in database
3 changed files with 24 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/Commands/Branch.cs
View file

@ -48,31 +48,19 @@
var cmd = new Command(); var cmd = new Command();
cmd.WorkingDirectory = repo; cmd.WorkingDirectory = repo;
cmd.Context = repo; cmd.Context = repo;
cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
cmd.Args = $"push {remote} --delete {name}";
return cmd.Exec();
}
public static bool DeleteRemoteTracking(string repo, string name) bool exists = new Remote(repo).HasBranch(remote, name);
{ if (exists)
var cmd = new Command(); {
cmd.WorkingDirectory = repo; cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
cmd.Context = repo; cmd.Args = $"push {remote} --delete {name}";
cmd.Args = $"branch -D -r {name}"; }
return cmd.Exec(); else
} {
cmd.Args = $"branch -D -r {remote}/{name}";
}
public static bool HasRemote(string repo, string remote, string name) return cmd.Exec();
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
cmd.Args = $"ls-remote {remote} {name}";
var rs = cmd.ReadToEnd();
return rs.StdOut.Length > 0;
} }
} }
} }

9
src/Commands/Remote.cs
View file

@ -45,5 +45,14 @@
Args = "remote set-url" + (isPush ? " --push " : " ") + $"{name} {url}"; Args = "remote set-url" + (isPush ? " --push " : " ") + $"{name} {url}";
return Exec(); return Exec();
} }
public bool HasBranch(string remote, string branch)
{
SSHKey = new Config(WorkingDirectory).Get($"remote.{remote}.sshkey");
Args = $"ls-remote {remote} {branch}";
var rs = ReadToEnd();
return rs.IsSuccess && rs.StdOut.Trim().Length > 0;
}
} }
} }

31
src/ViewModels/DeleteBranch.cs
View file

@ -1,5 +1,4 @@
using System; using System.Threading.Tasks;
using System.Threading.Tasks;
namespace SourceGit.ViewModels namespace SourceGit.ViewModels
{ {
@ -57,34 +56,12 @@ namespace SourceGit.ViewModels
if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null) if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null)
{ {
SetProgressDescription("Deleting remote-tracking branch...");
if (Commands.Branch.HasRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name)) Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name);
{
SetProgressDescription("Deleting remote-tracking branch and remote branch...");
Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name);
}
else
{
SetProgressDescription("Deleting remote-tracking branch...");
var remoteTrackingBranch = $"{TrackingRemoteBranch.Remote}/{TrackingRemoteBranch.Name}";
Commands.Branch.DeleteRemoteTracking(_repo.FullPath, remoteTrackingBranch);
}
} }
} }
else if(!Commands.Branch.HasRemote(_repo.FullPath, Target.Remote, Target.Name)) else
{ {
SetProgressDescription("Remote branch not found. Deleting remote-tracking branch...");
var remoteTrackingBranch = $"{Target.Remote}/{Target.Name}";
Commands.Branch.DeleteRemoteTracking(_repo.FullPath, remoteTrackingBranch);
}
else
{
SetProgressDescription("Deleting remote-tracking branch...");
Commands.Branch.DeleteRemote(_repo.FullPath, Target.Remote, Target.Name); Commands.Branch.DeleteRemote(_repo.FullPath, Target.Remote, Target.Name);
} }