github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-30 13:51:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
3 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ViewModels/DeleteBranch.cs
View File

@@ -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);
}