Re: [RFC/PATCH] Make --full-history consider more merges

From: Kevin Bracey <kevin@bracey.fi>
Date: Apr 25, 2013, 15:48 UTC
Message-ID: <5179505F.2000108@bracey.fi>
In-Reply-To: <7v61zb8j5d.fsf@alter.siamese.dyndns.org>

On 25/04/2013 04:59, Junio C Hamano wrote:

Show 11 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>>> So, given all that, revised patch below:
> I tried to squeeze the minimum test I sent $gmane/220919 to the test
> suite.  I think the "do not use --parents option for this test"
> switch needs to be cleaned up a bit more, but it fails without your
> patch and does pass with your patch.
>
> I somehow was hoping that your fix to TREESAME semantics would also
> correct the known breakage documented in that test, but it seems
> that I was too greedy ;-)

Thanks for the test addition. Maybe we will be able to satisfy your greed in this series. There could be more worth doing here, and I think getting TREESAME precise is key.

I think I do want to take the step of storing "treesame per parent". And once we do that, as well as avoiding the expensive re-diff, we have much richer information readily available as a simplification input (and output).

I'm working on a patch that does this - filling in an initial treesame[] array as a decoration in try_to_simplify_commit() is easy, and maintaining the array through later parent rewrites isn't as onerous as I feared - there are only a few places that rewrite parents after the initial scan. With a couple of helper functions to do things like "delete nth", I think it'll be quite tidy.

I believe that simplify_merges itself needs at least one addition, and could use the treesame[] array to do it: if after doing reduce_heads, a commit is now different to all remaining parents, but there was a TREESAME parent eliminated, that parent should be reinstated. That would clearly highlight missed merges, showing both that "older" TREESAME parent and the newer !TREESAME parent that would have been taken in a normal merge.

And maybe there's more simplify_merges could do, if it had this full TREESAME information available.

(But even after you do all this stuff to get the right commits out, we then hit a niggle of mine that gitk forces --cc diffs - even if it shows shows the offending merge commit, you can't get it to do a diff...)

Kevin