Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMartin Geisler <mg@aragost.com>
Thu, 07 Jul 2011 10:34:19 +0200
changeset 14853 4731d61cd36b
parent 14852 cac04f2f475b (current diff)
parent 14849 d87814992728 (diff)
child 14854 23c2d7d25329
merge with stable
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Jul 07 10:19:37 2011 +0200
+++ b/mercurial/commands.py	Thu Jul 07 10:34:19 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	Thu Jul 07 10:19:37 2011 +0200
+++ b/tests/test-extension.t	Thu Jul 07 10:34:19 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	Thu Jul 07 10:19:37 2011 +0200
+++ b/tests/test-help.t	Thu Jul 07 10:34:19 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
mercurial