summaryrefslogtreecommitdiff
path: root/Command/Move.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-15 16:50:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-15 16:50:49 -0400
commit35145202d2e463569989b710ab5b87f6d9a8fdc1 (patch)
treef418c4c52bd19e5cd7c850526d9bf4a105391776 /Command/Move.hs
parent456b45b9b3982d9440a43ec014635dee15066f0e (diff)
remove command type definitions
These were a mistake, they make the type signatures harder to read and less flexible. The CommandSeek, CommandStart, CommandPerform, and CommandCleanup types were a good idea, but composing them with the parameters expected is going too far.
Diffstat (limited to 'Command/Move.hs')
-rw-r--r--Command/Move.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Command/Move.hs b/Command/Move.hs
index f4310a2b8..15dae3938 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -31,7 +31,7 @@ seek = [withFilesInGit $ start True]
-
- This only operates on the cached file content; it does not involve
- moving data in the key-value backend. -}
-start :: Bool -> CommandStartString
+start :: Bool -> FilePath -> CommandStart
start move file = do
noAuto
to <- Annex.getState Annex.toremote
@@ -74,7 +74,7 @@ remoteHasKey remote key present = do
- A file's content can be moved even if there are insufficient copies to
- allow it to be dropped.
-}
-toStart :: Remote.Remote Annex -> Bool -> CommandStartString
+toStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart
toStart dest move file = isAnnexed file $ \(key, _) -> do
g <- Annex.gitRepo
u <- getUUID g
@@ -124,7 +124,7 @@ toCleanup dest move key = do
- If the current repository already has the content, it is still removed
- from the remote.
-}
-fromStart :: Remote.Remote Annex -> Bool -> CommandStartString
+fromStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart
fromStart src move file = isAnnexed file $ \(key, _) -> do
g <- Annex.gitRepo
u <- getUUID g