Hi Elijah, On Fri, 4 May 2018, Elijah Newren wrote: > On Fri, May 4, 2018 at 8:34 AM, Johannes Schindelin > <johannes.schindelin@xxxxxx> wrote: > > The incredibly useful `git-tbdiff` tool to compare patch series (say, to see > > what changed between two iterations sent to the Git mailing list) is slightly > > less useful for this developer due to the fact that it requires the `hungarian` > > and `numpy` Python packages which are for some reason really hard to build in > > MSYS2. So hard that I even had to give up, because it was simply easier to > > reimplement the whole shebang as a builtin command. > > tbdiff is awesome; thanks for bringing it in as a builtin to git. You're welcome. > I've run through a few cases, comparing output of tbdiff and > branch-diff. So far, what I've noted is that they produce largely the > same output except that: > > - tbdiff seems to shorten shas to 7 characters, branch-diff is using > 10, in git.git at least. (Probably a good change) Yes, it is a good change ;-) > - tbdiff aligned output columns better when there were more than 9 > patches (I'll comment more on patch 09/18) I added a new patch to align the patch numbers specifically. I considered squashing it into 9/18, but decided against it: it will make it easier to read through the rationale when calling `git annotate` on those lines. > - As noted elsewhere in the review of round 1, tbdiff uses difflib > while branch-diff uses xdiff. I found some cases where that mattered, > and in all of them, I either felt like the difference was irrelevant > or that difflib was suboptimal, so this is definitely an improvement > for me. Indeed. It is more or less ambiguities that get resolved differently. > - branch-diff produces it's output faster, and it is automatically > paged. This is really cool. :-) It was actually the paging that made the most difference for me. The `git tbdiff` command broke for me as soon as I switched on the pager, as tbdiff got confused by the decoration (AEvar had put up a PR to fix that, but that PR has not even so much as been answered in the meantime, so I thought it'd be a good time to rewrite the entire shebang in C, also because I could not use tbdiff *at all* on Windows due to its hefty dependencies). > Also, I don't have bash-completion for either tbdiff or branch-diff. > :-( But I saw some discussion on the v1 patches about how this gets > handled... :-) Oh? Does 18/18 not work for you? https://public-inbox.org/git/71698f11835311c103aae565a2a761d10f4676b9.1525448066.git.johannes.schindelin@xxxxxx/ Ciao, Dscho
