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>

diff --git a/revision.c b/revision.c
index 13e0519c0241635c0c1fd14a7ff12e9478c70bd4..60421f3a106de5d700aac775abbda0dbd33b8a7d 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -99,6 +99,31 @@ void mark_tree_uninteresting(struct repository *r, struct tree *tree)
        mark_tree_contents_uninteresting(r, tree);
 }
 
        mark_tree_contents_uninteresting(r, tree);
 }
 

+void mark_trees_uninteresting_sparse(struct repository *r,
+                                    struct oidset *trees)
+{
+       struct object_id *oid;
+       struct oidset_iter iter;
+
+       oidset_iter_init(trees, &iter);
+       while ((oid = oidset_iter_next(&iter))) {
+               struct tree *tree = lookup_tree(r, oid);
+
+               if (!tree)
+                       continue;
+
+               if (tree->object.flags & UNINTERESTING) {
+                       /*
+                        * Remove the flag so the next call
+                        * is not a no-op. The flag is added
+                        * in mark_tree_unintersting().
+                        */
+                       tree->object.flags ^= UNINTERESTING;
+                       mark_tree_uninteresting(r, tree);
+               }
+       }
+}
+

 struct commit_stack {
        struct commit **items;
        size_t nr, alloc;
 struct commit_stack {
        struct commit **items;
        size_t nr, alloc;

diff --git a/revision.h b/revision.h
index 7987bfcd2e9bd6ee7bac4f1cbeb10af17ab40b50..df684701b9386131e9243069a31cc60926b279f7 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -67,6 +67,7 @@ struct rev_cmdline_info {
 #define REVISION_WALK_NO_WALK_SORTED 1
 #define REVISION_WALK_NO_WALK_UNSORTED 2
 
 #define REVISION_WALK_NO_WALK_SORTED 1
 #define REVISION_WALK_NO_WALK_UNSORTED 2
 

+struct oidset;

 struct topo_walk_info;
 
 struct rev_info {
 struct topo_walk_info;
 
 struct rev_info {


@@ -327,6 +328,7 @@ void put_revision_mark(const struct rev_info *revs,
 
 void mark_parents_uninteresting(struct commit *commit);
 void mark_tree_uninteresting(struct repository *r, struct tree *tree);
 
 void mark_parents_uninteresting(struct commit *commit);
 void mark_tree_uninteresting(struct repository *r, struct tree *tree);

+void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);

 
 void show_object_with_name(FILE *, struct object *, const char *);
 
 
 void show_object_with_name(FILE *, struct object *, const char *);