diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:19:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-04 16:22:43 -0400 |
| commit | 332e98b6cb1091c46221e2d8579a0035ba4dff51 (patch) | |
| tree | 7c80c508ddf408951a6ffc0c419c84094736e781 /Command/Move.hs | |
| parent | 527b6970457e74f8c88dfdac7c96241e2496a2f2 (diff) | |
arrange for regional output manager to run when -J is enabled
Commands that want to use it have to run their seek action inside
allowConcurrentOutput. Which seems reasonable; perhaps some future command
will want to support the -J flag but not use regions.
The region state moved from Annex to MessageState. This makes sense
organizationally, and note that some uses of onLocal use a different Annex
state, but pass the MessageState into it, which is what is needed.
Diffstat (limited to 'Command/Move.hs')
| -rw-r--r-- | Command/Move.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index 9a289d8b6..7a0b57c10 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -45,10 +45,11 @@ instance DeferredParseClass MoveOptions where <*> pure (keyOptions v) seek :: MoveOptions -> CommandSeek -seek o = withKeyOptions (keyOptions o) False - (startKey o True) - (withFilesInGit $ whenAnnexed $ start o True) - (moveFiles o) +seek o = allowConcurrentOutput $ + withKeyOptions (keyOptions o) False + (startKey o True) + (withFilesInGit $ whenAnnexed $ start o True) + (moveFiles o) start :: MoveOptions -> Bool -> FilePath -> Key -> CommandStart start o move = start' o move . Just |