Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py
- changeset 3020
- 542e97d4ecb3
- parent 3008
- 7848489bcb92
- child 3023
- 34ce20603bf7
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 111 Private slot used to transplant changesets from another branch. | 111 Private slot used to transplant changesets from another branch. |
| 112 """ | 112 """ |
| 113 shouldReopen = self.vcs.getExtensionObject("transplant")\ | 113 shouldReopen = self.vcs.getExtensionObject("transplant")\ |
| 114 .hgTransplant(self.project.getProjectPath()) | 114 .hgTransplant(self.project.getProjectPath()) |
| 115 if shouldReopen: | 115 if shouldReopen: |
| 116 res = E5MessageBox.yesNo(None, | 116 res = E5MessageBox.yesNo( |
| 117 None, | |
| 117 self.trUtf8("Transplant Changesets"), | 118 self.trUtf8("Transplant Changesets"), |
| 118 self.trUtf8("""The project should be reread. Do this now?"""), | 119 self.trUtf8("""The project should be reread. Do this now?"""), |
| 119 yesDefault=True) | 120 yesDefault=True) |
| 120 if res: | 121 if res: |
| 121 self.project.reopenProject() | 122 self.project.reopenProject() |
| 125 Private slot used to continue the last transplant session after repair. | 126 Private slot used to continue the last transplant session after repair. |
| 126 """ | 127 """ |
| 127 shouldReopen = self.vcs.getExtensionObject("transplant")\ | 128 shouldReopen = self.vcs.getExtensionObject("transplant")\ |
| 128 .hgTransplantContinue(self.project.getProjectPath()) | 129 .hgTransplantContinue(self.project.getProjectPath()) |
| 129 if shouldReopen: | 130 if shouldReopen: |
| 130 res = E5MessageBox.yesNo(None, | 131 res = E5MessageBox.yesNo( |
| 132 None, | |
| 131 self.trUtf8("Transplant Changesets (Continue)"), | 133 self.trUtf8("Transplant Changesets (Continue)"), |
| 132 self.trUtf8("""The project should be reread. Do this now?"""), | 134 self.trUtf8("""The project should be reread. Do this now?"""), |
| 133 yesDefault=True) | 135 yesDefault=True) |
| 134 if res: | 136 if res: |
| 135 self.project.reopenProject() | 137 self.project.reopenProject() |
