eric: comparison Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

-:1b59c4ba121e
+:8cd4d08fa9f6
 COLORNAMES = ["blue", "darkgreen", "red", "green", "darkblue", "purple",
 "cyan", "olive", "magenta", "darkred", "darkmagenta",
 "darkcyan", "gray", "yellow"]
 COLORS = [str(QColor(x).name()) for x in COLORNAMES]
 class HgLogBrowserDialog(QDialog, Ui_HgLogBrowserDialog):
 """
 Class implementing a dialog to browse the log history.
 """
-IconColumn     = 0
+IconColumn = 0
-BranchColumn   = 1
+BranchColumn = 1
 RevisionColumn = 2
-AuthorColumn   = 3
+AuthorColumn = 3
-DateColumn     = 4
+DateColumn = 4
-MessageColumn  = 5
+MessageColumn = 5
-TagsColumn     = 6
+TagsColumn = 6
-def __init__(self, vcs, mode = "log", bundle = None, parent = None):
+def __init__(self, vcs, mode="log", bundle=None, parent=None):
 """
 Constructor
 @param vcs reference to the vcs object
 @param mode mode of the dialog (string; one of log, incoming, outgoing)
 self.nextButton.setEnabled(False)
 self.limitSpinBox.setEnabled(False)
 self.__messageRole = Qt.UserRole
 self.__changesRole = Qt.UserRole + 1
-self.__edgesRole   = Qt.UserRole + 2
+self.__edgesRole = Qt.UserRole + 2
 self.__parentsRole = Qt.UserRole + 3
 self.process = QProcess()
 self.process.finished.connect(self.__procFinished)
 self.process.readyReadStandardOutput.connect(self.__readStdout)
 self.process.readyReadStandardError.connect(self.__readStderr)
 self.flags = {
-'A' : self.trUtf8('Added'),
+'A': self.trUtf8('Added'),
-'D' : self.trUtf8('Deleted'),
+'D': self.trUtf8('Deleted'),
-'M' : self.trUtf8('Modified'),
+'M': self.trUtf8('Modified'),
 }
 self.buf = []        # buffer for stdout
 self.diff = None
 self.__started = False
 def __resortFiles(self):
 """
 Private method to resort the changed files tree.
 """
 sortColumn = self.filesTree.sortColumn()
 self.filesTree.sortItems(1,
 self.filesTree.header().sortIndicatorOrder())
 self.filesTree.sortItems(sortColumn,
 self.filesTree.header().sortIndicatorOrder())
 def __getColor(self, n):
 """
 Private method to get the (rotating) name of the color given an index.
 @param rev revision to calculate edge info for (integer)
 @param parents list of parent revisions (list of integers)
 @return tuple containing the column and color index for
 the given node and a list of tuples indicating the edges
 between the given node and its parents
 (integer, integer, [(integer, integer, integer), ...])
 """
 if rev not in self.__revs:
 # new head
 self.__revs.append(rev)
 Private method to generate an icon containing the revision tree for the
 given data.
 @param column column index of the revision (integer)
 @param color color of the node (integer)
 @param bottomedges list of edges for the bottom of the node
 (list of tuples of three integers)
 @param topedges list of edges for the top of the node
 (list of tuples of three integers)
 @param dotColor color to be used for the dot (QColor)
 @param currentRev flag indicating to draw the icon for the
 current revision (boolean)
 @param closed flag indicating to draw an icon for a closed
 painter.drawRect(dot_x - 2, dot_y + 1,
 radius + 4, radius - 2)
 elif self.commandMode in ("incoming", "outgoing"):
 offset = radius // 2
 painter.drawConvexPolygon(
 QPoint(dot_x + offset, dot_y),
 QPoint(dot_x, dot_y + offset),
 QPoint(dot_x + offset, dot_y + 2 * offset),
 QPoint(dot_x + 2 * offset, dot_y + offset)
 )
 else:
 painter.drawEllipse(dot_x, dot_y, radius, radius)
 painter.end()
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = \
 str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 parents = [int(p) for p in output.strip().splitlines()]
 else:
 if not finished:
 errMsg = self.trUtf8(
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = \
 str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.__projectRevision = output.strip()
 if self.__projectRevision.endswith("+"):
 self.__projectRevision = self.__projectRevision[:-1]
 else:
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = \
 str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 for line in output.splitlines():
 if line.strip().endswith("(closed)"):
 parts = line.split()
 self.__closedBranchesRevs.append(
 closedStr = ""
 msgtxt = msg[0]
 if len(msgtxt) > 30:
 msgtxt = "{0}...".format(msgtxt[:30])
 itm = QTreeWidgetItem(self.logTree, [
 "",
 branches[0] + closedStr,
 "{0:>7}:{1}".format(rev, node),
 author,
 date,
 msgtxt,
 ", ".join(tags),
 ])
 itm.setForeground(self.BranchColumn,
 QBrush(QColor(self.__branchColor(branches[0]))))
 if not self.projectMode:
 parents = self.__getParents(rev)
 if not parents:
 self.logTree.indexOfTopLevelItem(itm) - 1)\
 .data(0, self.__edgesRole)
 else:
 topedges = None
 icon = self.__generateIcon(column, color, edges, topedges,
 QColor(self.__branchColor(branches[0])),
 rev == self.__projectRevision,
 rev in self.__closedBranchesRevs)
 itm.setIcon(0, icon)
 try:
 self.__lastRev = int(revision.split(":")[0])
 @param path path of the file in the repository (string)
 @param copyfrom path the file was copied from (string)
 @return reference to the generated item (QTreeWidgetItem)
 """
 itm = QTreeWidgetItem(self.filesTree, [
 self.flags[action],
 path,
 copyfrom,
 ])
 return itm
-def __getLogEntries(self, startRev = None):
+def __getLogEntries(self, startRev=None):
 """
 Private method to retrieve log entries from the repository.
 @param startRev revision number to start from (integer, string)
 """
 not self.stopCheckBox.isChecked():
 args.append('--follow')
 if self.commandMode == "log":
 args.append('--copies')
 args.append('--style')
 args.append(os.path.join(os.path.dirname(__file__),
 "styles", "logBrowser.style"))
 if self.commandMode == "incoming":
 if self.bundle:
 args.append(self.bundle)
 else:
 def __processBuffer(self):
 """
 Private method to process the buffered output of the hg log command.
 """
 noEntries = 0
-log = {"message" : []}
+log = {"message": []}
 changedPaths = []
 initialText = True
 fileCopies = {}
 for s in self.buf:
 if s != "@@@\n":
 log["revision"] = value.strip()
 elif key == "user":
 log["author"] = value.strip()
 elif key == "parents":
 log["parents"] = \
 [int(x.split(":", 1)[0])
 for x in value.strip().split()]
 elif key == "date":
 log["date"] = " ".join(value.strip().split()[:2])
 elif key == "description":
 log["message"].append(value.strip())
 elif key == "file_adds":
 if value.strip():
 for f in value.strip().split(", "):
 if f in fileCopies:
 changedPaths.append({
-"action"   : "A",
+"action": "A",
-"path"     : f,
+"path": f,
-"copyfrom" : fileCopies[f],
+"copyfrom": fileCopies[f],
 })
 else:
 changedPaths.append({
-"action"   : "A",
+"action": "A",
-"path"     : f,
+"path": f,
-"copyfrom" : "",
+"copyfrom": "",
 })
 elif key == "files_mods":
 if value.strip():
 for f in value.strip().split(", "):
 changedPaths.append({
-"action"   : "M",
+"action": "M",
-"path"     : f,
+"path": f,
-"copyfrom" : "",
+"copyfrom": "",
 })
 elif key == "file_dels":
 if value.strip():
 for f in value.strip().split(", "):
 changedPaths.append({
-"action"   : "D",
+"action": "D",
-"path"     : f,
+"path": f,
-"copyfrom" : "",
+"copyfrom": "",
 })
 elif key == "file_copies":
 if value.strip():
 for entry in value.strip().split(", "):
 newName, oldName = entry[:-1].split(" (")
 continue
 if value.strip():
 log["message"].append(value.strip())
 else:
 if len(log) > 1:
 self.__generateLogItem(log["author"], log["date"],
 log["message"], log["revision"], changedPaths,
 log["parents"], log["branches"], log["tags"])
 dt = QDate.fromString(log["date"], Qt.ISODate)
 if not self.__maxDate.isValid() and \
 not self.__minDate.isValid():
 if self.__maxDate < dt:
 self.__maxDate = dt
 if self.__minDate > dt:
 self.__minDate = dt
 noEntries += 1
-log = {"message" : []}
+log = {"message": []}
 changedPaths = []
 fileCopies = {}
 self.logTree.doItemsLayout()
 self.__resizeColumnsLog()
 self.__filterLogsEnabled = True
 self.__filterLogs()
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal.
 It reads the output of the process and inserts it into a buffer.
 """
 self.process.setReadChannel(QProcess.StandardOutput)
 while self.process.canReadLine():
 line = str(self.process.readLine(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.buf.append(line)
 def __readStderr(self):
 """
 It reads the error output of the process and inserts it into the
 error pane.
 """
 if self.process is not None:
 self.errorGroup.show()
 s = str(self.process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"),
 'replace')
 self.errors.insertPlainText(s)
 self.errors.ensureCursorVisible()
 def __diffRevisions(self, rev1, rev2):
 @pyqtSlot(bool)
 def on_stopCheckBox_clicked(self, checked):
 """
 Private slot called, when the stop on copy/move checkbox is clicked
 """
 self.vcs.getPlugin().setPreferences("StopLogOnCopy",
 self.stopCheckBox.isChecked())
 self.nextButton.setEnabled(True)
 self.limitSpinBox.setEnabled(True)
 def on_passwordCheckBox_toggled(self, isOn):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py