summaryrefslogtreecommitdiff
path: root/Remotes.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-11-08 15:15:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-11-08 15:15:21 -0400
commit070e8530c1151dc96dec099eac8b967277751b10 (patch)
tree8605013ee71aeafdb2bb89612cf3e2044882ab6d /Remotes.hs
parent02a21d7f274568a2e2f94498607955aab8713a24 (diff)
refactoring, no code changes really
Diffstat (limited to 'Remotes.hs')
-rw-r--r--Remotes.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Remotes.hs b/Remotes.hs
index 280543968..7aad6c2a0 100644
--- a/Remotes.hs
+++ b/Remotes.hs
@@ -36,6 +36,7 @@ import Locations
import UUID
import Utility
import qualified Core
+import Messages
{- Human visible list of remotes. -}
list :: [Git.Repo] -> String
@@ -64,7 +65,7 @@ keyPossibilities key = do
let expensive = filter Git.repoIsUrl allremotes
doexpensive <- filterM cachedUUID expensive
unless (null doexpensive) $ do
- Core.showNote $ "getting UUID for " ++
+ showNote $ "getting UUID for " ++
(list doexpensive) ++ "..."
let todo = cheap ++ doexpensive
if (not $ null todo)
@@ -93,7 +94,7 @@ inAnnex r key = do
a <- Annex.new r []
Annex.eval a (Core.inAnnex key)
checkremote = do
- Core.showNote ("checking " ++ Git.repoDescribe r ++ "...")
+ showNote ("checking " ++ Git.repoDescribe r ++ "...")
inannex <- runCmd r "test" ["-e", annexLocation r key]
-- XXX Note that ssh failing and the file not existing
-- are not currently differentiated.
@@ -228,7 +229,7 @@ sshLocation r file = (Git.urlHost r) ++ ":" ++ shellEscape file
scp :: Git.Repo -> [String] -> Annex Bool
scp r params = do
scpoptions <- repoConfig r "scp-options" ""
- Core.showProgress -- make way for scp progress bar
+ showProgress -- make way for scp progress bar
liftIO $ boolSystem "scp" $ "-p":(words scpoptions) ++ params
{- Runs a command in a remote, using ssh if necessary.