Patchwork Fix formatting of template example in help file

login
register
mail settings
Submitter Steve Hoelzer
Date Dec. 10, 2013, 4:35 p.m.
Message ID <CACbrTHfhhkCDb=vakh7r9J2eTt2iT7jdcwCwq7P2ogYzDPKMag@mail.gmail.com>
Download mbox | patch
Permalink /patch/3210/
State Superseded
Headers show

Comments

Steve Hoelzer - Dec. 10, 2013, 4:35 p.m.
# HG changeset patch
# User Steve Hoelzer <shoelzer@gmail.com>
# Date 1386693253 21600
#      Tue Dec 10 10:34:13 2013 -0600
# Node ID bbb364f42669c01be468c7a697c72f5209188c62
# Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
Fix formatting of template example in help file
Augie Fackler - Dec. 10, 2013, 9:24 p.m.
On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
> # HG changeset patch
> # User Steve Hoelzer <shoelzer@gmail.com>
> # Date 1386693253 21600
> #      Tue Dec 10 10:34:13 2013 -0600
> # Node ID bbb364f42669c01be468c7a697c72f5209188c62
> # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
> Fix formatting of template example in help file
>

queued, thanks

>
> diff -r 1c92524c37cd -r bbb364f42669 mercurial/help/templates.txt
> --- a/mercurial/help/templates.txt Sun Dec 01 21:24:48 2013 -0600
> +++ b/mercurial/help/templates.txt Tue Dec 10 10:34:13 2013 -0600
> @@ -105,4 +105,4 @@
>
>  - Display the contents of the 'extra' field, one per line::
>
> -  $ hg log -r 0 --template "{join(extras, '\n')}\n"
> +   $ hg log -r 0 --template "{join(extras, '\n')}\n"
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
Matt Mackall - Dec. 10, 2013, 10:30 p.m.
On Tue, 2013-12-10 at 16:24 -0500, Augie Fackler wrote:
> On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
> > # HG changeset patch
> > # User Steve Hoelzer <shoelzer@gmail.com>
> > # Date 1386693253 21600
> > #      Tue Dec 10 10:34:13 2013 -0600
> > # Node ID bbb364f42669c01be468c7a697c72f5209188c62
> > # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
> > Fix formatting of template example in help file
> >
> 
> queued, thanks

Hopefully after fixing the non-conformant description.
Steve Hoelzer - Dec. 11, 2013, 4:56 p.m.
On Tue, Dec 10, 2013 at 4:30 PM, Matt Mackall <mpm@selenic.com> wrote:
> On Tue, 2013-12-10 at 16:24 -0500, Augie Fackler wrote:
>> On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
>> > # HG changeset patch
>> > # User Steve Hoelzer <shoelzer@gmail.com>
>> > # Date 1386693253 21600
>> > #      Tue Dec 10 10:34:13 2013 -0600
>> > # Node ID bbb364f42669c01be468c7a697c72f5209188c62
>> > # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
>> > Fix formatting of template example in help file
>> >
>>
>> queued, thanks
>
> Hopefully after fixing the non-conformant description.

I don't understand. Do you mean the description in the help file or in the
commit? What about it is non-conformant?
Simon King - Dec. 11, 2013, 5 p.m.
On Wed, Dec 11, 2013 at 4:56 PM, Steve Hoelzer <shoelzer@gmail.com> wrote:
> On Tue, Dec 10, 2013 at 4:30 PM, Matt Mackall <mpm@selenic.com> wrote:
>> On Tue, 2013-12-10 at 16:24 -0500, Augie Fackler wrote:
>>> On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
>>> > # HG changeset patch
>>> > # User Steve Hoelzer <shoelzer@gmail.com>
>>> > # Date 1386693253 21600
>>> > #      Tue Dec 10 10:34:13 2013 -0600
>>> > # Node ID bbb364f42669c01be468c7a697c72f5209188c62
>>> > # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
>>> > Fix formatting of template example in help file
>>> >
>>>
>>> queued, thanks
>>
>> Hopefully after fixing the non-conformant description.
>
> I don't understand. Do you mean the description in the help file or in the
> commit? What about it is non-conformant?

First bullet point of http://mercurial.selenic.com/wiki/ContributingChanges

* first line of commit message is of the form "topic: uncapitalized,
no trailing period"

so yours should probably have been something like:

    help: fix formatting of template example

Cheers,

Simon
Steve Hoelzer - Dec. 11, 2013, 5:38 p.m.
On Wed, Dec 11, 2013 at 11:00 AM, Simon King <simon@simonking.org.uk> wrote:
> On Wed, Dec 11, 2013 at 4:56 PM, Steve Hoelzer <shoelzer@gmail.com> wrote:
>> On Tue, Dec 10, 2013 at 4:30 PM, Matt Mackall <mpm@selenic.com> wrote:
>>> On Tue, 2013-12-10 at 16:24 -0500, Augie Fackler wrote:
>>>> On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
>>>> > # HG changeset patch
>>>> > # User Steve Hoelzer <shoelzer@gmail.com>
>>>> > # Date 1386693253 21600
>>>> > #      Tue Dec 10 10:34:13 2013 -0600
>>>> > # Node ID bbb364f42669c01be468c7a697c72f5209188c62
>>>> > # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
>>>> > Fix formatting of template example in help file
>>>> >
>>>>
>>>> queued, thanks
>>>
>>> Hopefully after fixing the non-conformant description.
>>
>> I don't understand. Do you mean the description in the help file or in the
>> commit? What about it is non-conformant?
>
> First bullet point of http://mercurial.selenic.com/wiki/ContributingChanges
>
> * first line of commit message is of the form "topic: uncapitalized,
> no trailing period"
>
> so yours should probably have been something like:
>
>     help: fix formatting of template example

Thanks. I will resend the patch.

Steve
Augie Fackler - Dec. 11, 2013, 5:40 p.m.
Okay, then I'll drop my queued copy. Thanks!


On Wed, Dec 11, 2013 at 12:38 PM, Steve Hoelzer <shoelzer@gmail.com> wrote:

> On Wed, Dec 11, 2013 at 11:00 AM, Simon King <simon@simonking.org.uk>
> wrote:
> > On Wed, Dec 11, 2013 at 4:56 PM, Steve Hoelzer <shoelzer@gmail.com>
> wrote:
> >> On Tue, Dec 10, 2013 at 4:30 PM, Matt Mackall <mpm@selenic.com> wrote:
> >>> On Tue, 2013-12-10 at 16:24 -0500, Augie Fackler wrote:
> >>>> On Tue, Dec 10, 2013 at 10:35:14AM -0600, Steve Hoelzer wrote:
> >>>> > # HG changeset patch
> >>>> > # User Steve Hoelzer <shoelzer@gmail.com>
> >>>> > # Date 1386693253 21600
> >>>> > #      Tue Dec 10 10:34:13 2013 -0600
> >>>> > # Node ID bbb364f42669c01be468c7a697c72f5209188c62
> >>>> > # Parent  1c92524c37cdd251c1a36b2da0fb4148b0e6ba09
> >>>> > Fix formatting of template example in help file
> >>>> >
> >>>>
> >>>> queued, thanks
> >>>
> >>> Hopefully after fixing the non-conformant description.
> >>
> >> I don't understand. Do you mean the description in the help file or in
> the
> >> commit? What about it is non-conformant?
> >
> > First bullet point of
> http://mercurial.selenic.com/wiki/ContributingChanges
> >
> > * first line of commit message is of the form "topic: uncapitalized,
> > no trailing period"
> >
> > so yours should probably have been something like:
> >
> >     help: fix formatting of template example
>
> Thanks. I will resend the patch.
>
> Steve
>

Patch

diff -r 1c92524c37cd -r bbb364f42669 mercurial/help/templates.txt
--- a/mercurial/help/templates.txt Sun Dec 01 21:24:48 2013 -0600
+++ b/mercurial/help/templates.txt Tue Dec 10 10:34:13 2013 -0600
@@ -105,4 +105,4 @@ 

 - Display the contents of the 'extra' field, one per line::

-  $ hg log -r 0 --template "{join(extras, '\n')}\n"
+   $ hg log -r 0 --template "{join(extras, '\n')}\n"