Leo Gaspard <leo@xxxxxxxxxx> writes:
> From: Léo Gaspard <leo@xxxxxxxxxx>
>
> No behavior changes yet, only some groundwork for the next change.
>
> The refs_result structure combines a status code with a ref map, which
> can be NULL even on success.
Sorry, but I have absolutely no idea what this sentence wants to do
by being here in the log message. "even on success" makes it sound
as if it is normal to be NULL when status code != success, but it is
not even clear why it is the case, and "can be NULL" implies that it
is not always NULL, but it does not make it clear when it is NULL
and when it is not NULL when code == success. If you find the need
to explain what each field of a new struct you are introducing to
the codebase means (and it probably is a good idea for this one),
perhaps the right place to do so is in in-code comment next to the
struct definition?
It seems that you also moved add_existing() in the file, for no
apparent reason.
> This will be needed when there's a
> tweak-fetch hook, because it can filter out all refs, while still
> succeeding.
>
> fetch_refs returns a refs_result, so that it can modify the ref_map.
The description keeps saying "ref map", but it is unclear what it
is, why it is a good thing to allow the caller "modify" it, and what
kind of modification the caller wants to make for what reason.
Also, in C, we tend to avoid passing structure by value. It seems
that the patch makes a callchain involving backfill_tags() return
this struct by value, which goes against the convention. I suspect
that it should be trivial to have the caller supply an on-stack
instance and pass the pointer to it down the callchain, though.
> Based-on-patch-by: Joey Hess <joey@xxxxxxxxxxx>
> Signed-off-by: Leo Gaspard <leo@xxxxxxxxxx>
> ---
> builtin/fetch.c | 68 +++++++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 44 insertions(+), 24 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 7bbcd26fa..76dc05f61 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -34,6 +34,11 @@ enum {
> TAGS_SET = 2
> };
>
> +struct refs_result {
> + struct ref *new_refs;
> + int status;
> +};
> +
> static int fetch_prune_config = -1; /* unspecified */
> static int prune = -1; /* unspecified */
> #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
> @@ -57,6 +62,18 @@ static int shown_url = 0;
> static int refmap_alloc, refmap_nr;
> static const char **refmap_array;
>
> +static int add_existing(const char *refname, const struct object_id *oid,
> + int flag, void *cbdata)
> +{
> + struct string_list *list = (struct string_list *)cbdata;
> + struct string_list_item *item = string_list_insert(list, refname);
> + struct object_id *old_oid = xmalloc(sizeof(*old_oid));
> +
> + oidcpy(old_oid, oid);
> + item->util = old_oid;
> + return 0;
> +}
> +
> static int git_fetch_config(const char *k, const char *v, void *cb)
> {
> if (!strcmp(k, "fetch.prune")) {
> @@ -217,18 +234,6 @@ static void add_merge_config(struct ref **head,
> }
> }
>
> -static int add_existing(const char *refname, const struct object_id *oid,
> - int flag, void *cbdata)
> -{
> - struct string_list *list = (struct string_list *)cbdata;
> - struct string_list_item *item = string_list_insert(list, refname);
> - struct object_id *old_oid = xmalloc(sizeof(*old_oid));
> -
> - oidcpy(old_oid, oid);
> - item->util = old_oid;
> - return 0;
> -}
> -
> static int will_fetch(struct ref **head, const unsigned char *sha1)
> {
> struct ref *rm = *head;
> @@ -920,15 +925,20 @@ static int quickfetch(struct ref *ref_map)
> return check_connected(iterate_ref_map, &rm, &opt);
> }
>
> -static int fetch_refs(struct transport *transport, struct ref *ref_map)
> +static struct refs_result fetch_refs(struct transport *transport,
> + struct ref *ref_map)
> {
> - int ret = quickfetch(ref_map);
> - if (ret)
> - ret = transport_fetch_refs(transport, ref_map);
> - if (!ret)
> - ret |= store_updated_refs(transport->url,
> + struct refs_result ret;
> + ret.status = quickfetch(ref_map);
> + if (ret.status) {
> + ret.status = transport_fetch_refs(transport, ref_map);
> + }
> + if (!ret.status) {
> + ret.new_refs = ref_map;
> + ret.status |= store_updated_refs(transport->url,
> transport->remote->name,
> - ref_map);
> + ret.new_refs);
> + }
> transport_unlock_pack(transport);
> return ret;
> }
> @@ -1048,9 +1058,11 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
> return transport;
> }
>
> -static void backfill_tags(struct transport *transport, struct ref *ref_map)
> +static struct refs_result backfill_tags(struct transport *transport,
> + struct ref *ref_map)
> {
> int cannot_reuse;
> + struct refs_result res;
>
> /*
> * Once we have set TRANS_OPT_DEEPEN_SINCE, we can't unset it
> @@ -1069,12 +1081,14 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map)
> transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
> transport_set_option(transport, TRANS_OPT_DEPTH, "0");
> transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
> - fetch_refs(transport, ref_map);
> + res = fetch_refs(transport, ref_map);
>
> if (gsecondary) {
> transport_disconnect(gsecondary);
> gsecondary = NULL;
> }
> +
> + return res;
> }
>
> static int do_fetch(struct transport *transport,
> @@ -1083,6 +1097,7 @@ static int do_fetch(struct transport *transport,
> struct string_list existing_refs = STRING_LIST_INIT_DUP;
> struct ref *ref_map;
> struct ref *rm;
> + struct refs_result res;
> int autotags = (transport->remote->fetch_tags == 1);
> int retcode = 0;
>
> @@ -1135,7 +1150,10 @@ static int do_fetch(struct transport *transport,
> transport->url);
> }
> }
> - if (fetch_refs(transport, ref_map)) {
> +
> + res = fetch_refs(transport, ref_map);
> + ref_map = res.new_refs;
> + if (res.status) {
> free_refs(ref_map);
> retcode = 1;
> goto cleanup;
> @@ -1148,8 +1166,10 @@ static int do_fetch(struct transport *transport,
> struct ref **tail = &ref_map;
> ref_map = NULL;
> find_non_local_tags(transport, &ref_map, &tail);
> - if (ref_map)
> - backfill_tags(transport, ref_map);
> + if (ref_map) {
> + res = backfill_tags(transport, ref_map);
> + ref_map = res.new_refs;
> + }
> free_refs(ref_map);
> }
