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

-:4a994190cf8b
+:c077fa008aae
 @param withSummary flag indicating to get a summary as well (boolean)
 @return list of patches (list of string)
 """
 patchesList = []
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 if listType == Queues.APPLIED_LIST:
 args.append("qapplied")
 elif listType == Queues.UNAPPLIED_LIST:
 args.append("qunapplied")
 else:
 raise ValueError("illegal value for listType")
 if withSummary:
 args.append("--summary")
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+output = ""
-procStarted = process.waitForStarted()
+if client:
-if procStarted:
+output = client.runcommand(args)[0]
-finished = process.waitForFinished(30000)
+else:
-if finished and process.exitCode() == 0:
+ioEncoding = Preferences.getSystem("IOEncoding")
-output = \
+process = QProcess()
-str(process.readAllStandardOutput(), ioEncoding, 'replace')
+process.setWorkingDirectory(repodir)
-for line in output.splitlines():
+process.start('hg', args)
-if withSummary:
+procStarted = process.waitForStarted()
-l = line.strip().split(": ")
+if procStarted:
-if len(l) == 1:
+finished = process.waitForFinished(30000)
-patch, summary = l[0][:-1], ""
+if finished and process.exitCode() == 0:
-else:
+output = \
-patch, summary = l[0], l[1]
+str(process.readAllStandardOutput(), ioEncoding, 'replace')
-patchesList.append("{0}@@{1}".format(patch, summary))
-else:
+for line in output.splitlines():
-patchesList.append(line.strip())
+if withSummary:
+l = line.strip().split(": ")
+if len(l) == 1:
+patch, summary = l[0][:-1], ""
+else:
+patch, summary = l[0], l[1]
+patchesList.append("{0}@@{1}".format(patch, summary))
+else:
+patchesList.append(line.strip())
 return patchesList
 def __getCurrentPatch(self, repodir):
 """
 @param repodir directory name of the repository (string)
 @return name of the current patch (string)
 """
 currentPatch = ""
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 args.append("qtop")
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+if client:
-procStarted = process.waitForStarted()
+currentPatch = client.runcommand(args)[0].strip()
-if procStarted:
+else:
-finished = process.waitForFinished(30000)
+ioEncoding = Preferences.getSystem("IOEncoding")
-if finished and process.exitCode() == 0:
+process = QProcess()
-currentPatch = str(
+process.setWorkingDirectory(repodir)
-process.readAllStandardOutput(),
+process.start('hg', args)
-ioEncoding, 'replace').strip()
+procStarted = process.waitForStarted()
+if procStarted:
+finished = process.waitForFinished(30000)
+if finished and process.exitCode() == 0:
+currentPatch = str(
+process.readAllStandardOutput(),
+ioEncoding, 'replace').strip()
 return currentPatch
 def __getCommitMessage(self, repodir):
 """
 @param repodir directory name of the repository (string)
 @return name of the current patch (string)
 """
 message = ""
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 args.append("qheader")
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+if client:
-procStarted = process.waitForStarted()
+message = client.runcommand(args)[0]
-if procStarted:
+else:
-finished = process.waitForFinished(30000)
+ioEncoding = Preferences.getSystem("IOEncoding")
-if finished and process.exitCode() == 0:
+process = QProcess()
-message = str(
+process.setWorkingDirectory(repodir)
-process.readAllStandardOutput(),
+process.start('hg', args)
-ioEncoding, 'replace')
+procStarted = process.waitForStarted()
+if procStarted:
+finished = process.waitForFinished(30000)
+if finished and process.exitCode() == 0:
+message = str(
+process.readAllStandardOutput(),
+ioEncoding, 'replace')
 return message
 def getGuardsList(self, repodir, all=True):
 """
 @param all flag indicating to get all guards (boolean)
 @return sorted list of guards (list of strings)
 """
 guardsList = []
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 args.append("qselect")
 if all:
 args.append("--series")
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+output = ""
-procStarted = process.waitForStarted()
+if client:
-if procStarted:
+output = client.runcommand(args)[0]
-finished = process.waitForFinished(30000)
+else:
-if finished and process.exitCode() == 0:
+ioEncoding = Preferences.getSystem("IOEncoding")
-output = \
+process = QProcess()
-str(process.readAllStandardOutput(), ioEncoding, 'replace')
+process.setWorkingDirectory(repodir)
-for guard in output.splitlines():
+process.start('hg', args)
-guard = guard.strip()
+procStarted = process.waitForStarted()
-if all:
+if procStarted:
-guard = guard[1:]
+finished = process.waitForFinished(30000)
-if guard not in guardsList:
+if finished and process.exitCode() == 0:
-guardsList.append(guard)
+output = \
+str(process.readAllStandardOutput(), ioEncoding, 'replace')
+for guard in output.splitlines():
+guard = guard.strip()
+if all:
+guard = guard[1:]
+if guard not in guardsList:
+guardsList.append(guard)
 return sorted(guardsList)
 def hgQueueNewPatch(self, name):
 """
 else:
 args.append("--date")
 args.append(dateStr)
 args.append(name)
-dia = HgDialog(self.trUtf8('New Patch'))
+dia = HgDialog(self.trUtf8('New Patch'), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 self.vcs.checkVCSStatus()
 args.append("--date")
 args.append(dateStr)
 else:
 return
-dia = HgDialog(self.trUtf8('Update Current Patch'))
+dia = HgDialog(self.trUtf8('Update Current Patch'), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 self.vcs.checkVCSStatus()
 E5MessageBox.information(None,
 self.trUtf8("Select Patch"),
 self.trUtf8("""No patches to select from."""))
 return False
-dia = HgDialog(title)
+dia = HgDialog(title, self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.vcs.checkVCSStatus()
 args = []
 args.append("qfinish")
 args.append("--applied")
-dia = HgDialog(self.trUtf8('Finish Applied Patches'))
+dia = HgDialog(self.trUtf8('Finish Applied Patches'), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 self.vcs.checkVCSStatus()
 newName, selectedPatch = dlg.getData()
 if selectedPatch:
 args.append(selectedPatch)
 args.append(newName)
-dia = HgDialog(self.trUtf8("Rename Patch"))
+dia = HgDialog(self.trUtf8("Rename Patch"), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgQueueDeletePatch(self, name):
 patchnames,
 0, False)
 if ok and patch:
 args.append(patch)
-dia = HgDialog(self.trUtf8("Delete Patch"))
+dia = HgDialog(self.trUtf8("Delete Patch"), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 else:
 E5MessageBox.information(None,
 args.append("--message")
 args.append(message)
 if patchesList:
 args.extend(patchesList)
-dia = HgDialog(self.trUtf8("Fold Patches"))
+dia = HgDialog(self.trUtf8("Fold Patches"), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 else:
 E5MessageBox.information(None,
 self.trUtf8("Select the patch to drop guards for"
 " (leave empty for the current patch):"),
 [""] + patchnames,
 0, False)
 if ok:
-process = QProcess()
 args = []
 args.append("qguard")
 if patch:
 args.append(patch)
 args.append("--none")
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+if client:
-procStarted = process.waitForStarted()
+client.runcommand(args)
-if procStarted:
+else:
-process.waitForFinished(30000)
+process = QProcess()
+process.setWorkingDirectory(repodir)
+process.start('hg', args)
+procStarted = process.waitForStarted()
+if procStarted:
+process.waitForFinished(30000)
 else:
 E5MessageBox.information(None,
 self.trUtf8("Drop All Guards"),
 self.trUtf8("""No patches available to define guards for."""))
 if guards:
 args = []
 args.append("qselect")
 args.extend(guards)
-dia = HgDialog(self.trUtf8('Set Active Guards'))
+dia = HgDialog(self.trUtf8('Set Active Guards'), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 else:
 E5MessageBox.information(None,
 args = []
 args.append("qselect")
 args.append("--none")
-dia = HgDialog(self.trUtf8('Deactivate Guards'))
+dia = HgDialog(self.trUtf8('Deactivate Guards'), self.vcs)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgQueueGuardsIdentifyActive(self, name):
 dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.NAME_INPUT,
 title, False, repodir)
 if dlg.exec_() == QDialog.Accepted:
 queueName = dlg.getData()
 if queueName:
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 args.append("qqueue")
 if isCreate:
 args.append("--create")
 else:
 args.append("--rename")
 args.append(queueName)
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+error = ""
-procStarted = process.waitForStarted()
+if client:
-if procStarted:
+error = client.runcommand(args)[1]
-finished = process.waitForFinished(30000)
+else:
-if finished:
+ioEncoding = Preferences.getSystem("IOEncoding")
-if process.exitCode() != 0:
+process = QProcess()
-error = \
+process.setWorkingDirectory(repodir)
-str(process.readAllStandardError(), ioEncoding, 'replace')
+process.start('hg', args)
-if isCreate:
+procStarted = process.waitForStarted()
-errMsg = self.trUtf8(
+if procStarted:
-"Error while creating a new queue.")
+finished = process.waitForFinished(30000)
-else:
+if finished:
-errMsg = self.trUtf8(
+if process.exitCode() != 0:
-"Error while renaming the active queue.")
+error = \
-E5MessageBox.warning(None,
+str(process.readAllStandardError(),
-title,
+ioEncoding, 'replace')
-"""<p>{0}</p><p>{1}</p>""".format(errMsg, error))
-else:
+if error:
-if self.queuesListQueuesDialog is not None and \
+if isCreate:
-self.queuesListQueuesDialog.isVisible():
+errMsg = self.trUtf8(
-self.queuesListQueuesDialog.refresh()
+"Error while creating a new queue.")
+else:
+errMsg = self.trUtf8(
+"Error while renaming the active queue.")
+E5MessageBox.warning(None,
+title,
+"""<p>{0}</p><p>{1}</p>""".format(errMsg, error))
+else:
+if self.queuesListQueuesDialog is not None and \
+self.queuesListQueuesDialog.isVisible():
+self.queuesListQueuesDialog.refresh()
 def hgQueueDeletePurgeActivateQueue(self, name, operation):
 """
 Public method to delete the reference to a queue and optionally
 remove the patch directory or set the active queue.
 dlg = HgQueuesQueueManagementDialog(HgQueuesQueueManagementDialog.QUEUE_INPUT,
 title, True, repodir)
 if dlg.exec_() == QDialog.Accepted:
 queueName = dlg.getData()
 if queueName:
-ioEncoding = Preferences.getSystem("IOEncoding")
-process = QProcess()
 args = []
 args.append("qqueue")
 if operation == Queues.QUEUE_PURGE:
 args.append("--purge")
 elif operation == Queues.QUEUE_DELETE:
 args.append("--delete")
 args.append(queueName)
-process.setWorkingDirectory(repodir)
+client = self.vcs.getClient()
-process.start('hg', args)
+error = ""
-procStarted = process.waitForStarted()
+if client:
-if procStarted:
+error = client.runcommand(args)[1]
-finished = process.waitForFinished(30000)
+else:
-if finished:
+ioEncoding = Preferences.getSystem("IOEncoding")
-if process.exitCode() != 0:
+process = QProcess()
-error = \
+process.setWorkingDirectory(repodir)
-str(process.readAllStandardError(), ioEncoding, 'replace')
+process.start('hg', args)
-if operation == Queues.QUEUE_PURGE:
+procStarted = process.waitForStarted()
-errMsg = self.trUtf8("Error while purging the queue.")
+if procStarted:
-elif operation == Queues.QUEUE_DELETE:
+finished = process.waitForFinished(30000)
-errMsg = self.trUtf8("Error while deleting the queue.")
+if finished:
-elif operation == Queues.QUEUE_ACTIVATE:
+if process.exitCode() != 0:
-errMsg = self.trUtf8(
+error = \
-"Error while setting the active queue.")
+str(process.readAllStandardError(),
-E5MessageBox.warning(None,
+ioEncoding, 'replace')
-title,
-"""<p>{0}</p><p>{1}</p>""".format(errMsg, error))
+if error:
-else:
+if operation == Queues.QUEUE_PURGE:
-if self.queuesListQueuesDialog is not None and \
+errMsg = self.trUtf8("Error while purging the queue.")
-self.queuesListQueuesDialog.isVisible():
+elif operation == Queues.QUEUE_DELETE:
-self.queuesListQueuesDialog.refresh()
+errMsg = self.trUtf8("Error while deleting the queue.")
+elif operation == Queues.QUEUE_ACTIVATE:
+errMsg = self.trUtf8(
+"Error while setting the active queue.")
+E5MessageBox.warning(None,
+title,
+"""<p>{0}</p><p>{1}</p>""".format(errMsg, error))
+else:
+if self.queuesListQueuesDialog is not None and \
+self.queuesListQueuesDialog.isVisible():
+self.queuesListQueuesDialog.refresh()
 def hgQueueListQueues(self, name):
 """
 Public method to list available queues.

Mercurial Repositories > eric / file comparison

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

Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py