diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-10 11:53:45 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-10 11:53:45 -0600 |
| commit | aa558f0b00ef012f6c7532d8451de3fb1ed1eb9b (patch) | |
| tree | 5a296752b628ce7ae926fcd3756a48eccf3ce363 /Command | |
| parent | 619297e1a7ba89f50fa5be9d7dfdfe5a9510129a (diff) | |
copy, drop: Avoid checking numcopies attribute unnecessarily
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Copy.hs | 2 | ||||
| -rw-r--r-- | Command/Drop.hs | 2 | ||||
| -rw-r--r-- | Command/Get.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Command/Copy.hs b/Command/Copy.hs index a8ec22570..5d92eef2e 100644 --- a/Command/Copy.hs +++ b/Command/Copy.hs @@ -24,5 +24,5 @@ seek = [withField Command.Move.toOption Remote.byName $ \to -> -- A copy is just a move that does not delete the source file. -- However, --auto mode avoids unnecessary copies. start :: Maybe Remote -> Maybe Remote -> FilePath -> (Key, Backend) -> CommandStart -start to from file (key, backend) = autoCopies file key (<) $ \_numcopies -> +start to from file (key, backend) = autoCopies file key (<) $ Command.Move.start to from False file (key, backend) diff --git a/Command/Drop.hs b/Command/Drop.hs index 28a52d626..ddf44ab82 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -30,7 +30,7 @@ seek = [withField fromOption Remote.byName $ \from -> withFilesInGit $ whenAnnexed $ start from] start :: Maybe Remote -> FilePath -> (Key, Backend) -> CommandStart -start from file (key, _) = autoCopies file key (>) $ \numcopies -> +start from file (key, _) = autoCopiesWith file key (>) $ \numcopies -> case from of Nothing -> startLocal file numcopies key Just remote -> do diff --git a/Command/Get.hs b/Command/Get.hs index a5901ba66..95a7040bb 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -24,7 +24,7 @@ seek = [withField Command.Move.fromOption Remote.byName $ \from -> start :: Maybe Remote -> FilePath -> (Key, Backend) -> CommandStart start from file (key, _) = stopUnless (not <$> inAnnex key) $ - autoCopies file key (<) $ \_numcopies -> + autoCopies file key (<) $ case from of Nothing -> go $ perform key file Just src -> |