Reorganize transport architecture (squashed 3)

1 files changed, 11 insertions, 382 deletions

diff --git a/src/fetch.c b/src/fetch.c
index 0aabe744f..4f9f0c6f9 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -9,17 +9,14 @@
 #include "git2/refs.h"
 #include "git2/revwalk.h"
 #include "git2/indexer.h"
+#include "git2/transport.h"
 
 #include "common.h"
-#include "transport.h"
 #include "remote.h"
 #include "refspec.h"
 #include "pack.h"
 #include "fetch.h"
 #include "netops.h"
-#include "pkt.h"
-
-#define NETWORK_XFER_THRESHOLD (100*1024)
 
 struct filter_payload {
 	git_remote *remote;
@@ -88,61 +85,6 @@ cleanup:
 	return error;
 }
 
-/* Wait until we get an ack from the */
-static int recv_pkt(git_pkt **out, gitno_buffer *buf)
-{
-	const char *ptr = buf->data, *line_end = ptr;
-	git_pkt *pkt;
-	int pkt_type, error = 0, ret;
-
-	do {
-		if (buf->offset > 0)
-			error = git_pkt_parse_line(&pkt, ptr, &line_end, buf->offset);
-		else
-			error = GIT_EBUFS;
-
-		if (error == 0)
-			break; /* return the pkt */
-
-		if (error < 0 && error != GIT_EBUFS)
-			return -1;
-
-		if ((ret = gitno_recv(buf)) < 0)
-			return -1;
-	} while (error);
-
-	gitno_consume(buf, line_end);
-	pkt_type = pkt->type;
-	if (out != NULL)
-		*out = pkt;
-	else
-		git__free(pkt);
-
-	return pkt_type;
-}
-
-static int store_common(git_transport *t)
-{
-	git_pkt *pkt = NULL;
-	gitno_buffer *buf = &t->buffer;
-
-	do {
-		if (recv_pkt(&pkt, buf) < 0)
-			return -1;
-
-		if (pkt->type == GIT_PKT_ACK) {
-			if (git_vector_insert(&t->common, pkt) < 0)
-				return -1;
-		} else {
-			git__free(pkt);
-			return 0;
-		}
-
-	} while (1);
-
-	return 0;
-}
-
 /*
  * In this first version, we push all our refs in and start sending
  * them out. When we get an ACK we hide that commit and continue
@@ -151,13 +93,7 @@ static int store_common(git_transport *t)
 int git_fetch_negotiate(git_remote *remote)
 {
 	git_transport *t = remote->transport;
-	gitno_buffer *buf = &t->buffer;
-	git_buf data = GIT_BUF_INIT;
-	git_revwalk *walk = NULL;
-	int error = -1, pkt_type;
-	unsigned int i;
-	git_oid oid;
-
+	
 	if (filter_wants(remote) < 0) {
 		giterr_set(GITERR_NET, "Failed to filter the reference list for wants");
 		return -1;
@@ -169,330 +105,23 @@ int git_fetch_negotiate(git_remote *remote)
 
 	/*
 	 * Now we have everything set up so we can start tell the
-	 * server what we want and what we have. Call the function if
-	 * the transport has its own logic. This is transitional and
-	 * will be removed once this function can support git and http.
-	 */
-	if (t->own_logic)
-		return t->negotiate_fetch(t, remote->repo, &remote->refs);
-
-	/* No own logic, do our thing */
-	if (git_pkt_buffer_wants(&remote->refs, &t->caps, &data) < 0)
-		return -1;
-
-	if (git_fetch_setup_walk(&walk, remote->repo) < 0)
-		goto on_error;
-	/*
-	 * We don't support any kind of ACK extensions, so the negotiation
-	 * boils down to sending what we have and listening for an ACK
-	 * every once in a while.
+	 * server what we want and what we have.
 	 */
-	i = 0;
-	while ((error = git_revwalk_next(&oid, walk)) == 0) {
-		git_pkt_buffer_have(&oid, &data);
-		i++;
-		if (i % 20 == 0) {
-			if (t->cancel.val) {
-				giterr_set(GITERR_NET, "The fetch was cancelled by the user");
-					error = GIT_EUSER;
-					goto on_error;
-			}
-
-			git_pkt_buffer_flush(&data);
-			if (git_buf_oom(&data))
-				goto on_error;
-
-			if (t->negotiation_step(t, data.ptr, data.size) < 0)
-				goto on_error;
-
-			git_buf_clear(&data);
-			if (t->caps.multi_ack) {
-				if (store_common(t) < 0)
-					goto on_error;
-			} else {
-				pkt_type = recv_pkt(NULL, buf);
-
-				if (pkt_type == GIT_PKT_ACK) {
-					break;
-				} else if (pkt_type == GIT_PKT_NAK) {
-					continue;
-				} else {
-					giterr_set(GITERR_NET, "Unexpected pkt type");
-					goto on_error;
-				}
-			}
-		}
-
-		if (t->common.length > 0)
-			break;
-
-		if (i % 20 == 0 && t->rpc) {
-			git_pkt_ack *pkt;
-			unsigned int i;
-
-			if (git_pkt_buffer_wants(&remote->refs, &t->caps, &data) < 0)
-				goto on_error;
-
-			git_vector_foreach(&t->common, i, pkt) {
-				git_pkt_buffer_have(&pkt->oid, &data);
-			}
-
-			if (git_buf_oom(&data))
-				goto on_error;
-		}
-	}
-
-	if (error < 0 && error != GIT_ITEROVER)
-		goto on_error;
-
-	/* Tell the other end that we're done negotiating */
-	if (t->rpc && t->common.length > 0) {
-		git_pkt_ack *pkt;
-		unsigned int i;
-
-		if (git_pkt_buffer_wants(&remote->refs, &t->caps, &data) < 0)
-			goto on_error;
-
-		git_vector_foreach(&t->common, i, pkt) {
-			git_pkt_buffer_have(&pkt->oid, &data);
-		}
-
-		if (git_buf_oom(&data))
-			goto on_error;
-	}
-
-	git_pkt_buffer_done(&data);
-	if (t->cancel.val) {
-		giterr_set(GITERR_NET, "The fetch was cancelled by the user");
-		error = GIT_EUSER;
-		goto on_error;
-	}
-	if (t->negotiation_step(t, data.ptr, data.size) < 0)
-		goto on_error;
-
-	git_buf_free(&data);
-	git_revwalk_free(walk);
-
-	/* Now let's eat up whatever the server gives us */
-	if (!t->caps.multi_ack) {
-		pkt_type = recv_pkt(NULL, buf);
-		if (pkt_type != GIT_PKT_ACK && pkt_type != GIT_PKT_NAK) {
-			giterr_set(GITERR_NET, "Unexpected pkt type");
-			return -1;
-		}
-	} else {
-		git_pkt_ack *pkt;
-		do {
-			if (recv_pkt((git_pkt **)&pkt, buf) < 0)
-				return -1;
-
-			if (pkt->type == GIT_PKT_NAK ||
-			    (pkt->type == GIT_PKT_ACK && pkt->status != GIT_ACK_CONTINUE)) {
-				git__free(pkt);
-				break;
-			}
-
-			git__free(pkt);
-		} while (1);
-	}
-
-	return 0;
-
-on_error:
-	git_revwalk_free(walk);
-	git_buf_free(&data);
-	return error;
+	return t->negotiate_fetch(t,
+		remote->repo,
+		(const git_remote_head * const *)remote->refs.contents,
+		remote->refs.length);
 }
 
 int git_fetch_download_pack(
-		git_remote *remote,
-		git_transfer_progress_callback progress_cb,
-		void *progress_payload)
-{
-	git_transport *t = remote->transport;
-
-	if(!remote->need_pack)
-		return 0;
-
-	if (t->own_logic)
-		return t->download_pack(t, remote->repo, &remote->stats);
-
-	return git_fetch__download_pack(t, remote->repo, &remote->stats,
-			progress_cb, progress_payload);
-
-}
-
-static int no_sideband(git_transport *t, git_indexer_stream *idx, gitno_buffer *buf, git_transfer_progress *stats)
-{
-	int recvd;
-
-	do {
-		if (t->cancel.val) {
-			giterr_set(GITERR_NET, "The fetch was cancelled by the user");
-			return GIT_EUSER;
-		}
-
-		if (git_indexer_stream_add(idx, buf->data, buf->offset, stats) < 0)
-			return -1;
-
-		gitno_consume_n(buf, buf->offset);
-
-		if ((recvd = gitno_recv(buf)) < 0)
-			return -1;
-	} while(recvd > 0);
-
-	if (git_indexer_stream_finalize(idx, stats))
-		return -1;
-
-	return 0;
-}
-
-struct network_packetsize_payload
-{
-	git_transfer_progress_callback callback;
-	void *payload;
-	git_transfer_progress *stats;
-	git_off_t last_fired_bytes;
-};
-
-static void network_packetsize(int received, void *payload)
-{
-	struct network_packetsize_payload *npp = (struct network_packetsize_payload*)payload;
-
-	/* Accumulate bytes */
-	npp->stats->received_bytes += received;
-
-	/* Fire notification if the threshold is reached */
-	if ((npp->stats->received_bytes - npp->last_fired_bytes) > NETWORK_XFER_THRESHOLD) {
-		npp->last_fired_bytes = npp->stats->received_bytes;
-		npp->callback(npp->stats, npp->payload);
-	}
-}
-
-/* Receiving data from a socket and storing it is pretty much the same for git and HTTP */
-int git_fetch__download_pack(
-	git_transport *t,
-	git_repository *repo,
-	git_transfer_progress *stats,
+	git_remote *remote,
 	git_transfer_progress_callback progress_cb,
 	void *progress_payload)
 {
-	git_buf path = GIT_BUF_INIT;
-	gitno_buffer *buf = &t->buffer;
-	git_indexer_stream *idx = NULL;
-	int error = -1;
-	struct network_packetsize_payload npp = {0};
-
-	if (progress_cb) {
-		npp.callback = progress_cb;
-		npp.payload = progress_payload;
-		npp.stats = stats;
-		buf->packetsize_cb = &network_packetsize;
-		buf->packetsize_payload = &npp;
-	}
-
-	if (git_buf_joinpath(&path, git_repository_path(repo), "objects/pack") < 0)
-		return -1;
-
-	if (git_indexer_stream_new(&idx, git_buf_cstr(&path), progress_cb, progress_payload) < 0)
-		goto on_error;
-
-	git_buf_free(&path);
-	memset(stats, 0, sizeof(git_transfer_progress));
-
-	/*
-	 * If the remote doesn't support the side-band, we can feed
-	 * the data directly to the indexer. Otherwise, we need to
-	 * check which one belongs there.
-	 */
-	if (!t->caps.side_band && !t->caps.side_band_64k) {
-		if (no_sideband(t, idx, buf, stats) < 0)
-			goto on_error;
+	git_transport *t = remote->transport;
 
-		git_indexer_stream_free(idx);
+	if(!remote->need_pack)
 		return 0;
-	}
-
-	do {
-		git_pkt *pkt;
-
-		if (t->cancel.val) {
-			giterr_set(GITERR_NET, "The fetch was cancelled by the user");
-			error = GIT_EUSER;
-			goto on_error;
-		}
-
-		if (recv_pkt(&pkt, buf) < 0)
-			goto on_error;
-
-		if (pkt->type == GIT_PKT_PROGRESS) {
-			if (t->progress_cb) {
-				git_pkt_progress *p = (git_pkt_progress *) pkt;
-				t->progress_cb(p->data, p->len, t->cb_data);
-			}
-			git__free(pkt);
-		} else if (pkt->type == GIT_PKT_DATA) {
-			git_pkt_data *p = (git_pkt_data *) pkt;
-			if (git_indexer_stream_add(idx, p->data, p->len, stats) < 0)
-				goto on_error;
-
-			git__free(pkt);
-		} else if (pkt->type == GIT_PKT_FLUSH) {
-			/* A flush indicates the end of the packfile */
-			git__free(pkt);
-			break;
-		}
-	} while (1);
-
-	if (git_indexer_stream_finalize(idx, stats) < 0)
-		goto on_error;
-
-	git_indexer_stream_free(idx);
-	return 0;
-
-on_error:
-	git_buf_free(&path);
-	git_indexer_stream_free(idx);
-	return error;
-}
-
-int git_fetch_setup_walk(git_revwalk **out, git_repository *repo)
-{
-	git_revwalk *walk;
-	git_strarray refs;
-	unsigned int i;
-	git_reference *ref;
-
-	if (git_reference_list(&refs, repo, GIT_REF_LISTALL) < 0)
-		return -1;
-
-	if (git_revwalk_new(&walk, repo) < 0)
-		return -1;
-
-	git_revwalk_sorting(walk, GIT_SORT_TIME);
-
-	for (i = 0; i < refs.count; ++i) {
-		/* No tags */
-		if (!git__prefixcmp(refs.strings[i], GIT_REFS_TAGS_DIR))
-			continue;
-
-		if (git_reference_lookup(&ref, repo, refs.strings[i]) < 0)
-			goto on_error;
-
-		if (git_reference_type(ref) == GIT_REF_SYMBOLIC)
-			continue;
-		if (git_revwalk_push(walk, git_reference_oid(ref)) < 0)
-			goto on_error;
-
-		git_reference_free(ref);
-	}
-
-	git_strarray_free(&refs);
-	*out = walk;
-	return 0;
 
-on_error:
-	git_reference_free(ref);
-	git_strarray_free(&refs);
-	return -1;
+	return t->download_pack(t, remote->repo, &remote->stats, progress_cb, progress_payload);
 }