[PATCH 1 of 2 V2] merge: separate read-only mergestate into separate module

Simon Farnsworth simonfar at fb.com
Thu Mar 10 09:10:02 EST 2016


On 10/03/2016, 13:57, "Pierre-Yves David" <pierre-yves.david at ens-lyon.org> wrote:


>On 03/07/2016 06:27 PM, Simon Farnsworth wrote:
>> # HG changeset patch
>> # User Simon Farnsworth <simonfar at fb.com>
>> # Date 1456843967 0
>> #      Tue Mar 01 14:52:47 2016 +0000
>> # Node ID d92485c84727d67bcbf462b26dcfc1b7c746d07d
>> # Parent  c7f89ad87baef87f00c507545dfd4cc824bc3131
>> merge: separate read-only mergestate into separate module
>>
>> This is code motion to prepare for revset predicates that read the
>> mergestate; without this code motion, there would be import loops.
>
>The fact you can (and have to) split the mergestate object into 2 
>subclass, one for the data and one for the action, seems to hint that 
>this should be two distinct objects. What do you think ?

That sounds like a nicer split. Will rework to match this suggestion.

-- 
Simon




More information about the Mercurial-devel mailing list