diff -r b1578699ddee -r 97480c872ea9 Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Aug 02 19:12:50 2018 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Aug 03 17:56:44 2018 +0200
@@ -971,6 +971,8 @@
self.hgPhaseAct.triggered.connect(self.__hgPhase)
self.actions.append(self.hgPhaseAct)
+ # TODO: Mercurial 4.7: add action for graft --stop
+ # TODO: Mercurial 4.7: add action for graft --abort
self.hgGraftAct = E5Action(
self.tr('Copy Changesets'),
UI.PixmapCache.getIcon("vcsGraft.png"),
@@ -1375,7 +1377,9 @@
self.__extensionsMenu))
self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu)
- graftMenu = QMenu(self.tr("Graft"), menu)
+ # TODO: Mercurial 4.7: add action for graft --stop
+ # TODO: Mercurial 4.7: add action for graft --abort
+ graftMenu = QMenu(self.tr("Copy Changesets"), menu)
graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png"))
graftMenu.setTearOffEnabled(True)
graftMenu.addAction(self.hgGraftAct)
@@ -1386,18 +1390,15 @@
subrepoMenu.addAction(self.hgAddSubrepoAct)
subrepoMenu.addAction(self.hgRemoveSubreposAct)
- changesMenu = QMenu(self.tr("Manage Changes"), menu)
- changesMenu.setTearOffEnabled(True)
- changesMenu.addAction(self.vcsRevertAct)
- changesMenu.addSeparator()
- changesMenu.addAction(self.vcsMergeAct)
- changesMenu.addAction(self.hgShowConflictsAct)
- changesMenu.addAction(self.vcsResolveAct)
- changesMenu.addAction(self.hgUnresolveAct)
- changesMenu.addAction(self.hgReMergeAct)
- changesMenu.addAction(self.hgCancelMergeAct)
- changesMenu.addSeparator()
- changesMenu.addAction(self.hgPhaseAct)
+ mergeMenu = QMenu(self.tr("Merge Changesets"), menu)
+ mergeMenu.setIcon(UI.PixmapCache.getIcon("vcsMerge.png"))
+ mergeMenu.setTearOffEnabled(True)
+ mergeMenu.addAction(self.vcsMergeAct)
+ mergeMenu.addAction(self.hgShowConflictsAct)
+ mergeMenu.addAction(self.vcsResolveAct)
+ mergeMenu.addAction(self.hgUnresolveAct)
+ mergeMenu.addAction(self.hgReMergeAct)
+ mergeMenu.addAction(self.hgCancelMergeAct)
act = menu.addAction(
UI.PixmapCache.getIcon(
@@ -1417,11 +1418,11 @@
menu.addAction(self.hgOutgoingAct)
menu.addAction(self.hgPushAct)
menu.addSeparator()
- menu.addMenu(changesMenu)
+ menu.addAction(self.vcsRevertAct)
+ menu.addMenu(mergeMenu)
+ menu.addMenu(graftMenu)
+ menu.addAction(self.hgPhaseAct)
menu.addSeparator()
- if graftMenu is not None:
- menu.addMenu(graftMenu)
- menu.addSeparator()
menu.addMenu(bundleMenu)
menu.addMenu(patchMenu)
menu.addSeparator()
