Skip to content

Commit 78967a5

Browse files
committed
diffcore-rename: relevant_sources needed for location might be skippable
As noted a few commits ago, when a source file rename is used as part of directory rename detection, we need to increment counts for each ancestor directory in dirs_removed with value RELEVANT_FOR_SELF. However, due to the last commit, we may have downgraded all relevant ancestor directories from RELEVANT_FOR_SELF to RELEVANT_FOR_ANCESTOR. If no ancestor directory is found in dirs_removed with a value of RELEVANT_FOR_SELF, then we can downgrade relevant_source[PATH] from RELEVANT_LOCATION to RELEVANT_NO_MORE. This change does not yet affect things, as handle_early_known_dir_renames() has not yet been hooked into the code and called from anywhere. The next commit will change that. Signed-off-by: Elijah Newren <[email protected]>
1 parent 54e268e commit 78967a5

File tree

1 file changed

+50
-1
lines changed

1 file changed

+50
-1
lines changed

diffcore-rename.c

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ static void handle_early_known_dir_renames(struct dir_rename_info *info,
10891089
struct strintmap *relevant_sources,
10901090
struct strintmap *dirs_removed)
10911091
{
1092-
int i;
1092+
int i, new_num_src;
10931093
struct hashmap_iter iter;
10941094
struct strmap_entry *entry;
10951095

@@ -1139,6 +1139,55 @@ static void handle_early_known_dir_renames(struct dir_rename_info *info,
11391139
RELEVANT_FOR_ANCESTOR);
11401140
}
11411141
}
1142+
1143+
for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
1144+
struct diff_filespec *one = rename_src[i].p->one;
1145+
int val;
1146+
1147+
val = strintmap_get(relevant_sources, one->path);
1148+
1149+
/*
1150+
* sources that were not found in relevant_sources should
1151+
* have already been removed by a prior call to
1152+
* remove_unneeded_paths_from_src()
1153+
*/
1154+
assert(val != -1);
1155+
1156+
if (val == RELEVANT_LOCATION) {
1157+
int removable = 1;
1158+
char *dir = get_dirname(one->path);
1159+
while (1) {
1160+
char *freeme = dir;
1161+
int res = strintmap_get(dirs_removed, dir);
1162+
1163+
/* Quit if not found or irrelevant */
1164+
if (res == NOT_RELEVANT)
1165+
break;
1166+
/* If RELEVANT_FOR_SELF, can't remove */
1167+
if (res == RELEVANT_FOR_SELF) {
1168+
removable = 0;
1169+
break;
1170+
}
1171+
/* Else continue searching upwards */
1172+
assert(res == RELEVANT_FOR_ANCESTOR);
1173+
dir = get_dirname(dir);
1174+
free(freeme);
1175+
}
1176+
free(dir);
1177+
if (removable) {
1178+
strintmap_set(relevant_sources, one->path,
1179+
RELEVANT_NO_MORE);
1180+
continue;
1181+
}
1182+
}
1183+
1184+
if (new_num_src < i)
1185+
memcpy(&rename_src[new_num_src], &rename_src[i],
1186+
sizeof(struct diff_rename_src));
1187+
new_num_src++;
1188+
}
1189+
1190+
rename_src_nr = new_num_src;
11421191
}
11431192

11441193
void diffcore_rename_extended(struct diff_options *options,

0 commit comments

Comments
 (0)