diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-13 15:05:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-13 15:06:49 -0400 |
| commit | 13fff71f2019ae098c3f8532ac2734cb1ab11498 (patch) | |
| tree | f37714c4089df4afac9bf9724c80757e5fd29e6f /Remote/Git.hs | |
| parent | 46588674b081cd4ea5820680d8fc15c81ed175ad (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 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 2f9288e1b..9d80f4c1c 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -16,6 +16,8 @@ import Utility.RsyncFile import Annex.Ssh import Types.Remote import qualified Git +import qualified Git.Config +import qualified Git.Construct import qualified Annex import Annex.UUID import qualified Annex.Content @@ -44,7 +46,7 @@ list = do case M.lookup (annexurl n) c of Nothing -> return r Just url -> Git.repoRemoteNameSet n <$> - inRepo (Git.genRemote url) + inRepo (Git.Construct.fromRemoteLocation url) gen :: Git.Repo -> UUID -> Maybe RemoteConfig -> Annex (Remote Annex) gen r u _ = do @@ -100,7 +102,7 @@ tryGitConfigRead r pipedconfig cmd params = safely $ pOpen ReadFromPipe cmd (toCommand params) $ - Git.hConfigRead r + Git.Config.hRead r geturlconfig = do s <- Url.get (Git.repoLocation r ++ "/config") @@ -108,7 +110,7 @@ tryGitConfigRead r hPutStr h s hClose h pOpen ReadFromPipe "git" ["config", "--list", "--file", tmpfile] $ - Git.hConfigRead r + Git.Config.hRead r store a = do r' <- a |