diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-02-24 20:50:24 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-24 08:35:44 -0800 |
| commit | 8afd8dc065c54d3c8d8e0397506aa99261703414 (patch) | |
| tree | d6284c214be5d149ff0b86cb156dce816d57b855 | |
| parent | bde873c52914b40377a12764cab926ee974c3f32 (diff) | |
| download | git-8afd8dc065c54d3c8d8e0397506aa99261703414.tar.gz git-8afd8dc065c54d3c8d8e0397506aa99261703414.tar.xz | |
push: support multiple levels of verbosity
Remove the flags TRANSPORT_PUSH_QUIET and TRANSPORT_PUSH_VERBOSE; use
transport->verbose instead to determine verbosity for pushing.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-push.c | 9 | ||||
| -rw-r--r-- | transport-helper.c | 1 | ||||
| -rw-r--r-- | transport.c | 8 | ||||
| -rw-r--r-- | transport.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/builtin-push.c b/builtin-push.c index 5633f0ade..0082dadb7 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -17,6 +17,7 @@ static const char * const push_usage[] = { static int thin; static int deleterefs; static const char *receivepack; +static int verbosity; static const char **refspec; static int refspec_nr; @@ -105,13 +106,16 @@ static int push_with_options(struct transport *transport, int flags) { int err; int nonfastforward; + + transport_set_verbosity(transport, verbosity); + if (receivepack) transport_set_option(transport, TRANS_OPT_RECEIVEPACK, receivepack); if (thin) transport_set_option(transport, TRANS_OPT_THIN, "yes"); - if (flags & TRANSPORT_PUSH_VERBOSE) + if (verbosity > 0) fprintf(stderr, "Pushing to %s\n", transport->url); err = transport_push(transport, refspec_nr, refspec, flags, &nonfastforward); @@ -204,8 +208,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) int rc; const char *repo = NULL; /* default repository */ struct option options[] = { - OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), - OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE), + OPT__VERBOSITY(&verbosity), OPT_STRING( 0 , "repo", &repo, "repository", "repository"), OPT_BIT( 0 , "all", &flags, "push all refs", TRANSPORT_PUSH_ALL), OPT_BIT( 0 , "mirror", &flags, "mirror all refs", diff --git a/transport-helper.c b/transport-helper.c index 107742891..3d33697a4 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -576,7 +576,6 @@ static int push_refs(struct transport *transport, if (buf.len == 0) return 0; - transport->verbose = flags & TRANSPORT_PUSH_VERBOSE ? 1 : 0; standard_options(transport); if (flags & TRANSPORT_PUSH_DRY_RUN) { diff --git a/transport.c b/transport.c index 1632c4d0a..0655f65c1 100644 --- a/transport.c +++ b/transport.c @@ -788,8 +788,8 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); args.use_thin_pack = data->options.thin; - args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE); - args.quiet = !!(flags & TRANSPORT_PUSH_QUIET); + args.verbose = (transport->verbose > 0); + args.quiet = (transport->verbose < 0); args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); ret = send_pack(&args, data->fd, data->conn, remote_refs, @@ -1039,8 +1039,8 @@ int transport_push(struct transport *transport, transport->get_refs_list(transport, 1); struct ref *local_refs = get_local_heads(); int match_flags = MATCH_REFS_NONE; - int verbose = flags & TRANSPORT_PUSH_VERBOSE; - int quiet = flags & TRANSPORT_PUSH_QUIET; + int verbose = (transport->verbose > 0); + int quiet = (transport->verbose < 0); int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; int pretend = flags & TRANSPORT_PUSH_DRY_RUN; int ret, err; diff --git a/transport.h b/transport.h index 7d1a0b6b3..c0743b108 100644 --- a/transport.h +++ b/transport.h @@ -88,9 +88,7 @@ struct transport { #define TRANSPORT_PUSH_FORCE 2 #define TRANSPORT_PUSH_DRY_RUN 4 #define TRANSPORT_PUSH_MIRROR 8 -#define TRANSPORT_PUSH_VERBOSE 16 #define TRANSPORT_PUSH_PORCELAIN 32 -#define TRANSPORT_PUSH_QUIET 64 #define TRANSPORT_PUSH_SET_UPSTREAM 128 /* Returns a transport suitable for the url */ |