# HG changeset patch # User muxator <a.mux@inwind.it> # Date 1508791524 -7200 # Mon Oct 23 22:45:24 2017 +0200 # Branch stable # Node ID 6a0e1d593bdd630dc726b845f23e971f73a7e34e # Parent 1856de4d12977dbc0cf625b4bcff48bb2332b97a 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" diff --git a/i18n/ja.po b/i18n/ja.po --- a/i18n/ja.po +++ b/i18n/ja.po @@ -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 "リãƒã‚¸ãƒˆãƒªã®æ•´åˆæ€§æ¤œè¨¼" diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po --- a/i18n/pt_BR.po +++ b/i18n/pt_BR.po @@ -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" diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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: diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t --- a/tests/test-update-branches.t +++ b/tests/test-update-branches.t @@ -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