eric: comparison Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py

-:9986ec0e559a
+:10516539f238
 @param repodir directory name of the repository (string)
 @param listType type of patches list to get
 (Queues.APPLIED_LIST, Queues.UNAPPLIED_LIST, Queues.SERIES_LIST)
 @param withSummary flag indicating to get a summary as well (boolean)
 @return list of patches (list of string)
+@exception ValueError raised to indicate an invalid patch list type
 """
 patchesList = []
 args = []
 if listType == Queues.APPLIED_LIST:
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(
-str(process.readAllStandardOutput(), ioEncoding, 'replace')
+process.readAllStandardOutput(), ioEncoding, 'replace')
 for line in output.splitlines():
 if withSummary:
 l = line.strip().split(": ")
 if len(l) == 1:
 process.start('hg', args)
 procStarted = process.waitForStarted(5000)
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
-output = \
+output = str(
-str(process.readAllStandardOutput(), ioEncoding, 'replace')
+process.readAllStandardOutput(), ioEncoding, 'replace')
 for guard in output.splitlines():
 guard = guard.strip()
 if all:
 guard = guard[1:]
 self.qheaderDialog = HgQueuesHeaderDialog(self.vcs)
 self.qheaderDialog.show()
 QApplication.processEvents()
 self.qheaderDialog.start(name)
-def hgQueuePushPopPatches(self, name, operation, all=False, named=False, force=False):
+def hgQueuePushPopPatches(self, name, operation, all=False, named=False,
-"""
+force=False):
-Public method to push patches onto the stack or pop patches off the stack.
+"""
+Public method to push patches onto the stack or pop patches off the
+stack.
 @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 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)
 @return flag indicating that the project should be reread (boolean)
+@exception ValueError raised to indicate an invalid operation
 """
 # find the root of the repo
 repodir = self.vcs.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
 repodir = os.path.dirname(repodir)
 args.append("qrename")
 patchnames = sorted(self.__getPatchesList(repodir, Queues.SERIES_LIST))
 if patchnames:
 currentPatch = self.__getCurrentPatch(repodir)
 if currentPatch:
-from .HgQueuesRenamePatchDialog import HgQueuesRenamePatchDialog
+from .HgQueuesRenamePatchDialog import \
+HgQueuesRenamePatchDialog
 dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames)
 if dlg.exec_() == QDialog.Accepted:
 newName, selectedPatch = dlg.getData()
 if selectedPatch:
 args.append(selectedPatch)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 args = []
 args.append("qdelete")
-patchnames = sorted(self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST))
+patchnames = sorted(self.__getPatchesList(repodir,
+Queues.UNAPPLIED_LIST))
 if patchnames:
 patch, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Select Patch"),
 self.trUtf8("Select the patch to be deleted:"),
 return
 args = []
 args.append("qfold")
 patchnames = sorted(
-self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST, withSummary=True))
+self.__getPatchesList(repodir, Queues.UNAPPLIED_LIST,
+withSummary=True))
 if patchnames:
 from .HgQueuesFoldDialog import HgQueuesFoldDialog
 dlg = HgQueuesFoldDialog(patchnames)
 if dlg.exec_() == QDialog.Accepted:
 message, patchesList = dlg.getData()
 patchnames = sorted(
 self.__getPatchesList(repodir, Queues.SERIES_LIST))
 if patchnames:
 from .HgQueuesListGuardsDialog import HgQueuesListGuardsDialog
-self.queuesListGuardsDialog = HgQueuesListGuardsDialog(self.vcs, patchnames)
+self.queuesListGuardsDialog = \
+HgQueuesListGuardsDialog(self.vcs, patchnames)
 self.queuesListGuardsDialog.show()
 self.queuesListGuardsDialog.start(name)
 else:
 E5MessageBox.information(None,
 self.trUtf8("List Guards"),
 return
 guardsList = self.getGuardsList(repodir)
 if guardsList:
 activeGuardsList = self.getGuardsList(repodir, all=False)
-from .HgQueuesGuardsSelectionDialog import HgQueuesGuardsSelectionDialog
+from .HgQueuesGuardsSelectionDialog import \
+HgQueuesGuardsSelectionDialog
 dlg = HgQueuesGuardsSelectionDialog(
 guardsList, activeGuards=activeGuardsList, listOnly=False)
 if dlg.exec_() == QDialog.Accepted:
 guards = dlg.getData()
 if guards:
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 guardsList = self.getGuardsList(repodir, all=False)
 if guardsList:
-from .HgQueuesGuardsSelectionDialog import HgQueuesGuardsSelectionDialog
+from .HgQueuesGuardsSelectionDialog import \
+HgQueuesGuardsSelectionDialog
 dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True)
 dlg.exec_()
 def hgQueueCreateRenameQueue(self, name, isCreate):
 """
 if isCreate:
 title = self.trUtf8("Create New Queue")
 else:
 title = self.trUtf8("Rename Active Queue")
-from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog
+from .HgQueuesQueueManagementDialog import \
-dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.NAME_INPUT,
+HgQueuesQueueManagementDialog
+dlg = HgQueuesQueueManagementDialog(
+HgQueuesQueueManagementDialog.NAME_INPUT,
 title, False, repodir, self.vcs)
 if dlg.exec_() == QDialog.Accepted:
 queueName = dlg.getData()
 if queueName:
 args = []
 remove the patch directory or set the active queue.
 @param name file/directory name (string)
 @param operation operation to be performed (Queues.QUEUE_DELETE,
 Queues.QUEUE_PURGE, Queues.QUEUE_ACTIVATE)
+@exception ValueError raised to indicate an invalid operation
 """
 # find the root of the repo
 repodir = self.vcs.splitPath(name)[0]
 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
 repodir = os.path.dirname(repodir)
 elif operation == Queues.QUEUE_ACTIVATE:
 title = self.trUtf8("Activate Queue")
 else:
 raise ValueError("illegal value for operation")
-from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog
+from .HgQueuesQueueManagementDialog import \
-dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.QUEUE_INPUT,
+HgQueuesQueueManagementDialog
+dlg = HgQueuesQueueManagementDialog(
+HgQueuesQueueManagementDialog.QUEUE_INPUT,
 title, True, repodir, self.vcs)
 if dlg.exec_() == QDialog.Accepted:
 queueName = dlg.getData()
 if queueName:
 args = []
 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
-from .HgQueuesQueueManagementDialog import HgQueuesQueueManagementDialog
+from .HgQueuesQueueManagementDialog import \
+HgQueuesQueueManagementDialog
 self.queuesListQueuesDialog = HgQueuesQueueManagementDialog(
 HgQueuesQueueManagementDialog.NO_INPUT,
 self.trUtf8("Available Queues"),
 False, repodir, self.vcs)
 self.queuesListQueuesDialog.show()
 args = []
 args.append('init')
 args.append('--mq')
 args.append(repodir)
 # init is not possible with the command server
-dia = HgDialog(self.trUtf8('Initializing new queue repository'), self.vcs)
+dia = HgDialog(
+self.trUtf8('Initializing new queue repository'), self.vcs)
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 def hgQueueStatus(self, name):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py

Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py