http-push.c 64.7 KB
Newer Older
1 2 3 4 5
#include "cache.h"
#include "commit.h"
#include "pack.h"
#include "tag.h"
#include "blob.h"
6
#include "http.h"
N
Nick Hengeveld 已提交
7
#include "refs.h"
8
#include "diff.h"
N
Nick Hengeveld 已提交
9
#include "revision.h"
10
#include "exec_cmd.h"
11
#include "remote.h"
12
#include "list-objects.h"
13
#include "sigchain.h"
14

15
#include <expat.h>
16 17

static const char http_push_usage[] =
S
Stephan Beyer 已提交
18
"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
19

20 21 22 23 24 25 26 27 28
#ifndef XML_STATUS_OK
enum XML_Status {
  XML_STATUS_OK = 1,
  XML_STATUS_ERROR = 0
};
#define XML_STATUS_OK    1
#define XML_STATUS_ERROR 0
#endif

29
#define PREV_BUF_SIZE 4096
30 31
#define RANGE_HEADER_SIZE 30

N
Nick Hengeveld 已提交
32
/* DAV methods */
33 34 35 36 37 38
#define DAV_LOCK "LOCK"
#define DAV_MKCOL "MKCOL"
#define DAV_MOVE "MOVE"
#define DAV_PROPFIND "PROPFIND"
#define DAV_PUT "PUT"
#define DAV_UNLOCK "UNLOCK"
39
#define DAV_DELETE "DELETE"
N
Nick Hengeveld 已提交
40 41 42 43 44 45 46 47 48 49 50 51 52

/* DAV lock flags */
#define DAV_PROP_LOCKWR (1u << 0)
#define DAV_PROP_LOCKEX (1u << 1)
#define DAV_LOCK_OK (1u << 2)

/* DAV XML properties */
#define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
#define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
#define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
#define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
#define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
#define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
N
Nick Hengeveld 已提交
53 54 55
#define DAV_PROPFIND_RESP ".multistatus.response"
#define DAV_PROPFIND_NAME ".multistatus.response.href"
#define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
N
Nick Hengeveld 已提交
56 57

/* DAV request body templates */
N
Nick Hengeveld 已提交
58 59
#define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>"
#define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
60 61
#define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>"

62 63 64
#define LOCK_TIME 600
#define LOCK_REFRESH 30

65
/* bits #0-15 in revision.h */
N
Nick Hengeveld 已提交
66

67 68 69 70
#define LOCAL    (1u<<16)
#define REMOTE   (1u<<17)
#define FETCHING (1u<<18)
#define PUSHING  (1u<<19)
N
Nick Hengeveld 已提交
71

72 73 74
/* We allow "recursive" symbolic refs. Only within reason, though */
#define MAXDEPTH 5

75 76
static int pushing;
static int aborted;
77
static signed char remote_dir_exists[256];
78 79 80

static struct curl_slist *no_pragma_header;

81
static int push_verbosely;
A
Andy Whitcroft 已提交
82
static int push_all = MATCH_REFS_NONE;
83
static int force_all;
84
static int dry_run;
85

86
static struct object_list *objects;
N
Nick Hengeveld 已提交
87

88 89 90
struct repo
{
	char *url;
91
	char *path;
N
Nick Hengeveld 已提交
92
	int path_len;
93 94 95
	int has_info_refs;
	int can_update_info_refs;
	int has_info_packs;
96
	struct packed_git *packs;
97
	struct remote_lock *locks;
98 99
};

100
static struct repo *remote;
101 102

enum transfer_state {
103 104 105
	NEED_FETCH,
	RUN_FETCH_LOOSE,
	RUN_FETCH_PACKED,
106 107 108 109 110 111 112 113 114 115
	NEED_PUSH,
	RUN_MKCOL,
	RUN_PUT,
	RUN_MOVE,
	ABORTED,
	COMPLETE,
};

struct transfer_request
{
N
Nick Hengeveld 已提交
116
	struct object *obj;
117 118
	char *url;
	char *dest;
N
Nick Hengeveld 已提交
119
	struct remote_lock *lock;
120 121 122 123
	struct curl_slist *headers;
	struct buffer buffer;
	char filename[PATH_MAX];
	char tmpfile[PATH_MAX];
124 125
	int local_fileno;
	FILE *local_stream;
126 127 128 129 130
	enum transfer_state state;
	CURLcode curl_result;
	char errorstr[CURL_ERROR_SIZE];
	long http_code;
	unsigned char real_sha1[20];
131
	git_SHA_CTX c;
132 133 134
	z_stream stream;
	int zret;
	int rename;
135
	void *userData;
136 137 138 139
	struct active_request_slot *slot;
	struct transfer_request *next;
};

140
static struct transfer_request *request_queue_head;
141

N
Nick Hengeveld 已提交
142 143 144 145 146 147 148 149 150
struct xml_ctx
{
	char *name;
	int len;
	char *cdata;
	void (*userFunc)(struct xml_ctx *ctx, int tag_closed);
	void *userData;
};

N
Nick Hengeveld 已提交
151
struct remote_lock
N
Nick Hengeveld 已提交
152
{
153
	char *url;
N
Nick Hengeveld 已提交
154
	char *owner;
155
	char *token;
156
	char tmpfile_suffix[41];
N
Nick Hengeveld 已提交
157 158
	time_t start_time;
	long timeout;
159
	int refreshing;
N
Nick Hengeveld 已提交
160 161 162
	struct remote_lock *next;
};

163 164 165 166 167 168 169 170 171
/* Flags that control remote_ls processing */
#define PROCESS_FILES (1u << 0)
#define PROCESS_DIRS  (1u << 1)
#define RECURSIVE     (1u << 2)

/* Flags that remote_ls passes to callback functions */
#define IS_DIR (1u << 0)

struct remote_ls_ctx
N
Nick Hengeveld 已提交
172
{
173 174 175 176 177 178 179
	char *path;
	void (*userFunc)(struct remote_ls_ctx *ls);
	void *userData;
	int flags;
	char *dentry_name;
	int dentry_flags;
	struct remote_ls_ctx *parent;
N
Nick Hengeveld 已提交
180 181
};

182 183 184 185 186 187 188
/* get_dav_token_headers options */
enum dav_header_flag {
	DAV_HEADER_IF = (1u << 0),
	DAV_HEADER_LOCK = (1u << 1),
	DAV_HEADER_TIMEOUT = (1u << 2)
};

J
Junio C Hamano 已提交
189 190
static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
{
191 192 193
	struct strbuf buf = STRBUF_INIT;
	struct curl_slist *dav_headers = NULL;

J
Junio C Hamano 已提交
194
	if (options & DAV_HEADER_IF) {
195 196 197 198
		strbuf_addf(&buf, "If: (<%s>)", lock->token);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
J
Junio C Hamano 已提交
199
	if (options & DAV_HEADER_LOCK) {
200 201 202 203
		strbuf_addf(&buf, "Lock-Token: <%s>", lock->token);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
J
Junio C Hamano 已提交
204
	if (options & DAV_HEADER_TIMEOUT) {
205 206 207 208 209 210 211 212 213
		strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
	strbuf_release(&buf);

	return dav_headers;
}

214 215 216 217 218 219 220 221 222
static void append_remote_object_url(struct strbuf *buf, const char *url,
				     const char *hex,
				     int only_two_digit_prefix)
{
	strbuf_addf(buf, "%sobjects/%.*s/", url, 2, hex);
	if (!only_two_digit_prefix)
		strbuf_addf(buf, "%s", hex+2);
}

223
static void finish_request(struct transfer_request *request);
224
static void release_request(struct transfer_request *request);
225

226
static void process_response(void *callback_data)
227
{
228 229
	struct transfer_request *request =
		(struct transfer_request *)callback_data;
230

231
	finish_request(request);
232 233
}

J
Junio C Hamano 已提交
234
#ifdef USE_CURL_MULTI
235

236 237
static char *get_remote_object_url(const char *url, const char *hex,
				   int only_two_digit_prefix)
238 239 240 241 242 243
{
	struct strbuf buf = STRBUF_INIT;
	append_remote_object_url(&buf, url, hex, only_two_digit_prefix);
	return strbuf_detach(&buf, NULL);
}

244 245 246 247 248 249 250 251
static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
			       void *data)
{
	unsigned char expn[4096];
	size_t size = eltsize * nmemb;
	int posn = 0;
	struct transfer_request *request = (struct transfer_request *)data;
	do {
252
		ssize_t retval = xwrite(request->local_fileno,
253
				       (char *) ptr + posn, size - posn);
254 255 256 257 258 259 260 261 262 263
		if (retval < 0)
			return posn;
		posn += retval;
	} while (posn < size);

	request->stream.avail_in = size;
	request->stream.next_in = ptr;
	do {
		request->stream.next_out = expn;
		request->stream.avail_out = sizeof(expn);
264
		request->zret = git_inflate(&request->stream, Z_SYNC_FLUSH);
265
		git_SHA1_Update(&request->c, expn,
266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322
			    sizeof(expn) - request->stream.avail_out);
	} while (request->stream.avail_in && request->zret == Z_OK);
	data_received++;
	return size;
}

static void start_fetch_loose(struct transfer_request *request)
{
	char *hex = sha1_to_hex(request->obj->sha1);
	char *filename;
	char prevfile[PATH_MAX];
	char *url;
	int prevlocal;
	unsigned char prev_buf[PREV_BUF_SIZE];
	ssize_t prev_read = 0;
	long prev_posn = 0;
	char range[RANGE_HEADER_SIZE];
	struct curl_slist *range_header = NULL;
	struct active_request_slot *slot;

	filename = sha1_file_name(request->obj->sha1);
	snprintf(request->filename, sizeof(request->filename), "%s", filename);
	snprintf(request->tmpfile, sizeof(request->tmpfile),
		 "%s.temp", filename);

	snprintf(prevfile, sizeof(prevfile), "%s.prev", request->filename);
	unlink(prevfile);
	rename(request->tmpfile, prevfile);
	unlink(request->tmpfile);

	if (request->local_fileno != -1)
		error("fd leakage in start: %d", request->local_fileno);
	request->local_fileno = open(request->tmpfile,
				     O_WRONLY | O_CREAT | O_EXCL, 0666);
	/* This could have failed due to the "lazy directory creation";
	 * try to mkdir the last path component.
	 */
	if (request->local_fileno < 0 && errno == ENOENT) {
		char *dir = strrchr(request->tmpfile, '/');
		if (dir) {
			*dir = 0;
			mkdir(request->tmpfile, 0777);
			*dir = '/';
		}
		request->local_fileno = open(request->tmpfile,
					     O_WRONLY | O_CREAT | O_EXCL, 0666);
	}

	if (request->local_fileno < 0) {
		request->state = ABORTED;
		error("Couldn't create temporary file %s for %s: %s",
		      request->tmpfile, request->filename, strerror(errno));
		return;
	}

	memset(&request->stream, 0, sizeof(request->stream));

323
	git_inflate_init(&request->stream);
324

325
	git_SHA1_Init(&request->c);
326

327 328
	url = get_remote_object_url(remote->url, hex, 0);
	request->url = xstrdup(url);
329 330 331 332 333 334

	/* If a previous temp file is present, process what was already
	   fetched. */
	prevlocal = open(prevfile, O_RDONLY);
	if (prevlocal != -1) {
		do {
335
			prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354
			if (prev_read>0) {
				if (fwrite_sha1_file(prev_buf,
						     1,
						     prev_read,
						     request) == prev_read) {
					prev_posn += prev_read;
				} else {
					prev_read = -1;
				}
			}
		} while (prev_read > 0);
		close(prevlocal);
	}
	unlink(prevfile);

	/* Reset inflate/SHA1 if there was an error reading the previous temp
	   file; also rewind to the beginning of the local file. */
	if (prev_read == -1) {
		memset(&request->stream, 0, sizeof(request->stream));
355
		git_inflate_init(&request->stream);
356
		git_SHA1_Init(&request->c);
357 358
		if (prev_posn>0) {
			prev_posn = 0;
359
			lseek(request->local_fileno, 0, SEEK_SET);
360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
			ftruncate(request->local_fileno, 0);
		}
	}

	slot = get_active_slot();
	slot->callback_func = process_response;
	slot->callback_data = request;
	request->slot = slot;

	curl_easy_setopt(slot->curl, CURLOPT_FILE, request);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
	curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);

	/* If we have successfully processed data from a previous fetch
	   attempt, only fetch the data we don't already have. */
	if (prev_posn>0) {
		if (push_verbosely)
			fprintf(stderr,
				"Resuming fetch of object %s at byte %ld\n",
				hex, prev_posn);
		sprintf(range, "Range: bytes=%ld-", prev_posn);
		range_header = curl_slist_append(range_header, range);
		curl_easy_setopt(slot->curl,
				 CURLOPT_HTTPHEADER, range_header);
	}

	/* Try to get the request started, abort the request on error */
	request->state = RUN_FETCH_LOOSE;
	if (!start_active_slot(slot)) {
		fprintf(stderr, "Unable to start GET request\n");
		remote->can_update_info_refs = 0;
		release_request(request);
	}
}

J
Junio C Hamano 已提交
397 398 399 400 401
static void start_mkcol(struct transfer_request *request)
{
	char *hex = sha1_to_hex(request->obj->sha1);
	struct active_request_slot *slot;

402
	request->url = get_remote_object_url(remote->url, hex, 1);
J
Junio C Hamano 已提交
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423

	slot = get_active_slot();
	slot->callback_func = process_response;
	slot->callback_data = request;
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); /* undo PUT setup */
	curl_easy_setopt(slot->curl, CURLOPT_URL, request->url);
	curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MKCOL);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);

	if (start_active_slot(slot)) {
		request->slot = slot;
		request->state = RUN_MKCOL;
	} else {
		request->state = ABORTED;
		free(request->url);
		request->url = NULL;
	}
}
#endif

424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470
static void start_fetch_packed(struct transfer_request *request)
{
	char *url;
	struct packed_git *target;
	FILE *packfile;
	char *filename;
	long prev_posn = 0;
	char range[RANGE_HEADER_SIZE];
	struct curl_slist *range_header = NULL;

	struct transfer_request *check_request = request_queue_head;
	struct active_request_slot *slot;

	target = find_sha1_pack(request->obj->sha1, remote->packs);
	if (!target) {
		fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1));
		remote->can_update_info_refs = 0;
		release_request(request);
		return;
	}

	fprintf(stderr,	"Fetching pack %s\n", sha1_to_hex(target->sha1));
	fprintf(stderr, " which contains %s\n", sha1_to_hex(request->obj->sha1));

	filename = sha1_pack_name(target->sha1);
	snprintf(request->filename, sizeof(request->filename), "%s", filename);
	snprintf(request->tmpfile, sizeof(request->tmpfile),
		 "%s.temp", filename);

	url = xmalloc(strlen(remote->url) + 64);
	sprintf(url, "%sobjects/pack/pack-%s.pack",
		remote->url, sha1_to_hex(target->sha1));

	/* Make sure there isn't another open request for this pack */
	while (check_request) {
		if (check_request->state == RUN_FETCH_PACKED &&
		    !strcmp(check_request->url, url)) {
			free(url);
			release_request(request);
			return;
		}
		check_request = check_request->next;
	}

	packfile = fopen(request->tmpfile, "a");
	if (!packfile) {
		fprintf(stderr, "Unable to open local file %s for pack",
471
			request->tmpfile);
472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
		remote->can_update_info_refs = 0;
		free(url);
		return;
	}

	slot = get_active_slot();
	slot->callback_func = process_response;
	slot->callback_data = request;
	request->slot = slot;
	request->local_stream = packfile;
	request->userData = target;

	request->url = url;
	curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
	slot->local = packfile;

	/* If there is data present from a previous transfer attempt,
	   resume where it left off */
	prev_posn = ftell(packfile);
	if (prev_posn>0) {
		if (push_verbosely)
			fprintf(stderr,
				"Resuming fetch of pack %s at byte %ld\n",
				sha1_to_hex(target->sha1), prev_posn);
		sprintf(range, "Range: bytes=%ld-", prev_posn);
		range_header = curl_slist_append(range_header, range);
		curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header);
	}

	/* Try to get the request started, abort the request on error */
	request->state = RUN_FETCH_PACKED;
	if (!start_active_slot(slot)) {
		fprintf(stderr, "Unable to start GET request\n");
		remote->can_update_info_refs = 0;
		release_request(request);
	}
}

513 514
static void start_put(struct transfer_request *request)
{
N
Nick Hengeveld 已提交
515
	char *hex = sha1_to_hex(request->obj->sha1);
516
	struct active_request_slot *slot;
517
	struct strbuf buf = STRBUF_INIT;
518
	enum object_type type;
519 520 521 522 523 524 525
	char hdr[50];
	void *unpacked;
	unsigned long len;
	int hdrlen;
	ssize_t size;
	z_stream stream;

526 527
	unpacked = read_sha1_file(request->obj->sha1, &type, &len);
	hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
528 529 530

	/* Set it up */
	memset(&stream, 0, sizeof(stream));
531
	deflateInit(&stream, zlib_compression_level);
532
	size = deflateBound(&stream, len + hdrlen);
M
Mike Hommey 已提交
533 534
	strbuf_init(&request->buffer.buf, size);
	request->buffer.posn = 0;
535 536

	/* Compress it */
M
Mike Hommey 已提交
537
	stream.next_out = (unsigned char *)request->buffer.buf.buf;
538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553
	stream.avail_out = size;

	/* First header.. */
	stream.next_in = (void *)hdr;
	stream.avail_in = hdrlen;
	while (deflate(&stream, 0) == Z_OK)
		/* nothing */;

	/* Then the data itself.. */
	stream.next_in = unpacked;
	stream.avail_in = len;
	while (deflate(&stream, Z_FINISH) == Z_OK)
		/* nothing */;
	deflateEnd(&stream);
	free(unpacked);

M
Mike Hommey 已提交
554
	request->buffer.buf.len = stream.total_out;
555

556 557 558 559 560
	strbuf_addstr(&buf, "Destination: ");
	append_remote_object_url(&buf, remote->url, hex, 0);
	request->dest = strbuf_detach(&buf, NULL);

	append_remote_object_url(&buf, remote->url, hex, 0);
561
	strbuf_add(&buf, request->lock->tmpfile_suffix, 41);
562
	request->url = strbuf_detach(&buf, NULL);
563 564

	slot = get_active_slot();
565 566
	slot->callback_func = process_response;
	slot->callback_data = request;
567
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &request->buffer);
M
Mike Hommey 已提交
568
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, request->buffer.buf.len);
569 570 571 572 573 574 575 576 577 578 579 580 581 582
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
	curl_easy_setopt(slot->curl, CURLOPT_PUT, 1);
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
	curl_easy_setopt(slot->curl, CURLOPT_URL, request->url);

	if (start_active_slot(slot)) {
		request->slot = slot;
		request->state = RUN_PUT;
	} else {
		request->state = ABORTED;
		free(request->url);
N
Nick Hengeveld 已提交
583
		request->url = NULL;
584 585 586 587 588 589 590 591 592
	}
}

static void start_move(struct transfer_request *request)
{
	struct active_request_slot *slot;
	struct curl_slist *dav_headers = NULL;

	slot = get_active_slot();
593 594
	slot->callback_func = process_response;
	slot->callback_data = request;
595 596 597 598 599 600 601 602 603 604 605 606 607 608
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); /* undo PUT setup */
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MOVE);
	dav_headers = curl_slist_append(dav_headers, request->dest);
	dav_headers = curl_slist_append(dav_headers, "Overwrite: T");
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
	curl_easy_setopt(slot->curl, CURLOPT_URL, request->url);

	if (start_active_slot(slot)) {
		request->slot = slot;
		request->state = RUN_MOVE;
	} else {
		request->state = ABORTED;
		free(request->url);
N
Nick Hengeveld 已提交
609
		request->url = NULL;
610 611 612
	}
}

613
static int refresh_lock(struct remote_lock *lock)
614 615
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
616
	struct slot_results results;
617
	struct curl_slist *dav_headers;
618
	int rc = 0;
619

620
	lock->refreshing = 1;
621

622
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT);
623

624 625 626 627 628 629 630
	slot = get_active_slot();
	slot->results = &results;
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
	curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
631

632 633 634 635 636 637 638 639 640 641
	if (start_active_slot(slot)) {
		run_active_slot(slot);
		if (results.curl_result != CURLE_OK) {
			fprintf(stderr, "LOCK HTTP error %ld\n",
				results.http_code);
		} else {
			lock->start_time = time(NULL);
			rc = 1;
		}
	}
N
Nick Hengeveld 已提交
642

643 644
	lock->refreshing = 0;
	curl_slist_free_all(dav_headers);
N
Nick Hengeveld 已提交
645

646 647 648
	return rc;
}

649
static void check_locks(void)
650 651 652 653 654 655 656 657 658 659 660 661 662 663 664
{
	struct remote_lock *lock = remote->locks;
	time_t current_time = time(NULL);
	int time_remaining;

	while (lock) {
		time_remaining = lock->start_time + lock->timeout -
			current_time;
		if (!lock->refreshing && time_remaining < LOCK_REFRESH) {
			if (!refresh_lock(lock)) {
				fprintf(stderr,
					"Unable to refresh lock for %s\n",
					lock->url);
				aborted = 1;
				return;
N
Nick Hengeveld 已提交
665
			}
666
		}
667
		lock = lock->next;
668
	}
N
Nick Hengeveld 已提交
669
}
670

N
Nick Hengeveld 已提交
671 672 673 674 675 676 677 678 679 680 681 682 683
static void release_request(struct transfer_request *request)
{
	struct transfer_request *entry = request_queue_head;

	if (request == request_queue_head) {
		request_queue_head = request->next;
	} else {
		while (entry->next != NULL && entry->next != request)
			entry = entry->next;
		if (entry->next == request)
			entry->next = entry->next->next;
	}

684 685 686 687
	if (request->local_fileno != -1)
		close(request->local_fileno);
	if (request->local_stream)
		fclose(request->local_stream);
688
	free(request->url);
N
Nick Hengeveld 已提交
689
	free(request);
690 691
}

692 693
static void finish_request(struct transfer_request *request)
{
694 695 696 697 698
	struct stat st;
	struct packed_git *target;
	struct packed_git **lst;

	request->curl_result = request->slot->curl_result;
699 700
	request->http_code = request->slot->http_code;
	request->slot = NULL;
701

N
Nick Hengeveld 已提交
702
	/* Keep locks active */
703
	check_locks();
704

705 706
	if (request->headers != NULL)
		curl_slist_free_all(request->headers);
N
Nick Hengeveld 已提交
707 708 709 710 711

	/* URL is reused for MOVE after PUT */
	if (request->state != RUN_PUT) {
		free(request->url);
		request->url = NULL;
N
Nick Hengeveld 已提交
712
	}
N
Nick Hengeveld 已提交
713

N
Nick Hengeveld 已提交
714
	if (request->state == RUN_MKCOL) {
715 716
		if (request->curl_result == CURLE_OK ||
		    request->http_code == 405) {
N
Nick Hengeveld 已提交
717
			remote_dir_exists[request->obj->sha1[0]] = 1;
718 719 720
			start_put(request);
		} else {
			fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
721
				sha1_to_hex(request->obj->sha1),
722 723 724 725 726 727 728 729 730
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
	} else if (request->state == RUN_PUT) {
		if (request->curl_result == CURLE_OK) {
			start_move(request);
		} else {
			fprintf(stderr,	"PUT %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
731
				sha1_to_hex(request->obj->sha1),
732 733 734 735 736 737
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
	} else if (request->state == RUN_MOVE) {
		if (request->curl_result == CURLE_OK) {
N
Nick Hengeveld 已提交
738 739 740
			if (push_verbosely)
				fprintf(stderr, "    sent %s\n",
					sha1_to_hex(request->obj->sha1));
N
Nick Hengeveld 已提交
741 742
			request->obj->flags |= REMOTE;
			release_request(request);
743 744
		} else {
			fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
745
				sha1_to_hex(request->obj->sha1),
746 747 748 749
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
750 751 752 753 754 755 756 757 758 759 760 761 762 763
	} else if (request->state == RUN_FETCH_LOOSE) {
		fchmod(request->local_fileno, 0444);
		close(request->local_fileno); request->local_fileno = -1;

		if (request->curl_result != CURLE_OK &&
		    request->http_code != 416) {
			if (stat(request->tmpfile, &st) == 0) {
				if (st.st_size == 0)
					unlink(request->tmpfile);
			}
		} else {
			if (request->http_code == 416)
				fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n");

764
			git_inflate_end(&request->stream);
765
			git_SHA1_Final(request->real_sha1, &request->c);
766 767
			if (request->zret != Z_STREAM_END) {
				unlink(request->tmpfile);
768
			} else if (hashcmp(request->obj->sha1, request->real_sha1)) {
769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792
				unlink(request->tmpfile);
			} else {
				request->rename =
					move_temp_to_file(
						request->tmpfile,
						request->filename);
				if (request->rename == 0) {
					request->obj->flags |= (LOCAL | REMOTE);
				}
			}
		}

		/* Try fetching packed if necessary */
		if (request->obj->flags & LOCAL)
			release_request(request);
		else
			start_fetch_packed(request);

	} else if (request->state == RUN_FETCH_PACKED) {
		if (request->curl_result != CURLE_OK) {
			fprintf(stderr, "Unable to get pack file %s\n%s",
				request->url, curl_errorstr);
			remote->can_update_info_refs = 0;
		} else {
793 794
			off_t pack_size = ftell(request->local_stream);

795 796 797 798 799
			fclose(request->local_stream);
			request->local_stream = NULL;
			if (!move_temp_to_file(request->tmpfile,
					       request->filename)) {
				target = (struct packed_git *)request->userData;
800
				target->pack_size = pack_size;
801 802 803 804 805
				lst = &remote->packs;
				while (*lst != target)
					lst = &((*lst)->next);
				*lst = (*lst)->next;

806
				if (!verify_pack(target))
807 808 809 810 811 812
					install_packed_git(target);
				else
					remote->can_update_info_refs = 0;
			}
		}
		release_request(request);
813 814 815
	}
}

N
Nick Hengeveld 已提交
816
#ifdef USE_CURL_MULTI
817
static int fill_active_slot(void *unused)
818 819 820 821
{
	struct transfer_request *request = request_queue_head;

	if (aborted)
822
		return 0;
823

824
	for (request = request_queue_head; request; request = request->next) {
825 826
		if (request->state == NEED_FETCH) {
			start_fetch_loose(request);
827
			return 1;
828
		} else if (pushing && request->state == NEED_PUSH) {
N
Nick Hengeveld 已提交
829
			if (remote_dir_exists[request->obj->sha1[0]] == 1) {
830
				start_put(request);
N
Nick Hengeveld 已提交
831
			} else {
832
				start_mkcol(request);
N
Nick Hengeveld 已提交
833
			}
834
			return 1;
835
		}
N
Nick Hengeveld 已提交
836
	}
837
	return 0;
838
}
N
Nick Hengeveld 已提交
839
#endif
840

N
Nick Hengeveld 已提交
841 842
static void get_remote_object_list(unsigned char parent);

843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869
static void add_fetch_request(struct object *obj)
{
	struct transfer_request *request;

	check_locks();

	/*
	 * Don't fetch the object if it's known to exist locally
	 * or is already in the request queue
	 */
	if (remote_dir_exists[obj->sha1[0]] == -1)
		get_remote_object_list(obj->sha1[0]);
	if (obj->flags & (LOCAL | FETCHING))
		return;

	obj->flags |= FETCHING;
	request = xmalloc(sizeof(*request));
	request->obj = obj;
	request->url = NULL;
	request->lock = NULL;
	request->headers = NULL;
	request->local_fileno = -1;
	request->local_stream = NULL;
	request->state = NEED_FETCH;
	request->next = request_queue_head;
	request_queue_head = request;

N
Nick Hengeveld 已提交
870
#ifdef USE_CURL_MULTI
871 872
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
873
#endif
874 875
}

N
Nick Hengeveld 已提交
876
static int add_send_request(struct object *obj, struct remote_lock *lock)
877 878 879 880
{
	struct transfer_request *request = request_queue_head;
	struct packed_git *target;

881 882 883
	/* Keep locks active */
	check_locks();

N
Nick Hengeveld 已提交
884 885 886 887 888 889 890
	/*
	 * Don't push the object if it's known to exist on the remote
	 * or is already in the request queue
	 */
	if (remote_dir_exists[obj->sha1[0]] == -1)
		get_remote_object_list(obj->sha1[0]);
	if (obj->flags & (REMOTE | PUSHING))
N
Nick Hengeveld 已提交
891
		return 0;
N
Nick Hengeveld 已提交
892 893 894
	target = find_sha1_pack(obj->sha1, remote->packs);
	if (target) {
		obj->flags |= REMOTE;
N
Nick Hengeveld 已提交
895
		return 0;
N
Nick Hengeveld 已提交
896
	}
897

N
Nick Hengeveld 已提交
898
	obj->flags |= PUSHING;
899
	request = xmalloc(sizeof(*request));
N
Nick Hengeveld 已提交
900
	request->obj = obj;
901
	request->url = NULL;
N
Nick Hengeveld 已提交
902
	request->lock = lock;
903
	request->headers = NULL;
904 905
	request->local_fileno = -1;
	request->local_stream = NULL;
N
Nick Hengeveld 已提交
906
	request->state = NEED_PUSH;
907 908
	request->next = request_queue_head;
	request_queue_head = request;
909

N
Nick Hengeveld 已提交
910
#ifdef USE_CURL_MULTI
911 912
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
913
#endif
N
Nick Hengeveld 已提交
914 915

	return 1;
916 917 918 919 920 921 922 923 924 925 926 927 928 929
}

static int fetch_index(unsigned char *sha1)
{
	char *hex = sha1_to_hex(sha1);
	char *filename;
	char *url;
	char tmpfile[PATH_MAX];
	long prev_posn = 0;
	char range[RANGE_HEADER_SIZE];
	struct curl_slist *range_header = NULL;

	FILE *indexfile;
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
930
	struct slot_results results;
931

932
	/* Don't use the index if the pack isn't there */
N
Nick Hengeveld 已提交
933 934
	url = xmalloc(strlen(remote->url) + 64);
	sprintf(url, "%sobjects/pack/pack-%s.pack", remote->url, hex);
935
	slot = get_active_slot();
N
Nick Hengeveld 已提交
936
	slot->results = &results;
937 938 939 940
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
941
		if (results.curl_result != CURLE_OK) {
942 943 944 945 946
			free(url);
			return error("Unable to verify pack %s is available",
				     hex);
		}
	} else {
947
		free(url);
948 949 950
		return error("Unable to start request");
	}

951 952
	if (has_pack_index(sha1)) {
		free(url);
953
		return 0;
954
	}
955 956 957

	if (push_verbosely)
		fprintf(stderr, "Getting index for pack %s\n", hex);
N
Nick Hengeveld 已提交
958 959 960

	sprintf(url, "%sobjects/pack/pack-%s.idx", remote->url, hex);

961 962 963
	filename = sha1_pack_index_name(sha1);
	snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
	indexfile = fopen(tmpfile, "a");
964 965
	if (!indexfile) {
		free(url);
966
		return error("Unable to open local file %s for pack index",
967
			     tmpfile);
968
	}
969 970

	slot = get_active_slot();
N
Nick Hengeveld 已提交
971
	slot->results = &results;
972 973
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994
	curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
	slot->local = indexfile;

	/* If there is data present from a previous transfer attempt,
	   resume where it left off */
	prev_posn = ftell(indexfile);
	if (prev_posn>0) {
		if (push_verbosely)
			fprintf(stderr,
				"Resuming fetch of index for pack %s at byte %ld\n",
				hex, prev_posn);
		sprintf(range, "Range: bytes=%ld-", prev_posn);
		range_header = curl_slist_append(range_header, range);
		curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header);
	}

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
995
		if (results.curl_result != CURLE_OK) {
996 997 998 999 1000 1001 1002
			free(url);
			fclose(indexfile);
			return error("Unable to get pack index %s\n%s", url,
				     curl_errorstr);
		}
	} else {
		free(url);
N
Nick Hengeveld 已提交
1003
		fclose(indexfile);
1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025
		return error("Unable to start request");
	}

	free(url);
	fclose(indexfile);

	return move_temp_to_file(tmpfile, filename);
}

static int setup_index(unsigned char *sha1)
{
	struct packed_git *new_pack;

	if (fetch_index(sha1))
		return -1;

	new_pack = parse_pack_index(sha1);
	new_pack->next = remote->packs;
	remote->packs = new_pack;
	return 0;
}

1026
static int fetch_indices(void)
1027 1028 1029
{
	unsigned char sha1[20];
	char *url;
M
Mike Hommey 已提交
1030
	struct strbuf buffer = STRBUF_INIT;
1031 1032 1033 1034
	char *data;
	int i = 0;

	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1035
	struct slot_results results;
1036 1037 1038

	if (push_verbosely)
		fprintf(stderr, "Getting pack list\n");
N
Nick Hengeveld 已提交
1039 1040 1041

	url = xmalloc(strlen(remote->url) + 20);
	sprintf(url, "%sobjects/info/packs", remote->url);
1042 1043

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1044
	slot->results = &results;
1045
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
1046
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1047 1048 1049 1050
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1051
		if (results.curl_result != CURLE_OK) {
M
Mike Hommey 已提交
1052
			strbuf_release(&buffer);
1053
			free(url);
N
Nick Hengeveld 已提交
1054
			if (results.http_code == 404)
1055 1056 1057 1058 1059
				return 0;
			else
				return error("%s", curl_errorstr);
		}
	} else {
M
Mike Hommey 已提交
1060
		strbuf_release(&buffer);
1061 1062 1063 1064 1065
		free(url);
		return error("Unable to start request");
	}
	free(url);

M
Mike Hommey 已提交
1066 1067
	data = buffer.buf;
	while (i < buffer.len) {
1068 1069 1070
		switch (data[i]) {
		case 'P':
			i++;
M
Mike Hommey 已提交
1071
			if (i + 52 < buffer.len &&
1072
			    !prefixcmp(data + i, " pack-") &&
1073
			    !prefixcmp(data + i + 46, ".pack\n")) {
1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085
				get_sha1_hex(data + i + 6, sha1);
				setup_index(sha1);
				i += 51;
				break;
			}
		default:
			while (data[i] != '\n')
				i++;
		}
		i++;
	}

M
Mike Hommey 已提交
1086
	strbuf_release(&buffer);
1087 1088 1089
	return 0;
}

N
Nick Hengeveld 已提交
1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107
static void one_remote_object(const char *hex)
{
	unsigned char sha1[20];
	struct object *obj;

	if (get_sha1_hex(hex, sha1) != 0)
		return;

	obj = lookup_object(sha1);
	if (!obj)
		obj = parse_object(sha1);

	/* Ignore remote objects that don't exist locally */
	if (!obj)
		return;

	obj->flags |= REMOTE;
	if (!object_list_contains(objects, obj))
1108
		object_list_insert(obj, &objects);
N
Nick Hengeveld 已提交
1109 1110
}

N
Nick Hengeveld 已提交
1111
static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
1112
{
N
Nick Hengeveld 已提交
1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127
	int *lock_flags = (int *)ctx->userData;

	if (tag_closed) {
		if (!strcmp(ctx->name, DAV_CTX_LOCKENTRY)) {
			if ((*lock_flags & DAV_PROP_LOCKEX) &&
			    (*lock_flags & DAV_PROP_LOCKWR)) {
				*lock_flags |= DAV_LOCK_OK;
			}
			*lock_flags &= DAV_LOCK_OK;
		} else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_WRITE)) {
			*lock_flags |= DAV_PROP_LOCKWR;
		} else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_EXCLUSIVE)) {
			*lock_flags |= DAV_PROP_LOCKEX;
		}
	}
N
Nick Hengeveld 已提交
1128 1129
}

N
Nick Hengeveld 已提交
1130
static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
1131
{
N
Nick Hengeveld 已提交
1132
	struct remote_lock *lock = (struct remote_lock *)ctx->userData;
1133 1134
	git_SHA_CTX sha_ctx;
	unsigned char lock_token_sha1[20];
N
Nick Hengeveld 已提交
1135 1136 1137 1138 1139 1140

	if (tag_closed && ctx->cdata) {
		if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) {
			lock->owner = xmalloc(strlen(ctx->cdata) + 1);
			strcpy(lock->owner, ctx->cdata);
		} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) {
1141
			if (!prefixcmp(ctx->cdata, "Second-"))
N
Nick Hengeveld 已提交
1142 1143 1144
				lock->timeout =
					strtol(ctx->cdata + 7, NULL, 10);
		} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) {
1145 1146
			lock->token = xmalloc(strlen(ctx->cdata) + 1);
			strcpy(lock->token, ctx->cdata);
1147 1148 1149 1150 1151 1152 1153

			git_SHA1_Init(&sha_ctx);
			git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token));
			git_SHA1_Final(lock_token_sha1, &sha_ctx);

			lock->tmpfile_suffix[0] = '_';
			memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40);
N
Nick Hengeveld 已提交
1154
		}
N
Nick Hengeveld 已提交
1155 1156 1157
	}
}

N
Nick Hengeveld 已提交
1158 1159
static void one_remote_ref(char *refname);

N
Nick Hengeveld 已提交
1160
static void
N
Nick Hengeveld 已提交
1161
xml_start_tag(void *userData, const char *name, const char **atts)
N
Nick Hengeveld 已提交
1162
{
N
Nick Hengeveld 已提交
1163
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
1164
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176
	int new_len;

	if (c == NULL)
		c = name;
	else
		c++;

	new_len = strlen(ctx->name) + strlen(c) + 2;

	if (new_len > ctx->len) {
		ctx->name = xrealloc(ctx->name, new_len);
		ctx->len = new_len;
N
Nick Hengeveld 已提交
1177
	}
N
Nick Hengeveld 已提交
1178 1179
	strcat(ctx->name, ".");
	strcat(ctx->name, c);
N
Nick Hengeveld 已提交
1180

J
Junio C Hamano 已提交
1181 1182
	free(ctx->cdata);
	ctx->cdata = NULL;
N
Nick Hengeveld 已提交
1183 1184

	ctx->userFunc(ctx, 0);
N
Nick Hengeveld 已提交
1185 1186
}

1187
static void
N
Nick Hengeveld 已提交
1188
xml_end_tag(void *userData, const char *name)
1189
{
N
Nick Hengeveld 已提交
1190
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
1191
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
1192
	char *ep;
1193

N
Nick Hengeveld 已提交
1194 1195 1196 1197 1198 1199 1200 1201 1202
	ctx->userFunc(ctx, 1);

	if (c == NULL)
		c = name;
	else
		c++;

	ep = ctx->name + strlen(ctx->name) - strlen(c) - 1;
	*ep = 0;
1203 1204 1205
}

static void
N
Nick Hengeveld 已提交
1206
xml_cdata(void *userData, const XML_Char *s, int len)
1207
{
N
Nick Hengeveld 已提交
1208
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
J
Junio C Hamano 已提交
1209
	free(ctx->cdata);
P
Pierre Habouzit 已提交
1210
	ctx->cdata = xmemdupz(s, len);
1211 1212
}

T
Timo Hirvonen 已提交
1213
static struct remote_lock *lock_remote(const char *path, long timeout)
1214 1215
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1216
	struct slot_results results;
M
Mike Hommey 已提交
1217 1218
	struct buffer out_buffer = { STRBUF_INIT, 0 };
	struct strbuf in_buffer = STRBUF_INIT;
1219
	char *url;
1220
	char *ep;
1221
	char timeout_header[25];
1222
	struct remote_lock *lock = NULL;
1223
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
1224
	struct xml_ctx ctx;
1225

N
Nick Hengeveld 已提交
1226 1227 1228
	url = xmalloc(strlen(remote->url) + strlen(path) + 1);
	sprintf(url, "%s%s", remote->url, path);

1229
	/* Make sure leading directories exist for the remote ref */
1230
	ep = strchr(url + strlen(remote->url) + 1, '/');
1231
	while (ep) {
1232 1233
		char saved_character = ep[1];
		ep[1] = '\0';
1234
		slot = get_active_slot();
N
Nick Hengeveld 已提交
1235
		slot->results = &results;
1236 1237 1238 1239 1240 1241
		curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
		curl_easy_setopt(slot->curl, CURLOPT_URL, url);
		curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MKCOL);
		curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
		if (start_active_slot(slot)) {
			run_active_slot(slot);
N
Nick Hengeveld 已提交
1242 1243
			if (results.curl_result != CURLE_OK &&
			    results.http_code != 405) {
1244 1245 1246 1247 1248 1249 1250
				fprintf(stderr,
					"Unable to create branch path %s\n",
					url);
				free(url);
				return NULL;
			}
		} else {
N
Nick Hengeveld 已提交
1251
			fprintf(stderr, "Unable to start MKCOL request\n");
1252 1253 1254
			free(url);
			return NULL;
		}
1255
		ep[1] = saved_character;
1256 1257 1258
		ep = strchr(ep + 1, '/');
	}

M
Mike Hommey 已提交
1259
	strbuf_addf(&out_buffer.buf, LOCK_REQUEST, git_default_email);
N
Nick Hengeveld 已提交
1260

1261
	sprintf(timeout_header, "Timeout: Second-%ld", timeout);
1262 1263 1264 1265
	dav_headers = curl_slist_append(dav_headers, timeout_header);
	dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1266
	slot->results = &results;
1267
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1268
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1269
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
N
Nick Hengeveld 已提交
1270
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
1271
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1272 1273 1274 1275 1276
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

N
Nick Hengeveld 已提交
1277 1278
	lock = xcalloc(1, sizeof(*lock));
	lock->timeout = -1;
N
Nick Hengeveld 已提交
1279

1280 1281
	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1282
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1283 1284
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1285 1286 1287 1288
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
			ctx.userFunc = handle_new_lock_ctx;
N
Nick Hengeveld 已提交
1289
			ctx.userData = lock;
N
Nick Hengeveld 已提交
1290 1291 1292 1293
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
1294 1295
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1296 1297 1298 1299 1300
			free(ctx.name);
			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
N
Nick Hengeveld 已提交
1301
				lock->timeout = -1;
N
Nick Hengeveld 已提交
1302
			}
M
Mike Hommey 已提交
1303
			XML_ParserFree(parser);
1304 1305
		}
	} else {
N
Nick Hengeveld 已提交
1306
		fprintf(stderr, "Unable to start LOCK request\n");
1307 1308
	}

N
Nick Hengeveld 已提交
1309
	curl_slist_free_all(dav_headers);
M
Mike Hommey 已提交
1310 1311
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1312

N
Nick Hengeveld 已提交
1313
	if (lock->token == NULL || lock->timeout <= 0) {
1314 1315
		free(lock->token);
		free(lock->owner);
1316
		free(url);
N
Nick Hengeveld 已提交
1317 1318
		free(lock);
		lock = NULL;
N
Nick Hengeveld 已提交
1319
	} else {
N
Nick Hengeveld 已提交
1320 1321
		lock->url = url;
		lock->start_time = time(NULL);
1322 1323
		lock->next = remote->locks;
		remote->locks = lock;
N
Nick Hengeveld 已提交
1324 1325
	}

N
Nick Hengeveld 已提交
1326
	return lock;
1327 1328
}

N
Nick Hengeveld 已提交
1329
static int unlock_remote(struct remote_lock *lock)
1330 1331
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1332
	struct slot_results results;
1333
	struct remote_lock *prev = remote->locks;
1334
	struct curl_slist *dav_headers;
1335 1336
	int rc = 0;

1337
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK);
1338 1339

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1340
	slot->results = &results;
1341
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
1342
	curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
1343 1344 1345 1346 1347
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_UNLOCK);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1348
		if (results.curl_result == CURLE_OK)
1349 1350
			rc = 1;
		else
1351
			fprintf(stderr, "UNLOCK HTTP error %ld\n",
N
Nick Hengeveld 已提交
1352
				results.http_code);
1353
	} else {
1354
		fprintf(stderr, "Unable to start UNLOCK request\n");
1355 1356 1357
	}

	curl_slist_free_all(dav_headers);
1358

1359 1360 1361 1362 1363 1364 1365 1366 1367
	if (remote->locks == lock) {
		remote->locks = lock->next;
	} else {
		while (prev && prev->next != lock)
			prev = prev->next;
		if (prev)
			prev->next = prev->next->next;
	}

1368
	free(lock->owner);
1369 1370 1371
	free(lock->url);
	free(lock->token);
	free(lock);
1372 1373 1374 1375

	return rc;
}

1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389
static void remove_locks(void)
{
	struct remote_lock *lock = remote->locks;

	fprintf(stderr, "Removing remote locks...\n");
	while (lock) {
		unlock_remote(lock);
		lock = lock->next;
	}
}

static void remove_locks_on_signal(int signo)
{
	remove_locks();
1390
	sigchain_pop(signo);
1391 1392 1393
	raise(signo);
}

1394 1395 1396
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData);
N
Nick Hengeveld 已提交
1397

1398 1399 1400 1401 1402
static void process_ls_object(struct remote_ls_ctx *ls)
{
	unsigned int *parent = (unsigned int *)ls->userData;
	char *path = ls->dentry_name;
	char *obj_hex;
N
Nick Hengeveld 已提交
1403

1404 1405 1406 1407
	if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) {
		remote_dir_exists[*parent] = 1;
		return;
	}
N
Nick Hengeveld 已提交
1408

1409 1410 1411 1412
	if (strlen(path) != 49)
		return;
	path += 8;
	obj_hex = xmalloc(strlen(path));
1413 1414
	/* NB: path is not null-terminated, can not use strlcpy here */
	memcpy(obj_hex, path, 2);
1415 1416 1417 1418
	strcpy(obj_hex + 2, path + 3);
	one_remote_object(obj_hex);
	free(obj_hex);
}
N
Nick Hengeveld 已提交
1419

1420 1421 1422 1423 1424 1425
static void process_ls_ref(struct remote_ls_ctx *ls)
{
	if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) {
		fprintf(stderr, "  %s\n", ls->dentry_name);
		return;
	}
N
Nick Hengeveld 已提交
1426

1427 1428 1429
	if (!(ls->dentry_flags & IS_DIR))
		one_remote_ref(ls->dentry_name);
}
N
Nick Hengeveld 已提交
1430

1431 1432 1433
static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
{
	struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData;
N
Nick Hengeveld 已提交
1434

1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449
	if (tag_closed) {
		if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) {
			if (ls->dentry_flags & IS_DIR) {
				if (ls->flags & PROCESS_DIRS) {
					ls->userFunc(ls);
				}
				if (strcmp(ls->dentry_name, ls->path) &&
				    ls->flags & RECURSIVE) {
					remote_ls(ls->dentry_name,
						  ls->flags,
						  ls->userFunc,
						  ls->userData);
				}
			} else if (ls->flags & PROCESS_FILES) {
				ls->userFunc(ls);
N
Nick Hengeveld 已提交
1450
			}
1451
		} else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) {
1452 1453 1454 1455 1456 1457 1458 1459 1460
			char *path = ctx->cdata;
			if (*ctx->cdata == 'h') {
				path = strstr(path, "//");
				if (path) {
					path = strchr(path+2, '/');
				}
			}
			if (path) {
				path += remote->path_len;
1461
				ls->dentry_name = xstrdup(path);
1462
			}
1463 1464
		} else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
			ls->dentry_flags |= IS_DIR;
N
Nick Hengeveld 已提交
1465
		}
1466
	} else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {
J
Junio C Hamano 已提交
1467
		free(ls->dentry_name);
1468 1469
		ls->dentry_name = NULL;
		ls->dentry_flags = 0;
N
Nick Hengeveld 已提交
1470 1471 1472
	}
}

1473 1474 1475 1476 1477 1478
/*
 * NEEDSWORK: remote_ls() ignores info/refs on the remote side.  But it
 * should _only_ heed the information from that file, instead of trying to
 * determine the refs from the remote file system (badly: it does not even
 * know about packed-refs).
 */
1479 1480 1481
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData)
N
Nick Hengeveld 已提交
1482
{
1483
	char *url = xmalloc(strlen(remote->url) + strlen(path) + 1);
N
Nick Hengeveld 已提交
1484
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1485
	struct slot_results results;
M
Mike Hommey 已提交
1486 1487
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
N
Nick Hengeveld 已提交
1488 1489
	struct curl_slist *dav_headers = NULL;
	struct xml_ctx ctx;
1490 1491 1492
	struct remote_ls_ctx ls;

	ls.flags = flags;
1493
	ls.path = xstrdup(path);
1494 1495 1496 1497
	ls.dentry_name = NULL;
	ls.dentry_flags = 0;
	ls.userData = userData;
	ls.userFunc = userFunc;
N
Nick Hengeveld 已提交
1498 1499 1500

	sprintf(url, "%s%s", remote->url, path);

M
Mike Hommey 已提交
1501
	strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST);
N
Nick Hengeveld 已提交
1502 1503 1504 1505 1506

	dav_headers = curl_slist_append(dav_headers, "Depth: 1");
	dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1507
	slot->results = &results;
N
Nick Hengeveld 已提交
1508
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1509
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
N
Nick Hengeveld 已提交
1510 1511 1512 1513 1514 1515 1516 1517 1518 1519
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PROPFIND);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1520
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1521 1522
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1523 1524 1525
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
1526 1527
			ctx.userFunc = handle_remote_ls_ctx;
			ctx.userData = &ls;
N
Nick Hengeveld 已提交
1528 1529 1530 1531
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
1532 1533
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1534 1535 1536 1537 1538 1539 1540
			free(ctx.name);

			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
			}
M
Mike Hommey 已提交
1541
			XML_ParserFree(parser);
N
Nick Hengeveld 已提交
1542 1543
		}
	} else {
1544
		fprintf(stderr, "Unable to start PROPFIND request\n");
N
Nick Hengeveld 已提交
1545 1546
	}

1547
	free(ls.path);
N
Nick Hengeveld 已提交
1548
	free(url);
M
Mike Hommey 已提交
1549 1550
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1551 1552 1553
	curl_slist_free_all(dav_headers);
}

1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566
static void get_remote_object_list(unsigned char parent)
{
	char path[] = "objects/XX/";
	static const char hex[] = "0123456789abcdef";
	unsigned int val = parent;

	path[8] = hex[val >> 4];
	path[9] = hex[val & 0xf];
	remote_dir_exists[val] = 0;
	remote_ls(path, (PROCESS_FILES | PROCESS_DIRS),
		  process_ls_object, &val);
}

N
Nick Hengeveld 已提交
1567
static int locking_available(void)
1568 1569
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1570
	struct slot_results results;
M
Mike Hommey 已提交
1571 1572
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1573
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
1574 1575
	struct xml_ctx ctx;
	int lock_flags = 0;
1576

M
Mike Hommey 已提交
1577
	strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, remote->url);
1578 1579 1580

	dav_headers = curl_slist_append(dav_headers, "Depth: 0");
	dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml");
N
Nick Hengeveld 已提交
1581

1582
	slot = get_active_slot();
N
Nick Hengeveld 已提交
1583
	slot->results = &results;
1584
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1585
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1586 1587
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
1588
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1589 1590 1591 1592 1593 1594 1595
	curl_easy_setopt(slot->curl, CURLOPT_URL, remote->url);
	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PROPFIND);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1596
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1597 1598
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1599 1600 1601 1602 1603 1604 1605 1606
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
			ctx.userFunc = handle_lockprop_ctx;
			ctx.userData = &lock_flags;
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
M
Mike Hommey 已提交
1607 1608
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1609 1610 1611 1612 1613 1614 1615 1616
			free(ctx.name);

			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
				lock_flags = 0;
			}
M
Mike Hommey 已提交
1617
			XML_ParserFree(parser);
1618 1619 1620 1621 1622 1623 1624 1625
			if (!lock_flags)
				error("Error: no DAV locking support on %s",
				      remote->url);

		} else {
			error("Cannot access URL %s, return code %d",
			      remote->url, results.curl_result);
			lock_flags = 0;
1626 1627
		}
	} else {
1628
		error("Unable to start PROPFIND request on %s", remote->url);
1629 1630
	}

M
Mike Hommey 已提交
1631 1632
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1633 1634 1635
	curl_slist_free_all(dav_headers);

	return lock_flags;
1636 1637
}

P
Pierre Habouzit 已提交
1638
static struct object_list **add_one_object(struct object *obj, struct object_list **p)
1639 1640 1641 1642 1643 1644 1645 1646
{
	struct object_list *entry = xmalloc(sizeof(struct object_list));
	entry->item = obj;
	entry->next = *p;
	*p = entry;
	return &entry->next;
}

N
Nick Hengeveld 已提交
1647 1648 1649 1650
static struct object_list **process_blob(struct blob *blob,
					 struct object_list **p,
					 struct name_path *path,
					 const char *name)
1651
{
N
Nick Hengeveld 已提交
1652
	struct object *obj = &blob->object;
1653

N
Nick Hengeveld 已提交
1654 1655 1656 1657 1658 1659
	obj->flags |= LOCAL;

	if (obj->flags & (UNINTERESTING | SEEN))
		return p;

	obj->flags |= SEEN;
1660
	return add_one_object(obj, p);
N
Nick Hengeveld 已提交
1661 1662 1663 1664 1665 1666 1667 1668
}

static struct object_list **process_tree(struct tree *tree,
					 struct object_list **p,
					 struct name_path *path,
					 const char *name)
{
	struct object *obj = &tree->object;
1669
	struct tree_desc desc;
1670
	struct name_entry entry;
N
Nick Hengeveld 已提交
1671 1672 1673 1674 1675 1676 1677 1678 1679 1680
	struct name_path me;

	obj->flags |= LOCAL;

	if (obj->flags & (UNINTERESTING | SEEN))
		return p;
	if (parse_tree(tree) < 0)
		die("bad tree object %s", sha1_to_hex(obj->sha1));

	obj->flags |= SEEN;
1681
	name = xstrdup(name);
1682
	p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1683 1684 1685
	me.up = path;
	me.elem = name;
	me.elem_len = strlen(name);
1686

1687
	init_tree_desc(&desc, tree->buffer, tree->size);
1688

1689 1690 1691
	while (tree_entry(&desc, &entry))
		switch (object_type(entry.mode)) {
		case OBJ_TREE:
1692
			p = process_tree(lookup_tree(entry.sha1), p, &me, name);
1693 1694
			break;
		case OBJ_BLOB:
1695
			p = process_blob(lookup_blob(entry.sha1), p, &me, name);
1696 1697 1698 1699 1700 1701
			break;
		default:
			/* Subproject commit - not in this repository */
			break;
		}

1702 1703
	free(tree->buffer);
	tree->buffer = NULL;
N
Nick Hengeveld 已提交
1704
	return p;
1705 1706
}

N
Nick Hengeveld 已提交
1707
static int get_delta(struct rev_info *revs, struct remote_lock *lock)
1708
{
1709
	int i;
1710
	struct commit *commit;
1711
	struct object_list **p = &objects;
N
Nick Hengeveld 已提交
1712
	int count = 0;
1713

N
Nick Hengeveld 已提交
1714 1715 1716 1717
	while ((commit = get_revision(revs)) != NULL) {
		p = process_tree(commit->tree, p, NULL, "");
		commit->object.flags |= LOCAL;
		if (!(commit->object.flags & UNINTERESTING))
N
Nick Hengeveld 已提交
1718
			count += add_send_request(&commit->object, lock);
N
Nick Hengeveld 已提交
1719
	}
1720

1721 1722 1723 1724
	for (i = 0; i < revs->pending.nr; i++) {
		struct object_array_entry *entry = revs->pending.objects + i;
		struct object *obj = entry->item;
		const char *name = entry->name;
1725

N
Nick Hengeveld 已提交
1726 1727
		if (obj->flags & (UNINTERESTING | SEEN))
			continue;
1728
		if (obj->type == OBJ_TAG) {
N
Nick Hengeveld 已提交
1729
			obj->flags |= SEEN;
1730
			p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1731
			continue;
1732
		}
1733
		if (obj->type == OBJ_TREE) {
N
Nick Hengeveld 已提交
1734 1735
			p = process_tree((struct tree *)obj, p, NULL, name);
			continue;
1736
		}
1737
		if (obj->type == OBJ_BLOB) {
N
Nick Hengeveld 已提交
1738 1739
			p = process_blob((struct blob *)obj, p, NULL, name);
			continue;
1740
		}
N
Nick Hengeveld 已提交
1741 1742 1743 1744 1745
		die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
	}

	while (objects) {
		if (!(objects->item->flags & UNINTERESTING))
N
Nick Hengeveld 已提交
1746
			count += add_send_request(objects->item, lock);
N
Nick Hengeveld 已提交
1747
		objects = objects->next;
1748
	}
N
Nick Hengeveld 已提交
1749 1750

	return count;
1751 1752
}

N
Nick Hengeveld 已提交
1753
static int update_remote(unsigned char *sha1, struct remote_lock *lock)
1754 1755
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1756
	struct slot_results results;
M
Mike Hommey 已提交
1757
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1758
	struct curl_slist *dav_headers;
1759

1760
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1761

M
Mike Hommey 已提交
1762
	strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
1763 1764

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1765
	slot->results = &results;
1766
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1767
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1768 1769 1770 1771 1772 1773
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
	curl_easy_setopt(slot->curl, CURLOPT_PUT, 1);
1774
	curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
1775 1776 1777

	if (start_active_slot(slot)) {
		run_active_slot(slot);
M
Mike Hommey 已提交
1778
		strbuf_release(&out_buffer.buf);
N
Nick Hengeveld 已提交
1779
		if (results.curl_result != CURLE_OK) {
1780 1781
			fprintf(stderr,
				"PUT error: curl result=%d, HTTP code=%ld\n",
N
Nick Hengeveld 已提交
1782
				results.curl_result, results.http_code);
1783 1784 1785 1786
			/* We should attempt recovery? */
			return 0;
		}
	} else {
M
Mike Hommey 已提交
1787
		strbuf_release(&out_buffer.buf);
1788 1789 1790 1791 1792 1793 1794
		fprintf(stderr, "Unable to start PUT request\n");
		return 0;
	}

	return 1;
}

N
Nick Hengeveld 已提交
1795 1796 1797
static struct ref *local_refs, **local_tail;
static struct ref *remote_refs, **remote_tail;

1798
static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
N
Nick Hengeveld 已提交
1799 1800 1801 1802
{
	struct ref *ref;
	int len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
1803
	hashcpy(ref->new_sha1, sha1);
N
Nick Hengeveld 已提交
1804 1805 1806 1807 1808 1809 1810 1811 1812
	memcpy(ref->name, refname, len);
	*local_tail = ref;
	local_tail = &ref->next;
	return 0;
}

static void one_remote_ref(char *refname)
{
	struct ref *ref;
1813
	struct object *obj;
N
Nick Hengeveld 已提交
1814

1815
	ref = alloc_ref(refname);
1816 1817

	if (http_fetch_ref(remote->url, ref) != 0) {
N
Nick Hengeveld 已提交
1818 1819 1820
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
			refname, remote->url);
1821
		free(ref);
N
Nick Hengeveld 已提交
1822 1823 1824
		return;
	}

1825 1826 1827 1828
	/*
	 * Fetch a copy of the object if it doesn't exist locally - it
	 * may be required for updating server info later.
	 */
1829 1830
	if (remote->can_update_info_refs && !has_sha1_file(ref->old_sha1)) {
		obj = lookup_unknown_object(ref->old_sha1);
1831 1832
		if (obj) {
			fprintf(stderr,	"  fetch %s for %s\n",
1833
				sha1_to_hex(ref->old_sha1), refname);
1834 1835 1836 1837
			add_fetch_request(obj);
		}
	}

N
Nick Hengeveld 已提交
1838 1839 1840 1841 1842 1843 1844
	*remote_tail = ref;
	remote_tail = &ref->next;
}

static void get_local_heads(void)
{
	local_tail = &local_refs;
1845
	for_each_ref(one_local_ref, NULL);
N
Nick Hengeveld 已提交
1846 1847 1848 1849 1850
}

static void get_dav_remote_heads(void)
{
	remote_tail = &remote_refs;
1851
	remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL);
N
Nick Hengeveld 已提交
1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886
}

static int is_zero_sha1(const unsigned char *sha1)
{
	int i;

	for (i = 0; i < 20; i++) {
		if (*sha1++)
			return 0;
	}
	return 1;
}

static void unmark_and_free(struct commit_list *list, unsigned int mark)
{
	while (list) {
		struct commit_list *temp = list;
		temp->item->object.flags &= ~mark;
		list = temp->next;
		free(temp);
	}
}

static int ref_newer(const unsigned char *new_sha1,
		     const unsigned char *old_sha1)
{
	struct object *o;
	struct commit *old, *new;
	struct commit_list *list, *used;
	int found = 0;

	/* Both new and old must be commit-ish and new is descendant of
	 * old.  Otherwise we require --force.
	 */
	o = deref_tag(parse_object(old_sha1), NULL, 0);
1887
	if (!o || o->type != OBJ_COMMIT)
N
Nick Hengeveld 已提交
1888 1889 1890 1891
		return 0;
	old = (struct commit *) o;

	o = deref_tag(parse_object(new_sha1), NULL, 0);
1892
	if (!o || o->type != OBJ_COMMIT)
N
Nick Hengeveld 已提交
1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913
		return 0;
	new = (struct commit *) o;

	if (parse_commit(new) < 0)
		return 0;

	used = list = NULL;
	commit_list_insert(new, &list);
	while (list) {
		new = pop_most_recent_commit(&list, TMP_MARK);
		commit_list_insert(new, &used);
		if (new == old) {
			found = 1;
			break;
		}
	}
	unmark_and_free(list, TMP_MARK);
	unmark_and_free(used, TMP_MARK);
	return found;
}

1914 1915
static void add_remote_info_ref(struct remote_ls_ctx *ls)
{
M
Mike Hommey 已提交
1916
	struct strbuf *buf = (struct strbuf *)ls->userData;
1917 1918 1919
	struct object *o;
	int len;
	char *ref_info;
1920 1921
	struct ref *ref;

1922
	ref = alloc_ref(ls->dentry_name);
1923

1924
	if (http_fetch_ref(remote->url, ref) != 0) {
1925 1926 1927 1928
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
			ls->dentry_name, remote->url);
		aborted = 1;
1929
		free(ref);
1930 1931 1932
		return;
	}

1933
	o = parse_object(ref->old_sha1);
1934 1935 1936
	if (!o) {
		fprintf(stderr,
			"Unable to parse object %s for remote ref %s\n",
1937
			sha1_to_hex(ref->old_sha1), ls->dentry_name);
1938
		aborted = 1;
1939
		free(ref);
1940 1941 1942 1943 1944 1945
		return;
	}

	len = strlen(ls->dentry_name) + 42;
	ref_info = xcalloc(len + 1, 1);
	sprintf(ref_info, "%s	%s\n",
1946
		sha1_to_hex(ref->old_sha1), ls->dentry_name);
1947 1948 1949
	fwrite_buffer(ref_info, 1, len, buf);
	free(ref_info);

1950
	if (o->type == OBJ_TAG) {
1951 1952 1953 1954 1955 1956 1957 1958 1959 1960
		o = deref_tag(o, ls->dentry_name, 0);
		if (o) {
			len = strlen(ls->dentry_name) + 45;
			ref_info = xcalloc(len + 1, 1);
			sprintf(ref_info, "%s	%s^{}\n",
				sha1_to_hex(o->sha1), ls->dentry_name);
			fwrite_buffer(ref_info, 1, len, buf);
			free(ref_info);
		}
	}
1961
	free(ref);
1962 1963 1964 1965
}

static void update_remote_info_refs(struct remote_lock *lock)
{
M
Mike Hommey 已提交
1966
	struct buffer buffer = { STRBUF_INIT, 0 };
1967 1968
	struct active_request_slot *slot;
	struct slot_results results;
1969
	struct curl_slist *dav_headers;
1970 1971

	remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
M
Mike Hommey 已提交
1972
		  add_remote_info_ref, &buffer.buf);
1973
	if (!aborted) {
1974
		dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1975 1976 1977 1978

		slot = get_active_slot();
		slot->results = &results;
		curl_easy_setopt(slot->curl, CURLOPT_INFILE, &buffer);
M
Mike Hommey 已提交
1979
		curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, buffer.buf.len);
1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996
		curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
		curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
		curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT);
		curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
		curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1);
		curl_easy_setopt(slot->curl, CURLOPT_PUT, 1);
		curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);

		if (start_active_slot(slot)) {
			run_active_slot(slot);
			if (results.curl_result != CURLE_OK) {
				fprintf(stderr,
					"PUT error: curl result=%d, HTTP code=%ld\n",
					results.curl_result, results.http_code);
			}
		}
	}
M
Mike Hommey 已提交
1997
	strbuf_release(&buffer.buf);
1998 1999 2000 2001 2002 2003 2004
}

static int remote_exists(const char *path)
{
	char *url = xmalloc(strlen(remote->url) + strlen(path) + 1);
	struct active_request_slot *slot;
	struct slot_results results;
2005
	int ret = -1;
2006 2007 2008

	sprintf(url, "%s%s", remote->url, path);

M
Mike Hommey 已提交
2009
	slot = get_active_slot();
2010
	slot->results = &results;
M
Mike Hommey 已提交
2011 2012
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
2013

M
Mike Hommey 已提交
2014
	if (start_active_slot(slot)) {
2015 2016
		run_active_slot(slot);
		if (results.http_code == 404)
2017
			ret = 0;
2018
		else if (results.curl_result == CURLE_OK)
2019
			ret = 1;
2020 2021 2022 2023 2024 2025
		else
			fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code);
	} else {
		fprintf(stderr, "Unable to start HEAD request\n");
	}

2026 2027
	free(url);
	return ret;
2028 2029
}

T
Timo Hirvonen 已提交
2030
static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
2031 2032
{
	char *url;
M
Mike Hommey 已提交
2033
	struct strbuf buffer = STRBUF_INIT;
2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056
	struct active_request_slot *slot;
	struct slot_results results;

	url = xmalloc(strlen(remote->url) + strlen(path) + 1);
	sprintf(url, "%s%s", remote->url, path);

	slot = get_active_slot();
	slot->results = &results;
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	if (start_active_slot(slot)) {
		run_active_slot(slot);
		if (results.curl_result != CURLE_OK) {
			die("Couldn't get %s for remote symref\n%s",
			    url, curl_errorstr);
		}
	} else {
		die("Unable to start remote symref request");
	}
	free(url);

2057
	free(*symref);
2058
	*symref = NULL;
2059
	hashclr(sha1);
2060

M
Mike Hommey 已提交
2061
	if (buffer.len == 0)
2062 2063 2064
		return;

	/* If it's a symref, set the refname; otherwise try for a sha1 */
M
Mike Hommey 已提交
2065 2066
	if (!prefixcmp((char *)buffer.buf, "ref: ")) {
		*symref = xmemdupz((char *)buffer.buf + 5, buffer.len - 6);
2067
	} else {
M
Mike Hommey 已提交
2068
		get_sha1_hex(buffer.buf, sha1);
2069 2070
	}

M
Mike Hommey 已提交
2071
	strbuf_release(&buffer);
2072 2073 2074 2075
}

static int verify_merge_base(unsigned char *head_sha1, unsigned char *branch_sha1)
{
2076 2077 2078
	struct commit *head = lookup_commit(head_sha1);
	struct commit *branch = lookup_commit(branch_sha1);
	struct commit_list *merge_bases = get_merge_bases(head, branch, 1);
2079

D
David Rientjes 已提交
2080
	return (merge_bases && !merge_bases->next && merge_bases->item == branch);
2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148
}

static int delete_remote_branch(char *pattern, int force)
{
	struct ref *refs = remote_refs;
	struct ref *remote_ref = NULL;
	unsigned char head_sha1[20];
	char *symref = NULL;
	int match;
	int patlen = strlen(pattern);
	int i;
	struct active_request_slot *slot;
	struct slot_results results;
	char *url;

	/* Find the remote branch(es) matching the specified branch name */
	for (match = 0; refs; refs = refs->next) {
		char *name = refs->name;
		int namelen = strlen(name);
		if (namelen < patlen ||
		    memcmp(name + namelen - patlen, pattern, patlen))
			continue;
		if (namelen != patlen && name[namelen - patlen - 1] != '/')
			continue;
		match++;
		remote_ref = refs;
	}
	if (match == 0)
		return error("No remote branch matches %s", pattern);
	if (match != 1)
		return error("More than one remote branch matches %s",
			     pattern);

	/*
	 * Remote HEAD must be a symref (not exactly foolproof; a remote
	 * symlink to a symref will look like a symref)
	 */
	fetch_symref("HEAD", &symref, head_sha1);
	if (!symref)
		return error("Remote HEAD is not a symref");

	/* Remote branch must not be the remote HEAD */
	for (i=0; symref && i<MAXDEPTH; i++) {
		if (!strcmp(remote_ref->name, symref))
			return error("Remote branch %s is the current HEAD",
				     remote_ref->name);
		fetch_symref(symref, &symref, head_sha1);
	}

	/* Run extra sanity checks if delete is not forced */
	if (!force) {
		/* Remote HEAD must resolve to a known object */
		if (symref)
			return error("Remote HEAD symrefs too deep");
		if (is_zero_sha1(head_sha1))
			return error("Unable to resolve remote HEAD");
		if (!has_sha1_file(head_sha1))
			return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1));

		/* Remote branch must resolve to a known object */
		if (is_zero_sha1(remote_ref->old_sha1))
			return error("Unable to resolve remote branch %s",
				     remote_ref->name);
		if (!has_sha1_file(remote_ref->old_sha1))
			return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, sha1_to_hex(remote_ref->old_sha1));

		/* Remote branch must be an ancestor of remote HEAD */
		if (!verify_merge_base(head_sha1, remote_ref->old_sha1)) {
2149 2150 2151 2152 2153
			return error("The branch '%s' is not an ancestor "
				     "of your current HEAD.\n"
				     "If you are sure you want to delete it,"
				     " run:\n\t'git http-push -D %s %s'",
				     remote_ref->name, remote->url, pattern);
2154 2155 2156 2157 2158
		}
	}

	/* Send delete request */
	fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name);
2159 2160
	if (dry_run)
		return 0;
2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182
	url = xmalloc(strlen(remote->url) + strlen(remote_ref->name) + 1);
	sprintf(url, "%s%s", remote->url, remote_ref->name);
	slot = get_active_slot();
	slot->results = &results;
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_DELETE);
	if (start_active_slot(slot)) {
		run_active_slot(slot);
		free(url);
		if (results.curl_result != CURLE_OK)
			return error("DELETE request failed (%d/%ld)\n",
				     results.curl_result, results.http_code);
	} else {
		free(url);
		return error("Unable to start DELETE request");
	}

	return 0;
}

2183 2184 2185 2186 2187 2188
int main(int argc, char **argv)
{
	struct transfer_request *request;
	struct transfer_request *next_request;
	int nr_refspec = 0;
	char **refspec = NULL;
2189
	struct remote_lock *ref_lock = NULL;
2190
	struct remote_lock *info_ref_lock = NULL;
N
Nick Hengeveld 已提交
2191
	struct rev_info revs;
2192 2193
	int delete_branch = 0;
	int force_delete = 0;
N
Nick Hengeveld 已提交
2194
	int objects_to_send;
2195 2196
	int rc = 0;
	int i;
2197 2198
	int new_refs;
	struct ref *ref;
2199
	char *rewritten_url = NULL;
2200

2201 2202
	git_extract_argv0_path(argv[0]);

2203
	setup_git_directory();
2204

2205
	remote = xcalloc(sizeof(*remote), 1);
2206 2207 2208 2209 2210 2211

	argv++;
	for (i = 1; i < argc; i++, argv++) {
		char *arg = *argv;

		if (*arg == '-') {
N
Nick Hengeveld 已提交
2212
			if (!strcmp(arg, "--all")) {
A
Andy Whitcroft 已提交
2213
				push_all = MATCH_REFS_ALL;
2214 2215 2216 2217 2218 2219
				continue;
			}
			if (!strcmp(arg, "--force")) {
				force_all = 1;
				continue;
			}
2220 2221 2222 2223
			if (!strcmp(arg, "--dry-run")) {
				dry_run = 1;
				continue;
			}
2224 2225 2226 2227
			if (!strcmp(arg, "--verbose")) {
				push_verbosely = 1;
				continue;
			}
2228 2229 2230 2231 2232 2233 2234 2235 2236
			if (!strcmp(arg, "-d")) {
				delete_branch = 1;
				continue;
			}
			if (!strcmp(arg, "-D")) {
				delete_branch = 1;
				force_delete = 1;
				continue;
			}
2237 2238
		}
		if (!remote->url) {
N
Nick Hengeveld 已提交
2239
			char *path = strstr(arg, "//");
2240
			remote->url = arg;
2241
			remote->path_len = strlen(arg);
N
Nick Hengeveld 已提交
2242
			if (path) {
2243 2244 2245
				remote->path = strchr(path+2, '/');
				if (remote->path)
					remote->path_len = strlen(remote->path);
N
Nick Hengeveld 已提交
2246
			}
2247 2248 2249 2250 2251 2252 2253
			continue;
		}
		refspec = argv;
		nr_refspec = argc - i;
		break;
	}

2254 2255 2256 2257
#ifndef USE_CURL_MULTI
	die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
#endif

N
Nick Hengeveld 已提交
2258 2259 2260
	if (!remote->url)
		usage(http_push_usage);

2261 2262 2263
	if (delete_branch && nr_refspec != 1)
		die("You must specify only one branch name when deleting a remote branch");

N
Nick Hengeveld 已提交
2264
	memset(remote_dir_exists, -1, 256);
2265

2266
	http_init(NULL);
2267 2268 2269

	no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");

2270
	if (remote->url && remote->url[strlen(remote->url)-1] != '/') {
2271
		rewritten_url = xmalloc(strlen(remote->url)+2);
2272 2273
		strcpy(rewritten_url, remote->url);
		strcat(rewritten_url, "/");
2274 2275
		remote->path = rewritten_url + (remote->path - remote->url);
		remote->path_len++;
2276 2277 2278
		remote->url = rewritten_url;
	}

2279
	/* Verify DAV compliance/lock support */
N
Nick Hengeveld 已提交
2280
	if (!locking_available()) {
2281 2282 2283 2284
		rc = 1;
		goto cleanup;
	}

2285
	sigchain_push_common(remove_locks_on_signal);
2286

2287 2288 2289 2290 2291 2292 2293 2294
	/* Check whether the remote has server info files */
	remote->can_update_info_refs = 0;
	remote->has_info_refs = remote_exists("info/refs");
	remote->has_info_packs = remote_exists("objects/info/packs");
	if (remote->has_info_refs) {
		info_ref_lock = lock_remote("info/refs", LOCK_TIME);
		if (info_ref_lock)
			remote->can_update_info_refs = 1;
2295 2296 2297 2298 2299
		else {
			fprintf(stderr, "Error: cannot lock existing info/refs\n");
			rc = 1;
			goto cleanup;
		}
2300 2301 2302 2303
	}
	if (remote->has_info_packs)
		fetch_indices();

N
Nick Hengeveld 已提交
2304 2305 2306 2307 2308
	/* Get a list of all local and remote heads to validate refspecs */
	get_local_heads();
	fprintf(stderr, "Fetching remote heads...\n");
	get_dav_remote_heads();

2309 2310 2311 2312 2313 2314 2315 2316
	/* Remove a remote branch if -d or -D was specified */
	if (delete_branch) {
		if (delete_remote_branch(refspec[0], force_delete) == -1)
			fprintf(stderr, "Unable to delete remote branch %s\n",
				refspec[0]);
		goto cleanup;
	}

N
Nick Hengeveld 已提交
2317 2318 2319 2320
	/* match them up */
	if (!remote_tail)
		remote_tail = &remote_refs;
	if (match_refs(local_refs, remote_refs, &remote_tail,
2321 2322 2323 2324
		       nr_refspec, (const char **) refspec, push_all)) {
		rc = -1;
		goto cleanup;
	}
N
Nick Hengeveld 已提交
2325 2326
	if (!remote_refs) {
		fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
2327 2328
		rc = 0;
		goto cleanup;
N
Nick Hengeveld 已提交
2329 2330
	}

2331
	new_refs = 0;
N
Nick Hengeveld 已提交
2332 2333
	for (ref = remote_refs; ref; ref = ref->next) {
		char old_hex[60], *new_hex;
2334 2335 2336 2337
		const char *commit_argv[4];
		int commit_argc;
		char *new_sha1_hex, *old_sha1_hex;

N
Nick Hengeveld 已提交
2338 2339
		if (!ref->peer_ref)
			continue;
2340 2341 2342 2343 2344 2345 2346 2347 2348 2349

		if (is_zero_sha1(ref->peer_ref->new_sha1)) {
			if (delete_remote_branch(ref->name, 1) == -1) {
				error("Could not remove %s", ref->name);
				rc = -4;
			}
			new_refs++;
			continue;
		}

2350
		if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
N
Nick Hengeveld 已提交
2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361
			if (push_verbosely || 1)
				fprintf(stderr, "'%s': up-to-date\n", ref->name);
			continue;
		}

		if (!force_all &&
		    !is_zero_sha1(ref->old_sha1) &&
		    !ref->force) {
			if (!has_sha1_file(ref->old_sha1) ||
			    !ref_newer(ref->peer_ref->new_sha1,
				       ref->old_sha1)) {
2362 2363
				/*
				 * We do not have the remote ref, or
N
Nick Hengeveld 已提交
2364 2365 2366 2367 2368 2369
				 * we know that the remote ref is not
				 * an ancestor of what we are trying to
				 * push.  Either way this can be losing
				 * commits at the remote end and likely
				 * we were not up to date to begin with.
				 */
2370 2371 2372
				error("remote '%s' is not an ancestor of\n"
				      "local '%s'.\n"
				      "Maybe you are not up-to-date and "
N
Nick Hengeveld 已提交
2373 2374 2375
				      "need to pull first?",
				      ref->name,
				      ref->peer_ref->name);
N
Nick Hengeveld 已提交
2376
				rc = -2;
N
Nick Hengeveld 已提交
2377 2378
				continue;
			}
2379
		}
2380
		hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
N
Nick Hengeveld 已提交
2381 2382 2383 2384 2385 2386 2387 2388
		new_refs++;
		strcpy(old_hex, sha1_to_hex(ref->old_sha1));
		new_hex = sha1_to_hex(ref->new_sha1);

		fprintf(stderr, "updating '%s'", ref->name);
		if (strcmp(ref->name, ref->peer_ref->name))
			fprintf(stderr, " using '%s'", ref->peer_ref->name);
		fprintf(stderr, "\n  from %s\n  to   %s\n", old_hex, new_hex);
2389 2390
		if (dry_run)
			continue;
2391 2392

		/* Lock remote branch ref */
N
Nick Hengeveld 已提交
2393 2394
		ref_lock = lock_remote(ref->name, LOCK_TIME);
		if (ref_lock == NULL) {
2395
			fprintf(stderr, "Unable to lock remote branch %s\n",
N
Nick Hengeveld 已提交
2396
				ref->name);
2397 2398 2399 2400
			rc = 1;
			continue;
		}

N
Nick Hengeveld 已提交
2401
		/* Set up revision info for this refspec */
2402
		commit_argc = 3;
2403
		new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1));
2404
		old_sha1_hex = NULL;
N
Nick Hengeveld 已提交
2405 2406
		commit_argv[1] = "--objects";
		commit_argv[2] = new_sha1_hex;
N
Nick Hengeveld 已提交
2407 2408 2409 2410
		if (!push_all && !is_zero_sha1(ref->old_sha1)) {
			old_sha1_hex = xmalloc(42);
			sprintf(old_sha1_hex, "^%s",
				sha1_to_hex(ref->old_sha1));
N
Nick Hengeveld 已提交
2411
			commit_argv[3] = old_sha1_hex;
N
Nick Hengeveld 已提交
2412
			commit_argc++;
2413
		}
2414
		init_revisions(&revs, setup_git_directory());
N
Nick Hengeveld 已提交
2415
		setup_revisions(commit_argc, commit_argv, &revs, NULL);
2416
		revs.edge_hint = 0; /* just in case */
N
Nick Hengeveld 已提交
2417 2418 2419 2420
		free(new_sha1_hex);
		if (old_sha1_hex) {
			free(old_sha1_hex);
			commit_argv[1] = NULL;
2421 2422
		}

N
Nick Hengeveld 已提交
2423
		/* Generate a list of objects that need to be pushed */
2424
		pushing = 0;
2425 2426
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
2427
		mark_edges_uninteresting(revs.commits, &revs, NULL);
N
Nick Hengeveld 已提交
2428
		objects_to_send = get_delta(&revs, ref_lock);
2429
		finish_all_active_slots();
2430 2431 2432 2433

		/* Push missing objects to remote, this would be a
		   convenient time to pack them first if appropriate. */
		pushing = 1;
N
Nick Hengeveld 已提交
2434 2435 2436
		if (objects_to_send)
			fprintf(stderr, "    sending %d objects\n",
				objects_to_send);
N
Nick Hengeveld 已提交
2437
#ifdef USE_CURL_MULTI
2438
		fill_active_slots();
2439
		add_fill_function(NULL, fill_active_slot);
N
Nick Hengeveld 已提交
2440
#endif
2441 2442 2443 2444 2445 2446
		do {
			finish_all_active_slots();
#ifdef USE_CURL_MULTI
			fill_active_slots();
#endif
		} while (request_queue_head && !aborted);
2447 2448

		/* Update the remote branch if all went well */
2449
		if (aborted || !update_remote(ref->new_sha1, ref_lock))
N
Nick Hengeveld 已提交
2450
			rc = 1;
2451

N
Nick Hengeveld 已提交
2452 2453 2454
		if (!rc)
			fprintf(stderr, "    done\n");
		unlock_remote(ref_lock);
2455
		check_locks();
2456 2457
	}

2458 2459 2460 2461
	/* Update remote server info if appropriate */
	if (remote->has_info_refs && new_refs) {
		if (info_ref_lock && remote->can_update_info_refs) {
			fprintf(stderr, "Updating remote server info\n");
2462 2463
			if (!dry_run)
				update_remote_info_refs(info_ref_lock);
2464 2465 2466 2467 2468
		} else {
			fprintf(stderr, "Unable to update server info\n");
		}
	}

2469
 cleanup:
2470
	free(rewritten_url);
2471 2472
	if (info_ref_lock)
		unlock_remote(info_ref_lock);
2473 2474 2475 2476
	free(remote);

	curl_slist_free_all(no_pragma_header);

2477
	http_cleanup();
2478 2479 2480 2481 2482 2483 2484 2485 2486 2487

	request = request_queue_head;
	while (request != NULL) {
		next_request = request->next;
		release_request(request);
		request = next_request;
	}

	return rc;
}