This commit supports the use of `uploadpack.excludeobject` to exclude
tree objects, which means that when a type object is configured as
packfile-uri, the tree object itself and all objects contains will be
recursively excluded.
Signed-off-by: Teng Long <dyroneteng@xxxxxxxxx>
---
builtin/pack-objects.c | 30 ++++++++++++++++++++----------
list-objects.c | 32 ++++++++++++++++++--------------
object.c | 6 +++++-
object.h | 13 ++++++++++++-
4 files changed, 55 insertions(+), 26 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 63f3aed70a..4ff12ec525 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1312,13 +1312,14 @@ static int want_object_in_pack(const struct object_id *oid,
int exclude,
struct packed_git **found_pack,
off_t *found_offset,
- struct object *referred_commit)
+ struct referred_objects *referred_objs)
{
int want;
struct list_head *pos;
struct multi_pack_index *m;
+ struct configured_exclusion *commit_ex;
+ struct configured_exclusion *tree_ex;
struct configured_exclusion *ex;
- struct configured_exclusion *referred_ex;
if (!exclude && local && has_loose_object_nonlocal(oid))
return 0;
@@ -1354,14 +1355,23 @@ static int want_object_in_pack(const struct object_id *oid,
}
if (uri_protocols.nr) {
- if (referred_commit) {
- referred_ex = oidmap_get(&configured_exclusions, &referred_commit->oid);
- if (referred_ex && match_packfile_uri_exclusions(referred_ex))
+ if (referred_objs && referred_objs->commit) {
+ commit_ex = oidmap_get(&configured_exclusions, &referred_objs->commit->oid);
+ if (match_packfile_uri_exclusions(commit_ex))
return 0;
}
+ if (referred_objs && referred_objs->trees) {
+ struct object_list *p;
+ for (p = referred_objs->trees; p; p = p->next) {
+ tree_ex = oidmap_get(&configured_exclusions, &p->item->oid);
+ if (match_packfile_uri_exclusions(tree_ex))
+ return 0;
+ }
+ }
+
ex = oidmap_get(&configured_exclusions, oid);
- if (ex && match_packfile_uri_exclusions(ex)) {
+ if (match_packfile_uri_exclusions(ex)) {
oidset_insert(&excluded_by_config, oid);
return 0;
}
@@ -1401,7 +1411,7 @@ static const char no_closure_warning[] = N_(
static int add_object_entry(const struct object_id *oid, enum object_type type,
const char *name, int exclude,
- struct object *referred_commit)
+ struct referred_objects *referred_objs)
{
struct packed_git *found_pack = NULL;
off_t found_offset = 0;
@@ -1411,7 +1421,7 @@ static int add_object_entry(const struct object_id *oid, enum object_type type,
if (have_duplicate_entry(oid, exclude))
return 0;
- if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset, referred_commit)) {
+ if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset, referred_objs)) {
/* The pack is missing an object, so it will not have closure */
if (write_bitmap_index) {
if (write_bitmap_index != WRITE_BITMAP_QUIET)
@@ -3262,9 +3272,9 @@ static void show_commit(struct commit *commit, void *data)
static void show_object(struct object *obj, const char *name, void *show_data, void *carry_data)
{
- struct object *referred_commit = carry_data;
+ struct referred_objects *referred_objs = carry_data;
add_preferred_base_object(name);
- add_object_entry(&obj->oid, obj->type, name, 0, referred_commit);
+ add_object_entry(&obj->oid, obj->type, name, 0, referred_objs);
obj->flags |= OBJECT_ADDED;
if (use_delta_islands) {
diff --git a/list-objects.c b/list-objects.c
index 968d842ceb..49f177cb56 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -25,7 +25,7 @@ static void process_blob(struct traversal_context *ctx,
struct blob *blob,
struct strbuf *path,
const char *name,
- struct object *referred_commit)
+ struct referred_objects *referred_objs)
{
struct object *obj = &blob->object;
size_t pathlen;
@@ -61,7 +61,7 @@ static void process_blob(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, path->buf, ctx->show_data, referred_commit);
+ ctx->show_object(obj, path->buf, ctx->show_data, referred_objs);
strbuf_setlen(path, pathlen);
}
@@ -99,19 +99,22 @@ static void process_tree(struct traversal_context *ctx,
struct tree *tree,
struct strbuf *base,
const char *name,
- struct object *referred_commit);
+ struct referred_objects *referred_objs);
static void process_tree_contents(struct traversal_context *ctx,
struct tree *tree,
struct strbuf *base,
- struct object *referred_commit)
+ struct referred_objects *referred_objs)
{
struct tree_desc desc;
struct name_entry entry;
enum interesting match = ctx->revs->diffopt.pathspec.nr == 0 ?
all_entries_interesting : entry_not_interesting;
+ struct referred_objects *referred_buf;
init_tree_desc(&desc, tree->buffer, tree->size);
+ referred_buf = xmemdupz(referred_objs, sizeof(struct referred_objects));
+ object_list_insert(&tree->object, &referred_buf->trees);
while (tree_entry(&desc, &entry)) {
if (match != all_entries_interesting) {
@@ -132,7 +135,7 @@ static void process_tree_contents(struct traversal_context *ctx,
entry.path, oid_to_hex(&tree->object.oid));
}
t->object.flags |= NOT_USER_GIVEN;
- process_tree(ctx, t, base, entry.path, referred_commit);
+ process_tree(ctx, t, base, entry.path, referred_buf);
}
else if (S_ISGITLINK(entry.mode))
process_gitlink(ctx, entry.oid.hash,
@@ -145,16 +148,17 @@ static void process_tree_contents(struct traversal_context *ctx,
entry.path, oid_to_hex(&tree->object.oid));
}
b->object.flags |= NOT_USER_GIVEN;
- process_blob(ctx, b, base, entry.path, referred_commit);
+ process_blob(ctx, b, base, entry.path, referred_buf);
}
}
+ free(referred_buf);
}
static void process_tree(struct traversal_context *ctx,
struct tree *tree,
struct strbuf *base,
const char *name,
- struct object *referred_commit)
+ struct referred_objects *referred_objs)
{
struct object *obj = &tree->object;
struct rev_info *revs = ctx->revs;
@@ -195,14 +199,14 @@ static void process_tree(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data, referred_commit);
+ ctx->show_object(obj, base->buf, ctx->show_data, referred_objs);
if (base->len)
strbuf_addch(base, '/');
if (r & LOFR_SKIP_TREE)
trace_printf("Skipping contents of tree %s...\n", base->buf);
else if (!failed_parse)
- process_tree_contents(ctx, tree, base, referred_commit);
+ process_tree_contents(ctx, tree, base, referred_objs);
r = list_objects_filter__filter_object(ctx->revs->repo,
LOFS_END_TREE, obj,
@@ -211,7 +215,7 @@ static void process_tree(struct traversal_context *ctx,
if (r & LOFR_MARK_SEEN)
obj->flags |= SEEN;
if (r & LOFR_DO_SHOW)
- ctx->show_object(obj, base->buf, ctx->show_data, referred_commit);
+ ctx->show_object(obj, base->buf, ctx->show_data, referred_objs);
strbuf_setlen(base, baselen);
free_tree_buffer(tree);
@@ -333,24 +337,24 @@ static void traverse_trees_and_blobs(struct traversal_context *ctx,
for (i = 0; i < ctx->revs->pending.nr; i++) {
struct object_array_entry *pending = ctx->revs->pending.objects + i;
struct object *obj = pending->item;
- struct object *referred_commit = pending->referred_commit;
+ struct referred_objects *referred_objs = pending->referred_objects;
const char *name = pending->name;
const char *path = pending->path;
if (obj->flags & (UNINTERESTING | SEEN))
continue;
if (obj->type == OBJ_TAG) {
obj->flags |= SEEN;
- ctx->show_object(obj, name, ctx->show_data, referred_commit);
+ ctx->show_object(obj, name, ctx->show_data, referred_objs);
continue;
}
if (!path)
path = "";
if (obj->type == OBJ_TREE) {
- process_tree(ctx, (struct tree *)obj, base, path, referred_commit);
+ process_tree(ctx, (struct tree *)obj, base, path, referred_objs);
continue;
}
if (obj->type == OBJ_BLOB) {
- process_blob(ctx, (struct blob *)obj, base, path, referred_commit);
+ process_blob(ctx, (struct blob *)obj, base, path, referred_objs);
continue;
}
die("unknown pending object %s (%s)",
diff --git a/object.c b/object.c
index 6b1ce2fcde..69ba0baf95 100644
--- a/object.c
+++ b/object.c
@@ -331,6 +331,7 @@ void add_object_array_with_path_and_referred_commit(struct object *obj, const ch
unsigned alloc = array->alloc;
struct object_array_entry *objects = array->objects;
struct object_array_entry *entry;
+ struct referred_objects *referred_objs = xmalloc(sizeof(struct referred_objects));
if (nr >= alloc) {
alloc = (alloc + 32) * 2;
@@ -338,9 +339,11 @@ void add_object_array_with_path_and_referred_commit(struct object *obj, const ch
array->alloc = alloc;
array->objects = objects;
}
+ referred_objs->commit = referred_commit;
+ referred_objs->trees = NULL;
entry = &objects[nr];
entry->item = obj;
- entry->referred_commit = referred_commit;
+ entry->referred_objects = referred_objs;
if (!name)
entry->name = NULL;
else if (!*name)
@@ -377,6 +380,7 @@ static void object_array_release_entry(struct object_array_entry *ent)
if (ent->name != object_array_slopbuf)
free(ent->name);
free(ent->path);
+ free(ent->referred_objects);
}
struct object *object_array_pop(struct object_array *array)
diff --git a/object.h b/object.h
index d63819ab91..3785546adf 100644
--- a/object.h
+++ b/object.h
@@ -52,12 +52,23 @@ struct object_array {
char *name;
char *path;
unsigned mode;
- struct object *referred_commit;
+ /*
+ * referred_objects or NULL. If non-NULL, it will
+ * temporary storage the referred commit and trees when
+ * traversing the specified object. Space for time,
+ * reduce related computing costs (such as packfile-uri
+ * exclusion), clean up when the traversal is over.
+ */
+ struct referred_objects *referred_objects;
} *objects;
};
#define OBJECT_ARRAY_INIT { 0, 0, NULL }
+struct referred_objects{
+ struct object *commit;
+ struct object_list *trees;
+};
/*
* object flag allocation:
* revision.h: 0---------10 15 23------26
--
2.31.1.449.gb2aa5456a8.dirty
