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

split out three modules from Git

Browse source 
Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
This commit is contained in:
Joey Hess 2011-12-13 15:05:07 -04:00
parent 46588674b0
commit 13fff71f20
20 changed files with 349 additions and 285 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Command/Map.hs
View file

@ -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" []