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

feature: supports filter submodules (#443)

Browse source
This commit is contained in:
leo 2024-09-06 09:57:22 +08:00
parent 0e774ee035
commit b1457fe39d
No known key found for this signature in database
9 changed files with 60 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/ViewModels/Repository.cs
View file

@ -83,17 +83,18 @@ namespace SourceGit.ViewModels
}
}
public string SearchBranchFilter
public string Filter
{
get => _searchBranchFilter;
get => _filter;
set
{
if (SetProperty(ref _searchBranchFilter, value))
if (SetProperty(ref _filter, value))
{
var builder = BuildBranchTree(_branches, _remotes);
LocalBranchTrees = builder.Locals;
RemoteBranchTrees = builder.Remotes;
VisibleTags = BuildVisibleTags();
VisibleSubmodules = BuildVisibleSubmodules();
}
}
}
@ -152,6 +153,12 @@ namespace SourceGit.ViewModels
private set => SetProperty(ref _submodules, value);
}
public List<Models.Submodule> VisibleSubmodules
{
get => _visibleSubmodules;
private set => SetProperty(ref _visibleSubmodules, value);
}
public int LocalChangesCount
{
get => _localChangesCount;
@ -391,6 +398,7 @@ namespace SourceGit.ViewModels
_tags.Clear();
_visibleTags.Clear();
_submodules.Clear();
_visibleSubmodules.Clear();
_searchedCommits.Clear();
_revisionFiles.Clear();
@ -525,6 +533,11 @@ namespace SourceGit.ViewModels
PopupHost.ShowAndStartPopup(new Cleanup(this));
}
public void ClearFilter()
{
Filter = string.Empty;
}
public void ClearHistoriesFilter()
{
_settings.Filters.Clear();
@ -582,11 +595,6 @@ namespace SourceGit.ViewModels
});
}
public void ClearSearchBranchFilter()
{
SearchBranchFilter = string.Empty;
}
public void SetWatcherEnabled(bool enabled)
{
_watcher?.SetEnabled(enabled);
@ -811,7 +819,12 @@ namespace SourceGit.ViewModels
{
var submodules = new Commands.QuerySubmodules(_fullpath).Result();
_watcher?.SetSubmodules(submodules);
Dispatcher.UIThread.Invoke(() => Submodules = submodules);
Dispatcher.UIThread.Invoke(() =>
{
Submodules = submodules;
VisibleSubmodules = BuildVisibleSubmodules();
});
}
public void RefreshWorkingCopyChanges()
@ -1919,7 +1932,7 @@ namespace SourceGit.ViewModels
var builder = new BranchTreeNode.Builder();
builder.SetFilters(_settings.Filters);
if (string.IsNullOrEmpty(_searchBranchFilter))
if (string.IsNullOrEmpty(_filter))
{
builder.CollectExpandedNodes(_localBranchTrees, true);
builder.CollectExpandedNodes(_remoteBranchTrees, false);
@ -1930,7 +1943,7 @@ namespace SourceGit.ViewModels
var visibles = new List<Models.Branch>();
foreach (var b in branches)
{
if (b.FullName.Contains(_searchBranchFilter, StringComparison.OrdinalIgnoreCase))
if (b.FullName.Contains(_filter, StringComparison.OrdinalIgnoreCase))
visibles.Add(b);
}
@ -1943,7 +1956,7 @@ namespace SourceGit.ViewModels
private List<Models.Tag> BuildVisibleTags()
{
var visible = new List<Models.Tag>();
if (string.IsNullOrEmpty(_searchBranchFilter))
if (string.IsNullOrEmpty(_filter))
{
visible.AddRange(_tags);
}
@ -1951,7 +1964,7 @@ namespace SourceGit.ViewModels
{
foreach (var t in _tags)
{
if (t.Name.Contains(_searchBranchFilter, StringComparison.OrdinalIgnoreCase))
if (t.Name.Contains(_filter, StringComparison.OrdinalIgnoreCase))
visible.Add(t);
}
}
@ -1959,6 +1972,24 @@ namespace SourceGit.ViewModels
return visible;
}
private List<Models.Submodule> BuildVisibleSubmodules()
{
var visible = new List<Models.Submodule>();
if (string.IsNullOrEmpty(_filter))
{
visible.AddRange(_submodules);
}
else
{
foreach (var s in _submodules)
{
if (s.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase))
visible.Add(s);
}
}
return visible;
}
private void UpdateCurrentRevisionFilesForSearchSuggestion()
{
_revisionFiles.Clear();
@ -2002,8 +2033,7 @@ namespace SourceGit.ViewModels
private bool _isSubmoduleGroupExpanded = false;
private bool _isWorktreeGroupExpanded = false;
private string _searchBranchFilter = string.Empty;
private string _filter = string.Empty;
private List<Models.Remote> _remotes = new List<Models.Remote>();
private List<Models.Branch> _branches = new List<Models.Branch>();
private Models.Branch _currentBranch = null;
@ -2013,8 +2043,9 @@ namespace SourceGit.ViewModels
private List<Models.Tag> _tags = new List<Models.Tag>();
private List<Models.Tag> _visibleTags = new List<Models.Tag>();
private List<Models.Submodule> _submodules = new List<Models.Submodule>();
private bool _includeUntracked = true;
private List<Models.Submodule> _visibleSubmodules = new List<Models.Submodule>();
private bool _includeUntracked = true;
private InProgressContext _inProgressContext = null;
private bool _hasUnsolvedConflicts = false;
private Models.Commit _searchResultSelectedCommit = null;