patch: use strlen to mean string length

[libgit2.git] / src / fetch.c

diff --git a/src/fetch.c b/src/fetch.c
index 295b036ef44ec2f4089f4e2d87a0c34a1be13906..4d895752cae8dcd1b89c207207418c18ba774db2 100644 (file)
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -19,52 +19,52 @@
 #include "repository.h"
 #include "refs.h"
 
-struct filter_payload {
-       git_remote *remote;
-       const git_refspec *spec, *tagspec;
-       git_odb *odb;
-};
-
-static int filter_ref__cb(git_remote_head *head, void *payload)
+static int maybe_want(git_remote *remote, git_remote_head *head, git_odb *odb, git_refspec *tagspec, git_remote_autotag_option_t tagopt)
 {
-       struct filter_payload *p = payload;
        int match = 0;
 
        if (!git_reference_is_valid_name(head->name))
                return 0;
 
-       if (p->remote->download_tags == GIT_REMOTE_DOWNLOAD_TAGS_ALL) {
+       if (tagopt == GIT_REMOTE_DOWNLOAD_TAGS_ALL) {
                /*
-                * If tagopt is --tags, then we only use the default
-                * tags refspec and ignore the remote's
+                * If tagopt is --tags, always request tags
+                * in addition to the remote's refspecs
                 */
-               if (git_refspec_src_matches(p->tagspec, head->name))
-                       match = 1;
-               else
-                       return 0;
-       } else if (git_remote__matching_refspec(p->remote, head->name))
+               if (git_refspec_src_matches(tagspec, head->name))
                        match = 1;
+       }
+
+       if (!match && git_remote__matching_refspec(remote, head->name))
+               match = 1;
 
        if (!match)
                return 0;
 
        /* If we have the object, mark it so we don't ask for it */
-       if (git_odb_exists(p->odb, &head->oid))
+       if (git_odb_exists(odb, &head->oid)) {
                head->local = 1;
+       }
        else
-               p->remote->need_pack = 1;
+               remote->need_pack = 1;
 
-       return git_vector_insert(&p->remote->refs, head);
+       return git_vector_insert(&remote->refs, head);
 }
 
-static int filter_wants(git_remote *remote)
+static int filter_wants(git_remote *remote, const git_fetch_options *opts)
 {
-       struct filter_payload p;
+       git_remote_head **heads;
        git_refspec tagspec, head;
-       int error = -1;
+       int error = 0;
+       git_odb *odb;
+       size_t i, heads_len;
+       git_remote_autotag_option_t tagopt = remote->download_tags;
+
+       if (opts && opts->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED)
+               tagopt = opts->download_tags;
 
-       //git_vector_clear(&remote->refs);
-       if (git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true) < 0)
+       git_vector_clear(&remote->refs);
+       if ((error = git_refspec__parse(&tagspec, GIT_REFSPEC_TAGS, true)) < 0)
                return error;
 
        /*
@@ -73,22 +73,27 @@ static int filter_wants(git_remote *remote)
         * not interested in any particular branch but just the remote's
         * HEAD, which will be stored in FETCH_HEAD after the fetch.
         */
-       p.tagspec = &tagspec;
-       p.remote = remote;
        if (remote->active_refspecs.length == 0) {
                if ((error = git_refspec__parse(&head, "HEAD", true)) < 0)
                        goto cleanup;
 
-               if ((error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs)) < 0)
+               error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs);
+               git_refspec__free(&head);
+
+               if (error < 0)
                        goto cleanup;
        }
 
-       git_vector_clear(&remote->refs);
+       if (git_repository_odb__weakptr(&odb, remote->repo) < 0)
+               goto cleanup;
 
-       if (git_repository_odb__weakptr(&p.odb, remote->repo) < 0)
+       if (git_remote_ls((const git_remote_head ***)&heads, &heads_len, remote) < 0)
                goto cleanup;
 
-       error = git_remote_ls(remote, filter_ref__cb, &p);
+       for (i = 0; i < heads_len; i++) {
+               if ((error = maybe_want(remote, heads[i], odb, &tagspec, tagopt)) < 0)
+                       break;
+       }
 
 cleanup:
        git_refspec__free(&tagspec);
@@ -101,11 +106,13 @@ cleanup:
  * them out. When we get an ACK we hide that commit and continue
  * traversing until we're done
  */
-int git_fetch_negotiate(git_remote *remote)
+int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts)
 {
        git_transport *t = remote->transport;
-       
-       if (filter_wants(remote) < 0) {
+
+       remote->need_pack = 0;
+
+       if (filter_wants(remote, opts) < 0) {
                giterr_set(GITERR_NET, "Failed to filter the reference list for wants");
                return -1;
        }
@@ -124,13 +131,26 @@ int git_fetch_negotiate(git_remote *remote)
                remote->refs.length);
 }
 
-int git_fetch_download_pack(git_remote *remote)
+int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks)
 {
        git_transport *t = remote->transport;
+       git_transfer_progress_cb progress = NULL;
+       void *payload = NULL;
 
-       if(!remote->need_pack)
+       if (!remote->need_pack)
                return 0;
 
-       return t->download_pack(t, remote->repo, &remote->stats,
-                               remote->callbacks.transfer_progress, remote->callbacks.payload);
+       if (callbacks) {
+               progress = callbacks->transfer_progress;
+               payload  = callbacks->payload;
+       }
+
+       return t->download_pack(t, remote->repo, &remote->stats, progress, payload);
+}
+
+int git_fetch_init_options(git_fetch_options *opts, unsigned int version)
+{
+       GIT_INIT_STRUCTURE_FROM_TEMPLATE(
+               opts, version, git_fetch_options, GIT_FETCH_OPTIONS_INIT);
+       return 0;
 }