[PATCH 3 of 3] run-tests: accept '\' vs '/' path differences without '(glob)'

Augie Fackler raf at durin42.com
Sun Dec 10 18:28:03 EST 2017


> On Dec 10, 2017, at 5:39 PM, Matt Harbison <mharbison72 at gmail.com> wrote:
> 
> On Sun, 10 Dec 2017 16:48:26 -0500, Augie Fackler <raf at durin42.com> wrote:
> 
>> 
>>> On Dec 10, 2017, at 3:47 PM, Matt Harbison <mharbison72 at gmail.com> wrote:
>>> 
>>> # HG changeset patch
>>> # User Matt Harbison <matt_harbison at yahoo.com>
>>> # Date 1512882971 18000
>>> #      Sun Dec 10 00:16:11 2017 -0500
>>> # Node ID ebc7a05d9389989fc2e81d30fa1c10dd01be9a76
>>> # Parent  e1119050f15e2169ac766e6a69eeab70729e9e40
>>> run-tests: accept '\' vs '/' path differences without '(glob)’
>> 
>> series queued, many thanks
>> 
>> […]
>> 
>>> It's probably unreasonable to submit a single patch that wipes out all of the
>>> (glob) instances that were only used to hide path differences, given the churn
>>> from other contributors.  Since their presence isn't harming the tests, these
>>> can be removed through attrition.
>> 
>> You could do it if you wanted with a skip-blame annotation as was done in d92dc725223b. Then we can pass the right filter to `hg annotate` and not see the noop changes. Not a requirement though, don’t feel obligated to do so.
> 
> I hadn't thought of blame- I was more worried about import conflicts.  Does skip-blame somehow help the import tools?

Sadly no, but I’ve often worked around issues like that by importing at the parent revision listed in the patch header and then using rebase so I get a proper merge tool. And we’d likely only get patches with such conflicts for a week or two...

> Probably a rough approximation:
> 
> $ grep '(glob)' *.t | grep -v '[*?]' | wc -l
> 1125
> 
> Without the negative filter, it's 3216.
> 
> (If I knew the equivalent regex, it should be trivial to pipe it through sed, and see what blows up.)

I’d probably write a tool in Python to do this replacement, because I’m lazy and it’d be less work for my brain.



More information about the Mercurial-devel mailing list