On Wed, Mar 17, 2021 at 3:23 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > Many topics marked as "Will cook in 'next'" should be marked for > merging to 'master' now, but that hasn't happened yet. Please > nominate those that should be kicked back from 'next' to 'seen', if > there are any. Please also nominate those that should be among the > first batch of topics to be in 'master' (after a handful of 2.31 > regression fixes go through 'next' down to 'master', that is). Will do; I'll also point out a few topics that have been reviewed but haven't been picked up yet. > * en/ort-perf-batch-9 (2021-03-10) 8 commits > - diffcore-rename: avoid doing basename comparisons for irrelevant sources > - merge-ort: skip rename detection entirely if possible > - merge-ort: use relevant_sources to filter possible rename sources > - merge-ort: precompute whether directory rename detection is needed > - merge-ort: introduce wrappers for alternate tree traversal > - merge-ort: add data structures for an alternate tree traversal > - merge-ort: precompute subset of sources for which we need rename detection > - diffcore-rename: enable filtering possible rename sources > (this branch uses en/ort-perf-batch-8.) > > More ort. Can I suggest an alternate title? "merge-ort optimization of skipping irrelevant renames" or anything that gets the idea of "skipping irrelevant renames" in there. > Ready? Yeah, I think it's ready; I'm not aware of any needed changes. Reviewed by Stolee at [1] and [2] [1] https://lore.kernel.org/git/c4ce57f2-fc02-a70c-5ecb-0911a551192c@xxxxxxxxx/ [2] https://lore.kernel.org/git/4aed9cc6-b133-b398-353c-9618439c7b8b@xxxxxxxxx/ Sidenote: This patch series was the single best thing in all of merge-ort. I was really hoping more people would read just the cover letter, even if they read none of the patches or even none of the other cover letters. (As Stolee said, 'These are _very_ impressive numbers for such a "simple" idea.'). > * en/ort-perf-batch-8 (2021-02-26) 10 commits > (merged to 'next' on 2021-03-07 at f03b2c1acd) > + diffcore-rename: compute dir_rename_guess from dir_rename_counts > + diffcore-rename: limit dir_rename_counts computation to relevant dirs > + diffcore-rename: compute dir_rename_counts in stages > + diffcore-rename: extend cleanup_dir_rename_info() > + diffcore-rename: move dir_rename_counts into dir_rename_info struct > + diffcore-rename: add function for clearing dir_rename_count > + Move computation of dir_rename_count from merge-ort to diffcore-rename > + diffcore-rename: add a mapping of destination names to their indices > + diffcore-rename: provide basic implementation of idx_possible_rename() > + diffcore-rename: use directory rename guided basename comparisons > (this branch is used by en/ort-perf-batch-9.) > > Rename detection rework continues. > > Will cook in 'next'. I think it's ready to merge to master. -------------------------------------------------- [Not yet cooking] Here are some reviewed topics that haven't been cooking yet, that I personally think are worth picking up (at least for seen and probably for next rather soonish): * Matheus' add-rm-sparse-checkout work: https://lore.kernel.org/git/CABPp-BEriPaDY=84=j0tT62+U93jKePTyTKPZA4+dYtSFJaSTg@xxxxxxxxxxxxxx/ * Stolee's first sparse-index series: https://lore.kernel.org/git/pull.883.v3.git.1615912983.gitgitgadget@xxxxxxxxx/ * My ort-perf-batch-10 ("skip even more irrelevant renames") series: https://lore.kernel.org/git/8422759a-a4a3-4dc6-4ae7-4a61896b9946@xxxxxxxxx/; (the review comment there is addressed by the next patch series in this list) * My "declare merge-ort stable" series at https://lore.kernel.org/git/pull.905.v2.git.1616016485.gitgitgadget@xxxxxxxxx/ (though most the reviews were on the separate-at-the-time topic at https://lore.kernel.org/git/pull.973.v2.git.git.1615271086.gitgitgadget@xxxxxxxxx/ ). Actually, only the first 12 patches are reviewed, but the last one is testing code rather than source code, so close enough for at least picking up?
