summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-13 16:16:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-13 16:30:34 -0400
commit571cd1c57aeb4e8071b30caf529a0845e8ddc7cf (patch)
treee895c99334d675cec3f7996cb6c298fb7751b33b /Remote
parent89cc1d2a38a1abaaecdfb7766739f3c2b5dbf963 (diff)
split cost out into its own module
Added a function to insert a new cost into a list, which could be used to asjust costs after a drag and drop.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Bup.hs3
-rw-r--r--Remote/Directory.hs1
-rw-r--r--Remote/Git.hs1
-rw-r--r--Remote/Glacier.hs1
-rw-r--r--Remote/Helper/Encryptable.hs2
-rw-r--r--Remote/Hook.hs1
-rw-r--r--Remote/Rsync.hs1
-rw-r--r--Remote/S3.hs1
-rw-r--r--Remote/Web.hs1
-rw-r--r--Remote/WebDAV.hs1
10 files changed, 11 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index a598e5599..43d28a40f 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -20,6 +20,7 @@ import qualified Git.Config
import qualified Git.Construct
import qualified Git.Ref
import Config
+import Config.Cost
import Remote.Helper.Ssh
import Remote.Helper.Special
import Remote.Helper.Encryptable
@@ -44,7 +45,7 @@ gen r u c gc = do
bupr <- liftIO $ bup2GitRemote buprepo
cst <- remoteCost gc $
if bupLocal buprepo
- then semiCheapRemoteCost
+ then nearlyCheapRemoteCost
else expensiveRemoteCost
(u', bupr') <- getBupUUID bupr u
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 141586938..da75fb794 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -16,6 +16,7 @@ import Data.Int
import Common.Annex
import Types.Remote
import qualified Git
+import Config.Cost
import Config
import Utility.FileMode
import Remote.Helper.Special
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 0de453522..b08166bfa 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -35,6 +35,7 @@ import qualified Annex.Branch
import qualified Utility.Url as Url
import Utility.TempFile
import Config
+import Config.Cost
import Init
import Types.Key
import qualified Fields
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index bd2f0a179..b7e002b3d 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -16,6 +16,7 @@ import Types.Remote
import Types.Key
import qualified Git
import Config
+import Config.Cost
import Remote.Helper.Special
import Remote.Helper.Encryptable
import qualified Remote.Helper.AWS as AWS
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index d322a5cf8..242fcfe8a 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -13,7 +13,7 @@ import Common.Annex
import Types.Remote
import Crypto
import qualified Annex
-import Config
+import Config.Cost
import Utility.Base64
{- Encryption setup for a remote. The user must specify whether to use
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index 9fbd632d6..b6b4d8788 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -16,6 +16,7 @@ import Types.Remote
import Types.Key
import qualified Git
import Config
+import Config.Cost
import Annex.Content
import Remote.Helper.Special
import Remote.Helper.Encryptable
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index a7a830ef9..c303316ab 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -15,6 +15,7 @@ import Common.Annex
import Types.Remote
import qualified Git
import Config
+import Config.Cost
import Annex.Content
import Remote.Helper.Special
import Remote.Helper.Encryptable
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 164e384f5..8d487de22 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -21,6 +21,7 @@ import Types.Remote
import Types.Key
import qualified Git
import Config
+import Config.Cost
import Remote.Helper.Special
import Remote.Helper.Encryptable
import qualified Remote.Helper.AWS as AWS
diff --git a/Remote/Web.hs b/Remote/Web.hs
index f984137a9..38546c717 100644
--- a/Remote/Web.hs
+++ b/Remote/Web.hs
@@ -13,6 +13,7 @@ import qualified Git
import qualified Git.Construct
import Annex.Content
import Config
+import Config.Cost
import Logs.Web
import qualified Utility.Url as Url
import Types.Key
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index b1c2ee4a8..a06a4eb11 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -24,6 +24,7 @@ import Common.Annex
import Types.Remote
import qualified Git
import Config
+import Config.Cost
import Remote.Helper.Special
import Remote.Helper.Encryptable
import Remote.Helper.Chunked