Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/Commands/Branch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,27 @@ public static bool DeleteRemote(string repo, string remote, string name)
cmd.Args = $"push {remote} --delete {name}";
return cmd.Exec();
}

public static bool DeleteRemoteTracking(string repo, string name)
{
var cmd = new Command();
cmd.WorkingDirectory = repo;
cmd.Context = repo;
cmd.Args = $"branch -D -r {name}";
return cmd.Exec();
}

public static bool HasRemote(string repo, string remote, string name)
{
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;
}
}
}
31 changes: 27 additions & 4 deletions src/ViewModels/DeleteBranch.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System;
using System.Threading.Tasks;

namespace SourceGit.ViewModels
{
Expand Down Expand Up @@ -56,12 +57,34 @@ public override Task<bool> Sure()

if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null)
{
SetProgressDescription("Deleting tracking remote branch...");
Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name);

if (Commands.Branch.HasRemote(_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
else if(!Commands.Branch.HasRemote(_repo.FullPath, Target.Remote, Target.Name))
{
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);
}

Expand Down
Loading