Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
- changeset 3008
- 7848489bcb92
- parent 2405
- d4b5f3bd4720
- child 3057
- 10516539f238
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3007:bad2e89047e7 | 3008:7848489bcb92 |
|---|---|
| 43 | 43 |
| 44 from .TransplantDialog import TransplantDialog | 44 from .TransplantDialog import TransplantDialog |
| 45 res = False | 45 res = False |
| 46 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) | 46 dlg = TransplantDialog(self.vcs.hgGetBranchesList(repodir)) |
| 47 if dlg.exec_() == QDialog.Accepted: | 47 if dlg.exec_() == QDialog.Accepted: |
| 48 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = dlg.getData() | 48 revs, sourceRepo, branch, all, pruneRevs, mergeRevs, log = \ |
| 49 dlg.getData() | |
| 49 | 50 |
| 50 args = [] | 51 args = [] |
| 51 args.append("transplant") | 52 args.append("transplant") |
| 52 args.append("--verbose") | 53 args.append("--verbose") |
| 53 if sourceRepo: | 54 if sourceRepo: |
| 93 args = [] | 94 args = [] |
| 94 args.append("transplant") | 95 args.append("transplant") |
| 95 args.append("--continue") | 96 args.append("--continue") |
| 96 args.append("--verbose") | 97 args.append("--verbose") |
| 97 | 98 |
| 98 dia = HgDialog(self.trUtf8('Transplant Changesets (Continue)'), self.vcs) | 99 dia = HgDialog( |
| 100 self.trUtf8('Transplant Changesets (Continue)'), self.vcs) | |
| 99 res = dia.startProcess(args, repodir) | 101 res = dia.startProcess(args, repodir) |
| 100 if res: | 102 if res: |
| 101 dia.exec_() | 103 dia.exec_() |
| 102 res = dia.hasAddOrDelete() | 104 res = dia.hasAddOrDelete() |
| 103 self.vcs.checkVCSStatus() | 105 self.vcs.checkVCSStatus() |
