diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-04 17:13:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 17:13:20 -0400 |
| commit | 950a549dc1fb8dc4e64812dcbdc17a7ac0a4204f (patch) | |
| tree | 3864cc91a386bd0e1736ed219ae7443d5f77fa99 | |
| parent | ecb430460d417d3e48921964f8ee36c44c46415f (diff) | |
drop -Jn
| -rw-r--r-- | Command/Drop.hs | 11 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/git-annex-drop.mdwn | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs index 5c5328618..b26a4842a 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -24,7 +24,7 @@ import System.Log.Logger (debugM) import qualified Data.Set as S cmd :: Command -cmd = withGlobalOptions annexedMatchingOptions $ +cmd = withGlobalOptions (jobsOption : annexedMatchingOptions) $ command "drop" SectionCommon "remove content of files from repository" paramPaths (seek <$$> optParser) @@ -51,10 +51,11 @@ parseDropFromOption = parseRemoteOption $ strOption ) seek :: DropOptions -> CommandSeek -seek o = withKeyOptions (keyOptions o) (autoMode o) - (startKeys o) - (withFilesInGit $ whenAnnexed $ start o) - (dropFiles o) +seek o = allowConcurrentOutput $ + withKeyOptions (keyOptions o) (autoMode o) + (startKeys o) + (withFilesInGit $ whenAnnexed $ start o) + (dropFiles o) start :: DropOptions -> FilePath -> Key -> CommandStart start o file key = start' o key (Just file) diff --git a/debian/changelog b/debian/changelog index db157e0ce..44ed24a60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ git-annex (5.20151102.2) UNRELEASED; urgency=medium - * Use concurrent-output library. - * Additional commands now suppport the -J flag for running multiple - actions concurrently with nicely displayed messages: fsck + * Use concurrent-output library when configured with -fConcurrentOutput. + This allows nicely displayed messages when using the -J flag. + * Additional commands now suppport the -J flag: fsck, drop -- Joey Hess <id@joeyh.name> Wed, 04 Nov 2015 12:50:20 -0400 diff --git a/doc/git-annex-drop.mdwn b/doc/git-annex-drop.mdwn index a3a79f8d7..2e207cd8b 100644 --- a/doc/git-annex-drop.mdwn +++ b/doc/git-annex-drop.mdwn @@ -55,6 +55,12 @@ safe to do so. The [[git-annex-matching-options]](1) can be used to specify files to drop. +* `--jobs=N` `-JN` + + Runs multiple drop jobs in parallel. This is particularly useful + when git-annex has to contact remotes to check if it can drop files. + For example: `-J4` + # SEE ALSO [[git-annex]](1) |