Add another bit flag to the struct rev_info.
The only caller that uses this after this patch is builtin/pack-objects.
Without this, sparsity seems to do little good therein, as
prepare_revision_walk will densely propagate UNINTERESTING flags from
trees to tree contents, before mark_edges_uninteresting has a chance to
be faster by being sparse.
While here, drop the "sparse" parameter to mark_edges_uninteresting,
introduced in 4f6d26b167 ("list-objects: consume sparse tree walk",
2019-01-16) which can now use the flag in struct rev_info. No
functional change intended.
Signed-off-by: Nathaniel Filardo <nwf20@xxxxxxxxxxxx>
---
bisect.c | 2 +-
builtin/pack-objects.c | 3 ++-
builtin/rev-list.c | 2 +-
http-push.c | 2 +-
list-objects.c | 5 ++---
list-objects.h | 3 +--
revision.c | 3 ++-
revision.h | 1 +
8 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/bisect.c b/bisect.c
index 3af955c4bc..6bf521138a 100644
--- a/bisect.c
+++ b/bisect.c
@@ -658,7 +658,7 @@ static void bisect_common(struct rev_info *revs)
if (prepare_revision_walk(revs))
die("revision walk setup failed");
if (revs->tree_objects)
- mark_edges_uninteresting(revs, NULL, 0);
+ mark_edges_uninteresting(revs, NULL);
}
static void exit_if_skipped_commits(struct commit_list *tried,
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a154fc29f6..fb9937edf9 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3134,9 +3134,10 @@ static void get_object_list(int ac, const char **av)
if (use_delta_islands)
load_delta_islands(the_repository);
+ revs.sparse_tree_walk = !!sparse;
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
- mark_edges_uninteresting(&revs, show_edge, sparse);
+ mark_edges_uninteresting(&revs, show_edge);
if (!fn_show_object)
fn_show_object = show_object;
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 5b5b6dbb1c..14ef659c12 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -546,7 +546,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
if (revs.tree_objects)
- mark_edges_uninteresting(&revs, show_edge, 0);
+ mark_edges_uninteresting(&revs, show_edge);
if (bisect_list) {
int reaches, all;
diff --git a/http-push.c b/http-push.c
index b22c7caea0..39b6f5bafb 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1933,7 +1933,7 @@ int cmd_main(int argc, const char **argv)
pushing = 0;
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
- mark_edges_uninteresting(&revs, NULL, 0);
+ mark_edges_uninteresting(&revs, NULL);
objects_to_send = get_delta(&revs, ref_lock);
finish_all_active_slots();
diff --git a/list-objects.c b/list-objects.c
index dc77361e11..7ea108fba8 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -254,13 +254,12 @@ static void add_edge_parents(struct commit *commit,
}
void mark_edges_uninteresting(struct rev_info *revs,
- show_edge_fn show_edge,
- int sparse)
+ show_edge_fn show_edge)
{
struct commit_list *list;
int i;
- if (sparse) {
+ if (revs->sparse_tree_walk) {
struct oidset set;
oidset_init(&set, 16);
diff --git a/list-objects.h b/list-objects.h
index a952680e46..9388d96785 100644
--- a/list-objects.h
+++ b/list-objects.h
@@ -11,8 +11,7 @@ void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, voi
typedef void (*show_edge_fn)(struct commit *);
void mark_edges_uninteresting(struct rev_info *revs,
- show_edge_fn show_edge,
- int sparse);
+ show_edge_fn show_edge);
struct oidset;
struct list_objects_filter_options;
diff --git a/revision.c b/revision.c
index eb8e51bc63..1f43f6f2da 100644
--- a/revision.c
+++ b/revision.c
@@ -456,7 +456,8 @@ static struct commit *handle_commit(struct rev_info *revs,
if (!revs->tree_objects)
return NULL;
if (flags & UNINTERESTING) {
- mark_tree_contents_uninteresting(revs->repo, tree);
+ if (!revs->sparse_tree_walk)
+ mark_tree_contents_uninteresting(revs->repo, tree);
return NULL;
}
add_pending_object_with_path(revs, object, name, mode, path);
diff --git a/revision.h b/revision.h
index 4134dc6029..a7154566b3 100644
--- a/revision.h
+++ b/revision.h
@@ -145,6 +145,7 @@ struct rev_info {
first_parent_only:1,
line_level_traverse:1,
tree_blobs_in_commit_order:1,
+ sparse_tree_walk:1,
/*
* Blobs are shown without regard for their existence.
--
2.17.1
