[PATCH] help: make multirevs just an alias for revsets

Augie Fackler raf at durin42.com
Fri Dec 16 17:28:03 EST 2016


On Fri, Dec 16, 2016 at 01:44:33PM -0800, Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1481910494 28800
> #      Fri Dec 16 09:48:14 2016 -0800
> # Node ID 28e1f757b76717048dd43046184e2b8e769c6c5f
> # Parent  be520fe3a3e95edb4a8db75d424ed067cb5bf706
> help: make multirevs just an alias for revsets

<obiwan>there's a name I've not heard in a long time.

A long time.
</obiwan>

Queued.

>
> The multirevs topis seems to be covered well by the revsets topic, so
> just make it an alias and remove multirevs.txt.
>
> diff -r be520fe3a3e9 -r 28e1f757b767 contrib/wix/help.wxs
> --- a/contrib/wix/help.wxs	Thu Dec 15 11:00:18 2016 -0800
> +++ b/contrib/wix/help.wxs	Fri Dec 16 09:48:14 2016 -0800
> @@ -25,7 +25,6 @@
>            <File Name="hgignore.txt" />
>            <File Name="hgweb.txt" />
>            <File Name="merge-tools.txt" />
> -          <File Name="multirevs.txt" />
>            <File Name="patterns.txt" />
>            <File Name="phases.txt" />
>            <File Name="revisions.txt" />
> diff -r be520fe3a3e9 -r 28e1f757b767 mercurial/help.py
> --- a/mercurial/help.py	Thu Dec 15 11:00:18 2016 -0800
> +++ b/mercurial/help.py	Fri Dec 16 09:48:14 2016 -0800
> @@ -212,9 +212,8 @@
>       loaddoc('environment')),
>      (['revisions', 'revs'], _('Specifying Single Revisions'),
>       loaddoc('revisions')),
> -    (['multirevs', 'mrevs'], _('Specifying Multiple Revisions'),
> -     loaddoc('multirevs')),
> -    (['revsets', 'revset'], _("Specifying Revision Sets"), loaddoc('revsets')),
> +    (['revsets', 'revset', 'multirevs', 'mrevs'],
> +     _("Specifying Revision Sets"), loaddoc('revsets')),
>      (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
>      (['diffs'], _('Diff Formats'), loaddoc('diffs')),
>      (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
> diff -r be520fe3a3e9 -r 28e1f757b767 mercurial/help/multirevs.txt
> --- a/mercurial/help/multirevs.txt	Thu Dec 15 11:00:18 2016 -0800
> +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
> @@ -1,13 +0,0 @@
> -When Mercurial accepts more than one revision, they may be specified
> -individually, or provided as a topologically continuous range,
> -separated by the ":" character.
> -
> -The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
> -revision identifiers. Both BEGIN and END are optional. If BEGIN is not
> -specified, it defaults to revision number 0. If END is not specified,
> -it defaults to the tip. The range ":" thus means "all revisions".
> -
> -If BEGIN is greater than END, revisions are treated in reverse order.
> -
> -A range acts as a closed interval. This means that a range of 3:5
> -gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
> diff -r be520fe3a3e9 -r 28e1f757b767 tests/test-extension.t
> --- a/tests/test-extension.t	Thu Dec 15 11:00:18 2016 -0800
> +++ b/tests/test-extension.t	Fri Dec 16 09:48:14 2016 -0800
> @@ -730,23 +730,15 @@
>    > EOF
>    $ echo "multirevs = multirevs.py" >> $HGRCPATH
>
> -  $ hg help multirevs
> -  Specifying Multiple Revisions
> -  """""""""""""""""""""""""""""
> -
> -      When Mercurial accepts more than one revision, they may be specified
> -      individually, or provided as a topologically continuous range, separated
> -      by the ":" character.
> +  $ hg help multirevs | tail
>
> -      The syntax of range notation is [BEGIN]:[END], where BEGIN and END are
> -      revision identifiers. Both BEGIN and END are optional. If BEGIN is not
> -      specified, it defaults to revision number 0. If END is not specified, it
> -      defaults to the tip. The range ":" thus means "all revisions".
> +      - Changesets committed in May 2008, sorted by user:
>
> -      If BEGIN is greater than END, revisions are treated in reverse order.
> +          hg log -r "sort(date('May 2008'), user)"
>
> -      A range acts as a closed interval. This means that a range of 3:5 gives 3,
> -      4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.
> +      - Changesets mentioning "bug" or "issue" that are not in a tagged release:
> +
> +          hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"
>
>    use 'hg help -c multirevs' to see help for the multirevs command
>
> diff -r be520fe3a3e9 -r 28e1f757b767 tests/test-globalopts.t
> --- a/tests/test-globalopts.t	Thu Dec 15 11:00:18 2016 -0800
> +++ b/tests/test-globalopts.t	Fri Dec 16 09:48:14 2016 -0800
> @@ -351,7 +351,6 @@
>     hgweb         Configuring hgweb
>     internals     Technical implementation topics
>     merge-tools   Merge Tools
> -   multirevs     Specifying Multiple Revisions
>     patterns      File Name Patterns
>     phases        Working with Phases
>     revisions     Specifying Single Revisions
> @@ -434,7 +433,6 @@
>     hgweb         Configuring hgweb
>     internals     Technical implementation topics
>     merge-tools   Merge Tools
> -   multirevs     Specifying Multiple Revisions
>     patterns      File Name Patterns
>     phases        Working with Phases
>     revisions     Specifying Single Revisions
> diff -r be520fe3a3e9 -r 28e1f757b767 tests/test-help.t
> --- a/tests/test-help.t	Thu Dec 15 11:00:18 2016 -0800
> +++ b/tests/test-help.t	Fri Dec 16 09:48:14 2016 -0800
> @@ -113,7 +113,6 @@
>     hgweb         Configuring hgweb
>     internals     Technical implementation topics
>     merge-tools   Merge Tools
> -   multirevs     Specifying Multiple Revisions
>     patterns      File Name Patterns
>     phases        Working with Phases
>     revisions     Specifying Single Revisions
> @@ -190,7 +189,6 @@
>     hgweb         Configuring hgweb
>     internals     Technical implementation topics
>     merge-tools   Merge Tools
> -   multirevs     Specifying Multiple Revisions
>     patterns      File Name Patterns
>     phases        Working with Phases
>     revisions     Specifying Single Revisions
> @@ -831,7 +829,6 @@
>     hgweb         Configuring hgweb
>     internals     Technical implementation topics
>     merge-tools   Merge Tools
> -   multirevs     Specifying Multiple Revisions
>     patterns      File Name Patterns
>     phases        Working with Phases
>     revisions     Specifying Single Revisions
> @@ -1907,13 +1904,6 @@
>    Merge Tools
>    </td></tr>
>    <tr><td>
> -  <a href="/help/multirevs">
> -  multirevs
> -  </a>
> -  </td><td>
> -  Specifying Multiple Revisions
> -  </td></tr>
> -  <tr><td>
>    <a href="/help/patterns">
>    patterns
>    </a>
> diff -r be520fe3a3e9 -r 28e1f757b767 tests/test-hgweb-json.t
> --- a/tests/test-hgweb-json.t	Thu Dec 15 11:00:18 2016 -0800
> +++ b/tests/test-hgweb-json.t	Fri Dec 16 09:48:14 2016 -0800
> @@ -1593,10 +1593,6 @@
>          "topic": "merge-tools"
>        },
>        {
> -        "summary": "Specifying Multiple Revisions",
> -        "topic": "multirevs"
> -      },
> -      {
>          "summary": "File Name Patterns",
>          "topic": "patterns"
>        },
> _______________________________________________
> 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