summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-27 19:23:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-27 19:23:00 -0400
commit28bf28a73c503c7c2d9add38e964149355bb9e50 (patch)
tree169796dee448367549cdf3a3e9a65126d24fec00
parent4868b64868747455a9c5d512650f9e7074e6009e (diff)
rename
-rw-r--r--Command/Map.hs4
-rw-r--r--Remote.hs5
-rw-r--r--Remote/Git.hs (renamed from Remote/GitRemote.hs)0
3 files changed, 5 insertions, 4 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index 6206aeeb5..dc3acb56e 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -16,7 +16,7 @@ import Data.List.Utils
import Command
import qualified Annex
import qualified GitRepo as Git
-import qualified Remote.GitRemote
+import qualified Remote.Git
import Messages
import Types
import Utility
@@ -203,7 +203,7 @@ tryScan r
Git.hConfigRead r
configlist =
- Remote.GitRemote.onRemote r (pipedconfig, Nothing) "configlist" []
+ Remote.Git.onRemote r (pipedconfig, Nothing) "configlist" []
manualconfiglist = do
let sshcmd =
"cd " ++ shellEscape(Git.workTree r) ++ " && " ++
diff --git a/Remote.hs b/Remote.hs
index a7136ea65..b3f1a0c6b 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -27,7 +27,8 @@ import Control.Monad (when, liftM)
import Data.List
import RemoteClass
-import qualified Remote.GitRemote
+import qualified Remote.Git
+import qualified Remote.S3
import Types
import UUID
import qualified Annex
@@ -36,7 +37,7 @@ import LocationLog
{- add generators for new Remotes here -}
generators :: [Annex [Remote Annex]]
-generators = [Remote.GitRemote.generate]
+generators = [Remote.Git.generate]
{- Builds a list of all available Remotes.
- Since doing so can be expensive, the list is cached in the Annex. -}
diff --git a/Remote/GitRemote.hs b/Remote/Git.hs
index 43e75b97b..43e75b97b 100644
--- a/Remote/GitRemote.hs
+++ b/Remote/Git.hs