better types allowed breaking module dep loop
This commit is contained in:
parent
80efafe496
commit
971ab27e78
9 changed files with 64 additions and 70 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue