Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
- changeset 6461
- 48bf6c3f084f
- parent 6458
- 97480c872ea9
- child 6467
- 56ef1ae1629d
equal
deleted
inserted
replaced
| 6460:af9e529d0fb6 | 6461:48bf6c3f084f |
|---|---|
| 969 """<p>This changes the phase of revisions.</p>""" | 969 """<p>This changes the phase of revisions.</p>""" |
| 970 )) | 970 )) |
| 971 self.hgPhaseAct.triggered.connect(self.__hgPhase) | 971 self.hgPhaseAct.triggered.connect(self.__hgPhase) |
| 972 self.actions.append(self.hgPhaseAct) | 972 self.actions.append(self.hgPhaseAct) |
| 973 | 973 |
| 974 # TODO: Mercurial 4.7: add action for graft --stop | |
| 975 # TODO: Mercurial 4.7: add action for graft --abort | |
| 976 self.hgGraftAct = E5Action( | 974 self.hgGraftAct = E5Action( |
| 977 self.tr('Copy Changesets'), | 975 self.tr('Copy Changesets'), |
| 978 UI.PixmapCache.getIcon("vcsGraft.png"), | 976 UI.PixmapCache.getIcon("vcsGraft.png"), |
| 979 self.tr('Copy Changesets'), | 977 self.tr('Copy Changesets'), |
| 980 0, 0, self, 'mercurial_graft') | 978 0, 0, self, 'mercurial_graft') |
| 1002 """<p>This continues the last copying session after conflicts""" | 1000 """<p>This continues the last copying session after conflicts""" |
| 1003 """ were resolved.</p>""" | 1001 """ were resolved.</p>""" |
| 1004 )) | 1002 )) |
| 1005 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) | 1003 self.hgGraftContinueAct.triggered.connect(self.__hgGraftContinue) |
| 1006 self.actions.append(self.hgGraftContinueAct) | 1004 self.actions.append(self.hgGraftContinueAct) |
| 1005 | |
| 1006 if self.vcs.version >= (4, 7, 0): | |
| 1007 self.hgGraftStopAct = E5Action( | |
| 1008 self.tr('Stop Copying Session'), | |
| 1009 self.tr('Stop Copying Session'), | |
| 1010 0, 0, self, 'mercurial_graft_stop') | |
| 1011 self.hgGraftStopAct.setStatusTip(self.tr( | |
| 1012 'Stop the interrupted copying session' | |
| 1013 )) | |
| 1014 self.hgGraftStopAct.setWhatsThis(self.tr( | |
| 1015 """<b>Stop Copying Session</b>""" | |
| 1016 """<p>This stops the interrupted copying session.</p>""" | |
| 1017 )) | |
| 1018 self.hgGraftStopAct.triggered.connect(self.__hgGraftStop) | |
| 1019 self.actions.append(self.hgGraftStopAct) | |
| 1020 | |
| 1021 self.hgGraftAbortAct = E5Action( | |
| 1022 self.tr('Abort Copying Session'), | |
| 1023 self.tr('Abort Copying Session'), | |
| 1024 0, 0, self, 'mercurial_graft_abort') | |
| 1025 self.hgGraftAbortAct.setStatusTip(self.tr( | |
| 1026 'Abort the interrupted copying session and rollback' | |
| 1027 )) | |
| 1028 self.hgGraftAbortAct.setWhatsThis(self.tr( | |
| 1029 """<b>Abort Copying Session</b>""" | |
| 1030 """<p>This aborts the interrupted copying session and""" | |
| 1031 """ rollbacks to the state before the copy.</p>""" | |
| 1032 )) | |
| 1033 self.hgGraftAbortAct.triggered.connect(self.__hgGraftAbort) | |
| 1034 self.actions.append(self.hgGraftAbortAct) | |
| 1007 | 1035 |
| 1008 self.hgAddSubrepoAct = E5Action( | 1036 self.hgAddSubrepoAct = E5Action( |
| 1009 self.tr('Add'), | 1037 self.tr('Add'), |
| 1010 UI.PixmapCache.getIcon("vcsAdd.png"), | 1038 UI.PixmapCache.getIcon("vcsAdd.png"), |
| 1011 self.tr('Add...'), | 1039 self.tr('Add...'), |
| 1375 self.extensionMenus[extensionName] = self.__extensionsMenu.addMenu( | 1403 self.extensionMenus[extensionName] = self.__extensionsMenu.addMenu( |
| 1376 self.__extensions[extensionName].initMenu( | 1404 self.__extensions[extensionName].initMenu( |
| 1377 self.__extensionsMenu)) | 1405 self.__extensionsMenu)) |
| 1378 self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) | 1406 self.vcs.activeExtensionsChanged.connect(self.__showExtensionMenu) |
| 1379 | 1407 |
| 1380 # TODO: Mercurial 4.7: add action for graft --stop | |
| 1381 # TODO: Mercurial 4.7: add action for graft --abort | |
| 1382 graftMenu = QMenu(self.tr("Copy Changesets"), menu) | 1408 graftMenu = QMenu(self.tr("Copy Changesets"), menu) |
| 1383 graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) | 1409 graftMenu.setIcon(UI.PixmapCache.getIcon("vcsGraft.png")) |
| 1384 graftMenu.setTearOffEnabled(True) | 1410 graftMenu.setTearOffEnabled(True) |
| 1385 graftMenu.addAction(self.hgGraftAct) | 1411 graftMenu.addAction(self.hgGraftAct) |
| 1386 graftMenu.addAction(self.hgGraftContinueAct) | 1412 graftMenu.addAction(self.hgGraftContinueAct) |
| 1413 if self.vcs.version >= (4, 7, 0): | |
| 1414 graftMenu.addAction(self.hgGraftStopAct) | |
| 1415 graftMenu.addAction(self.hgGraftAbortAct) | |
| 1387 | 1416 |
| 1388 subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) | 1417 subrepoMenu = QMenu(self.tr("Sub-Repository"), menu) |
| 1389 subrepoMenu.setTearOffEnabled(True) | 1418 subrepoMenu.setTearOffEnabled(True) |
| 1390 subrepoMenu.addAction(self.hgAddSubrepoAct) | 1419 subrepoMenu.addAction(self.hgAddSubrepoAct) |
| 1391 subrepoMenu.addAction(self.hgRemoveSubreposAct) | 1420 subrepoMenu.addAction(self.hgRemoveSubreposAct) |
| 1908 self.tr("""The project should be reread. Do this now?"""), | 1937 self.tr("""The project should be reread. Do this now?"""), |
| 1909 yesDefault=True) | 1938 yesDefault=True) |
| 1910 if res: | 1939 if res: |
| 1911 self.project.reopenProject() | 1940 self.project.reopenProject() |
| 1912 | 1941 |
| 1942 def __hgGraftStop(self): | |
| 1943 """ | |
| 1944 Private slot used to stop an interrupted copying session. | |
| 1945 """ | |
| 1946 shouldReopen = self.vcs.hgGraftStop(self.project.getProjectPath()) | |
| 1947 if shouldReopen: | |
| 1948 res = E5MessageBox.yesNo( | |
| 1949 None, | |
| 1950 self.tr("Copy Changesets (Stop)"), | |
| 1951 self.tr("""The project should be reread. Do this now?"""), | |
| 1952 yesDefault=True) | |
| 1953 if res: | |
| 1954 self.project.reopenProject() | |
| 1955 | |
| 1956 def __hgGraftAbort(self): | |
| 1957 """ | |
| 1958 Private slot used to abort an interrupted copying session and perform | |
| 1959 a rollback. | |
| 1960 """ | |
| 1961 shouldReopen = self.vcs.hgGraftAbort(self.project.getProjectPath()) | |
| 1962 if shouldReopen: | |
| 1963 res = E5MessageBox.yesNo( | |
| 1964 None, | |
| 1965 self.tr("Copy Changesets (Abort)"), | |
| 1966 self.tr("""The project should be reread. Do this now?"""), | |
| 1967 yesDefault=True) | |
| 1968 if res: | |
| 1969 self.project.reopenProject() | |
| 1970 | |
| 1913 def __hgAddSubrepository(self): | 1971 def __hgAddSubrepository(self): |
| 1914 """ | 1972 """ |
| 1915 Private slot used to add a sub-repository. | 1973 Private slot used to add a sub-repository. |
| 1916 """ | 1974 """ |
| 1917 self.vcs.hgAddSubrepository() | 1975 self.vcs.hgAddSubrepository() |
