dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 12:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: wait a while after branch changed (#1254)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-28 16:19:40 +08:00
parent 2698427cd0
commit 30d42b11e2
No known key found for this signature in database
3 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ViewModels/Checkout.cs
View file

@ -62,6 +62,8 @@ namespace SourceGit.ViewModels
CallUIThread(() => CallUIThread(() =>
{ {
ProgressDescription = "Waiting for branch updated...";
var b = _repo.Branches.Find(x => x.IsLocal && x.Name == Branch); var b = _repo.Branches.Find(x => x.IsLocal && x.Name == Branch);
if (b != null && _repo.HistoriesFilterMode == Models.FilterMode.Included) if (b != null && _repo.HistoriesFilterMode == Models.FilterMode.Included)
_repo.SetBranchFilterMode(b, Models.FilterMode.Included, true, false); _repo.SetBranchFilterMode(b, Models.FilterMode.Included, true, false);
@ -70,6 +72,7 @@ namespace SourceGit.ViewModels
_repo.SetWatcherEnabled(true); _repo.SetWatcherEnabled(true);
}); });
Task.Delay(400).Wait();
return rs; return rs;
}); });
} }

6
src/ViewModels/CreateBranch.cs
View file

@ -150,6 +150,12 @@ namespace SourceGit.ViewModels
_repo.SetWatcherEnabled(true); _repo.SetWatcherEnabled(true);
}); });
if (CheckoutAfterCreated)
{
CallUIThread(() => ProgressDescription = "Waiting for branch updated...");
Task.Delay(400).Wait();
}
return true; return true;
}); });
} }

7
src/ViewModels/RenameBranch.cs
View file

@ -58,12 +58,15 @@ namespace SourceGit.ViewModels
return Task.Run(() => return Task.Run(() =>
{ {
var isCurrent = Target.IsCurrent;
var oldName = Target.FullName; var oldName = Target.FullName;
var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, fixedName, log); var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, fixedName, log);
log.Complete(); log.Complete();
CallUIThread(() => CallUIThread(() =>
{ {
ProgressDescription = "Waiting for branch updated...";
if (succ) if (succ)
{ {
foreach (var filter in _repo.Settings.HistoriesFilters) foreach (var filter in _repo.Settings.HistoriesFilters)
@ -80,6 +83,10 @@ namespace SourceGit.ViewModels
_repo.MarkBranchesDirtyManually(); _repo.MarkBranchesDirtyManually();
_repo.SetWatcherEnabled(true); _repo.SetWatcherEnabled(true);
}); });
if (isCurrent)
Task.Delay(400).Wait();
return succ; return succ;
}); });
} }