use action, not sideAction

sideAction is for things not generally related to the current action being
performed. And, it adds a newline after the side action. This was not the
right thing to use for stuff like "checksum", where doing a checksum is
part of the git annex get process, and indeed we want it to display
"(checksum...) ok"
This commit is contained in:
Joey Hess 2015-10-11 13:29:44 -04:00
parent bddff249ae
commit fa9333e99f
Failed to extract signature
6 changed files with 6 additions and 6 deletions

View file

@ -209,7 +209,7 @@ checkSharedClone = inRepo Git.Objects.isSharedClone
initSharedClone :: Bool -> Annex () initSharedClone :: Bool -> Annex ()
initSharedClone False = return () initSharedClone False = return ()
initSharedClone True = do initSharedClone True = do
showSideAction "Repository was cloned with --shared; setting annex.hardlink=true and making repository untrusted." showLongNote "Repository was cloned with --shared; setting annex.hardlink=true and making repository untrusted."
u <- getUUID u <- getUUID
trustSet u UnTrusted trustSet u UnTrusted
setConfig (annexConfig "hardlink") (Git.Config.boolConfig True) setConfig (annexConfig "hardlink") (Git.Config.boolConfig True)

View file

@ -116,7 +116,7 @@ checkKeyChecksum hash key file = go `catchHardwareFault` hwfault
case (mstat, fast) of case (mstat, fast) of
(Just stat, False) -> do (Just stat, False) -> do
filesize <- liftIO $ getFileSize' file stat filesize <- liftIO $ getFileSize' file stat
showSideAction "checksum" showAction "checksum"
check <$> hashFile hash file filesize check <$> hashFile hash file filesize
_ -> return True _ -> return True
expected = keyHash key expected = keyHash key

View file

@ -115,7 +115,7 @@ getCache :: Maybe String -> Annex Cache
getCache opttemplate = ifM (Annex.getState Annex.force) getCache opttemplate = ifM (Annex.getState Annex.force)
( ret S.empty S.empty ( ret S.empty S.empty
, do , do
showSideAction "checking known urls" showAction "checking known urls"
(is, us) <- unzip <$> (mapM knownItems =<< knownUrls) (is, us) <- unzip <$> (mapM knownItems =<< knownUrls)
ret (S.fromList us) (S.fromList (concat is)) ret (S.fromList us) (S.fromList (concat is))
) )

View file

@ -63,7 +63,7 @@ start :: Int -> RemoteName -> CommandStart
start basesz name = do start basesz name = do
showStart "testremote" name showStart "testremote" name
r <- either error id <$> Remote.byName' name r <- either error id <$> Remote.byName' name
showSideAction "generating test keys" showAction "generating test keys"
fast <- Annex.getState Annex.fast fast <- Annex.getState Annex.fast
ks <- mapM randKey (keySizes basesz fast) ks <- mapM randKey (keySizes basesz fast)
rs <- catMaybes <$> mapM (adjustChunkSize r) (chunkSizes basesz fast) rs <- catMaybes <$> mapM (adjustChunkSize r) (chunkSizes basesz fast)

View file

@ -39,7 +39,7 @@ start ps = do
perform :: View -> CommandPerform perform :: View -> CommandPerform
perform view = do perform view = do
showSideAction "searching" showAction "searching"
next $ checkoutViewBranch view applyView next $ checkoutViewBranch view applyView
paramView :: String paramView :: String

View file

@ -185,7 +185,7 @@ toDavPass = B8.fromString
-} -}
testDav :: URLString -> Maybe CredPair -> Annex () testDav :: URLString -> Maybe CredPair -> Annex ()
testDav url (Just (u, p)) = do testDav url (Just (u, p)) = do
showSideAction "testing WebDAV server" showAction "testing WebDAV server"
test $ liftIO $ evalDAVT url $ do test $ liftIO $ evalDAVT url $ do
prepDAV user pass prepDAV user pass
makeParentDirs makeParentDirs