Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Thu Aug 18 17:34:05 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Tue Aug 23 12:21:46 2016 +0200
@@ -44,7 +44,6 @@
         from .FetchExtension.ProjectHelper import FetchProjectHelper
         from .PurgeExtension.ProjectHelper import PurgeProjectHelper
         from .GpgExtension.ProjectHelper import GpgProjectHelper
-        from .TransplantExtension.ProjectHelper import TransplantProjectHelper
         from .RebaseExtension.ProjectHelper import RebaseProjectHelper
         from .ShelveExtension.ProjectHelper import ShelveProjectHelper
         from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper
@@ -53,7 +52,6 @@
             "fetch": FetchProjectHelper(),
             "purge": PurgeProjectHelper(),
             "gpg": GpgProjectHelper(),
-            "transplant": TransplantProjectHelper(),
             "rebase": RebaseProjectHelper(),
             "shelve": ShelveProjectHelper(),
             "largefiles": LargefilesProjectHelper(),
@@ -1363,14 +1361,11 @@
                     self.__extensionsMenu))
         self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu)
         
-        if self.vcs.version >= (2, 0):
-            graftMenu = QMenu(self.tr("Graft"), menu)
-            graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png"))
-            graftMenu.setTearOffEnabled(True)
-            graftMenu.addAction(self.hgGraftAct)
-            graftMenu.addAction(self.hgGraftContinueAct)
-        else:
-            graftMenu = None
+        graftMenu = QMenu(self.tr("Graft"), menu)
+        graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png"))
+        graftMenu.setTearOffEnabled(True)
+        graftMenu.addAction(self.hgGraftAct)
+        graftMenu.addAction(self.hgGraftContinueAct)
         
         subrepoMenu = QMenu(self.tr("Sub-Repository"), menu)
         subrepoMenu.setTearOffEnabled(True)
@@ -1387,9 +1382,8 @@
         changesMenu.addAction(self.hgUnresolveAct)
         changesMenu.addAction(self.hgReMergeAct)
         changesMenu.addAction(self.hgCancelMergeAct)
-        if self.vcs.version >= (2, 1):
-            changesMenu.addSeparator()
-            changesMenu.addAction(self.hgPhaseAct)
+        changesMenu.addSeparator()
+        changesMenu.addAction(self.hgPhaseAct)
         
         act = menu.addAction(
             UI.PixmapCache.getIcon(