Mercurial > hg-stable
changeset 32190:4fadea09feca
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 04 May 2017 00:26:55 -0400 |
| parents | f238a483a1fd (current diff) 40785ccab410 (diff) |
| children | d90ffee93df6 |
| files | |
| diffstat | 9 files changed, 25 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/bundlespec.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/bundlespec.txt Thu May 04 00:26:55 2017 -0400 @@ -24,7 +24,7 @@ The literal bundle format string is used. <compression>-<type> - The compression engine and format are delimited by a hypthen (``-``). + The compression engine and format are delimited by a hyphen (``-``). Optional parameters follow the ``<type>``. Parameters are URI escaped ``key=value`` pairs. Each pair is delimited by a semicolon (``;``). The
--- a/mercurial/help/color.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/color.txt Thu May 04 00:26:55 2017 -0400 @@ -17,6 +17,13 @@ See :hg:`help config.ui.color` for details. +.. container:: windows + + The default pager on Windows does not support color, so enabling the pager + will effectively disable color. See :hg:`help config.ui.paginate` to disable + the pager. Alternately, MSYS and Cygwin shells provide `less` as a pager, + which can be configured to support ANSI color mode. + Mode ====
--- a/mercurial/help/config.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/config.txt Thu May 04 00:26:55 2017 -0400 @@ -419,7 +419,7 @@ terminal. Any invalid value will disable color. ``pagermode`` - String: optinal override of ``color.mode`` used with pager. + String: optional override of ``color.mode`` used with pager. On some systems, terminfo mode may cause problems when using color with ``less -R`` as a pager program. less with the -R option
--- a/mercurial/help/environment.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/environment.txt Thu May 04 00:26:55 2017 -0400 @@ -8,7 +8,7 @@ HGEDITOR This is the name of the editor to run when committing. See EDITOR. - (deprecated, use configuration file) + (deprecated, see :hg:`help config.ui.editor`) HGENCODING This overrides the default locale setting detected by Mercurial. @@ -36,7 +36,7 @@ will be executed with three arguments: local file, remote file, ancestor file. - (deprecated, use configuration file) + (deprecated, see :hg:`help config.ui.merge`) HGRCPATH A list of files or directories to search for configuration @@ -87,7 +87,7 @@ - interactive prompt - LOGNAME (with ``@hostname`` appended) - (deprecated, use configuration file) + (deprecated, see :hg:`help config.ui.username`) EMAIL May be used as the author of a commit; see HGUSER.
--- a/mercurial/help/internals/changegroups.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/internals/changegroups.txt Thu May 04 00:26:55 2017 -0400 @@ -72,7 +72,7 @@ The *delta data* is a series of *delta*s that describe a diff from an existing entry (either that the recipient already has, or previously specified in the -bundlei/changegroup). +bundle/changegroup). The *delta header* is different between versions ``1``, ``2``, and ``3`` of the changegroup format.
--- a/mercurial/help/pager.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/pager.txt Thu May 04 00:26:55 2017 -0400 @@ -1,4 +1,4 @@ -Some Mercurial commands produce a lot of output, and Mercurial will +Some Mercurial commands can produce a lot of output, and Mercurial will attempt to use a pager to make those commands more pleasant. To set the pager that should be used, set the application variable:: @@ -10,6 +10,13 @@ $PAGER. If neither pager.pager, nor $PAGER is set, a default pager will be used, typically `less` on Unix and `more` on Windows. +.. container:: windows + + On Windows, `more` is not color aware, so using it effectively disables color. + MSYS and Cygwin shells provide `less` as a pager, which can be configured to + support ANSI color codes. See :hg:`help config.color.pagermode` to configure + the color mode when invoking a pager. + You can disable the pager for certain commands by adding them to the pager.ignore list::
--- a/mercurial/help/templates.txt Wed May 03 18:04:43 2017 -0700 +++ b/mercurial/help/templates.txt Thu May 04 00:26:55 2017 -0400 @@ -62,7 +62,7 @@ * for multiplication / for floor division (division rounded to integer nearest -infinity) -Division fulfils the law x = x / y + mod(x, y). +Division fulfills the law x = x / y + mod(x, y). Also, for any expression that returns a list, there is a list operator::
--- a/tests/test-diff-color.t Wed May 03 18:04:43 2017 -0700 +++ b/tests/test-diff-color.t Thu May 04 00:26:55 2017 -0400 @@ -4,6 +4,7 @@ > [ui] > color = yes > formatted = always + > paginate = never > [color] > mode = ansi > EOF
--- a/tests/test-help.t Wed May 03 18:04:43 2017 -0700 +++ b/tests/test-help.t Thu May 04 00:26:55 2017 -0400 @@ -1032,7 +1032,7 @@ The *delta data* is a series of *delta*s that describe a diff from an existing entry (either that the recipient already has, or previously - specified in the bundlei/changegroup). + specified in the bundle/changegroup). The *delta header* is different between versions "1", "2", and "3" of the changegroup format. @@ -3183,7 +3183,7 @@ <p> The *delta data* is a series of *delta*s that describe a diff from an existing entry (either that the recipient already has, or previously specified in the - bundlei/changegroup). + bundle/changegroup). </p> <p> The *delta header* is different between versions "1", "2", and