summaryrefslogtreecommitdiff
path: root/Command/Map.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-13 15:05:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-13 15:06:49 -0400
commit13fff71f2019ae098c3f8532ac2734cb1ab11498 (patch)
treef37714c4089df4afac9bf9724c80757e5fd29e6f /Command/Map.hs
parent46588674b081cd4ea5820680d8fc15c81ed175ad (diff)
split out three modules from Git
Constructors and configuration make sense in separate modules. A separate Git.Types is needed to avoid cycles.
Diffstat (limited to 'Command/Map.hs')
-rw-r--r--Command/Map.hs10
1 files changed, 6 insertions, 4 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index 57b48d503..815b142e7 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -13,6 +13,8 @@ import qualified Data.Map as M
import Common.Annex
import Command
import qualified Git
+import qualified Git.Config
+import qualified Git.Construct
import Annex.UUID
import Logs.UUID
import Logs.Trust
@@ -146,8 +148,8 @@ spider' (r:rs) known
{- Converts repos to a common absolute form. -}
absRepo :: Git.Repo -> Git.Repo -> Annex Git.Repo
absRepo reference r
- | Git.repoIsUrl reference = return $ Git.localToUrl reference r
- | otherwise = liftIO $ Git.repoFromAbsPath =<< absPath (Git.workTree r)
+ | Git.repoIsUrl reference = return $ Git.Construct.localToUrl reference r
+ | otherwise = liftIO $ Git.Construct.fromAbsPath =<< absPath (Git.workTree r)
{- Checks if two repos are the same. -}
same :: Git.Repo -> Git.Repo -> Bool
@@ -182,7 +184,7 @@ tryScan :: Git.Repo -> Annex (Maybe Git.Repo)
tryScan r
| Git.repoIsSsh r = sshscan
| Git.repoIsUrl r = return Nothing
- | otherwise = safely $ Git.configRead r
+ | otherwise = safely $ Git.Config.read r
where
safely a = do
result <- liftIO (try a :: IO (Either SomeException Git.Repo))
@@ -191,7 +193,7 @@ tryScan r
Right r' -> return $ Just r'
pipedconfig cmd params = safely $
pOpen ReadFromPipe cmd (toCommand params) $
- Git.hConfigRead r
+ Git.Config.hRead r
configlist =
onRemote r (pipedconfig, Nothing) "configlist" []