diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-22 22:00:23 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-22 22:00:24 +0100 |
| commit | dd4048d1c76f067ad7b339dfb3a5f4765f5ae979 (patch) | |
| tree | eadb32eaf2d919c8f310f36d480ba3755775af8a /diffcore.h | |
| parent | Merge branch 'ab/grep-pcre2-allocfix' (diff) | |
| parent | diffcore-rename: compute dir_rename_guess from dir_rename_counts (diff) | |
| download | git-dd4048d1c76f067ad7b339dfb3a5f4765f5ae979.tar.xz git-dd4048d1c76f067ad7b339dfb3a5f4765f5ae979.zip | |
Merge branch 'en/ort-perf-batch-8'
Rename detection rework continues.
* en/ort-perf-batch-8:
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
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index c1592bcd01..b9a230ab7f 100644 --- a/diffcore.h +++ b/diffcore.h @@ -8,6 +8,8 @@ struct diff_options; struct repository; +struct strmap; +struct strset; struct userdiff_driver; /* This header file is internal between diff.c and its diff transformers @@ -159,8 +161,13 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *, struct diff_filespec *); void diff_q(struct diff_queue_struct *, struct diff_filepair *); +void partial_clear_dir_rename_count(struct strmap *dir_rename_count); + void diffcore_break(struct repository *, int); void diffcore_rename(struct diff_options *); +void diffcore_rename_extended(struct diff_options *options, + struct strset *dirs_removed, + struct strmap *dir_rename_count); void diffcore_merge_broken(void); void diffcore_pickaxe(struct diff_options *); void diffcore_order(const char *orderfile); |