Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 8143
- 2c730d5fd177
- parent 7971
- ff2971513d6d
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 35 from .HgRebaseDialog import HgRebaseDialog | 35 from .HgRebaseDialog import HgRebaseDialog |
| 36 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(), | 36 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(), |
| 37 self.vcs.hgGetBranchesList(), | 37 self.vcs.hgGetBranchesList(), |
| 38 self.vcs.hgGetBookmarksList(), | 38 self.vcs.hgGetBookmarksList(), |
| 39 self.vcs.version) | 39 self.vcs.version) |
| 40 if dlg.exec() == QDialog.Accepted: | 40 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 41 (indicator, sourceRev, destRev, collapse, keep, keepBranches, | 41 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 42 detach, dryRunOnly, dryRunConfirm) = dlg.getData() | 42 detach, dryRunOnly, dryRunConfirm) = dlg.getData() |
| 43 | 43 |
| 44 args = self.vcs.initCommand("rebase") | 44 args = self.vcs.initCommand("rebase") |
| 45 if indicator == "S": | 45 if indicator == "S": |
