Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
- changeset 3345
- 071afe8be2a1
- parent 3190
- a9a94491c4fd
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3343:f7a6d271bb40 | 3345:071afe8be2a1 |
|---|---|
| 41 )) | 41 )) |
| 42 self.hgRebaseAct.setWhatsThis(self.tr( | 42 self.hgRebaseAct.setWhatsThis(self.tr( |
| 43 """<b>Rebase Changesets</b>""" | 43 """<b>Rebase Changesets</b>""" |
| 44 """<p>This rebases changesets to another branch.</p>""" | 44 """<p>This rebases changesets to another branch.</p>""" |
| 45 )) | 45 )) |
| 46 self.hgRebaseAct.triggered[()].connect(self.__hgRebase) | 46 self.hgRebaseAct.triggered.connect(self.__hgRebase) |
| 47 self.actions.append(self.hgRebaseAct) | 47 self.actions.append(self.hgRebaseAct) |
| 48 | 48 |
| 49 self.hgRebaseContinueAct = E5Action( | 49 self.hgRebaseContinueAct = E5Action( |
| 50 self.tr('Continue Rebase Session'), | 50 self.tr('Continue Rebase Session'), |
| 51 self.tr('Continue Rebase Session'), | 51 self.tr('Continue Rebase Session'), |
| 55 )) | 55 )) |
| 56 self.hgRebaseContinueAct.setWhatsThis(self.tr( | 56 self.hgRebaseContinueAct.setWhatsThis(self.tr( |
| 57 """<b>Continue Rebase Session</b>""" | 57 """<b>Continue Rebase Session</b>""" |
| 58 """<p>This continues the last rebase session after repair.</p>""" | 58 """<p>This continues the last rebase session after repair.</p>""" |
| 59 )) | 59 )) |
| 60 self.hgRebaseContinueAct.triggered[()].connect(self.__hgRebaseContinue) | 60 self.hgRebaseContinueAct.triggered.connect(self.__hgRebaseContinue) |
| 61 self.actions.append(self.hgRebaseContinueAct) | 61 self.actions.append(self.hgRebaseContinueAct) |
| 62 | 62 |
| 63 self.hgRebaseAbortAct = E5Action( | 63 self.hgRebaseAbortAct = E5Action( |
| 64 self.tr('Abort Rebase Session'), | 64 self.tr('Abort Rebase Session'), |
| 65 self.tr('Abort Rebase Session'), | 65 self.tr('Abort Rebase Session'), |
| 69 )) | 69 )) |
| 70 self.hgRebaseAbortAct.setWhatsThis(self.tr( | 70 self.hgRebaseAbortAct.setWhatsThis(self.tr( |
| 71 """<b>Abort Rebase Session</b>""" | 71 """<b>Abort Rebase Session</b>""" |
| 72 """<p>This aborts the last rebase session.</p>""" | 72 """<p>This aborts the last rebase session.</p>""" |
| 73 )) | 73 )) |
| 74 self.hgRebaseAbortAct.triggered[()].connect(self.__hgRebaseAbort) | 74 self.hgRebaseAbortAct.triggered.connect(self.__hgRebaseAbort) |
| 75 self.actions.append(self.hgRebaseAbortAct) | 75 self.actions.append(self.hgRebaseAbortAct) |
| 76 | 76 |
| 77 def initMenu(self, mainMenu): | 77 def initMenu(self, mainMenu): |
| 78 """ | 78 """ |
| 79 Public method to generate the extension menu. | 79 Public method to generate the extension menu. |
