Hi, On Tue, 4 Nov 2008, Pierre Habouzit wrote: > The nasty thing about the patience diff is that it still needs the usual > diff algorithm once it has split the file into chunks separated by > "unique lines". Actually, it should try to apply patience diff again in those chunks, separately. > So you cannot make really independant stuff. What I could do is put most > of the xpatience diff into xpatience.c but it would still have to use > some functions from xdiffi.c that are currently private, so it messes > somehow the files more than it's worth IMHO. I think it is better that you use the stuff from xdiffi.c through a well defined interface, i.e. _not_ mess up the code by mingling it together with the code in xdiffi.c. The code is hard enough to read already. Oh, BTW, "ha" is a hash of the lines which is used to make the line matching more performant. You will see a lot of "ha" comparisons before actually calling xdl_recmatch() for that reason. Incidentally, this is also the hash that I'd use for the hash multi-set I was referring to. Oh, and I am not sure that it is worth your time trying to get it to run with the linear list, since you cannot reuse that code afterwards, and have to spend the same amount of time to redo it with the hash set. I am awfully short on time, so it will take some days until I can review what you have already, unfortunately. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
