averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

diffcore-rename: add a mapping of destination names to their indices

Browse Source 
Compute a mapping of full filename to the index within rename_dst where
that filename is found, and store it in idx_map.  idx_possible_rename()
needs this to quickly finding an array entry in rename_dst given the
pathname.

While at it, add placeholder initializations for dir_rename_count and
dir_rename_guess; these will be more fully populated in subsequent
commits.

Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2021-02-27 00:30:41 +00:00
committed by Junio C Hamano
parent bde8b9f34c
commit ae8cf74d3f
1 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
diffcore-rename.c
View File

@@ -380,6 +380,45 @@ static char *get_dirname(const char *filename)
return slash ? xstrndup(filename, slash - filename) : xstrdup(""); return slash ? xstrndup(filename, slash - filename) : xstrdup("");
} }
static void initialize_dir_rename_info(struct dir_rename_info *info)
{
int i;
info->setup = 1;
strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
info->dir_rename_count = NULL;
/*
* Loop setting up both info->idx_map.
*/
for (i = 0; i < rename_dst_nr; ++i) {
/*
* For non-renamed files, make idx_map contain mapping of
* filename -> index (index within rename_dst, that is)
*/
if (!rename_dst[i].is_rename) {
char *filename = rename_dst[i].p->two->path;
strintmap_set(&info->idx_map, filename, i);
}
}
}
static void cleanup_dir_rename_info(struct dir_rename_info *info)
{
if (!info->setup)
return;
/* idx_map */
strintmap_clear(&info->idx_map);
/* dir_rename_guess */
strmap_clear(&info->dir_rename_guess, 1);
/* Nothing to do for dir_rename_count, yet */
}
static const char *get_basename(const char *filename) static const char *get_basename(const char *filename)
{ {
/* /*
@@ -858,6 +897,11 @@ void diffcore_rename(struct diff_options *options)
remove_unneeded_paths_from_src(want_copies); remove_unneeded_paths_from_src(want_copies);
trace2_region_leave("diff", "cull after exact", options->repo); trace2_region_leave("diff", "cull after exact", options->repo);
/* Preparation for basename-driven matching. */
trace2_region_enter("diff", "dir rename setup", options->repo);
initialize_dir_rename_info(&info);
trace2_region_leave("diff", "dir rename setup", options->repo);
/* Utilize file basenames to quickly find renames. */ /* Utilize file basenames to quickly find renames. */
trace2_region_enter("diff", "basename matches", options->repo); trace2_region_enter("diff", "basename matches", options->repo);
rename_count += find_basename_matches(options, rename_count += find_basename_matches(options,
@@ -1026,6 +1070,7 @@ void diffcore_rename(struct diff_options *options)
if (rename_dst[i].filespec_to_free) if (rename_dst[i].filespec_to_free)
free_filespec(rename_dst[i].filespec_to_free); free_filespec(rename_dst[i].filespec_to_free);
cleanup_dir_rename_info(&info);
FREE_AND_NULL(rename_dst); FREE_AND_NULL(rename_dst);
rename_dst_nr = rename_dst_alloc = 0; rename_dst_nr = rename_dst_alloc = 0;
FREE_AND_NULL(rename_src); FREE_AND_NULL(rename_src);