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

-:be38b958a78e
+:cdfdecd2faef
 "</table>"
 )
 self.__tagsTemplate = self.tr(
 "<tr><td><b>Tags</b></td><td>{0}</td></tr>"
 )
+self.__latestTagTemplate = self.tr(
+"<tr><td><b>Latest Tag</b></td><td>{0}</td></tr>"
+)
 self.__bookmarksTemplate = self.tr(
 "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>"
 )
 self.__bundle = ""
 self.__messageRole = Qt.UserRole
 self.__changesRole = Qt.UserRole + 1
 self.__edgesRole = Qt.UserRole + 2
 self.__parentsRole = Qt.UserRole + 3
+self.__latestTagRole = Qt.UserRole + 4
 if self.__hgClient:
 self.process = None
 else:
 self.process = QProcess()
 if line.strip().endswith("(closed)"):
 parts = line.split()
 self.__closedBranchesRevs.append(
 parts[-2].split(":", 1)[0])
+def __getRevisionOfTag(self, tag):
+"""
+Private method to get the revision of a tag.
+@param tag tag name
+@type str
+@return tuple containing the revision and changeset ID
+@rtype tuple of (str, str)
+"""
+errMsg = ""
+args = self.vcs.initCommand("tags")
+output = ""
+if self.__hgClient:
+output, errMsg = self.__hgClient.runcommand(args)
+else:
+process = QProcess()
+process.setWorkingDirectory(self.repodir)
+process.start('hg', args)
+procStarted = process.waitForStarted(5000)
+if procStarted:
+finished = process.waitForFinished(30000)
+if finished and process.exitCode() == 0:
+output = str(process.readAllStandardOutput(),
+self.vcs.getEncoding(), 'replace')
+else:
+if not finished:
+errMsg = self.tr(
+"The hg process did not finish within 30s.")
+else:
+errMsg = self.tr("Could not start the hg executable.")
+if errMsg:
+E5MessageBox.critical(
+self,
+self.tr("Mercurial Error"),
+errMsg)
+res = ("", "")
+if output:
+for line in output.splitlines():
+name, rev = line.strip().rsplit(None, 1)
+if name == tag:
+res = tuple(rev.split(":", 1))
+break
+return res
 def __generateLogItem(self, author, date, message, revision, changedPaths,
-parents, branches, tags, phase, bookmarks=None):
+parents, branches, tags, phase, bookmarks,
+latestTag):
 """
 Private method to generate a log tree entry.
 @param author author info (string)
 @param date date info (string)
 @param parents list of parent revisions (list of integers)
 @param branches list of branches (list of strings)
 @param tags list of tags (string)
 @param phase phase of the entry (string)
 @param bookmarks list of bookmarks (string)
+@param latestTag the latest tag(s) reachable from the changeset
+(list of strings)
 @return reference to the generated item (QTreeWidgetItem)
 """
 logMessageColumnWidth = self.vcs.getPlugin().getPreferences(
 "LogMessageColumnWidth")
 msgtxt = ""
 column, color, edges = self.__generateEdges(int(rev), parents)
 itm.setData(0, self.__messageRole, message)
 itm.setData(0, self.__changesRole, changedPaths)
 itm.setData(0, self.__edgesRole, edges)
+itm.setData(0, self.__latestTagRole, latestTag)
 if parents == [-1]:
 itm.setData(0, self.__parentsRole, [])
 else:
 itm.setData(0, self.__parentsRole, parents)
 for parent in parents:
 log["tags"] = value.strip().split(", ")
 elif key == "bookmarks":
 log["bookmarks"] = value.strip().split(", ")
 elif key == "phase":
 log["phase"] = value.strip()
+elif key == "latesttag":
+tag = value.strip()
+if tag == "null":
+log["latesttag"] = []
+elif ":" in tag:
+log["latesttag"] = [
+t.strip() for t in tag.split(":") if t.strip()]
+else:
+log["latesttag"] = [tag]
 else:
 if initialText:
 continue
 if value.strip():
 log["message"].append(value.strip())
 if len(log) > 1:
 self.__generateLogItem(
 log["author"], log["date"],
 log["message"], log["revision"], changedPaths,
 log["parents"], log["branches"], log["tags"],
-log["phase"], log["bookmarks"])
+log["phase"], log["bookmarks"], log["latesttag"])
 dt = QDate.fromString(log["date"], Qt.ISODate)
 if not self.__maxDate.isValid() and \
 not self.__minDate.isValid():
 self.__maxDate = dt
 self.__minDate = dt
 if itm.text(self.BookmarksColumn):
 bookmarksStr = self.__bookmarksTemplate.format(
 itm.text(self.BookmarksColumn))
 else:
 bookmarksStr = ""
+if itm.data(0, self.__latestTagRole):
+latestTagLinks = []
+for tag in itm.data(0, self.__latestTagRole):
+url = QUrl()
+url.setScheme("rev")
+url.setPath(self.__getRevisionOfTag(tag)[0])
+latestTagLinks.append('<a href="{0}">{1}</a>'.format(
+url.toString(), tag))
+latestTagStr = self.__latestTagTemplate.format(
+", ".join(latestTagLinks))
+else:
+latestTagStr = ""
 rev = int(itm.text(self.RevisionColumn).split(":", 1)[0])
 parentLinks = []
 for parent in [str(x) for x in itm.data(0, self.__parentsRole)]:
 url = QUrl()
 itm.text(self.AuthorColumn),
 itm.text(self.BranchColumn).replace(
 self.ClosedIndicator, ""),
 ", ".join(parentLinks),
 ", ".join(childLinks),
-tagsStr + bookmarksStr,
+tagsStr + latestTagStr + bookmarksStr,
 ))
 for line in itm.data(0, self.__messageRole):
 self.messageEdit.append(line.strip())
 @pyqtSlot()
 def on_logTree_itemSelectionChanged(self):
 """
 Private slot called, when the selection has changed.
 """
-if len(self.logTree.selectedItems()) == 1:
-self.__updateGui(self.logTree.selectedItems()[0])
 self.__updateDiffButtons()
 self.__updateToolMenuActions()
 @pyqtSlot()
 def on_upButton_clicked(self):

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py