[PATCH 4 of 4 more-matchers] manifestmerge: have manifest do matching before diffing

[Augie Fackler]

> On Dec 15, 2015, at 5:38 PM, Matt Mackall <mpm at selenic.com> wrote:
> 
> On Tue, 2015-12-15 at 16:36 -0600, Matt Mackall wrote:
>> On Tue, 2015-12-15 at 12:56 -0500, Augie Fackler wrote:
>>> On Tue, Dec 15, 2015 at 12:15 AM, Martin von Zweigbergk
>>> <martinvonz at google.com> wrote:
>>>> 
>>>> 
>>>> On Mon, Dec 14, 2015 at 7:20 PM Augie Fackler <raf at durin42.com>
>>>> wrote:
>>>>> 
>>>>> # HG changeset patch
>>>>> # User Augie Fackler <augie at google.com>
>>>>> # Date 1450144641 18000
>>>>> #      Mon Dec 14 20:57:21 2015 -0500
>>>>> # Node ID 7048ea9ba5b92e4f582524463a6167039fa44eeb
>>>>> # Parent  5eee49ed60caa99be140f7f80ac7fb07f1c0324d
>>>>> manifestmerge: have manifest do matching before diffing
>>>>> 
>>>>> This means that the diff code does less work, potentially
>>>>> significantly less in the case of treemanifests. It also should
>>>>> help
>>>>> with narrowed clone cases (such as narrowhg) when we don't
>>>>> always
>>>>> have
>>>>> the entire set of treemanifest revlogs locally.
>>>> 
>>>> 
>>>> Looks good to me. I'd simplify that definition of "partial" in
>>>> flight and
>>>> queue if only the clowncopter had been up. And perhaps it
>>>> appropriate for
>>>> someone not from the same company looks at it too.
>>> 
>>> Per an irc conversation I've added some mozilla-central timing
>>> information and pushed these to the clowncopter. Thanks!
>> 
>> This timing info is mystifying:
> 
> Also, what appears to be a stray verify hunk has snuck in. Dropping for
> now.

Mailed a v2 with timing info dropped (marmoute suggested that benchmark, I should have confirmed it mattered). As far as I can tell this is a barely-used codepath anyway (with the matcher), so I’m not too worried about timing overall.

Sorry about that verify hunk. That’s mystifying to me. I suspect an evolve bug (in grab), but have no supporting evidence.

> 
> -- 
> Mathematics is the supreme nostalgia of our time.
>