summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-10-27 11:24:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-10-27 11:28:58 -0400
commitfc607bb2481055042a0880ab440e77854c9dcc73 (patch)
tree31846d406a9dd9f5fce4ac4bb35813b36a1fd67d /Git
parent49c89bbc3bfe007d18047da85e405b8ea116deb9 (diff)
move remote removal into separate module
This allows using Git.Remote w/o needing to have Git.BuildVersion, which requires configure. It will simplify github-backup when these libraries are used there.
Diffstat (limited to 'Git')
-rw-r--r--Git/Remote.hs13
-rw-r--r--Git/Remote/Remove.hs27
2 files changed, 27 insertions, 13 deletions
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
+ ]