Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3302
- e92f0dd51979
- child 3562
- ef3f13a2c599
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 56 bookmarksList) | 56 bookmarksList) |
| 57 if dlg.exec_() == QDialog.Accepted: | 57 if dlg.exec_() == QDialog.Accepted: |
| 58 (indicator, sourceRev, destRev, collapse, keep, keepBranches, | 58 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 59 detach) = dlg.getData() | 59 detach) = dlg.getData() |
| 60 | 60 |
| 61 args = [] | 61 args = self.vcs.initCommand("rebase") |
| 62 args.append("rebase") | |
| 63 if indicator == "S": | 62 if indicator == "S": |
| 64 args.append("--source") | 63 args.append("--source") |
| 65 args.append(sourceRev) | 64 args.append(sourceRev) |
| 66 elif indicator == "B": | 65 elif indicator == "B": |
| 67 args.append("--base") | 66 args.append("--base") |
| 77 args.append("--keepbranches") | 76 args.append("--keepbranches") |
| 78 if detach: | 77 if detach: |
| 79 args.append("--detach") | 78 args.append("--detach") |
| 80 args.append("--verbose") | 79 args.append("--verbose") |
| 81 | 80 |
| 82 dia = HgDialog(self.trUtf8('Rebase Changesets'), self.vcs) | 81 dia = HgDialog(self.tr('Rebase Changesets'), self.vcs) |
| 83 res = dia.startProcess(args, repodir) | 82 res = dia.startProcess(args, repodir) |
| 84 if res: | 83 if res: |
| 85 dia.exec_() | 84 dia.exec_() |
| 86 res = dia.hasAddOrDelete() | 85 res = dia.hasAddOrDelete() |
| 87 self.vcs.checkVCSStatus() | 86 self.vcs.checkVCSStatus() |
| 99 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 98 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 100 repodir = os.path.dirname(repodir) | 99 repodir = os.path.dirname(repodir) |
| 101 if os.path.splitdrive(repodir)[1] == os.sep: | 100 if os.path.splitdrive(repodir)[1] == os.sep: |
| 102 return False | 101 return False |
| 103 | 102 |
| 104 args = [] | 103 args = self.vcs.initCommand("rebase") |
| 105 args.append("rebase") | |
| 106 args.append("--continue") | 104 args.append("--continue") |
| 107 args.append("--verbose") | 105 args.append("--verbose") |
| 108 | 106 |
| 109 dia = HgDialog(self.trUtf8('Rebase Changesets (Continue)'), self.vcs) | 107 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) |
| 110 res = dia.startProcess(args, repodir) | 108 res = dia.startProcess(args, repodir) |
| 111 if res: | 109 if res: |
| 112 dia.exec_() | 110 dia.exec_() |
| 113 res = dia.hasAddOrDelete() | 111 res = dia.hasAddOrDelete() |
| 114 self.vcs.checkVCSStatus() | 112 self.vcs.checkVCSStatus() |
| 126 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 124 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 127 repodir = os.path.dirname(repodir) | 125 repodir = os.path.dirname(repodir) |
| 128 if os.path.splitdrive(repodir)[1] == os.sep: | 126 if os.path.splitdrive(repodir)[1] == os.sep: |
| 129 return False | 127 return False |
| 130 | 128 |
| 131 args = [] | 129 args = self.vcs.initCommand("rebase") |
| 132 args.append("rebase") | |
| 133 args.append("--abort") | 130 args.append("--abort") |
| 134 args.append("--verbose") | 131 args.append("--verbose") |
| 135 | 132 |
| 136 dia = HgDialog(self.trUtf8('Rebase Changesets (Abort)'), self.vcs) | 133 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) |
| 137 res = dia.startProcess(args, repodir) | 134 res = dia.startProcess(args, repodir) |
| 138 if res: | 135 if res: |
| 139 dia.exec_() | 136 dia.exec_() |
| 140 res = dia.hasAddOrDelete() | 137 res = dia.hasAddOrDelete() |
| 141 self.vcs.checkVCSStatus() | 138 self.vcs.checkVCSStatus() |
