Patchwork [2,of,3] revsetbenchmark: allow comment ('#' prefix) in the revset input

login
register
mail settings
Submitter Pierre-Yves David
Date Sept. 24, 2014, 12:31 a.m.
Message ID <d557d5e8020445bdc3ab.1411518677@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/5945/
State Accepted
Headers show

Comments

Pierre-Yves David - Sept. 24, 2014, 12:31 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1411517359 25200
#      Tue Sep 23 17:09:19 2014 -0700
# Node ID d557d5e8020445bdc3ab5f5b0763eca00d111c04
# Parent  b0b9aadb625d62922eb6dae164b9934f314807db
revsetbenchmark: allow comment ('#' prefix) in the revset input
Sean Farley - Sept. 24, 2014, 1:49 a.m.
Pierre-Yves David writes:

> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1411517359 25200
> #      Tue Sep 23 17:09:19 2014 -0700
> # Node ID d557d5e8020445bdc3ab5f5b0763eca00d111c04
> # Parent  b0b9aadb625d62922eb6dae164b9934f314807db
> revsetbenchmark: allow comment ('#' prefix) in the revset input
>
> diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
> --- a/contrib/revsetbenchmarks.py
> +++ b/contrib/revsetbenchmarks.py
> @@ -92,11 +92,11 @@ target_rev = args[0]
>  
>  revsetsfile = sys.stdin
>  if options.file:
>      revsetsfile = open(options.file)
>  
> -revsets = [l.strip() for l in revsetsfile]
> +revsets = [l.strip() for l in revsetsfile if not l.startswith('l')]

Am I missing something or is 'l' a typo?
Pierre-Yves David - Sept. 24, 2014, 3:06 a.m.
On 09/23/2014 06:49 PM, Sean Farley wrote:
>
> Pierre-Yves David writes:
>
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david@fb.com>
>> # Date 1411517359 25200
>> #      Tue Sep 23 17:09:19 2014 -0700
>> # Node ID d557d5e8020445bdc3ab5f5b0763eca00d111c04
>> # Parent  b0b9aadb625d62922eb6dae164b9934f314807db
>> revsetbenchmark: allow comment ('#' prefix) in the revset input
>>
>> diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
>> --- a/contrib/revsetbenchmarks.py
>> +++ b/contrib/revsetbenchmarks.py
>> @@ -92,11 +92,11 @@ target_rev = args[0]
>>
>>   revsetsfile = sys.stdin
>>   if options.file:
>>       revsetsfile = open(options.file)
>>
>> -revsets = [l.strip() for l in revsetsfile]
>> +revsets = [l.strip() for l in revsetsfile if not l.startswith('l')]
>
> Am I missing something or is 'l' a typo?

Looks like I forgot an amend somewhere…

   New programming trend, "l" as a comment prefix!

Should I repost a V2 or will the queuer fix it?
Augie Fackler - Sept. 24, 2014, 2:10 p.m.
On Tue, Sep 23, 2014 at 08:06:43PM -0700, Pierre-Yves David wrote:
>
>
> On 09/23/2014 06:49 PM, Sean Farley wrote:
> >
> >Pierre-Yves David writes:
> >
> >># HG changeset patch
> >># User Pierre-Yves David <pierre-yves.david@fb.com>
> >># Date 1411517359 25200
> >>#      Tue Sep 23 17:09:19 2014 -0700
> >># Node ID d557d5e8020445bdc3ab5f5b0763eca00d111c04
> >># Parent  b0b9aadb625d62922eb6dae164b9934f314807db
> >>revsetbenchmark: allow comment ('#' prefix) in the revset input
> >>
> >>diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
> >>--- a/contrib/revsetbenchmarks.py
> >>+++ b/contrib/revsetbenchmarks.py
> >>@@ -92,11 +92,11 @@ target_rev = args[0]
> >>
> >>  revsetsfile = sys.stdin
> >>  if options.file:
> >>      revsetsfile = open(options.file)
> >>
> >>-revsets = [l.strip() for l in revsetsfile]
> >>+revsets = [l.strip() for l in revsetsfile if not l.startswith('l')]
> >
> >Am I missing something or is 'l' a typo?
>
> Looks like I forgot an amend somewhere…
>
>   New programming trend, "l" as a comment prefix!
>
> Should I repost a V2 or will the queuer fix it?

I'll fix it when I queue.

>
>
>
> --
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/revsetbenchmarks.py b/contrib/revsetbenchmarks.py
--- a/contrib/revsetbenchmarks.py
+++ b/contrib/revsetbenchmarks.py
@@ -92,11 +92,11 @@  target_rev = args[0]
 
 revsetsfile = sys.stdin
 if options.file:
     revsetsfile = open(options.file)
 
-revsets = [l.strip() for l in revsetsfile]
+revsets = [l.strip() for l in revsetsfile if not l.startswith('l')]
 
 print "Revsets to benchmark"
 print "----------------------------"
 
 for idx, rset in enumerate(revsets):
diff --git a/contrib/revsetbenchmarks.txt b/contrib/revsetbenchmarks.txt
--- a/contrib/revsetbenchmarks.txt
+++ b/contrib/revsetbenchmarks.txt
@@ -12,18 +12,19 @@  author(mpm) or author(lmoscovicz)
 tip:0
 max(tip:0)
 min(0:tip)
 0::
 min(0::)
+# those two `roots(...)` inputs are close to what phase movement use.
 roots((tip~100::) - (tip~100::tip))
+roots((0::) - (0::tip))
 ::p1(p1(tip))::
 public()
 :10000 and public()
 draft()
 :10000 and draft()
 max(::(tip~20) - obsolete())
 roots((0:tip)::)
 (not public() - obsolete())
-roots((0::) - (0::tip))
 (_intlist('20000\x0020001')) and merge()
 parents(20000)
 (20000::) - (20000)