From: Teng Long <dyroneteng@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, avarab@gmail.com, jonathantanmy@google.com,
bagasdotme@gmail.com, adlternative@gmail.com, stolee@gmail.com,
Teng Long <dyroneteng@gmail.com>
Subject: [PATCH v6 08/12] packfile-uri: support for excluding trees
Date: Tue, 19 Oct 2021 19:38:32 +0800 [thread overview]
Message-ID: <c7a885ebec703f383f5935517170b4ab755b5411.1634634814.git.tenglong@alibaba-inc.com> (raw)
In-Reply-To: <cover.1634634814.git.tenglong@alibaba-inc.com>
From: Teng Long <dyroneteng@gmail.com>
This commit introduce the exclusion of tree objects. The exclusion range
is designed by an enum named `exclude_level` in "pack-objects.c" that
enumerate three values, "ET_SELF", "ET_INCLUDE" and "ET_REACHABLE".
Exclusion scope on different level:
1. When a tree is specified to be excluded with level "ET_SELF",
only the tree object itself will be excluded.
2. When a tree specified to be excluded with level "ET_INCLUDE",
exclude the tree itself, as well as all the trees and blobs it contains.
3. When it is specified with level "ET_REACHABLE", the excluding scope
is as same as level "ET_INCLUDE", because tree do not have any
ancestors.
Signed-off-by: Teng Long <dyroneteng@gmail.com>
---
builtin/pack-objects.c | 18 ++++++++++++++++++
list-objects.c | 8 ++++++--
object.c | 1 +
object.h | 1 +
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index e7b27ef443..6713e734fb 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1250,6 +1250,21 @@ static int match_packfile_uri_exclusions(struct configured_exclusion *ex)
return 0;
}
+static int want_exclude_object(struct object_list *objects)
+{
+ struct object_list *p;
+ struct configured_exclusion *ex;
+
+ if (!objects)
+ return 0;
+ for (p = objects; p; p = p->next) {
+ ex = oidmap_get(&configured_exclusions, &p->item->oid);
+ if (match_packfile_uri_exclusions(ex) && ex->level > ET_SELF)
+ return 1;
+ }
+ return 0;
+}
+
static int want_found_object(const struct object_id *oid, int exclude,
struct packed_git *p)
{
@@ -1400,11 +1415,14 @@ static int want_object_in_pack(const struct object_id *oid,
if (uri_protocols.nr) {
if (referred_objs) {
struct commit *commit = referred_objs->commit;
+ struct object_list *trees = referred_objs->trees;
if (commit) {
commit_ex = oidmap_get(&configured_exclusions, &commit->object.oid);
if (match_packfile_uri_exclusions(commit_ex) && commit_ex->level > ET_SELF)
return 0;
}
+ if (want_exclude_object(trees))
+ return 0;
}
ex = oidmap_get(&configured_exclusions, oid);
diff --git a/list-objects.c b/list-objects.c
index b32213ecf1..40292e2cc8 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -114,8 +114,11 @@ static void process_tree_contents(struct traversal_context *ctx,
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) {
@@ -136,7 +139,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_objs);
+ process_tree(ctx, t, base, entry.path, referred_buf);
}
else if (S_ISGITLINK(entry.mode))
process_gitlink(ctx, entry.oid.hash,
@@ -149,9 +152,10 @@ 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_objs);
+ process_blob(ctx, b, base, entry.path, referred_buf);
}
}
+ free(referred_buf);
}
static void process_tree(struct traversal_context *ctx,
diff --git a/object.c b/object.c
index f86b52c4d6..895068cbc2 100644
--- a/object.c
+++ b/object.c
@@ -334,6 +334,7 @@ void add_object_array_with_path_and_referred_commit(struct object *obj, const ch
struct referred_objects *referred_objs;
referred_objs = xmalloc(sizeof(struct referred_objects));
referred_objs->commit = referred_commit;
+ referred_objs->trees = NULL;
if (nr >= alloc) {
alloc = (alloc + 32) * 2;
diff --git a/object.h b/object.h
index 4db0ecc3f2..618d674249 100644
--- a/object.h
+++ b/object.h
@@ -65,6 +65,7 @@ struct object_array {
struct referred_objects{
struct commit *commit;
+ struct object_list *trees;
};
#define OBJECT_ARRAY_INIT { 0, 0, NULL }
--
2.31.1.453.g945ddc3a74.dirty
next prev parent reply other threads:[~2021-10-19 11:40 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 2:11 [PATCH] Packfile-uris support excluding commit objects Teng Long
2021-05-10 11:14 ` Ævar Arnfjörð Bjarmason
2021-05-18 8:49 ` [PATCH v2 0/3] packfile-uris: commit objects exclusion Teng Long
2021-05-18 8:49 ` [PATCH v2 1/3] packfile-uris: support for excluding commit object Teng Long
2021-05-19 4:28 ` Junio C Hamano
2021-05-20 4:46 ` Junio C Hamano
2021-05-18 8:49 ` [PATCH v2 2/3] packfile-uris.txt: " Teng Long
2021-05-18 8:49 ` [PATCH v2 3/3] t5702: excluding commits with packfile-uris Teng Long
2021-07-26 9:46 ` [PATCH v3 0/3] packfile-uris: commit objects exclusio Teng Long
2021-07-26 9:46 ` [PATCH v3 1/3] packfile-uris: support for excluding commit objects Teng Long
2021-07-26 18:15 ` Junio C Hamano
2021-07-26 19:45 ` Felipe Contreras
2021-08-11 1:44 ` Teng Long
2021-07-26 9:46 ` [PATCH v3 2/3] t5702: " Teng Long
2021-07-26 15:03 ` Ævar Arnfjörð Bjarmason
2021-08-11 1:46 ` [PATCH v3 1/3] packfile-uris: " Teng Long
2021-07-26 9:46 ` [PATCH v3 3/3] packfile-uri.txt: " Teng Long
2021-07-26 20:52 ` Junio C Hamano
2021-08-11 1:47 ` Teng Long
2021-07-26 12:34 ` [PATCH v3 0/3] packfile-uris: commit objects exclusio Ævar Arnfjörð Bjarmason
2021-08-11 1:48 ` Teng Long
2021-08-11 7:45 ` [PATCH v4 0/7] packfile-uris: commits and trees exclusion Teng Long
2021-08-11 7:45 ` [PATCH v4 1/7] pack-objects.c: introduce new method `match_packfile_uri_exclusions` Teng Long
2021-08-11 7:45 ` [PATCH v4 2/7] Add new parameter "carry_data" for "show_object" function Teng Long
2021-08-11 7:45 ` [PATCH v4 3/7] packfile-uri: support for excluding commit objects Teng Long
2021-08-11 7:45 ` [PATCH v4 4/7] packfile-uri: support for excluding tree objects Teng Long
2021-08-11 7:45 ` [PATCH v4 5/7] packfile-uri.txt: support for excluding commits and trees Teng Long
2021-08-11 9:59 ` Bagas Sanjaya
2021-08-11 7:45 ` [PATCH v4 6/7] t5702: replace with "test_when_finished" for cleanup Teng Long
2021-08-11 7:45 ` [PATCH v4 7/7] t5702: support for excluding commit objects Teng Long
2021-08-25 2:21 ` [PATCH v5 00/14] packfile-uris: commits, trees and tags exclusion Teng Long
2021-08-25 2:21 ` [PATCH v5 01/14] pack-objects.c: introduce new method `match_packfile_uri_exclusions` Teng Long
2021-08-25 2:21 ` [PATCH v5 02/14] Add new parameter "carry_data" for "show_object" function Teng Long
2021-08-26 20:45 ` Junio C Hamano
2021-09-02 11:08 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 03/14] packfile-uri: support for excluding commit objects Teng Long
2021-08-25 23:49 ` Ævar Arnfjörð Bjarmason
2021-09-02 12:26 ` Teng Long
2021-08-26 20:56 ` Junio C Hamano
2021-09-02 12:51 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 04/14] packfile-uri: support for excluding tree objects Teng Long
2021-08-25 2:21 ` [PATCH v5 05/14] packfile-uri.txt: support for excluding commits and trees Teng Long
2021-08-25 23:52 ` Ævar Arnfjörð Bjarmason
2021-09-02 11:23 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 06/14] t5702: replace with "test_when_finished" for cleanup Teng Long
2021-08-25 23:55 ` Ævar Arnfjörð Bjarmason
2021-09-02 11:37 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 07/14] t5702: support for excluding commit objects Teng Long
2021-08-25 2:21 ` [PATCH v5 08/14] Add new parameter "carry_data" for "show_commit function Teng Long
2021-08-25 2:21 ` [PATCH v5 09/14] commit.h: add wrapped tags in commit struct Teng Long
2021-08-25 23:58 ` Ævar Arnfjörð Bjarmason
2021-09-02 12:17 ` Teng Long
2021-09-02 12:39 ` ZheNing Hu
2021-09-02 13:01 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 10/14] object.h: add referred tags in `referred_objects` struct Teng Long
2021-08-25 2:21 ` [PATCH v5 11/14] packfile-uri: support for excluding tag objects Teng Long
2021-08-25 2:21 ` [PATCH v5 12/14] packfile-uri.txt: " Teng Long
2021-08-25 2:21 ` [PATCH v5 13/14] t5702: add tag exclusion test case Teng Long
2021-08-25 2:21 ` [PATCH v5 14/14] pack-objects.c: introduce `want_exclude_object` function Teng Long
2021-10-19 11:38 ` [PATCH v6 00/12] packfile-uri: support excluding multiple object types Teng Long
2021-10-19 11:38 ` [PATCH v6 01/12] objects.c: introduce `exclude_level` enum Teng Long
2021-10-19 11:38 ` [PATCH v6 02/12] Introduce function `match_packfile_uri_exclusions` Teng Long
2021-10-19 11:38 ` [PATCH v6 03/12] Replace `show_data` with structure `show_info` Teng Long
2021-10-19 11:38 ` [PATCH v6 04/12] Introduce `uploadpack.excludeobject` configuration Teng Long
2021-10-19 11:38 ` [PATCH v6 05/12] t5702: test cases for `uploadpack.excludeobject` Teng Long
2021-10-19 11:38 ` [PATCH v6 06/12] packfile-uri: support for excluding commits Teng Long
2021-10-19 11:38 ` [PATCH v6 07/12] t5702: test cases " Teng Long
2021-10-19 11:38 ` Teng Long [this message]
2021-10-19 11:38 ` [PATCH v6 09/12] t5702: test cases for excluding trees Teng Long
2021-10-19 11:38 ` [PATCH v6 10/12] packfile-uri: support for excluding tags Teng Long
2021-10-19 11:38 ` [PATCH v6 11/12] t5702: test cases " Teng Long
2021-10-19 11:38 ` [PATCH v6 12/12] packfile-uri.txt: support multiple object types Teng Long
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c7a885ebec703f383f5935517170b4ab755b5411.1634634814.git.tenglong@alibaba-inc.com \
--to=dyroneteng@gmail.com \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).