refactor

Better to not have a single function module, and better to have a more
specific type than Bool.

This commit was sponsored by Jack Hill on Patreon

Annex/AdjustedBranch.hs

@@ -59,7 +59,6 @@ import Utility.Tmp.Dir
 import Utility.CopyFile
 import qualified Database.Keys
 import Config
-import Config.CommitMode
 
 import qualified Data.Map as M
 
@@ -226,7 +225,7 @@ adjustToCrippledFileSystem = do
 	warning "Entering an adjusted branch where files are unlocked as this filesystem does not support locked files."
 	checkVersionSupported
 	whenM (isNothing <$> inRepo Git.Branch.current) $ do
-		cmode <-  implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		void $ inRepo $ Git.Branch.commitCommand cmode
 			[ Param "--quiet"
 			, Param "--allow-empty"
@@ -313,10 +312,10 @@ commitAdjustedTree' treesha (BasisBranch basis) parents =
 	go =<< catCommit basis
   where
 	go Nothing = do
-		cmode <- implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		inRepo $ mkcommit cmode
 	go (Just basiscommit) = do
-		cmode <- implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		inRepo $ commitWithMetaData
 			(commitAuthorMetaData basiscommit)
 			(commitCommitterMetaData basiscommit)
@@ -450,7 +449,7 @@ mergeToAdjustedBranch tomerge (origbranch, adj) mergeconfig canresolvemerge comm
 	reparent adjtree adjmergecommit (Just currentcommit) = do
 		if (commitTree currentcommit /= adjtree)
 			then do
-				cmode <- implicitCommitMode
+				cmode <- annexCommitMode <$> Annex.getGitConfig
 				c <- inRepo $ Git.Branch.commitTree cmode
 					("Merged " ++ fromRef tomerge) [adjmergecommit]
 					(commitTree currentcommit)
@@ -541,7 +540,7 @@ reverseAdjustedCommit commitparent adj (csha, basiscommit) origbranch
 	| length (commitParent basiscommit) > 1 = return $
 		Left $ "unable to propigate merge commit " ++ show csha ++ " back to " ++ show origbranch
 	| otherwise = do
-		cmode <- implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		treesha <- reverseAdjustedTree commitparent adj csha
 		revadjcommit <- inRepo $ commitWithMetaData
 			(commitAuthorMetaData basiscommit)

Annex/Branch.hs

@@ -70,7 +70,6 @@ import Annex.Branch.Transitions
 import qualified Annex
 import Annex.Hook
 import Utility.Directory.Stream
-import Config.CommitMode
 
 {- Name of the branch that is used to store git-annex's information. -}
 name :: Git.Ref
@@ -111,7 +110,7 @@ getBranch = maybe (hasOrigin >>= go >>= use) return =<< branchsha
 		fromMaybe (error $ "failed to create " ++ fromRef name)
 			<$> branchsha
 	go False = withIndex' True $ do
-		cmode <- implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		inRepo $ Git.Branch.commitAlways cmode "branch created" fullname []
 	use sha = do
 		setIndexSha sha
@@ -319,7 +318,7 @@ commitIndex jl branchref message parents = do
 commitIndex' :: JournalLocked -> Git.Ref -> String -> String -> Integer -> [Git.Ref] -> Annex ()
 commitIndex' jl branchref message basemessage retrynum parents = do
 	updateIndex jl branchref
-	cmode <- implicitCommitMode
+	cmode <- annexCommitMode <$> Annex.getGitConfig
 	committedref <- inRepo $ Git.Branch.commitAlways cmode message fullname parents
 	setIndexSha committedref
 	parentrefs <- commitparents <$> catObject committedref
@@ -554,7 +553,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
 		Annex.Queue.flush
 		if neednewlocalbranch
 			then do
-				cmode <- implicitCommitMode
+				cmode <- annexCommitMode <$> Annex.getGitConfig
 				committedref <- inRepo $ Git.Branch.commitAlways cmode message fullname transitionedrefs
 				setIndexSha committedref
 			else do
@@ -661,7 +660,7 @@ rememberTreeish treeish graftpoint = lockJournal $ \jl -> do
 	origtree <- fromMaybe (giveup "unable to determine git-annex branch tree") <$>
 		inRepo (Git.Ref.tree branchref)
 	addedt <- inRepo $ Git.Tree.graftTree treeish graftpoint origtree
-	cmode <- implicitCommitMode
+	cmode <- annexCommitMode <$> Annex.getGitConfig
 	c <- inRepo $ Git.Branch.commitTree cmode
 		"graft" [branchref] addedt
 	c' <- inRepo $ Git.Branch.commitTree cmode

Annex/RemoteTrackingBranch.hs

@@ -17,12 +17,12 @@ module Annex.RemoteTrackingBranch
 
 import Annex.Common
 import Annex.CatFile
+import qualified Annex
 import Git.Types
 import qualified Git.Ref
 import qualified Git.Branch
 import Git.History
 import qualified Types.Remote as Remote
-import Config.CommitMode
 
 import qualified Data.Set as S
 
@@ -74,7 +74,7 @@ makeRemoteTrackingBranchMergeCommit tb commitsha =
 
 makeRemoteTrackingBranchMergeCommit' :: Sha -> Sha -> Sha -> Annex Sha
 makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha = do
-	cmode <- implicitCommitMode
+	cmode <- annexCommitMode <$> Annex.getGitConfig
 	inRepo $ Git.Branch.commitTree
 			cmode
 			"remote tracking branch"

Annex/View.hs

@@ -12,6 +12,7 @@ import Annex.View.ViewedFile
 import Types.View
 import Types.MetaData
 import Annex.MetaData
+import qualified Annex
 import qualified Git
 import qualified Git.DiffTree as DiffTree
 import qualified Git.Branch
@@ -30,7 +31,6 @@ import Logs.View
 import Utility.Glob
 import Types.Command
 import CmdLine.Action
-import Config.CommitMode
 
 import qualified Data.Text as T
 import qualified Data.ByteString as B
@@ -419,7 +419,7 @@ withViewIndex a = do
 genViewBranch :: View -> Annex Git.Branch
 genViewBranch view = withViewIndex $ do
 	let branch = branchView view
-	cmode <- implicitCommitMode
+	cmode <- annexCommitMode <$> Annex.getGitConfig
 	void $ inRepo $ Git.Branch.commit cmode True (fromRef branch) branch []
 	return branch
 

Assistant/MakeRepo.hs

@@ -22,7 +22,6 @@ import Logs.PreferredContent
 import qualified Annex.Branch
 import Utility.Process.Transcript
 import Config
-import Config.CommitMode
 
 {- Makes a new git repository. Or, if a git repository already
  - exists, returns False. -}
@@ -55,7 +54,7 @@ initRepo True primary_assistant_repo dir desc mgroup = inDir dir $ do
 	{- Initialize the master branch, so things that expect
 	 - to have it will work, before any files are added. -}
 	unlessM (Git.Config.isBare <$> gitRepo) $ do
-		cmode <- implicitCommitMode
+		cmode <- annexCommitMode <$> Annex.getGitConfig
 		void $ inRepo $ Git.Branch.commitCommand cmode
 			[ Param "--quiet"
 			, Param "--allow-empty"

Assistant/Threads/Committer.hs

@@ -38,7 +38,6 @@ import qualified Database.Keys
 import qualified Command.Sync
 import Utility.Tuple
 import Utility.Metered
-import Config.CommitMode
 
 import Data.Time.Clock
 import qualified Data.Set as S
@@ -231,7 +230,7 @@ commitStaged msg = do
 	case v of
 		Left _ -> return False
 		Right _ -> do
-			cmode <- implicitCommitMode
+			cmode <- annexCommitMode <$> Annex.getGitConfig
 			ok <- Command.Sync.commitStaged cmode msg
 			when ok $
 				Command.Sync.updateBranches =<< getCurrentBranch

Assistant/Threads/Merger.hs

@@ -14,12 +14,12 @@ import Assistant.Sync
 import Utility.DirWatcher
 import Utility.DirWatcher.Types
 import Annex.CurrentBranch
+import qualified Annex
 import qualified Annex.Branch
 import qualified Git
 import qualified Git.Branch
 import qualified Git.Ref
 import qualified Command.Sync
-import Config.CommitMode
 
 {- This thread watches for changes to .git/refs/, and handles incoming
  - pushes. -}
@@ -82,7 +82,7 @@ onChange file
 					, "into", Git.fromRef b
 					]
 				void $ liftAnnex $ do
-					cmode <- implicitCommitMode
+					cmode <- annexCommitMode <$> Annex.getGitConfig
 					Command.Sync.merge
 						currbranch Command.Sync.mergeConfig
 						def

Command/Import.hs

@@ -32,7 +32,6 @@ import Git.FilePath
 import Git.Types
 import Types.Import
 import Utility.Metered
-import Config.CommitMode
 
 import Control.Concurrent.STM
 
@@ -266,7 +265,7 @@ seekRemote remote branch msubdir = do
 					Nothing -> giveup $ "Unable to find base tree for branch " ++ fromRef branch
 	
 	trackingcommit <- fromtrackingbranch Git.Ref.sha
-	cmode <- implicitCommitMode
+	cmode <- annexCommitMode <$> Annex.getGitConfig
 	let importcommitconfig = ImportCommitConfig trackingcommit cmode importmessage
 	let commitimport = commitRemote remote branch tb trackingcommit importtreeconfig importcommitconfig
 

Config/CommitMode.hs

@@ -1,18 +0,0 @@
-{- git-annex configuration
- -
- - Copyright 2019 Joey Hess <id@joeyh.name>
- -
- - Licensed under the GNU AGPL version 3 or higher.
- -}
-
-module Config.CommitMode where
-
-import Annex.Common
-import qualified Annex
-import Git.Branch (CommitMode(..))
-
-implicitCommitMode :: Annex CommitMode
-implicitCommitMode = go . annexAllowSign <$> Annex.getGitConfig
-  where
-	go True = ManualCommit
-	go False = AutomaticCommit

Types/GitConfig.hs

@@ -21,6 +21,7 @@ import qualified Git.Config
 import qualified Git.Construct
 import Git.Types
 import Git.ConfigTypes
+import Git.Branch (CommitMode(..))
 import Utility.DataUnits
 import Config.Cost
 import Types.UUID
@@ -105,7 +106,7 @@ data GitConfig = GitConfig
 	, annexJobs :: Concurrency
 	, annexCacheCreds :: Bool
 	, annexAutoUpgradeRepository :: Bool
-	, annexAllowSign :: Bool
+	, annexCommitMode :: CommitMode
 	, coreSymlinks :: Bool
 	, coreSharedRepository :: SharedRepository
 	, receiveDenyCurrentBranch :: DenyCurrentBranch
@@ -187,7 +188,9 @@ extractGitConfig r = GitConfig
 		parseConcurrency =<< getmaybe (annex "jobs")
 	, annexCacheCreds = getbool (annex "cachecreds") True
 	, annexAutoUpgradeRepository = getbool (annex "autoupgraderepository") True
-	, annexAllowSign = getbool (annex "allowsign") False
+	, annexCommitMode = if getbool (annex "allowsign") False
+		then ManualCommit
+		else AutomaticCommit
 	, coreSymlinks = getbool "core.symlinks" True
 	, coreSharedRepository = getSharedRepository r
 	, receiveDenyCurrentBranch = getDenyCurrentBranch r

git-annex.cabal

@@ -806,7 +806,6 @@ Executable git-annex
     Command.Whereis
     Common
     Config
-    Config.CommitMode
     Config.Cost
     Config.Files
     Config.DynamicConfig