summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* diffcore-rename: add computation of number of unknown renamesElijah Newren2021-03-182-4/+40
* diffcore-rename: check if we have enough renames for directories early onElijah Newren2021-03-181-10/+63
* diffcore-rename: only compute dir_rename_count for relevant directoriesElijah Newren2021-03-181-5/+22
* merge-ort: record the reason that we want a rename for a directoryElijah Newren2021-03-183-4/+46
* merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren2021-03-183-40/+41
* diffcore-rename: take advantage of "majority rules" to skip more renamesElijah Newren2021-03-181-0/+25
* diffcore-rename: avoid doing basename comparisons for irrelevant sourcesElijah Newren2021-03-111-4/+33
* merge-ort: skip rename detection entirely if possibleElijah Newren2021-03-111-0/+44
* merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren2021-03-111-1/+1
* merge-ort: precompute whether directory rename detection is neededElijah Newren2021-03-111-6/+61
* merge-ort: introduce wrappers for alternate tree traversalElijah Newren2021-03-111-0/+71
* merge-ort: add data structures for an alternate tree traversalElijah Newren2021-03-111-0/+26
* merge-ort: precompute subset of sources for which we need rename detectionElijah Newren2021-03-112-3/+103
* diffcore-rename: enable filtering possible rename sourcesElijah Newren2021-03-113-7/+21
* diffcore-rename: compute dir_rename_guess from dir_rename_countsElijah Newren2021-02-271-4/+41
* diffcore-rename: limit dir_rename_counts computation to relevant dirsElijah Newren2021-02-271-0/+10
* diffcore-rename: compute dir_rename_counts in stagesElijah Newren2021-02-271-40/+70
* diffcore-rename: extend cleanup_dir_rename_info()Elijah Newren2021-02-271-4/+36
* diffcore-rename: move dir_rename_counts into dir_rename_info structElijah Newren2021-02-271-11/+16
* diffcore-rename: add function for clearing dir_rename_countElijah Newren2021-02-273-9/+17
* Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren2021-02-273-130/+145
* diffcore-rename: add a mapping of destination names to their indicesElijah Newren2021-02-271-0/+45
* diffcore-rename: provide basic implementation of idx_possible_rename()Elijah Newren2021-02-271-6/+94
* diffcore-rename: use directory rename guided basename comparisonsElijah Newren2021-02-272-9/+35
* merge-ort: call diffcore_rename() directlyElijah Newren2021-02-161-7/+59
* gitdiffcore doc: mention new preliminary step for rename detectionElijah Newren2021-02-161-0/+20
* diffcore-rename: guide inexact rename detection based on basenamesElijah Newren2021-02-162-8/+52
* diffcore-rename: complete find_basename_matches()Elijah Newren2021-02-161-3/+79
* diffcore-rename: compute basenames of source and dest candidatesElijah Newren2021-02-161-0/+63
* t4001: add a test comparing basename similarity and content similarityElijah Newren2021-02-161-0/+23
* diffcore-rename: filter rename_src list when possibleElijah Newren2021-02-161-8/+51
* diffcore-rename: no point trying to find a match better than exactElijah Newren2021-02-121-6/+14
* Sync with maintJunio C Hamano2021-02-110-0/+0
|\
| * Merge branch 'tb/ci-run-cocci-with-18.04' into maintJunio C Hamano2021-02-111-1/+1
| |\
* | \ Merge branch 'en/merge-ort-perf'Junio C Hamano2021-02-112-1/+94
|\ \ \
| * | | merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren2021-01-242-0/+65
| * | | merge-ort: ignore the directory rename split conflict for nowElijah Newren2021-01-241-1/+12
| * | | merge-ort: fix massive leakElijah Newren2021-01-241-0/+17
| * | | Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano2021-01-211-22/+1228
| |\ \ \
| * \ \ \ Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfJunio C Hamano2021-01-141-18/+653
| |\ \ \ \
| * \ \ \ \ Merge branch 'en/diffcore-rename' into en/merge-ort-perfJunio C Hamano2021-01-142-131/+192
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'en/ort-directory-rename'Junio C Hamano2021-02-111-19/+811
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge-ort: fix a directory rename detection bugElijah Newren2021-01-211-117/+81
| * | | | | | merge-ort: process_renames() now needs more defensivenessElijah Newren2021-01-211-5/+21
| * | | | | | merge-ort: implement apply_directory_rename_modifications()Elijah Newren2021-01-211-1/+167
| * | | | | | merge-ort: add a new toplevel_dir fieldElijah Newren2021-01-211-6/+9
| * | | | | | merge-ort: implement handle_path_level_conflicts()Elijah Newren2021-01-211-1/+71
| * | | | | | merge-ort: implement check_for_directory_rename()Elijah Newren2021-01-211-1/+66
| * | | | | | merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren2021-01-211-2/+35
| * | | | | | merge-ort: implement compute_collisions()Elijah Newren2021-01-211-1/+67