struct stats_table {
struct string_list rows;
+ struct string_list annotations;
int name_col_width;
int value_col_width;
struct stats_table_entry {
char *value;
const char *unit;
+ size_t index;
+ struct object_id *oid;
};
static void stats_table_vaddf(struct stats_table *table,
table->name_col_width = name_width;
if (!entry)
return;
+ if (entry->oid) {
+ entry->index = table->annotations.nr + 1;
+ strbuf_addf(&buf, "[%" PRIuMAX "] %s", (uintmax_t)entry->index,
+ oid_to_hex(entry->oid));
+ string_list_append_nodup(&table->annotations, strbuf_detach(&buf, NULL));
+ }
if (entry->value) {
int value_width = utf8_strwidth(entry->value);
if (value_width > table->value_col_width)
if (unit_width > table->unit_col_width)
table->unit_col_width = unit_width;
}
+
+ strbuf_release(&buf);
}
static void stats_table_addf(struct stats_table *table, const char *format, ...)
va_end(ap);
}
+static void stats_table_object_size_addf(struct stats_table *table,
+ struct object_id *oid, size_t value,
+ const char *format, ...)
+{
+ struct stats_table_entry *entry;
+ va_list ap;
+
+ CALLOC_ARRAY(entry, 1);
+ humanise_bytes(value, &entry->value, &entry->unit, HUMANISE_COMPACT);
+
+ /*
+ * A NULL OID should not have a table annotation.
+ */
+ if (!is_null_oid(oid))
+ entry->oid = oid;
+
+ va_start(ap, format);
+ stats_table_vaddf(table, entry, format, ap);
+ va_end(ap);
+}
+
static inline size_t get_total_reference_count(struct ref_stats *stats)
{
return stats->branches + stats->remotes + stats->tags + stats->others;
stats_table_addf(table, "");
stats_table_addf(table, "* %s", _("Largest objects"));
stats_table_addf(table, " * %s", _("Commits"));
- stats_table_size_addf(table, objects->largest.commit_size.value,
- " * %s", _("Maximum size"));
+ stats_table_object_size_addf(table,
+ &objects->largest.commit_size.oid,
+ objects->largest.commit_size.value,
+ " * %s", _("Maximum size"));
stats_table_addf(table, " * %s", _("Trees"));
- stats_table_size_addf(table, objects->largest.tree_size.value,
- " * %s", _("Maximum size"));
+ stats_table_object_size_addf(table,
+ &objects->largest.tree_size.oid,
+ objects->largest.tree_size.value,
+ " * %s", _("Maximum size"));
stats_table_addf(table, " * %s", _("Blobs"));
- stats_table_size_addf(table, objects->largest.blob_size.value,
- " * %s", _("Maximum size"));
+ stats_table_object_size_addf(table,
+ &objects->largest.blob_size.oid,
+ objects->largest.blob_size.value,
+ " * %s", _("Maximum size"));
stats_table_addf(table, " * %s", _("Tags"));
- stats_table_size_addf(table, objects->largest.tag_size.value,
- " * %s", _("Maximum size"));
+ stats_table_object_size_addf(table,
+ &objects->largest.tag_size.oid,
+ objects->largest.tag_size.value,
+ " * %s", _("Maximum size"));
}
+#define INDEX_WIDTH 4
+
static void stats_table_print_structure(const struct stats_table *table)
{
const char *name_col_title = _("Repository structure");
value_col_width = title_value_width - unit_col_width;
strbuf_addstr(&buf, "| ");
- strbuf_utf8_align(&buf, ALIGN_LEFT, name_col_width, name_col_title);
+ strbuf_utf8_align(&buf, ALIGN_LEFT, name_col_width + INDEX_WIDTH,
+ name_col_title);
strbuf_addstr(&buf, " | ");
strbuf_utf8_align(&buf, ALIGN_LEFT,
value_col_width + unit_col_width + 1, value_col_title);
printf("%s\n", buf.buf);
printf("| ");
- for (int i = 0; i < name_col_width; i++)
+ for (int i = 0; i < name_col_width + INDEX_WIDTH; i++)
putchar('-');
printf(" | ");
for (int i = 0; i < value_col_width + unit_col_width + 1; i++)
strbuf_reset(&buf);
strbuf_addstr(&buf, "| ");
strbuf_utf8_align(&buf, ALIGN_LEFT, name_col_width, item->string);
+
+ if (entry && entry->oid)
+ strbuf_addf(&buf, " [%" PRIuMAX "]",
+ (uintmax_t)entry->index);
+ else
+ strbuf_addchars(&buf, ' ', INDEX_WIDTH);
+
strbuf_addstr(&buf, " | ");
strbuf_utf8_align(&buf, ALIGN_RIGHT, value_col_width, value);
strbuf_addch(&buf, ' ');
printf("%s\n", buf.buf);
}
+ if (table->annotations.nr) {
+ printf("\n");
+ for_each_string_list_item(item, &table->annotations)
+ printf("%s\n", item->string);
+ }
+
strbuf_release(&buf);
}
}
string_list_clear(&table->rows, 1);
+ string_list_clear(&table->annotations, 1);
}
static inline void print_keyvalue(const char *key, char key_delim, size_t value,
{
struct stats_table table = {
.rows = STRING_LIST_INIT_DUP,
+ .annotations = STRING_LIST_INIT_DUP,
};
enum output_format format = FORMAT_TABLE;
struct repo_structure stats = { 0 };
(
cd repo &&
cat >expect <<-\EOF &&
- | Repository structure | Value |
- | -------------------- | ------ |
- | * References | |
- | * Count | 0 |
- | * Branches | 0 |
- | * Tags | 0 |
- | * Remotes | 0 |
- | * Others | 0 |
- | | |
- | * Reachable objects | |
- | * Count | 0 |
- | * Commits | 0 |
- | * Trees | 0 |
- | * Blobs | 0 |
- | * Tags | 0 |
- | * Inflated size | 0 B |
- | * Commits | 0 B |
- | * Trees | 0 B |
- | * Blobs | 0 B |
- | * Tags | 0 B |
- | * Disk size | 0 B |
- | * Commits | 0 B |
- | * Trees | 0 B |
- | * Blobs | 0 B |
- | * Tags | 0 B |
- | | |
- | * Largest objects | |
- | * Commits | |
- | * Maximum size | 0 B |
- | * Trees | |
- | * Maximum size | 0 B |
- | * Blobs | |
- | * Maximum size | 0 B |
- | * Tags | |
- | * Maximum size | 0 B |
+ | Repository structure | Value |
+ | ------------------------ | ------ |
+ | * References | |
+ | * Count | 0 |
+ | * Branches | 0 |
+ | * Tags | 0 |
+ | * Remotes | 0 |
+ | * Others | 0 |
+ | | |
+ | * Reachable objects | |
+ | * Count | 0 |
+ | * Commits | 0 |
+ | * Trees | 0 |
+ | * Blobs | 0 |
+ | * Tags | 0 |
+ | * Inflated size | 0 B |
+ | * Commits | 0 B |
+ | * Trees | 0 B |
+ | * Blobs | 0 B |
+ | * Tags | 0 B |
+ | * Disk size | 0 B |
+ | * Commits | 0 B |
+ | * Trees | 0 B |
+ | * Blobs | 0 B |
+ | * Tags | 0 B |
+ | | |
+ | * Largest objects | |
+ | * Commits | |
+ | * Maximum size | 0 B |
+ | * Trees | |
+ | * Maximum size | 0 B |
+ | * Blobs | |
+ | * Maximum size | 0 B |
+ | * Tags | |
+ | * Maximum size | 0 B |
EOF
git repo structure >out 2>err &&
# git-rev-list(1) --disk-usage=human option printing the full
# "byte/bytes" unit string instead of just "B".
cat >expect <<-EOF &&
- | Repository structure | Value |
- | -------------------- | ---------- |
- | * References | |
- | * Count | 4 |
- | * Branches | 1 |
- | * Tags | 1 |
- | * Remotes | 1 |
- | * Others | 1 |
- | | |
- | * Reachable objects | |
- | * Count | 3.02 k |
- | * Commits | 1.01 k |
- | * Trees | 1.01 k |
- | * Blobs | 1.01 k |
- | * Tags | 1 |
- | * Inflated size | 16.03 MiB |
- | * Commits | 217.92 KiB |
- | * Trees | 15.81 MiB |
- | * Blobs | 11.68 KiB |
- | * Tags | 132 B |
- | * Disk size | $(object_type_disk_usage all true) |
- | * Commits | $(object_type_disk_usage commit true) |
- | * Trees | $(object_type_disk_usage tree true) |
- | * Blobs | $(object_type_disk_usage blob true) |
- | * Tags | $(object_type_disk_usage tag) B |
- | | |
- | * Largest objects | |
- | * Commits | |
- | * Maximum size | 223 B |
- | * Trees | |
- | * Maximum size | 32.29 KiB |
- | * Blobs | |
- | * Maximum size | 13 B |
- | * Tags | |
- | * Maximum size | 132 B |
+ | Repository structure | Value |
+ | ------------------------ | ---------- |
+ | * References | |
+ | * Count | 4 |
+ | * Branches | 1 |
+ | * Tags | 1 |
+ | * Remotes | 1 |
+ | * Others | 1 |
+ | | |
+ | * Reachable objects | |
+ | * Count | 3.02 k |
+ | * Commits | 1.01 k |
+ | * Trees | 1.01 k |
+ | * Blobs | 1.01 k |
+ | * Tags | 1 |
+ | * Inflated size | 16.03 MiB |
+ | * Commits | 217.92 KiB |
+ | * Trees | 15.81 MiB |
+ | * Blobs | 11.68 KiB |
+ | * Tags | 132 B |
+ | * Disk size | $(object_type_disk_usage all true) |
+ | * Commits | $(object_type_disk_usage commit true) |
+ | * Trees | $(object_type_disk_usage tree true) |
+ | * Blobs | $(object_type_disk_usage blob true) |
+ | * Tags | $(object_type_disk_usage tag) B |
+ | | |
+ | * Largest objects | |
+ | * Commits | |
+ | * Maximum size [1] | 223 B |
+ | * Trees | |
+ | * Maximum size [2] | 32.29 KiB |
+ | * Blobs | |
+ | * Maximum size [3] | 13 B |
+ | * Tags | |
+ | * Maximum size [4] | 132 B |
+
+ [1] 0dc91eb18580102a3a216c8bfecedeba2b9f9b9a
+ [2] 60665251ab71dbd8c18d9bf2174f4ee0d58aa06c
+ [3] 97d808e45116bf02103490294d3d46dad7a2ac62
+ [4] 4dae4f5954f5e6feb3577cfb1b181daa3fd3afd2
EOF
git repo structure >out 2>err &&
projects / thirdparty / git.git / commitdiff
