showStart variant for when there's no worktree file

Clean up some uses of showStart with "" for the file,
or in some cases, a non-filename description string. That would
generate bad json, although none of the commands doing that
supported --json.

Using "" for the file resulted in output like "foo  rest";
now the extra space is eliminated.

This commit was sponsored by Fernando Jimenez on Patreon.

45 files changed, 64 insertions, 64 deletions

diff --git a/Command/Adjust.hs b/Command/Adjust.hs
index 204fd057a..0fef3f936 100644
--- a/Command/Adjust.hs
+++ b/Command/Adjust.hs
@@ -38,5 +38,5 @@ seek = commandAction . start
 start :: Adjustment -> CommandStart
 start adj = do
 	checkVersionSupported
-	showStart "adjust" ""
+	showStart' "adjust" Nothing
 	next $ next $ enterAdjustedBranch adj
diff --git a/Command/Config.hs b/Command/Config.hs
index 5da196044..47415999d 100644
--- a/Command/Config.hs
+++ b/Command/Config.hs
@@ -50,14 +50,14 @@ optParser _ = setconfig <|> getconfig <|> unsetconfig
 seek :: Action -> CommandSeek
 seek (SetConfig name val) = commandAction $ do
 	allowMessages
-	showStart name val
+	showStart' name (Just val)
 	next $ next $ do
 		setGlobalConfig name val
 		setConfig (ConfigKey name) val
 		return True
 seek (UnsetConfig name) = commandAction $ do
 	allowMessages
-	showStart name "unset"
+	showStart' name (Just "unset")
 	next $ next $ do
 		unsetGlobalConfig name
 		unsetConfig (ConfigKey name)
diff --git a/Command/Dead.hs b/Command/Dead.hs
index 44cf7b7f6..385dd6fad 100644
--- a/Command/Dead.hs
+++ b/Command/Dead.hs
@@ -33,7 +33,7 @@ seek (DeadKeys ks) = seekActions $ pure $ map startKey ks
 
 startKey :: Key -> CommandStart
 startKey key = do
-	showStart "dead" (key2file key)
+	showStart' "dead" (Just $ key2file key)
 	ls <- keyLocations key
 	case ls of
 		[] -> next $ performKey key
diff --git a/Command/Describe.hs b/Command/Describe.hs
index dc7a5d8f9..4b86a7b58 100644
--- a/Command/Describe.hs
+++ b/Command/Describe.hs
@@ -22,7 +22,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start (name:description) = do
-	showStart "describe" name
+	showStart' "describe" (Just name)
 	u <- Remote.nameToUUID name
 	next $ perform u $ unwords description
 start _ = giveup "Specify a repository and a description."	
diff --git a/Command/Direct.hs b/Command/Direct.hs
index 817cedd53..20eeef726 100644
--- a/Command/Direct.hs
+++ b/Command/Direct.hs
@@ -31,7 +31,7 @@ start = ifM versionSupportsDirectMode
 
 perform :: CommandPerform
 perform = do
-	showStart "commit" ""
+	showStart' "commit" Nothing
 	showOutput
 	_ <- inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit
 		[ Param "-a"
@@ -65,6 +65,6 @@ perform = do
 
 cleanup :: CommandCleanup
 cleanup = do
-	showStart "direct" ""
+	showStart' "direct" Nothing
 	setDirect True
 	return True
diff --git a/Command/Drop.hs b/Command/Drop.hs
index b03e3e080..275714a65 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -89,12 +89,12 @@ startKeys o key = start' o key (AssociatedFile Nothing)
 
 startLocal :: AssociatedFile -> ActionItem -> NumCopies -> Key -> [VerifiedCopy] -> CommandStart
 startLocal afile ai numcopies key preverified = stopUnless (inAnnex key) $ do
-	showStart' "drop" key ai
+	showStartKey "drop" key ai
 	next $ performLocal key afile numcopies preverified
 
 startRemote :: AssociatedFile -> ActionItem -> NumCopies -> Key -> Remote -> CommandStart
 startRemote afile ai numcopies key remote = do
-	showStart' ("drop " ++ Remote.name remote) key ai
+	showStartKey ("drop " ++ Remote.name remote) key ai
 	next $ performRemote key afile numcopies remote
 
 performLocal :: Key -> AssociatedFile -> NumCopies -> [VerifiedCopy] -> CommandPerform
diff --git a/Command/DropKey.hs b/Command/DropKey.hs
index 65446ba06..f3f2333dd 100644
--- a/Command/DropKey.hs
+++ b/Command/DropKey.hs
@@ -42,7 +42,7 @@ seek o = do
 
 start :: Key -> CommandStart
 start key = do
-	showStart' "dropkey" key (mkActionItem key)
+	showStartKey "dropkey" key (mkActionItem key)
 	next $ perform key
 
 perform :: Key -> CommandPerform
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs
index fd830375a..d9993ebc9 100644
--- a/Command/EnableRemote.hs
+++ b/Command/EnableRemote.hs
@@ -55,7 +55,7 @@ start (name:rest) = go =<< filter matchingname <$> Annex.fromRepo Git.remotes
 startNormalRemote :: Git.RemoteName -> [String] -> Git.Repo -> CommandStart
 startNormalRemote name restparams r
 	| null restparams = do
-		showStart "enableremote" name
+		showStart' "enableremote" (Just name)
 		next $ next $ do
 			setRemoteIgnore r False
 			r' <- Remote.Git.configRead False r
@@ -77,7 +77,7 @@ startSpecialRemote name config Nothing = do
 startSpecialRemote name config (Just (u, c)) = do
 	let fullconfig = config `M.union` c	
 	t <- either giveup return (Annex.SpecialRemote.findType fullconfig)
-	showStart "enableremote" name
+	showStart' "enableremote" (Just name)
 	gc <- maybe (liftIO dummyRemoteGitConfig) 
 		(return . Remote.gitconfig)
 		=<< Remote.byUUID u
diff --git a/Command/EnableTor.hs b/Command/EnableTor.hs
index 7076a9a73..72fa50448 100644
--- a/Command/EnableTor.hs
+++ b/Command/EnableTor.hs
@@ -51,7 +51,7 @@ start os = do
 			Nothing -> giveup "Need user-id parameter."
 			Just userid -> go uuid userid
 		else do
-			showStart "enable-tor" ""
+			showStart' "enable-tor" Nothing
 			gitannex <- liftIO readProgramFile
 			let ps = [Param (cmdname cmd), Param (show curruserid)]
 			sucommand <- liftIO $ mkSuCommand gitannex ps
diff --git a/Command/Expire.hs b/Command/Expire.hs
index 551742304..28f90dfb5 100644
--- a/Command/Expire.hs
+++ b/Command/Expire.hs
@@ -59,12 +59,12 @@ start :: Expire -> Bool -> Log Activity -> M.Map UUID String -> UUID -> CommandS
 start (Expire expire) noact actlog descs u =
 	case lastact of
 		Just ent | notexpired ent -> checktrust (== DeadTrusted) $ do
-			showStart "unexpire" desc
+			showStart' "unexpire" (Just desc)
 			showNote =<< whenactive
 			unless noact $
 				trustSet u SemiTrusted
 		_ -> checktrust (/= DeadTrusted) $ do
-			showStart "expire" desc
+			showStart' "expire" (Just desc)
 			showNote =<< whenactive
 			unless noact $
 				trustSet u DeadTrusted
diff --git a/Command/Forget.hs b/Command/Forget.hs
index d172cc693..40ac98d4b 100644
--- a/Command/Forget.hs
+++ b/Command/Forget.hs
@@ -34,7 +34,7 @@ seek = commandAction . start
 
 start :: ForgetOptions -> CommandStart
 start o = do
-	showStart "forget" "git-annex"
+	showStart' "forget" (Just "git-annex")
 	c <- liftIO currentVectorClock
 	let basets = addTransition c ForgetGitHistory noTransitions
 	let ts = if dropDead o
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index c1e3a7965..1b276db99 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -41,7 +41,7 @@ start force (keyname, file) = do
 
 startMass :: CommandStart
 startMass = do
-	showStart "fromkey" "stdin"
+	showStart' "fromkey" (Just "stdin")
 	next massAdd
 
 massAdd :: CommandPerform
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 514421e93..bc7a29f15 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -536,7 +536,7 @@ badContentRemote remote localcopy key = do
 runFsck :: Incremental -> ActionItem -> Key -> Annex Bool -> CommandStart
 runFsck inc ai key a = ifM (needFsck inc key)
 	( do
-		showStart' "fsck" key ai
+		showStartKey "fsck" key ai
 		next $ do
 			ok <- a
 			when ok $
diff --git a/Command/Get.hs b/Command/Get.hs
index a412b2cb3..a74ca253f 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -71,7 +71,7 @@ start' expensivecheck from key afile ai = onlyActionOn key $
 					go $ Command.Move.fromPerform src False key afile
   where
 	go a = do
-		showStart' "get" key ai
+		showStartKey "get" key ai
 		next a
 
 perform :: Key -> AssociatedFile -> CommandPerform
diff --git a/Command/Group.hs b/Command/Group.hs
index 65e062589..52b7e688c 100644
--- a/Command/Group.hs
+++ b/Command/Group.hs
@@ -24,7 +24,7 @@ seek = withWords start
 start :: [String] -> CommandStart
 start (name:g:[]) = do
 	allowMessages
-	showStart "group" name
+	showStart' "group" (Just name)
 	u <- Remote.nameToUUID name
 	next $ setGroup u g
 start (name:[]) = do
diff --git a/Command/GroupWanted.hs b/Command/GroupWanted.hs
index 939b3030a..8dab02933 100644
--- a/Command/GroupWanted.hs
+++ b/Command/GroupWanted.hs
@@ -24,6 +24,6 @@ start :: [String] -> CommandStart
 start (g:[]) = next $ performGet groupPreferredContentMapRaw g
 start (g:expr:[]) = do
 	allowMessages
-	showStart "groupwanted" g
+	showStart' "groupwanted" (Just g)
 	next $ performSet groupPreferredContentSet expr g
 start _ = giveup "Specify a group."
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
index d2989f05b..0a8122b25 100644
--- a/Command/ImportFeed.hs
+++ b/Command/ImportFeed.hs
@@ -72,7 +72,7 @@ seek o = do
 
 start :: ImportFeedOptions -> Cache -> URLString -> CommandStart
 start opts cache url = do
-	showStart "importfeed" url
+	showStart' "importfeed" (Just url)
 	next $ perform opts cache url
 
 perform :: ImportFeedOptions -> Cache -> URLString -> CommandPerform
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 862c6e00e..825b82004 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -42,7 +42,7 @@ start = ifM isDirect
 
 perform :: CommandPerform
 perform = do
-	showStart "commit" ""
+	showStart' "commit" Nothing
 	whenM stageDirect $ do
 		showOutput
 		void $ inRepo $ Git.Branch.commitCommand Git.Branch.ManualCommit
@@ -100,6 +100,6 @@ perform = do
 	
 cleanup :: CommandCleanup
 cleanup = do
-	showStart "indirect" ""
+	showStart' "indirect" Nothing
 	showEndOk
 	return True
diff --git a/Command/Init.hs b/Command/Init.hs
index 3c38c0f8a..e7f57c29c 100644
--- a/Command/Init.hs
+++ b/Command/Init.hs
@@ -40,7 +40,7 @@ seek = commandAction . start
 
 start :: InitOptions -> CommandStart
 start os = do
-	showStart "init" (initDesc os)
+	showStart' "init" (Just $ initDesc os)
 	next $ perform os
 
 perform :: InitOptions -> CommandPerform
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index d82dc366c..c52ca4c56 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -38,7 +38,7 @@ start (name:ws) = ifM (isJust <$> findExisting name)
 				let c = newConfig name
 				t <- either giveup return (findType config)
 
-				showStart "initremote" name
+				showStart' "initremote" (Just name)
 				next $ perform t name $ M.union config c
 			)
 	)
diff --git a/Command/Map.hs b/Command/Map.hs
index ae568f8cc..9ae73d898 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -189,7 +189,7 @@ same a b
 {- reads the config of a remote, with progress display -}
 scan :: Git.Repo -> Annex Git.Repo
 scan r = do
-	showStart "map" $ Git.repoDescribe r
+	showStart' "map" (Just $ Git.repoDescribe r)
 	v <- tryScan r
 	case v of
 		Just r' -> do
diff --git a/Command/Merge.hs b/Command/Merge.hs
index 4f99093ab..66b519973 100644
--- a/Command/Merge.hs
+++ b/Command/Merge.hs
@@ -23,7 +23,7 @@ seek _ = do
 
 mergeBranch :: CommandStart
 mergeBranch = do
-	showStart "merge" "git-annex"
+	showStart' "merge" (Just "git-annex")
 	next $ do
 		Annex.Branch.update
 		-- commit explicitly, in case no remote branches were merged
diff --git a/Command/MetaData.hs b/Command/MetaData.hs
index fd5fd0838..9fba1097a 100644
--- a/Command/MetaData.hs
+++ b/Command/MetaData.hs
@@ -100,7 +100,7 @@ startKeys c o k ai = case getSet o of
 			putStrLn . fromMetaValue
 		stop
 	_ -> do
-		showStart' "metadata" k ai
+		showStartKey "metadata" k ai
 		next $ perform c o k
 
 perform :: VectorClock -> MetaDataOptions -> Key -> CommandPerform
@@ -164,7 +164,7 @@ startBatch (i, (MetaData m)) = case i of
 	Right k -> go k (mkActionItem k)
   where
 	go k ai = do
-		showStart' "metadata" k ai
+		showStartKey "metadata" k ai
 		let o = MetaDataOptions
 			{ forFiles = []
 			, getSet = if MetaData m == emptyMetaData
diff --git a/Command/Move.hs b/Command/Move.hs
index 04e6aa384..63b5fb8b0 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -87,7 +87,7 @@ start' o move afile key ai = onlyActionOn key $
 				toHereStart move afile key ai
 
 showMoveAction :: Bool -> Key -> ActionItem -> Annex ()
-showMoveAction move = showStart' (if move then "move" else "copy")
+showMoveAction move = showStartKey (if move then "move" else "copy")
 
 {- Moves (or copies) the content of an annexed file to a remote.
  -
diff --git a/Command/Multicast.hs b/Command/Multicast.hs
index 7b0d54e8e..9a518a18f 100644
--- a/Command/Multicast.hs
+++ b/Command/Multicast.hs
@@ -78,7 +78,7 @@ seek (MultiCastOptions Receive _ _) = giveup "Cannot specify list of files with
 
 genAddress :: CommandStart
 genAddress = do
-	showStart "gen-address" ""
+	showStart' "gen-address" Nothing
 	k <- uftpKey
 	(s, ok) <- case k of
 		KeyContainer s -> liftIO $ genkey (Param s)
@@ -130,7 +130,7 @@ send ups fs = withTmpFile "send" $ \t h -> do
 	whenM isDirect $
 		giveup "Sorry, multicast send cannot be done from a direct mode repository."
 	
-	showStart "generating file list" ""
+	showStart' "generating file list" Nothing
 	fs' <- seekHelper LsFiles.inRepo =<< workTreeItems fs
 	matcher <- Limit.getMatcher
 	let addlist f o = whenM (matcher $ MatchingFile $ FileInfo f f) $
@@ -143,7 +143,7 @@ send ups fs = withTmpFile "send" $ \t h -> do
 	liftIO $ hClose h
 	showEndOk
 
-	showStart "sending files" ""
+	showStart' "sending files" Nothing
 	showOutput
 	serverkey <- uftpKey
 	u <- getUUID
@@ -169,7 +169,7 @@ send ups fs = withTmpFile "send" $ \t h -> do
 
 receive :: [CommandParam] -> CommandStart
 receive ups = do
-	showStart "receiving multicast files" ""
+	showStart' "receiving multicast files" Nothing
 	showNote "Will continue to run until stopped by ctrl-c"
 	
 	showOutput
diff --git a/Command/NumCopies.hs b/Command/NumCopies.hs
index 9e467da7a..d10f70063 100644
--- a/Command/NumCopies.hs
+++ b/Command/NumCopies.hs
@@ -48,7 +48,7 @@ startGet = next $ next $ do
 startSet :: Int -> CommandStart
 startSet n = do
 	allowMessages
-	showStart "numcopies" (show n)
+	showStart' "numcopies" (Just $ show n)
 	next $ next $ do
 		setGlobalNumCopies $ NumCopies n
 		return True
diff --git a/Command/P2P.hs b/Command/P2P.hs
index 58b5c3bd7..40a49b49f 100644
--- a/Command/P2P.hs
+++ b/Command/P2P.hs
@@ -97,7 +97,7 @@ genAddresses addrs = do
 -- Address is read from stdin, to avoid leaking it in shell history.
 linkRemote :: RemoteName -> CommandStart
 linkRemote remotename = do
-	showStart "p2p link" remotename
+	showStart' "p2p link" (Just remotename)
 	next $ next promptaddr
   where
 	promptaddr = do
@@ -123,7 +123,7 @@ linkRemote remotename = do
 startPairing :: RemoteName -> [P2PAddress] -> CommandStart
 startPairing _ [] = giveup "No P2P networks are currrently available."
 startPairing remotename addrs = do
-	showStart "p2p pair" remotename
+	showStart' "p2p pair" (Just remotename)
 	ifM (liftIO Wormhole.isInstalled)
 		( next $ performPairing remotename addrs
 		, giveup "Magic Wormhole is not installed, and is needed for pairing. Install it from your distribution or from https://github.com/warner/magic-wormhole/"
diff --git a/Command/RegisterUrl.hs b/Command/RegisterUrl.hs
index 008e6436c..ef73e6728 100644
--- a/Command/RegisterUrl.hs
+++ b/Command/RegisterUrl.hs
@@ -27,10 +27,10 @@ seek = withWords start
 start :: [String] -> CommandStart
 start (keyname:url:[]) = do
 	let key = mkKey keyname
-	showStart "registerurl" url
+	showStart' "registerurl" (Just url)
 	next $ perform key url
 start [] = do
-	showStart "registerurl" "stdin"
+	showStart' "registerurl" (Just "stdin")
 	next massAdd
 start _ = giveup "specify a key and an url"
 
diff --git a/Command/Reinit.hs b/Command/Reinit.hs
index 25001db43..6defa4e95 100644
--- a/Command/Reinit.hs
+++ b/Command/Reinit.hs
@@ -25,7 +25,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start ws = do
-	showStart "reinit" s
+	showStart' "reinit" (Just s)
 	next $ perform s
   where
 	s = unwords ws
diff --git a/Command/ResolveMerge.hs b/Command/ResolveMerge.hs
index 0ba6efb36..df72e24d4 100644
--- a/Command/ResolveMerge.hs
+++ b/Command/ResolveMerge.hs
@@ -23,7 +23,7 @@ seek = withNothing start
 
 start :: CommandStart
 start = do
-	showStart "resolvemerge" ""
+	showStart' "resolvemerge" Nothing
 	us <- fromMaybe nobranch <$> inRepo Git.Branch.current
 	d <- fromRepo Git.localGitDir
 	let merge_head = d </> "MERGE_HEAD"
diff --git a/Command/Schedule.hs b/Command/Schedule.hs
index 5814d99f1..b39e652b2 100644
--- a/Command/Schedule.hs
+++ b/Command/Schedule.hs
@@ -28,7 +28,7 @@ start = parse
 	parse (name:[]) = go name performGet
 	parse (name:expr:[]) = go name $ \uuid -> do
 		allowMessages
-		showStart "schedule" name
+		showStart' "schedule" (Just name)
 		performSet expr uuid
 	parse _ = giveup "Specify a repository."
 
diff --git a/Command/SetPresentKey.hs b/Command/SetPresentKey.hs
index da2a6fa3d..6e7075e8c 100644
--- a/Command/SetPresentKey.hs
+++ b/Command/SetPresentKey.hs
@@ -23,7 +23,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start (ks:us:vs:[]) = do
-	showStart' "setpresentkey" k (mkActionItem k)
+	showStartKey "setpresentkey" k (mkActionItem k)
 	next $ perform k (toUUID us) s
   where
 	k = fromMaybe (giveup "bad key") (file2key ks)
diff --git a/Command/Sync.hs b/Command/Sync.hs
index b2d0bd275..f63260ed4 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -299,7 +299,7 @@ syncRemotes' ps available =
 commit :: SyncOptions -> CommandStart
 commit o = stopUnless shouldcommit $ next $ next $ do
 	commitmessage <- maybe commitMsg return (messageOption o)
-	showStart "commit" ""
+	showStart' "commit" Nothing
 	Annex.Branch.commit "update"
 	ifM isDirect
 		( do
@@ -342,7 +342,7 @@ mergeLocal mergeconfig resolvemergeoverride currbranch@(Just _, _) =
   where
 	go Nothing = stop
 	go (Just syncbranch) = do
-		showStart "merge" $ Git.Ref.describe syncbranch
+		showStart' "merge" (Just $ Git.Ref.describe syncbranch)
 		next $ next $ merge currbranch mergeconfig resolvemergeoverride Git.Branch.ManualCommit syncbranch
 mergeLocal _ _ (Nothing, madj) = do
 	b <- inRepo Git.Branch.currentUnsafe
@@ -401,7 +401,7 @@ updateBranch syncbranch updateto g =
 
 pullRemote :: SyncOptions -> [Git.Merge.MergeConfig] -> Remote -> CurrBranch -> CommandStart
 pullRemote o mergeconfig remote branch = stopUnless (pure $ pullOption o && wantpull) $ do
-	showStart "pull" (Remote.name remote)
+	showStart' "pull" (Just (Remote.name remote))
 	next $ do
 		showOutput
 		stopUnless fetch $
@@ -438,7 +438,7 @@ mergeRemote remote currbranch mergeconfig resolvemergeoverride = ifM isBareRepo
 pushRemote :: SyncOptions -> Remote -> CurrBranch -> CommandStart
 pushRemote _o _remote (Nothing, _) = stop
 pushRemote o remote (Just branch, _) = stopUnless (pure (pushOption o) <&&> needpush) $ do
-	showStart "push" (Remote.name remote)
+	showStart' "push" (Just (Remote.name remote))
 	next $ next $ do
 		showOutput
 		ok <- inRepoWithSshOptionsTo (Remote.repo remote) gc $
@@ -651,7 +651,7 @@ syncFile ebloom rs af k = onlyActionOn' k $ do
 		, return []
 		)
 	get have = includeCommandAction $ do
-		showStart' "get" k (mkActionItem af)
+		showStartKey "get" k (mkActionItem af)
 		next $ next $ getKey' k af have
 
 	wantput r
@@ -703,7 +703,7 @@ seekExportContent rs = or <$> forM rs go
 cleanupLocal :: CurrBranch -> CommandStart
 cleanupLocal (Nothing, _) = stop
 cleanupLocal (Just currb, _) = do
-	showStart "cleanup" "local"
+	showStart' "cleanup" (Just "local")
 	next $ next $ do
 		delbranch $ syncBranch currb
 		delbranch $ syncBranch $ Git.Ref.base $ Annex.Branch.name
@@ -717,7 +717,7 @@ cleanupLocal (Just currb, _) = do
 cleanupRemote :: Remote -> CurrBranch -> CommandStart
 cleanupRemote _ (Nothing, _) = stop
 cleanupRemote remote (Just b, _) = do
-	showStart "cleanup" (Remote.name remote)
+	showStart' "cleanup" (Just (Remote.name remote))
 	next $ next $
 		inRepo $ Git.Command.runBool
 			[ Param "push"
diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs
index 75e438d79..1a5da42b2 100644
--- a/Command/TestRemote.hs
+++ b/Command/TestRemote.hs
@@ -58,7 +58,7 @@ seek o = commandAction $ start (fromInteger $ sizeOption o) (testRemote o)
 
 start :: Int -> RemoteName -> CommandStart
 start basesz name = do
-	showStart "testremote" name
+	showStart' "testremote" (Just name)
 	fast <- Annex.getState Annex.fast
 	r <- either giveup disableExportTree =<< Remote.byName' name
 	rs <- catMaybes <$> mapM (adjustChunkSize r) (chunkSizes basesz fast)
diff --git a/Command/Trust.hs b/Command/Trust.hs
index 66a1c81b3..5f161af26 100644
--- a/Command/Trust.hs
+++ b/Command/Trust.hs
@@ -27,7 +27,7 @@ trustCommand c level = withWords start
   where
 	start ws = do
 		let name = unwords ws
-		showStart c name
+		showStart' c (Just name)
 		u <- Remote.nameToUUID name
 		next $ perform u
 	perform uuid = do
diff --git a/Command/Ungroup.hs b/Command/Ungroup.hs
index ddcdba466..357f5685f 100644
--- a/Command/Ungroup.hs
+++ b/Command/Ungroup.hs
@@ -23,7 +23,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start (name:g:[]) = do
-	showStart "ungroup" name
+	showStart' "ungroup" (Just name)
 	u <- Remote.nameToUUID name
 	next $ perform u g
 start _ = giveup "Specify a repository and a group."
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 916e6db25..27018cf38 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -70,7 +70,7 @@ start o = do
 		Just "." -> (".", checkUnused refspec)
 		Just "here" -> (".", checkUnused refspec)
 		Just n -> (n, checkRemoteUnused n refspec)
-	showStart "unused" name
+	showStart' "unused" (Just name)
 	next perform
 
 checkUnused :: RefSpec -> CommandPerform
@@ -338,5 +338,5 @@ startUnused message unused badunused tmpunused maps n = search
 		case M.lookup n m of
 			Nothing -> search rest
 			Just key -> do
-				showStart message (show n)
+				showStart' message (Just $ show n)
 				next $ a key
diff --git a/Command/Upgrade.hs b/Command/Upgrade.hs
index 696b794a5..1c3e62695 100644
--- a/Command/Upgrade.hs
+++ b/Command/Upgrade.hs
@@ -23,7 +23,7 @@ seek = withNothing start
 
 start :: CommandStart
 start = do
-	showStart "upgrade" "."
+	showStart' "upgrade" Nothing
 	whenM (isNothing <$> getVersion) $ do
 		initialize Nothing Nothing
 	r <- upgrade False latestVersion
diff --git a/Command/VAdd.hs b/Command/VAdd.hs
index c94ce5722..800573732 100644
--- a/Command/VAdd.hs
+++ b/Command/VAdd.hs
@@ -23,7 +23,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start params = do
-	showStart "vadd" ""
+	showStart' "vadd" Nothing
 	withCurrentView $ \view -> do
 		let (view', change) = refineView view $
 			map parseViewParam $ reverse params
diff --git a/Command/VCycle.hs b/Command/VCycle.hs
index 28326e16f..9c1e24e0d 100644
--- a/Command/VCycle.hs
+++ b/Command/VCycle.hs
@@ -27,7 +27,7 @@ start = go =<< currentView
   where
 	go Nothing = giveup "Not in a view."
 	go (Just v) = do
-		showStart "vcycle" ""
+		showStart' "vcycle" Nothing
 		let v' = v { viewComponents = vcycle [] (viewComponents v) }
 		if v == v'
 			then do
diff --git a/Command/VFilter.hs b/Command/VFilter.hs
index 130e2550c..fa545cddd 100644
--- a/Command/VFilter.hs
+++ b/Command/VFilter.hs
@@ -21,7 +21,7 @@ seek = withWords start
 
 start :: [String] -> CommandStart
 start params = do
-	showStart "vfilter" ""
+	showStart' "vfilter" Nothing
 	withCurrentView $ \view -> do
 		let view' = filterView view $
 			map parseViewParam $ reverse params
diff --git a/Command/VPop.hs b/Command/VPop.hs
index 58411001b..71da586c2 100644
--- a/Command/VPop.hs
+++ b/Command/VPop.hs
@@ -28,7 +28,7 @@ start ps = go =<< currentView
   where
 	go Nothing = giveup "Not in a view."
 	go (Just v) = do
-		showStart "vpop" (show num)
+		showStart' "vpop" (Just $ show num)
 		removeView v
 		(oldvs, vs) <- splitAt (num - 1) . filter (sameparentbranch v)
 			<$> recentViews
diff --git a/Command/View.hs b/Command/View.hs
index 513e6d10c..298fad0ee 100644
--- a/Command/View.hs
+++ b/Command/View.hs
@@ -27,7 +27,7 @@ seek = withWords start
 start :: [String] -> CommandStart
 start [] = giveup "Specify metadata to include in view"
 start ps = do
-	showStart "view" ""
+	showStart' "view" Nothing
 	view <- mkView ps
 	go view  =<< currentView
   where
diff --git a/Command/Wanted.hs b/Command/Wanted.hs
index fc1fa86bd..ac4175ecd 100644
--- a/Command/Wanted.hs
+++ b/Command/Wanted.hs
@@ -35,7 +35,7 @@ cmd' name desc getter setter = noMessages $
 	start (rname:[]) = go rname (performGet getter)
 	start (rname:expr:[]) = go rname $ \uuid -> do
 		allowMessages
-		showStart name rname
+		showStart' name (Just rname)
 		performSet setter expr uuid
 	start _ = giveup "Specify a repository."
 		
diff --git a/Command/Whereis.hs b/Command/Whereis.hs
index c5543bc66..295d11994 100644
--- a/Command/Whereis.hs
+++ b/Command/Whereis.hs
@@ -53,7 +53,7 @@ start remotemap file key = startKeys remotemap key (mkActionItem afile)
 
 startKeys :: M.Map UUID Remote -> Key -> ActionItem -> CommandStart
 startKeys remotemap key ai = do
-	showStart' "whereis" key ai
+	showStartKey "whereis" key ai
 	next $ perform remotemap key
 
 perform :: M.Map UUID Remote -> Key -> CommandPerform