Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2525
- 8b507a9a2d40
- parent 3008
- 7848489bcb92
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 54 self.hgTransplantAct.setStatusTip(self.trUtf8( | 54 self.hgTransplantAct.setStatusTip(self.trUtf8( |
| 55 'Transplant changesets from another branch' | 55 'Transplant changesets from another branch' |
| 56 )) | 56 )) |
| 57 self.hgTransplantAct.setWhatsThis(self.trUtf8( | 57 self.hgTransplantAct.setWhatsThis(self.trUtf8( |
| 58 """<b>Transplant Changesets</b>""" | 58 """<b>Transplant Changesets</b>""" |
| 59 """<p>This transplants changesets from another branch on top of the""" | 59 """<p>This transplants changesets from another branch on top""" |
| 60 """ current working directory with the log of the original changeset.</p>""" | 60 """ of the current working directory with the log of the""" |
| 61 """ original changeset.</p>""" | |
| 61 )) | 62 )) |
| 62 self.hgTransplantAct.triggered[()].connect(self.__hgTransplant) | 63 self.hgTransplantAct.triggered[()].connect(self.__hgTransplant) |
| 63 self.actions.append(self.hgTransplantAct) | 64 self.actions.append(self.hgTransplantAct) |
| 64 | 65 |
| 65 self.hgTransplantContinueAct = E5Action( | 66 self.hgTransplantContinueAct = E5Action( |
| 69 self.hgTransplantContinueAct.setStatusTip(self.trUtf8( | 70 self.hgTransplantContinueAct.setStatusTip(self.trUtf8( |
| 70 'Continue the last transplant session after repair' | 71 'Continue the last transplant session after repair' |
| 71 )) | 72 )) |
| 72 self.hgTransplantContinueAct.setWhatsThis(self.trUtf8( | 73 self.hgTransplantContinueAct.setWhatsThis(self.trUtf8( |
| 73 """<b>Continue Transplant Session</b>""" | 74 """<b>Continue Transplant Session</b>""" |
| 74 """<p>This continues the last transplant session after repair.</p>""" | 75 """<p>This continues the last transplant session after""" |
| 76 """ repair.</p>""" | |
| 75 )) | 77 )) |
| 76 self.hgTransplantContinueAct.triggered[()].connect(self.__hgTransplantContinue) | 78 self.hgTransplantContinueAct.triggered[()].connect( |
| 79 self.__hgTransplantContinue) | |
| 77 self.actions.append(self.hgTransplantContinueAct) | 80 self.actions.append(self.hgTransplantContinueAct) |
| 78 | 81 |
| 79 def initMenu(self, mainMenu): | 82 def initMenu(self, mainMenu): |
| 80 """ | 83 """ |
| 81 Public method to generate the extension menu. | 84 Public method to generate the extension menu. |
| 85 """ | 88 """ |
| 86 menu = QMenu(self.menuTitle(), mainMenu) | 89 menu = QMenu(self.menuTitle(), mainMenu) |
| 87 menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) | 90 menu.setIcon(UI.PixmapCache.getIcon("vcsTransplant.png")) |
| 88 if self.vcs.version >= (2, 3): | 91 if self.vcs.version >= (2, 3): |
| 89 # transplant is deprecated as of Mercurial 2.3 | 92 # transplant is deprecated as of Mercurial 2.3 |
| 90 menu.addAction(self.trUtf8("Transplant is deprecated")).setEnabled(False) | 93 menu.addAction( |
| 94 self.trUtf8("Transplant is deprecated")).setEnabled(False) | |
| 91 else: | 95 else: |
| 92 menu.setTearOffEnabled(True) | 96 menu.setTearOffEnabled(True) |
| 93 | 97 |
| 94 menu.addAction(self.hgTransplantAct) | 98 menu.addAction(self.hgTransplantAct) |
| 95 menu.addAction(self.hgTransplantContinueAct) | 99 menu.addAction(self.hgTransplantContinueAct) |
