repo: add --all to git-repo-info

Add a new flag `--all` to git-repo-info for requesting values for all
the available keys. By using this flag, the user can retrieve all the
values instead of searching what are the desired keys for what they
wants.

Helped-by: Karthik Nayak <karthik.188@gmail.com>
Helped-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-repo.adoc b/Documentation/git-repo.adoc
index ce43cb19c8b03cb0d0eed83090036135d1501803..70f0a6d2e472917e160cacedc5a013cc603d0599 100644 (file)
--- a/Documentation/git-repo.adoc
+++ b/Documentation/git-repo.adoc
@@ -8,7 +8,7 @@ git-repo - Retrieve information about the repository
 SYNOPSIS
 --------
 [synopsis]
-git repo info [--format=(keyvalue|nul)] [-z] [<key>...]
+git repo info [--format=(keyvalue|nul)] [-z] [--all | <key>...]
 git repo structure [--format=(table|keyvalue|nul)]
 
 DESCRIPTION
@@ -19,13 +19,13 @@ THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
 
 COMMANDS
 --------
-`info [--format=(keyvalue|nul)] [-z] [<key>...]`::
+`info [--format=(keyvalue|nul)] [-z] [--all | <key>...]`::
        Retrieve metadata-related information about the current repository. Only
        the requested data will be returned based on their keys (see "INFO KEYS"
        section below).
 +
 The values are returned in the same order in which their respective keys were
-requested.
+requested. The `--all` flag requests the values for all the available keys.
 +
 The output format can be chosen through the flag `--format`. Two formats are
 supported:

diff --git a/builtin/repo.c b/builtin/repo.c
index f9fb4184940e2ef0a30f6b3b341aa2e95503162e..e30e2416d4f59d86a7fdc41ecefae6e03662d7db 100644 (file)
--- a/builtin/repo.c
+++ b/builtin/repo.c
@@ -15,7 +15,7 @@
 #include "utf8.h"
 
 static const char *const repo_usage[] = {
-       "git repo info [--format=(keyvalue|nul)] [-z] [<key>...]",
+       "git repo info [--format=(keyvalue|nul)] [-z] [--all | <key>...]",
        "git repo structure [--format=(table|keyvalue|nul)]",
        NULL
 };
@@ -129,6 +129,23 @@ static int print_fields(int argc, const char **argv,
        return ret;
 }
 
+static int print_all_fields(struct repository *repo,
+                           enum output_format format)
+{
+       struct strbuf valbuf = STRBUF_INIT;
+
+       for (size_t i = 0; i < ARRAY_SIZE(repo_info_fields); i++) {
+               const struct field *field = &repo_info_fields[i];
+
+               strbuf_reset(&valbuf);
+               field->get_value(repo, &valbuf);
+               print_field(format, field->key, valbuf.buf);
+       }
+
+       strbuf_release(&valbuf);
+       return 0;
+}
+
 static int parse_format_cb(const struct option *opt,
                           const char *arg, int unset UNUSED)
 {
@@ -152,6 +169,7 @@ static int cmd_repo_info(int argc, const char **argv, const char *prefix,
                         struct repository *repo)
 {
        enum output_format format = FORMAT_KEYVALUE;
+       int all_keys = 0;
        struct option options[] = {
                OPT_CALLBACK_F(0, "format", &format, N_("format"),
                               N_("output format"),
@@ -160,6 +178,7 @@ static int cmd_repo_info(int argc, const char **argv, const char *prefix,
                               N_("synonym for --format=nul"),
                               PARSE_OPT_NONEG | PARSE_OPT_NOARG,
                               parse_format_cb),
+               OPT_BOOL(0, "all", &all_keys, N_("print all keys/values")),
                OPT_END()
        };
 
@@ -167,7 +186,13 @@ static int cmd_repo_info(int argc, const char **argv, const char *prefix,
        if (format != FORMAT_KEYVALUE && format != FORMAT_NUL_TERMINATED)
                die(_("unsupported output format"));
 
-       return print_fields(argc, argv, repo, format);
+       if (all_keys && argc)
+               die(_("--all and <key> cannot be used together"));
+
+       if (all_keys)
+               return print_all_fields(repo, format);
+       else
+               return print_fields(argc, argv, repo, format);
 }
 
 struct ref_stats {

diff --git a/t/t1900-repo.sh b/t/t1900-repo.sh
index 2beba67889af25d3547a223e62f45037dba7f171..51d55f11a5ed664bc5927b12677f56ad76f32070 100755 (executable)
--- a/t/t1900-repo.sh
+++ b/t/t1900-repo.sh
@@ -4,6 +4,15 @@ test_description='test git repo-info'
 
 . ./test-lib.sh
 
+# git-repo-info keys. It must contain the same keys listed in the const
+# repo_info_fields, in lexicographical order.
+REPO_INFO_KEYS='
+       layout.bare
+       layout.shallow
+       object.format
+       references.format
+'
+
 # Test whether a key-value pair is correctly returned
 #
 # Usage: test_repo_info <label> <init command> <repo_name> <key> <expected value>
@@ -110,4 +119,16 @@ test_expect_success 'git repo info uses the last requested format' '
        test_cmp expected actual
 '
 
+test_expect_success 'git repo info --all returns all key-value pairs' '
+       git repo info $REPO_INFO_KEYS >expect &&
+       git repo info --all >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'git repo info --all <key> aborts' '
+       echo "fatal: --all and <key> cannot be used together" >expect &&
+       test_must_fail git repo info --all object.format 2>actual &&
+       test_cmp expect actual
+'
+
 test_done