[PATCH v4 16/24] read-cache: write index-v5 cache-tree data

[Thomas Gummerer <t.gummerer@gmail.com>]

Write the cache-tree data for the index version 5 file format. The
in-memory cache-tree data is converted to the ondisk format, by adding
it to the directory entries, that were compiled from the cache-entries
in the step before.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
 read-cache-v5.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/read-cache-v5.c b/read-cache-v5.c
index 797022f..0d06cfe 100644
--- a/read-cache-v5.c
+++ b/read-cache-v5.c
@@ -789,6 +789,57 @@ static struct directory_entry *get_directory(char *dir, unsigned int dir_len,
 	return ret;
 }
 
+static void convert_one_to_ondisk(struct hash_table *table, struct cache_tree *it,
+				  const char *path, int pathlen, uint32_t crc)
+{
+	int i, path_len = strlen(path);
+	struct directory_entry *search;
+
+	crc = crc32(crc, (Bytef*)path, pathlen);
+	search = lookup_hash(crc, table);
+	while (search && (path_len > search->de_pathlen
+			  || strcmp(path, search->pathname + search->de_pathlen - path_len)))
+		search = search->next_hash;
+	if (!search)
+		return;
+	/*
+	 * The number of subtrees is already calculated by
+	 * compile_directory_data, therefore we only need to
+	 * add the entry_count
+	 */
+	search->de_nentries = it->entry_count;
+	if (0 <= it->entry_count)
+		hashcpy(search->sha1, it->sha1);
+
+#if DEBUG
+	if (0 <= it->entry_count)
+		fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
+			pathlen, path, it->entry_count, it->subtree_nr,
+			sha1_to_hex(it->sha1));
+	else
+		fprintf(stderr, "cache-tree <%.*s> (%d subtree) invalid\n",
+			pathlen, path, it->subtree_nr);
+#endif
+
+	if (strcmp(path, ""))
+		crc = crc32(crc, (Bytef*)"/", 1);
+	for (i = 0; i < it->subtree_nr; i++) {
+		struct cache_tree_sub *down = it->down[i];
+		if (i) {
+			struct cache_tree_sub *prev = it->down[i-1];
+			if (subtree_name_cmp(down->name, down->namelen,
+					     prev->name, prev->namelen) <= 0)
+				die("fatal - unsorted cache subtree");
+		}
+		convert_one_to_ondisk(table, down->cache_tree, down->name, down->namelen, crc);
+	}
+}
+
+static void cache_tree_to_ondisk(struct hash_table *table, struct cache_tree *root)
+{
+	convert_one_to_ondisk(table, root, "", 0, 0);
+}
+
 static void ce_queue_push(struct cache_entry **head,
 			  struct cache_entry **tail,
 			  struct cache_entry *ce)
@@ -844,6 +895,8 @@ static struct directory_entry *compile_directory_data(struct index_state *istate
 			*total_file_len -= search->de_pathlen + 1;
 		ce_queue_push(&(search->ce), &(search->ce_last), cache[i]);
 	}
+	if (istate->cache_tree)
+		cache_tree_to_ondisk(&table, istate->cache_tree);
 	return de;
 }
 
-- 
1.8.4.2