2009-08-05 07:01:53 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "transport.h"
|
2009-10-31 01:47:30 +01:00
|
|
|
#include "quote.h"
|
2009-08-05 07:01:53 +02:00
|
|
|
#include "run-command.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
2009-10-31 01:47:29 +01:00
|
|
|
#include "quote.h"
|
2009-11-18 02:42:28 +01:00
|
|
|
#include "remote.h"
|
2009-08-05 07:01:53 +02:00
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
static int debug;
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
struct helper_data
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
struct child_process *helper;
|
2009-10-31 01:47:28 +01:00
|
|
|
FILE *out;
|
2009-10-31 01:47:29 +01:00
|
|
|
unsigned fetch : 1,
|
2009-12-07 07:40:16 +01:00
|
|
|
import : 1,
|
2009-10-31 01:47:30 +01:00
|
|
|
option : 1,
|
2009-12-09 16:26:32 +01:00
|
|
|
push : 1,
|
|
|
|
connect : 1,
|
|
|
|
no_disconnect_req : 1;
|
2009-11-18 02:42:28 +01:00
|
|
|
/* These go from remote name (as in "list") to private name */
|
|
|
|
struct refspec *refspecs;
|
|
|
|
int refspec_nr;
|
2009-12-09 16:26:31 +01:00
|
|
|
/* Transport options for fetch-pack/send-pack (should one of
|
|
|
|
* those be invoked).
|
|
|
|
*/
|
|
|
|
struct git_transport_options transport_options;
|
2009-08-05 07:01:53 +02:00
|
|
|
};
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
static void sendline(struct helper_data *helper, struct strbuf *buffer)
|
|
|
|
{
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Remote helper: -> %s", buffer->buf);
|
|
|
|
if (write_in_full(helper->helper->in, buffer->buf, buffer->len)
|
|
|
|
!= buffer->len)
|
|
|
|
die_errno("Full write to remote helper failed");
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
static int recvline_fh(FILE *helper, struct strbuf *buffer)
|
2009-12-09 16:26:27 +01:00
|
|
|
{
|
|
|
|
strbuf_reset(buffer);
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Remote helper: Waiting...\n");
|
2009-12-09 16:26:32 +01:00
|
|
|
if (strbuf_getline(buffer, helper, '\n') == EOF) {
|
2009-12-09 16:26:27 +01:00
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Remote helper quit.\n");
|
|
|
|
exit(128);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Remote helper: <- %s\n", buffer->buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
static int recvline(struct helper_data *helper, struct strbuf *buffer)
|
|
|
|
{
|
|
|
|
return recvline_fh(helper->out, buffer);
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
static void xchgline(struct helper_data *helper, struct strbuf *buffer)
|
|
|
|
{
|
|
|
|
sendline(helper, buffer);
|
|
|
|
recvline(helper, buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_constant(int fd, const char *str)
|
|
|
|
{
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Remote helper: -> %s", str);
|
|
|
|
if (write_in_full(fd, str, strlen(str)) != strlen(str))
|
|
|
|
die_errno("Full write to remote helper failed");
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:29 +01:00
|
|
|
const char *remove_ext_force(const char *url)
|
|
|
|
{
|
|
|
|
if (url) {
|
|
|
|
const char *colon = strchr(url, ':');
|
|
|
|
if (colon && colon[1] == ':')
|
|
|
|
return colon + 2;
|
|
|
|
}
|
|
|
|
return url;
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
static void do_take_over(struct transport *transport)
|
|
|
|
{
|
|
|
|
struct helper_data *data;
|
|
|
|
data = (struct helper_data *)transport->data;
|
|
|
|
transport_take_over(transport, data->helper);
|
|
|
|
fclose(data->out);
|
|
|
|
free(data);
|
|
|
|
}
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
static struct child_process *get_helper(struct transport *transport)
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct child_process *helper;
|
2009-11-18 02:42:28 +01:00
|
|
|
const char **refspecs = NULL;
|
|
|
|
int refspec_nr = 0;
|
|
|
|
int refspec_alloc = 0;
|
2009-12-09 16:26:31 +01:00
|
|
|
int duped;
|
2010-01-12 20:53:29 +01:00
|
|
|
int code;
|
2009-08-05 07:01:53 +02:00
|
|
|
|
|
|
|
if (data->helper)
|
|
|
|
return data->helper;
|
|
|
|
|
|
|
|
helper = xcalloc(1, sizeof(*helper));
|
|
|
|
helper->in = -1;
|
|
|
|
helper->out = -1;
|
|
|
|
helper->err = 0;
|
|
|
|
helper->argv = xcalloc(4, sizeof(*helper->argv));
|
2010-01-12 20:53:29 +01:00
|
|
|
strbuf_addf(&buf, "git-remote-%s", data->name);
|
2009-08-05 07:01:53 +02:00
|
|
|
helper->argv[0] = strbuf_detach(&buf, NULL);
|
|
|
|
helper->argv[1] = transport->remote->name;
|
2009-12-09 16:26:29 +01:00
|
|
|
helper->argv[2] = remove_ext_force(transport->url);
|
2010-01-12 20:53:29 +01:00
|
|
|
helper->git_cmd = 0;
|
|
|
|
helper->silent_exec_failure = 1;
|
|
|
|
code = start_command(helper);
|
|
|
|
if (code < 0 && errno == ENOENT)
|
|
|
|
die("Unable to find remote helper for '%s'", data->name);
|
|
|
|
else if (code != 0)
|
|
|
|
exit(code);
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
data->helper = helper;
|
2009-12-09 16:26:32 +01:00
|
|
|
data->no_disconnect_req = 0;
|
2009-08-05 07:01:53 +02:00
|
|
|
|
2009-12-09 16:26:31 +01:00
|
|
|
/*
|
|
|
|
* Open the output as FILE* so strbuf_getline() can be used.
|
|
|
|
* Do this with duped fd because fclose() will close the fd,
|
|
|
|
* and stuff like taking over will require the fd to remain.
|
|
|
|
*/
|
|
|
|
duped = dup(helper->out);
|
|
|
|
if (duped < 0)
|
|
|
|
die_errno("Can't dup helper output fd");
|
|
|
|
data->out = xfdopen(duped, "r");
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
write_constant(helper->in, "capabilities\n");
|
2009-09-04 04:13:51 +02:00
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
while (1) {
|
2009-12-09 16:26:28 +01:00
|
|
|
const char *capname;
|
|
|
|
int mandatory = 0;
|
2009-12-09 16:26:27 +01:00
|
|
|
recvline(data, &buf);
|
2009-08-05 07:01:53 +02:00
|
|
|
|
|
|
|
if (!*buf.buf)
|
|
|
|
break;
|
2009-12-09 16:26:28 +01:00
|
|
|
|
|
|
|
if (*buf.buf == '*') {
|
|
|
|
capname = buf.buf + 1;
|
|
|
|
mandatory = 1;
|
|
|
|
} else
|
|
|
|
capname = buf.buf;
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
if (debug)
|
2009-12-09 16:26:28 +01:00
|
|
|
fprintf(stderr, "Debug: Got cap %s\n", capname);
|
|
|
|
if (!strcmp(capname, "fetch"))
|
2009-08-05 07:01:53 +02:00
|
|
|
data->fetch = 1;
|
2009-12-09 16:26:28 +01:00
|
|
|
else if (!strcmp(capname, "option"))
|
2009-10-31 01:47:29 +01:00
|
|
|
data->option = 1;
|
2009-12-09 16:26:28 +01:00
|
|
|
else if (!strcmp(capname, "push"))
|
2009-10-31 01:47:30 +01:00
|
|
|
data->push = 1;
|
2009-12-09 16:26:28 +01:00
|
|
|
else if (!strcmp(capname, "import"))
|
2009-11-18 02:42:27 +01:00
|
|
|
data->import = 1;
|
2009-12-09 16:26:28 +01:00
|
|
|
else if (!data->refspecs && !prefixcmp(capname, "refspec ")) {
|
2009-11-18 02:42:28 +01:00
|
|
|
ALLOC_GROW(refspecs,
|
|
|
|
refspec_nr + 1,
|
|
|
|
refspec_alloc);
|
|
|
|
refspecs[refspec_nr++] = strdup(buf.buf + strlen("refspec "));
|
2009-12-09 16:26:32 +01:00
|
|
|
} else if (!strcmp(capname, "connect")) {
|
|
|
|
data->connect = 1;
|
2009-12-09 16:26:28 +01:00
|
|
|
} else if (mandatory) {
|
2010-02-04 06:23:18 +01:00
|
|
|
die("Unknown mandatory capability %s. This remote "
|
2009-12-09 16:26:28 +01:00
|
|
|
"helper probably needs newer version of Git.\n",
|
|
|
|
capname);
|
2009-11-18 02:42:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (refspecs) {
|
|
|
|
int i;
|
|
|
|
data->refspec_nr = refspec_nr;
|
|
|
|
data->refspecs = parse_fetch_refspec(refspec_nr, refspecs);
|
|
|
|
for (i = 0; i < refspec_nr; i++) {
|
|
|
|
free((char *)refspecs[i]);
|
|
|
|
}
|
|
|
|
free(refspecs);
|
2009-08-05 07:01:53 +02:00
|
|
|
}
|
2009-11-18 02:42:29 +01:00
|
|
|
strbuf_release(&buf);
|
2009-12-09 16:26:27 +01:00
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Capabilities complete.\n");
|
2009-08-05 07:01:53 +02:00
|
|
|
return data->helper;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int disconnect_helper(struct transport *transport)
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
2009-12-09 16:26:27 +01:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
if (data->helper) {
|
2009-12-09 16:26:27 +01:00
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Disconnecting.\n");
|
2009-12-09 16:26:32 +01:00
|
|
|
if (!data->no_disconnect_req) {
|
|
|
|
strbuf_addf(&buf, "\n");
|
|
|
|
sendline(data, &buf);
|
|
|
|
}
|
2009-08-05 07:01:53 +02:00
|
|
|
close(data->helper->in);
|
2009-12-09 16:26:31 +01:00
|
|
|
close(data->helper->out);
|
2009-10-31 01:47:28 +01:00
|
|
|
fclose(data->out);
|
2009-08-05 07:01:53 +02:00
|
|
|
finish_command(data->helper);
|
|
|
|
free((char *)data->helper->argv[0]);
|
|
|
|
free(data->helper->argv);
|
|
|
|
free(data->helper);
|
|
|
|
data->helper = NULL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-31 01:47:29 +01:00
|
|
|
static const char *unsupported_options[] = {
|
|
|
|
TRANS_OPT_UPLOADPACK,
|
|
|
|
TRANS_OPT_RECEIVEPACK,
|
|
|
|
TRANS_OPT_THIN,
|
|
|
|
TRANS_OPT_KEEP
|
|
|
|
};
|
|
|
|
static const char *boolean_options[] = {
|
|
|
|
TRANS_OPT_THIN,
|
|
|
|
TRANS_OPT_KEEP,
|
|
|
|
TRANS_OPT_FOLLOWTAGS
|
|
|
|
};
|
|
|
|
|
|
|
|
static int set_helper_option(struct transport *transport,
|
|
|
|
const char *name, const char *value)
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int i, ret, is_bool = 0;
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
get_helper(transport);
|
|
|
|
|
2009-10-31 01:47:29 +01:00
|
|
|
if (!data->option)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(unsupported_options); i++) {
|
|
|
|
if (!strcmp(name, unsupported_options[i]))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(boolean_options); i++) {
|
|
|
|
if (!strcmp(name, boolean_options[i])) {
|
|
|
|
is_bool = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_addf(&buf, "option %s ", name);
|
|
|
|
if (is_bool)
|
|
|
|
strbuf_addstr(&buf, value ? "true" : "false");
|
|
|
|
else
|
|
|
|
quote_c_style(value, &buf, NULL, 0);
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
xchgline(data, &buf);
|
2009-10-31 01:47:29 +01:00
|
|
|
|
|
|
|
if (!strcmp(buf.buf, "ok"))
|
|
|
|
ret = 0;
|
|
|
|
else if (!prefixcmp(buf.buf, "error")) {
|
|
|
|
ret = -1;
|
|
|
|
} else if (!strcmp(buf.buf, "unsupported"))
|
|
|
|
ret = 1;
|
|
|
|
else {
|
|
|
|
warning("%s unexpectedly said: '%s'", data->name, buf.buf);
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void standard_options(struct transport *t)
|
|
|
|
{
|
|
|
|
char buf[16];
|
|
|
|
int n;
|
|
|
|
int v = t->verbose;
|
2009-12-25 18:12:03 +01:00
|
|
|
int no_progress = v < 0 || (!t->progress && !isatty(2));
|
2009-10-31 01:47:29 +01:00
|
|
|
|
|
|
|
set_helper_option(t, "progress", !no_progress ? "true" : "false");
|
|
|
|
|
|
|
|
n = snprintf(buf, sizeof(buf), "%d", v + 1);
|
|
|
|
if (n >= sizeof(buf))
|
|
|
|
die("impossibly large verbosity value");
|
|
|
|
set_helper_option(t, "verbosity", buf);
|
|
|
|
}
|
|
|
|
|
2009-11-18 02:42:21 +01:00
|
|
|
static int release_helper(struct transport *transport)
|
|
|
|
{
|
2009-11-18 02:42:28 +01:00
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
free_refspec(data->refspec_nr, data->refspecs);
|
|
|
|
data->refspecs = NULL;
|
2009-11-18 02:42:21 +01:00
|
|
|
disconnect_helper(transport);
|
|
|
|
free(transport->data);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
static int fetch_with_fetch(struct transport *transport,
|
2009-11-18 02:42:24 +01:00
|
|
|
int nr_heads, struct ref **to_fetch)
|
2009-08-05 07:01:53 +02:00
|
|
|
{
|
2009-10-31 01:47:28 +01:00
|
|
|
struct helper_data *data = transport->data;
|
2009-08-05 07:01:53 +02:00
|
|
|
int i;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
2009-10-31 01:47:29 +01:00
|
|
|
standard_options(transport);
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
for (i = 0; i < nr_heads; i++) {
|
2009-08-05 07:01:59 +02:00
|
|
|
const struct ref *posn = to_fetch[i];
|
2009-08-05 07:01:53 +02:00
|
|
|
if (posn->status & REF_STATUS_UPTODATE)
|
|
|
|
continue;
|
2009-09-04 04:13:51 +02:00
|
|
|
|
|
|
|
strbuf_addf(&buf, "fetch %s %s\n",
|
|
|
|
sha1_to_hex(posn->old_sha1), posn->name);
|
2009-10-31 01:47:28 +01:00
|
|
|
}
|
2009-09-04 04:13:51 +02:00
|
|
|
|
2009-10-31 01:47:28 +01:00
|
|
|
strbuf_addch(&buf, '\n');
|
2009-12-09 16:26:27 +01:00
|
|
|
sendline(data, &buf);
|
2009-10-31 01:47:28 +01:00
|
|
|
|
|
|
|
while (1) {
|
2009-12-09 16:26:27 +01:00
|
|
|
recvline(data, &buf);
|
2009-10-31 01:47:28 +01:00
|
|
|
|
|
|
|
if (!prefixcmp(buf.buf, "lock ")) {
|
|
|
|
const char *name = buf.buf + 5;
|
|
|
|
if (transport->pack_lockfile)
|
|
|
|
warning("%s also locked %s", data->name, name);
|
|
|
|
else
|
|
|
|
transport->pack_lockfile = xstrdup(name);
|
|
|
|
}
|
|
|
|
else if (!buf.len)
|
|
|
|
break;
|
|
|
|
else
|
|
|
|
warning("%s unexpectedly said: '%s'", data->name, buf.buf);
|
2009-08-05 07:01:53 +02:00
|
|
|
}
|
2009-10-31 01:47:28 +01:00
|
|
|
strbuf_release(&buf);
|
2009-08-05 07:01:53 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-18 02:42:27 +01:00
|
|
|
static int get_importer(struct transport *transport, struct child_process *fastimport)
|
|
|
|
{
|
|
|
|
struct child_process *helper = get_helper(transport);
|
|
|
|
memset(fastimport, 0, sizeof(*fastimport));
|
|
|
|
fastimport->in = helper->out;
|
|
|
|
fastimport->argv = xcalloc(5, sizeof(*fastimport->argv));
|
|
|
|
fastimport->argv[0] = "fast-import";
|
|
|
|
fastimport->argv[1] = "--quiet";
|
|
|
|
|
|
|
|
fastimport->git_cmd = 1;
|
|
|
|
return start_command(fastimport);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fetch_with_import(struct transport *transport,
|
|
|
|
int nr_heads, struct ref **to_fetch)
|
|
|
|
{
|
|
|
|
struct child_process fastimport;
|
2009-11-18 02:42:28 +01:00
|
|
|
struct helper_data *data = transport->data;
|
2009-11-18 02:42:27 +01:00
|
|
|
int i;
|
|
|
|
struct ref *posn;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
get_helper(transport);
|
|
|
|
|
2009-11-18 02:42:27 +01:00
|
|
|
if (get_importer(transport, &fastimport))
|
|
|
|
die("Couldn't run fast-import");
|
|
|
|
|
|
|
|
for (i = 0; i < nr_heads; i++) {
|
|
|
|
posn = to_fetch[i];
|
|
|
|
if (posn->status & REF_STATUS_UPTODATE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
strbuf_addf(&buf, "import %s\n", posn->name);
|
2009-12-09 16:26:27 +01:00
|
|
|
sendline(data, &buf);
|
2009-11-18 02:42:27 +01:00
|
|
|
strbuf_reset(&buf);
|
|
|
|
}
|
|
|
|
disconnect_helper(transport);
|
|
|
|
finish_command(&fastimport);
|
2009-11-18 02:42:29 +01:00
|
|
|
free(fastimport.argv);
|
|
|
|
fastimport.argv = NULL;
|
2009-11-18 02:42:27 +01:00
|
|
|
|
|
|
|
for (i = 0; i < nr_heads; i++) {
|
2009-11-18 02:42:28 +01:00
|
|
|
char *private;
|
2009-11-18 02:42:27 +01:00
|
|
|
posn = to_fetch[i];
|
|
|
|
if (posn->status & REF_STATUS_UPTODATE)
|
|
|
|
continue;
|
2009-11-18 02:42:28 +01:00
|
|
|
if (data->refspecs)
|
|
|
|
private = apply_refspecs(data->refspecs, data->refspec_nr, posn->name);
|
|
|
|
else
|
|
|
|
private = strdup(posn->name);
|
|
|
|
read_ref(private, posn->old_sha1);
|
|
|
|
free(private);
|
2009-11-18 02:42:27 +01:00
|
|
|
}
|
2009-11-18 02:42:29 +01:00
|
|
|
strbuf_release(&buf);
|
2009-11-18 02:42:27 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
static int process_connect_service(struct transport *transport,
|
|
|
|
const char *name, const char *exec)
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
struct strbuf cmdbuf = STRBUF_INIT;
|
|
|
|
struct child_process *helper;
|
|
|
|
int r, duped, ret = 0;
|
|
|
|
FILE *input;
|
|
|
|
|
|
|
|
helper = get_helper(transport);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Yes, dup the pipe another time, as we need unbuffered version
|
|
|
|
* of input pipe as FILE*. fclose() closes the underlying fd and
|
|
|
|
* stream buffering only can be changed before first I/O operation
|
|
|
|
* on it.
|
|
|
|
*/
|
|
|
|
duped = dup(helper->out);
|
|
|
|
if (duped < 0)
|
|
|
|
die_errno("Can't dup helper output fd");
|
|
|
|
input = xfdopen(duped, "r");
|
|
|
|
setvbuf(input, NULL, _IONBF, 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle --upload-pack and friends. This is fire and forget...
|
|
|
|
* just warn if it fails.
|
|
|
|
*/
|
|
|
|
if (strcmp(name, exec)) {
|
|
|
|
r = set_helper_option(transport, "servpath", exec);
|
|
|
|
if (r > 0)
|
|
|
|
warning("Setting remote service path not supported by protocol.");
|
|
|
|
else if (r < 0)
|
|
|
|
warning("Invalid remote service path.");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->connect)
|
|
|
|
strbuf_addf(&cmdbuf, "connect %s\n", name);
|
|
|
|
else
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
sendline(data, &cmdbuf);
|
|
|
|
recvline_fh(input, &cmdbuf);
|
|
|
|
if (!strcmp(cmdbuf.buf, "")) {
|
|
|
|
data->no_disconnect_req = 1;
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Smart transport connection "
|
|
|
|
"ready.\n");
|
|
|
|
ret = 1;
|
|
|
|
} else if (!strcmp(cmdbuf.buf, "fallback")) {
|
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Falling back to dumb "
|
|
|
|
"transport.\n");
|
|
|
|
} else
|
|
|
|
die("Unknown response to connect: %s",
|
|
|
|
cmdbuf.buf);
|
|
|
|
|
|
|
|
exit:
|
|
|
|
fclose(input);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int process_connect(struct transport *transport,
|
|
|
|
int for_push)
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
const char *name;
|
|
|
|
const char *exec;
|
|
|
|
|
|
|
|
name = for_push ? "git-receive-pack" : "git-upload-pack";
|
|
|
|
if (for_push)
|
|
|
|
exec = data->transport_options.receivepack;
|
|
|
|
else
|
|
|
|
exec = data->transport_options.uploadpack;
|
|
|
|
|
|
|
|
return process_connect_service(transport, name, exec);
|
|
|
|
}
|
|
|
|
|
2009-12-09 16:26:33 +01:00
|
|
|
static int connect_helper(struct transport *transport, const char *name,
|
|
|
|
const char *exec, int fd[2])
|
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
|
|
|
|
/* Get_helper so connect is inited. */
|
|
|
|
get_helper(transport);
|
|
|
|
if (!data->connect)
|
|
|
|
die("Operation not supported by protocol.");
|
|
|
|
|
|
|
|
if (!process_connect_service(transport, name, exec))
|
|
|
|
die("Can't connect to subservice %s.", name);
|
|
|
|
|
|
|
|
fd[0] = data->helper->out;
|
|
|
|
fd[1] = data->helper->in;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
static int fetch(struct transport *transport,
|
2009-11-18 02:42:24 +01:00
|
|
|
int nr_heads, struct ref **to_fetch)
|
2009-08-05 07:01:53 +02:00
|
|
|
{
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
int i, count;
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
if (process_connect(transport, 0)) {
|
|
|
|
do_take_over(transport);
|
|
|
|
return transport->fetch(transport, nr_heads, to_fetch);
|
|
|
|
}
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
count = 0;
|
|
|
|
for (i = 0; i < nr_heads; i++)
|
|
|
|
if (!(to_fetch[i]->status & REF_STATUS_UPTODATE))
|
|
|
|
count++;
|
|
|
|
|
|
|
|
if (!count)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (data->fetch)
|
|
|
|
return fetch_with_fetch(transport, nr_heads, to_fetch);
|
|
|
|
|
2009-11-18 02:42:27 +01:00
|
|
|
if (data->import)
|
|
|
|
return fetch_with_import(transport, nr_heads, to_fetch);
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-10-31 01:47:30 +01:00
|
|
|
static int push_refs(struct transport *transport,
|
|
|
|
struct ref *remote_refs, int flags)
|
|
|
|
{
|
|
|
|
int force_all = flags & TRANSPORT_PUSH_FORCE;
|
|
|
|
int mirror = flags & TRANSPORT_PUSH_MIRROR;
|
|
|
|
struct helper_data *data = transport->data;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct child_process *helper;
|
|
|
|
struct ref *ref;
|
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
if (process_connect(transport, 1)) {
|
|
|
|
do_take_over(transport);
|
|
|
|
return transport->push_refs(transport, remote_refs, flags);
|
|
|
|
}
|
|
|
|
|
2010-01-08 03:12:45 +01:00
|
|
|
if (!remote_refs) {
|
|
|
|
fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
|
|
|
|
"Perhaps you should specify a branch such as 'master'.\n");
|
2009-10-31 01:47:30 +01:00
|
|
|
return 0;
|
2010-01-08 03:12:45 +01:00
|
|
|
}
|
2009-10-31 01:47:30 +01:00
|
|
|
|
|
|
|
helper = get_helper(transport);
|
|
|
|
if (!data->push)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
for (ref = remote_refs; ref; ref = ref->next) {
|
2010-01-08 03:12:42 +01:00
|
|
|
if (!ref->peer_ref && !mirror)
|
2009-10-31 01:47:30 +01:00
|
|
|
continue;
|
|
|
|
|
2010-01-08 03:12:42 +01:00
|
|
|
/* Check for statuses set by set_ref_status_for_push() */
|
|
|
|
switch (ref->status) {
|
|
|
|
case REF_STATUS_REJECT_NONFASTFORWARD:
|
|
|
|
case REF_STATUS_UPTODATE:
|
2009-10-31 01:47:30 +01:00
|
|
|
continue;
|
2010-01-08 03:12:42 +01:00
|
|
|
default:
|
|
|
|
; /* do nothing */
|
2009-10-31 01:47:30 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (force_all)
|
|
|
|
ref->force = 1;
|
|
|
|
|
|
|
|
strbuf_addstr(&buf, "push ");
|
|
|
|
if (!ref->deletion) {
|
|
|
|
if (ref->force)
|
|
|
|
strbuf_addch(&buf, '+');
|
|
|
|
if (ref->peer_ref)
|
|
|
|
strbuf_addstr(&buf, ref->peer_ref->name);
|
|
|
|
else
|
|
|
|
strbuf_addstr(&buf, sha1_to_hex(ref->new_sha1));
|
|
|
|
}
|
|
|
|
strbuf_addch(&buf, ':');
|
|
|
|
strbuf_addstr(&buf, ref->name);
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
}
|
2009-10-31 01:47:31 +01:00
|
|
|
if (buf.len == 0)
|
|
|
|
return 0;
|
2009-10-31 01:47:30 +01:00
|
|
|
|
|
|
|
transport->verbose = flags & TRANSPORT_PUSH_VERBOSE ? 1 : 0;
|
|
|
|
standard_options(transport);
|
|
|
|
|
|
|
|
if (flags & TRANSPORT_PUSH_DRY_RUN) {
|
|
|
|
if (set_helper_option(transport, "dry-run", "true") != 0)
|
|
|
|
die("helper %s does not support dry-run", data->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_addch(&buf, '\n');
|
2009-12-09 16:26:27 +01:00
|
|
|
sendline(data, &buf);
|
2009-10-31 01:47:30 +01:00
|
|
|
|
|
|
|
ref = remote_refs;
|
|
|
|
while (1) {
|
|
|
|
char *refname, *msg;
|
|
|
|
int status;
|
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
recvline(data, &buf);
|
2009-10-31 01:47:30 +01:00
|
|
|
if (!buf.len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!prefixcmp(buf.buf, "ok ")) {
|
|
|
|
status = REF_STATUS_OK;
|
|
|
|
refname = buf.buf + 3;
|
|
|
|
} else if (!prefixcmp(buf.buf, "error ")) {
|
|
|
|
status = REF_STATUS_REMOTE_REJECT;
|
|
|
|
refname = buf.buf + 6;
|
|
|
|
} else
|
|
|
|
die("expected ok/error, helper said '%s'\n", buf.buf);
|
|
|
|
|
|
|
|
msg = strchr(refname, ' ');
|
|
|
|
if (msg) {
|
|
|
|
struct strbuf msg_buf = STRBUF_INIT;
|
|
|
|
const char *end;
|
|
|
|
|
|
|
|
*msg++ = '\0';
|
|
|
|
if (!unquote_c_style(&msg_buf, msg, &end))
|
|
|
|
msg = strbuf_detach(&msg_buf, NULL);
|
|
|
|
else
|
|
|
|
msg = xstrdup(msg);
|
|
|
|
strbuf_release(&msg_buf);
|
|
|
|
|
|
|
|
if (!strcmp(msg, "no match")) {
|
|
|
|
status = REF_STATUS_NONE;
|
|
|
|
free(msg);
|
|
|
|
msg = NULL;
|
|
|
|
}
|
|
|
|
else if (!strcmp(msg, "up to date")) {
|
|
|
|
status = REF_STATUS_UPTODATE;
|
|
|
|
free(msg);
|
|
|
|
msg = NULL;
|
|
|
|
}
|
|
|
|
else if (!strcmp(msg, "non-fast forward")) {
|
|
|
|
status = REF_STATUS_REJECT_NONFASTFORWARD;
|
|
|
|
free(msg);
|
|
|
|
msg = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ref)
|
|
|
|
ref = find_ref_by_name(ref, refname);
|
|
|
|
if (!ref)
|
|
|
|
ref = find_ref_by_name(remote_refs, refname);
|
|
|
|
if (!ref) {
|
|
|
|
warning("helper reported unexpected status of %s", refname);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-01-08 03:12:44 +01:00
|
|
|
if (ref->status != REF_STATUS_NONE) {
|
|
|
|
/*
|
|
|
|
* Earlier, the ref was marked not to be pushed, so ignore the ref
|
|
|
|
* status reported by the remote helper if the latter is 'no match'.
|
|
|
|
*/
|
|
|
|
if (status == REF_STATUS_NONE)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-10-31 01:47:30 +01:00
|
|
|
ref->status = status;
|
|
|
|
ref->remote_status = msg;
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-18 02:42:30 +01:00
|
|
|
static int has_attribute(const char *attrs, const char *attr) {
|
|
|
|
int len;
|
|
|
|
if (!attrs)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
len = strlen(attr);
|
|
|
|
for (;;) {
|
|
|
|
const char *space = strchrnul(attrs, ' ');
|
|
|
|
if (len == space - attrs && !strncmp(attrs, attr, len))
|
|
|
|
return 1;
|
|
|
|
if (!*space)
|
|
|
|
return 0;
|
|
|
|
attrs = space + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
static struct ref *get_refs_list(struct transport *transport, int for_push)
|
|
|
|
{
|
2009-10-31 01:47:28 +01:00
|
|
|
struct helper_data *data = transport->data;
|
2009-08-05 07:01:53 +02:00
|
|
|
struct child_process *helper;
|
|
|
|
struct ref *ret = NULL;
|
|
|
|
struct ref **tail = &ret;
|
|
|
|
struct ref *posn;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
|
|
|
|
helper = get_helper(transport);
|
2009-09-04 04:13:51 +02:00
|
|
|
|
2009-12-09 16:26:32 +01:00
|
|
|
if (process_connect(transport, for_push)) {
|
|
|
|
do_take_over(transport);
|
|
|
|
return transport->get_refs_list(transport, for_push);
|
|
|
|
}
|
|
|
|
|
2009-10-31 01:47:30 +01:00
|
|
|
if (data->push && for_push)
|
|
|
|
write_str_in_full(helper->in, "list for-push\n");
|
|
|
|
else
|
|
|
|
write_str_in_full(helper->in, "list\n");
|
2009-08-05 07:01:53 +02:00
|
|
|
|
|
|
|
while (1) {
|
|
|
|
char *eov, *eon;
|
2009-12-09 16:26:27 +01:00
|
|
|
recvline(data, &buf);
|
2009-08-05 07:01:53 +02:00
|
|
|
|
|
|
|
if (!*buf.buf)
|
|
|
|
break;
|
|
|
|
|
|
|
|
eov = strchr(buf.buf, ' ');
|
|
|
|
if (!eov)
|
|
|
|
die("Malformed response in ref list: %s", buf.buf);
|
|
|
|
eon = strchr(eov + 1, ' ');
|
|
|
|
*eov = '\0';
|
|
|
|
if (eon)
|
|
|
|
*eon = '\0';
|
|
|
|
*tail = alloc_ref(eov + 1);
|
|
|
|
if (buf.buf[0] == '@')
|
|
|
|
(*tail)->symref = xstrdup(buf.buf + 1);
|
|
|
|
else if (buf.buf[0] != '?')
|
|
|
|
get_sha1_hex(buf.buf, (*tail)->old_sha1);
|
2009-11-18 02:42:30 +01:00
|
|
|
if (eon) {
|
|
|
|
if (has_attribute(eon + 1, "unchanged")) {
|
|
|
|
(*tail)->status |= REF_STATUS_UPTODATE;
|
|
|
|
read_ref((*tail)->name, (*tail)->old_sha1);
|
|
|
|
}
|
|
|
|
}
|
2009-08-05 07:01:53 +02:00
|
|
|
tail = &((*tail)->next);
|
|
|
|
}
|
2009-12-09 16:26:27 +01:00
|
|
|
if (debug)
|
|
|
|
fprintf(stderr, "Debug: Read ref listing.\n");
|
2009-08-05 07:01:53 +02:00
|
|
|
strbuf_release(&buf);
|
|
|
|
|
|
|
|
for (posn = ret; posn; posn = posn->next)
|
|
|
|
resolve_remote_symref(posn, ret);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-09-04 04:13:49 +02:00
|
|
|
int transport_helper_init(struct transport *transport, const char *name)
|
2009-08-05 07:01:53 +02:00
|
|
|
{
|
|
|
|
struct helper_data *data = xcalloc(sizeof(*data), 1);
|
2009-09-04 04:13:49 +02:00
|
|
|
data->name = name;
|
2009-08-05 07:01:53 +02:00
|
|
|
|
2009-12-09 16:26:27 +01:00
|
|
|
if (getenv("GIT_TRANSPORT_HELPER_DEBUG"))
|
|
|
|
debug = 1;
|
|
|
|
|
2009-08-05 07:01:53 +02:00
|
|
|
transport->data = data;
|
2009-10-31 01:47:29 +01:00
|
|
|
transport->set_option = set_helper_option;
|
2009-08-05 07:01:53 +02:00
|
|
|
transport->get_refs_list = get_refs_list;
|
|
|
|
transport->fetch = fetch;
|
2009-10-31 01:47:30 +01:00
|
|
|
transport->push_refs = push_refs;
|
2009-11-18 02:42:21 +01:00
|
|
|
transport->disconnect = release_helper;
|
2009-12-09 16:26:33 +01:00
|
|
|
transport->connect = connect_helper;
|
2009-12-09 16:26:31 +01:00
|
|
|
transport->smart_options = &(data->transport_options);
|
2009-08-05 07:01:53 +02:00
|
|
|
return 0;
|
|
|
|
}
|