Browse Source

fetch: refactor verbosity option handling into transport.[ch]

transport_set_verbosity() is now provided to transport users.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Tay Ray Chuan 15 years ago committed by Junio C Hamano
parent
commit
bde873c529
  1. 5
      builtin-fetch.c
  2. 8
      transport.c
  3. 1
      transport.h

5
builtin-fetch.c

@ -823,10 +823,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv) @@ -823,10 +823,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
die("Where do you want to fetch from today?");

transport = transport_get(remote, NULL);
if (verbosity >= 2)
transport->verbose = verbosity <= 3 ? verbosity : 3;
if (verbosity < 0)
transport->verbose = -1;
transport_set_verbosity(transport, verbosity);
if (upload_pack)
set_option(TRANS_OPT_UPLOADPACK, upload_pack);
if (keep)

8
transport.c

@ -1013,6 +1013,14 @@ int transport_set_option(struct transport *transport, @@ -1013,6 +1013,14 @@ int transport_set_option(struct transport *transport,
return 1;
}

void transport_set_verbosity(struct transport *transport, int verbosity)
{
if (verbosity >= 2)
transport->verbose = verbosity <= 3 ? verbosity : 3;
if (verbosity < 0)
transport->verbose = -1;
}

int transport_push(struct transport *transport,
int refspec_nr, const char **refspec, int flags,
int *nonfastforward)

1
transport.h

@ -122,6 +122,7 @@ struct transport *transport_get(struct remote *, const char *); @@ -122,6 +122,7 @@ struct transport *transport_get(struct remote *, const char *);
**/
int transport_set_option(struct transport *transport, const char *name,
const char *value);
void transport_set_verbosity(struct transport *transport, int verbosity);

int transport_push(struct transport *connection,
int refspec_nr, const char **refspec, int flags,

Loading…
Cancel
Save