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