diff -r ea526b78ee6c -r 6ba512d9f46a Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Mar 07 19:46:57 2017 +0100
@@ -814,8 +814,8 @@
self.vcs.getExtensionObject("mq")\
.hgQueueShowHeader(self.project.getProjectPath())
- def __hgQueuePushPopPatches(self, name, operation, all=False, named=False,
- force=False):
+ def __hgQueuePushPopPatches(self, name, operation, doAll=False,
+ named=False, force=False):
"""
Private method to push patches onto the stack or pop patches off the
stack.
@@ -823,13 +823,13 @@
@param name file/directory name (string)
@param operation operation type to be performed (Queues.POP,
Queues.PUSH, Queues.GOTO)
- @keyparam all flag indicating to push/pop all (boolean)
+ @keyparam doAll flag indicating to push/pop all (boolean)
@keyparam named flag indicating to push/pop until a named patch
is at the top of the stack (boolean)
@keyparam force flag indicating a forceful pop (boolean)
"""
shouldReopen = self.vcs.getExtensionObject("mq")\
- .hgQueuePushPopPatches(name, operation=operation, all=all,
+ .hgQueuePushPopPatches(name, operation=operation, doAll=doAll,
named=named, force=force)
if shouldReopen:
res = E5MessageBox.yesNo(
