Hi, On Fri, 9 Jan 2009, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > On Thu, 8 Jan 2009, Junio C Hamano wrote: > > > >> If we find the "common" context lines that have only blank and > >> punctuation letters in Dscho output, turn each of them into "-" and "+", > >> and rearrange them so that all "-" are together followed by "+", it will > >> match Bzr output. > > > > So we'd need something like this (I still think we should treat curly > > brackets the same as punctuation, and for good measure I just handled > > everything that is not alphanumerical the same): > > I meant by punctuation to include curlies (my wording may have been wrong > but from the example with " }" line it should have been obvious). > > But I agree with both points Linus raised. The criteria to pick what to > pretend unmatching should be "small insignificant lines" (small goes for > both size and also number of consecutive "insignificant" lines), and the > coallescing should be done to join a block of consecutive changed lines of > a significant size (so you do not join two 1 or 2-line "changed line" > blocks by pretending that a 1-line unchanged insignificant line in between > them is unmatching). Of course, the number should be configurable as with the inter-hunk context. However, I'll not have much time to work on this feature, and it would definitely need some experimenting to find the best parameters, e.g. maximal number of inter-hunk lines, maybe even an inter-hunk/hunk ratio, alnums, or as Linus suggests the length of the line (of which I am still not convinced). 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
