Mercurial > hg
comparison hgext/transplant.py @ 43903:d50b4ad1d4a5
transplant: use check_incompatible_arguments()
Differential Revision: https://phab.mercurial-scm.org/D7663
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 13 Dec 2019 14:12:14 -0800 |
| parents | 96edd0c38740 |
| children | d4c1501225c4 |
comparison
equal
deleted
inserted
replaced
| 43902:e623ad1b4800 | 43903:d50b4ad1d4a5 |
|---|---|
| 758 if match(node): | 758 if match(node): |
| 759 yield node | 759 yield node |
| 760 | 760 |
| 761 def checkopts(opts, revs): | 761 def checkopts(opts, revs): |
| 762 if opts.get(b'continue'): | 762 if opts.get(b'continue'): |
| 763 if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): | 763 cmdutil.check_incompatible_arguments( |
| 764 raise error.Abort( | 764 opts, b'continue', b'branch', b'all', b'merge' |
| 765 _( | 765 ) |
| 766 b'--continue is incompatible with ' | |
| 767 b'--branch, --all and --merge' | |
| 768 ) | |
| 769 ) | |
| 770 return | 766 return |
| 771 if opts.get(b'stop'): | 767 if opts.get(b'stop'): |
| 772 if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): | 768 cmdutil.check_incompatible_arguments( |
| 773 raise error.Abort( | 769 opts, b'stop', b'branch', b'all', b'merge' |
| 774 _( | 770 ) |
| 775 b'--stop is incompatible with ' | |
| 776 b'--branch, --all and --merge' | |
| 777 ) | |
| 778 ) | |
| 779 return | 771 return |
| 780 if not ( | 772 if not ( |
| 781 opts.get(b'source') | 773 opts.get(b'source') |
| 782 or revs | 774 or revs |
| 783 or opts.get(b'merge') | 775 or opts.get(b'merge') |