Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
- changeset 1249
- 77f836a883c1
- parent 1093
- 47bc4ef30315
- child 1318
- 6fa303bd65d6
equal
deleted
inserted
replaced
| 1248:7d0eff6435a9 | 1249:77f836a883c1 |
|---|---|
| 67 args.append(mergeRev) | 67 args.append(mergeRev) |
| 68 if log: | 68 if log: |
| 69 args.append("--log") | 69 args.append("--log") |
| 70 args.extend(revs) | 70 args.extend(revs) |
| 71 | 71 |
| 72 dia = HgDialog(self.trUtf8('Transplant Changesets')) | 72 dia = HgDialog(self.trUtf8('Transplant Changesets'), self.vcs) |
| 73 res = dia.startProcess(args, repodir) | 73 res = dia.startProcess(args, repodir) |
| 74 if res: | 74 if res: |
| 75 dia.exec_() | 75 dia.exec_() |
| 76 res = dia.hasAddOrDelete() | 76 res = dia.hasAddOrDelete() |
| 77 self.vcs.checkVCSStatus() | 77 self.vcs.checkVCSStatus() |
| 94 args = [] | 94 args = [] |
| 95 args.append("transplant") | 95 args.append("transplant") |
| 96 args.append("--continue") | 96 args.append("--continue") |
| 97 args.append("--verbose") | 97 args.append("--verbose") |
| 98 | 98 |
| 99 dia = HgDialog(self.trUtf8('Transplant Changesets (Continue)')) | 99 dia = HgDialog(self.trUtf8('Transplant Changesets (Continue)'), self.vcs) |
| 100 res = dia.startProcess(args, repodir) | 100 res = dia.startProcess(args, repodir) |
| 101 if res: | 101 if res: |
| 102 dia.exec_() | 102 dia.exec_() |
| 103 res = dia.hasAddOrDelete() | 103 res = dia.hasAddOrDelete() |
| 104 self.vcs.checkVCSStatus() | 104 self.vcs.checkVCSStatus() |
