Revert "multiple -m"

This reverts commit cee12f6a2f.

This commit broke git-annex init run in a repo that was cloned from a
repo with an adjusted branch checked out.

The problem is that findAdjustingCommit was not able to identify the
commit that created the adjusted branch. It seems that there is an extra
"\n" at the end of the commit message that it does not expect.

Since backwards compatability needs to be maintained, cannot just make
findAdjustingCommit accept it with the "\n". Will have to instead
have one commitTree variant that uses the old method, and use it for
adjusted branch committing.

Annex/AdjustedBranch.hs

@@ -469,7 +469,7 @@ commitAdjustedTree' treesha (BasisBranch basis) parents =
 			(commitCommitterMetaData basiscommit)
 			(mkcommit cmode)
 	mkcommit cmode = Git.Branch.commitTree cmode
-		[adjustedBranchCommitMessage] parents treesha
+		adjustedBranchCommitMessage parents treesha
 
 {- This message should never be changed. -}
 adjustedBranchCommitMessage :: String
@@ -577,7 +577,7 @@ reverseAdjustedCommit commitparent adj (csha, basiscommit) origbranch
 			(commitAuthorMetaData basiscommit)
 			(commitCommitterMetaData basiscommit) $
 				Git.Branch.commitTree cmode
-					[commitMessage basiscommit]
+					(commitMessage basiscommit)
 					[commitparent] treesha
 		return (Right revadjcommit)
 

Annex/AdjustedBranch/Merge.hs

@@ -153,8 +153,7 @@ mergeToAdjustedBranch tomerge (origbranch, adj) mergeconfig canresolvemerge comm
 			then do
 				cmode <- annexCommitMode <$> Annex.getGitConfig
 				c <- inRepo $ Git.Branch.commitTree cmode
-					["Merged " ++ fromRef tomerge]
+					("Merged " ++ fromRef tomerge) [adjmergecommit]
-					[adjmergecommit]
 					(commitTree currentcommit)
 				inRepo $ Git.Branch.update "updating adjusted branch" currbranch c
 				propigateAdjustedCommits origbranch adj

Annex/Branch.hs

@@ -945,9 +945,9 @@ rememberTreeishLocked treeish graftpoint jl = do
 	addedt <- inRepo $ Git.Tree.graftTree treeish graftpoint origtree
 	cmode <- annexCommitMode <$> Annex.getGitConfig
 	c <- inRepo $ Git.Branch.commitTree cmode
-		["graft"] [branchref] addedt
+		"graft" [branchref] addedt
 	c' <- inRepo $ Git.Branch.commitTree cmode
-		["graft cleanup"] [c] origtree
+		"graft cleanup" [c] origtree
 	inRepo $ Git.Branch.update' fullname c'
 	-- The tree in c' is the same as the tree in branchref,
 	-- and the index was updated to that above, so it's safe to

Annex/Import.hs

@@ -86,7 +86,7 @@ data ImportCommitConfig = ImportCommitConfig
 	{ importCommitTracking :: Maybe Sha
 	-- ^ Current commit on the remote tracking branch.
 	, importCommitMode :: Git.Branch.CommitMode
-	, importCommitMessages :: [String]
+	, importCommitMessage :: String
 	}
 
 {- Buils a commit for an import from a special remote.
@@ -251,7 +251,7 @@ buildImportCommit' remote importcommitconfig mtrackingcommit imported@(History t
 
 	mkcommit parents tree = inRepo $ Git.Branch.commitTree
 		(importCommitMode importcommitconfig)
-		(importCommitMessages importcommitconfig)
+		(importCommitMessage importcommitconfig)
 		parents
 		tree
 

Annex/RemoteTrackingBranch.hs

@@ -77,7 +77,7 @@ makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha = do
 	cmode <- annexCommitMode <$> Annex.getGitConfig
 	inRepo $ Git.Branch.commitTree
 			cmode
-			["remote tracking branch"]
+			"remote tracking branch"
 			[commitsha, importedhistory]
 			treesha
 

Annex/View.hs

@@ -577,7 +577,7 @@ updateView view madj = do
 			cmode <- annexCommitMode <$> Annex.getGitConfig
 			let msg = "updated " ++ fromRef (branchView view madj)
 			let parent = catMaybes [oldcommit]
-			inRepo (Git.Branch.commitTree cmode [msg] parent newtree)
+			inRepo (Git.Branch.commitTree cmode msg parent newtree)
 		else return Nothing
 
 {- Diff between currently checked out branch and staged changes, and

CHANGELOG

@@ -13,8 +13,6 @@ git-annex (10.20240228) UNRELEASED; urgency=medium
     the same repository.
   * Windows: Fix escaping output to terminal when using old
     versions of MinTTY.
-  * sync, assist, import: Allow -m option to be specified multiple
-    times, to provide additional paragraphs for the commit message.
 
  -- Joey Hess <id@joeyh.name>  Tue, 27 Feb 2024 13:07:10 -0400
 

Command/FilterBranch.hs

@@ -189,7 +189,7 @@ seek o = withOtherTmp $ \tmpdir -> do
 	liftIO $ removeWhenExistsWith removeLink tmpindex
 	cmode <- annexCommitMode <$> Annex.getGitConfig
 	cmessage <- Annex.Branch.commitMessage
-	c <- inRepo $ Git.commitTree cmode [cmessage] [] t
+	c <- inRepo $ Git.commitTree cmode cmessage [] t
 	liftIO $ putStrLn (fromRef c)
   where
 	ww = WarnUnmatchLsFiles "filter-branch"

Command/Import.hs

@@ -1,6 +1,6 @@
 {- git-annex command
  -
- - Copyright 2012-2024 Joey Hess <id@joeyh.name>
+ - Copyright 2012-2021 Joey Hess <id@joeyh.name>
  -
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@@ -70,7 +70,7 @@ data ImportOptions
 		, importToSubDir :: Maybe FilePath
 		, importContent :: Bool
 		, checkGitIgnoreOption :: CheckGitIgnore
-		, messageOption :: [String]
+		, messageOption :: Maybe String
 		}
 
 optParser :: CmdParamsDesc -> Parser ImportOptions
@@ -82,7 +82,7 @@ optParser desc = do
 		)
 	dupmode <- fromMaybe Default <$> optional duplicateModeParser
 	ic <- Command.Add.checkGitIgnoreSwitch
-	message <- many (strOption
+	message <- optional (strOption
 		( long "message" <> short 'm' <> metavar "MSG"
 		<> help "commit message"
 		))
@@ -322,8 +322,8 @@ verifyExisting key destfile (yes, no) = do
 	verifyEnoughCopiesToDrop [] key Nothing needcopies mincopies [] preverified tocheck
 		(const yes) no
 
-seekRemote :: Remote -> Branch -> Maybe TopFilePath -> Bool -> CheckGitIgnore -> [String] -> CommandSeek
+seekRemote :: Remote -> Branch -> Maybe TopFilePath -> Bool -> CheckGitIgnore -> Maybe String -> CommandSeek
-seekRemote remote branch msubdir importcontent ci importmessages = do
+seekRemote remote branch msubdir importcontent ci mimportmessage = do
 	importtreeconfig <- case msubdir of
 		Nothing -> return ImportTree
 		Just subdir ->
@@ -336,7 +336,7 @@ seekRemote remote branch msubdir importcontent ci importmessages = do
 	
 	trackingcommit <- fromtrackingbranch Git.Ref.sha
 	cmode <- annexCommitMode <$> Annex.getGitConfig
-	let importcommitconfig = ImportCommitConfig trackingcommit cmode importmessages'
+	let importcommitconfig = ImportCommitConfig trackingcommit cmode importmessage
 	let commitimport = commitRemote remote branch tb trackingcommit importtreeconfig importcommitconfig
 
 	importabletvar <- liftIO $ newTVarIO Nothing
@@ -353,9 +353,9 @@ seekRemote remote branch msubdir importcontent ci importmessages = do
 				includeCommandAction $ 
 					commitimport imported
   where
-	importmessages'
+	importmessage = fromMaybe 
-		| null importmessages = ["import from " ++ Remote.name remote]
+		("import from " ++ Remote.name remote)
-		| otherwise = importmessages
+		mimportmessage
 
 	tb = mkRemoteTrackingBranch remote branch
 

Command/Sync.hs

@@ -1,7 +1,7 @@
 {- git-annex command
  -
  - Copyright 2011 Joachim Breitner <mail@joachim-breitner.de>
- - Copyright 2011-2024 Joey Hess <id@joeyh.name>
+ - Copyright 2011-2023 Joey Hess <id@joeyh.name>
  -
  - Licensed under the GNU AGPL version 3 or higher.
  -}
@@ -105,7 +105,7 @@ data SyncOptions = SyncOptions
 	, notOnlyAnnexOption :: Bool
 	, commitOption :: Bool
 	, noCommitOption :: Bool
-	, messageOption :: [String]
+	, messageOption :: Maybe String
 	, pullOption :: Bool
 	, pushOption :: Bool
 	, contentOption :: Maybe Bool
@@ -125,7 +125,7 @@ instance Default SyncOptions where
 		, notOnlyAnnexOption = False
 		, commitOption = False
 		, noCommitOption = False
-		, messageOption = []
+		, messageOption = Nothing
 		, pullOption = False
 		, pushOption = False
 		, contentOption = Just False
@@ -169,8 +169,8 @@ optParser mode desc = SyncOptions
 			( long "no-commit"
 			<> help "avoid git commit" 
 			))
-	<*> unlessmode [SyncMode, AssistMode] []
+	<*> unlessmode [SyncMode, AssistMode] Nothing
-		(many (strOption
+		(optional (strOption
 			( long "message" <> short 'm' <> metavar "MSG"
 			<> help "commit message"
 			)))
@@ -402,18 +402,17 @@ syncRemotes' ps available =
 
 commit :: SyncOptions -> CommandStart
 commit o = stopUnless shouldcommit $ starting "commit" ai si $ do
+	commitmessage <- maybe commitMsg return (messageOption o)
 	Annex.Branch.commit =<< Annex.Branch.commitMessage
-	mopts <- concatMap (\msg -> [Param "-m", Param msg])
-		<$> if null (messageOption o)
-			then (:[]) <$> commitMsg
-			else pure (messageOption o)
 	next $ do
 		showOutput
 		let cmode = Git.Branch.ManualCommit
 		cquiet <- Git.Branch.CommitQuiet <$> commandProgressDisabled
-		void $ inRepo $ Git.Branch.commitCommand
+		void $ inRepo $ Git.Branch.commitCommand cmode cquiet
-			cmode cquiet
+			[ Param "-a"
-			([ Param "-a" ] ++ mopts)
+			, Param "-m"
+			, Param commitmessage
+			]
 		return True
   where
 	shouldcommit = notOnlyAnnex o <&&>
@@ -427,8 +426,7 @@ commitMsg :: Annex String
 commitMsg = do
 	u <- getUUID
 	m <- uuidDescMap
-	return $ "git-annex in "
+	return $ "git-annex in " ++ maybe "unknown" fromUUIDDesc (M.lookup u m)
-		++ maybe "unknown" fromUUIDDesc (M.lookup u m)
 
 mergeLocal :: [Git.Merge.MergeConfig] -> SyncOptions -> CurrBranch -> CommandStart
 mergeLocal mergeconfig o currbranch = stopUnless (notOnlyAnnex o) $
@@ -580,7 +578,7 @@ importRemote importcontent o remote currbranch
 			let (branch, subdir) = splitRemoteAnnexTrackingBranchSubdir b
 			if canImportKeys remote importcontent
 				then do
-					Command.Import.seekRemote remote branch subdir importcontent (CheckGitIgnore True) []
+					Command.Import.seekRemote remote branch subdir importcontent (CheckGitIgnore True) Nothing
 					-- Importing generates a branch
 					-- that is not initially connected
 					-- to the current branch, so allow

Git/Branch.hs

@@ -178,7 +178,7 @@ commit commitmode allowempty message branch parentrefs repo = do
 	tree <- writeTree repo
 	ifM (cancommit tree)
 		( do
-			sha <- commitTree commitmode [message] parentrefs tree repo
+			sha <- commitTree commitmode message parentrefs tree repo
 			update' branch sha repo
 			return $ Just sha
 		, return Nothing
@@ -207,15 +207,15 @@ writeTreeQuiet repo = extractSha <$> withNullHandle go
 	go nullh = pipeReadStrict' (\p -> p { std_err = UseHandle nullh }) 
 		[Param "write-tree"] repo
 
-commitTree :: CommitMode -> [String] -> [Ref] -> Ref -> Repo -> IO Sha
+commitTree :: CommitMode -> String -> [Ref] -> Ref -> Repo -> IO Sha
-commitTree commitmode messages parentrefs tree repo =
+commitTree commitmode message parentrefs tree repo =
-	getSha "commit-tree" $ pipeReadStrict ps repo
+	getSha "commit-tree" $
+		pipeWriteRead ([Param "commit-tree", Param (fromRef tree)] ++ ps)
+			sendmsg repo
   where
-	ps = [Param "commit-tree", Param (fromRef tree)]
+	sendmsg = Just $ flip hPutStr message
-		++ applyCommitModeForCommitTree commitmode baseparams repo
+	ps = applyCommitModeForCommitTree commitmode parentparams repo
-	baseparams = map Param $
+	parentparams = map Param $ concatMap (\r -> ["-p", fromRef r]) parentrefs
-		concatMap (\r -> ["-p", fromRef r]) parentrefs
-			++ concatMap (\msg -> ["-m", msg]) messages
 
 {- A leading + makes git-push force pushing a branch. -}
 forcePush :: String -> String

doc/git-annex-assist.mdwn

@@ -34,9 +34,6 @@ files that it does not match will instead be added with `git add`.
 
   Use this option to specify a commit message.
 
-  If multiple -m options are given, their values are concatenated
-  as separate paragraphs.
-
 * `--content-of=path` `-C path`
 
   Only add, pull, and push files in the given path.

doc/git-annex-import.mdwn

@@ -107,9 +107,6 @@ the tree of files on the remote, even when importing into a subdirectory.
   Use this option to specify a commit message for the changes that have
   been made to the special remote since the last import from it.
 
-  If multiple -m options are given, their values are concatenated
-  as separate paragraphs.
-
 # IMPORTING FROM A DIRECTORY
 
 When run with a path, `git annex import` **moves** files from somewhere outside

doc/git-annex-sync.mdwn

@@ -51,9 +51,6 @@ when syncing with repositories that have preferred content configured.
 
   Use this option to specify a commit message.
 
-  If multiple -m options are given, their values are concatenated
-  as separate paragraphs.
-
 * `--pull`, `--no-pull`
 
   Use this option to disable pulling.

doc/todo/multiple_-m.mdwn

@@ -1,4 +1,2 @@
 git-annex sync etc -m should be able to be specified multiple times. In git
 commit, multiple -m can be used to make a multiparagraph commit. --[[Joey]]
-
-> [[done]]