diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-14 15:56:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-14 15:56:11 -0400 |
| commit | ef28b3fef7e236d8c27ce35308c0e37ece58d20c (patch) | |
| tree | 346b40aaffcdb2ad5220741d9b9546821d07c4c9 /Remote | |
| parent | 02f1bd2bf47d3ff49a222e9428ec27708ef55f64 (diff) | |
split out Git/Command.hs
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 5 | ||||
| -rw-r--r-- | Remote/Git.hs | 3 | ||||
| -rw-r--r-- | Remote/Helper/Special.hs | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 4d63d88e1..8bd484b7d 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -15,6 +15,7 @@ import System.Process import Common.Annex import Types.Remote import qualified Git +import qualified Git.Command import qualified Git.Config import qualified Git.Construct import Config @@ -148,7 +149,7 @@ checkPresent r bupr k ok <- onBupRemote bupr boolSystem "git" params return $ Right ok | otherwise = liftIO $ catchMsgIO $ - boolSystem "git" $ Git.gitCommandLine params bupr + boolSystem "git" $ Git.Command.gitCommandLine params bupr where params = [ Params "show-ref --quiet --verify" @@ -168,7 +169,7 @@ storeBupUUID u buprepo = do r' <- Git.Config.read r let olduuid = Git.Config.get "annex.uuid" "" r' when (olduuid == "") $ - Git.run "config" + Git.Command.run "config" [Param "annex.uuid", Param v] r' where v = fromUUID u diff --git a/Remote/Git.hs b/Remote/Git.hs index d848a21b3..f27d17084 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -16,6 +16,7 @@ import Utility.RsyncFile import Annex.Ssh import Types.Remote import qualified Git +import qualified Git.Command import qualified Git.Config import qualified Git.Construct import qualified Annex @@ -176,7 +177,7 @@ onLocal r a = do -- for anything onLocal is used to do. Annex.BranchState.disableUpdate ret <- a - liftIO Git.reap + liftIO Git.Command.reap return ret keyUrls :: Git.Repo -> Key -> [String] diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index c374a16aa..3f6c9c155 100644 --- a/Remote/Helper/Special.hs +++ b/Remote/Helper/Special.hs @@ -12,6 +12,7 @@ import qualified Data.Map as M import Common.Annex import Types.Remote import qualified Git +import qualified Git.Command import qualified Git.Construct {- Special remotes don't have a configured url, so Git.Repo does not @@ -33,7 +34,7 @@ gitConfigSpecialRemote u c k v = do set ("annex-"++k) v set ("annex-uuid") (fromUUID u) where - set a b = inRepo $ Git.run "config" + set a b = inRepo $ Git.Command.run "config" [Param (configsetting a), Param b] remotename = fromJust (M.lookup "name" c) configsetting s = "remote." ++ remotename ++ "." ++ s |