2008/6/23 Karl Hasselström <kha@xxxxxxxxxxx>: > On 2008-06-20 10:14:29 +0100, Catalin Marinas wrote: > >> 2008/6/19 Karl Hasselström <kha@xxxxxxxxxxx>: >> > I'd actually say the opposite: until we have a good visualizer >> > that doesn't need the simplified log, we need to have the >> > simplified log. If I actually have to look at the diffs in the >> > log, I find gitk indispensible. >> >> And what would the simplified log contain if we decide to go with a >> new scheme? In your proposal, it points to the tree of main log and >> you get the diff of diffs (which also means that the diffs must be >> generated for every modification of a patch). Would this be the >> same? Again, I worry a bit about the overhead to generate the patch >> diff for every push (with refresh I'm OK). It can be optimised as in >> the stable branch where we try git-apply followed by a three-way >> merge (which, BTW, I'd like added before 0.15). If git-apply >> succeeds, there is no need to re-generate the diff. > > Yes, I was imagining a simplified log precisely like the one I've > currently implemented (a tree with one blob per patch, which contains > the message, the diff, and some other odds and ends such as the > author). At a first look, I'm OK with a simplified log. > Two optimizations would hopefully make it fast: > > 1. If the patch's sha1 hasn't changed, we don't have to regenerate > the diff. > > 2. If the patch's sha1 has changed, but git apply was sufficient > during the merge stage, we can just reuse that patch. We do have > to write it to a blob, but we have already generated the diff and > don't need to do so again. (I've shamelessly stolen your idea > here.) It can be optimised a bit more to actually apply the diff in the blob directly rather than the current way of generating the diff (since we don't store the diff). > In most cases, (1) would make sure that only a small handful of > patches would need to be considered. In the cases where a lot of > patches are touched, such as rebase, (2) would provide a good speedup > (except for the cases where we had to call merge-recursive, and those > are slow anyway). I think it should work. Rebase is indeed my worry but it might be even faster for most of the patches to apply the blob than computing the diff. In my experience with the Linux kernel, full merge is rarely needed. -- Catalin -- 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
