Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 34920:6a0e1d593bdd stable
commands: be more uniform in an "hg update" error message
"can only specify one of -C/--clean, -c/--check, or -m/merge"
becomes
"can only specify one of -C/--clean, -c/--check, or -m/--merge"
| author | muxator <a.mux@inwind.it> |
|---|---|
| date | Mon, 23 Oct 2017 22:45:24 +0200 |
| parents | 2e45bbd3db7b |
| children | a74befa25ade |
comparison
equal
deleted
inserted
replaced
| 34919:1856de4d1297 | 34920:6a0e1d593bdd |
|---|---|
| 5487 if date and rev is not None: | 5487 if date and rev is not None: |
| 5488 raise error.Abort(_("you can't specify a revision and a date")) | 5488 raise error.Abort(_("you can't specify a revision and a date")) |
| 5489 | 5489 |
| 5490 if len([x for x in (clean, check, merge) if x]) > 1: | 5490 if len([x for x in (clean, check, merge) if x]) > 1: |
| 5491 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " | 5491 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
| 5492 "or -m/merge")) | 5492 "or -m/--merge")) |
| 5493 | 5493 |
| 5494 updatecheck = None | 5494 updatecheck = None |
| 5495 if check: | 5495 if check: |
| 5496 updatecheck = 'abort' | 5496 updatecheck = 'abort' |
| 5497 elif merge: | 5497 elif merge: |