Mercurial > hg-stable
comparison hgext/transplant.py @ 27322:84e85f461b79
transplant: use Oxford comma
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Mon, 30 Nov 2015 19:28:26 +0000 |
| parents | ee33e677f0ac |
| children | 43c00ca887d1 |
comparison
equal
deleted
inserted
replaced
| 27321:dcdf0a52ad36 | 27322:84e85f461b79 |
|---|---|
| 605 raise error.Abort(_('--continue is incompatible with ' | 605 raise error.Abort(_('--continue is incompatible with ' |
| 606 '--branch, --all and --merge')) | 606 '--branch, --all and --merge')) |
| 607 return | 607 return |
| 608 if not (opts.get('source') or revs or | 608 if not (opts.get('source') or revs or |
| 609 opts.get('merge') or opts.get('branch')): | 609 opts.get('merge') or opts.get('branch')): |
| 610 raise error.Abort(_('no source URL, branch revision or revision ' | 610 raise error.Abort(_('no source URL, branch revision, or revision ' |
| 611 'list provided')) | 611 'list provided')) |
| 612 if opts.get('all'): | 612 if opts.get('all'): |
| 613 if not opts.get('branch'): | 613 if not opts.get('branch'): |
| 614 raise error.Abort(_('--all requires a branch revision')) | 614 raise error.Abort(_('--all requires a branch revision')) |
| 615 if revs: | 615 if revs: |