mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 20:24:59 +00:00
code_review: PR #692
* 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:
parent
8935bdd4c9
commit
fd5c1f5105
3 changed files with 24 additions and 50 deletions
|
@ -1,5 +1,4 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace SourceGit.ViewModels
|
||||
{
|
||||
|
@ -57,34 +56,12 @@ namespace SourceGit.ViewModels
|
|||
|
||||
if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null)
|
||||
{
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
SetProgressDescription("Deleting remote-tracking branch...");
|
||||
Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name);
|
||||
}
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue