Allow fetch to modify refs

This allows the transport to use the null sha1 for a ref reported to
be present in the remote repository to indicate that a ref exists but
its actual value is presently unknown and will be set if the objects
are fetched.

Also adds documentation to the API to specify exactly what the methods
should do and how they should interpret arguments.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-clone.c b/builtin-clone.c
index 5762a6f9d8191c79d4fd66d227038d59ab1e785e..32f22e100ed792fffe1aa3c59c3f841f2fee24ab 100644 (file)
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -360,9 +360,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        const char *repo_name, *repo, *work_tree, *git_dir;
        char *path, *dir;
        int dest_exists;
        const char *repo_name, *repo, *work_tree, *git_dir;
        char *path, *dir;
        int dest_exists;

-       const struct ref *refs, *remote_head, *mapped_refs;
+       const struct ref *refs, *remote_head;

        const struct ref *remote_head_points_at;
        const struct ref *our_head_points_at;
        const struct ref *remote_head_points_at;
        const struct ref *our_head_points_at;

+       struct ref *mapped_refs;

        struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
        struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
        struct transport *transport = NULL;
        struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
        struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
        struct transport *transport = NULL;

diff --git a/transport-helper.c b/transport-helper.c
index e24fcbb17d0bb6e28bd8c83ec55a5ce3e8bbc88e..53d8f08ee9cd3ead105953940d7ad42028b6ab4a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -75,7 +75,7 @@ static int release_helper(struct transport *transport)
 }
 
 static int fetch_with_fetch(struct transport *transport,
 }
 
 static int fetch_with_fetch(struct transport *transport,

-                           int nr_heads, const struct ref **to_fetch)
+                           int nr_heads, struct ref **to_fetch)

 {
        struct child_process *helper = get_helper(transport);
        FILE *file = xfdopen(helper->out, "r");
 {
        struct child_process *helper = get_helper(transport);
        FILE *file = xfdopen(helper->out, "r");


@@ -99,7 +99,7 @@ static int fetch_with_fetch(struct transport *transport,
 }
 
 static int fetch(struct transport *transport,
 }
 
 static int fetch(struct transport *transport,

-                int nr_heads, const struct ref **to_fetch)
+                int nr_heads, struct ref **to_fetch)

 {
        struct helper_data *data = transport->data;
        int i, count;
 {
        struct helper_data *data = transport->data;
        int i, count;

diff --git a/transport.c b/transport.c
index 9daa68609f51048be096bb2df2279e65f288d60b..5ae8db6335ee9dc75b39065c27f9fa3cb3d09d9e 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -204,7 +204,7 @@ static struct ref *get_refs_via_rsync(struct transport *transport, int for_push)
 }
 
 static int fetch_objs_via_rsync(struct transport *transport,
 }
 
 static int fetch_objs_via_rsync(struct transport *transport,

-                               int nr_objs, const struct ref **to_fetch)
+                               int nr_objs, struct ref **to_fetch)

 {
        struct strbuf buf = STRBUF_INIT;
        struct child_process rsync;
 {
        struct strbuf buf = STRBUF_INIT;
        struct child_process rsync;


@@ -408,7 +408,7 @@ static struct ref *get_refs_from_bundle(struct transport *transport, int for_pus
 }
 
 static int fetch_refs_from_bundle(struct transport *transport,
 }
 
 static int fetch_refs_from_bundle(struct transport *transport,

-                              int nr_heads, const struct ref **to_fetch)
+                              int nr_heads, struct ref **to_fetch)

 {
        struct bundle_transport_data *data = transport->data;
        return unbundle(&data->header, data->fd);
 {
        struct bundle_transport_data *data = transport->data;
        return unbundle(&data->header, data->fd);


@@ -486,7 +486,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
 }
 
 static int fetch_refs_via_pack(struct transport *transport,
 }
 
 static int fetch_refs_via_pack(struct transport *transport,

-                              int nr_heads, const struct ref **to_fetch)
+                              int nr_heads, struct ref **to_fetch)

 {
        struct git_transport_data *data = transport->data;
        char **heads = xmalloc(nr_heads * sizeof(*heads));
 {
        struct git_transport_data *data = transport->data;
        char **heads = xmalloc(nr_heads * sizeof(*heads));


@@ -926,16 +926,17 @@ const struct ref *transport_get_remote_refs(struct transport *transport)
        return transport->remote_refs;
 }
 
        return transport->remote_refs;
 }
 

-int transport_fetch_refs(struct transport *transport, const struct ref *refs)
+int transport_fetch_refs(struct transport *transport, struct ref *refs)

 {
        int rc;
        int nr_heads = 0, nr_alloc = 0, nr_refs = 0;
 {
        int rc;
        int nr_heads = 0, nr_alloc = 0, nr_refs = 0;

-       const struct ref **heads = NULL;
-       const struct ref *rm;
+       struct ref **heads = NULL;
+       struct ref *rm;

 
        for (rm = refs; rm; rm = rm->next) {
                nr_refs++;
                if (rm->peer_ref &&
 
        for (rm = refs; rm; rm = rm->next) {
                nr_refs++;
                if (rm->peer_ref &&

+                   !is_null_sha1(rm->old_sha1) &&

                    !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1))
                        continue;
                ALLOC_GROW(heads, nr_heads + 1, nr_alloc);
                    !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1))
                        continue;
                ALLOC_GROW(heads, nr_heads + 1, nr_alloc);

diff --git a/transport.h b/transport.h
index c14da6f1e53ece9fa9ac2e68b73674c54329be5f..503db11701b44766716bbe435e58a69d0d36b871 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -18,11 +18,48 @@ struct transport {
        int (*set_option)(struct transport *connection, const char *name,
                          const char *value);
 
        int (*set_option)(struct transport *connection, const char *name,
                          const char *value);
 

+       /**
+        * Returns a list of the remote side's refs. In order to allow
+        * the transport to try to share connections, for_push is a
+        * hint as to whether the ultimate operation is a push or a fetch.
+        *
+        * If the transport is able to determine the remote hash for
+        * the ref without a huge amount of effort, it should store it
+        * in the ref's old_sha1 field; otherwise it should be all 0.
+        **/

        struct ref *(*get_refs_list)(struct transport *transport, int for_push);
        struct ref *(*get_refs_list)(struct transport *transport, int for_push);

-       int (*fetch)(struct transport *transport, int refs_nr, const struct ref **refs);
+
+       /**
+        * Fetch the objects for the given refs. Note that this gets
+        * an array, and should ignore the list structure.
+        *
+        * If the transport did not get hashes for refs in
+        * get_refs_list(), it should set the old_sha1 fields in the
+        * provided refs now.
+        **/
+       int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
+
+       /**
+        * Push the objects and refs. Send the necessary objects, and
+        * then, for any refs where peer_ref is set and
+        * peer_ref->new_sha1 is different from old_sha1, tell the
+        * remote side to update each ref in the list from old_sha1 to
+        * peer_ref->new_sha1.
+        *
+        * Where possible, set the status for each ref appropriately.
+        *
+        * The transport must modify new_sha1 in the ref to the new
+        * value if the remote accepted the change. Note that this
+        * could be a different value from peer_ref->new_sha1 if the
+        * process involved generating new commits.
+        **/

        int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
        int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
 
        int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
        int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
 

+       /** get_refs_list(), fetch(), and push_refs() can keep
+        * resources (such as a connection) reserved for futher
+        * use. disconnect() releases these resources.
+        **/

        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
        signed verbose : 2;
        int (*disconnect)(struct transport *connection);
        char *pack_lockfile;
        signed verbose : 2;


@@ -74,7 +111,7 @@ int transport_push(struct transport *connection,
 
 const struct ref *transport_get_remote_refs(struct transport *transport);
 
 
 const struct ref *transport_get_remote_refs(struct transport *transport);
 

-int transport_fetch_refs(struct transport *transport, const struct ref *refs);
+int transport_fetch_refs(struct transport *transport, struct ref *refs);

 void transport_unlock_pack(struct transport *transport);
 int transport_disconnect(struct transport *transport);
 char *transport_anonymize_url(const char *url);
 void transport_unlock_pack(struct transport *transport);
 int transport_disconnect(struct transport *transport);
 char *transport_anonymize_url(const char *url);