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>

diff --git a/builtin-fetch.c b/builtin-fetch.c
index 8654fa7a2dbe2c1ca76a493a4322447de5219b99..d23ea2a53e89b03418067d553a7c9e98ea2ed050 100644 (file)
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -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);
                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)
        if (upload_pack)
                set_option(TRANS_OPT_UPLOADPACK, upload_pack);
        if (keep)

diff --git a/transport.c b/transport.c
index 3846aacb476b552cefddd8774b9a055e353b6ebc..1632c4d0aab3195ee79a60b5dc44ab7c29cc10a4 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1013,6 +1013,14 @@ int transport_set_option(struct transport *transport,
        return 1;
 }
 
        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)
 int transport_push(struct transport *transport,
                   int refspec_nr, const char **refspec, int flags,
                   int *nonfastforward)

diff --git a/transport.h b/transport.h
index 7cea5cc7234185b1c37ada818dfa1a9114621ad2..7d1a0b6b36dcf5cf4f7199fdb9e588441b849228 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -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);
  **/
 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,
 
 int transport_push(struct transport *connection,
                   int refspec_nr, const char **refspec, int flags,