Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3302
- e92f0dd51979
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 48 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) | 48 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) |
| 49 if dlg.exec_() == QDialog.Accepted: | 49 if dlg.exec_() == QDialog.Accepted: |
| 50 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = \ | 50 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = \ |
| 51 dlg.getData() | 51 dlg.getData() |
| 52 | 52 |
| 53 args = [] | 53 args = self.vcs.initCommand("transplant") |
| 54 args.append("transplant") | |
| 55 args.append("--verbose") | 54 args.append("--verbose") |
| 56 if sourceRepo: | 55 if sourceRepo: |
| 57 args.append("--source") | 56 args.append("--source") |
| 58 args.append(sourceRepo) | 57 args.append(sourceRepo) |
| 59 if branch: | 58 if branch: |
| 69 args.append(mergeRev) | 68 args.append(mergeRev) |
| 70 if log: | 69 if log: |
| 71 args.append("--log") | 70 args.append("--log") |
| 72 args.extend(revs) | 71 args.extend(revs) |
| 73 | 72 |
| 74 dia = HgDialog(self.trUtf8('Transplant Changesets'), self.vcs) | 73 dia = HgDialog(self.tr('Transplant Changesets'), self.vcs) |
| 75 res = dia.startProcess(args, repodir) | 74 res = dia.startProcess(args, repodir) |
| 76 if res: | 75 if res: |
| 77 dia.exec_() | 76 dia.exec_() |
| 78 res = dia.hasAddOrDelete() | 77 res = dia.hasAddOrDelete() |
| 79 self.vcs.checkVCSStatus() | 78 self.vcs.checkVCSStatus() |
| 91 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): | 90 while not os.path.isdir(os.path.join(repodir, self.vcs.adminDir)): |
| 92 repodir = os.path.dirname(repodir) | 91 repodir = os.path.dirname(repodir) |
| 93 if os.path.splitdrive(repodir)[1] == os.sep: | 92 if os.path.splitdrive(repodir)[1] == os.sep: |
| 94 return | 93 return |
| 95 | 94 |
| 96 args = [] | 95 args = self.vcs.initCommand("transplant") |
| 97 args.append("transplant") | |
| 98 args.append("--continue") | 96 args.append("--continue") |
| 99 args.append("--verbose") | 97 args.append("--verbose") |
| 100 | 98 |
| 101 dia = HgDialog( | 99 dia = HgDialog( |
| 102 self.trUtf8('Transplant Changesets (Continue)'), self.vcs) | 100 self.tr('Transplant Changesets (Continue)'), self.vcs) |
| 103 res = dia.startProcess(args, repodir) | 101 res = dia.startProcess(args, repodir) |
| 104 if res: | 102 if res: |
| 105 dia.exec_() | 103 dia.exec_() |
| 106 res = dia.hasAddOrDelete() | 104 res = dia.hasAddOrDelete() |
| 107 self.vcs.checkVCSStatus() | 105 self.vcs.checkVCSStatus() |
