@matheusbsbs / matheus-bagliano / commits / f1f5de442f

revision: add mark_tree_uninteresting_sparse

In preparation for a new algorithm that walks fewer trees when creating a pack from a set of revisions, create a method that takes an oidset of tree oids and marks reachable objects as UNINTERESTING. The current implementation uses the existing mark_tree_uninteresting to recursively walk the trees and blobs. This will walk the same number of trees as the old mechanism. To ensure that mark_tree_uninteresting walks the tree, we need to remove the UNINTERESTING flag before calling the method. This implementation will be replaced entirely in a later commit. There is one new assumption in this approach: we are also given the oids of the interesting trees. This implementation does not use those trees at the moment, but we will use them in a later rewrite of this method. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Derrick Stolee committed Jan 16, 2019 at 10:25 UTC f1f5de442faf85724e67917cd24df6b7275ca360
2 files changed +27
revision.c
+25
@@ -99,6 +99,31 @@ void mark_tree_uninteresting(struct repository *r, struct tree *tree)
99 mark_tree_contents_uninteresting(r, tree);
100 }
101
102 +void mark_trees_uninteresting_sparse(struct repository *r,
103 + struct oidset *trees)
104 +{
105 + struct object_id *oid;
106 + struct oidset_iter iter;
107 +
108 + oidset_iter_init(trees, &iter);
109 + while ((oid = oidset_iter_next(&iter))) {
110 + struct tree *tree = lookup_tree(r, oid);
111 +
112 + if (!tree)
113 + continue;
114 +
115 + if (tree->object.flags & UNINTERESTING) {
116 + /*
117 + * Remove the flag so the next call
118 + * is not a no-op. The flag is added
119 + * in mark_tree_unintersting().
120 + */
121 + tree->object.flags ^= UNINTERESTING;
122 + mark_tree_uninteresting(r, tree);
123 + }
124 + }
125 +}
126 +
127 struct commit_stack {
128 struct commit **items;
129 size_t nr, alloc;
revision.h
+2
@@ -67,6 +67,7 @@ struct rev_cmdline_info {
67 #define REVISION_WALK_NO_WALK_SORTED 1
68 #define REVISION_WALK_NO_WALK_UNSORTED 2
69
70 +struct oidset;
71 struct topo_walk_info;
72
73 struct rev_info {
@@ -327,6 +328,7 @@ void put_revision_mark(const struct rev_info *revs,
328
329 void mark_parents_uninteresting(struct commit *commit);
330 void mark_tree_uninteresting(struct repository *r, struct tree *tree);
331 +void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);
332
333 void show_object_with_name(FILE *, struct object *, const char *);
334