From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from flow-a5-smtp.messagingengine.com (flow-a5-smtp.messagingengine.com [103.168.172.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B41A12EEE75 for ; Thu, 15 Oct 2026 14:46:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792075601; cv=none; b=V4tR3BH27xlGHfombj5wo9gPQPV0y2hClkC3K9i7cG6O3/+UhXSeFKrTf4D5Q3a4LnHtlRmZSNe1pK7uzSAOj7KzKlW9VupZ6CKrWX53xDWY4R92A2f0rw2TuDjszPPz18dk1vwPI9hL7XOM+IUtwycrhWb4luK915SZGltyZfU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792075601; c=relaxed/simple; bh=8EEwBRBV8KYShMCC+HoUrQVmrVm78GOOT3oDNtEcdeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uIXF/PyIUcCzMTA92bVydDcB69YZQfFiEJi8FXdw9+yJLWr911NYnaeXv7pQADBOtKQHwMAvxEj88DDKQHtzaK8pdIFjGT5ksrx7xYWkEMHQRfRoCM1lUdAB4NsY/70xvsR6bXECrNiE4Ge5ypEAv6ph/K537QLU+dSeC7v2wVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com; spf=pass smtp.mailfrom=fastmail.com; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b=eIm7wy7h; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=n9tKWMu1; arc=none smtp.client-ip=103.168.172.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fastmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fastmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fastmail.com header.i=@fastmail.com header.b="eIm7wy7h"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="n9tKWMu1" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailflow.phl.internal (Postfix) with ESMTP id F393713802DE for ; Thu, 15 Oct 2026 10:46:38 -0400 (EDT) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Thu, 15 Oct 2026 10:46:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1792075598; x= 1792079198; bh=bol6O1ubDiyyEv3XUEYoJKJccN8ZAC6+vqC5OeFLvpc=; b=e Im7wy7h1/I0E2Gf3SQIfOZIrNJ2DpGHajW2mjuAa47q7T0xwfZXuEKQasA/z8HJu CGXiP4xnRtdpjk2/aOO5bjRd8YaP04ZvNGOgM4soXtmF40LXMH579RekelmSwdMb 4ahe14ZniAfZ+3pmKWxWSm3Ab+KAvGB6ggLxEbn0aSusHIzSFBcX3Stlx3+Vn659 mDXu1eh9PGneuAPAyxAVN9Iu0NjEBlyvuHhrGAL637hdcPWIvFP6H05K7X7LqCaP 3N2dQBMcINIzgNrSUzKG8bEwlA9EQEldo5b44YdseQwDfmTS+yb5Hc7xZzUrhjJu J6ChMGsUIOq+Yws7FEoTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1792075598; x=1792079198; bh=b ol6O1ubDiyyEv3XUEYoJKJccN8ZAC6+vqC5OeFLvpc=; b=n9tKWMu1m12uYky9R I0WyNegCPTm/xDVTIZGprCq0GGdKouzZ4qMZT+l+PROZ2WDuQxixjgbvi+1ZJ4Ig 7yUoBbf0behEmXSVvve8GtLx48xERLyk4MlhpcWSdOK7siG9rF78AfZ/14wo8guJ Y44godct0RTkQM2gXt4L2RNj5gQBwh+QhKapGpGw6JOKDy5TVH7c5rV5esa3mq6x VQ6cGVNslg2LOe5kzBUvH53vVUP8+t5Rs1ayM5ADFMEXLhe7HENPW8+TagsKdlp5 kxXNIpH1IT94p6CIzmBciR1FZMXIg/xkjSrDAsZ9iNnNX7sF0s9AEphOL1FYac8t oETOQ== X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-06; repo=github.com/dkim2wg/interop; date=2026-10-04; sw=lmtpprox; action=sign d=fastmail.com a=rsa-sha256; DKIM2-Signature: i=1; m=1; t=1792075598; d=fastmail.com; mf=PG1hcmtjaHVjYXJyb2xsQGZhc3RtYWlsLmNvbT4=; rt=PGdpdEB2Z2VyLmtlcm5lbC5vcmc+; s=fm2:rsa-sha256:k5JrIZu6AFeKbe2QrqFahL1Lq5fm1qpaDGf3BEqo4828gOQ xUxxG019HGYVwPOaD/S4CjRN+nYA0emwT0KlOrczFxDsV9UIZKnR9yG/JqEUL9sc w4jzcVtB+lgm4HV07uD/xRIW89y9/UxeQLGd+XQtX+ZRh9U5Ga6T1T4lGnmE+dp9 cwhvCmouQEkQGrg7flVeWoREOO2SLA4lgP1w4j/sMPQl9AUOGpWcCptmw+IejSy6 6RwbqjJTB/k3dUw/z5wywFTm5n+i/TUdBis1lg4Qz6mj/U+y43TsRRivBDhXIh7F j6Ovvhti9V33af6/ZXgCYazXmGvXUfb65fb1Q5Q==; X-DKIM2-Info: draft=ietf-dkim-dkim2-spec-06; repo=github.com/dkim2wg/interop; date=2026-10-04; sw=lmtpprox; action=mi-m=1; hc=11; hn=cc,content-transfer-encoding,date,feedback-id,from, in-reply-to,message-id,mime-version,references,subject,to; Message-Instance: m=1; h=sha256:lfZ7/y2s9u8QfyMSiTykCwpISHDLMhScDCmypO3CWrU=:8EEwBRBV8KYShMCC+HoUrQVmrVm78GOOT3oDNtEcdeA=; X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTE07EJT4HD2ZBOnvKBXGjh1w35aRpSzGK8FaAi5D+lZIu/BtvRHOYIstvx62kW0qp 518wAL+b7uNv3Qc6UI7C7QtyXz9NvR7GWk94SC9LM1ld8gf9l2u2zuNQrAaZ4N8MMbOPi6 gVC5OGEqEm8Cf1hBr1cwCFYRBSZNzKCSwt48zXvSJf7HGb5h9D8YKplnNq9Bba4naVszBz vzaPtOGwv0FP6UDCDgSHJpZTHcpaUdXDeKeeVMztwoP7KbBKNUl37jtuR5EMX22EUCqlOw Vgi0o7b+g2kVdIA/ijfcUs6RYMyGZXYlDvDK+r112/JBFDuUq5dmh2umntP84eXSjmz5GX zU1TjQJeemUgoQf6KmZKSlseR9nDIMFMtGkUcSKz+0eTWEG/sef+kEH3m2kD/bD3jJGx8b clP3dbnzOMyeB1lDn5RMTbWZ8JXoa7TZzt1YQqyh2v2tXcp1NoPt/67VqDV3TqyLrkH95H XJFukVV9Nc4qZCrrc5yw0P+e3Le7imR/OEwiKDvZkqKjyEjQsC6ZG0U6jZFJb90yuA3hYT /tIybdFIX/QYyGjgaDvDkKAN/srOLIwqr00p5aoEn6TMU3YR2Gex7VFVpc8BuZVJdCjRBh E1Pr4ldSuB3N6o6Vs/gQETNW1oBuCVBeOFeT7jrgCjf5iGqlIl6zTKSB4X0g X-ME-Proxy: Feedback-ID: id2564aa6:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 15 Oct 2026 10:46:38 -0400 (EDT) From: "Mark C. Chu-Carroll" To: git@vger.kernel.org Cc: jltobler@gmail.com, ps@pks.im, "Mark C. Chu-Carroll" Subject: [PATCH v6 1/1] repo: add filtering options to "repo structure" Date: Thu, 15 Oct 2026 10:46:02 -0400 Message-ID: <20261015144559.3652143-5-markchucarroll@fastmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261015144559.3652143-3-markchucarroll@fastmail.com> References: <20261013172849.1109478-2-markchucarroll@fastmail.com> <20261015144559.3652143-3-markchucarroll@fastmail.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The current implementation of "git repo stucture" provides summary information about everything in the repository - all of the branches, remotes, tags, stashes, and notes. But sometimes to properly diagnose a problem, it's useful to be able to filter this information to get focused data about the specific part of the repo that's exhibiting a problem. Update "git repo structure" to use rev expressions to filter the set of objects to be processed. This implementation makes an awkward trade-off involving "setup_revisions" which results in doing the ref-walk twice when revisions are specified on the command line. In order to accept standard the standard revs parameters, it uses `setup_revisions`, which does a ref walk and populates the pending objects list that will be used by "repo structure". But this ref walk doesn't count refs in the way that "repo structure" requires, and because "setup_revisions" doesn't support a custom callback for its ref-walk, that's not changeable. So in the cases where a user specifies revs, "repo structure" does an initial ref-walk as part of "setup_revisions", and then a second ref-walk in "count_references" in repo.c to count by reference type. Further, if the user doesn't specify a revs parameter, "setup_revisions" is not called, so the "count_references" walk needs to add objects to the pending list. A parameter is added to "count_references" to allow it to distinguish the cases where the pending list is already populated from the case where it needs to populate it. Signed-off-by: Mark C. Chu-Carroll --- Documentation/git-repo.adoc | 31 +++++- builtin/repo.c | 32 ++++-- t/t1901-repo-structure.sh | 197 ++++++++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+), 13 deletions(-) diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index ed7d80c690..819202dc4e 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -10,7 +10,7 @@ SYNOPSIS [synopsis] git repo info [--format=(lines|nul) | -z] [--all | ...] git repo info --keys [--format=(lines|nul) | -z] -git repo structure [--format=(table|lines|nul) | -z] +git repo structure [--format=(table|lines|nul) | -z] [...] DESCRIPTION ----------- @@ -56,7 +56,7 @@ supported: `nul`::: Similar to `lines`, but using a _NUL_ character after each value. -`structure [--format=(table|lines|nul) | -z]`:: +`structure [--format=(table|lines|nul) | -z] [...]`:: Retrieve statistics about the current repository structure. The following kinds of information are reported: + @@ -66,6 +66,11 @@ supported: * Total disk size of reachable objects by type * Largest reachable objects in the repository by type + +The set of objects counted can be filtered by specifying a collection +of revisions to select which objects will be counted. These parameters +follow the same syntax as the parameters to similar commands like +`git log`. Defaults to all objects reachable from a reference. ++ The output format can be chosen through the flag `--format`. Three formats are supported: + @@ -141,6 +146,28 @@ using the `nul` format: git repo info --format=nul layout.bare layout.shallow ------------ +* Generates information about storage usage in the repository: ++ +------------ +git repo structure +------------ ++ + +* Generates information about storage usage in the repository omitting +the branch "foo": ++ +------------ +git repo structure --all ^foo +------------ ++ +* Generates information about repository objects reachable from +the references "x" and "y", but omitting anything that can +only be reached on a path including "xchild": ++ +------------ +git repo structure x y ^xchild +------------ ++ SEE ALSO -------- linkgit:git-rev-parse[1] diff --git a/builtin/repo.c b/builtin/repo.c index 84e012f83f..78638c2dcd 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -27,7 +27,7 @@ "git repo info --keys [--format=(lines|nul) | -z]" #define REPO_STRUCTURE_USAGE \ - "git repo structure [--format=(table|lines|nul) | -z]" + "git repo structure [--format=(table|lines|nul) | -z] [...]" static const char *const repo_usage[] = { REPO_INFO_USAGE, @@ -740,6 +740,7 @@ struct count_references_data { struct ref_stats *stats; struct rev_info *revs; struct progress *progress; + bool add_to_pending; }; static int count_references(const struct reference *ref, void *cb_data) @@ -766,10 +767,12 @@ static int count_references(const struct reference *ref, void *cb_data) } /* - * While iterating through references for counting, also add OIDs in + * While iterating through references for counting, if we didn't already + * populate the pending list in setup_revisions, also add OIDs in * preparation for the path walk. */ - add_pending_oid(data->revs, NULL, ref->oid, 0); + if (data->add_to_pending) + add_pending_oid(data->revs, NULL, ref->oid, 0); ref_count = get_total_reference_count(stats); display_progress(data->progress, ref_count); @@ -780,11 +783,13 @@ static int count_references(const struct reference *ref, void *cb_data) static void structure_count_references(struct ref_stats *stats, struct rev_info *revs, struct repository *repo, - int show_progress) + int show_progress, + bool add_to_pending) { struct count_references_data data = { .stats = stats, .revs = revs, + .add_to_pending = add_to_pending }; if (show_progress) @@ -935,6 +940,7 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix, struct repo_structure stats = { 0 }; struct rev_info revs; int show_progress = -1; + bool included_revision_args = false; struct option options[] = { OPT_CALLBACK_F(0, "format", &format, N_("format"), N_("output format"), @@ -947,16 +953,20 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix, OPT_END() }; - argc = parse_options(argc, argv, prefix, options, repo_structure_usage, 0); - if (argc) - usage(_("too many arguments")); - - repo_init_revisions(repo, &revs, prefix); - + argc = parse_options(argc, argv, prefix, options, repo_structure_usage, + PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN_OPT); if (show_progress < 0) show_progress = isatty(2); - structure_count_references(&stats.refs, &revs, repo, show_progress); + repo_init_revisions(repo, &revs, prefix); + if (argc > 1) { + argc = setup_revisions(argc, argv, &revs, NULL); + included_revision_args = true; + if (argc > 1) + return error(_("unrecognized argument: %s"), argv[1]); + } + + structure_count_references(&stats.refs, &revs, repo, show_progress, !included_revision_args); structure_count_objects(&stats.objects, &revs, repo, show_progress); switch (format) { diff --git a/t/t1901-repo-structure.sh b/t/t1901-repo-structure.sh index 02cc2b594a..4e5e4a0a7a 100755 --- a/t/t1901-repo-structure.sh +++ b/t/t1901-repo-structure.sh @@ -144,6 +144,203 @@ test_expect_success SHA1 'repository with references and objects' ' ) ' +test_expect_success SHA1 'repository with branches' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 1005 && + git tag -a foo -m bar && + + oid="$(git rev-parse HEAD)" && + git update-ref refs/remotes/origin/foo "$oid" && + git checkout -b grobble && + test_commit_bulk --ref=refs/heads/grobble 20 && + git checkout master && + test_commit_bulk 20 && + # Also creates a commit, tree, and blob. + git notes add -m foo && + git repo structure --format=lines >actual 2>err && + test_grep "^objects" actual >actual.objects && + cat >expect <<-\EOF && + objects.commits.count=1046 + objects.trees.count=1006 + objects.blobs.count=1006 + objects.tags.count=1 + objects.commits.inflated_size=231976 + objects.trees.inflated_size=16578431 + objects.blobs.inflated_size=11962 + objects.tags.inflated_size=132 + objects.commits.disk_size=163722 + objects.trees.disk_size=284547 + objects.blobs.disk_size=21022 + objects.tags.disk_size=126 + objects.commits.max_size=223 + objects.commits.max_size_oid=0dc91eb18580102a3a216c8bfecedeba2b9f9b9a + objects.trees.max_size=33063 + objects.trees.max_size_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + objects.blobs.max_size=13 + objects.blobs.max_size_oid=97d808e45116bf02103490294d3d46dad7a2ac62 + objects.tags.max_size=132 + objects.tags.max_size_oid=4dae4f5954f5e6feb3577cfb1b181daa3fd3afd2 + objects.commits.max_parents=1 + objects.commits.max_parents_oid=df6400c01440c329f1011669c4c26cc0c7852887 + objects.trees.max_entries=1005 + objects.trees.max_entries_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + EOF + test_cmp expect actual.objects && + test_must_be_empty err + ) +' + +test_expect_success SHA1 'filter by a positive rev' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 1005 && + git tag -a foo -m bar && + oid="$(git rev-parse HEAD)" && + git update-ref refs/remotes/origin/foo "$oid" && + git checkout -b grobble && + test_commit_bulk --ref=refs/heads/grobble 20 && + git checkout master && + test_commit_bulk 20 && + git notes add -m foo && + + cat >expect <<-\EOF && + objects.commits.count=1025 + objects.trees.count=1005 + objects.blobs.count=1005 + objects.tags.count=0 + objects.commits.inflated_size=227371 + objects.trees.inflated_size=16578363 + objects.blobs.inflated_size=11958 + objects.tags.inflated_size=0 + objects.commits.disk_size=160455 + objects.trees.disk_size=284462 + objects.blobs.disk_size=21003 + objects.tags.disk_size=0 + objects.commits.max_size=223 + objects.commits.max_size_oid=0dc91eb18580102a3a216c8bfecedeba2b9f9b9a + objects.trees.max_size=33063 + objects.trees.max_size_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + objects.blobs.max_size=13 + objects.blobs.max_size_oid=97d808e45116bf02103490294d3d46dad7a2ac62 + objects.tags.max_size=0 + objects.tags.max_size_oid=0000000000000000000000000000000000000000 + objects.commits.max_parents=1 + objects.commits.max_parents_oid=c1d3cb6c863e93a546c657ccecdf0f643d2e18af + objects.trees.max_entries=1005 + objects.trees.max_entries_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + EOF + git repo structure --format=lines grobble >actual 2>err && + test_grep "^objects" actual >actual.objects && + test_cmp expect actual.objects && + test_must_be_empty err + ) +' + +test_expect_success SHA1 'filter by both positive and negative revs' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 1005 && + git tag -a foo -m bar && + + oid="$(git rev-parse HEAD)" && + git update-ref refs/remotes/origin/foo "$oid" && + git checkout -b grobble && + test_commit_bulk --ref=refs/heads/grobble 20 && + git checkout master && + test_commit_bulk 20 && + # Also creates a commit, tree, and blob. + git notes add -m foo && + + cat >expect <<-\EOF && + objects.commits.count=20 + objects.trees.count=1 + objects.blobs.count=1005 + objects.tags.count=0 + objects.commits.inflated_size=4411 + objects.trees.inflated_size=33063 + objects.blobs.inflated_size=11958 + objects.tags.inflated_size=0 + objects.commits.disk_size=3122 + objects.trees.disk_size=53 + objects.blobs.disk_size=21003 + objects.tags.disk_size=0 + objects.commits.max_size=221 + objects.commits.max_size_oid=c1d3cb6c863e93a546c657ccecdf0f643d2e18af + objects.trees.max_size=33063 + objects.trees.max_size_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + objects.blobs.max_size=13 + objects.blobs.max_size_oid=97d808e45116bf02103490294d3d46dad7a2ac62 + objects.tags.max_size=0 + objects.tags.max_size_oid=0000000000000000000000000000000000000000 + objects.commits.max_parents=1 + objects.commits.max_parents_oid=c1d3cb6c863e93a546c657ccecdf0f643d2e18af + objects.trees.max_entries=1005 + objects.trees.max_entries_oid=60665251ab71dbd8c18d9bf2174f4ee0d58aa06c + EOF + git repo structure --format=lines grobble ^master >actual 2>err && + test_grep "^objects" actual >actual.objects && + test_cmp expect actual.objects && + test_must_be_empty err + ) +' + +test_expect_success 'filter by object type' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit_bulk 1005 && + git tag -a foo -m bar && + + oid="$(git rev-parse HEAD)" && + git update-ref refs/remotes/origin/foo "$oid" && + git checkout -b grobble && + test_commit_bulk --ref=refs/heads/grobble 20 && + git checkout master && + test_commit_bulk 20 && + # Also creates a commit, tree, and blob. + git notes add -m foo && + + cat >expect <<-\EOF && + objects.commits.count=0 + objects.trees.count=0 + objects.blobs.count=1006 + objects.tags.count=0 + objects.commits.inflated_size=0 + objects.trees.inflated_size=0 + objects.blobs.inflated_size=11962 + objects.tags.inflated_size=0 + objects.commits.disk_size=0 + objects.trees.disk_size=0 + objects.blobs.disk_size=21022 + objects.tags.disk_size=0 + objects.commits.max_size=0 + objects.commits.max_size_oid=0000000000000000000000000000000000000000 + objects.trees.max_size=0 + objects.trees.max_size_oid=0000000000000000000000000000000000000000 + objects.blobs.max_size=13 + objects.blobs.max_size_oid=97d808e45116bf02103490294d3d46dad7a2ac62 + objects.tags.max_size=0 + objects.tags.max_size_oid=0000000000000000000000000000000000000000 + objects.commits.max_parents=0 + objects.commits.max_parents_oid=0000000000000000000000000000000000000000 + objects.trees.max_entries=0 + objects.trees.max_entries_oid=0000000000000000000000000000000000000000 + EOF + git repo structure --format=lines --objects --all --filter=object:type=blob >actual 2>err && + test_grep "^objects" actual >actual.objects && + test_cmp expect actual.objects && + test_must_be_empty err + ) +' + test_expect_success SHA1 'lines and nul format' ' test_when_finished "rm -rf repo" && git init repo && -- 2.53.0