refactor: rewrite the histories filter function to supports both include and exclude modes (#690)

Signed-off-by: leo <longshuang@msn.cn>

src/Models/Filter.cs

@@ -0,0 +1,60 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.Models
+{
+    public enum FilterType
+    {
+        LocalBranch = 0,
+        LocalBranchFolder,
+        RemoteBranch,
+        RemoteBranchFolder,
+        Tag,
+    }
+
+    public enum FilterMode
+    {
+        None = 0,
+        Included,
+        Excluded,
+    }
+
+    public class Filter : ObservableObject
+    {
+        public string Pattern 
+        {
+            get => _pattern;
+            set => SetProperty(ref _pattern, value);
+        }
+
+        public FilterType Type 
+        {
+            get;
+            set;
+        } = FilterType.LocalBranch;
+
+        public FilterMode Mode 
+        {
+            get => _mode;
+            set => SetProperty(ref _mode, value);
+        }
+
+        public bool IsBranch
+        {
+            get => Type != FilterType.Tag;
+        }
+
+        public Filter()
+        {
+        }
+
+        public Filter(string pattern, FilterType type, FilterMode mode)
+        {
+            _pattern = pattern;
+            _mode = mode;
+            Type = type;
+        }
+
+        private string _pattern = string.Empty;
+        private FilterMode _mode = FilterMode.None;
+    }
+}

src/Models/RepositorySettings.cs

@@ -1,4 +1,9 @@
-using Avalonia.Collections;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Avalonia.Collections;
+using Avalonia.Threading;
 
 namespace SourceGit.Models
 {
@@ -76,11 +81,11 @@ namespace SourceGit.Models
             set;
         } = true;
 
-        public AvaloniaList<string> Filters
+        public AvaloniaList<Filter> HistoriesFilters
         {
             get;
             set;
-        } = new AvaloniaList<string>();
+        } = new AvaloniaList<Filter>();
 
         public AvaloniaList<CommitTemplate> CommitTemplates
         {
@@ -148,6 +153,177 @@ namespace SourceGit.Models
             set;
         } = "---";
 
+        public FilterMode GetHistoriesFilterMode(string pattern, FilterType type)
+        {
+            foreach (var filter in HistoriesFilters)
+            {
+                if (filter.Type != type)
+                    continue;
+
+                if (filter.Pattern.Equals(pattern, StringComparison.Ordinal))
+                    return filter.Mode;
+            }
+
+            return FilterMode.None;
+        }
+
+        public bool UpdateHistoriesFilter(string pattern, FilterType type, FilterMode mode)
+        {
+            for (int i = 0; i < HistoriesFilters.Count; i++)
+            {
+                var filter = HistoriesFilters[i];
+                if (filter.Type != type)
+                    continue;
+
+                if (filter.Pattern.Equals(pattern, StringComparison.Ordinal))
+                {
+                    if (mode == FilterMode.None)
+                    {
+                        HistoriesFilters.RemoveAt(i);
+                        return true;
+                    }
+
+                    if (mode != filter.Mode)
+                    {
+                        filter.Mode = mode;
+                        return true;
+                    }
+                }
+            }
+
+            if (mode != FilterMode.None)
+            {
+                HistoriesFilters.Add(new Filter(pattern, type, mode));
+                return true;
+            }
+
+            return false;
+        }
+
+        public string BuildHistoriesFilter()
+        {
+            var builder = new StringBuilder();
+
+            var excludedBranches = new List<string>();
+            var excludedRemotes = new List<string>();
+            var excludedTags = new List<string>();
+            var includedBranches = new List<string>();
+            var includedRemotes = new List<string>();
+            var includedTags = new List<string>();
+            foreach (var filter in HistoriesFilters)
+            {
+                if (filter.Type == FilterType.LocalBranch)
+                {
+                    var name = filter.Pattern.Substring(11);
+                    var b = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+                    
+                    if (filter.Mode == FilterMode.Included)
+                        includedBranches.Add(b);
+                    else if (filter.Mode == FilterMode.Excluded)
+                        excludedBranches.Add(b);
+                }
+                else if (filter.Type == FilterType.LocalBranchFolder)
+                {
+                    if (filter.Mode == FilterMode.Included)
+                        includedBranches.Add($"{filter.Pattern.Substring(11)}/*");
+                    else if (filter.Mode == FilterMode.Excluded)
+                        excludedBranches.Add($"{filter.Pattern.Substring(11)}/*");
+                }
+                else if (filter.Type == FilterType.RemoteBranch)
+                {
+                    var name = filter.Pattern.Substring(13);
+                    var r = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+
+                    if (filter.Mode == FilterMode.Included)
+                        includedRemotes.Add(r);
+                    else if (filter.Mode == FilterMode.Excluded)
+                        excludedRemotes.Add(r);
+                }
+                else if (filter.Type == FilterType.RemoteBranchFolder)
+                {
+                    if (filter.Mode == FilterMode.Included)
+                        includedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
+                    else if (filter.Mode == FilterMode.Excluded)
+                        excludedRemotes.Add($"{filter.Pattern.Substring(13)}/*");
+                }
+                else if (filter.Type == FilterType.Tag)
+                {
+                    var name = filter.Pattern;
+                    var t = $"{name.Substring(0, name.Length - 1)}[{name[^1]}]";
+
+                    if (filter.Mode == FilterMode.Included)
+                        includedTags.Add(t);
+                    else if (filter.Mode == FilterMode.Excluded)
+                        excludedTags.Add(t);
+                }
+            }
+
+            foreach (var b in excludedBranches)
+            {
+                builder.Append("--exclude=");
+                builder.Append(b);
+                builder.Append(' ');
+            }
+
+            if (includedBranches.Count > 0)
+            {
+                foreach (var b in includedBranches)
+                {
+                    builder.Append("--branches=");
+                    builder.Append(b);
+                    builder.Append(' ');
+                }
+            }
+            else if (excludedBranches.Count > 0)
+            {
+                builder.Append("--branches ");
+            }
+
+            foreach (var r in excludedRemotes)
+            {
+                builder.Append("--exclude=");
+                builder.Append(r);
+                builder.Append(' ');
+            }
+
+            if (includedRemotes.Count > 0)
+            {
+                foreach (var r in includedRemotes)
+                {
+                    builder.Append("--remotes=");
+                    builder.Append(r);
+                    builder.Append(' ');
+                }
+            }
+            else if (excludedRemotes.Count > 0)
+            {
+                builder.Append("--remotes ");
+            }
+
+            foreach (var t in excludedTags)
+            {
+                builder.Append("--exclude=");
+                builder.Append(t);
+                builder.Append(' ');
+            }
+
+            if (includedTags.Count > 0)
+            {
+                foreach (var t in includedTags)
+                {
+                    builder.Append("--tags=");
+                    builder.Append(t);
+                    builder.Append(' ');
+                }
+            }
+            else if (excludedTags.Count > 0)
+            {
+                builder.Append("--tags ");
+            }
+
+            return builder.ToString();
+        }
+
         public void PushCommitMessage(string message)
         {
             var existIdx = CommitMessages.IndexOf(message);

src/Models/Tag.cs

@@ -1,10 +1,19 @@
-namespace SourceGit.Models
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.Models
 {
-    public class Tag
+    public class Tag : ObservableObject
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
-        public string SHA { get; set; }
+        public string SHA { get; set; } = string.Empty;
-        public string Message { get; set; }
+        public string Message { get; set; } = string.Empty;
-        public bool IsFiltered { get; set; }
+
+        public FilterMode FilterMode
+        {
+            get => _filterMode;
+            set => SetProperty(ref _filterMode, value);
+        }
+
+        private FilterMode _filterMode = FilterMode.None;
     }
 }

src/Resources/Styles.axaml

@@ -1038,35 +1038,6 @@
     <Setter Property="Background" Value="Transparent"/>
   </Style>
 
-  <Style Selector="ToggleButton.filter">
-    <Setter Property="Margin" Value="0"/>
-    <Setter Property="Padding" Value="0"/>
-    <Setter Property="Background" Value="Transparent"/>
-    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-    <Setter Property="VerticalAlignment" Value="Stretch"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Border Background="Transparent">
-          <Path x:Name="PART_IndicatorIcon"
-                Width="12"
-                Data="{StaticResource Icons.Filter}"
-                Fill="Transparent"
-                StrokeThickness="1"
-                Stroke="{DynamicResource Brush.FG2}"
-                HorizontalAlignment="Center" VerticalAlignment="Center"/>
-        </Border>
-      </ControlTemplate>
-    </Setter>
-  </Style>
-  <Style Selector="ToggleButton.filter:pressed">
-    <Setter Property="RenderTransform" Value="scale(1)"/>
-  </Style>
-  <Style Selector="ToggleButton.filter:checked /template/ Path#PART_IndicatorIcon">
-    <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
-  </Style>
-  <Style Selector="ToggleButton.filter:pointerover /template/ Path#PART_IndicatorIcon">
-    <Setter Property="Stroke" Value="{DynamicResource Brush.Accent}"/>
-  </Style>
   <Style Selector="ToggleButton.tree_expander">
     <Setter Property="Margin" Value="0" />
     <Setter Property="Width" Value="9" />

src/ViewModels/BranchTreeNode.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -13,15 +11,16 @@ namespace SourceGit.ViewModels
     public class BranchTreeNode : ObservableObject
     {
         public string Name { get; private set; } = string.Empty;
+        public string Path { get; private set; } = string.Empty;
         public object Backend { get; private set; } = null;
         public int Depth { get; set; } = 0;
         public bool IsSelected { get; set; } = false;
         public List<BranchTreeNode> Children { get; private set; } = new List<BranchTreeNode>();
 
-        public bool IsFiltered
+        public Models.FilterMode FilterMode
         {
-            get => _isFiltered;
+            get => _filterMode;
-            set => SetProperty(ref _isFiltered, value);
+            set => SetProperty(ref _filterMode, value);
         }
 
         public bool IsExpanded
@@ -51,7 +50,7 @@ namespace SourceGit.ViewModels
             get => Backend is Models.Branch b ? b.FriendlyName : null;
         }
 
-        private bool _isFiltered = false;
+        private Models.FilterMode _filterMode = Models.FilterMode.None;
         private bool _isExpanded = false;
         private CornerRadius _cornerRadius = new CornerRadius(4);
 
@@ -60,18 +59,25 @@ namespace SourceGit.ViewModels
             public List<BranchTreeNode> Locals => _locals;
             public List<BranchTreeNode> Remotes => _remotes;
 
+            public Builder(Models.RepositorySettings settings)
+            {
+                _settings = settings;
+            }
+
             public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool bForceExpanded)
             {
                 var folders = new Dictionary<string, BranchTreeNode>();
 
                 foreach (var remote in remotes)
                 {
-                    var path = $"remote/{remote.Name}";
+                    var path = $"refs/remotes/{remote.Name}";
                     var node = new BranchTreeNode()
                     {
                         Name = remote.Name,
+                        Path = path,
                         Backend = remote,
                         IsExpanded = bForceExpanded || _expanded.Contains(path),
+                        FilterMode = _settings.GetHistoriesFilterMode(path, Models.FilterType.RemoteBranchFolder)
                     };
 
                     folders.Add(path, node);
@@ -80,16 +86,15 @@ namespace SourceGit.ViewModels
 
                 foreach (var branch in branches)
                 {
-                    var isFiltered = _filters.Contains(branch.FullName);
                     if (branch.IsLocal)
                     {
-                        MakeBranchNode(branch, _locals, folders, "local", isFiltered, bForceExpanded);
+                        MakeBranchNode(branch, _locals, folders, "refs/heads", bForceExpanded);
                     }
                     else
                     {
                         var remote = _remotes.Find(x => x.Name == branch.Remote);
                         if (remote != null)
-                            MakeBranchNode(branch, remote.Children, folders, $"remote/{remote.Name}", isFiltered, bForceExpanded);
+                            MakeBranchNode(branch, remote.Children, folders, $"refs/remotes/{remote.Name}", bForceExpanded);
                     }
                 }
 
@@ -98,42 +103,33 @@ namespace SourceGit.ViewModels
                 SortNodes(_remotes);
             }
 
-            public void SetFilters(AvaloniaList<string> filters)
+            public void CollectExpandedNodes(List<BranchTreeNode> nodes)
-            {
-                _filters.AddRange(filters);
-            }
-
-            public void CollectExpandedNodes(List<BranchTreeNode> nodes, bool isLocal)
-            {
-                CollectExpandedNodes(nodes, isLocal ? "local" : "remote");
-            }
-
-            private void CollectExpandedNodes(List<BranchTreeNode> nodes, string prefix)
             {
                 foreach (var node in nodes)
                 {
                     if (node.Backend is Models.Branch)
                         continue;
 
-                    var path = prefix + "/" + node.Name;
                     if (node.IsExpanded)
-                        _expanded.Add(path);
+                        _expanded.Add(node.Path);
 
-                    CollectExpandedNodes(node.Children, path);
+                    CollectExpandedNodes(node.Children);
                 }
             }
 
-            private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Dictionary<string, BranchTreeNode> folders, string prefix, bool isFiltered, bool bForceExpanded)
+            private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, Dictionary<string, BranchTreeNode> folders, string prefix, bool bForceExpanded)
             {
+                var fullpath = $"{prefix}/{branch.Name}";
                 var sepIdx = branch.Name.IndexOf('/', StringComparison.Ordinal);
                 if (sepIdx == -1 || branch.IsDetachedHead)
                 {
                     roots.Add(new BranchTreeNode()
                     {
                         Name = branch.Name,
+                        Path = fullpath,
                         Backend = branch,
                         IsExpanded = false,
-                        IsFiltered = isFiltered,
+                        FilterMode = _settings.GetHistoriesFilterMode(fullpath, branch.IsLocal ? Models.FilterType.LocalBranch : Models.FilterType.RemoteBranch),
                     });
                     return;
                 }
@@ -156,7 +152,9 @@ namespace SourceGit.ViewModels
                         lastFolder = new BranchTreeNode()
                         {
                             Name = name,
+                            Path = folder,
                             IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(folder),
+                            FilterMode = _settings.GetHistoriesFilterMode(folder, branch.IsLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder),
                         };
                         roots.Add(lastFolder);
                         folders.Add(folder, lastFolder);
@@ -166,7 +164,9 @@ namespace SourceGit.ViewModels
                         var cur = new BranchTreeNode()
                         {
                             Name = name,
+                            Path = folder,
                             IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(folder),
+                            FilterMode = _settings.GetHistoriesFilterMode(folder, branch.IsLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder),
                         };
                         lastFolder.Children.Add(cur);
                         folders.Add(folder, cur);
@@ -179,10 +179,11 @@ namespace SourceGit.ViewModels
 
                 lastFolder?.Children.Add(new BranchTreeNode()
                 {
-                    Name = Path.GetFileName(branch.Name),
+                    Name = System.IO.Path.GetFileName(branch.Name),
+                    Path = fullpath,
                     Backend = branch,
                     IsExpanded = false,
-                    IsFiltered = isFiltered,
+                    FilterMode = _settings.GetHistoriesFilterMode(fullpath, branch.IsLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder),
                 });
             }
 
@@ -203,10 +204,10 @@ namespace SourceGit.ViewModels
                     SortNodes(node.Children);
             }
 
+            private readonly Models.RepositorySettings _settings = null;
             private readonly List<BranchTreeNode> _locals = new List<BranchTreeNode>();
             private readonly List<BranchTreeNode> _remotes = new List<BranchTreeNode>();
             private readonly HashSet<string> _expanded = new HashSet<string>();
-            private readonly List<string> _filters = new List<string>();
         }
     }
 }

src/ViewModels/Checkout.cs

@@ -65,7 +65,7 @@ namespace SourceGit.ViewModels
                 {
                     var b = _repo.Branches.Find(x => x.IsLocal && x.Name == Branch);
                     if (b != null)
-                        _repo.AutoAddBranchFilterPostCheckout(b);
+                        _repo.UpdateHistoriesFilterAfterCheckout(b);
 
                     _repo.MarkBranchesDirtyManually();
                     _repo.SetWatcherEnabled(true);

src/ViewModels/CreateBranch.cs

@@ -127,7 +127,7 @@ namespace SourceGit.ViewModels
                 {
                     if (CheckoutAfterCreated)
                     {
-                        _repo.AutoAddBranchFilterPostCheckout(new Models.Branch()
+                        _repo.UpdateHistoriesFilterAfterCheckout(new Models.Branch()
                         {
                             FullName = $"refs/heads/{_name}",
                             Upstream = BasedOn is Models.Branch { IsLocal: false } remoteBranch ? remoteBranch.FullName : string.Empty,

src/ViewModels/RenameBranch.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -57,10 +58,17 @@ namespace SourceGit.ViewModels
                 var succ = Commands.Branch.Rename(_repo.FullPath, Target.Name, _name);
                 CallUIThread(() =>
                 {
-                    if (succ && _repo.Settings.Filters.Contains(oldName))
+                    if (succ)
                     {
-                        _repo.Settings.Filters.Remove(oldName);
+                        foreach (var filter in _repo.Settings.HistoriesFilters)
-                        _repo.Settings.Filters.Add($"refs/heads/{_name}");
+                        {
+                            if (filter.Type == Models.FilterType.LocalBranch &&
+                                filter.Pattern.Equals(oldName, StringComparison.Ordinal))
+                            {
+                                filter.Pattern = $"refs/heads/{_name}";
+                                break;
+                            }
+                        }
                     }
 
                     _repo.MarkBranchesDirtyManually();

src/ViewModels/Repository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -587,18 +588,6 @@ namespace SourceGit.ViewModels
             Filter = string.Empty;
         }
 
-        public void ClearHistoriesFilter()
-        {
-            _settings.Filters.Clear();
-
-            Task.Run(() =>
-            {
-                RefreshBranches();
-                RefreshTags();
-                RefreshCommits();
-            });
-        }
-
         public void ClearSearchCommitFilter()
         {
             SearchCommitFilter = string.Empty;
@@ -696,53 +685,21 @@ namespace SourceGit.ViewModels
                 NavigateToCommit(_currentBranch.Head);
         }
 
-        public void AutoAddBranchFilterPostCheckout(Models.Branch local)
+        public void ClearHistoriesFilter()
         {
-            if (_settings.Filters.Count == 0 || _settings.Filters.Contains(local.FullName))
+            _settings.HistoriesFilters.Clear();
-                return;
 
-            var hasLeft = false;
+            Task.Run(() =>
-            foreach (var b in _branches)
             {
-                if (!b.FullName.Equals(local.FullName, StringComparison.Ordinal) &&
+                RefreshBranches();
-                    !b.FullName.Equals(local.Upstream, StringComparison.Ordinal) &&
+                RefreshTags();
-                    !_settings.Filters.Contains(b.FullName))
+                RefreshCommits();
-                {
+            });
-                    hasLeft = true;
-                    break;
-                }
-            }
-
-            if (!hasLeft)
-                _settings.Filters.Clear();
-            else if (string.IsNullOrEmpty(local.Upstream) || _settings.Filters.Contains(local.Upstream))
-                _settings.Filters.Add(local.FullName);
-            else
-                _settings.Filters.AddRange([local.FullName, local.Upstream]);
         }
 
-        public void UpdateFilters(List<string> filters, bool toggle)
+        public void UpdateHistoriesFilterAfterCheckout(Models.Branch local)
         {
-            var changed = false;
+            // TODO:
-            if (toggle)
-            {
-                foreach (var filter in filters)
-                {
-                    if (!_settings.Filters.Contains(filter))
-                    {
-                        _settings.Filters.Add(filter);
-                        changed = true;
-                    }
-                }
-            }
-            else
-            {
-                foreach (var filter in filters)
-                    changed |= _settings.Filters.Remove(filter);
-            }
-
-            if (changed)
-                Task.Run(RefreshCommits);
         }
 
         public void StashAll(bool autoStart)
@@ -834,7 +791,7 @@ namespace SourceGit.ViewModels
         {
             var tags = new Commands.QueryTags(_fullpath).Result();
             foreach (var tag in tags)
-                tag.IsFiltered = _settings.Filters.Contains(tag.Name);
+                tag.FilterMode = _settings.GetHistoriesFilterMode(tag.Name, Models.FilterType.Tag);
 
             Dispatcher.UIThread.Invoke(() =>
             {
@@ -847,49 +804,21 @@ namespace SourceGit.ViewModels
         {
             Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true);
 
-            var limits = $"-{Preference.Instance.MaxHistoryCommits} ";
+            var builder = new StringBuilder();
+            builder.Append($"-{Preference.Instance.MaxHistoryCommits} ");
             if (_enableReflog)
-                limits += "--reflog ";
+                builder.Append("--reflog ");
             if (_enableFirstParentInHistories)
-                limits += "--first-parent ";
+                builder.Append("--first-parent ");
 
-            var validFilters = new List<string>();
+            var invalidFilters = new List<Models.Filter>();
-            foreach (var filter in _settings.Filters)
+            var filters = _settings.BuildHistoriesFilter();
-            {
+            if (string.IsNullOrEmpty(filters))
-                if (filter.StartsWith("refs/", StringComparison.Ordinal))
+                builder.Append("--branches --remotes --tags");
-                {
-                    if (_branches.FindIndex(x => x.FullName == filter) >= 0)
-                        validFilters.Add(filter);
-                }
-                else
-                {
-                    if (_tags.FindIndex(t => t.Name == filter) >= 0)
-                        validFilters.Add(filter);
-                }
-            }
-
-            if (validFilters.Count > 0)
-            {
-                limits += string.Join(" ", validFilters);
-
-                if (_settings.Filters.Count != validFilters.Count)
-                {
-                    Dispatcher.UIThread.Invoke(() =>
-                    {
-                        _settings.Filters.Clear();
-                        _settings.Filters.AddRange(validFilters);
-                    });
-                }
-            }
             else
-            {
+                builder.Append(filters);
-                if (_settings.Filters.Count != 0)
-                    Dispatcher.UIThread.Invoke(() => _settings.Filters.Clear());
 
-                limits += "--exclude=refs/stash --all";
+            var commits = new Commands.QueryCommits(_fullpath, builder.ToString()).Result();
-            }
-
-            var commits = new Commands.QueryCommits(_fullpath, limits).Result();
             var graph = Models.CommitGraph.Parse(commits, _enableFirstParentInHistories);
 
             Dispatcher.UIThread.Invoke(() =>
@@ -2061,13 +1990,11 @@ namespace SourceGit.ViewModels
 
         private BranchTreeNode.Builder BuildBranchTree(List<Models.Branch> branches, List<Models.Remote> remotes)
         {
-            var builder = new BranchTreeNode.Builder();
+            var builder = new BranchTreeNode.Builder(_settings);
-            builder.SetFilters(_settings.Filters);
-
             if (string.IsNullOrEmpty(_filter))
             {
-                builder.CollectExpandedNodes(_localBranchTrees, true);
+                builder.CollectExpandedNodes(_localBranchTrees);
-                builder.CollectExpandedNodes(_remoteBranchTrees, false);
+                builder.CollectExpandedNodes(_remoteBranchTrees);
                 builder.Run(branches, remotes, false);
             }
             else

src/ViewModels/TagCollection.cs

@@ -22,16 +22,6 @@ namespace SourceGit.ViewModels
             get => Tag == null;
         }
 
-        public bool IsFiltered
-        {
-            get => Tag?.IsFiltered ?? false;
-            set
-            {
-                if (Tag != null)
-                    Tag.IsFiltered = value;
-            }
-        }
-
         public bool IsExpanded
         {
             get => _isExpanded;

src/Views/BranchTree.axaml

@@ -24,6 +24,10 @@
       <Style Selector="ListBoxItem" x:DataType="vm:BranchTreeNode">
         <Setter Property="CornerRadius" Value="{Binding CornerRadius}"/>
       </Style>
+
+      <Style Selector="ListBoxItem:pointerover v|FilterModeSwitchButton">
+        <Setter Property="IsNoneVisible" Value="True"/>
+      </Style>
     </ListBox.Styles>
 
     <ListBox.ItemTemplate>
@@ -44,7 +48,7 @@
           <!-- Content Area (allows double-click) -->
           <Grid Grid.Column="1"
                 Background="Transparent"
-                ColumnDefinitions="18,*,Auto,Auto"
+                ColumnDefinitions="18,*,Auto,20"
                 DoubleTapped="OnDoubleTappedBranchNode">
 
             <!-- Icon -->
@@ -67,15 +71,8 @@
                                                   Foreground="{DynamicResource Brush.BadgeFG}"
                                                   Background="{DynamicResource Brush.Badge}"/>
 
-            <!-- Filter Toggle Button -->
+            <!-- Filter Mode Switcher -->
-            <ToggleButton Grid.Column="3"
+            <v:FilterModeSwitchButton Grid.Column="3" Mode="{Binding FilterMode}"/>
-                          Classes="filter"
-                          Margin="0,0,8,0"
-                          Background="Transparent"
-                          IsVisible="{Binding IsBranch}"
-                          IsChecked="{Binding IsFiltered}"
-                          Click="OnToggleFilterClicked"
-                          ToolTip.Tip="{DynamicResource Text.Filter}"/>
           </Grid>
         </Grid>
       </DataTemplate>

src/Views/BranchTree.axaml.cs

@@ -428,28 +428,6 @@ namespace SourceGit.Views
             }
         }
 
-        private void OnToggleFilterClicked(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is ViewModels.Repository repo &&
-                sender is ToggleButton toggle &&
-                toggle.DataContext is ViewModels.BranchTreeNode { Backend: Models.Branch branch } node)
-            {
-                bool filtered = toggle.IsChecked == true;
-                List<string> filters = [branch.FullName];
-                if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))
-                {
-                    filters.Add(branch.Upstream);
-
-                    node.IsFiltered = filtered;
-                    UpdateUpstreamFilterState(repo.RemoteBranchTrees, branch.Upstream, filtered);
-                }
-
-                repo.UpdateFilters(filters, filtered);
-            }
-
-            e.Handled = true;
-        }
-
         private void MakeRows(List<ViewModels.BranchTreeNode> rows, List<ViewModels.BranchTreeNode> nodes, int depth)
         {
             foreach (var node in nodes)
@@ -477,23 +455,6 @@ namespace SourceGit.Views
                 CollectBranchesInNode(outs, sub);
         }
 
-        private bool UpdateUpstreamFilterState(List<ViewModels.BranchTreeNode> collection, string upstream, bool isFiltered)
-        {
-            foreach (var node in collection)
-            {
-                if (node.Backend is Models.Branch b && b.FullName == upstream)
-                {
-                    node.IsFiltered = isFiltered;
-                    return true;
-                }
-
-                if (node.Backend is Models.Remote r && upstream.StartsWith($"refs/remotes/{r.Name}/", StringComparison.Ordinal))
-                    return UpdateUpstreamFilterState(node.Children, upstream, isFiltered);
-            }
-
-            return false;
-        }
-
         private bool _disableSelectionChangingEvent = false;
     }
 }

src/Views/FilterModeSwitchButton.axaml

@@ -0,0 +1,41 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:m="using:SourceGit.Models"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.FilterModeSwitchButton"
+             x:Name="ThisControl">  
+  <Button Classes="icon_button"
+          Width="12" Height="12"
+          Padding="0"
+          Background="Transparent"
+          VerticalContentAlignment="Center"
+          Click="OnChangeFilterModeButtonClicked">
+    <Grid>
+      <Path Width="12" Height="12"
+            Data="{StaticResource Icons.Eye}"
+            Fill="{DynamicResource Brush.FG2}">
+        <Path.IsVisible>
+          <MultiBinding Converter="{x:Static BoolConverters.And}">
+            <Binding Path="#ThisControl.Mode" Converter="{x:Static ObjectConverters.Equal}" ConverterParameter="{x:Static m:FilterMode.None}"/>
+            <MultiBinding Converter="{x:Static BoolConverters.Or}">
+              <Binding Path="#ThisControl.IsNoneVisible"/>
+              <Binding Path="#ThisControl.IsContextMenuOpening"/>              
+            </MultiBinding>
+          </MultiBinding>
+        </Path.IsVisible>
+      </Path>
+
+      <Path Width="12" Height="12"
+            Data="{StaticResource Icons.Filter}"
+            Fill="{DynamicResource Brush.Accent}"
+            IsVisible="{Binding #ThisControl.Mode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Included}}"/>
+
+      <Path Width="12" Height="12"
+            Data="{StaticResource Icons.EyeClose}"
+            Fill="{DynamicResource Brush.Accent}"
+            IsVisible="{Binding #ThisControl.Mode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Excluded}}"/>
+    </Grid>
+  </Button>
+</UserControl>

src/Views/FilterModeSwitchButton.axaml.cs

@@ -0,0 +1,256 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+
+namespace SourceGit.Views
+{
+    public partial class FilterModeSwitchButton : UserControl
+    {
+        public static readonly StyledProperty<Models.FilterMode> ModeProperty =
+            AvaloniaProperty.Register<FilterModeSwitchButton, Models.FilterMode>(nameof(Mode));
+
+        public Models.FilterMode Mode
+        {
+            get => GetValue(ModeProperty);
+            set => SetValue(ModeProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> IsNoneVisibleProperty =
+            AvaloniaProperty.Register<FilterModeSwitchButton, bool>(nameof(IsNoneVisible));
+
+        public bool IsNoneVisible
+        {
+            get => GetValue(IsNoneVisibleProperty);
+            set => SetValue(IsNoneVisibleProperty, value);
+        }
+
+        public static readonly StyledProperty<bool> IsContextMenuOpeningProperty =
+            AvaloniaProperty.Register<FilterModeSwitchButton, bool>(nameof(IsContextMenuOpening));
+
+        public bool IsContextMenuOpening
+        {
+            get => GetValue(IsContextMenuOpeningProperty);
+            set => SetValue(IsContextMenuOpeningProperty, value);
+        }
+
+        public FilterModeSwitchButton()
+        {
+            InitializeComponent();
+        }
+
+        private void OnChangeFilterModeButtonClicked(object sender, RoutedEventArgs e)
+        {
+            var repoView = this.FindAncestorOfType<Repository>();
+            if (repoView == null)
+                return;
+
+            var repo = repoView.DataContext as ViewModels.Repository;
+            if (repo == null)
+                return;
+
+            var button = sender as Button;
+            if (button == null)
+                return;
+
+            if (DataContext is Models.Tag tag)
+            {
+                var mode = tag.FilterMode;
+
+                var none = new MenuItem();
+                none.Icon = App.CreateMenuIcon("Icons.Eye");
+                none.Header = "Default";
+                none.IsEnabled = mode != Models.FilterMode.None;
+                none.Click += (_, ev) =>
+                {
+                    UpdateTagFilterMode(repo, tag, Models.FilterMode.None);
+                    ev.Handled = true;
+                };
+
+                var include = new MenuItem();
+                include.Icon = App.CreateMenuIcon("Icons.Filter");
+                include.Header = "Filter";
+                include.IsEnabled = mode != Models.FilterMode.Included;
+                include.Click += (_, ev) =>
+                {
+                    UpdateTagFilterMode(repo, tag, Models.FilterMode.Included);
+                    ev.Handled = true;
+                };
+
+                var exclude = new MenuItem();
+                exclude.Icon = App.CreateMenuIcon("Icons.EyeClose");
+                exclude.Header = "Hide";
+                exclude.IsEnabled = mode != Models.FilterMode.Excluded;
+                exclude.Click += (_, ev) =>
+                {
+                    UpdateTagFilterMode(repo, tag, Models.FilterMode.Excluded);
+                    ev.Handled = true;
+                };
+
+                var menu = new ContextMenu();
+                menu.Items.Add(none);
+                menu.Items.Add(include);
+                menu.Items.Add(exclude);
+
+                if (mode == Models.FilterMode.None)
+                {
+                    IsContextMenuOpening = true;
+                    menu.Closed += (_, _) => IsContextMenuOpening = false;
+                }
+
+                menu.Open(button);
+            }
+            else if (DataContext is ViewModels.BranchTreeNode node)
+            {
+                var mode = node.FilterMode;
+
+                var none = new MenuItem();
+                none.Icon = App.CreateMenuIcon("Icons.Eye");
+                none.Header = "Default";
+                none.IsEnabled = mode != Models.FilterMode.None;
+                none.Click += (_, ev) =>
+                {
+                    UpdateBranchFilterMode(repo, node, Models.FilterMode.None);
+                    ev.Handled = true;
+                };
+
+                var include = new MenuItem();
+                include.Icon = App.CreateMenuIcon("Icons.Filter");
+                include.Header = "Filter";
+                include.IsEnabled = mode != Models.FilterMode.Included;
+                include.Click += (_, ev) =>
+                {
+                    UpdateBranchFilterMode(repo, node, Models.FilterMode.Included);
+                    ev.Handled = true;
+                };
+
+                var exclude = new MenuItem();
+                exclude.Icon = App.CreateMenuIcon("Icons.EyeClose");
+                exclude.Header = "Hide";
+                exclude.IsEnabled = mode != Models.FilterMode.Excluded;
+                exclude.Click += (_, ev) =>
+                {
+                    UpdateBranchFilterMode(repo, node, Models.FilterMode.Excluded);
+                    ev.Handled = true;
+                };
+
+                var menu = new ContextMenu();
+                menu.Items.Add(none);
+                menu.Items.Add(include);
+                menu.Items.Add(exclude);
+
+                if (mode == Models.FilterMode.None)
+                {
+                    IsContextMenuOpening = true;
+                    menu.Closed += (_, _) => IsContextMenuOpening = false;
+                }
+
+                menu.Open(button);
+            }
+
+            e.Handled = true;
+        }
+
+        private void UpdateTagFilterMode(ViewModels.Repository repo, Models.Tag tag, Models.FilterMode mode)
+        {
+            var changed = repo.Settings.UpdateHistoriesFilter(tag.Name, Models.FilterType.Tag, mode);
+            if (changed)
+            {
+                tag.FilterMode = mode;
+                Task.Run(repo.RefreshCommits);
+            }
+        }
+
+        private void UpdateBranchFilterMode(ViewModels.Repository repo, ViewModels.BranchTreeNode node, Models.FilterMode mode)
+        {
+            var isLocal = node.Path.StartsWith("refs/heads/", StringComparison.Ordinal);
+            var type = isLocal ? Models.FilterType.LocalBranch : Models.FilterType.RemoteBranch;
+            var tree = isLocal ? repo.LocalBranchTrees : repo.RemoteBranchTrees;
+
+            if (node.Backend is Models.Branch branch)
+            {
+                var changed = repo.Settings.UpdateHistoriesFilter(node.Path, type, mode);
+                if (!changed)
+                    return;
+
+                node.FilterMode = mode;
+            }
+            else
+            {
+                var changed = repo.Settings.UpdateHistoriesFilter(node.Path, isLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder, mode);
+                if (!changed)
+                    return;
+
+                node.FilterMode = mode;
+                ResetChildrenBranchNodeFilterMode(repo, node, isLocal);
+            }
+
+            var parentType = isLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder;
+            var cur = node;
+            do
+            {
+                var lastSepIdx = cur.Path.LastIndexOf('/');
+                if (lastSepIdx <= 0)
+                    break;
+
+                var parentPath = cur.Path.Substring(0, lastSepIdx);
+                var parent = FindParentNode(tree, parentPath);
+                if (parent == null)
+                    break;
+
+                repo.Settings.UpdateHistoriesFilter(parent.Path, parentType, Models.FilterMode.None);
+                parent.FilterMode = Models.FilterMode.None;
+                cur = parent;
+            } while (true);
+
+            Task.Run(repo.RefreshCommits);
+        }
+
+        private void ResetChildrenBranchNodeFilterMode(ViewModels.Repository repo, ViewModels.BranchTreeNode node, bool isLocal)
+        {
+            foreach (var child in node.Children)
+            {
+                child.FilterMode = Models.FilterMode.None;
+
+                if (child.IsBranch)
+                {
+                    var type = isLocal ? Models.FilterType.LocalBranch : Models.FilterType.RemoteBranch;
+                    repo.Settings.UpdateHistoriesFilter(child.Path, type, Models.FilterMode.None);
+                }
+                else
+                {
+                    var type = isLocal ? Models.FilterType.LocalBranchFolder : Models.FilterType.RemoteBranchFolder;
+                    repo.Settings.UpdateHistoriesFilter(child.Path, type, Models.FilterMode.None);
+                    ResetChildrenBranchNodeFilterMode(repo, child, isLocal);
+                }
+            }
+        }
+
+        private ViewModels.BranchTreeNode FindParentNode(List<ViewModels.BranchTreeNode> nodes, string parent)
+        {
+            foreach (var node in nodes)
+            {
+                if (node.IsBranch)
+                    continue;
+
+                if (node.Path.Equals(parent, StringComparison.Ordinal))
+                    return node;
+
+                if (parent.StartsWith(node.Path, StringComparison.Ordinal))
+                {
+                    var founded = FindParentNode(node.Children, parent);
+                    if (founded != null)
+                        return founded;
+                }
+            }
+
+            return null;
+        }
+    }
+}
+
+

src/Views/Repository.axaml

@@ -577,14 +577,14 @@
         <Border.IsVisible>
           <MultiBinding Converter="{x:Static BoolConverters.And}">
             <Binding Path="SelectedViewIndex" Converter="{x:Static c:IntConverters.IsZero}"/>
-            <Binding Path="Settings.Filters.Count" Converter="{x:Static c:IntConverters.IsGreaterThanZero}"/>
+            <Binding Path="Settings.HistoriesFilters.Count" Converter="{x:Static c:IntConverters.IsGreaterThanZero}"/>
           </MultiBinding>
         </Border.IsVisible>
 
         <Grid Height="28" ColumnDefinitions="Auto,*,Auto">
           <TextBlock Grid.Column="0" Margin="8,0,0,0" Classes="table_header" Text="{DynamicResource Text.Repository.FilterCommitPrefix}"/>
 
-          <ItemsControl Grid.Column="1" Margin="8,0,0,0" ItemsSource="{Binding Settings.Filters}">
+          <ItemsControl Grid.Column="1" Margin="8,0,0,0" ItemsSource="{Binding Settings.HistoriesFilters}">
             <ItemsControl.ItemsPanel>
               <ItemsPanelTemplate>
                 <VirtualizingStackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
@@ -592,10 +592,24 @@
             </ItemsControl.ItemsPanel>
             
             <ItemsControl.ItemTemplate>
-              <DataTemplate>
+              <DataTemplate DataType="m:Filter">
-                <Border Height="20" Margin="0,0,6,0" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" CornerRadius="12">
+                <Grid Height="20" Margin="0,0,6,0">
-                  <TextBlock Classes="primary" Text="{Binding Converter={x:Static c:StringConverters.TrimRefsPrefix}}" Margin="8,0"/>
+                  <Border BorderThickness="1"
-                </Border>
+                          BorderBrush="Green"
+                          CornerRadius="12"
+                          IsVisible="{Binding Mode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Included}}"/>
+
+                  <Border BorderThickness="1"
+                          BorderBrush="Red"
+                          CornerRadius="12"
+                          IsVisible="{Binding Mode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:FilterMode.Excluded}}"/>
+
+                  <StackPanel Orientation="Horizontal" Margin="8,0">
+                    <Path Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}"/>
+                    <Path Width="10" Height="10" Data="{StaticResource Icons.Tag}" IsVisible="{Binding !IsBranch}"/>
+                    <TextBlock Classes="primary" Text="{Binding Pattern, Converter={x:Static c:StringConverters.TrimRefsPrefix}}" Margin="4,0,0,0"/>
+                  </StackPanel>
+                </Grid>
               </DataTemplate>
             </ItemsControl.ItemTemplate>
           </ItemsControl>

src/Views/TagsView.axaml

@@ -12,6 +12,10 @@
     <Style Selector="ListBoxItem">
       <Setter Property="CornerRadius" Value="4"/>
     </Style>
+
+    <Style Selector="ListBoxItem:pointerover v|FilterModeSwitchButton">
+      <Setter Property="IsNoneVisible" Value="True"/>
+    </Style>
   </UserControl.Styles>
   
   <UserControl.DataTemplates>
@@ -43,15 +47,14 @@
                          Classes="primary" 
                          Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" 
                          Margin="8,0,0,0"/>
-              
+
-              <ToggleButton Grid.Column="3"
+              <ContentControl Grid.Column="3" Content="{Binding Tag}">
-                            Classes="filter"
+                <ContentControl.DataTemplates>
-                            Margin="0,0,8,0"
+                  <DataTemplate DataType="m:Tag">
-                            Background="Transparent"
+                    <v:FilterModeSwitchButton Mode="{Binding FilterMode}"/>
-                            Click="OnToggleFilterClicked"
+                  </DataTemplate>
-                            IsChecked="{Binding IsFiltered, Mode=TwoWay}"
+                </ContentControl.DataTemplates>
-                            IsVisible="{Binding !IsFolder}"
+              </ContentControl>
-                            ToolTip.Tip="{DynamicResource Text.Filter}"/>
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>
@@ -66,7 +69,7 @@
                SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Tag">
-            <Grid ColumnDefinitions="Auto,*,Auto"
+            <Grid ColumnDefinitions="Auto,*,20"
                   Background="Transparent"
                   ContextRequested="OnRowContextRequested"
                   ToolTip.Tip="{Binding Message}">
@@ -78,15 +81,10 @@
               <TextBlock Grid.Column="1"
                          Classes="primary" 
                          Text="{Binding Name}" 
-                         Margin="8,0,0,0"/>
+                         Margin="8,0,0,0"
+                         TextTrimming="CharacterEllipsis"/>
               
-              <ToggleButton Grid.Column="2"
+              <v:FilterModeSwitchButton Grid.Column="2" Mode="{Binding FilterMode}"/>
-                            Classes="filter"
-                            Margin="0,0,8,0"
-                            Background="Transparent"
-                            Click="OnToggleFilterClicked"
-                            IsChecked="{Binding IsFiltered, Mode=TwoWay}"
-                            ToolTip.Tip="{DynamicResource Text.Filter}"/>
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>

src/Views/TagsView.axaml.cs

@@ -247,23 +247,6 @@ namespace SourceGit.Views
             }
         }
 
-        private void OnToggleFilterClicked(object sender, RoutedEventArgs e)
-        {
-            if (sender is ToggleButton toggle && DataContext is ViewModels.Repository repo)
-            {
-                var target = null as Models.Tag;
-                if (toggle.DataContext is ViewModels.TagTreeNode node)
-                    target = node.Tag;
-                else if (toggle.DataContext is Models.Tag tag)
-                    target = tag;
-
-                if (target != null)
-                    repo.UpdateFilters([target.Name], toggle.IsChecked == true);
-            }
-
-            e.Handled = true;
-        }
-
         private void MakeTreeRows(List<ViewModels.TagTreeNode> rows, List<ViewModels.TagTreeNode> nodes)
         {
             foreach (var node in nodes)