diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-11 13:29:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-11 13:29:44 -0400 |
| commit | b3e761b6cf42cb537e7e8e8db4d74b12c7dbfd8a (patch) | |
| tree | 3b799f34356a5ae27371ff5d04ab6dbec39e62ad /Command | |
| parent | 017af7233d8d6520d1673218bcd3fadce73d2b1d (diff) | |
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"
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/ImportFeed.hs | 2 | ||||
| -rw-r--r-- | Command/TestRemote.hs | 2 | ||||
| -rw-r--r-- | Command/View.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 647cd269e..2db6e608a 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -115,7 +115,7 @@ getCache :: Maybe String -> Annex Cache getCache opttemplate = ifM (Annex.getState Annex.force) ( ret S.empty S.empty , do - showSideAction "checking known urls" + showAction "checking known urls" (is, us) <- unzip <$> (mapM knownItems =<< knownUrls) ret (S.fromList us) (S.fromList (concat is)) ) diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs index be1b9a324..f66a77ba7 100644 --- a/Command/TestRemote.hs +++ b/Command/TestRemote.hs @@ -63,7 +63,7 @@ start :: Int -> RemoteName -> CommandStart start basesz name = do showStart "testremote" name r <- either error id <$> Remote.byName' name - showSideAction "generating test keys" + showAction "generating test keys" fast <- Annex.getState Annex.fast ks <- mapM randKey (keySizes basesz fast) rs <- catMaybes <$> mapM (adjustChunkSize r) (chunkSizes basesz fast) diff --git a/Command/View.hs b/Command/View.hs index b39aef7d9..3fdbbb9c5 100644 --- a/Command/View.hs +++ b/Command/View.hs @@ -39,7 +39,7 @@ start ps = do perform :: View -> CommandPerform perform view = do - showSideAction "searching" + showAction "searching" next $ checkoutViewBranch view applyView paramView :: String |