Skip to content

Commit dac3510

Browse files
committed
survey: add --top=<N> option and config
The 'git survey' builtin provides several detail tables, such as "top files by on-disk size". The size of these tables defaults to 100, currently. Allow the user to specify this number via a new --top=<N> option or the new survey.top config key. Signed-off-by: Derrick Stolee <[email protected]>
1 parent 5eee0c9 commit dac3510

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

Documentation/config/survey.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ survey.*::
88
This boolean value implies the `--[no-]verbose` option.
99
progress::
1010
This boolean value implies the `--[no-]progress` option.
11+
top::
12+
This integer value implies `--top=<N>`, specifying the
13+
number of entries in the detail tables.
1114
--

builtin/survey.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ static struct survey_refs_wanted default_ref_options = {
4040
struct survey_opts {
4141
int verbose;
4242
int show_progress;
43+
int top_nr;
4344
struct survey_refs_wanted refs;
4445
};
4546

@@ -539,6 +540,10 @@ static int survey_load_config_cb(const char *var, const char *value,
539540
ctx->opts.show_progress = git_config_bool(var, value);
540541
return 0;
541542
}
543+
if (!strcmp(var, "survey.top")) {
544+
ctx->opts.top_nr = git_config_bool(var, value);
545+
return 0;
546+
}
542547

543548
return git_default_config(var, value, cctx, pvoid);
544549
}
@@ -783,8 +788,6 @@ static int survey_objects_path_walk_fn(const char *path,
783788

784789
static void initialize_report(struct survey_context *ctx)
785790
{
786-
const int top_limit = 100;
787-
788791
CALLOC_ARRAY(ctx->report.by_type, REPORT_TYPE_COUNT);
789792
ctx->report.by_type[REPORT_TYPE_COMMIT].label = xstrdup(_("Commits"));
790793
ctx->report.by_type[REPORT_TYPE_TREE].label = xstrdup(_("Trees"));
@@ -793,21 +796,21 @@ static void initialize_report(struct survey_context *ctx)
793796

794797
CALLOC_ARRAY(ctx->report.top_paths_by_count, REPORT_TYPE_COUNT);
795798
init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_TREE],
796-
top_limit, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
799+
ctx->opts.top_nr, _("TOP DIRECTORIES BY COUNT"), cmp_by_nr);
797800
init_top_sizes(&ctx->report.top_paths_by_count[REPORT_TYPE_BLOB],
798-
top_limit, _("TOP FILES BY COUNT"), cmp_by_nr);
801+
ctx->opts.top_nr, _("TOP FILES BY COUNT"), cmp_by_nr);
799802

800803
CALLOC_ARRAY(ctx->report.top_paths_by_disk, REPORT_TYPE_COUNT);
801804
init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_TREE],
802-
top_limit, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
805+
ctx->opts.top_nr, _("TOP DIRECTORIES BY DISK SIZE"), cmp_by_disk_size);
803806
init_top_sizes(&ctx->report.top_paths_by_disk[REPORT_TYPE_BLOB],
804-
top_limit, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
807+
ctx->opts.top_nr, _("TOP FILES BY DISK SIZE"), cmp_by_disk_size);
805808

806809
CALLOC_ARRAY(ctx->report.top_paths_by_inflate, REPORT_TYPE_COUNT);
807810
init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_TREE],
808-
top_limit, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
811+
ctx->opts.top_nr, _("TOP DIRECTORIES BY INFLATED SIZE"), cmp_by_inflated_size);
809812
init_top_sizes(&ctx->report.top_paths_by_inflate[REPORT_TYPE_BLOB],
810-
top_limit, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
813+
ctx->opts.top_nr, _("TOP FILES BY INFLATED SIZE"), cmp_by_inflated_size);
811814
}
812815

813816
static void survey_phase_objects(struct survey_context *ctx)
@@ -856,6 +859,7 @@ int cmd_survey(int argc, const char **argv, const char *prefix)
856859
.opts = {
857860
.verbose = 0,
858861
.show_progress = -1, /* defaults to isatty(2) */
862+
.top_nr = 100,
859863

860864
.refs.want_all_refs = -1,
861865

@@ -871,6 +875,8 @@ int cmd_survey(int argc, const char **argv, const char *prefix)
871875
static struct option survey_options[] = {
872876
OPT__VERBOSE(&ctx.opts.verbose, N_("verbose output")),
873877
OPT_BOOL(0, "progress", &ctx.opts.show_progress, N_("show progress")),
878+
OPT_INTEGER('n', "top", &ctx.opts.top_nr,
879+
N_("number of entries to include in detail tables")),
874880

875881
OPT_BOOL_F(0, "all-refs", &ctx.opts.refs.want_all_refs, N_("include all refs"), PARSE_OPT_NONEG),
876882

0 commit comments

Comments
 (0)