diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-09 12:57:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-09 12:57:42 -0400 |
| commit | cac7297784a4eb953f0d6108d7e67e97be9285ad (patch) | |
| tree | ca0098b875209945e15de2f63f52463487eb5e43 /Annex.hs | |
| parent | 70ad04b5fc21d39bdae85b08ec948359a28021e6 (diff) | |
disentangle concurrency and message type
This makes -Jn work with --json and --quiet, where before
setting -Jn disabled those options.
Concurrent json output is currently a mess though since threads output
chunks over top of one-another.
Diffstat (limited to 'Annex.hs')
| -rw-r--r-- | Annex.hs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -56,6 +56,7 @@ import Types.BranchState import Types.TrustLevel import Types.Group import Types.Messages +import Types.Concurrency import Types.UUID import Types.FileMatcher import Types.NumCopies @@ -101,6 +102,7 @@ data AnnexState = AnnexState , remotes :: [Types.Remote.RemoteA Annex] , remoteannexstate :: M.Map UUID AnnexState , output :: MessageState + , concurrency :: Concurrency , force :: Bool , fast :: Bool , daemon :: Bool @@ -134,7 +136,6 @@ data AnnexState = AnnexState , existinghooks :: M.Map Git.Hook.Hook Bool , desktopnotify :: DesktopNotify , workers :: [Either AnnexState (Async AnnexState)] - , concurrentjobs :: Maybe Int , activeremotes :: MVar (S.Set (Types.Remote.RemoteA Annex)) , keysdbhandle :: Maybe Keys.DbHandle , cachedcurrentbranch :: Maybe Git.Branch @@ -151,6 +152,7 @@ newState c r = do , remotes = [] , remoteannexstate = M.empty , output = def + , concurrency = NonConcurrent , force = False , fast = False , daemon = False @@ -184,7 +186,6 @@ newState c r = do , existinghooks = M.empty , desktopnotify = mempty , workers = [] - , concurrentjobs = Nothing , activeremotes = emptyactiveremotes , keysdbhandle = Nothing , cachedcurrentbranch = Nothing |