mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant

Browse source
This commit is contained in:
Joey Hess 2012-07-16 15:06:08 -04:00
commit fa3aef96e2
50 changed files with 582 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Copy.hs
View file

@ -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)

2
Command/Drop.hs
View file

@ -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

2
Command/Get.hs
View file

@ -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 ->