diff -r ea526b78ee6c -r 6ba512d9f46a Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Mar 07 18:53:18 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Mar 07 19:46:57 2017 +0100
@@ -185,18 +185,18 @@
return message
- def getGuardsList(self, repodir, all=True):
+ def getGuardsList(self, repodir, allGuards=True):
"""
Public method to get a list of all guards defined.
@param repodir directory name of the repository (string)
- @param all flag indicating to get all guards (boolean)
+ @param allGuards flag indicating to get all guards (boolean)
@return sorted list of guards (list of strings)
"""
guardsList = []
args = self.vcs.initCommand("qselect")
- if all:
+ if allGuards:
args.append("--series")
client = self.vcs.getClient()
@@ -216,7 +216,7 @@
for guard in output.splitlines():
guard = guard.strip()
- if all:
+ if allGuards:
guard = guard[1:]
if guard not in guardsList:
guardsList.append(guard)
@@ -339,7 +339,7 @@
QApplication.processEvents()
self.qheaderDialog.start(name)
- def hgQueuePushPopPatches(self, name, operation, all=False, named=False,
+ def hgQueuePushPopPatches(self, name, operation, doAll=False, named=False,
force=False):
"""
Public method to push patches onto the stack or pop patches off the
@@ -348,7 +348,7 @@
@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)
@@ -379,7 +379,7 @@
args.append("-v")
if force:
args.append("--force")
- if all and operation in (Queues.POP, Queues.PUSH):
+ if doAll and operation in (Queues.POP, Queues.PUSH):
args.append("--all")
elif named or operation == Queues.GOTO:
patchnames = self.__getPatchesList(repodir, listType)
@@ -678,7 +678,7 @@
guardsList = self.getGuardsList(repodir)
if guardsList:
- activeGuardsList = self.getGuardsList(repodir, all=False)
+ activeGuardsList = self.getGuardsList(repodir, allGuards=False)
from .HgQueuesGuardsSelectionDialog import \
HgQueuesGuardsSelectionDialog
dlg = HgQueuesGuardsSelectionDialog(
@@ -734,7 +734,7 @@
if os.path.splitdrive(repodir)[1] == os.sep:
return
- guardsList = self.getGuardsList(repodir, all=False)
+ guardsList = self.getGuardsList(repodir, allGuards=False)
if guardsList:
from .HgQueuesGuardsSelectionDialog import \
HgQueuesGuardsSelectionDialog
