Re: [PATCH v3 1/3] Implement the patience diff algorithm

From: Davide Libenzi <davidel@xmailserver.org>
Date: Jan 7, 2009, 20:09 UTC
Message-ID: <alpine.DEB.1.10.0901071159060.17115@alien.or.mcafeemobile.com>
In-Reply-To: <alpine.DEB.1.00.0901071924350.7496@intel-tinevez-2-302>

On Wed, 7 Jan 2009, Johannes Schindelin wrote:

Show 12 quoted lines

> Heh.
> 
> Could it be that you misread my patch, and assumed that I faked an 
> xdfenv?
> 
> I did not, but instead faked two mmfiles, which is only as simple as I did 
> it because in git.git, we only have contiguous mmfiles.  (I recall that 
> libxdiff allows for ropes instead of arrays.)
> 
> The way I did it has one big shortcoming: I need to prepare an xdfenv for 
> the subfiles even if I already prepared one for the complete files.  IOW 
> the lines are rehashed all over again.

I told you I just glanced at the code :) In that way, if you guys decide to merge this new algo, you'll need to split the prepare from the optimize, and feed it with an already prepared env. Before going that way, have you ever tried to tweak xdl_cleanup_records and xdl_clean_mmatch to reduce the level of optimization, and see the results you get? It is possible that you won't need two different algos inside git.

- Davide