[PATCH 2 of 9 mergedriver] filemerge: turn filemerge.filemerge into a class

[Siddharth Agarwal]

On 10/7/15 11:55 AM, Augie Fackler wrote:
>> On Oct 7, 2015, at 14:31, Siddharth Agarwal <sid at less-broken.com> wrote:
>>
>> On 10/7/15 11:04 AM, Augie Fackler wrote:
>>>>> -def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
>>>>> -    """perform a 3-way merge in the working directory
>>>>> +class mergectx(object):
>>>>> +    """perform a 3-way merge in the working directory"""
>>> it looks like this docstring lost its way and wants to live on
>>> mergectx.merge()? and then this type wants to be documented as a state
>>> container for merges or something like that
>>>
>> Yeah, I think you're right. Any chance you could you fix it in flight, Pierre-Yves?
> I've poked a followup midstream (which we can fold if people care), and have queued the whole series.

I'm trying out a cleaner alternative implementation using coroutines, so 
could you please drop patch 2 and your followup for now? (Patch 1 still 
needs to be there because I need the extra level of indentation to catch 
GeneratorExit). Patches 3 onwards apply cleanly even without patch 2.

I think I used to have clowncopter access, but apparently not any longer.

- Siddharth


>
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel