mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-remote: use parse-options api

Browse Source 
Currently ls-remote uses a hand rolled parser for its command line
arguments.  Use the parse-options api instead of the hand rolled parser
to simplify the code and make it easier to add new arguments.  In
addition this improves the help message.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer
2016-01-19 00:20:49 +01:00
committed by Junio C Hamano
parent 80b17e5831
commit ba5f28bf79
1 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
builtin/ls-remote.c
View File

@ -3,9 +3,11 @@
#include "transport.h" #include "transport.h"
#include "remote.h" #include "remote.h"
static const char ls_remote_usage[] = static const char * const ls_remote_usage[] = {
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]"; " [-q | --quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]"),
NULL
};
/* /*
* Is there one among the list of patterns that match the tail part * Is there one among the list of patterns that match the tail part
@ -30,7 +32,6 @@ static int tail_match(const char **pattern, const char *path)
int cmd_ls_remote(int argc, const char **argv, const char *prefix) int cmd_ls_remote(int argc, const char **argv, const char *prefix)
{ {
int i;
const char *dest = NULL; const char *dest = NULL;
unsigned flags = 0; unsigned flags = 0;
int get_url = 0; int get_url = 0;
@ -43,59 +44,34 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
struct transport *transport; struct transport *transport;
const struct ref *ref; const struct ref *ref;
if (argc == 2 && !strcmp("-h", argv[1])) struct option options[] = {
usage(ls_remote_usage); OPT__QUIET(&quiet, N_("do not print remote URL")),
OPT_STRING(0, "upload-pack", &uploadpack, N_("exec"),
N_("path of git-upload-pack on the remote host")),
{ OPTION_STRING, 0, "exec", &uploadpack, N_("exec"),
N_("path of git-upload-pack on the remote host"),
PARSE_OPT_HIDDEN },
OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS),
OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_HEADS),
OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
OPT_BOOL(0, "get-url", &get_url,
N_("take url.<base>.insteadOf into account")),
OPT_SET_INT(0, "exit-code", &status,
N_("exit with exit code 2 if no matching refs are found"), 2),
OPT_END()
};
for (i = 1; i < argc; i++) { argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
const char *arg = argv[i]; PARSE_OPT_STOP_AT_NON_OPTION);
dest = argv[0];
if (*arg == '-') { if (argc > 1) {
if (starts_with(arg, "--upload-pack=")) { int i;
uploadpack = arg + 14; pattern = xcalloc(argc, sizeof(const char *));
continue; for (i = 1; i < argc; i++)
} pattern[i - 1] = xstrfmt("*/%s", argv[i]);
if (starts_with(arg, "--exec=")) {
uploadpack = arg + 7;
continue;
}
if (!strcmp("--tags", arg) || !strcmp("-t", arg)) {
flags |= REF_TAGS;
continue;
}
if (!strcmp("--heads", arg) || !strcmp("-h", arg)) {
flags |= REF_HEADS;
continue;
}
if (!strcmp("--refs", arg)) {
flags |= REF_NORMAL;
continue;
}
if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {
quiet = 1;
continue;
}
if (!strcmp("--get-url", arg)) {
get_url = 1;
continue;
}
if (!strcmp("--exit-code", arg)) {
/* return this code if no refs are reported */
status = 2;
continue;
}
usage(ls_remote_usage);
}
dest = arg;
i++;
break;
} }
if (argv[i]) {
int j;
pattern = xcalloc(argc - i + 1, sizeof(const char *));
for (j = i; j < argc; j++)
pattern[j - i] = xstrfmt("*/%s", argv[j]);
}
remote = remote_get(dest); remote = remote_get(dest);
if (!remote) { if (!remote) {
if (dest) if (dest)