summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-05 20:36:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-05 20:36:43 -0400
commitcab4ac247ca990a03537f7611b299efca8edaffe (patch)
treebd71fcf9608dfa1ee2d1903d4cfed259b3c00827
parentc98b5cf36e785cdf2c971eaf9b0329db06b68ef8 (diff)
rename
-rw-r--r--Command/Fsck.hs2
-rw-r--r--Command/Map.hs4
-rw-r--r--Command/Status.hs2
-rw-r--r--Content.hs2
-rw-r--r--Remote/Bup.hs2
-rw-r--r--Remote/Git.hs2
-rw-r--r--Remote/Ssh.hs (renamed from Ssh.hs)4
-rw-r--r--Utility/DataUnits.hs (renamed from DataUnits.hs)2
-rw-r--r--Utility/Dot.hs (renamed from Dot.hs)2
9 files changed, 11 insertions, 11 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 446d25a44..ec3f1d8e7 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -26,7 +26,7 @@ import Content
import LocationLog
import Locations
import Trust
-import DataUnits
+import Utility.DataUnits
import Config
command :: [Command]
diff --git a/Command/Map.hs b/Command/Map.hs
index 940db54c8..0391ab8e8 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -21,8 +21,8 @@ import Types
import Utility
import UUID
import Trust
-import Ssh
-import qualified Dot
+import Remote.Ssh
+import qualified Utility.Dot as Dot
-- a link from the first repository to the second (its remote)
data Link = Link Git.Repo Git.Repo
diff --git a/Command/Status.hs b/Command/Status.hs
index 2448f65a4..1ec478236 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -21,7 +21,7 @@ import qualified Command.Unused
import qualified Git
import Command
import Types
-import DataUnits
+import Utility.DataUnits
import Content
import Types.Key
import Locations
diff --git a/Content.hs b/Content.hs
index a2f38ddc9..94f8b8c2a 100644
--- a/Content.hs
+++ b/Content.hs
@@ -43,7 +43,7 @@ import qualified Branch
import Utility
import StatFS
import Types.Key
-import DataUnits
+import Utility.DataUnits
import Config
{- Checks if a given key is currently present in the gitAnnexLocation. -}
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 11c0ec4da..5a44397f0 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -28,7 +28,7 @@ import Locations
import Config
import Utility
import Messages
-import Ssh
+import Remote.Ssh
import Remote.Special
import Remote.Encryptable
import Crypto
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 4a8f8ee92..fb8512382 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -24,7 +24,7 @@ import qualified Content
import Messages
import Utility.CopyFile
import Utility.RsyncFile
-import Ssh
+import Remote.Ssh
import Config
remote :: RemoteType Annex
diff --git a/Ssh.hs b/Remote/Ssh.hs
index 21e72c083..0d4842a1a 100644
--- a/Ssh.hs
+++ b/Remote/Ssh.hs
@@ -1,11 +1,11 @@
-{- git-annex repository access with ssh
+{- git-annex remote access with ssh
-
- Copyright 2011 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
-module Ssh where
+module Remote.Ssh where
import Control.Monad.State (liftIO)
diff --git a/DataUnits.hs b/Utility/DataUnits.hs
index c81c6e42e..7af2eadaf 100644
--- a/DataUnits.hs
+++ b/Utility/DataUnits.hs
@@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher.
-}
-module DataUnits (
+module Utility.DataUnits (
dataUnits,
storageUnits,
memoryUnits,
diff --git a/Dot.hs b/Utility/Dot.hs
index deba10201..869684996 100644
--- a/Dot.hs
+++ b/Utility/Dot.hs
@@ -5,7 +5,7 @@
- Licensed under the GNU GPL version 3 or higher.
-}
-module Dot where -- import qualified
+module Utility.Dot where -- import qualified
{- generates a graph description from a list of lines -}
graph :: [String] -> String