# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1310027550 -7200
# Node ID d87814992728fd1720872894f5350f39b5011c2c
# Parent  e9264b45237d94ca0953daac9333444bfa40ce5c
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.

diff -r e9264b45237d -r d87814992728 mercurial/commands.py
--- 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', [],
diff -r e9264b45237d -r d87814992728 tests/test-extension.t
--- 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')
diff -r e9264b45237d -r d87814992728 tests/test-help.t
--- 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