[PATCH] help: minor copy editing for grammar
Augie Fackler
raf at durin42.com
Wed Nov 1 12:07:54 EDT 2017
> On Nov 1, 2017, at 00:29, Matt Harbison <mharbison72 at gmail.com> wrote:
>
> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1509505769 14400
> # Tue Oct 31 23:09:29 2017 -0400
> # Branch stable
> # Node ID acfcc84e9e4c9ed5b33322250f0268419ffd81d2
> # Parent bf2db35a6fe7a02b69eaa0e35708cf0044d73510
> help: minor copy editing for grammar
queued, thanks
>
> diff --git a/hgext/share.py b/hgext/share.py
> --- a/hgext/share.py
> +++ b/hgext/share.py
> @@ -34,7 +34,7 @@
> requested in the :hg:`clone` command matches exactly to a repository
> that was cloned before.
>
> - The default naming mode is "identity."
> + The default naming mode is "identity".
> '''
>
> from __future__ import absolute_import
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -2072,7 +2072,7 @@
> (grafted from CHANGESETHASH)
>
> If --force is specified, revisions will be grafted even if they
> - are already ancestors of or have been grafted to the destination.
> + are already ancestors of, or have been grafted to, the destination.
> This is useful when the revisions have since been backed out.
>
> If a graft merge results in conflicts, the graft process is
> @@ -3075,7 +3075,7 @@
>
> Show new changesets found in the specified path/URL or the default
> pull location. These are the changesets that would have been pulled
> - if a pull at the time you issued this command.
> + by :hg:`pull` at the time you issued this command.
>
> See pull for valid source format details.
>
> @@ -3808,8 +3808,8 @@
> With one of -p/--public, -d/--draft or -s/--secret, change the
> phase value of the specified revisions.
>
> - Unless -f/--force is specified, :hg:`phase` won't move changeset from a
> - lower phase to an higher phase. Phases are ordered as follows::
> + Unless -f/--force is specified, :hg:`phase` won't move changesets from a
> + lower phase to a higher phase. Phases are ordered as follows::
>
> public < draft < secret
>
> diff --git a/mercurial/help/internals/config.txt b/mercurial/help/internals/config.txt
> --- a/mercurial/help/internals/config.txt
> +++ b/mercurial/help/internals/config.txt
> @@ -23,7 +23,7 @@
> ---------------------
>
> If the default provided is a callable, it is called to retrieve the default
> -value when accessing the config option. This is useful for default value that
> +value when accessing the config option. This is useful for default values that
> are mutable like the empty list::
>
> coreconfigitem('pager', 'ignore',
> @@ -31,8 +31,8 @@
> )
>
> In addition, there are cases where the default is not fixed, but computed from
> -other properties. In this case, use the ``dynamicdefault`` object as value for
> -the ``default`` parameters. A default value is then explicitly required when
> +other properties. In this case, use the ``dynamicdefault`` object as the value
> +for the ``default`` parameter. A default value is then explicitly required when
> reading the option::
>
> # registration
> @@ -41,7 +41,7 @@
> )
>
> # usage
> - ui.config('web', 'name', dirnam)
> + ui.config('web', 'name', dirname)
>
> Free form options
> -----------------
> @@ -63,7 +63,7 @@
> priority=-1,
> )
>
> -The ``priority`` parameter control the order used to match the generic pattern
> +The ``priority`` parameter controls the order used to match the generic pattern
> (lower first).
>
> Config Option in Extensions
> @@ -85,24 +85,24 @@
> The ``dynamicdefault`` object is then available as
> ``configitem.dynamicdefault``.
>
> -Supporting older version
> -------------------------
> +Supporting older versions
> +-------------------------
>
> -The register was introduced in Mercurial 4.3, the ``generic`` parameter was
> +The registry was introduced in Mercurial 4.3, and the ``generic`` parameter was
> introduced in 4.4. Starting with Mercurial 4.4, all core options were registered
> and developer warnings are emitted when accessing unregistered option.
>
> -Extensions supporting version older than Mercurial-4.3 cannot rely on the
> -default value registered. The simplest way to register option while still
> -supporting older version is to use ``dynamicdefault`` for option requiring a
> -default value. The existing code passing an explicit default can then stay in
> -use until compatibility to Mercurial 4.2 is dropped.
> +Extensions supporting versions older than Mercurial 4.3 cannot rely on the
> +default value being registered. The simplest way to register an option while
> +still supporting an older version is to use ``dynamicdefault`` for options
> +requiring a default value. The existing code passing an explicit default can
> +then stay in use until compatibility with Mercurial 4.2 is dropped.
>
> -As reminder here are the default value for each config types:
> +As reminder, here are the default values for each config type:
> - config: None
> - configbool: False
> - configbytes: 0
> - configdate: None
> - configint: None
> - configlist: []
> -- configpath: None
> +- configpath: None
> diff --git a/mercurial/help/merge-tools.txt b/mercurial/help/merge-tools.txt
> --- a/mercurial/help/merge-tools.txt
> +++ b/mercurial/help/merge-tools.txt
> @@ -76,7 +76,7 @@
>
> After selecting a merge program, Mercurial will by default attempt
> to merge the files using a simple merge algorithm first. Only if it doesn't
> - succeed because of conflicting changes Mercurial will actually execute the
> + succeed because of conflicting changes will Mercurial actually execute the
> merge program. Whether to use the simple merge algorithm first can be
> controlled by the premerge setting of the merge tool. Premerge is enabled by
> default unless the file is binary or a symlink.
> diff --git a/mercurial/help/phases.txt b/mercurial/help/phases.txt
> --- a/mercurial/help/phases.txt
> +++ b/mercurial/help/phases.txt
> @@ -28,7 +28,7 @@
> Phases can also be manually manipulated with the :hg:`phase` command
> if needed. See :hg:`help -v phase` for examples.
>
> -To make yours commits secret by default, put this in your
> +To make your commits secret by default, put this in your
> configuration file::
>
> [phases]
> @@ -89,7 +89,7 @@
>
> hg phase --force --draft .
>
> - - show a list of changeset revision and phase::
> + - show a list of changeset revisions and each corresponding phase::
>
> hg log --template "{rev} {phase}\n"
>
> diff --git a/mercurial/help/revisions.txt b/mercurial/help/revisions.txt
> --- a/mercurial/help/revisions.txt
> +++ b/mercurial/help/revisions.txt
> @@ -134,7 +134,7 @@
> prefixed with ``(?i)``.
>
> For example, ``tag(r're:(?i)release')`` matches "release" or "RELEASE"
> -or "Release", etc
> +or "Release", etc.
>
> Predicates
> ==========
> @@ -212,7 +212,7 @@
>
> hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
>
> -- Update to commit that bookmark @ is pointing too, without activating the
> +- Update to the commit that bookmark @ is pointing to, without activating the
> bookmark (this works because the last revision of the revset is used)::
>
> hg update :@
> diff --git a/tests/test-extension.t b/tests/test-extension.t
> --- a/tests/test-extension.t
> +++ b/tests/test-extension.t
> @@ -813,7 +813,7 @@
> $ echo "multirevs = multirevs.py" >> $HGRCPATH
>
> $ hg help multirevs | tail
> - bookmark (this works because the last revision of the revset is used):
> + used):
>
> hg update :@
>
> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -1876,7 +1876,7 @@
> Note:
> After selecting a merge program, Mercurial will by default attempt to
> merge the files using a simple merge algorithm first. Only if it
> - doesn't succeed because of conflicting changes Mercurial will actually
> + doesn't succeed because of conflicting changes will Mercurial actually
> execute the merge program. Whether to use the simple merge algorithm
> first can be controlled by the premerge setting of the merge tool.
> Premerge is enabled by default unless the file is binary or a symlink.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list