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.gumme...@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 f056f6b..306de30 100644
--- a/read-cache-v5.c
+++ b/read-cache-v5.c
@@ -960,6 +960,57 @@ static struct conflict_entry 
*create_conflict_entry_from_ce(struct cache_entry *
        return create_new_conflict(ce->name, ce_namelen(ce), pathlen);
 }
 
+static void convert_one_to_ondisk_v5(struct hash_table *table, struct 
cache_tree *it,
+                               const char *path, int pathlen, uint32_t crc)
+{
+       int i;
+       struct directory_entry *found, *search;
+
+       crc = crc32(crc, (Bytef*)path, pathlen);
+       found = lookup_hash(crc, table);
+       search = found;
+       while (search && strcmp(path, search->pathname + search->de_pathlen - 
strlen(path)) != 0)
+               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 (strcmp(path, "") != 0)
+               crc = crc32(crc, (Bytef*)"/", 1);
+
+#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
+
+       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_v5(table, down->cache_tree, down->name, 
down->namelen, crc);
+       }
+}
+
+static void cache_tree_to_ondisk_v5(struct hash_table *table, struct 
cache_tree *root)
+{
+       convert_one_to_ondisk_v5(table, root, "", 0, 0);
+}
+
 static struct directory_entry *compile_directory_data(struct index_state 
*istate,
                                                int nfile,
                                                unsigned int *ndir,
@@ -1065,6 +1116,8 @@ static struct directory_entry 
*compile_directory_data(struct index_state *istate
                        previous_entry->next = no_subtrees;
                }
        }
+       if (istate->cache_tree)
+               cache_tree_to_ondisk_v5(&table, istate->cache_tree);
        return de;
 }
 
-- 
1.8.3.453.g1dfc63d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to