aboutsummaryrefslogtreecommitdiff
path: root/Annex/Queue.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Annex/Queue.hs')
-rw-r--r--Annex/Queue.hs11
1 files changed, 5 insertions, 6 deletions
diff --git a/Annex/Queue.hs b/Annex/Queue.hs
index f49a22069..24575e906 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -26,15 +26,14 @@ add command params files = do
flushWhenFull :: Annex ()
flushWhenFull = do
q <- get
- when (Git.Queue.full q) $ flush False
+ when (Git.Queue.full q) flush
{- Runs (and empties) the queue. -}
-flush :: Bool -> Annex ()
-flush silent = do
+flush :: Annex ()
+flush = do
q <- get
unless (0 == Git.Queue.size q) $ do
- unless silent $
- showSideAction "Recording state in git"
+ showStoringStateAction
q' <- inRepo $ Git.Queue.flush q
store q'
@@ -47,7 +46,7 @@ new = do
store q
return q
where
- queuesize = readish <$> getConfig "annex.queuesize" ""
+ queuesize = readish <$> getConfig (annexConfig "queuesize") ""
store :: Git.Queue.Queue -> Annex ()
store q = changeState $ \s -> s { repoqueue = Just q }