Patchwork help: replace patterns with matching

login
register
mail settings
Submitter timeless
Date Jan. 24, 2017, 6:42 a.m.
Message ID <efe7a979f88411014449.1485240129@gcc2-power8.osuosl.org>
Download mbox | patch
Permalink /patch/18271/
State Accepted
Headers show

Comments

timeless - Jan. 24, 2017, 6:42 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1485239979 0
#      Tue Jan 24 06:39:39 2017 +0000
# Branch stable
# Node ID efe7a979f88411014449f28cc3cc873187d2e0f8
# Parent  7bfe02b57695900ef996989286c1fdc2a13aec82
# Available At https://bitbucket.org/timeless/mercurial-crew
#              hg pull https://bitbucket.org/timeless/mercurial-crew -r efe7a979f884
help: replace patterns with matching

The subject of the section is actually matching.
We already have a patterns top level help topic.
Matt Harbison - Jan. 25, 2017, 2:39 a.m.
On Tue, 24 Jan 2017 01:42:09 -0500, timeless <timeless@fmr.im> wrote:

> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1485239979 0
> #      Tue Jan 24 06:39:39 2017 +0000
> # Branch stable
> # Node ID efe7a979f88411014449f28cc3cc873187d2e0f8
> # Parent  7bfe02b57695900ef996989286c1fdc2a13aec82
> # Available At https://bitbucket.org/timeless/mercurial-crew
> #              hg pull https://bitbucket.org/timeless/mercurial-crew -r  
> efe7a979f884
> help: replace patterns with matching
>
> The subject of the section is actually matching.
> We already have a patterns top level help topic.
>
> diff -r 7bfe02b57695 -r efe7a979f884 mercurial/help/revisions.txt
> --- a/mercurial/help/revisions.txt	Fri Jan 20 10:17:34 2017 -0500
> +++ b/mercurial/help/revisions.txt	Tue Jan 24 06:39:39 2017 +0000
> @@ -119,7 +119,7 @@
>  ``x^``
>    Equivalent to ``x^1``, the first parent of each changeset in x.
> -Patterns
> +Matching
>  ========
> Where noted, predicates that perform string matching can accept a pattern

Seems OK, but the references to this section need to be updated too.

https://www.mercurial-scm.org/repo/hg/rev/0b49449a01f4

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - Jan. 30, 2017, 1:55 p.m.
On Tue, 24 Jan 2017 21:39:45 -0500, Matt Harbison wrote:
> On Tue, 24 Jan 2017 01:42:09 -0500, timeless <timeless@fmr.im> wrote:
> > # HG changeset patch
> > # User timeless <timeless@mozdev.org>
> > # Date 1485239979 0
> > #      Tue Jan 24 06:39:39 2017 +0000
> > # Branch stable
> > # Node ID efe7a979f88411014449f28cc3cc873187d2e0f8
> > # Parent  7bfe02b57695900ef996989286c1fdc2a13aec82
> > # Available At https://bitbucket.org/timeless/mercurial-crew
> > #              hg pull https://bitbucket.org/timeless/mercurial-crew -r  
> > efe7a979f884
> > help: replace patterns with matching
> >
> > The subject of the section is actually matching.
> > We already have a patterns top level help topic.
> >
> > diff -r 7bfe02b57695 -r efe7a979f884 mercurial/help/revisions.txt
> > --- a/mercurial/help/revisions.txt	Fri Jan 20 10:17:34 2017 -0500
> > +++ b/mercurial/help/revisions.txt	Tue Jan 24 06:39:39 2017 +0000
> > @@ -119,7 +119,7 @@
> >  ``x^``
> >    Equivalent to ``x^1``, the first parent of each changeset in x.
> > -Patterns
> > +Matching
> >  ========
> > Where noted, predicates that perform string matching can accept a pattern
> 
> Seems OK, but the references to this section need to be updated too.
> 
> https://www.mercurial-scm.org/repo/hg/rev/0b49449a01f4

"hg help revisions.matching" isn't cool, which shows both "Matching" section
and "matching()" function.

Can we drop this from the hg-committed repo?
via Mercurial-devel - Jan. 30, 2017, 5:16 p.m.
On Mon, Jan 30, 2017 at 5:55 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> On Tue, 24 Jan 2017 21:39:45 -0500, Matt Harbison wrote:
>> On Tue, 24 Jan 2017 01:42:09 -0500, timeless <timeless@fmr.im> wrote:
>> > # HG changeset patch
>> > # User timeless <timeless@mozdev.org>
>> > # Date 1485239979 0
>> > #      Tue Jan 24 06:39:39 2017 +0000
>> > # Branch stable
>> > # Node ID efe7a979f88411014449f28cc3cc873187d2e0f8
>> > # Parent  7bfe02b57695900ef996989286c1fdc2a13aec82
>> > # Available At https://bitbucket.org/timeless/mercurial-crew
>> > #              hg pull https://bitbucket.org/timeless/mercurial-crew -r
>> > efe7a979f884
>> > help: replace patterns with matching
>> >
>> > The subject of the section is actually matching.
>> > We already have a patterns top level help topic.
>> >
>> > diff -r 7bfe02b57695 -r efe7a979f884 mercurial/help/revisions.txt
>> > --- a/mercurial/help/revisions.txt  Fri Jan 20 10:17:34 2017 -0500
>> > +++ b/mercurial/help/revisions.txt  Tue Jan 24 06:39:39 2017 +0000
>> > @@ -119,7 +119,7 @@
>> >  ``x^``
>> >    Equivalent to ``x^1``, the first parent of each changeset in x.
>> > -Patterns
>> > +Matching
>> >  ========
>> > Where noted, predicates that perform string matching can accept a pattern
>>
>> Seems OK, but the references to this section need to be updated too.
>>
>> https://www.mercurial-scm.org/repo/hg/rev/0b49449a01f4
>
> "hg help revisions.matching" isn't cool, which shows both "Matching" section
> and "matching()" function.
>
> Can we drop this from the hg-committed repo?

I'm for dropping it. It's a small regression, but the benefit is also
small. Augie, since you queued it, I'll let you drop it (besides, I'm
not sure how to do it correctly :-P).

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Augie Fackler - Jan. 30, 2017, 7:54 p.m.
> On Jan 30, 2017, at 12:16, Martin von Zweigbergk <martinvonz@google.com> wrote:
> 
> On Mon, Jan 30, 2017 at 5:55 AM, Yuya Nishihara <yuya@tcha.org> wrote:
>> On Tue, 24 Jan 2017 21:39:45 -0500, Matt Harbison wrote:
>>> On Tue, 24 Jan 2017 01:42:09 -0500, timeless <timeless@fmr.im> wrote:
>>>> # HG changeset patch
>>>> # User timeless <timeless@mozdev.org>
>>>> # Date 1485239979 0
>>>> #      Tue Jan 24 06:39:39 2017 +0000
>>>> # Branch stable
>>>> # Node ID efe7a979f88411014449f28cc3cc873187d2e0f8
>>>> # Parent  7bfe02b57695900ef996989286c1fdc2a13aec82
>>>> # Available At https://bitbucket.org/timeless/mercurial-crew
>>>> #              hg pull https://bitbucket.org/timeless/mercurial-crew -r
>>>> efe7a979f884
>>>> help: replace patterns with matching
>>>> 
>>>> The subject of the section is actually matching.
>>>> We already have a patterns top level help topic.
>>>> 
>>>> diff -r 7bfe02b57695 -r efe7a979f884 mercurial/help/revisions.txt
>>>> --- a/mercurial/help/revisions.txt  Fri Jan 20 10:17:34 2017 -0500
>>>> +++ b/mercurial/help/revisions.txt  Tue Jan 24 06:39:39 2017 +0000
>>>> @@ -119,7 +119,7 @@
>>>> ``x^``
>>>>   Equivalent to ``x^1``, the first parent of each changeset in x.
>>>> -Patterns
>>>> +Matching
>>>> ========
>>>> Where noted, predicates that perform string matching can accept a pattern
>>> 
>>> Seems OK, but the references to this section need to be updated too.
>>> 
>>> https://www.mercurial-scm.org/repo/hg/rev/0b49449a01f4
>> 
>> "hg help revisions.matching" isn't cool, which shows both "Matching" section
>> and "matching()" function.
>> 
>> Can we drop this from the hg-committed repo?
> 
> I'm for dropping it. It's a small regression, but the benefit is also
> small. Augie, since you queued it, I'll let you drop it (besides, I'm
> not sure how to do it correctly :-P).

I've dropped this for now. timeless, you'll want to run 'hg touch --hidden efe7a979f88411014449f28cc3cc873187d2e0f8' in your clone of Mercurial.

> 
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff -r 7bfe02b57695 -r efe7a979f884 mercurial/help/revisions.txt
--- a/mercurial/help/revisions.txt	Fri Jan 20 10:17:34 2017 -0500
+++ b/mercurial/help/revisions.txt	Tue Jan 24 06:39:39 2017 +0000
@@ -119,7 +119,7 @@ 
 ``x^``
   Equivalent to ``x^1``, the first parent of each changeset in x.
 
-Patterns
+Matching
 ========
 
 Where noted, predicates that perform string matching can accept a pattern