Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 44438:1e508097f570
update: simplify slightly
Differential Revision: https://phab.mercurial-scm.org/D8204
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Mon, 02 Mar 2020 15:34:51 -0500 |
| parents | ddbc296a1f48 |
| children | 2f290136b7d6 |
comparison
equal
deleted
inserted
replaced
| 44437:c85d5fd1a5d9 | 44438:1e508097f570 |
|---|---|
| 7663 | 7663 |
| 7664 See :hg:`help dates` for a list of formats valid for -d/--date. | 7664 See :hg:`help dates` for a list of formats valid for -d/--date. |
| 7665 | 7665 |
| 7666 Returns 0 on success, 1 if there are unresolved files. | 7666 Returns 0 on success, 1 if there are unresolved files. |
| 7667 """ | 7667 """ |
| 7668 cmdutil.check_at_most_one_arg(opts, b'clean', b'check', b'merge') | |
| 7668 rev = opts.get('rev') | 7669 rev = opts.get('rev') |
| 7669 date = opts.get('date') | 7670 date = opts.get('date') |
| 7670 clean = opts.get('clean') | 7671 clean = opts.get('clean') |
| 7671 check = opts.get('check') | 7672 check = opts.get('check') |
| 7672 merge = opts.get('merge') | 7673 merge = opts.get('merge') |
| 7683 if rev is None or rev == b'': | 7684 if rev is None or rev == b'': |
| 7684 rev = node | 7685 rev = node |
| 7685 | 7686 |
| 7686 if date and rev is not None: | 7687 if date and rev is not None: |
| 7687 raise error.Abort(_(b"you can't specify a revision and a date")) | 7688 raise error.Abort(_(b"you can't specify a revision and a date")) |
| 7688 | |
| 7689 if len([x for x in (clean, check, merge) if x]) > 1: | |
| 7690 raise error.Abort( | |
| 7691 _( | |
| 7692 b"can only specify one of -C/--clean, -c/--check, " | |
| 7693 b"or -m/--merge" | |
| 7694 ) | |
| 7695 ) | |
| 7696 | 7689 |
| 7697 updatecheck = None | 7690 updatecheck = None |
| 7698 if check: | 7691 if check: |
| 7699 updatecheck = b'abort' | 7692 updatecheck = b'abort' |
| 7700 elif merge: | 7693 elif merge: |