tree:<depth>: skip some trees even when collecting omits
If a tree has already been recorded as omitted, we don't need to traverse it again just to collect its omits. Stop traversing trees a second time when collecting omits. Signed-off-by: Matthew DeVore <matvore@google.com> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c813a7c35f
commit
8272f26034
@ -107,18 +107,19 @@ struct seen_map_entry {
|
|||||||
size_t depth;
|
size_t depth;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void filter_trees_update_omits(
|
/* Returns 1 if the oid was in the omits set before it was invoked. */
|
||||||
|
static int filter_trees_update_omits(
|
||||||
struct object *obj,
|
struct object *obj,
|
||||||
struct filter_trees_depth_data *filter_data,
|
struct filter_trees_depth_data *filter_data,
|
||||||
int include_it)
|
int include_it)
|
||||||
{
|
{
|
||||||
if (!filter_data->omits)
|
if (!filter_data->omits)
|
||||||
return;
|
return 0;
|
||||||
|
|
||||||
if (include_it)
|
if (include_it)
|
||||||
oidset_remove(filter_data->omits, &obj->oid);
|
return oidset_remove(filter_data->omits, &obj->oid);
|
||||||
else
|
else
|
||||||
oidset_insert(filter_data->omits, &obj->oid);
|
return oidset_insert(filter_data->omits, &obj->oid);
|
||||||
}
|
}
|
||||||
|
|
||||||
static enum list_objects_filter_result filter_trees_depth(
|
static enum list_objects_filter_result filter_trees_depth(
|
||||||
@ -171,12 +172,17 @@ static enum list_objects_filter_result filter_trees_depth(
|
|||||||
if (already_seen) {
|
if (already_seen) {
|
||||||
filter_res = LOFR_SKIP_TREE;
|
filter_res = LOFR_SKIP_TREE;
|
||||||
} else {
|
} else {
|
||||||
|
int been_omitted = filter_trees_update_omits(
|
||||||
|
obj, filter_data, include_it);
|
||||||
seen_info->depth = filter_data->current_depth;
|
seen_info->depth = filter_data->current_depth;
|
||||||
filter_trees_update_omits(obj, filter_data, include_it);
|
|
||||||
|
|
||||||
if (include_it)
|
if (include_it)
|
||||||
filter_res = LOFR_DO_SHOW;
|
filter_res = LOFR_DO_SHOW;
|
||||||
else if (filter_data->omits)
|
else if (filter_data->omits && !been_omitted)
|
||||||
|
/*
|
||||||
|
* Must update omit information of children
|
||||||
|
* recursively; they have not been omitted yet.
|
||||||
|
*/
|
||||||
filter_res = LOFR_ZERO;
|
filter_res = LOFR_ZERO;
|
||||||
else
|
else
|
||||||
filter_res = LOFR_SKIP_TREE;
|
filter_res = LOFR_SKIP_TREE;
|
||||||
|
@ -283,7 +283,7 @@ test_expect_success 'verify tree:0 includes trees in "filtered" output' '
|
|||||||
|
|
||||||
# Make sure tree:0 does not iterate through any trees.
|
# Make sure tree:0 does not iterate through any trees.
|
||||||
|
|
||||||
test_expect_success 'filter a GIANT tree through tree:0' '
|
test_expect_success 'verify skipping tree iteration when not collecting omits' '
|
||||||
GIT_TRACE=1 git -C r3 rev-list \
|
GIT_TRACE=1 git -C r3 rev-list \
|
||||||
--objects --filter=tree:0 HEAD 2>filter_trace &&
|
--objects --filter=tree:0 HEAD 2>filter_trace &&
|
||||||
grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
|
grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
|
||||||
@ -377,6 +377,15 @@ test_expect_success 'test tree:# filter provisional omit for blob and tree' '
|
|||||||
expect_has_with_different_name r4 filt/subdir
|
expect_has_with_different_name r4 filt/subdir
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'verify skipping tree iteration when collecting omits' '
|
||||||
|
GIT_TRACE=1 git -C r4 rev-list --filter-print-omitted \
|
||||||
|
--objects --filter=tree:0 HEAD 2>filter_trace &&
|
||||||
|
grep "^Skipping contents of tree " filter_trace >actual &&
|
||||||
|
|
||||||
|
echo "Skipping contents of tree subdir/..." >expect &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
# Test tree:<depth> where a tree is iterated to twice - once where a subentry is
|
# Test tree:<depth> where a tree is iterated to twice - once where a subentry is
|
||||||
# too deep to be included, and again where the blob inside it is shallow enough
|
# too deep to be included, and again where the blob inside it is shallow enough
|
||||||
# to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we
|
# to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we
|
||||||
|
Loading…
Reference in New Issue
Block a user