Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
- changeset 3345
- 071afe8be2a1
- parent 3190
- a9a94491c4fd
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3343:f7a6d271bb40 | 3345:071afe8be2a1 |
|---|---|
| 57 """<b>Transplant Changesets</b>""" | 57 """<b>Transplant Changesets</b>""" |
| 58 """<p>This transplants changesets from another branch on top""" | 58 """<p>This transplants changesets from another branch on top""" |
| 59 """ of the current working directory with the log of the""" | 59 """ of the current working directory with the log of the""" |
| 60 """ original changeset.</p>""" | 60 """ original changeset.</p>""" |
| 61 )) | 61 )) |
| 62 self.hgTransplantAct.triggered[()].connect(self.__hgTransplant) | 62 self.hgTransplantAct.triggered.connect(self.__hgTransplant) |
| 63 self.actions.append(self.hgTransplantAct) | 63 self.actions.append(self.hgTransplantAct) |
| 64 | 64 |
| 65 self.hgTransplantContinueAct = E5Action( | 65 self.hgTransplantContinueAct = E5Action( |
| 66 self.tr('Continue Transplant Session'), | 66 self.tr('Continue Transplant Session'), |
| 67 self.tr('Continue Transplant Session'), | 67 self.tr('Continue Transplant Session'), |
| 72 self.hgTransplantContinueAct.setWhatsThis(self.tr( | 72 self.hgTransplantContinueAct.setWhatsThis(self.tr( |
| 73 """<b>Continue Transplant Session</b>""" | 73 """<b>Continue Transplant Session</b>""" |
| 74 """<p>This continues the last transplant session after""" | 74 """<p>This continues the last transplant session after""" |
| 75 """ repair.</p>""" | 75 """ repair.</p>""" |
| 76 )) | 76 )) |
| 77 self.hgTransplantContinueAct.triggered[()].connect( | 77 self.hgTransplantContinueAct.triggered.connect( |
| 78 self.__hgTransplantContinue) | 78 self.__hgTransplantContinue) |
| 79 self.actions.append(self.hgTransplantContinueAct) | 79 self.actions.append(self.hgTransplantContinueAct) |
| 80 | 80 |
| 81 def initMenu(self, mainMenu): | 81 def initMenu(self, mainMenu): |
| 82 """ | 82 """ |
