From: Justin Tobler Date: Tue, 23 Sep 2025 02:56:57 GMT Subject: [PATCH 1/4] builtin/repo: introduce stats subcommand Message-ID: <20250923025700.3046260-2-jltobler@gmail.com> In-Reply-To: <20250923025700.3046260-1-jltobler@gmail.com> The shape of a repository's history can have huge impacts on the performance and health of the repository itself. Currently, Git lacks a means to surface key stats/information regarding the shape of a repository via a single command. Acquiring this information requires users to be fairly knowledgeable about the structure of a Git repository and how to identify the relevant data points. To fill this gap, supplemental tools such as git-sizer(1) have been developed. To allow users to more readily identify potential issues for a repository, introduce the "stats" subcommand in git-repo(1) to output stats for the repository that may be of interest to users. The goal of this subcommand is to eventually provide similar functionality to git-sizer(1), but in Git natively. The initial version of this command only iterates through all references in the repository and tracks the count of branches, tags, remotes, and other reference types. The corresponding information is displayed in a human-friendly table formatted in a very similar manner to git-sizer(1). The width of each table column is adjusted automatically to satisfy the requirements of the widest row contained. Subsequent commits will surface additional relevant data points to output. Signed-off-by: Justin Tobler --- Documentation/git-repo.adoc | 7 ++ builtin/repo.c | 151 ++++++++++++++++++++++++++++++++++++ t/meson.build | 1 + t/t1901-repo-stats.sh | 59 ++++++++++++++ 4 files changed, 218 insertions(+) create mode 100755 t/t1901-repo-stats.sh diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc index 209afd1b61..7762329551 100644 --- a/Documentation/git-repo.adoc +++ b/Documentation/git-repo.adoc @@ -9,6 +9,7 @@ SYNOPSIS -------- [synopsis] git repo info [--format=(keyvalue|nul)] [-z] [...] +git repo stats DESCRIPTION ----------- @@ -43,6 +44,12 @@ supported: + `-z` is an alias for `--format=nul`. +stats:: + Retrieve stats about the current repository. All references in the + repository are categorized and counted accordingly. ++ +The table output format may change and is not intended for machine parsing. + INFO KEYS --------- In order to obtain a set of values from `git repo info`, you should provide diff --git a/builtin/repo.c b/builtin/repo.c index bbb0966f2d..15899dd74c 100644 --- a/builtin/repo.c +++ b/builtin/repo.c @@ -4,12 +4,15 @@ #include "environment.h" #include "parse-options.h" #include "quote.h" +#include "ref-filter.h" #include "refs.h" #include "strbuf.h" +#include "string-list.h" #include "shallow.h" static const char *const repo_usage[] = { "git repo info [--format=(keyvalue|nul)] [-z] [...]", + "git repo stats", NULL }; @@ -156,12 +159,160 @@ static int repo_info(int argc, const char **argv, const char *prefix, return print_fields(argc, argv, repo, format); } +struct stats { + size_t branches; + size_t remotes; + size_t tags; + size_t others; +}; + +struct stats_table { + struct string_list rows; + + int name_col_width; + int value_col_width; +}; + +struct stats_table_entry { + char *value; +}; + +static void stats_table_add(struct stats_table *table, const char *name, + struct stats_table_entry *entry) +{ + int name_width = strlen(name); + struct string_list_item *item; + + item = string_list_append(&table->rows, name); + item->util = entry; + + if (name_width > table->name_col_width) + table->name_col_width = name_width; + if (entry) { + int value_width = strlen(entry->value); + if (value_width > table->value_col_width) + table->value_col_width = value_width; + } +} + +static void stats_table_add_count(struct stats_table *table, const char *name, + size_t value) +{ + struct stats_table_entry *entry; + + CALLOC_ARRAY(entry, 1); + entry->value = xstrfmt("%" PRIuMAX, (uintmax_t)value); + stats_table_add(table, name, entry); +} + +static void stats_table_setup(struct stats_table *table, struct stats *stats) +{ + size_t ref_total; + + ref_total = stats->branches + stats->remotes + stats->tags + stats->others; + stats_table_add(table, _("* References"), NULL); + stats_table_add_count(table, _(" * Count"), ref_total); + stats_table_add_count(table, _(" * Branches"), stats->branches); + stats_table_add_count(table, _(" * Tags"), stats->tags); + stats_table_add_count(table, _(" * Remotes"), stats->remotes); + stats_table_add_count(table, _(" * Others"), stats->others); +} + +static void stats_table_print(struct stats_table *table) +{ + const char *name_col_title = _("Repository stats"); + const char *value_col_title = _("Value"); + int name_col_width = strlen(name_col_title); + int value_col_width = strlen(value_col_title); + struct strbuf buf = STRBUF_INIT; + struct string_list_item *item; + + if (table->name_col_width > name_col_width) + name_col_width = table->name_col_width; + if (table->value_col_width > value_col_width) + value_col_width = table->value_col_width; + + strbuf_addf(&buf, "| %-*s | %-*s |\n", name_col_width, name_col_title, + value_col_width, value_col_title); + strbuf_addstr(&buf, "| "); + strbuf_addchars(&buf, '-', name_col_width); + strbuf_addstr(&buf, " | "); + strbuf_addchars(&buf, '-', value_col_width); + strbuf_addstr(&buf, " |\n"); + + for_each_string_list_item (item, &table->rows) { + struct stats_table_entry *entry = item->util; + const char *value = ""; + + if (entry) { + struct stats_table_entry *entry = item->util; + value = entry->value; + } + + strbuf_addf(&buf, "| %-*s | %*s |\n", name_col_width, + item->string, value_col_width, value); + + if (entry) + free(entry->value); + } + + fputs(buf.buf, stdout); + strbuf_release(&buf); +} + +static void stats_count_references(struct stats *stats, struct ref_array *refs) +{ + for (int i = 0; i < refs->nr; i++) { + struct ref_array_item *ref = refs->items[i]; + + switch (ref->kind) { + case FILTER_REFS_BRANCHES: + stats->branches++; + break; + case FILTER_REFS_REMOTES: + stats->remotes++; + break; + case FILTER_REFS_TAGS: + stats->tags++; + break; + case FILTER_REFS_OTHERS: + stats->others++; + break; + } + } +} + +static int repo_stats(int argc UNUSED, const char **argv UNUSED, + const char *prefix UNUSED, struct repository *repo UNUSED) +{ + struct ref_filter filter = REF_FILTER_INIT; + struct strvec ref_patterns = STRVEC_INIT; + struct stats_table table = { 0 }; + struct ref_array refs = { 0 }; + struct stats stats = { 0 }; + + filter.name_patterns = ref_patterns.v; + filter_refs(&refs, &filter, FILTER_REFS_REGULAR); + + stats_count_references(&stats, &refs); + + stats_table_setup(&table, &stats); + stats_table_print(&table); + + string_list_clear(&table.rows, 1); + strvec_clear(&ref_patterns); + ref_array_clear(&refs); + + return 0; +} + int cmd_repo(int argc, const char **argv, const char *prefix, struct repository *repo) { parse_opt_subcommand_fn *fn = NULL; struct option options[] = { OPT_SUBCOMMAND("info", &fn, repo_info), + OPT_SUBCOMMAND("stats", &fn, repo_stats), OPT_END() }; diff --git a/t/meson.build b/t/meson.build index 7974795fe4..071d4a5112 100644 --- a/t/meson.build +++ b/t/meson.build @@ -236,6 +236,7 @@ integration_tests = [ 't1701-racy-split-index.sh', 't1800-hook.sh', 't1900-repo.sh', + 't1901-repo-stats.sh', 't2000-conflict-when-checking-files-out.sh', 't2002-checkout-cache-u.sh', 't2003-checkout-cache-mkdir.sh', diff --git a/t/t1901-repo-stats.sh b/t/t1901-repo-stats.sh new file mode 100755 index 0000000000..27c32ec45f --- /dev/null +++ b/t/t1901-repo-stats.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +test_description='test git repo stats' + +. ./test-lib.sh + +test_expect_success 'empty repository stats' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + git repo stats >out 2>err && + + cat >expect <<-EOF && + | Repository stats | Value | + | ---------------- | ----- | + | * References | | + | * Count | 0 | + | * Branches | 0 | + | * Tags | 0 | + | * Remotes | 0 | + | * Others | 0 | + EOF + + test_cmp expect out && + test_line_count = 0 err + ) +' + +test_expect_success 'repository stats with references' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + git commit --allow-empty -m init && + oid="$(git rev-parse HEAD)" && + git switch -c foo && + git tag init && + git update-ref refs/remotes/origin/foo "$oid" && + git notes add -m foo && + git repo stats >out 2>err && + + cat >expect <<-EOF && + | Repository stats | Value | + | ---------------- | ----- | + | * References | | + | * Count | 5 | + | * Branches | 2 | + | * Tags | 1 | + | * Remotes | 1 | + | * Others | 1 | + EOF + + test_cmp expect out && + test_line_count = 0 err + ) +' + +test_done -- 2.51.0.193.g4975ec3473b