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 11006
- a671918232f3
- parent 10439
- 21c28b0f9e41
- child 11090
- f5f5f5803935
equal
deleted
inserted
replaced
| 11005:b918c6c2736b | 11006:a671918232f3 |
|---|---|
| 16 class Rebase(HgExtension): | 16 class Rebase(HgExtension): |
| 17 """ | 17 """ |
| 18 Class implementing the rebase extension interface. | 18 Class implementing the rebase extension interface. |
| 19 """ | 19 """ |
| 20 | 20 |
| 21 def __init__(self, vcs): | 21 def __init__(self, vcs, ui=None): |
| 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 @type Hg |
| 27 @param ui reference to a UI widget (defaults to None) | |
| 28 @type QWidget | |
| 27 """ | 29 """ |
| 28 super().__init__(vcs) | 30 super().__init__(vcs, ui=ui) |
| 29 | 31 |
| 30 def hgRebase(self): | 32 def hgRebase(self): |
| 31 """ | 33 """ |
| 32 Public method to rebase changesets to a different branch. | 34 Public method to rebase changesets to a different branch. |
| 33 | 35 |
| 40 dlg = HgRebaseDialog( | 42 dlg = HgRebaseDialog( |
| 41 self.vcs.hgGetTagsList(), | 43 self.vcs.hgGetTagsList(), |
| 42 self.vcs.hgGetBranchesList(), | 44 self.vcs.hgGetBranchesList(), |
| 43 self.vcs.hgGetBookmarksList(), | 45 self.vcs.hgGetBookmarksList(), |
| 44 self.vcs.version, | 46 self.vcs.version, |
| 47 parent=self.ui, | |
| 45 ) | 48 ) |
| 46 if dlg.exec() == QDialog.DialogCode.Accepted: | 49 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 47 ( | 50 ( |
| 48 indicator, | 51 indicator, |
| 49 sourceRev, | 52 sourceRev, |
| 78 args.append("--dry-run") | 81 args.append("--dry-run") |
| 79 elif dryRunConfirm: | 82 elif dryRunConfirm: |
| 80 args.append("--confirm") | 83 args.append("--confirm") |
| 81 args.append("--verbose") | 84 args.append("--verbose") |
| 82 | 85 |
| 83 dia = HgDialog(self.tr("Rebase Changesets"), self.vcs) | 86 dia = HgDialog(self.tr("Rebase Changesets"), hg=self.vcs, parent=self.ui) |
| 84 res = dia.startProcess(args) | 87 res = dia.startProcess(args) |
| 85 if res: | 88 if res: |
| 86 dia.exec() | 89 dia.exec() |
| 87 res = dia.hasAddOrDelete() | 90 res = dia.hasAddOrDelete() |
| 88 self.vcs.checkVCSStatus() | 91 self.vcs.checkVCSStatus() |
| 97 """ | 100 """ |
| 98 args = self.vcs.initCommand("rebase") | 101 args = self.vcs.initCommand("rebase") |
| 99 args.append("--continue") | 102 args.append("--continue") |
| 100 args.append("--verbose") | 103 args.append("--verbose") |
| 101 | 104 |
| 102 dia = HgDialog(self.tr("Rebase Changesets (Continue)"), self.vcs) | 105 dia = HgDialog( |
| 106 self.tr("Rebase Changesets (Continue)"), hg=self.vcs, parent=self.ui | |
| 107 ) | |
| 103 res = dia.startProcess(args) | 108 res = dia.startProcess(args) |
| 104 if res: | 109 if res: |
| 105 dia.exec() | 110 dia.exec() |
| 106 res = dia.hasAddOrDelete() | 111 res = dia.hasAddOrDelete() |
| 107 self.vcs.checkVCSStatus() | 112 self.vcs.checkVCSStatus() |
| 116 """ | 121 """ |
| 117 args = self.vcs.initCommand("rebase") | 122 args = self.vcs.initCommand("rebase") |
| 118 args.append("--abort") | 123 args.append("--abort") |
| 119 args.append("--verbose") | 124 args.append("--verbose") |
| 120 | 125 |
| 121 dia = HgDialog(self.tr("Rebase Changesets (Abort)"), self.vcs) | 126 dia = HgDialog( |
| 127 self.tr("Rebase Changesets (Abort)"), hg=self.vcs, parent=self.ui | |
| 128 ) | |
| 122 res = dia.startProcess(args) | 129 res = dia.startProcess(args) |
| 123 if res: | 130 if res: |
| 124 dia.exec() | 131 dia.exec() |
| 125 res = dia.hasAddOrDelete() | 132 res = dia.hasAddOrDelete() |
| 126 self.vcs.checkVCSStatus() | 133 self.vcs.checkVCSStatus() |
