Mercurial > hg-stable

changeset 14849:d87814992728 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: improve help for -y/--noninteractive Before, the help text said that Mercurial would assume 'yes' for all prompts, but this is confusing since many prompts don't have any 'yes' choice. It now more accurately describes what will happen.
author Martin Geisler <mg@aragost.com>
date Thu, 07 Jul 2011 10:32:30 +0200
parents e9264b45237d
children a95242af945c 4731d61cd36b
files mercurial/commands.py tests/test-extension.t tests/test-help.t
diffstat 3 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jul 06 13:43:29 2011 -0500
+++ b/mercurial/commands.py	Thu Jul 07 10:32:30 2011 +0200
@@ -31,7 +31,7 @@
     ('', 'cwd', '',
      _('change working directory'), _('DIR')),
     ('y', 'noninteractive', None,
-     _('do not prompt, assume \'yes\' for any required answers')),
+     _('do not prompt, automatically pick the first choice for all prompts')),
     ('q', 'quiet', None, _('suppress output')),
     ('v', 'verbose', None, _('enable additional output')),
     ('', 'config', [],
--- a/tests/test-extension.t	Wed Jul 06 13:43:29 2011 -0500
+++ b/tests/test-extension.t	Thu Jul 07 10:32:30 2011 +0200
@@ -185,7 +185,8 @@
    -R --repository REPO    repository root directory or name of overlay bundle
                            file
       --cwd DIR            change working directory
-   -y --noninteractive     do not prompt, assume 'yes' for any required answers
+   -y --noninteractive     do not prompt, automatically pick the first choice
+                           for all prompts
    -q --quiet              suppress output
    -v --verbose            enable additional output
       --config CONFIG [+]  set/override config option (use 'section.name=value')
@@ -215,7 +216,8 @@
    -R --repository REPO    repository root directory or name of overlay bundle
                            file
       --cwd DIR            change working directory
-   -y --noninteractive     do not prompt, assume 'yes' for any required answers
+   -y --noninteractive     do not prompt, automatically pick the first choice
+                           for all prompts
    -q --quiet              suppress output
    -v --verbose            enable additional output
       --config CONFIG [+]  set/override config option (use 'section.name=value')
--- a/tests/test-help.t	Wed Jul 06 13:43:29 2011 -0500
+++ b/tests/test-help.t	Thu Jul 07 10:32:30 2011 +0200
@@ -247,7 +247,8 @@
    -R --repository REPO    repository root directory or name of overlay bundle
                            file
       --cwd DIR            change working directory
-   -y --noninteractive     do not prompt, assume 'yes' for any required answers
+   -y --noninteractive     do not prompt, automatically pick the first choice
+                           for all prompts
    -q --quiet              suppress output
    -v --verbose            enable additional output
       --config CONFIG [+]  set/override config option (use 'section.name=value')
@@ -331,8 +332,8 @@
    -R --repository REPO      repository root directory or name of overlay bundle
                              file
       --cwd DIR              change working directory
-   -y --noninteractive       do not prompt, assume 'yes' for any required
-                             answers
+   -y --noninteractive       do not prompt, automatically pick the first choice
+                             for all prompts
    -q --quiet                suppress output
    -v --verbose              enable additional output
       --config CONFIG [+]    set/override config option (use