summaryrefslogtreecommitdiff
path: root/Remotes.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:25:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:25:31 -0400
commit4cd96ad2db0867ef7450215d3de7afcf748d7088 (patch)
tree4dd077502002f5cc476fb9ed0edeee2c1fb25930 /Remotes.hs
parentfcdc4797a9ab2b792a9bb20f2ca9802b8f6d5a1e (diff)
rename
Diffstat (limited to 'Remotes.hs')
-rw-r--r--Remotes.hs12
1 files changed, 6 insertions, 6 deletions
diff --git a/Remotes.hs b/Remotes.hs
index 1523e6750..4dcc4c9ad 100644
--- a/Remotes.hs
+++ b/Remotes.hs
@@ -64,7 +64,7 @@ tryGitConfigRead r
Left _ -> return r
Right r' -> return r'
pipedconfig cmd params = safely $
- pOpen ReadFromPipe cmd (toShell params) $
+ pOpen ReadFromPipe cmd (toCommand params) $
Git.hConfigRead r
store a = do
r' <- a
@@ -263,7 +263,7 @@ rsynchelper r sending key file = do
{- Generates rsync parameters that ssh to the remote and asks it
- to either receive or send the key's content. -}
-rsyncParams :: Git.Repo -> Bool -> Key -> FilePath -> Annex [ShellParam]
+rsyncParams :: Git.Repo -> Bool -> Key -> FilePath -> Annex [CommandParam]
rsyncParams r sending key file = do
Just (shellcmd, shellparams) <- git_annex_shell r
(if sending then "sendkey" else "recvkey")
@@ -295,9 +295,9 @@ rsyncParams r sending key file = do
- a specified error value. -}
onRemote
:: Git.Repo
- -> (FilePath -> [ShellParam] -> IO a, a)
+ -> (FilePath -> [CommandParam] -> IO a, a)
-> String
- -> [ShellParam]
+ -> [CommandParam]
-> Annex a
onRemote r (with, errorval) command params = do
s <- git_annex_shell r command params
@@ -306,7 +306,7 @@ onRemote r (with, errorval) command params = do
Nothing -> return errorval
{- Generates parameters to run a git-annex-shell command on a remote. -}
-git_annex_shell :: Git.Repo -> String -> [ShellParam] -> Annex (Maybe (FilePath, [ShellParam]))
+git_annex_shell :: Git.Repo -> String -> [CommandParam] -> Annex (Maybe (FilePath, [CommandParam]))
git_annex_shell r command params
| not $ Git.repoIsUrl r = return $ Just (shellcmd, shellopts)
| Git.repoIsSsh r = do
@@ -319,7 +319,7 @@ git_annex_shell r command params
shellcmd = "git-annex-shell"
shellopts = (Param command):(File dir):params
sshcmd = shellcmd ++ " " ++
- unwords (map shellEscape $ toShell shellopts)
+ unwords (map shellEscape $ toCommand shellopts)
{- Looks up a per-remote config option in git config.
- Failing that, tries looking for a global config option. -}