On 05/30/17 16:35, Ævar Arnfjörð Bjarmason wrote: > On Tue, May 30, 2017 at 3:37 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: >> >>> Just curious do you know about https://github.com/trast/tbdiff ? If >>> not it might have a high overlap with what you're doing. Thank you for the suggestion, it does exactly what I need. It solves the Assignment Problem a whole lot better than my current, crude script. https://en.wikipedia.org/wiki/Assignment_problem https://en.wikipedia.org/wiki/Hungarian_algorithm (Mildly amusing, to me anyway: I happen to be Hungarian.) The output of git-tbdiff is not exactly the way I like it (I like to review interdiffs colorized, and fed to $PAGER individually), but I can easily do that on top of the "--no-patches" output. >> Yes, that is a very good suggestion. You'd need to be able to >> actually apply the patches but the way I often do a review is very >> similar to (actually, I'd say it is identical workflow) Laszlo's, >> and it goes like this: >> >> $ git checkout topic ;# previous round >> $ git checkout master... ;# check out the fork point of previous one >> $ git am mbox ;# apply the updated one >> $ git tbdiff ..@{-1} @{-1}.. > > I wonder if this tool seemingly everyone on-list uses should just be > integrated into git.git. > > I only learned about it <2 weeks ago and it's been great. The diff > output was a bit nonsensical in some cases because it uses python's > diff engine instead of git's. Yes, I'd probably plug in git's diff engine (the patience algorithm at that). > > Would you mind patches to just integrate it to git in python as-is, > then we could slowly convert it to C as we're doing with everything > else. That would be wonderful. My preference would be to use core git features for solving the problem; as a second preference, it would be great if git-tbdiff were packaged & shipped by GNU/Linux distros. Thomas (I see you are on To:/Cc: now -- I meant to CC you, snarfing your email from the git.git history :) ), are you aware of any distros already packaging git-tbdiff? Still the best would be if git provided this feature out of the box; incremental review of rerolled series appears a common activity for any serious reviewer / subsystem co-maintainer. Thanks! Laszlo