diff -r 9cc5217881ab -r 0b9420dc1093 Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Thu Aug 18 17:34:05 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Aug 23 12:21:46 2016 +0200
@@ -171,8 +171,6 @@
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)
self.__initActionsMenu()
@@ -181,25 +179,19 @@
Private method to initialize the actions menu.
"""
self.__actionsMenu = QMenu()
- if self.vcs.version >= (2, 0):
- self.__graftAct = self.__actionsMenu.addAction(
- self.tr("Copy Changesets"), self.__graftActTriggered)
- self.__graftAct.setToolTip(self.tr(
- "Copy the selected changesets to the current branch"))
- else:
- self.__graftAct = None
+ self.__graftAct = self.__actionsMenu.addAction(
+ self.tr("Copy Changesets"), self.__graftActTriggered)
+ self.__graftAct.setToolTip(self.tr(
+ "Copy the selected changesets to the current branch"))
- if self.vcs.version >= (2, 1):
- self.__phaseAct = self.__actionsMenu.addAction(
- self.tr("Change Phase"), self.__phaseActTriggered)
- self.__phaseAct.setToolTip(self.tr(
- "Change the phase of the selected revisions"))
- self.__phaseAct.setWhatsThis(self.tr(
- """<b>Change Phase</b>\n<p>This changes the phase of the"""
- """ selected revisions. The selected revisions have to have"""
- """ the same current phase.</p>"""))
- else:
- self.__phaseAct = None
+ self.__phaseAct = self.__actionsMenu.addAction(
+ self.tr("Change Phase"), self.__phaseActTriggered)
+ self.__phaseAct.setToolTip(self.tr(
+ "Change the phase of the selected revisions"))
+ self.__phaseAct.setWhatsThis(self.tr(
+ """<b>Change Phase</b>\n<p>This changes the phase of the"""
+ """ selected revisions. The selected revisions have to have"""
+ """ the same current phase.</p>"""))
self.__tagAct = self.__actionsMenu.addAction(
self.tr("Tag"), self.__tagActTriggered)
@@ -216,13 +208,10 @@
self.tr("Pull Changes"), self.__pullActTriggered)
self.__pullAct.setToolTip(self.tr(
"Pull changes from a remote repository"))
- if self.vcs.version >= (2, 0):
- self.__lfPullAct = self.__actionsMenu.addAction(
- self.tr("Pull Large Files"), self.__lfPullActTriggered)
- self.__lfPullAct.setToolTip(self.tr(
- "Pull large files for selected revisions"))
- else:
- self.__lfPullAct = None
+ self.__lfPullAct = self.__actionsMenu.addAction(
+ self.tr("Pull Large Files"), self.__lfPullActTriggered)
+ self.__lfPullAct.setToolTip(self.tr(
+ "Pull large files for selected revisions"))
self.__actionsMenu.addSeparator()
@@ -791,21 +780,10 @@
args.append('--follow')
if self.commandMode == "log":
args.append('--copies')
- if self.vcs.version >= (3, 0):
- args.append('--template')
- args.append(os.path.join(os.path.dirname(__file__),
- "templates",
- "logBrowserBookmarkPhase.tmpl"))
- else:
- args.append('--style')
- if self.vcs.version >= (2, 1):
- args.append(os.path.join(os.path.dirname(__file__),
- "styles",
- "logBrowserBookmarkPhase.style"))
- else:
- args.append(os.path.join(os.path.dirname(__file__),
- "styles",
- "logBrowserBookmark.style"))
+ args.append('--template')
+ args.append(os.path.join(os.path.dirname(__file__),
+ "templates",
+ "logBrowserBookmarkPhase.tmpl"))
if self.commandMode == "incoming":
if self.__bundle:
args.append(self.__bundle)
