diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-21 14:50:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-21 14:50:14 -0400 |
| commit | 226781c047a50747f5c60a6cf4920a43cd3a3a73 (patch) | |
| tree | 0a5ead6c80110d533630db1875a9ebc10dea176d /Remote/Git.hs | |
| parent | 6873d785f050cbfb2aa7bd67fcdb29ab585ec291 (diff) | |
unify types
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index cd38cac06..c10347f98 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -264,7 +264,7 @@ copyFromRemoteCheap r key file | otherwise = return False {- Tries to copy a key's content to a remote's annex. -} -copyToRemote :: Git.Repo -> Key -> AssociatedFile -> ProgressCallback -> Annex Bool +copyToRemote :: Git.Repo -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool copyToRemote r key file p | not $ Git.repoIsUrl r = guardUsable r False $ commitOnCleanup r $ do keysrc <- inRepo $ gitAnnexLocation key @@ -285,7 +285,7 @@ copyToRemote r key file p rsyncHelper (Just p) =<< rsyncParamsRemote r False key keysrc file | otherwise = error "copying to non-ssh repo not supported" -rsyncHelper :: Maybe ProgressCallback -> [CommandParam] -> Annex Bool +rsyncHelper :: Maybe MeterUpdate -> [CommandParam] -> Annex Bool rsyncHelper callback params = do showOutput -- make way for progress bar ifM (liftIO $ (maybe rsync rsyncProgress callback) params) @@ -297,7 +297,7 @@ rsyncHelper callback params = do {- Copys a file with rsync unless both locations are on the same - filesystem. Then cp could be faster. -} -rsyncOrCopyFile :: [CommandParam] -> FilePath -> FilePath -> ProgressCallback -> Annex Bool +rsyncOrCopyFile :: [CommandParam] -> FilePath -> FilePath -> MeterUpdate -> Annex Bool rsyncOrCopyFile rsyncparams src dest p = ifM (sameDeviceIds src dest) (dorsync, docopy) where |