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

avoid combining queued commands with different params

Browse source 
I don't think this affected git-annex currently, but if the same command
was queued twice with different params, one set of params was thrown
away, and the files going with those were run with the other set of
params.
This commit is contained in:
Joey Hess 2021-01-04 12:38:43 -04:00
commit cd776ecb2e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Git/Queue.hs
View file

@ -55,12 +55,15 @@ instance Eq (InternalActionRunner m) where
InternalActionRunner s1 _ == InternalActionRunner s2 _ = s1 == s2 InternalActionRunner s1 _ == InternalActionRunner s2 _ = s1 == s2
{- A key that can uniquely represent an action in a Map. -} {- A key that can uniquely represent an action in a Map. -}
data ActionKey = UpdateIndexActionKey | CommandActionKey String | InternalActionKey String data ActionKey
= UpdateIndexActionKey
| CommandActionKey String [CommandParam]
| InternalActionKey String
deriving (Eq, Ord) deriving (Eq, Ord)
actionKey :: Action m -> ActionKey actionKey :: Action m -> ActionKey
actionKey (UpdateIndexAction _) = UpdateIndexActionKey actionKey (UpdateIndexAction _) = UpdateIndexActionKey
actionKey CommandAction { getSubcommand = s } = CommandActionKey s actionKey CommandAction { getSubcommand = s, getParams = p } = CommandActionKey s p
actionKey InternalAction { getRunner = InternalActionRunner s _ } = InternalActionKey s actionKey InternalAction { getRunner = InternalActionRunner s _ } = InternalActionKey s
{- A queue of actions to perform (in any order) on a git repository, {- A queue of actions to perform (in any order) on a git repository,