Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 7759
- 51aa6c6b66f7
- parent 7360
- 9190402e4505
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 46 from .HgRebaseDialog import HgRebaseDialog | 46 from .HgRebaseDialog import HgRebaseDialog |
| 47 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), | 47 dlg = HgRebaseDialog(self.vcs.hgGetTagsList(repodir), |
| 48 self.vcs.hgGetBranchesList(repodir), | 48 self.vcs.hgGetBranchesList(repodir), |
| 49 self.vcs.hgGetBookmarksList(repodir), | 49 self.vcs.hgGetBookmarksList(repodir), |
| 50 self.vcs.version) | 50 self.vcs.version) |
| 51 if dlg.exec_() == QDialog.Accepted: | 51 if dlg.exec() == QDialog.Accepted: |
| 52 (indicator, sourceRev, destRev, collapse, keep, keepBranches, | 52 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 53 detach, dryRunOnly, dryRunConfirm) = dlg.getData() | 53 detach, dryRunOnly, dryRunConfirm) = dlg.getData() |
| 54 | 54 |
| 55 args = self.vcs.initCommand("rebase") | 55 args = self.vcs.initCommand("rebase") |
| 56 if indicator == "S": | 56 if indicator == "S": |
| 77 args.append("--verbose") | 77 args.append("--verbose") |
| 78 | 78 |
| 79 dia = HgDialog(self.tr('Rebase Changesets'), self.vcs) | 79 dia = HgDialog(self.tr('Rebase Changesets'), self.vcs) |
| 80 res = dia.startProcess(args, repodir) | 80 res = dia.startProcess(args, repodir) |
| 81 if res: | 81 if res: |
| 82 dia.exec_() | 82 dia.exec() |
| 83 res = dia.hasAddOrDelete() | 83 res = dia.hasAddOrDelete() |
| 84 self.vcs.checkVCSStatus() | 84 self.vcs.checkVCSStatus() |
| 85 return res | 85 return res |
| 86 | 86 |
| 87 def hgRebaseContinue(self, path): | 87 def hgRebaseContinue(self, path): |
| 103 args.append("--verbose") | 103 args.append("--verbose") |
| 104 | 104 |
| 105 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) | 105 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) |
| 106 res = dia.startProcess(args, repodir) | 106 res = dia.startProcess(args, repodir) |
| 107 if res: | 107 if res: |
| 108 dia.exec_() | 108 dia.exec() |
| 109 res = dia.hasAddOrDelete() | 109 res = dia.hasAddOrDelete() |
| 110 self.vcs.checkVCSStatus() | 110 self.vcs.checkVCSStatus() |
| 111 return res | 111 return res |
| 112 | 112 |
| 113 def hgRebaseAbort(self, path): | 113 def hgRebaseAbort(self, path): |
| 129 args.append("--verbose") | 129 args.append("--verbose") |
| 130 | 130 |
| 131 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) | 131 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) |
| 132 res = dia.startProcess(args, repodir) | 132 res = dia.startProcess(args, repodir) |
| 133 if res: | 133 if res: |
| 134 dia.exec_() | 134 dia.exec() |
| 135 res = dia.hasAddOrDelete() | 135 res = dia.hasAddOrDelete() |
| 136 self.vcs.checkVCSStatus() | 136 self.vcs.checkVCSStatus() |
| 137 return res | 137 return res |
