Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
- changeset 7257
- c4d0cac9b5c9
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7256:4ef3b78ebb4e | 7257:c4d0cac9b5c9 |
|---|---|
| 102 | 102 |
| 103 def __hgRebase(self): | 103 def __hgRebase(self): |
| 104 """ | 104 """ |
| 105 Private slot used to rebase changesets to another branch. | 105 Private slot used to rebase changesets to another branch. |
| 106 """ | 106 """ |
| 107 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 107 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebase( |
| 108 .hgRebase(self.project.getProjectPath()) | 108 self.project.getProjectPath()) |
| 109 if shouldReopen: | 109 if shouldReopen: |
| 110 res = E5MessageBox.yesNo( | 110 res = E5MessageBox.yesNo( |
| 111 None, | 111 None, |
| 112 self.tr("Rebase Changesets"), | 112 self.tr("Rebase Changesets"), |
| 113 self.tr("""The project should be reread. Do this now?"""), | 113 self.tr("""The project should be reread. Do this now?"""), |
| 117 | 117 |
| 118 def __hgRebaseContinue(self): | 118 def __hgRebaseContinue(self): |
| 119 """ | 119 """ |
| 120 Private slot used to continue the last rebase session after repair. | 120 Private slot used to continue the last rebase session after repair. |
| 121 """ | 121 """ |
| 122 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 122 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseContinue( |
| 123 .hgRebaseContinue(self.project.getProjectPath()) | 123 self.project.getProjectPath()) |
| 124 if shouldReopen: | 124 if shouldReopen: |
| 125 res = E5MessageBox.yesNo( | 125 res = E5MessageBox.yesNo( |
| 126 None, | 126 None, |
| 127 self.tr("Rebase Changesets (Continue)"), | 127 self.tr("Rebase Changesets (Continue)"), |
| 128 self.tr("""The project should be reread. Do this now?"""), | 128 self.tr("""The project should be reread. Do this now?"""), |
| 132 | 132 |
| 133 def __hgRebaseAbort(self): | 133 def __hgRebaseAbort(self): |
| 134 """ | 134 """ |
| 135 Private slot used to abort the last rebase session. | 135 Private slot used to abort the last rebase session. |
| 136 """ | 136 """ |
| 137 shouldReopen = self.vcs.getExtensionObject("rebase")\ | 137 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseAbort( |
| 138 .hgRebaseAbort(self.project.getProjectPath()) | 138 self.project.getProjectPath()) |
| 139 if shouldReopen: | 139 if shouldReopen: |
| 140 res = E5MessageBox.yesNo( | 140 res = E5MessageBox.yesNo( |
| 141 None, | 141 None, |
| 142 self.tr("Rebase Changesets (Abort)"), | 142 self.tr("Rebase Changesets (Abort)"), |
| 143 self.tr("""The project should be reread. Do this now?"""), | 143 self.tr("""The project should be reread. Do this now?"""), |
