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"
--- a/i18n/ja.po Wed Oct 04 23:22:34 2017 +0200
+++ b/i18n/ja.po Mon Oct 23 22:45:24 2017 +0200
@@ -16535,8 +16535,8 @@
msgid "for example: hg update \".::\""
msgstr "指定例: hg update \".::\""
-msgid "can only specify one of -C/--clean, -c/--check, or -m/merge"
-msgstr "-C/--clean, -c/--check および -m/merge は複数指定できません"
+msgid "can only specify one of -C/--clean, -c/--check, or -m/--merge"
+msgstr "-C/--clean, -c/--check および -m/--merge は複数指定できません"
msgid "verify the integrity of the repository"
msgstr "リポジトリの整合性検証"
--- a/i18n/pt_BR.po Wed Oct 04 23:22:34 2017 +0200
+++ b/i18n/pt_BR.po Mon Oct 23 22:45:24 2017 +0200
@@ -18293,9 +18293,9 @@
msgid "for example: hg update \".::\""
msgstr "por exemplo: hg update \".::\""
-msgid "can only specify one of -C/--clean, -c/--check, or -m/merge"
-msgstr ""
-"só se pode especificar uma opção dentre -C/--clean, -c/--check ou -m/merge"
+msgid "can only specify one of -C/--clean, -c/--check, or -m/--merge"
+msgstr ""
+"só se pode especificar uma opção dentre -C/--clean, -c/--check ou -m/--merge"
msgid "verify the integrity of the repository"
msgstr "verifica a integridade do repositório"
--- a/mercurial/commands.py Wed Oct 04 23:22:34 2017 +0200
+++ b/mercurial/commands.py Mon Oct 23 22:45:24 2017 +0200
@@ -5489,7 +5489,7 @@
if len([x for x in (clean, check, merge) if x]) > 1:
raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
- "or -m/merge"))
+ "or -m/--merge"))
updatecheck = None
if check:
--- a/tests/test-update-branches.t Wed Oct 04 23:22:34 2017 +0200
+++ b/tests/test-update-branches.t Mon Oct 23 22:45:24 2017 +0200
@@ -184,17 +184,17 @@
parent=2
$ revtest '-cC dirty linear' dirty 1 2 -cC
- abort: can only specify one of -C/--clean, -c/--check, or -m/merge
+ abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
parent=1
M foo
$ revtest '-mc dirty linear' dirty 1 2 -mc
- abort: can only specify one of -C/--clean, -c/--check, or -m/merge
+ abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
parent=1
M foo
$ revtest '-mC dirty linear' dirty 1 2 -mC
- abort: can only specify one of -C/--clean, -c/--check, or -m/merge
+ abort: can only specify one of -C/--clean, -c/--check, or -m/--merge
parent=1
M foo