Remove use of app state from showTags support

Author: Cameron Way

pkg/config/app_config_test.go

@@ -698,7 +698,8 @@ git:
     # displays the whole git graph by default in the commits view (equivalent to passing the --all argument to git log)
     showWholeGraph: false
 
-    # Configure this with Log menu -> 'Show commit tags' (<c-l> in the commits window by default).
+    # This determines whether tags are displayed in the commits view
+    # One of 'always' | 'never' | 'when-maximised'
     showTags: always
 
   # When copying commit hashes to the clipboard, truncate them to this

pkg/config/user_config.go

@@ -337,7 +337,7 @@ type LogConfig struct {
 	ShowGraph string `yaml:"showGraph" jsonschema:"deprecated,enum=always,enum=never,enum=when-maximised"`
 	// displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
 	ShowWholeGraph bool `yaml:"showWholeGraph"`
-	// Configure this with `Log menu -> Show tags` (<c-l> in the commits window by default).
+	// This determines whether tags are displayed in the commits view
 	ShowTags string `yaml:"showTags" jsonschema:"enum=always,enum=never,enum=when-maximised"`
 }
 

pkg/gui/context/local_commits_context.go

@@ -61,7 +61,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 			startIdx,
 			endIdx,
 			shouldShowGraph(c),
-			shouldShowTags(c),
+			shouldDisplayForScreenMode(c, viewModel.showTags),
 			c.Model().BisectInfo,
 		)
 	}
@@ -149,13 +149,17 @@ type LocalCommitsViewModel struct {
 
 	// If this is true we'll use git log --all when fetching the commits.
 	showWholeGitGraph bool
+
+	// If this is true we'll show tags in the commit list.
+	showTags string
 }
 
 func NewLocalCommitsViewModel(getModel func() []*models.Commit, c *ContextCommon) *LocalCommitsViewModel {
 	self := &LocalCommitsViewModel{
 		ListViewModel:     NewListViewModel(getModel),
 		limitCommits:      true,
 		showWholeGitGraph: c.UserConfig().Git.Log.ShowWholeGraph,
+		showTags: c.UserConfig().Git.Log.ShowTags,
 	}
 
 	return self
@@ -239,6 +243,14 @@ func (self *LocalCommitsViewModel) SetShowWholeGitGraph(value bool) {
 	self.showWholeGitGraph = value
 }
 
+func (self *LocalCommitsContext) GetShowTags() string {
+	return self.showTags
+}
+
+func (self *LocalCommitsViewModel) SetShowTags(value string) {
+	self.showTags = value
+}
+
 func (self *LocalCommitsViewModel) GetShowWholeGitGraph() bool {
 	return self.showWholeGitGraph
 }
@@ -248,14 +260,10 @@ func (self *LocalCommitsViewModel) GetCommits() []*models.Commit {
 }
 
 func shouldShowGraph(c *ContextCommon) bool {
-	return shouldShowBasedOnAppState(c, c.GetAppState().GitLogShowGraph)
-}
-
-func shouldShowTags(c *ContextCommon) bool {
-	return shouldShowBasedOnAppState(c, c.GetAppState().GitLogShowTags)
+	return shouldDisplayForScreenMode(c, c.GetAppState().GitLogShowGraph)
 }
 
-func shouldShowBasedOnAppState(c *ContextCommon, value string) bool {
+func shouldDisplayForScreenMode(c *ContextCommon, value string) bool {
 	if c.Modes().Filtering.Active() {
 		return false
 	}

pkg/gui/context/sub_commits_context.go

@@ -76,7 +76,7 @@ func NewSubCommitsContext(
 			startIdx,
 			endIdx,
 			shouldShowGraph(c),
-			shouldShowTags(c),
+			shouldDisplayForScreenMode(c, viewModel.GetShowTags()),
 			git_commands.NewNullBisectInfo(),
 		)
 	}
@@ -148,6 +148,7 @@ type SubCommitsViewModel struct {
 
 	limitCommits    bool
 	showBranchHeads bool
+	showTags		string
 }
 
 func (self *SubCommitsViewModel) SetRef(ref types.Ref) {
@@ -174,6 +175,14 @@ func (self *SubCommitsViewModel) GetShowBranchHeads() bool {
 	return self.showBranchHeads
 }
 
+func (self *SubCommitsViewModel) SetShowTags(value string) {
+	self.showTags = value
+}
+
+func (self *SubCommitsViewModel) GetShowTags() string {
+	return self.showTags
+}
+
 func (self *SubCommitsContext) CanRebase() bool {
 	return false
 }

pkg/gui/controllers/local_commits_controller.go

@@ -1196,10 +1196,10 @@ func (self *LocalCommitsController) handleOpenLogMenu() error {
 				Label:     self.c.Tr.ShowTags,
 				OpensMenu: true,
 				OnPress: func() error {
-					currentValue := self.c.GetAppState().GitLogShowTags
+					currentValue := self.context().GetShowTags()
 					onPress := func(value string) func() error {
 						return func() error {
-							self.c.GetAppState().GitLogShowTags = value
+							self.context().SetShowTags(value)
 							self.c.SaveAppStateAndLogError()
 							self.c.PostRefreshUpdate(self.c.Contexts().LocalCommits)
 							self.c.PostRefreshUpdate(self.c.Contexts().SubCommits)