--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri May 09 15:53:40 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon May 12 18:19:22 2014 +0200
@@ -95,29 +95,17 @@
self.initialCommandMode = "log"
self.__hgClient = vcs.getClient()
- if self.vcs.version >= (1, 8):
- self.__detailsTemplate = self.tr(
- "<table>"
- "<tr><td><b>Revision</b></td><td>{0}</td></tr>"
- "<tr><td><b>Date</b></td><td>{1}</td></tr>"
- "<tr><td><b>Author</b></td><td>{2}</td></tr>"
- "<tr><td><b>Branch</b></td><td>{3}</td></tr>"
- "<tr><td><b>Tags</b></td><td>{4}</td></tr>"
- "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>"
- "<tr><td><b>Parents</b></td><td>{6}</td></tr>"
- "</table>"
- )
- else:
- self.__detailsTemplate = self.tr(
- "<table>"
- "<tr><td><b>Revision</b></td><td>{0}</td></tr>"
- "<tr><td><b>Date</b></td><td>{1}</td></tr>"
- "<tr><td><b>Author</b></td><td>{2}</td></tr>"
- "<tr><td><b>Branch</b></td><td>{3}</td></tr>"
- "<tr><td><b>Tags</b></td><td>{4}</td></tr>"
- "<tr><td><b>Parents</b></td><td>{5}</td></tr>"
- "</table>"
- )
+ self.__detailsTemplate = self.tr(
+ "<table>"
+ "<tr><td><b>Revision</b></td><td>{0}</td></tr>"
+ "<tr><td><b>Date</b></td><td>{1}</td></tr>"
+ "<tr><td><b>Author</b></td><td>{2}</td></tr>"
+ "<tr><td><b>Branch</b></td><td>{3}</td></tr>"
+ "<tr><td><b>Tags</b></td><td>{4}</td></tr>"
+ "<tr><td><b>Bookmarks</b></td><td>{5}</td></tr>"
+ "<tr><td><b>Parents</b></td><td>{6}</td></tr>"
+ "</table>"
+ )
self.__bundle = ""
self.__filename = ""
@@ -155,12 +143,9 @@
self.logTree.setIconSize(
QSize(100 * self.__rowHeight, self.__rowHeight))
- if self.vcs.version >= (1, 8):
- self.BookmarksColumn = self.logTree.columnCount()
- self.logTree.headerItem().setText(
- self.BookmarksColumn, self.tr("Bookmarks"))
- else:
- self.BookmarksColumn = -1
+ self.BookmarksColumn = self.logTree.columnCount()
+ self.logTree.headerItem().setText(
+ self.BookmarksColumn, self.tr("Bookmarks"))
if self.vcs.version < (2, 1):
self.logTree.setColumnHidden(self.PhaseColumn, True)
@@ -759,14 +744,10 @@
args.append(os.path.join(os.path.dirname(__file__),
"styles",
"logBrowserBookmarkPhase.style"))
- elif self.vcs.version >= (1, 8):
+ else:
args.append(os.path.join(os.path.dirname(__file__),
"styles",
"logBrowserBookmark.style"))
- else:
- args.append(os.path.join(os.path.dirname(__file__),
- "styles",
- "logBrowser.style"))
if self.commandMode == "incoming":
if self.__bundle:
args.append(self.__bundle)
@@ -1231,31 +1212,18 @@
self.filesTree.clear()
if itm is not None:
- if self.vcs.version >= (1, 8):
- self.detailsEdit.setHtml(self.__detailsTemplate.format(
- itm.text(self.RevisionColumn),
- itm.text(self.DateColumn),
- itm.text(self.AuthorColumn),
- itm.text(self.BranchColumn).replace(
- self.ClosedIndicator, ""),
- itm.text(self.TagsColumn),
- itm.text(self.BookmarksColumn),
- ", ".join(
- [str(x) for x in itm.data(0, self.__parentsRole)]
- ),
- ))
- else:
- self.detailsEdit.setHtml(self.__detailsTemplate.format(
- itm.text(self.RevisionColumn),
- itm.text(self.DateColumn),
- itm.text(self.AuthorColumn),
- itm.text(self.BranchColumn).replace(
- self.ClosedIndicator, ""),
- itm.text(self.TagsColumn),
- ", ".join(
- [str(x) for x in itm.data(0, self.__parentsRole)]
- ),
- ))
+ self.detailsEdit.setHtml(self.__detailsTemplate.format(
+ itm.text(self.RevisionColumn),
+ itm.text(self.DateColumn),
+ itm.text(self.AuthorColumn),
+ itm.text(self.BranchColumn).replace(
+ self.ClosedIndicator, ""),
+ itm.text(self.TagsColumn),
+ itm.text(self.BookmarksColumn),
+ ", ".join(
+ [str(x) for x in itm.data(0, self.__parentsRole)]
+ ),
+ ))
for line in itm.data(0, self.__messageRole):
self.messageEdit.append(line.strip())
