diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
| commit | 75d29250823326c8b4894a855927f65b5fdf4e13 (patch) | |
| tree | a888b86d8e0569b9e1c388700dd6717aaa175834 /Command/Move.hs | |
| parent | 377bf24d9a951186b374cd7a3f920b6bc9deb8f1 (diff) | |
| parent | 8d5374f4a33f398baa166035e5fafb716a78fd1d (diff) | |
Merge branch 'master' into checkout
Conflicts:
debian/changelog
doc/backends.mdwn
Diffstat (limited to 'Command/Move.hs')
| -rw-r--r-- | Command/Move.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index cee941622..6ca923a31 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -20,6 +20,7 @@ import Core import qualified GitRepo as Git import qualified Remotes import UUID +import Messages {- Move a file either --to or --from a repository. - @@ -64,7 +65,7 @@ moveToPerform key = do showNote $ show err return Nothing Right False -> do - Core.showNote $ "moving to " ++ (Git.repoDescribe remote) ++ "..." + showNote $ "moving to " ++ (Git.repoDescribe remote) ++ "..." let tmpfile = (annexTmpLocation remote) ++ (keyFile key) ok <- Remotes.copyToRemote remote key tmpfile if (ok) @@ -112,7 +113,7 @@ moveFromPerform key = do if (ishere) then return $ Just $ moveFromCleanup remote key else do - Core.showNote $ "moving from " ++ (Git.repoDescribe remote) ++ "..." + showNote $ "moving from " ++ (Git.repoDescribe remote) ++ "..." ok <- getViaTmp key (Remotes.copyFromRemote remote key) if (ok) then return $ Just $ moveFromCleanup remote key |