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

fix: auto-filter does not work well (#855)

Browse source
This commit is contained in:
leo 2025-01-02 19:49:14 +08:00
parent 127315528a
commit 4e06944c9f
No known key found for this signature in database
5 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/ViewModels/Repository.cs
View file

@ -770,21 +770,27 @@ namespace SourceGit.ViewModels
{
var changed = _settings.UpdateHistoriesFilter(tag.Name, Models.FilterType.Tag, mode);
if (changed)
RefreshHistoriesFilters();
RefreshHistoriesFilters(true);
}
public void SetBranchFilterMode(Models.Branch branch, Models.FilterMode mode)
public void SetBranchFilterMode(Models.Branch branch, Models.FilterMode mode, bool clearExists, bool refresh)
{
var node = FindBranchNode(branch.IsLocal ? _localBranchTrees : _remoteBranchTrees, branch.FullName);
if (node != null)
SetBranchFilterMode(node, mode);
SetBranchFilterMode(node, mode, clearExists, refresh);
}
public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode)
public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode, bool clearExists, bool refresh)
{
var isLocal = node.Path.StartsWith("refs/heads/", StringComparison.Ordinal);
var tree = isLocal ? _localBranchTrees : _remoteBranchTrees;
if (clearExists)
{
_settings.HistoriesFilters.Clear();
HistoriesFilterMode = Models.FilterMode.None;
}
if (node.Backend is Models.Branch branch)
{
var type = isLocal ? Models.FilterType.LocalBranch : Models.FilterType.RemoteBranch;
@ -822,7 +828,7 @@ namespace SourceGit.ViewModels
cur = parent;
} while (true);
RefreshHistoriesFilters();
RefreshHistoriesFilters(refresh);
}
public void StashAll(bool autoStart)
@ -2149,18 +2155,21 @@ namespace SourceGit.ViewModels
return visible;
}
private void RefreshHistoriesFilters()
private void RefreshHistoriesFilters(bool refresh)
{
var filters = _settings.CollectHistoriesFilters();
UpdateBranchTreeFilterMode(LocalBranchTrees, filters);
UpdateBranchTreeFilterMode(RemoteBranchTrees, filters);
UpdateTagFilterMode(filters);
if (_settings.HistoriesFilters.Count > 0)
HistoriesFilterMode = _settings.HistoriesFilters[0].Mode;
else
HistoriesFilterMode = Models.FilterMode.None;
if (!refresh)
return;
var filters = _settings.CollectHistoriesFilters();
UpdateBranchTreeFilterMode(LocalBranchTrees, filters);
UpdateBranchTreeFilterMode(RemoteBranchTrees, filters);
UpdateTagFilterMode(filters);
Task.Run(RefreshCommits);
}