Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
- changeset 3020
- 542e97d4ecb3
- parent 2302
- f29e9405c851
- child 3023
- 34ce20603bf7
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 103 Private slot used to rebase changesets to another branch. | 103 Private slot used to rebase changesets to another branch. |
| 104 """ | 104 """ |
| 105 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 105 shouldReopen = self.vcs.getExtensionObject("rebase")\ |
| 106 .hgRebase(self.project.getProjectPath()) | 106 .hgRebase(self.project.getProjectPath()) |
| 107 if shouldReopen: | 107 if shouldReopen: |
| 108 res = E5MessageBox.yesNo(None, | 108 res = E5MessageBox.yesNo( |
| 109 None, | |
| 109 self.trUtf8("Rebase Changesets"), | 110 self.trUtf8("Rebase Changesets"), |
| 110 self.trUtf8("""The project should be reread. Do this now?"""), | 111 self.trUtf8("""The project should be reread. Do this now?"""), |
| 111 yesDefault=True) | 112 yesDefault=True) |
| 112 if res: | 113 if res: |
| 113 self.project.reopenProject() | 114 self.project.reopenProject() |
| 117 Private slot used to continue the last rebase session after repair. | 118 Private slot used to continue the last rebase session after repair. |
| 118 """ | 119 """ |
| 119 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 120 shouldReopen = self.vcs.getExtensionObject("rebase")\ |
| 120 .hgRebaseContinue(self.project.getProjectPath()) | 121 .hgRebaseContinue(self.project.getProjectPath()) |
| 121 if shouldReopen: | 122 if shouldReopen: |
| 122 res = E5MessageBox.yesNo(None, | 123 res = E5MessageBox.yesNo( |
| 124 None, | |
| 123 self.trUtf8("Rebase Changesets (Continue)"), | 125 self.trUtf8("Rebase Changesets (Continue)"), |
| 124 self.trUtf8("""The project should be reread. Do this now?"""), | 126 self.trUtf8("""The project should be reread. Do this now?"""), |
| 125 yesDefault=True) | 127 yesDefault=True) |
| 126 if res: | 128 if res: |
| 127 self.project.reopenProject() | 129 self.project.reopenProject() |
| 131 Private slot used to abort the last rebase session. | 133 Private slot used to abort the last rebase session. |
| 132 """ | 134 """ |
| 133 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 135 shouldReopen = self.vcs.getExtensionObject("rebase")\ |
| 134 .hgRebaseAbort(self.project.getProjectPath()) | 136 .hgRebaseAbort(self.project.getProjectPath()) |
| 135 if shouldReopen: | 137 if shouldReopen: |
| 136 res = E5MessageBox.yesNo(None, | 138 res = E5MessageBox.yesNo( |
| 139 None, | |
| 137 self.trUtf8("Rebase Changesets (Abort)"), | 140 self.trUtf8("Rebase Changesets (Abort)"), |
| 138 self.trUtf8("""The project should be reread. Do this now?"""), | 141 self.trUtf8("""The project should be reread. Do this now?"""), |
| 139 yesDefault=True) | 142 yesDefault=True) |
| 140 if res: | 143 if res: |
| 141 self.project.reopenProject() | 144 self.project.reopenProject() |
