diff options
| -rw-r--r-- | Assistant/DeleteRemote.hs | 3 | ||||
| -rw-r--r-- | Git/Remote.hs | 13 | ||||
| -rw-r--r-- | Git/Remote/Remove.hs | 27 |
3 files changed, 29 insertions, 14 deletions
diff --git a/Assistant/DeleteRemote.hs b/Assistant/DeleteRemote.hs index a900753a7..968b214c1 100644 --- a/Assistant/DeleteRemote.hs +++ b/Assistant/DeleteRemote.hs @@ -18,6 +18,7 @@ import Assistant.DaemonStatus import qualified Remote import Remote.List import qualified Git.Remote +import qualified Git.Remote.Remove import Logs.Trust import qualified Annex @@ -34,7 +35,7 @@ disableRemote uuid = do remote <- fromMaybe (error "unknown remote") <$> liftAnnex (Remote.remoteFromUUID uuid) liftAnnex $ do - inRepo $ Git.Remote.remove (Remote.name remote) + inRepo $ Git.Remote.Remove.remove (Remote.name remote) void $ remoteListRefresh updateSyncRemotes return remote diff --git a/Git/Remote.hs b/Git/Remote.hs index 7e8e5f817..156e30891 100644 --- a/Git/Remote.hs +++ b/Git/Remote.hs @@ -12,8 +12,6 @@ module Git.Remote where import Common import Git import Git.Types -import qualified Git.Command -import qualified Git.BuildVersion import Data.Char import qualified Data.Map as M @@ -44,17 +42,6 @@ makeLegalName s = case filter legal $ replace "/" "_" s of legal '.' = True legal c = isAlphaNum c -remove :: RemoteName -> Repo -> IO () -remove remotename = Git.Command.run - [ Param "remote" - -- name of this subcommand changed - , Param $ - if Git.BuildVersion.older "1.8.0" - then "rm" - else "remove" - , Param remotename - ] - data RemoteLocation = RemoteUrl String | RemotePath FilePath remoteLocationIsUrl :: RemoteLocation -> Bool diff --git a/Git/Remote/Remove.hs b/Git/Remote/Remove.hs new file mode 100644 index 000000000..949019b22 --- /dev/null +++ b/Git/Remote/Remove.hs @@ -0,0 +1,27 @@ +{- git remote stuff + - + - Copyright 2012 Joey Hess <joey@kitenet.net> + - + - Licensed under the GNU GPL version 3 or higher. + -} + +{-# LANGUAGE CPP #-} + +module Git.Remote.Remove where + +import Common +import Git +import Git.Types +import qualified Git.Command +import qualified Git.BuildVersion + +remove :: RemoteName -> Repo -> IO () +remove remotename = Git.Command.run + [ Param "remote" + -- name of this subcommand changed + , Param $ + if Git.BuildVersion.older "1.8.0" + then "rm" + else "remove" + , Param remotename + ] |