transport: rename negotiation_tips

The previous change added the --negotiation-restrict synonym for the
--negotiation-tips option for 'git fetch'. In anticipation of adding a
new option that behaves similarly but with distinct changes to its
behavior, rename the internal representation of this data from
'negotiation_tips' to 'negotiation_restrict_tips'.

The 'tips' part is kept because this is an oid_array in the transport
layer. This requires the builtin to handle parsing refs into collections
of oids so the transport layer can handle this cleaner form of the data.

Also update the string_list used to store the inputs from command-line
options.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch.c b/builtin/fetch.c
index fc950fe35b5e734ebf854015609366f53ad35c01..2ba0051d520cdf6195d3734468bbf8c4c22f12fa 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -98,7 +98,7 @@ static struct transport *gtransport;
 static struct transport *gsecondary;
 static struct refspec refmap = REFSPEC_INIT_FETCH;
 static struct string_list server_options = STRING_LIST_INIT_DUP;
-static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
+static struct string_list negotiation_restrict = STRING_LIST_INIT_NODUP;
 
 struct fetch_config {
        enum display_format display_format;
@@ -1534,13 +1534,13 @@ static int add_oid(const struct reference *ref, void *cb_data)
        return 0;
 }
 
-static void add_negotiation_tips(struct git_transport_options *smart_options)
+static void add_negotiation_restrict_tips(struct git_transport_options *smart_options)
 {
        struct oid_array *oids = xcalloc(1, sizeof(*oids));
        int i;
 
-       for (i = 0; i < negotiation_tip.nr; i++) {
-               const char *s = negotiation_tip.items[i].string;
+       for (i = 0; i < negotiation_restrict.nr; i++) {
+               const char *s = negotiation_restrict.items[i].string;
                struct refs_for_each_ref_options opts = {
                        .pattern = s,
                };
@@ -1561,7 +1561,7 @@ static void add_negotiation_tips(struct git_transport_options *smart_options)
                        warning(_("ignoring %s=%s because it does not match any refs"),
                                "--negotiation-restrict", s);
        }
-       smart_options->negotiation_tips = oids;
+       smart_options->negotiation_restrict_tips = oids;
 }
 
 static struct transport *prepare_transport(struct remote *remote, int deepen,
@@ -1595,9 +1595,9 @@ static struct transport *prepare_transport(struct remote *remote, int deepen,
                set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec);
                set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
        }
-       if (negotiation_tip.nr) {
+       if (negotiation_restrict.nr) {
                if (transport->smart_options)
-                       add_negotiation_tips(transport->smart_options);
+                       add_negotiation_restrict_tips(transport->smart_options);
                else
                        warning(_("ignoring %s because the protocol does not support it"),
                                "--negotiation-restrict");
@@ -2566,7 +2566,7 @@ int cmd_fetch(int argc,
                               N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg),
                OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
                OPT_IPVERSION(&family),
-               OPT_STRING_LIST(0, "negotiation-restrict", &negotiation_tip, N_("revision"),
+               OPT_STRING_LIST(0, "negotiation-restrict", &negotiation_restrict, N_("revision"),
                                N_("report that we have only objects reachable from this object")),
                OPT_ALIAS(0, "negotiation-tip", "negotiation-restrict"),
                OPT_BOOL(0, "negotiate-only", &negotiate_only,
@@ -2658,7 +2658,7 @@ int cmd_fetch(int argc,
                config.display_format = DISPLAY_FORMAT_PORCELAIN;
        }
 
-       if (negotiate_only && !negotiation_tip.nr)
+       if (negotiate_only && !negotiation_restrict.nr)
                die(_("%s needs one or more %s"), "--negotiate-only",
                    "--negotiation-restrict=*");
 

diff --git a/fetch-pack.c b/fetch-pack.c
index 6ecd468ef766a8923af879f336f282baf65a5d86..baf239adf98db3715462a20c3809d20523de886d 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -291,21 +291,21 @@ static int next_flush(int stateless_rpc, int count)
 }
 
 static void mark_tips(struct fetch_negotiator *negotiator,
-                     const struct oid_array *negotiation_tips)
+                     const struct oid_array *negotiation_restrict_tips)
 {
        struct refs_for_each_ref_options opts = {
                .flags = REFS_FOR_EACH_INCLUDE_BROKEN,
        };
        int i;
 
-       if (!negotiation_tips) {
+       if (!negotiation_restrict_tips) {
                refs_for_each_ref_ext(get_main_ref_store(the_repository),
                                      rev_list_insert_ref_oid, negotiator, &opts);
                return;
        }
 
-       for (i = 0; i < negotiation_tips->nr; i++)
-               rev_list_insert_ref(negotiator, &negotiation_tips->oid[i]);
+       for (i = 0; i < negotiation_restrict_tips->nr; i++)
+               rev_list_insert_ref(negotiator, &negotiation_restrict_tips->oid[i]);
        return;
 }
 
@@ -355,7 +355,7 @@ static int find_common(struct fetch_negotiator *negotiator,
                           PACKET_READ_CHOMP_NEWLINE |
                           PACKET_READ_DIE_ON_ERR_PACKET);
 
-       mark_tips(negotiator, args->negotiation_tips);
+       mark_tips(negotiator, args->negotiation_restrict_tips);
        for_each_cached_alternate(negotiator, insert_one_alternate_object);
 
        fetching = 0;
@@ -1728,7 +1728,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
                        else
                                state = FETCH_SEND_REQUEST;
 
-                       mark_tips(negotiator, args->negotiation_tips);
+                       mark_tips(negotiator, args->negotiation_restrict_tips);
                        for_each_cached_alternate(negotiator,
                                                  insert_one_alternate_object);
                        break;
@@ -2177,7 +2177,7 @@ static void clear_common_flag(struct oidset *s)
        }
 }
 
-void negotiate_using_fetch(const struct oid_array *negotiation_tips,
+void negotiate_using_fetch(const struct oid_array *negotiation_restrict_tips,
                           const struct string_list *server_options,
                           int stateless_rpc,
                           int fd[],
@@ -2195,13 +2195,13 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips,
        timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
 
        fetch_negotiator_init(the_repository, &negotiator);
-       mark_tips(&negotiator, negotiation_tips);
+       mark_tips(&negotiator, negotiation_restrict_tips);
 
        packet_reader_init(&reader, fd[0], NULL, 0,
                           PACKET_READ_CHOMP_NEWLINE |
                           PACKET_READ_DIE_ON_ERR_PACKET);
 
-       oid_array_for_each((struct oid_array *) negotiation_tips,
+       oid_array_for_each((struct oid_array *) negotiation_restrict_tips,
                           add_to_object_array,
                           &nt_object_array);
 

diff --git a/fetch-pack.h b/fetch-pack.h
index 9d3470366f85ecdd7cbdb303b6b903fb26767b7b..6c70c942c2f001a7df5fa32bc6970b950e9fd90e 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -21,7 +21,7 @@ struct fetch_pack_args {
         * If not NULL, during packfile negotiation, fetch-pack will send "have"
         * lines only with these tips and their ancestors.
         */
-       const struct oid_array *negotiation_tips;
+       const struct oid_array *negotiation_restrict_tips;
 
        unsigned deepen_relative:1;
        unsigned quiet:1;
@@ -89,7 +89,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
  * In the capability advertisement that has happened prior to invoking this
  * function, the "wait-for-done" capability must be present.
  */
-void negotiate_using_fetch(const struct oid_array *negotiation_tips,
+void negotiate_using_fetch(const struct oid_array *negotiation_restrict_tips,
                           const struct string_list *server_options,
                           int stateless_rpc,
                           int fd[],

diff --git a/transport-helper.c b/transport-helper.c
index 4d95d84f9e4d05db5117016bcdacadf3a4fe46b2..0e5b3b7202cf20eb08eb0e467d8c4056bd86e31a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -754,7 +754,7 @@ static int fetch_refs(struct transport *transport,
                set_helper_option(transport, "filter", spec);
        }
 
-       if (data->transport_options.negotiation_tips)
+       if (data->transport_options.negotiation_restrict_tips)
                warning("Ignoring --negotiation-tip because the protocol does not support it.");
 
        if (data->fetch)

diff --git a/transport.c b/transport.c
index 107f4fa5dce96adb4afbaba4fcf5bb5f9eb80b4c..a3051f6733633d2d63841952e85f247fab51c279 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -463,7 +463,7 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.refetch = data->options.refetch;
        args.stateless_rpc = transport->stateless_rpc;
        args.server_options = transport->server_options;
-       args.negotiation_tips = data->options.negotiation_tips;
+       args.negotiation_restrict_tips = data->options.negotiation_restrict_tips;
        args.reject_shallow_remote = transport->smart_options->reject_shallow;
 
        if (!data->finished_handshake) {
@@ -491,7 +491,7 @@ static int fetch_refs_via_pack(struct transport *transport,
                        warning(_("server does not support wait-for-done"));
                        ret = -1;
                } else {
-                       negotiate_using_fetch(data->options.negotiation_tips,
+                       negotiate_using_fetch(data->options.negotiation_restrict_tips,
                                              transport->server_options,
                                              transport->stateless_rpc,
                                              data->fd,
@@ -979,9 +979,9 @@ static int disconnect_git(struct transport *transport)
                finish_connect(data->conn);
        }
 
-       if (data->options.negotiation_tips) {
-               oid_array_clear(data->options.negotiation_tips);
-               free(data->options.negotiation_tips);
+       if (data->options.negotiation_restrict_tips) {
+               oid_array_clear(data->options.negotiation_restrict_tips);
+               free(data->options.negotiation_restrict_tips);
        }
        list_objects_filter_release(&data->options.filter_options);
        oid_array_clear(&data->extra_have);

diff --git a/transport.h b/transport.h
index 892f19454a75d602ec69cb251f503bff0b93aa58..cdeb33c16f82f6e94917f10dea62605cce31a551 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -40,13 +40,13 @@ struct git_transport_options {
 
        /*
         * This is only used during fetch. See the documentation of
-        * negotiation_tips in struct fetch_pack_args.
+        * negotiation_restrict_tips in struct fetch_pack_args.
         *
         * This field is only supported by transports that support connect or
         * stateless_connect. Set this field directly instead of using
         * transport_set_option().
         */
-       struct oid_array *negotiation_tips;
+       struct oid_array *negotiation_restrict_tips;
 
        /*
         * If allocated, whenever transport_fetch_refs() is called, add known