Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py
- changeset 7971
- ff2971513d6d
- parent 7923
- 91e843545d9a
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 7970:c4ee8a81584c | 7971:ff2971513d6d |
|---|---|
| 101 | 101 |
| 102 def __hgRebase(self): | 102 def __hgRebase(self): |
| 103 """ | 103 """ |
| 104 Private slot used to rebase changesets to another branch. | 104 Private slot used to rebase changesets to another branch. |
| 105 """ | 105 """ |
| 106 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebase( | 106 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebase() |
| 107 self.project.getProjectPath()) | |
| 108 if shouldReopen: | 107 if shouldReopen: |
| 109 res = E5MessageBox.yesNo( | 108 res = E5MessageBox.yesNo( |
| 110 None, | 109 None, |
| 111 self.tr("Rebase Changesets"), | 110 self.tr("Rebase Changesets"), |
| 112 self.tr("""The project should be reread. Do this now?"""), | 111 self.tr("""The project should be reread. Do this now?"""), |
| 116 | 115 |
| 117 def __hgRebaseContinue(self): | 116 def __hgRebaseContinue(self): |
| 118 """ | 117 """ |
| 119 Private slot used to continue the last rebase session after repair. | 118 Private slot used to continue the last rebase session after repair. |
| 120 """ | 119 """ |
| 121 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseContinue( | 120 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseContinue() |
| 122 self.project.getProjectPath()) | |
| 123 if shouldReopen: | 121 if shouldReopen: |
| 124 res = E5MessageBox.yesNo( | 122 res = E5MessageBox.yesNo( |
| 125 None, | 123 None, |
| 126 self.tr("Rebase Changesets (Continue)"), | 124 self.tr("Rebase Changesets (Continue)"), |
| 127 self.tr("""The project should be reread. Do this now?"""), | 125 self.tr("""The project should be reread. Do this now?"""), |
| 131 | 129 |
| 132 def __hgRebaseAbort(self): | 130 def __hgRebaseAbort(self): |
| 133 """ | 131 """ |
| 134 Private slot used to abort the last rebase session. | 132 Private slot used to abort the last rebase session. |
| 135 """ | 133 """ |
| 136 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseAbort( | 134 shouldReopen = self.vcs.getExtensionObject("rebase").hgRebaseAbort() |
| 137 self.project.getProjectPath()) | |
| 138 if shouldReopen: | 135 if shouldReopen: |
| 139 res = E5MessageBox.yesNo( | 136 res = E5MessageBox.yesNo( |
| 140 None, | 137 None, |
| 141 self.tr("Rebase Changesets (Abort)"), | 138 self.tr("Rebase Changesets (Abort)"), |
| 142 self.tr("""The project should be reread. Do this now?"""), | 139 self.tr("""The project should be reread. Do this now?"""), |
