summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-25 21:02:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-25 21:02:34 -0400
commit109a719b03dbeb70eb317be17f7e18567efa9dac (patch)
treeb48e0ef83b2472e3c99bd9c2d0f8cd5f10b215fd /Command
parentf8e303e1c9a9d976a4dc339295aa0f09eb997b7f (diff)
parameterize Backend type
This allows the Backend type to not depend on the Annex type, and so the Annex type can later be moved out of TypeInternals.
Diffstat (limited to 'Command')
-rw-r--r--Command/Drop.hs2
-rw-r--r--Command/Fsck.hs2
-rw-r--r--Command/Get.hs2
-rw-r--r--Command/Migrate.hs2
-rw-r--r--Command/Unannex.hs2
5 files changed, 5 insertions, 5 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs
index 065e1743a..fdc55969f 100644
--- a/Command/Drop.hs
+++ b/Command/Drop.hs
@@ -37,7 +37,7 @@ start (file, attr) = isAnnexed file $ \(key, backend) -> do
where
numcopies = readMaybe attr :: Maybe Int
-perform :: Key -> Backend -> Maybe Int -> CommandPerform
+perform :: Key -> Backend Annex -> Maybe Int -> CommandPerform
perform key backend numcopies = do
success <- Backend.removeKey backend key numcopies
if success
diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index 662c281c2..fc9bd7f52 100644
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -28,7 +28,7 @@ start (file, attr) = isAnnexed file $ \(key, backend) -> do
where
numcopies = readMaybe attr :: Maybe Int
-perform :: Key -> Backend -> Maybe Int -> CommandPerform
+perform :: Key -> Backend Annex -> Maybe Int -> CommandPerform
perform key backend numcopies = do
success <- Backend.fsckKey backend key numcopies
if success
diff --git a/Command/Get.hs b/Command/Get.hs
index e0af6c407..2aa3c0c15 100644
--- a/Command/Get.hs
+++ b/Command/Get.hs
@@ -30,7 +30,7 @@ start file = isAnnexed file $ \(key, backend) -> do
showStart "get" file
return $ Just $ perform key backend
-perform :: Key -> Backend -> CommandPerform
+perform :: Key -> Backend Annex -> CommandPerform
perform key backend = do
ok <- getViaTmp key (Backend.retrieveKeyFile backend key)
if ok
diff --git a/Command/Migrate.hs b/Command/Migrate.hs
index 5bc54ceab..566b508c0 100644
--- a/Command/Migrate.hs
+++ b/Command/Migrate.hs
@@ -42,7 +42,7 @@ start (file, b) = isAnnexed file $ \(key, oldbackend) -> do
return $ head backends
choosebackend (Just backend) = return backend
-perform :: FilePath -> Key -> Backend -> CommandPerform
+perform :: FilePath -> Key -> Backend Annex -> CommandPerform
perform file oldkey newbackend = do
g <- Annex.gitRepo
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index cdd577ba8..413443969 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -36,7 +36,7 @@ start file = isAnnexed file $ \(key, backend) -> do
return $ Just $ perform file key backend
else return Nothing
-perform :: FilePath -> Key -> Backend -> CommandPerform
+perform :: FilePath -> Key -> Backend Annex -> CommandPerform
perform file key backend = do
-- force backend to always remove
ok <- Backend.removeKey backend key (Just 0)