Patchwork [1,of,2] test-help: tighten grep patterns

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 14, 2015, 6:05 a.m.
Message ID <ab3fdce6469850a88152.1450073112@waste.org>
Download mbox | patch
Permalink /patch/12030/
State Accepted
Commit 55ac8006880f8f430eb308c7c00775fdcde8ac9a
Headers show

Comments

timeless@mozdev.org - Dec. 14, 2015, 6:05 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450072832 0
#      Mon Dec 14 06:00:32 2015 +0000
# Node ID ab3fdce6469850a8815205d6f328e16ea3b3dde8
# Parent  944af8e2eb4cddf96ba5b8a96854528b40979715
test-help: tighten grep patterns

Help should output section headings, but no debug commands
Matt Harbison - Dec. 15, 2015, 3:10 a.m.
On Mon, 14 Dec 2015 01:05:12 -0500, timeless <timeless@mozdev.org> wrote:

> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450072832 0
> #      Mon Dec 14 06:00:32 2015 +0000
> # Node ID ab3fdce6469850a8815205d6f328e16ea3b3dde8
> # Parent  944af8e2eb4cddf96ba5b8a96854528b40979715
> test-help: tighten grep patterns

This one solves my original problem, thanks.

Didn't you say that you meant to check 'debug' with -k?

> Help should output section headings, but no debug commands
>
> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -1053,11 +1053,11 @@
> Test -e / -c / -k combinations
> -  $ hg help -c|egrep '^\S|debug'
> +  $ hg help -c|egrep '^[A-Z].*:|^ debug'
>    Commands:
> -  $ hg help -e|egrep '^\S'
> +  $ hg help -e|egrep '^[A-Z].*:|^ debug'
>    Extensions:
> -  $ hg help -k|egrep '^\S'
> +  $ hg help -k|egrep '^[A-Z].*:'
>    Topics:
>    Commands:
>    Extensions:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
Matt Harbison - Dec. 15, 2015, 3:15 a.m.
On Mon, 14 Dec 2015 22:10:58 -0500, Matt Harbison <mharbison72@gmail.com>  
wrote:

> On Mon, 14 Dec 2015 01:05:12 -0500, timeless <timeless@mozdev.org> wrote:
>
>> # HG changeset patch
>> # User timeless <timeless@mozdev.org>
>> # Date 1450072832 0
>> #      Mon Dec 14 06:00:32 2015 +0000
>> # Node ID ab3fdce6469850a8815205d6f328e16ea3b3dde8
>> # Parent  944af8e2eb4cddf96ba5b8a96854528b40979715
>> test-help: tighten grep patterns
>
> This one solves my original problem, thanks.
>
> Didn't you say that you meant to check 'debug' with -k?

Sorry, nevermind.  I didn't see the second patch.

>> Help should output section headings, but no debug commands
>>
>> diff --git a/tests/test-help.t b/tests/test-help.t
>> --- a/tests/test-help.t
>> +++ b/tests/test-help.t
>> @@ -1053,11 +1053,11 @@
>> Test -e / -c / -k combinations
>> -  $ hg help -c|egrep '^\S|debug'
>> +  $ hg help -c|egrep '^[A-Z].*:|^ debug'
>>    Commands:
>> -  $ hg help -e|egrep '^\S'
>> +  $ hg help -e|egrep '^[A-Z].*:|^ debug'
>>    Extensions:
>> -  $ hg help -k|egrep '^\S'
>> +  $ hg help -k|egrep '^[A-Z].*:'
>>    Topics:
>>    Commands:
>>    Extensions:
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1053,11 +1053,11 @@ 
 
 Test -e / -c / -k combinations
 
-  $ hg help -c|egrep '^\S|debug'
+  $ hg help -c|egrep '^[A-Z].*:|^ debug'
   Commands:
-  $ hg help -e|egrep '^\S'
+  $ hg help -e|egrep '^[A-Z].*:|^ debug'
   Extensions:
-  $ hg help -k|egrep '^\S'
+  $ hg help -k|egrep '^[A-Z].*:'
   Topics:
   Commands:
   Extensions: