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

fix<Filters>: remove from filters after a branch or tag deleted

Browse source
This commit is contained in:
leo 2021-08-28 20:56:50 +08:00
parent 16b324424c
commit 36b5c7b809
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Commands/Tag.cs
View file

@ -29,6 +29,11 @@ namespace SourceGit.Commands {
Args = $"tag --delete {name}"; Args = $"tag --delete {name}";
if (!Exec()) return false; if (!Exec()) return false;
var repo = Models.Preference.Instance.FindRepository(Cwd);
if (repo != null && repo.Filters.Contains(name)) {
repo.Filters.Remove(name);
}
if (push) { if (push) {
var remotes = new Remotes(Cwd).Result(); var remotes = new Remotes(Cwd).Result();
foreach (var r in remotes) { foreach (var r in remotes) {

10
src/Views/Popups/DeleteBranch.xaml.cs
View file

@ -27,11 +27,21 @@ namespace SourceGit.Views.Popups {
public override Task<bool> Start() { public override Task<bool> Start() {
return Task.Run(() => { return Task.Run(() => {
Models.Watcher.SetEnabled(repo, false); Models.Watcher.SetEnabled(repo, false);
var full = branch;
if (string.IsNullOrEmpty(remote)) { if (string.IsNullOrEmpty(remote)) {
full = $"refs/heads/{branch}";
new Commands.Branch(repo, branch).Delete(); new Commands.Branch(repo, branch).Delete();
} else { } else {
full = $"refs/remotes/{remote}/{branch}";
new Commands.Push(repo, remote, branch).Exec(); new Commands.Push(repo, remote, branch).Exec();
} }
var exists = Models.Preference.Instance.FindRepository(repo);
if (exists != null && exists.Filters.Contains(full)) {
exists.Filters.Remove(full);
}
Models.Watcher.SetEnabled(repo, true); Models.Watcher.SetEnabled(repo, true);
return true; return true;
}); });