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

Fix bug in annex.queuesize calculation that caused much more queue flushing than necessary.

Browse source 
The bug caused the size of the queue to be miscalculted; it was doubled
each time an item was added. Commands run after approx 140 items rather
than the intended 10240!
This commit is contained in:
Joey Hess 2014-06-18 17:23:36 -04:00
parent c7cbd6488c
commit 986bf1d6f6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Git/Queue.hs
View file

@ -82,16 +82,16 @@ new lim = Queue 0 (fromMaybe defaultLimit lim) M.empty
-} -}
addCommand :: String -> [CommandParam] -> [FilePath] -> Queue -> Repo -> IO Queue addCommand :: String -> [CommandParam] -> [FilePath] -> Queue -> Repo -> IO Queue
addCommand subcommand params files q repo = addCommand subcommand params files q repo =
updateQueue action different (length newfiles) q repo updateQueue action different (length files) q repo
where where
key = actionKey action key = actionKey action
action = CommandAction action = CommandAction
{ getSubcommand = subcommand { getSubcommand = subcommand
, getParams = params , getParams = params
, getFiles = newfiles , getFiles = allfiles
} }
newfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q) allfiles = map File files ++ maybe [] getFiles (M.lookup key $ items q)
different (CommandAction { getSubcommand = s }) = s /= subcommand different (CommandAction { getSubcommand = s }) = s /= subcommand
different _ = True different _ = True

2
debian/changelog vendored
View file

@ -7,6 +7,8 @@ git-annex (5.20140614) UNRELEASED; urgency=medium
* Windows: Fix opening file browser from webapp when repo is in a * Windows: Fix opening file browser from webapp when repo is in a
directory with spaces. directory with spaces.
* Windows: Assistant now logs to daemon.log. * Windows: Assistant now logs to daemon.log.
* Fix bug in annex.queuesize calculation that caused much more
queue flushing than necessary.
-- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400 -- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400