clone: request the 'bundle-uri' command when available
Set up all the needed client parts of the 'bundle-uri' protocol v2 command, without actually doing anything with the bundle URIs. If the server says it supports 'bundle-uri' teach Git to issue the 'bundle-uri' command after the 'ls-refs' during 'git clone'. The returned key=value pairs are passed to the bundle list code which is tested using a different ingest mechanism in t5750-bundle-uri-parse.sh. At this point, Git does nothing with that bundle list. It will not download any of the bundles. That will come in a later change after these protocol bits are finalized. The no-op client is initially used only by 'git clone' to test the basic functionality, and eventually will bootstrap the initial download of Git objects during a fresh clone. The bundle URI client will not be integrated into other fetches until a mechanism is created to select a subset of bundles for download. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
8f788eb8b7
commit
0cfde740f0
44
connect.c
44
connect.c
@@ -15,6 +15,7 @@
|
||||
#include "version.h"
|
||||
#include "protocol.h"
|
||||
#include "alias.h"
|
||||
#include "bundle-uri.h"
|
||||
|
||||
static char *server_capabilities_v1;
|
||||
static struct strvec server_capabilities_v2 = STRVEC_INIT;
|
||||
@@ -491,6 +492,49 @@ static void send_capabilities(int fd_out, struct packet_reader *reader)
|
||||
}
|
||||
}
|
||||
|
||||
int get_remote_bundle_uri(int fd_out, struct packet_reader *reader,
|
||||
struct bundle_list *bundles, int stateless_rpc)
|
||||
{
|
||||
int line_nr = 1;
|
||||
|
||||
/* Assert bundle-uri support */
|
||||
server_supports_v2("bundle-uri", 1);
|
||||
|
||||
/* (Re-)send capabilities */
|
||||
send_capabilities(fd_out, reader);
|
||||
|
||||
/* Send command */
|
||||
packet_write_fmt(fd_out, "command=bundle-uri\n");
|
||||
packet_delim(fd_out);
|
||||
|
||||
packet_flush(fd_out);
|
||||
|
||||
/* Process response from server */
|
||||
while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
|
||||
const char *line = reader->line;
|
||||
line_nr++;
|
||||
|
||||
if (!bundle_uri_parse_line(bundles, line))
|
||||
continue;
|
||||
|
||||
return error(_("error on bundle-uri response line %d: %s"),
|
||||
line_nr, line);
|
||||
}
|
||||
|
||||
if (reader->status != PACKET_READ_FLUSH)
|
||||
return error(_("expected flush after bundle-uri listing"));
|
||||
|
||||
/*
|
||||
* Might die(), but obscure enough that that's OK, e.g. in
|
||||
* serve.c we'll call BUG() on its equivalent (the
|
||||
* PACKET_READ_RESPONSE_END check).
|
||||
*/
|
||||
check_stateless_delimiter(stateless_rpc, reader,
|
||||
_("expected response end packet after ref listing"));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
|
||||
struct ref **list, int for_push,
|
||||
struct transport_ls_refs_options *transport_options,
|
||||
|
||||
Reference in New Issue
Block a user