Patchwork [6,of,7] docchecker: try to reject single quotes

login
register
mail settings
Submitter timeless@mozdev.org
Date April 4, 2016, 9:31 a.m.
Message ID <3b0f25d82ea78c185b5b.1459762292@waste.org>
Download mbox | patch
Permalink /patch/14340/
State Accepted
Headers show

Comments

timeless@mozdev.org - April 4, 2016, 9:31 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1452591057 0
#      Tue Jan 12 09:30:57 2016 +0000
# Node ID 3b0f25d82ea78c185b5b67a098d8adf58e3da2ba
# Parent  3f37daec9b438013c6192e128bca472b6ec944e9
docchecker: try to reject single quotes
via Mercurial-devel - April 6, 2016, 8:50 p.m.
2016-04-04 2:31 GMT-07:00 timeless <timeless@mozdev.org>:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1452591057 0
> #      Tue Jan 12 09:30:57 2016 +0000
> # Node ID 3b0f25d82ea78c185b5b67a098d8adf58e3da2ba
> # Parent  3f37daec9b438013c6192e128bca472b6ec944e9
> docchecker: try to reject single quotes
>
> diff --git a/doc/docchecker b/doc/docchecker
> --- a/doc/docchecker
> +++ b/doc/docchecker
> @@ -16,6 +16,8 @@
>      """warning: please avoid nesting ' in :hg:`...`"""),
>    (r'\w:hg:`',
>      'warning: please have a space before :hg:'),
> +  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
> +    '''warning: please use " instead of ' for hg ... "..."'''),
>  ]
>
>  def check(line):
> diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
> --- a/tests/test-gendoc-ja.t
> +++ b/tests/test-gendoc-ja.t
> @@ -2,3 +2,5 @@
>
>    $ $TESTDIR/check-gendoc ja
>    checking for parse errors
> +  \xe8\xa4\x87\xe8\xa3\xbd\xef\xbc\x8f\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x99\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe4\xbf\x9d\xe5\xad\x98\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xab git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8(-g/--git \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\x84 \xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xae [diff] git=1 \xe8\xa8\x98\xe8\xbf\xb0)\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xa7\xe3\x81\x82\xe3\x82\x8c\xe3\x81\xb0\xe3\x80\x81 add/remove/copy/rename \xe3\x81\xa8\xe3\x81\x84\xe3\x81\xa3\xe3\x81\x9f hg \xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa8\x98\xe9\x8c\xb2\xe3\x82\x82\xe3\x80\x81 \xe9\x80\x9a\xe5\xb8\xb8\xe3\x81\xa8\xe5\xa4\x89\xe3\x82\x8f\xe3\x82\x8a\xe3\x81\xaa\xe3\x81\x8f\xe6\xa9\x9f\xe8\x83\xbd\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82 git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 'help diffs' \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82 (esc)
> +  warning: please use " instead of ' for hg ... "..."

Is this desirable or a false positive we're willing to live with?
timeless - April 6, 2016, 10:04 p.m.
No -- it's a true positive and should be fixed.
But it's in a localization, and there's half a policy of not stomping
on localizations.

I could have "fixed" it myself, or removed the translation leaving it
for them to translate again later, but both are considered rude.

2016-04-06 16:50 GMT-04:00 Martin von Zweigbergk via Mercurial-devel
<mercurial-devel@mercurial-scm.org>:
> 2016-04-04 2:31 GMT-07:00 timeless <timeless@mozdev.org>:
>> # HG changeset patch
>> # User timeless <timeless@mozdev.org>
>> # Date 1452591057 0
>> #      Tue Jan 12 09:30:57 2016 +0000
>> # Node ID 3b0f25d82ea78c185b5b67a098d8adf58e3da2ba
>> # Parent  3f37daec9b438013c6192e128bca472b6ec944e9
>> docchecker: try to reject single quotes
>>
>> diff --git a/doc/docchecker b/doc/docchecker
>> --- a/doc/docchecker
>> +++ b/doc/docchecker
>> @@ -16,6 +16,8 @@
>>      """warning: please avoid nesting ' in :hg:`...`"""),
>>    (r'\w:hg:`',
>>      'warning: please have a space before :hg:'),
>> +  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
>> +    '''warning: please use " instead of ' for hg ... "..."'''),
>>  ]
>>
>>  def check(line):
>> diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
>> --- a/tests/test-gendoc-ja.t
>> +++ b/tests/test-gendoc-ja.t
>> @@ -2,3 +2,5 @@
>>
>>    $ $TESTDIR/check-gendoc ja
>>    checking for parse errors
>> +  \xe8\xa4\x87\xe8\xa3\xbd\xef\xbc\x8f\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x99\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe4\xbf\x9d\xe5\xad\x98\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xab git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8(-g/--git \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\x84 \xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xae [diff] git=1 \xe8\xa8\x98\xe8\xbf\xb0)\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xa7\xe3\x81\x82\xe3\x82\x8c\xe3\x81\xb0\xe3\x80\x81 add/remove/copy/rename \xe3\x81\xa8\xe3\x81\x84\xe3\x81\xa3\xe3\x81\x9f hg \xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa8\x98\xe9\x8c\xb2\xe3\x82\x82\xe3\x80\x81 \xe9\x80\x9a\xe5\xb8\xb8\xe3\x81\xa8\xe5\xa4\x89\xe3\x82\x8f\xe3\x82\x8a\xe3\x81\xaa\xe3\x81\x8f\xe6\xa9\x9f\xe8\x83\xbd\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82 git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 'help diffs' \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82 (esc)
>> +  warning: please use " instead of ' for hg ... "..."
>
> Is this desirable or a false positive we're willing to live with?
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
via Mercurial-devel - April 6, 2016, 10:06 p.m.
On Wed, Apr 6, 2016 at 3:04 PM, timeless <timeless@gmail.com> wrote:
> No -- it's a true positive and should be fixed.

That's what I meant by "desirable" :-) I couldn't tell whether the
'help diffs' referred to a command that should be quoted using double
quotes or not. Thanks for clarifying. Again, would have helped to have
that in the commit message from the beginning.

> But it's in a localization, and there's half a policy of not stomping
> on localizations.
>
> I could have "fixed" it myself, or removed the translation leaving it
> for them to translate again later, but both are considered rude.
>
> 2016-04-06 16:50 GMT-04:00 Martin von Zweigbergk via Mercurial-devel
> <mercurial-devel@mercurial-scm.org>:
>> 2016-04-04 2:31 GMT-07:00 timeless <timeless@mozdev.org>:
>>> # HG changeset patch
>>> # User timeless <timeless@mozdev.org>
>>> # Date 1452591057 0
>>> #      Tue Jan 12 09:30:57 2016 +0000
>>> # Node ID 3b0f25d82ea78c185b5b67a098d8adf58e3da2ba
>>> # Parent  3f37daec9b438013c6192e128bca472b6ec944e9
>>> docchecker: try to reject single quotes
>>>
>>> diff --git a/doc/docchecker b/doc/docchecker
>>> --- a/doc/docchecker
>>> +++ b/doc/docchecker
>>> @@ -16,6 +16,8 @@
>>>      """warning: please avoid nesting ' in :hg:`...`"""),
>>>    (r'\w:hg:`',
>>>      'warning: please have a space before :hg:'),
>>> +  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
>>> +    '''warning: please use " instead of ' for hg ... "..."'''),
>>>  ]
>>>
>>>  def check(line):
>>> diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
>>> --- a/tests/test-gendoc-ja.t
>>> +++ b/tests/test-gendoc-ja.t
>>> @@ -2,3 +2,5 @@
>>>
>>>    $ $TESTDIR/check-gendoc ja
>>>    checking for parse errors
>>> +  \xe8\xa4\x87\xe8\xa3\xbd\xef\xbc\x8f\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x99\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe4\xbf\x9d\xe5\xad\x98\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xab git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8(-g/--git \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\x84 \xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xae [diff] git=1 \xe8\xa8\x98\xe8\xbf\xb0)\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xa7\xe3\x81\x82\xe3\x82\x8c\xe3\x81\xb0\xe3\x80\x81 add/remove/copy/rename \xe3\x81\xa8\xe3\x81\x84\xe3\x81\xa3\xe3\x81\x9f hg \xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa8\x98\xe9\x8c\xb2\xe3\x82\x82\xe3\x80\x81 \xe9\x80\x9a\xe5\xb8\xb8\xe3\x81\xa8\xe5\xa4\x89\xe3\x82\x8f\xe3\x82\x8a\xe3\x81\xaa\xe3\x81\x8f\xe6\xa9\x9f\xe8\x83\xbd\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82 git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 'help diffs' \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82 (esc)
>>> +  warning: please use " instead of ' for hg ... "..."
>>
>> Is this desirable or a false positive we're willing to live with?
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
via Mercurial-devel - April 6, 2016, 11:23 p.m.
Queued up to here. Thanks!

2016-04-04 2:31 GMT-07:00 timeless <timeless@mozdev.org>:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1452591057 0
> #      Tue Jan 12 09:30:57 2016 +0000
> # Node ID 3b0f25d82ea78c185b5b67a098d8adf58e3da2ba
> # Parent  3f37daec9b438013c6192e128bca472b6ec944e9
> docchecker: try to reject single quotes
>
> diff --git a/doc/docchecker b/doc/docchecker
> --- a/doc/docchecker
> +++ b/doc/docchecker
> @@ -16,6 +16,8 @@
>      """warning: please avoid nesting ' in :hg:`...`"""),
>    (r'\w:hg:`',
>      'warning: please have a space before :hg:'),
> +  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
> +    '''warning: please use " instead of ' for hg ... "..."'''),
>  ]
>
>  def check(line):
> diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
> --- a/tests/test-gendoc-ja.t
> +++ b/tests/test-gendoc-ja.t
> @@ -2,3 +2,5 @@
>
>    $ $TESTDIR/check-gendoc ja
>    checking for parse errors
> +  \xe8\xa4\x87\xe8\xa3\xbd\xef\xbc\x8f\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x99\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe4\xbf\x9d\xe5\xad\x98\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xab git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8(-g/--git \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\x84 \xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xae [diff] git=1 \xe8\xa8\x98\xe8\xbf\xb0)\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xa7\xe3\x81\x82\xe3\x82\x8c\xe3\x81\xb0\xe3\x80\x81 add/remove/copy/rename \xe3\x81\xa8\xe3\x81\x84\xe3\x81\xa3\xe3\x81\x9f hg \xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa8\x98\xe9\x8c\xb2\xe3\x82\x82\xe3\x80\x81 \xe9\x80\x9a\xe5\xb8\xb8\xe3\x81\xa8\xe5\xa4\x89\xe3\x82\x8f\xe3\x82\x8a\xe3\x81\xaa\xe3\x81\x8f\xe6\xa9\x9f\xe8\x83\xbd\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82 git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 'help diffs' \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82 (esc)
> +  warning: please use " instead of ' for hg ... "..."
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/doc/docchecker b/doc/docchecker
--- a/doc/docchecker
+++ b/doc/docchecker
@@ -16,6 +16,8 @@ 
     """warning: please avoid nesting ' in :hg:`...`"""),
   (r'\w:hg:`',
     'warning: please have a space before :hg:'),
+  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
+    '''warning: please use " instead of ' for hg ... "..."'''),
 ]
 
 def check(line):
diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
--- a/tests/test-gendoc-ja.t
+++ b/tests/test-gendoc-ja.t
@@ -2,3 +2,5 @@ 
 
   $ $TESTDIR/check-gendoc ja
   checking for parse errors
+  \xe8\xa4\x87\xe8\xa3\xbd\xef\xbc\x8f\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x99\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe4\xbf\x9d\xe5\xad\x98\xe3\x81\xae\xe3\x81\x9f\xe3\x82\x81\xe3\x81\xab git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8(-g/--git \xe6\x8c\x87\xe5\xae\x9a\xe3\x82\x84 \xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xae [diff] git=1 \xe8\xa8\x98\xe8\xbf\xb0)\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xa7\xe3\x81\x82\xe3\x82\x8c\xe3\x81\xb0\xe3\x80\x81 add/remove/copy/rename \xe3\x81\xa8\xe3\x81\x84\xe3\x81\xa3\xe3\x81\x9f hg \xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe5\xb1\xa5\xe6\xad\xb4\xe8\xa8\x98\xe9\x8c\xb2\xe3\x82\x82\xe3\x80\x81 \xe9\x80\x9a\xe5\xb8\xb8\xe3\x81\xa8\xe5\xa4\x89\xe3\x82\x8f\xe3\x82\x8a\xe3\x81\xaa\xe3\x81\x8f\xe6\xa9\x9f\xe8\x83\xbd\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82 git \xe5\xb7\xae\xe5\x88\x86\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xab\xe9\x96\xa2\xe3\x81\x97\xe3\x81\xa6\xe3\x81\xaf\xe3\x80\x81 'help diffs' \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82 (esc)
+  warning: please use " instead of ' for hg ... "..."