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

-:6365b1466615
+:885c8d93e6f9
 self.patchesList.header().setSortIndicator(0, Qt.AscendingOrder)
 self.process.finished.connect(self.__procFinished)
 self.process.readyReadStandardOutput.connect(self.__readStdout)
 self.process.readyReadStandardError.connect(self.__readStderr)
+self.__statusDict = {
+"A": self.trUtf8("applied"),
+"U": self.trUtf8("not applied"),
+"G": self.trUtf8("guarded"),
+"D": self.trUtf8("missing"),
+}
 def closeEvent(self, e):
 """
 Private slot implementing a close event handler.
 repodir = os.path.dirname(repodir)
 if repodir == os.sep:
 return
 self.__repodir = repodir
-self.__patchesCount = 0
+self.__getSeries()
-self.__getApplied()
+def __getSeries(self, missing=False):
-def __getApplied(self):
+"""
-"""
+Private slot to get the list of applied, unapplied and guarded patches and
-Private slot to get the list of applied patches.
+patches missing in the series file.
-"""
-self.__mode = "qapplied"
+@param missing flag indicating to get the patches missing in the series file
+(boolean)
+"""
+if missing:
+self.__mode = "missing"
+else:
+self.__mode = "qseries"
 args = []
-args.append('qapplied')
+args.append('qseries')
 args.append('--summary')
+args.append('--verbose')
+if missing:
+args.append('--missing')
 self.process.kill()
 self.process.setWorkingDirectory(self.__repodir)
 self.process.start('hg', args)
 ).format('hg'))
 else:
 self.inputGroup.setEnabled(True)
 self.inputGroup.show()
-def __getUnapplied(self):
+def __getTop(self):
 """
-Private slot to get the list of unapplied patches.
+Private slot to get patch at the top of the stack.
 """
-self.__mode = "qunapplied"
+self.__mode = "qtop"
 args = []
-args.append('qunapplied')
+args.append('qtop')
-args.append('--summary')
 self.process.kill()
 self.process.setWorkingDirectory(self.__repodir)
 self.process.start('hg', args)
 ).format('hg'))
 else:
 self.inputGroup.setEnabled(True)
 self.inputGroup.show()
-def __getTop(self):
-"""
-Private slot to get patch at the top of the stack.
-"""
-self.__mode = "qtop"
-args = []
-args.append('qtop')
-self.process.kill()
-self.process.setWorkingDirectory(self.__repodir)
-self.process.start('hg', args)
-procStarted = self.process.waitForStarted()
-if not procStarted:
-self.inputGroup.setEnabled(False)
-self.inputGroup.hide()
-E5MessageBox.critical(self,
-self.trUtf8('Process Generation Error'),
-self.trUtf8(
-'The process {0} could not be started. '
-'Ensure, that it is in the search path.'
-).format('hg'))
-else:
-self.inputGroup.setEnabled(True)
-self.inputGroup.show()
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed the button.
 """
 if self.process is not None and \
 self.buttonBox.button(QDialogButtonBox.Close).setFocus(Qt.OtherFocusReason)
 self.process = None
 if self.patchesList.topLevelItemCount() == 0:
-# no bookmarks defined
+# no patches present
 self.__generateItem(self.trUtf8("no patches found"), "", True)
 self.patchesList.doItemsLayout()
 self.__resizeColumns()
 self.__resort()
 Private slot connected to the finished signal.
 @param exitCode exit code of the process (integer)
 @param exitStatus exit status of the process (QProcess.ExitStatus)
 """
-if self.__mode == "qapplied":
+if self.__mode == "qseries":
-self.__getUnapplied()
+self.__getSeries(True)
-elif self.__mode == "qunapplied":
+elif self.__mode == "missing":
 self.__getTop()
 else:
 self.__finish()
 def __resort(self):
 Private method to resize the list columns.
 """
 self.patchesList.header().resizeSections(QHeaderView.ResizeToContents)
 self.patchesList.header().setStretchLastSection(True)
-def __generateItem(self, name, summary, error=False):
+def __generateItem(self, index, status, name, summary, error=False):
 """
 Private method to generate a patch item in the list of patches.
+@param index index of the patch (integer, -1 for missing)
+@param status status of the patch (string)
 @param name name of the patch (string)
 @param summary first line of the patch header (string)
 @param error flag indicating an error entry (boolean)
 """
 if error:
 name,
 "",
 summary
 ])
 else:
-self.__patchesCount += 1
+if index == -1:
+indexStr = ""
+else:
+indexStr = "{0:>7}".format(index)
+try:
+statusStr = self.__statusDict[status]
+except KeyError:
+statusStr = self.trUtf8("unknown")
 itm = QTreeWidgetItem(self.patchesList, [
-"{0:>7}".format(self.__patchesCount),
+indexStr,
 name,
-self.__mode == "qapplied" and \
+statusStr,
-self.trUtf8("applied") or \
-self.trUtf8("not applied"),
 summary
 ])
+if status == "A":
+# applied
+for column in range(itm.columnCount()):
+itm.setForeground(column, Qt.blue)
+elif status == "D":
+# missing
+for column in range(itm.columnCount()):
+itm.setForeground(column, Qt.red)
 itm.setTextAlignment(0, Qt.AlignRight)
 itm.setTextAlignment(2, Qt.AlignHCenter)
 def __markTopItem(self, name):
 """
 if self.__mode == "qtop":
 self.__markTopItem(s)
 else:
 l = s.split(": ", 1)
 if len(l) == 1:
-name, summary = l[0][:-1], ""
+data, summary = l[0][:-1], ""
 else:
-name, summary = l[0], l[1]
+data, summary = l[0], l[1]
-self.__generateItem(name, summary)
+l = data.split(None, 2)
+if len(l) == 2:
+# missing entry
+index, status, name = -1, l[0], l[1]
+elif len(l) == 3:
+index, status, name = l[:3]
+else:
+continue
+self.__generateItem(index, status, name, summary)
 def __readStderr(self):
 """
 Private slot to handle the readyReadStderr signal.

Mercurial Repositories > eric / file comparison

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

Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py