[PATCH 2 of 6] filemerge: turn filemerge into a generator

Siddharth Agarwal sid at less-broken.com
Sun Oct 11 12:57:14 CDT 2015


On 10/11/15 10:48, Matt Mackall wrote:
> So the plan is to stash the generator objects in a list for later 
> completion? What resources are held from one call to the other? Temp 
> files? Filectxs and associated filelogs and their caches? For a 
> disastrous merge, this could exhaust memory or /tmp for some people.

Yeah, both of those. The memory use is a good point and one I hadn't 
considered -- I guess I'll have to rework this a bit :)

Please drop patch 2 onwards, and the set of 5 I sent after that. I'll 
clean all this up -- shouldn't be too much work -- and send a V2.

- Siddharth


>
> We should generally assume we've only got enough memory to work on one
> file at a time. This maximizes the size of the largest file people can
> work on.
>



More information about the Mercurial-devel mailing list