Mercurial > hg
changeset 30610:66cffa87d2f2
help: make multirevs just an alias for revsets
The multirevs topis seems to be covered well by the revsets topic, so
just make it an alias and remove multirevs.txt.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 16 Dec 2016 09:48:14 -0800 |
| parents | 9bf43a72b49d |
| children | cbc61b1b52ea |
| files | contrib/wix/help.wxs mercurial/help.py mercurial/help/multirevs.txt tests/test-extension.t tests/test-globalopts.t tests/test-help.t tests/test-hgweb-json.t |
| diffstat | 7 files changed, 7 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/wix/help.wxs Fri Dec 16 21:02:39 2016 +0000 +++ 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" />
--- a/mercurial/help.py Fri Dec 16 21:02:39 2016 +0000 +++ 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')),
--- a/mercurial/help/multirevs.txt Fri Dec 16 21:02:39 2016 +0000 +++ /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.
--- a/tests/test-extension.t Fri Dec 16 21:02:39 2016 +0000 +++ 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 - """"""""""""""""""""""""""""" + $ hg help multirevs | tail - When Mercurial accepts more than one revision, they may be specified - individually, or provided as a topologically continuous range, separated - by the ":" character. + - Changesets committed in May 2008, sorted by user: - 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". + hg log -r "sort(date('May 2008'), user)" - If BEGIN is greater than END, revisions are treated in reverse order. + - Changesets mentioning "bug" or "issue" that are not in a tagged release: - 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. + hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())" use 'hg help -c multirevs' to see help for the multirevs command
--- a/tests/test-globalopts.t Fri Dec 16 21:02:39 2016 +0000 +++ 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
--- a/tests/test-help.t Fri Dec 16 21:02:39 2016 +0000 +++ 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>
--- a/tests/test-hgweb-json.t Fri Dec 16 21:02:39 2016 +0000 +++ 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" },