Commit 0db270b

committed

improvement: do not clear the commit filter while change the branch

- do not clear the commit filter while changing the branch - do not change the filter if thereis `HEAD` filter while changing branch

1 parent 443e139 commit 0db270bCopy full SHA for 0db270b

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Threading.Tasks;`
	`1`	`+using System.Linq;`
	`2`	`+using System.Threading.Tasks;`
`2`	`3`
`3`	`4`	`namespace SourceGit.ViewModels`
`4`	`5`	`{`
`@@ -102,7 +103,8 @@ public override async Task<bool> Sure()`
`102`	`103`	`log.Complete();`
`103`	`104`
`104`	`105`	`var b = _repo.Branches.Find(x => x.IsLocal && x.Name == Branch);`
`105`		`- if (b != null && _repo.HistoriesFilterMode == Models.FilterMode.Included)`
	`106`	`+ if (b != null && _repo.HistoriesFilterMode == Models.FilterMode.Included`
	`107`	`+ && !_repo.Settings.HistoriesFilters.Any(f => f.Pattern == "HEAD"))`
`106`	`108`	`_repo.SetBranchFilterMode(b, Models.FilterMode.Included, true, false);`
`107`	`109`
`108`	`110`	`_repo.MarkBranchesDirtyManually();`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1124,8 +1124,10 @@ public void SetBranchFilterMode(BranchTreeNode node, Models.FilterMode mode, boo`
`1124`	`1124`
`1125`	`1125`	`if (clearExists)`
`1126`	`1126`	`{`
`1127`		`- _settings.HistoriesFilters.Clear();`
`1128`		`- HistoriesFilterMode = Models.FilterMode.None;`
	`1127`	`+ _settings.HistoriesFilters.RemoveAll(_settings.HistoriesFilters`
	`1128`	`+ .Where(f => f.Type != Models.FilterType.SoloCommits).ToArray());`
	`1129`	`+ if (_settings.HistoriesFilters.Count <= 0)`
	`1130`	`+ HistoriesFilterMode = Models.FilterMode.None;`
`1129`	`1131`	`}`
`1130`	`1132`
`1131`	`1133`	`if (node.Backend is Models.Branch branch)`

Comments

(0)