[PATCH v8 0/6] convert: add "status=delayed" to filter process protocol

@@ -508,7 +508,7 @@ static struct hashmap subprocess_map;

 static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
 {
-	int err;
+	int err, i;
 	struct cmd2process *entry = (struct cmd2process *)subprocess;
 	struct string_list cap_list = STRING_LIST_INIT_NODUP;
 	char *cap_buf;

@@ -516,6 +516,15 @@ static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
 	struct child_process *process = &subprocess->process;
 	const char *cmd = subprocess->cmd;

+	static const struct {
+		const char *name;
+		unsigned int cap;
+	} known_caps[] = {
+		{ "clean",  CAP_CLEAN  },
+		{ "smudge", CAP_SMUDGE },
+		{ "delay",  CAP_DELAY  },
+	};
+
 	sigchain_push(SIGPIPE, SIG_IGN);

 	err = packet_writel(process->in, "git-filter-client", "version=2", NULL);

@@ -534,8 +543,15 @@ static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
 	if (err)
 		goto done;

-	err = packet_writel(process->in,
-		"capability=clean", "capability=smudge", "capability=delay", NULL);
+	for (i = 0; i < ARRAY_SIZE(known_caps); ++i) {
+		err = packet_write_fmt_gently(
+			process->in, "capability=%s\n", known_caps[i].name);
+		if (err)
+			goto done;
+	}
+	err = packet_flush_gently(process->in);
+	if (err)
+		goto done;

 	for (;;) {
 		cap_buf = packet_read_line(process->out, NULL);

@@ -547,18 +563,15 @@ static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)
 			continue;

 		cap_name = cap_list.items[1].string;
-		if (!strcmp(cap_name, "clean")) {
-			entry->supported_capabilities |= CAP_CLEAN;
-		} else if (!strcmp(cap_name, "smudge")) {
-			entry->supported_capabilities |= CAP_SMUDGE;
-		} else if (!strcmp(cap_name, "delay")) {
-			entry->supported_capabilities |= CAP_DELAY;
-		} else {
-			warning(
-				"external filter '%s' requested unsupported filter capability '%s'",
-				cmd, cap_name
-			);
-		}
+		i = ARRAY_SIZE(known_caps) - 1;
+		while (i >= 0 && strcmp(cap_name, known_caps[i].name))
+			i--;
+
+		if (i >= 0)
+			entry->supported_capabilities |= known_caps[i].cap;
+		else
+			warning("external filter '%s' requested unsupported filter capability '%s'",
+			cmd, cap_name);

 		string_list_clear(&cap_list, 0);
 	}

@@ -677,7 +690,6 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 		goto done;

 	if (can_delay && !strcmp(filter_status.buf, "delayed")) {
-		dco->is_delayed = 1;
 		string_list_insert(&dco->filters, cmd);
 		string_list_insert(&dco->paths, path);
 	} else {

@@ -41,14 +41,13 @@ enum ce_delay_state {
 };

 struct delayed_checkout {
-	/* State of the currently processed cache entry. If the state is
-	 * CE_CAN_DELAY, then the filter can change the 'is_delayed' flag
-	 * to signal that the current cache entry was delayed. If the state is
-	 * CE_RETRY, then this signals the filter that the cache entry was
-	 * requested before.
+	/*
+	 * State of the currently processed cache entry. If the state is
+	 * CE_CAN_DELAY, then the filter can delay the current cache entry.
+	 * If the state is CE_RETRY, then this signals the filter that the
+	 * cache entry was requested before.
 	 */
 	enum ce_delay_state state;
-	int is_delayed;
 	/* List of filter drivers that signaled delayed blobs. */
 	struct string_list filters;
 	/* List of delayed blobs identified by their path. */

@@ -179,7 +179,8 @@ int finish_delayed_checkout(struct checkout *state)
 				continue;
 			}
 			if (available_paths.nr <= 0) {
-				/* Filter responded with no entries. That means
+				/*
+				 * Filter responded with no entries. That means
 				 * the filter is done and we can remove the
 				 * filter from the list (see
 				 * "string_list_remove_empty_items" call below).

@@ -188,7 +189,8 @@ int finish_delayed_checkout(struct checkout *state)
 				continue;
 			}

-			/* In dco->paths we store a list of all delayed paths.
+			/*
+			 * In dco->paths we store a list of all delayed paths.
 			 * The filter just send us a list of available paths.
 			 * Remove them from the list.
 			 */

@@ -205,7 +207,8 @@ int finish_delayed_checkout(struct checkout *state)
 					      filter->string, path->string);
 					errs |= 1;

-					/* Do not ask the filter for available blobs,
+					/*
+					 * Do not ask the filter for available blobs,
 					 * again, as the filter is likely buggy.
 					 */
 					filter->string = "";

@@ -213,7 +216,6 @@ int finish_delayed_checkout(struct checkout *state)
 				}
 				ce = index_file_exists(state->istate, path->string,
 						       strlen(path->string), 0);
-				assert(dco->state == CE_RETRY);
 				errs |= (ce ? checkout_entry(ce, state, NULL) : 1);
 			}
 		}

@@ -284,10 +286,9 @@ static int write_entry(struct cache_entry *ce,
 					new = NULL;
 					size = 0;
 				}
-				dco->is_delayed = 0;
 				ret = async_convert_to_working_tree(
 					ce->name, new, size, &buf, dco);
-				if (ret && dco->is_delayed) {
+				if (ret && string_list_has_string(&dco->paths, ce->name)) {
 					free(new);
 					goto finish;
 				}