Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3302
- e92f0dd51979
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 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'), self.vcs) | 72 dia = HgDialog(self.tr('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() |
| 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( | 99 dia = HgDialog( |
| 100 self.trUtf8('Transplant Changesets (Continue)'), self.vcs) | 100 self.tr('Transplant Changesets (Continue)'), self.vcs) |
| 101 res = dia.startProcess(args, repodir) | 101 res = dia.startProcess(args, repodir) |
| 102 if res: | 102 if res: |
| 103 dia.exec_() | 103 dia.exec_() |
| 104 res = dia.hasAddOrDelete() | 104 res = dia.hasAddOrDelete() |
| 105 self.vcs.checkVCSStatus() | 105 self.vcs.checkVCSStatus() |
