Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 6460
- af9e529d0fb6
- parent 6458
- 97480c872ea9
- child 6461
- 48bf6c3f084f
equal
deleted
inserted
replaced
| 6459:68c13732795b | 6460:af9e529d0fb6 |
|---|---|
| 2998 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 2998 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 2999 repodir = os.path.dirname(repodir) | 2999 repodir = os.path.dirname(repodir) |
| 3000 if os.path.splitdrive(repodir)[1] == os.sep: | 3000 if os.path.splitdrive(repodir)[1] == os.sep: |
| 3001 return False | 3001 return False |
| 3002 | 3002 |
| 3003 # TODO: Mercurial 4.7: add support for the --no-commit flag | |
| 3004 from .HgGraftDialog import HgGraftDialog | 3003 from .HgGraftDialog import HgGraftDialog |
| 3005 res = False | 3004 res = False |
| 3006 dlg = HgGraftDialog(self, revs) | 3005 dlg = HgGraftDialog(self, revs) |
| 3007 if dlg.exec_() == QDialog.Accepted: | 3006 if dlg.exec_() == QDialog.Accepted: |
| 3008 revs, (userData, currentUser, userName), \ | 3007 revs, (userData, currentUser, userName), \ |
| 3009 (dateData, currentDate, dateStr), log, dryrun = dlg.getData() | 3008 (dateData, currentDate, dateStr), log, dryrun, \ |
| 3009 noCommit = dlg.getData() | |
| 3010 | 3010 |
| 3011 args = self.initCommand("graft") | 3011 args = self.initCommand("graft") |
| 3012 args.append("--verbose") | 3012 args.append("--verbose") |
| 3013 if userData: | 3013 if userData: |
| 3014 if currentUser: | 3014 if currentUser: |
| 3024 args.append(dateStr) | 3024 args.append(dateStr) |
| 3025 if log: | 3025 if log: |
| 3026 args.append("--log") | 3026 args.append("--log") |
| 3027 if dryrun: | 3027 if dryrun: |
| 3028 args.append("--dry-run") | 3028 args.append("--dry-run") |
| 3029 if noCommit: | |
| 3030 args.append("--no-commit") | |
| 3029 args.extend(revs) | 3031 args.extend(revs) |
| 3030 | 3032 |
| 3031 dia = HgDialog(self.tr('Copy Changesets'), self) | 3033 dia = HgDialog(self.tr('Copy Changesets'), self) |
| 3032 res = dia.startProcess(args, repodir) | 3034 res = dia.startProcess(args, repodir) |
| 3033 if res: | 3035 if res: |
