undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use parseopts in builtin-push

Browse Source 
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2007-11-04 22:35:37 -05:00 committed by Junio C Hamano
parent 93fc05eb9e
commit 378c4832ef
1 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
builtin-push.c
View File

@ -7,8 +7,12 @@
#include "builtin.h" #include "builtin.h"
#include "remote.h" #include "remote.h"
#include "transport.h" #include "transport.h"
#include "parse-options.h"
static const char push_usage[] = "git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]"; static const char * const push_usage[] = {
"git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...]",
NULL,
};
static int thin, verbose; static int thin, verbose;
static const char *receivepack; static const char *receivepack;
@ -85,63 +89,43 @@ static int do_push(const char *repo, int flags)
int cmd_push(int argc, const char **argv, const char *prefix) int cmd_push(int argc, const char **argv, const char *prefix)
{ {
int i;
int flags = 0; int flags = 0;
int all = 0;
int dry_run = 0;
int force = 0;
int tags = 0;
const char *repo = NULL; /* default repository */ const char *repo = NULL; /* default repository */
for (i = 1; i < argc; i++) { struct option options[] = {
const char *arg = argv[i]; OPT__VERBOSE(&verbose),
OPT_STRING( 0 , "repo", &repo, "repository", "repository"),
OPT_BOOLEAN( 0 , "all", &all, "push all refs"),
OPT_BOOLEAN( 0 , "tags", &tags, "push tags"),
OPT_BOOLEAN( 0 , "dry-run", &dry_run, "dry run"),
OPT_BOOLEAN('f', "force", &force, "force updates"),
OPT_BOOLEAN( 0 , "thin", &thin, "use thin pack"),
OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", "receive pack program"),
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
OPT_END()
};
if (arg[0] != '-') { argc = parse_options(argc, argv, options, push_usage, 0);
repo = arg;
i++; if (force)
break; flags |= TRANSPORT_PUSH_FORCE;
} if (dry_run)
if (!strcmp(arg, "-v")) { flags |= TRANSPORT_PUSH_DRY_RUN;
verbose=1; if (tags)
continue; add_refspec("refs/tags/*");
} if (all)
if (!prefixcmp(arg, "--repo=")) { flags |= TRANSPORT_PUSH_ALL;
repo = arg+7;
continue; if (argc > 0) {
} repo = argv[0];
if (!strcmp(arg, "--all")) { set_refspecs(argv + 1, argc - 1);
flags |= TRANSPORT_PUSH_ALL;
continue;
}
if (!strcmp(arg, "--dry-run")) {
flags |= TRANSPORT_PUSH_DRY_RUN;
continue;
}
if (!strcmp(arg, "--tags")) {
add_refspec("refs/tags/*");
continue;
}
if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
flags |= TRANSPORT_PUSH_FORCE;
continue;
}
if (!strcmp(arg, "--thin")) {
thin = 1;
continue;
}
if (!strcmp(arg, "--no-thin")) {
thin = 0;
continue;
}
if (!prefixcmp(arg, "--receive-pack=")) {
receivepack = arg + 15;
continue;
}
if (!prefixcmp(arg, "--exec=")) {
receivepack = arg + 7;
continue;
}
usage(push_usage);
} }
set_refspecs(argv + i, argc - i);
if ((flags & TRANSPORT_PUSH_ALL) && refspec) if ((flags & TRANSPORT_PUSH_ALL) && refspec)
usage(push_usage); usage_with_options(push_usage, options);
return do_push(repo, flags); return do_push(repo, flags);
} }