mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

better types allowed breaking module dep loop

Browse source
This commit is contained in:
Joey Hess 2011-06-01 19:10:38 -04:00
parent 80efafe496
commit 971ab27e78
9 changed files with 64 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Move.hs
View file

@ -16,7 +16,6 @@ import LocationLog
import Types
import Content
import qualified Remote
import qualified RemoteUtils
import UUID
import Messages
@ -90,7 +89,7 @@ toPerform dest move key = do
let fastcheck = fast && not move && not (Remote.hasKeyCheap dest)
isthere <- if fastcheck
then do
(remotes, _) <- RemoteUtils.keyPossibilities key
(remotes, _) <- Remote.keyPossibilities key
return $ Right $ dest `elem` remotes
else Remote.hasKey dest key
case isthere of
@ -124,7 +123,7 @@ fromStart :: Remote.Remote Annex -> Bool -> CommandStartString
fromStart src move file = isAnnexed file $ \(key, _) -> do
g <- Annex.gitRepo
u <- getUUID g
(remotes, _) <- RemoteUtils.keyPossibilities key
(remotes, _) <- Remote.keyPossibilities key
if (u == Remote.uuid src) || (null $ filter (== src) remotes)
then stop
else do