dir: convert fill_directory to take an index

bmwill · gitster · commit 0d32c183b636 · 2017-05-06T19:15:39.000+09:00
Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/add.c b/builtin/add.c
@@ -400,7 +400,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		}
 
 		/* This picks up the paths that are not tracked */
-		baselen = fill_directory(&dir, &pathspec);
+		baselen = fill_directory(&dir, &the_index, &pathspec);
 		if (pathspec.nr)
 			seen = prune_directory(&dir, &pathspec, baselen);
 	}
diff --git a/builtin/clean.c b/builtin/clean.c
@@ -930,7 +930,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 		       PATHSPEC_PREFER_CWD,
 		       prefix, argv);
 
-	fill_directory(&dir, &pathspec);
+	fill_directory(&dir, &the_index, &pathspec);
 
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
diff --git a/builtin/grep.c b/builtin/grep.c
@@ -866,7 +866,7 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
 	if (exc_std)
 		setup_standard_excludes(&dir);
 
-	fill_directory(&dir, pathspec);
+	fill_directory(&dir, &the_index, pathspec);
 	for (i = 0; i < dir.nr; i++) {
 		if (!dir_path_match(dir.entries[i], pathspec, 0, NULL))
 			continue;
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
@@ -333,7 +333,7 @@ static void show_files(struct dir_struct *dir)
 	if (show_others || show_killed) {
 		if (!show_others)
 			dir->flags |= DIR_COLLECT_KILLED_ONLY;
-		fill_directory(dir, &pathspec);
+		fill_directory(dir, &the_index, &pathspec);
 		if (show_others)
 			show_other_files(dir);
 		if (show_killed)
diff --git a/dir.c b/dir.c
@@ -177,7 +177,9 @@ char *common_prefix(const struct pathspec *pathspec)
 	return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
 }
 
-int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
+int fill_directory(struct dir_struct *dir,
+		   struct index_state *istate,
+		   const struct pathspec *pathspec)
 {
 	const char *prefix;
 	size_t prefix_len;
@@ -190,7 +192,7 @@ int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
 	prefix = prefix_len ? pathspec->items[0].match : "";
 
 	/* Read the directory and prune it */
-	read_directory(dir, &the_index, prefix, prefix_len, pathspec);
+	read_directory(dir, istate, prefix, prefix_len, pathspec);
 
 	return prefix_len;
 }
diff --git a/dir.h b/dir.h
@@ -214,7 +214,9 @@ extern int match_pathspec(const struct pathspec *pathspec,
 extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
 extern int within_depth(const char *name, int namelen, int depth, int max_depth);
 
-extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);
+extern int fill_directory(struct dir_struct *dir,
+			  struct index_state *istate,
+			  const struct pathspec *pathspec);
 extern int read_directory(struct dir_struct *, struct index_state *istate,
 			  const char *path, int len,
 			  const struct pathspec *pathspec);
diff --git a/wt-status.c b/wt-status.c
@@ -665,7 +665,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
 		dir.untracked = the_index.untracked;
 	setup_standard_excludes(&dir);
 
-	fill_directory(&dir, &s->pathspec);
+	fill_directory(&dir, &the_index, &s->pathspec);
 
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ int cmd_add(int argc, const char *argv, const char prefix)`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`/* This picks up the paths that are not tracked */`
`403`		`- baselen = fill_directory(&dir, &pathspec);`
	`403`	`+ baselen = fill_directory(&dir, &the_index, &pathspec);`
`404`	`404`	`if (pathspec.nr)`
`405`	`405`	`seen = prune_directory(&dir, &pathspec, baselen);`
`406`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,9 @@ char common_prefix(const struct pathspec pathspec)`
`177`	`177`	`return len ? xmemdupz(pathspec->items[0].match, len) : NULL;`
`178`	`178`	`}`
`179`	`179`
`180`		`-int fill_directory(struct dir_struct dir, const struct pathspec pathspec)`
	`180`	`+int fill_directory(struct dir_struct *dir,`
	`181`	`+ struct index_state *istate,`
	`182`	`+ const struct pathspec *pathspec)`
`181`	`183`	`{`
`182`	`184`	`const char *prefix;`
`183`	`185`	`size_t prefix_len;`
`@@ -190,7 +192,7 @@ int fill_directory(struct dir_struct dir, const struct pathspec pathspec)`
`190`	`192`	`prefix = prefix_len ? pathspec->items[0].match : "";`
`191`	`193`
`192`	`194`	`/* Read the directory and prune it */`
`193`		`- read_directory(dir, &the_index, prefix, prefix_len, pathspec);`
	`195`	`+ read_directory(dir, istate, prefix, prefix_len, pathspec);`
`194`	`196`
`195`	`197`	`return prefix_len;`
`196`	`198`	`}`