Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py
- changeset 3302
- e92f0dd51979
- parent 3190
- a9a94491c4fd
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3300:734353e7d679 | 3302:e92f0dd51979 |
|---|---|
| 54 bookmarksList) | 54 bookmarksList) |
| 55 if dlg.exec_() == QDialog.Accepted: | 55 if dlg.exec_() == QDialog.Accepted: |
| 56 (indicator, sourceRev, destRev, collapse, keep, keepBranches, | 56 (indicator, sourceRev, destRev, collapse, keep, keepBranches, |
| 57 detach) = dlg.getData() | 57 detach) = dlg.getData() |
| 58 | 58 |
| 59 args = [] | 59 args = self.vcs.initCommand("rebase") |
| 60 args.append("rebase") | |
| 61 if indicator == "S": | 60 if indicator == "S": |
| 62 args.append("--source") | 61 args.append("--source") |
| 63 args.append(sourceRev) | 62 args.append(sourceRev) |
| 64 elif indicator == "B": | 63 elif indicator == "B": |
| 65 args.append("--base") | 64 args.append("--base") |
| 97 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 96 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 98 repodir = os.path.dirname(repodir) | 97 repodir = os.path.dirname(repodir) |
| 99 if os.path.splitdrive(repodir)[1] == os.sep: | 98 if os.path.splitdrive(repodir)[1] == os.sep: |
| 100 return False | 99 return False |
| 101 | 100 |
| 102 args = [] | 101 args = self.vcs.initCommand("rebase") |
| 103 args.append("rebase") | |
| 104 args.append("--continue") | 102 args.append("--continue") |
| 105 args.append("--verbose") | 103 args.append("--verbose") |
| 106 | 104 |
| 107 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) | 105 dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) |
| 108 res = dia.startProcess(args, repodir) | 106 res = dia.startProcess(args, repodir) |
| 124 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 122 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 125 repodir = os.path.dirname(repodir) | 123 repodir = os.path.dirname(repodir) |
| 126 if os.path.splitdrive(repodir)[1] == os.sep: | 124 if os.path.splitdrive(repodir)[1] == os.sep: |
| 127 return False | 125 return False |
| 128 | 126 |
| 129 args = [] | 127 args = self.vcs.initCommand("rebase") |
| 130 args.append("rebase") | |
| 131 args.append("--abort") | 128 args.append("--abort") |
| 132 args.append("--verbose") | 129 args.append("--verbose") |
| 133 | 130 |
| 134 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) | 131 dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) |
| 135 res = dia.startProcess(args, repodir) | 132 res = dia.startProcess(args, repodir) |
