eric: comparison src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py

-:92810aebc909
+:989ee2535d59
 import re
 from PyQt6.QtCore import Qt, QCoreApplication
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem
+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
 from .Ui_HgAnnotateDialog import Ui_HgAnnotateDialog
-from eric7 import Preferences
 class HgAnnotateDialog(QDialog, Ui_HgAnnotateDialog):
 """
 Class implementing a dialog to show the output of the hg annotate command.
 self.vcs = vcs
 self.__hgClient = vcs.getClient()
 self.__annotateRe = re.compile(
-r"""(.+)\s+(\d+)\s+([0-9a-fA-F]+)\s+([0-9-]+)\s+(.+)"""
+r"""(.+)\s+(\d+)\s+([0-9a-fA-F]+)\s+([0-9-]+)\s+(.+?)([:*])(.*)"""
 )
 self.annotateList.headerItem().setText(self.annotateList.columnCount(), "")
 font = Preferences.getEditorOtherFonts("MonospacedFont")
 self.annotateList.setFont(font)
 if self.__hgClient.isExecuting():
 self.__hgClient.cancel()
 e.accept()
-def start(self, fn):
+def start(self, fn, skiplist=""):
 """
 Public slot to start the annotate command.
-@param fn filename to show the annotation for (string)
+@param fn filename to show the annotation for
+@type str
+@param skiplist name of a skip list file
+@type str
 """
 self.annotateList.clear()
 self.errorGroup.hide()
 self.intercept = False
 self.activateWindow()
 args.append("--user")
 args.append("--date")
 args.append("--number")
 args.append("--changeset")
 args.append("--quiet")
+if skiplist:
+args.extend(self.__buildSkipList(skiplist))
 args.append(fn)
 out, err = self.__hgClient.runcommand(args)
 if err:
 self.__showError(err)
 self.__processOutputLine(line)
 if self.__hgClient.wasCanceled():
 break
 self.__finish()
+def __buildSkipList(self, skiplist):
+"""
+Private method to build a program arguments list of changesets to be skipped.
+@param skiplist name of a skip list file
+@type str
+@return list of arguments
+@rtype list of str
+"""
+skipArgs = []
+try:
+with open(skiplist, "r") as f:
+for line in f.readlines():
+line = line.strip()
+if line and not line.startswith("#"):
+skipArgs.extend(["--skip", line])
+except OSError as err:
+EricMessageBox.information(
+None,
+self.tr("Mercurial Annotate"),
+self.tr(
+"<p>The skip list file <b>{0}</b> could not be read. The skip list"
+" will be ignored.</p><p>Reason: {1}</p>"
+).format(skiplist, str(err)),
+)
+skipArgs = []
+return skipArgs
 def __finish(self):
 """
 Private slot called when the process finished or the user pressed
 the button.
 """
 """
 self.annotateList.header().resizeSections(
 QHeaderView.ResizeMode.ResizeToContents
 )
-def __generateItem(self, revision, changeset, author, date, text):
+def __generateItem(self, marker, revision, changeset, author, date, text):
 """
 Private method to generate an annotate item in the annotation list.
+@param marker marker character for skipped revisions (string)
 @param revision revision string (string)
 @param changeset changeset string (string)
 @param author author of the change (string)
 @param date date of the change (string)
 @param text text of the change (string)
 """
 itm = QTreeWidgetItem(
 self.annotateList,
-[revision, changeset, author, date, "{0:d}".format(self.lineno), text],
+[
-)
+marker,
+revision,
+changeset,
+author,
+date,
+"{0:d}".format(self.lineno),
+text,
+],
+)
+itm.setTextAlignment(0, Qt.AlignmentFlag.AlignHCenter)
+itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)
+itm.setTextAlignment(5, Qt.AlignmentFlag.AlignRight)
+if marker == "*":
+itm.setToolTip(0, self.tr("Changed by skipped commit"))
 self.lineno += 1
-itm.setTextAlignment(0, Qt.AlignmentFlag.AlignRight)
-itm.setTextAlignment(4, Qt.AlignmentFlag.AlignRight)
 def __processOutputLine(self, line):
 """
 Private method to process the lines of output.
 @param line output line to be processed (string)
 """
-try:
+match = self.__annotateRe.match(line)
-info, text = line.split(": ", 1)
+author, rev, changeset, date, file, marker, text = match.groups()
-except ValueError:
+if marker == ":":
-info = line[:-2]
+marker = ""
-text = ""
-match = self.__annotateRe.match(info)
-author, rev, changeset, date, file = match.groups()
 self.__generateItem(
-rev.strip(), changeset.strip(), author.strip(), date.strip(), text
+marker, rev.strip(), changeset.strip(), author.strip(), date.strip(), text
 )
 def __showError(self, out):
 """
 Private slot to show some error.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py

src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py