summaryrefslogtreecommitdiff
path: root/Remote/Hook.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-19 14:07:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-19 14:07:23 -0400
commit00153eed48a2328969cc08688ef674a4c19c2014 (patch)
treef2ee8ac90225d1d2329f45b43061b53b7757d815 /Remote/Hook.hs
parentec9e9343d9fa99b0786ee93ff142484e2402d3c8 (diff)
unify elipsis handling
And add a simple dots-based progress display, currently only used in v2 upgrade.
Diffstat (limited to 'Remote/Hook.hs')
-rw-r--r--Remote/Hook.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index f0e4d5bfb..87f86ffe4 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -98,7 +98,7 @@ runHook :: String -> String -> Key -> Maybe FilePath -> Annex Bool -> Annex Bool
runHook hooktype hook k f a = maybe (return False) run =<< lookupHook hooktype hook
where
run command = do
- showProgress -- make way for hook output
+ showOutput -- make way for hook output
res <- liftIO $ boolSystemEnv
"sh" [Param "-c", Param command] $ hookEnv k f
if res
@@ -133,7 +133,7 @@ remove h k = runHook h "remove" k Nothing $ return True
checkPresent :: Git.Repo -> String -> Key -> Annex (Either IOException Bool)
checkPresent r h k = do
- showNote ("checking " ++ Git.repoDescribe r ++ "...")
+ showAction $ "checking " ++ Git.repoDescribe r
v <- lookupHook h "checkpresent"
liftIO (try (check v) ::IO (Either IOException Bool))
where