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

-:b0d829cf4234
+:aaa856499ed5
 self.__rowHeight = 20
 self.__branchColors = {}
 self.logTree.setIconSize(QSize(100 * self.__rowHeight, self.__rowHeight))
+self.__projectRevision = -1
 def closeEvent(self, e):
 """
 Private slot implementing a close event handler.
 edges.append((ecol, next.index(p), self.__revColors[p]))
 self.__revs = next
 return col, color, edges
-def __generateIcon(self, column, color, bottomedges, topedges, dotColor):
+def __generateIcon(self, column, color, bottomedges, topedges, dotColor, currentRev):
 """
 Private method to generate an icon containing the revision tree for the
 given data.
 @param column column index of the revision (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)
 @return icon for the node (QIcon)
 """
 def col2x(col, radius):
 return int(1.2 * radius) * col + radius // 2 + 3
 radius = self.__dotRadius
 w = len(bottomedges) * radius + 20
 h = self.__rowHeight
 dot_x = col2x(column, radius) - radius // 2
 dot_y = h // 2
 pix = QPixmap(w, h)
 pix.fill(QColor(0, 0, 0, 0))
 painter = QPainter(pix)
 painter.setRenderHint(QPainter.Antialiasing)
 pen = QPen(Qt.blue)
 pen.setWidth(2)
 painter.setPen(pen)
 lpen = QPen(pen)
 lpen.setColor(Qt.black)
 painter.setPen(lpen)
+# draw the revision history lines
 for y1, y2, lines in ((0, h, bottomedges),
 (-h, 0, topedges)):
 if lines:
 for start, end, ecolor in lines:
 lpen = QPen(pen)
 lpen.setWidth(2)
 painter.setPen(lpen)
 x1 = col2x(start, radius)
 x2 = col2x(end, radius)
 painter.drawLine(x1, dot_y + y1, x2, dot_y + y2)
 penradius = 1
 pencolor = Qt.black
 dot_y = (h // 2) - radius // 2
+# draw a dot for the revision
+if currentRev:
+# enlarge dot for the current revision
+delta = 2
+radius += 2 * delta
+dot_y -= delta
+dot_x -= delta
 painter.setBrush(dotColor)
 pen = QPen(pencolor)
 pen.setWidth(penradius)
 painter.setPen(pen)
 painter.drawEllipse(dot_x, dot_y, radius, radius)
 self.trUtf8("Mercurial Error"),
 errMsg)
 return parents
+def __identifyProject(self):
+"""
+Private method to determine the revision of the project directory.
+"""
+errMsg = ""
+process = QProcess()
+args = []
+args.append("identify")
+args.append("-n")
+process.setWorkingDirectory(self.repodir)
+process.start('hg', args)
+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()
+else:
+if not finished:
+errMsg = self.trUtf8("The hg process did not finish within 30s.")
+else:
+errMsg = self.trUtf8("Could not start the hg executable.")
+if errMsg:
+QMessageBox.critical(self,
+self.trUtf8("Mercurial Error"),
+errMsg)
 def __generateLogItem(self, author, date, message, revision, changedPaths, parents,
 branches, tags):
 """
 Private method to generate a log tree entry.
 .data(0, self.__edgesRole)
 else:
 topedges = None
 icon = self.__generateIcon(column, color, edges, topedges,
-QColor(self.__branchColor(branches[0])))
+QColor(self.__branchColor(branches[0])),
+rev == self.__projectRevision)
 itm.setIcon(0, icon)
 try:
 self.__lastRev = int(revision.split(":")[0])
 except ValueError:
 def __processBuffer(self):
 """
 Private method to process the buffered output of the hg log command.
 """
+self.__identifyProject()
 noEntries = 0
 log = {"message" : []}
 changedPaths = []
 initialText = True
 fileCopies = {}

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py