On Wed, Jun 30, 2021 at 3:58 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: I've started reviewing v7 of ds/status-with-sparse-index and will also look at ds/commit-and-checkout-with-sparse-index afterwards. > * en/ort-perf-batch-13 (2021-06-28) 5 commits > - merge-ort: add prefetching for content merges > - diffcore-rename: use a different prefetch for basename comparisons > - diffcore-rename: allow different missing_object_cb functions > - t6421: add tests checking for excessive object downloads during merge > - promisor-remote: output trace2 statistics for number of objects fetched > > Performance tweaks of "git merge -sort" around lazy fetching of objects. Most of the discussion on this series was actually about related improvements and ideas, with both Stolee and I agreeing those belong outside this particular series. I also tried to ask Jonathan Tan to review since it was based upon his similar work to do the original prefetching in diffcore-rename, but I think he's been busy. I'm not aware of further tweaks needed right now, but it's not at all clear to me whether I addressed your and Stolee's feedback to each of your satisfaction. So this one could potentially be marked "Waiting for reviews (to finalize)" > * en/zdiff3 (2021-06-15) 2 commits > - update documentation for new zdiff3 conflictStyle > - xdiff: implement a zealous diff3, or "zdiff3" > > "Zealous diff3" style of merge conflict presentation has been added. > > Expecting a reroll. > cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@xxxxxxxxxxxxxx> I've got some updates for this RFC series (in part thanks to Phillip's awesome digging!), including some tests. However, I've also got a clear testcase failure, and another I-know-I-saw-a-real-problem-in-real-testing-but-lost-the-details issue. So I may wait a while to resend. > * pw/diff-color-moved-fix (2021-06-15) 10 commits > - diff --color-moved: intern strings > - diff --color-moved-ws=allow-indentation-change: improve hash lookups > - diff --color-moved: stop clearing potential moved blocks > - diff --color-moved: shrink potential moved blocks as we go > - diff --color-moved: unify moved block growth functions > - diff --color-moved: call comparison function directly > - diff --color-moved-ws=allow-indentation-change: simplify and optimize > - diff: simplify allow-indentation-change delta calculation > - diff --color-moved: avoid false short line matches and bad zebra coloring > - diff --color-moved=zebra: fix alternate coloring > > Long-overdue correctness and performance update to "diff > --color-moved" feature. > > Waiting for reviews. I read through the first half the patches or so and didn't spot anything wrong, though I'm very unfamiliar with this code area and don't yet understand much of what's going on; it was more of a spot check. I'll try to get back to it again, but my review probably won't be that deep. > * en/ort-perf-batch-12 (2021-06-09) 4 commits > - merge-ort: miscellaneous touch-ups > - Fix various issues found in comments > - diffcore-rename: avoid unnecessary strdup'ing in break_idx > - merge-ort: replace string_list_df_name_compare with faster alternative > > More fix-ups and optimization to "merge -sort". > > Will merge to 'next'. Sounds good, thanks. As far as I can tell, I addressed everyone's feedback a month or more ago (including getting Stolee's Reviewed-by); no changes since then. > * ab/send-email-optim (2021-05-28) 13 commits > - perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd() > - send-email: move trivial config handling to Perl > - perl: lazily load some common Git.pm setup code > - send-email: lazily load modules for a big speedup > - send-email: get rid of indirect object syntax > - send-email: use function syntax instead of barewords > - send-email: lazily shell out to "git var" > - send-email: lazily load config for a big speedup > - send-email: copy "config_regxp" into git-send-email.perl > - send-email: refactor sendemail.smtpencryption config parsing > - send-email: remove non-working support for "sendemail.smtpssl" > - send-email tests: test for boolean variables without a value > - send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true > > "git send-email" optimization. > > Will merge to 'next'. Wahoo!
