Patchwork [5,of,7,STABLE] config: wrap ".orig." in rst quotes

login
register
mail settings
Submitter Sean Farley
Date May 1, 2016, 7:12 a.m.
Message ID <1068bb9e2d1ce68a01a7.1462086725@laptop.local>
Download mbox | patch
Permalink /patch/14854/
State Accepted
Headers show

Comments

Sean Farley - May 1, 2016, 7:12 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1462066834 25200
#      Sat Apr 30 18:40:34 2016 -0700
# Branch stable
# Node ID 1068bb9e2d1ce68a01a75f862e475b1c676452ac
# Parent  60d96ee76151c33087068443af42cacfe8a5391e
# EXP-Topic docker-ppa
config: wrap ".orig." in rst quotes

Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to
silence lintian warnings.
Yuya Nishihara - May 1, 2016, 9:13 a.m.
On Sun, 01 May 2016 00:12:05 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1462066834 25200
> #      Sat Apr 30 18:40:34 2016 -0700
> # Branch stable
> # Node ID 1068bb9e2d1ce68a01a75f862e475b1c676452ac
> # Parent  60d96ee76151c33087068443af42cacfe8a5391e
> # EXP-Topic docker-ppa
> config: wrap ".orig." in rst quotes
> 
> Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to
> silence lintian warnings.
> 
> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> --- a/mercurial/help/config.txt
> +++ b/mercurial/help/config.txt
> @@ -1018,12 +1018,12 @@ This section specifies behavior during m
>  ``checkignored``
>     Controls behavior when an ignored file on disk has the same name as a tracked
>     file in the changeset being merged or updated to, and has different
>     contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
>     abort on such files. With ``warn``, warn on such files and back them up as
> -   .orig. With ``ignore``, don't print a warning and back them up as
> -   .orig. (default: ``abort``)
> +   ``.orig.`` With ``ignore``, don't print a warning and back them up as
> +   ``.orig.`` (default: ``abort``)

Er, ``.orig``. ?
Sean Farley - May 1, 2016, 5:50 p.m.
Yuya Nishihara <yuya@tcha.org> writes:

> On Sun, 01 May 2016 00:12:05 -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1462066834 25200
>> #      Sat Apr 30 18:40:34 2016 -0700
>> # Branch stable
>> # Node ID 1068bb9e2d1ce68a01a75f862e475b1c676452ac
>> # Parent  60d96ee76151c33087068443af42cacfe8a5391e
>> # EXP-Topic docker-ppa
>> config: wrap ".orig." in rst quotes
>> 
>> Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to
>> silence lintian warnings.
>> 
>> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
>> --- a/mercurial/help/config.txt
>> +++ b/mercurial/help/config.txt
>> @@ -1018,12 +1018,12 @@ This section specifies behavior during m
>>  ``checkignored``
>>     Controls behavior when an ignored file on disk has the same name as a tracked
>>     file in the changeset being merged or updated to, and has different
>>     contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
>>     abort on such files. With ``warn``, warn on such files and back them up as
>> -   .orig. With ``ignore``, don't print a warning and back them up as
>> -   .orig. (default: ``abort``)
>> +   ``.orig.`` With ``ignore``, don't print a warning and back them up as
>> +   ``.orig.`` (default: ``abort``)
>
> Er, ``.orig``. ?

I think it's how pedantic you want to be. For ending a sentence, I
believe you put the punctuation inside the quote. I honestly don't care
one way or the other, so outside the quote is fine with me, too.
Yuya Nishihara - May 2, 2016, 1:40 a.m.
On Sun, 01 May 2016 10:50:32 -0700, Sean Farley wrote:
> Yuya Nishihara <yuya@tcha.org> writes:
> 
> > On Sun, 01 May 2016 00:12:05 -0700, Sean Farley wrote:  
> >> # HG changeset patch
> >> # User Sean Farley <sean@farley.io>
> >> # Date 1462066834 25200
> >> #      Sat Apr 30 18:40:34 2016 -0700
> >> # Branch stable
> >> # Node ID 1068bb9e2d1ce68a01a75f862e475b1c676452ac
> >> # Parent  60d96ee76151c33087068443af42cacfe8a5391e
> >> # EXP-Topic docker-ppa
> >> config: wrap ".orig." in rst quotes
> >> 
> >> Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to
> >> silence lintian warnings.
> >> 
> >> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> >> --- a/mercurial/help/config.txt
> >> +++ b/mercurial/help/config.txt
> >> @@ -1018,12 +1018,12 @@ This section specifies behavior during m
> >>  ``checkignored``
> >>     Controls behavior when an ignored file on disk has the same name as a tracked
> >>     file in the changeset being merged or updated to, and has different
> >>     contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
> >>     abort on such files. With ``warn``, warn on such files and back them up as
> >> -   .orig. With ``ignore``, don't print a warning and back them up as
> >> -   .orig. (default: ``abort``)
> >> +   ``.orig.`` With ``ignore``, don't print a warning and back them up as
> >> +   ``.orig.`` (default: ``abort``)  
> >
> > Er, ``.orig``. ?  
> 
> I think it's how pedantic you want to be. For ending a sentence, I
> believe you put the punctuation inside the quote. I honestly don't care
> one way or the other, so outside the quote is fine with me, too.

".orig." is one way to render ``.orig.``. It is <tt>.orig.</tt> in HTML, and
man page has different style.

I'll queue the outside-the-quote one, thanks.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -1018,12 +1018,12 @@  This section specifies behavior during m
 ``checkignored``
    Controls behavior when an ignored file on disk has the same name as a tracked
    file in the changeset being merged or updated to, and has different
    contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
    abort on such files. With ``warn``, warn on such files and back them up as
-   .orig. With ``ignore``, don't print a warning and back them up as
-   .orig. (default: ``abort``)
+   ``.orig.`` With ``ignore``, don't print a warning and back them up as
+   ``.orig.`` (default: ``abort``)
 
 ``checkunknown``
    Controls behavior when an unknown file that isn't ignored has the same name
    as a tracked file in the changeset being merged or updated to, and has
    different contents. Similar to ``merge.checkignored``, except for files that