Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9653
- e67609152c5e
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 21 def __init__(self, vcs): | 21 def __init__(self, vcs): |
| 22 """ | 22 """ |
| 23 Constructor | 23 Constructor |
| 24 | 24 |
| 25 @param vcs reference to the Mercurial vcs object | 25 @param vcs reference to the Mercurial vcs object |
| 26 @type Hg | |
| 26 """ | 27 """ |
| 27 super().__init__(vcs) | 28 super().__init__(vcs) |
| 28 | 29 |
| 29 def hgRebase(self): | 30 def hgRebase(self): |
| 30 """ | 31 """ |
| 31 Public method to rebase changesets to a different branch. | 32 Public method to rebase changesets to a different branch. |
| 32 | 33 |
| 33 @return flag indicating that the project should be reread (boolean) | 34 @return flag indicating that the project should be reread |
| 35 @rtype bool | |
| 34 """ | 36 """ |
| 35 from .HgRebaseDialog import HgRebaseDialog | 37 from .HgRebaseDialog import HgRebaseDialog |
| 36 | 38 |
| 37 res = False | 39 res = False |
| 38 dlg = HgRebaseDialog( | 40 dlg = HgRebaseDialog( |
| 88 | 90 |
| 89 def hgRebaseContinue(self): | 91 def hgRebaseContinue(self): |
| 90 """ | 92 """ |
| 91 Public method to continue rebasing changesets from another branch. | 93 Public method to continue rebasing changesets from another branch. |
| 92 | 94 |
| 93 @return flag indicating that the project should be reread (boolean) | 95 @return flag indicating that the project should be reread |
| 96 @rtype bool | |
| 94 """ | 97 """ |
| 95 args = self.vcs.initCommand("rebase") | 98 args = self.vcs.initCommand("rebase") |
| 96 args.append("--continue") | 99 args.append("--continue") |
| 97 args.append("--verbose") | 100 args.append("--verbose") |
| 98 | 101 |
| 106 | 109 |
| 107 def hgRebaseAbort(self): | 110 def hgRebaseAbort(self): |
| 108 """ | 111 """ |
| 109 Public method to abort rebasing changesets from another branch. | 112 Public method to abort rebasing changesets from another branch. |
| 110 | 113 |
| 111 @return flag indicating that the project should be reread (boolean) | 114 @return flag indicating that the project should be reread |
| 115 @rtype bool | |
| 112 """ | 116 """ |
| 113 args = self.vcs.initCommand("rebase") | 117 args = self.vcs.initCommand("rebase") |
| 114 args.append("--abort") | 118 args.append("--abort") |
| 115 args.append("--verbose") | 119 args.append("--verbose") |
| 116 | 120 |
