http-push.c 64.5 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

13
#include <expat.h>
14 15

static const char http_push_usage[] =
16
"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
17

18 19 20 21 22 23 24 25 26
#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

27
#define PREV_BUF_SIZE 4096
28 29
#define RANGE_HEADER_SIZE 30

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

/* 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 已提交
51 52 53
#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 已提交
54 55

/* DAV request body templates */
N
Nick Hengeveld 已提交
56 57
#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>"
58 59
#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>"

60 61 62
#define LOCK_TIME 600
#define LOCK_REFRESH 30

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

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

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

73 74
static int pushing;
static int aborted;
75
static signed char remote_dir_exists[256];
76 77 78

static struct curl_slist *no_pragma_header;

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

84
static struct object_list *objects;
N
Nick Hengeveld 已提交
85

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

97
static struct repo *remote;
98 99

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

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

137
static struct transfer_request *request_queue_head;
138

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

N
Nick Hengeveld 已提交
148
struct remote_lock
N
Nick Hengeveld 已提交
149
{
150
	char *url;
N
Nick Hengeveld 已提交
151
	char *owner;
152
	char *token;
N
Nick Hengeveld 已提交
153 154
	time_t start_time;
	long timeout;
155
	int refreshing;
N
Nick Hengeveld 已提交
156 157 158
	struct remote_lock *next;
};

159 160 161 162 163 164 165 166 167
/* 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 已提交
168
{
169 170 171 172 173 174 175
	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 已提交
176 177
};

178
static void finish_request(struct transfer_request *request);
179
static void release_request(struct transfer_request *request);
180

181
static void process_response(void *callback_data)
182
{
183 184
	struct transfer_request *request =
		(struct transfer_request *)callback_data;
185

186
	finish_request(request);
187 188
}

J
Junio C Hamano 已提交
189
#ifdef USE_CURL_MULTI
190 191 192 193 194 195 196 197
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 {
198
		ssize_t retval = xwrite(request->local_fileno,
199
				       (char *) ptr + posn, size - posn);
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 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
		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);
		request->zret = inflate(&request->stream, Z_SYNC_FLUSH);
		SHA1_Update(&request->c, expn,
			    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;
	char *posn;
	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));

	inflateInit(&request->stream);

	SHA1_Init(&request->c);

	url = xmalloc(strlen(remote->url) + 50);
	request->url = xmalloc(strlen(remote->url) + 50);
	strcpy(url, remote->url);
	posn = url + strlen(remote->url);
	strcpy(posn, "objects/");
	posn += 8;
	memcpy(posn, hex, 2);
	posn += 2;
	*(posn++) = '/';
	strcpy(posn, hex + 2);
	strcpy(request->url, url);

	/* If a previous temp file is present, process what was already
	   fetched. */
	prevlocal = open(prevfile, O_RDONLY);
	if (prevlocal != -1) {
		do {
291
			prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);
292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314
			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));
		inflateInit(&request->stream);
		SHA1_Init(&request->c);
		if (prev_posn>0) {
			prev_posn = 0;
315
			lseek(request->local_fileno, 0, SEEK_SET);
316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352
			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 已提交
353 354 355 356 357 358 359 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
static void start_mkcol(struct transfer_request *request)
{
	char *hex = sha1_to_hex(request->obj->sha1);
	struct active_request_slot *slot;
	char *posn;

	request->url = xmalloc(strlen(remote->url) + 13);
	strcpy(request->url, remote->url);
	posn = request->url + strlen(remote->url);
	strcpy(posn, "objects/");
	posn += 8;
	memcpy(posn, hex, 2);
	posn += 2;
	strcpy(posn, "/");

	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

388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434
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",
435
			request->tmpfile);
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 471 472 473 474 475 476
		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);
	}
}

477 478
static void start_put(struct transfer_request *request)
{
N
Nick Hengeveld 已提交
479
	char *hex = sha1_to_hex(request->obj->sha1);
480 481
	struct active_request_slot *slot;
	char *posn;
482
	enum object_type type;
483 484 485 486 487 488 489
	char hdr[50];
	void *unpacked;
	unsigned long len;
	int hdrlen;
	ssize_t size;
	z_stream stream;

490 491
	unpacked = read_sha1_file(request->obj->sha1, &type, &len);
	hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
492 493 494

	/* Set it up */
	memset(&stream, 0, sizeof(stream));
495
	deflateInit(&stream, zlib_compression_level);
496
	size = deflateBound(&stream, len + hdrlen);
M
Mike Hommey 已提交
497 498
	strbuf_init(&request->buffer.buf, size);
	request->buffer.posn = 0;
499 500

	/* Compress it */
M
Mike Hommey 已提交
501
	stream.next_out = (unsigned char *)request->buffer.buf.buf;
502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517
	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 已提交
518
	request->buffer.buf.len = stream.total_out;
519

J
Junio C Hamano 已提交
520
	request->url = xmalloc(strlen(remote->url) +
N
Nick Hengeveld 已提交
521
			       strlen(request->lock->token) + 51);
522 523 524 525 526 527 528 529 530 531 532
	strcpy(request->url, remote->url);
	posn = request->url + strlen(remote->url);
	strcpy(posn, "objects/");
	posn += 8;
	memcpy(posn, hex, 2);
	posn += 2;
	*(posn++) = '/';
	strcpy(posn, hex + 2);
	request->dest = xmalloc(strlen(request->url) + 14);
	sprintf(request->dest, "Destination: %s", request->url);
	posn += 38;
533
	*(posn++) = '_';
N
Nick Hengeveld 已提交
534
	strcpy(posn, request->lock->token);
535 536

	slot = get_active_slot();
537 538
	slot->callback_func = process_response;
	slot->callback_data = request;
539
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &request->buffer);
M
Mike Hommey 已提交
540
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, request->buffer.buf.len);
541 542 543 544 545 546 547 548 549 550 551 552 553 554
	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 已提交
555
		request->url = NULL;
556 557 558 559 560 561 562 563 564
	}
}

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

	slot = get_active_slot();
565 566
	slot->callback_func = process_response;
	slot->callback_data = request;
567 568 569 570 571 572 573 574 575 576 577 578 579 580
	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 已提交
581
		request->url = NULL;
582 583 584
	}
}

585
static int refresh_lock(struct remote_lock *lock)
586 587
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
588
	struct slot_results results;
589 590 591
	char *if_header;
	char timeout_header[25];
	struct curl_slist *dav_headers = NULL;
592
	int rc = 0;
593

594
	lock->refreshing = 1;
595

596 597 598 599 600
	if_header = xmalloc(strlen(lock->token) + 25);
	sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token);
	sprintf(timeout_header, "Timeout: Second-%ld", lock->timeout);
	dav_headers = curl_slist_append(dav_headers, if_header);
	dav_headers = curl_slist_append(dav_headers, timeout_header);
601

602 603 604 605 606 607 608
	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);
609

610 611 612 613 614 615 616 617 618 619
	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 已提交
620

621 622 623
	lock->refreshing = 0;
	curl_slist_free_all(dav_headers);
	free(if_header);
N
Nick Hengeveld 已提交
624

625 626 627
	return rc;
}

628
static void check_locks(void)
629 630 631 632 633 634 635 636 637 638 639 640 641 642 643
{
	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 已提交
644
			}
645
		}
646
		lock = lock->next;
647
	}
N
Nick Hengeveld 已提交
648
}
649

N
Nick Hengeveld 已提交
650 651 652 653 654 655 656 657 658 659 660 661 662
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;
	}

663 664 665 666
	if (request->local_fileno != -1)
		close(request->local_fileno);
	if (request->local_stream)
		fclose(request->local_stream);
667
	free(request->url);
N
Nick Hengeveld 已提交
668
	free(request);
669 670
}

671 672
static void finish_request(struct transfer_request *request)
{
673 674 675 676 677
	struct stat st;
	struct packed_git *target;
	struct packed_git **lst;

	request->curl_result = request->slot->curl_result;
678 679
	request->http_code = request->slot->http_code;
	request->slot = NULL;
680

N
Nick Hengeveld 已提交
681
	/* Keep locks active */
682
	check_locks();
683

684 685
	if (request->headers != NULL)
		curl_slist_free_all(request->headers);
N
Nick Hengeveld 已提交
686 687 688 689 690

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

N
Nick Hengeveld 已提交
693
	if (request->state == RUN_MKCOL) {
694 695
		if (request->curl_result == CURLE_OK ||
		    request->http_code == 405) {
N
Nick Hengeveld 已提交
696
			remote_dir_exists[request->obj->sha1[0]] = 1;
697 698 699
			start_put(request);
		} else {
			fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
700
				sha1_to_hex(request->obj->sha1),
701 702 703 704 705 706 707 708 709
				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 已提交
710
				sha1_to_hex(request->obj->sha1),
711 712 713 714 715 716
				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 已提交
717 718 719
			if (push_verbosely)
				fprintf(stderr, "    sent %s\n",
					sha1_to_hex(request->obj->sha1));
N
Nick Hengeveld 已提交
720 721
			request->obj->flags |= REMOTE;
			release_request(request);
722 723
		} else {
			fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
724
				sha1_to_hex(request->obj->sha1),
725 726 727 728
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746
	} 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");

			inflateEnd(&request->stream);
			SHA1_Final(request->real_sha1, &request->c);
			if (request->zret != Z_STREAM_END) {
				unlink(request->tmpfile);
747
			} else if (hashcmp(request->obj->sha1, request->real_sha1)) {
748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771
				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 {
772 773
			off_t pack_size = ftell(request->local_stream);

774 775 776 777 778
			fclose(request->local_stream);
			request->local_stream = NULL;
			if (!move_temp_to_file(request->tmpfile,
					       request->filename)) {
				target = (struct packed_git *)request->userData;
779
				target->pack_size = pack_size;
780 781 782 783 784 785 786 787 788 789 790 791
				lst = &remote->packs;
				while (*lst != target)
					lst = &((*lst)->next);
				*lst = (*lst)->next;

				if (!verify_pack(target, 0))
					install_packed_git(target);
				else
					remote->can_update_info_refs = 0;
			}
		}
		release_request(request);
792 793 794
	}
}

N
Nick Hengeveld 已提交
795
#ifdef USE_CURL_MULTI
796
static int fill_active_slot(void *unused)
797 798 799 800
{
	struct transfer_request *request = request_queue_head;

	if (aborted)
801
		return 0;
802

803
	for (request = request_queue_head; request; request = request->next) {
804 805
		if (request->state == NEED_FETCH) {
			start_fetch_loose(request);
806
			return 1;
807
		} else if (pushing && request->state == NEED_PUSH) {
N
Nick Hengeveld 已提交
808
			if (remote_dir_exists[request->obj->sha1[0]] == 1) {
809
				start_put(request);
N
Nick Hengeveld 已提交
810
			} else {
811
				start_mkcol(request);
N
Nick Hengeveld 已提交
812
			}
813
			return 1;
814
		}
N
Nick Hengeveld 已提交
815
	}
816
	return 0;
817
}
N
Nick Hengeveld 已提交
818
#endif
819

N
Nick Hengeveld 已提交
820 821
static void get_remote_object_list(unsigned char parent);

822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848
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 已提交
849
#ifdef USE_CURL_MULTI
850 851
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
852
#endif
853 854
}

N
Nick Hengeveld 已提交
855
static int add_send_request(struct object *obj, struct remote_lock *lock)
856 857 858 859
{
	struct transfer_request *request = request_queue_head;
	struct packed_git *target;

860 861 862
	/* Keep locks active */
	check_locks();

N
Nick Hengeveld 已提交
863 864 865 866 867 868 869
	/*
	 * 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 已提交
870
		return 0;
N
Nick Hengeveld 已提交
871 872 873
	target = find_sha1_pack(obj->sha1, remote->packs);
	if (target) {
		obj->flags |= REMOTE;
N
Nick Hengeveld 已提交
874
		return 0;
N
Nick Hengeveld 已提交
875
	}
876

N
Nick Hengeveld 已提交
877
	obj->flags |= PUSHING;
878
	request = xmalloc(sizeof(*request));
N
Nick Hengeveld 已提交
879
	request->obj = obj;
880
	request->url = NULL;
N
Nick Hengeveld 已提交
881
	request->lock = lock;
882
	request->headers = NULL;
883 884
	request->local_fileno = -1;
	request->local_stream = NULL;
N
Nick Hengeveld 已提交
885
	request->state = NEED_PUSH;
886 887
	request->next = request_queue_head;
	request_queue_head = request;
888

N
Nick Hengeveld 已提交
889
#ifdef USE_CURL_MULTI
890 891
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
892
#endif
N
Nick Hengeveld 已提交
893 894

	return 1;
895 896 897 898 899 900 901 902 903 904 905 906 907 908
}

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 已提交
909
	struct slot_results results;
910

911
	/* Don't use the index if the pack isn't there */
N
Nick Hengeveld 已提交
912 913
	url = xmalloc(strlen(remote->url) + 64);
	sprintf(url, "%sobjects/pack/pack-%s.pack", remote->url, hex);
914
	slot = get_active_slot();
N
Nick Hengeveld 已提交
915
	slot->results = &results;
916 917 918 919
	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 已提交
920
		if (results.curl_result != CURLE_OK) {
921 922 923 924 925
			free(url);
			return error("Unable to verify pack %s is available",
				     hex);
		}
	} else {
926
		free(url);
927 928 929
		return error("Unable to start request");
	}

930 931
	if (has_pack_index(sha1)) {
		free(url);
932
		return 0;
933
	}
934 935 936

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

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

940 941 942
	filename = sha1_pack_index_name(sha1);
	snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
	indexfile = fopen(tmpfile, "a");
943 944
	if (!indexfile) {
		free(url);
945
		return error("Unable to open local file %s for pack index",
946
			     tmpfile);
947
	}
948 949

	slot = get_active_slot();
N
Nick Hengeveld 已提交
950
	slot->results = &results;
951 952
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973
	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 已提交
974
		if (results.curl_result != CURLE_OK) {
975 976 977 978 979 980 981
			free(url);
			fclose(indexfile);
			return error("Unable to get pack index %s\n%s", url,
				     curl_errorstr);
		}
	} else {
		free(url);
N
Nick Hengeveld 已提交
982
		fclose(indexfile);
983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004
		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;
}

1005
static int fetch_indices(void)
1006 1007 1008
{
	unsigned char sha1[20];
	char *url;
M
Mike Hommey 已提交
1009
	struct strbuf buffer = STRBUF_INIT;
1010 1011 1012 1013
	char *data;
	int i = 0;

	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1014
	struct slot_results results;
1015 1016 1017

	if (push_verbosely)
		fprintf(stderr, "Getting pack list\n");
N
Nick Hengeveld 已提交
1018 1019 1020

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

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1023
	slot->results = &results;
1024
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
1025
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1026 1027 1028 1029
	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 已提交
1030
		if (results.curl_result != CURLE_OK) {
M
Mike Hommey 已提交
1031
			strbuf_release(&buffer);
1032
			free(url);
N
Nick Hengeveld 已提交
1033
			if (results.http_code == 404)
1034 1035 1036 1037 1038
				return 0;
			else
				return error("%s", curl_errorstr);
		}
	} else {
M
Mike Hommey 已提交
1039
		strbuf_release(&buffer);
1040 1041 1042 1043 1044
		free(url);
		return error("Unable to start request");
	}
	free(url);

M
Mike Hommey 已提交
1045 1046
	data = buffer.buf;
	while (i < buffer.len) {
1047 1048 1049
		switch (data[i]) {
		case 'P':
			i++;
M
Mike Hommey 已提交
1050
			if (i + 52 < buffer.len &&
1051
			    !prefixcmp(data + i, " pack-") &&
1052
			    !prefixcmp(data + i + 46, ".pack\n")) {
1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
				get_sha1_hex(data + i + 6, sha1);
				setup_index(sha1);
				i += 51;
				break;
			}
		default:
			while (data[i] != '\n')
				i++;
		}
		i++;
	}

M
Mike Hommey 已提交
1065
	strbuf_release(&buffer);
1066 1067 1068
	return 0;
}

N
Nick Hengeveld 已提交
1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086
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))
1087
		object_list_insert(obj, &objects);
N
Nick Hengeveld 已提交
1088 1089
}

N
Nick Hengeveld 已提交
1090
static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
1091
{
N
Nick Hengeveld 已提交
1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106
	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 已提交
1107 1108
}

N
Nick Hengeveld 已提交
1109
static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
1110
{
N
Nick Hengeveld 已提交
1111
	struct remote_lock *lock = (struct remote_lock *)ctx->userData;
N
Nick Hengeveld 已提交
1112 1113 1114 1115 1116 1117

	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)) {
1118
			if (!prefixcmp(ctx->cdata, "Second-"))
N
Nick Hengeveld 已提交
1119 1120 1121
				lock->timeout =
					strtol(ctx->cdata + 7, NULL, 10);
		} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) {
1122
			if (!prefixcmp(ctx->cdata, "opaquelocktoken:")) {
J
Jan Andres 已提交
1123
				lock->token = xmalloc(strlen(ctx->cdata) - 15);
N
Nick Hengeveld 已提交
1124 1125 1126
				strcpy(lock->token, ctx->cdata + 16);
			}
		}
N
Nick Hengeveld 已提交
1127 1128 1129
	}
}

N
Nick Hengeveld 已提交
1130 1131
static void one_remote_ref(char *refname);

N
Nick Hengeveld 已提交
1132
static void
N
Nick Hengeveld 已提交
1133
xml_start_tag(void *userData, const char *name, const char **atts)
N
Nick Hengeveld 已提交
1134
{
N
Nick Hengeveld 已提交
1135
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
1136
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148
	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 已提交
1149
	}
N
Nick Hengeveld 已提交
1150 1151
	strcat(ctx->name, ".");
	strcat(ctx->name, c);
N
Nick Hengeveld 已提交
1152

J
Junio C Hamano 已提交
1153 1154
	free(ctx->cdata);
	ctx->cdata = NULL;
N
Nick Hengeveld 已提交
1155 1156

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

1159
static void
N
Nick Hengeveld 已提交
1160
xml_end_tag(void *userData, const char *name)
1161
{
N
Nick Hengeveld 已提交
1162
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
1163
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
1164
	char *ep;
1165

N
Nick Hengeveld 已提交
1166 1167 1168 1169 1170 1171 1172 1173 1174
	ctx->userFunc(ctx, 1);

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

	ep = ctx->name + strlen(ctx->name) - strlen(c) - 1;
	*ep = 0;
1175 1176 1177
}

static void
N
Nick Hengeveld 已提交
1178
xml_cdata(void *userData, const XML_Char *s, int len)
1179
{
N
Nick Hengeveld 已提交
1180
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
J
Junio C Hamano 已提交
1181
	free(ctx->cdata);
P
Pierre Habouzit 已提交
1182
	ctx->cdata = xmemdupz(s, len);
1183 1184
}

T
Timo Hirvonen 已提交
1185
static struct remote_lock *lock_remote(const char *path, long timeout)
1186 1187
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1188
	struct slot_results results;
M
Mike Hommey 已提交
1189 1190
	struct buffer out_buffer = { STRBUF_INIT, 0 };
	struct strbuf in_buffer = STRBUF_INIT;
1191
	char *url;
1192
	char *ep;
1193
	char timeout_header[25];
1194
	struct remote_lock *lock = NULL;
1195
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
1196
	struct xml_ctx ctx;
1197

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

1201
	/* Make sure leading directories exist for the remote ref */
1202
	ep = strchr(url + strlen(remote->url) + 1, '/');
1203 1204 1205
	while (ep) {
		*ep = 0;
		slot = get_active_slot();
N
Nick Hengeveld 已提交
1206
		slot->results = &results;
1207 1208 1209 1210 1211 1212
		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 已提交
1213 1214
			if (results.curl_result != CURLE_OK &&
			    results.http_code != 405) {
1215 1216 1217 1218 1219 1220 1221
				fprintf(stderr,
					"Unable to create branch path %s\n",
					url);
				free(url);
				return NULL;
			}
		} else {
N
Nick Hengeveld 已提交
1222
			fprintf(stderr, "Unable to start MKCOL request\n");
1223 1224 1225 1226 1227 1228 1229
			free(url);
			return NULL;
		}
		*ep = '/';
		ep = strchr(ep + 1, '/');
	}

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

1232
	sprintf(timeout_header, "Timeout: Second-%ld", timeout);
1233 1234 1235 1236
	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 已提交
1237
	slot->results = &results;
1238
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1239
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1240
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
N
Nick Hengeveld 已提交
1241
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
1242
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1243 1244 1245 1246 1247
	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 已提交
1248 1249
	lock = xcalloc(1, sizeof(*lock));
	lock->timeout = -1;
N
Nick Hengeveld 已提交
1250

1251 1252
	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1253
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1254 1255
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1256 1257 1258 1259
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
			ctx.userFunc = handle_new_lock_ctx;
N
Nick Hengeveld 已提交
1260
			ctx.userData = lock;
N
Nick Hengeveld 已提交
1261 1262 1263 1264
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
1265 1266
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1267 1268 1269 1270 1271
			free(ctx.name);
			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
N
Nick Hengeveld 已提交
1272
				lock->timeout = -1;
N
Nick Hengeveld 已提交
1273
			}
M
Mike Hommey 已提交
1274
			XML_ParserFree(parser);
1275 1276
		}
	} else {
N
Nick Hengeveld 已提交
1277
		fprintf(stderr, "Unable to start LOCK request\n");
1278 1279
	}

N
Nick Hengeveld 已提交
1280
	curl_slist_free_all(dav_headers);
M
Mike Hommey 已提交
1281 1282
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1283

N
Nick Hengeveld 已提交
1284
	if (lock->token == NULL || lock->timeout <= 0) {
1285 1286
		free(lock->token);
		free(lock->owner);
1287
		free(url);
N
Nick Hengeveld 已提交
1288 1289
		free(lock);
		lock = NULL;
N
Nick Hengeveld 已提交
1290
	} else {
N
Nick Hengeveld 已提交
1291 1292
		lock->url = url;
		lock->start_time = time(NULL);
1293 1294
		lock->next = remote->locks;
		remote->locks = lock;
N
Nick Hengeveld 已提交
1295 1296
	}

N
Nick Hengeveld 已提交
1297
	return lock;
1298 1299
}

N
Nick Hengeveld 已提交
1300
static int unlock_remote(struct remote_lock *lock)
1301 1302
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1303
	struct slot_results results;
1304
	struct remote_lock *prev = remote->locks;
1305 1306 1307 1308
	char *lock_token_header;
	struct curl_slist *dav_headers = NULL;
	int rc = 0;

N
Nick Hengeveld 已提交
1309
	lock_token_header = xmalloc(strlen(lock->token) + 31);
1310
	sprintf(lock_token_header, "Lock-Token: <opaquelocktoken:%s>",
N
Nick Hengeveld 已提交
1311
		lock->token);
1312 1313 1314
	dav_headers = curl_slist_append(dav_headers, lock_token_header);

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1315
	slot->results = &results;
1316
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null);
1317
	curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
1318 1319 1320 1321 1322
	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 已提交
1323
		if (results.curl_result == CURLE_OK)
1324 1325
			rc = 1;
		else
1326
			fprintf(stderr, "UNLOCK HTTP error %ld\n",
N
Nick Hengeveld 已提交
1327
				results.http_code);
1328
	} else {
1329
		fprintf(stderr, "Unable to start UNLOCK request\n");
1330 1331 1332 1333
	}

	curl_slist_free_all(dav_headers);
	free(lock_token_header);
1334

1335 1336 1337 1338 1339 1340 1341 1342 1343
	if (remote->locks == lock) {
		remote->locks = lock->next;
	} else {
		while (prev && prev->next != lock)
			prev = prev->next;
		if (prev)
			prev->next = prev->next->next;
	}

1344
	free(lock->owner);
1345 1346 1347
	free(lock->url);
	free(lock->token);
	free(lock);
1348 1349 1350 1351

	return rc;
}

1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369
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();
	signal(signo, SIG_DFL);
	raise(signo);
}

1370 1371 1372
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData);
N
Nick Hengeveld 已提交
1373

1374 1375 1376 1377 1378
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 已提交
1379

1380 1381 1382 1383
	if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) {
		remote_dir_exists[*parent] = 1;
		return;
	}
N
Nick Hengeveld 已提交
1384

1385 1386 1387 1388
	if (strlen(path) != 49)
		return;
	path += 8;
	obj_hex = xmalloc(strlen(path));
1389 1390
	/* NB: path is not null-terminated, can not use strlcpy here */
	memcpy(obj_hex, path, 2);
1391 1392 1393 1394
	strcpy(obj_hex + 2, path + 3);
	one_remote_object(obj_hex);
	free(obj_hex);
}
N
Nick Hengeveld 已提交
1395

1396 1397 1398 1399 1400 1401
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 已提交
1402

1403 1404 1405
	if (!(ls->dentry_flags & IS_DIR))
		one_remote_ref(ls->dentry_name);
}
N
Nick Hengeveld 已提交
1406

1407 1408 1409
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 已提交
1410

1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425
	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 已提交
1426
			}
1427 1428 1429 1430 1431 1432
		} else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) {
			ls->dentry_name = xmalloc(strlen(ctx->cdata) -
						  remote->path_len + 1);
			strcpy(ls->dentry_name, ctx->cdata + remote->path_len);
		} else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
			ls->dentry_flags |= IS_DIR;
N
Nick Hengeveld 已提交
1433
		}
1434
	} else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {
J
Junio C Hamano 已提交
1435
		free(ls->dentry_name);
1436 1437
		ls->dentry_name = NULL;
		ls->dentry_flags = 0;
N
Nick Hengeveld 已提交
1438 1439 1440
	}
}

1441 1442 1443
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData)
N
Nick Hengeveld 已提交
1444
{
1445
	char *url = xmalloc(strlen(remote->url) + strlen(path) + 1);
N
Nick Hengeveld 已提交
1446
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1447
	struct slot_results results;
M
Mike Hommey 已提交
1448 1449
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
N
Nick Hengeveld 已提交
1450 1451
	struct curl_slist *dav_headers = NULL;
	struct xml_ctx ctx;
1452 1453 1454
	struct remote_ls_ctx ls;

	ls.flags = flags;
1455
	ls.path = xstrdup(path);
1456 1457 1458 1459
	ls.dentry_name = NULL;
	ls.dentry_flags = 0;
	ls.userData = userData;
	ls.userFunc = userFunc;
N
Nick Hengeveld 已提交
1460 1461 1462

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

M
Mike Hommey 已提交
1463
	strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST);
N
Nick Hengeveld 已提交
1464 1465 1466 1467 1468

	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 已提交
1469
	slot->results = &results;
N
Nick Hengeveld 已提交
1470
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1471
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
N
Nick Hengeveld 已提交
1472 1473 1474 1475 1476 1477 1478 1479 1480 1481
	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 已提交
1482
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1483 1484
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1485 1486 1487
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
1488 1489
			ctx.userFunc = handle_remote_ls_ctx;
			ctx.userData = &ls;
N
Nick Hengeveld 已提交
1490 1491 1492 1493
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
1494 1495
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1496 1497 1498 1499 1500 1501 1502
			free(ctx.name);

			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
			}
M
Mike Hommey 已提交
1503
			XML_ParserFree(parser);
N
Nick Hengeveld 已提交
1504 1505
		}
	} else {
1506
		fprintf(stderr, "Unable to start PROPFIND request\n");
N
Nick Hengeveld 已提交
1507 1508
	}

1509
	free(ls.path);
N
Nick Hengeveld 已提交
1510
	free(url);
M
Mike Hommey 已提交
1511 1512
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1513 1514 1515
	curl_slist_free_all(dav_headers);
}

1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528
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 已提交
1529
static int locking_available(void)
1530 1531
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1532
	struct slot_results results;
M
Mike Hommey 已提交
1533 1534
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1535
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
1536 1537
	struct xml_ctx ctx;
	int lock_flags = 0;
1538

M
Mike Hommey 已提交
1539
	strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, remote->url);
1540 1541 1542

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

1544
	slot = get_active_slot();
N
Nick Hengeveld 已提交
1545
	slot->results = &results;
1546
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1547
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1548 1549
	curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer);
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
1550
	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
1551 1552 1553 1554 1555 1556 1557
	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 已提交
1558
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1559 1560
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1561 1562 1563 1564 1565 1566 1567 1568
			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 已提交
1569 1570
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1571 1572 1573 1574 1575 1576 1577 1578
			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 已提交
1579
			XML_ParserFree(parser);
1580 1581 1582 1583 1584 1585 1586 1587
			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;
1588 1589
		}
	} else {
1590
		error("Unable to start PROPFIND request on %s", remote->url);
1591 1592
	}

M
Mike Hommey 已提交
1593 1594
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1595 1596 1597
	curl_slist_free_all(dav_headers);

	return lock_flags;
1598 1599
}

P
Pierre Habouzit 已提交
1600
static struct object_list **add_one_object(struct object *obj, struct object_list **p)
1601 1602 1603 1604 1605 1606 1607 1608
{
	struct object_list *entry = xmalloc(sizeof(struct object_list));
	entry->item = obj;
	entry->next = *p;
	*p = entry;
	return &entry->next;
}

N
Nick Hengeveld 已提交
1609 1610 1611 1612
static struct object_list **process_blob(struct blob *blob,
					 struct object_list **p,
					 struct name_path *path,
					 const char *name)
1613
{
N
Nick Hengeveld 已提交
1614
	struct object *obj = &blob->object;
1615

N
Nick Hengeveld 已提交
1616 1617 1618 1619 1620 1621
	obj->flags |= LOCAL;

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

	obj->flags |= SEEN;
1622
	return add_one_object(obj, p);
N
Nick Hengeveld 已提交
1623 1624 1625 1626 1627 1628 1629 1630
}

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;
1631
	struct tree_desc desc;
1632
	struct name_entry entry;
N
Nick Hengeveld 已提交
1633 1634 1635 1636 1637 1638 1639 1640 1641 1642
	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;
1643
	name = xstrdup(name);
1644
	p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1645 1646 1647
	me.up = path;
	me.elem = name;
	me.elem_len = strlen(name);
1648

1649
	init_tree_desc(&desc, tree->buffer, tree->size);
1650

1651 1652 1653
	while (tree_entry(&desc, &entry))
		switch (object_type(entry.mode)) {
		case OBJ_TREE:
1654
			p = process_tree(lookup_tree(entry.sha1), p, &me, name);
1655 1656
			break;
		case OBJ_BLOB:
1657
			p = process_blob(lookup_blob(entry.sha1), p, &me, name);
1658 1659 1660 1661 1662 1663
			break;
		default:
			/* Subproject commit - not in this repository */
			break;
		}

1664 1665
	free(tree->buffer);
	tree->buffer = NULL;
N
Nick Hengeveld 已提交
1666
	return p;
1667 1668
}

N
Nick Hengeveld 已提交
1669
static int get_delta(struct rev_info *revs, struct remote_lock *lock)
1670
{
1671
	int i;
1672
	struct commit *commit;
1673
	struct object_list **p = &objects;
N
Nick Hengeveld 已提交
1674
	int count = 0;
1675

N
Nick Hengeveld 已提交
1676 1677 1678 1679
	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 已提交
1680
			count += add_send_request(&commit->object, lock);
N
Nick Hengeveld 已提交
1681
	}
1682

1683 1684 1685 1686
	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;
1687

N
Nick Hengeveld 已提交
1688 1689
		if (obj->flags & (UNINTERESTING | SEEN))
			continue;
1690
		if (obj->type == OBJ_TAG) {
N
Nick Hengeveld 已提交
1691
			obj->flags |= SEEN;
1692
			p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1693
			continue;
1694
		}
1695
		if (obj->type == OBJ_TREE) {
N
Nick Hengeveld 已提交
1696 1697
			p = process_tree((struct tree *)obj, p, NULL, name);
			continue;
1698
		}
1699
		if (obj->type == OBJ_BLOB) {
N
Nick Hengeveld 已提交
1700 1701
			p = process_blob((struct blob *)obj, p, NULL, name);
			continue;
1702
		}
N
Nick Hengeveld 已提交
1703 1704 1705 1706 1707
		die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
	}

	while (objects) {
		if (!(objects->item->flags & UNINTERESTING))
N
Nick Hengeveld 已提交
1708
			count += add_send_request(objects->item, lock);
N
Nick Hengeveld 已提交
1709
		objects = objects->next;
1710
	}
N
Nick Hengeveld 已提交
1711 1712

	return count;
1713 1714
}

N
Nick Hengeveld 已提交
1715
static int update_remote(unsigned char *sha1, struct remote_lock *lock)
1716 1717
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1718
	struct slot_results results;
1719
	char *if_header;
M
Mike Hommey 已提交
1720
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1721 1722
	struct curl_slist *dav_headers = NULL;

N
Nick Hengeveld 已提交
1723 1724
	if_header = xmalloc(strlen(lock->token) + 25);
	sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token);
1725 1726
	dav_headers = curl_slist_append(dav_headers, if_header);

M
Mike Hommey 已提交
1727
	strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
1728 1729

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1730
	slot->results = &results;
1731
	curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer);
M
Mike Hommey 已提交
1732
	curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.buf.len);
1733 1734 1735 1736 1737 1738
	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);
1739
	curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url);
1740 1741 1742

	if (start_active_slot(slot)) {
		run_active_slot(slot);
M
Mike Hommey 已提交
1743
		strbuf_release(&out_buffer.buf);
1744
		free(if_header);
N
Nick Hengeveld 已提交
1745
		if (results.curl_result != CURLE_OK) {
1746 1747
			fprintf(stderr,
				"PUT error: curl result=%d, HTTP code=%ld\n",
N
Nick Hengeveld 已提交
1748
				results.curl_result, results.http_code);
1749 1750 1751 1752
			/* We should attempt recovery? */
			return 0;
		}
	} else {
M
Mike Hommey 已提交
1753
		strbuf_release(&out_buffer.buf);
1754 1755 1756 1757 1758 1759 1760 1761
		free(if_header);
		fprintf(stderr, "Unable to start PUT request\n");
		return 0;
	}

	return 1;
}

N
Nick Hengeveld 已提交
1762 1763 1764
static struct ref *local_refs, **local_tail;
static struct ref *remote_refs, **remote_tail;

1765
static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
N
Nick Hengeveld 已提交
1766 1767 1768 1769
{
	struct ref *ref;
	int len = strlen(refname) + 1;
	ref = xcalloc(1, sizeof(*ref) + len);
1770
	hashcpy(ref->new_sha1, sha1);
N
Nick Hengeveld 已提交
1771 1772 1773 1774 1775 1776 1777 1778 1779
	memcpy(ref->name, refname, len);
	*local_tail = ref;
	local_tail = &ref->next;
	return 0;
}

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

1782
	ref = alloc_ref_from_str(refname);
1783 1784

	if (http_fetch_ref(remote->url, ref) != 0) {
N
Nick Hengeveld 已提交
1785 1786 1787
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
			refname, remote->url);
1788
		free(ref);
N
Nick Hengeveld 已提交
1789 1790 1791
		return;
	}

1792 1793 1794 1795
	/*
	 * Fetch a copy of the object if it doesn't exist locally - it
	 * may be required for updating server info later.
	 */
1796 1797
	if (remote->can_update_info_refs && !has_sha1_file(ref->old_sha1)) {
		obj = lookup_unknown_object(ref->old_sha1);
1798 1799
		if (obj) {
			fprintf(stderr,	"  fetch %s for %s\n",
1800
				sha1_to_hex(ref->old_sha1), refname);
1801 1802 1803 1804
			add_fetch_request(obj);
		}
	}

N
Nick Hengeveld 已提交
1805 1806 1807 1808 1809 1810 1811
	*remote_tail = ref;
	remote_tail = &ref->next;
}

static void get_local_heads(void)
{
	local_tail = &local_refs;
1812
	for_each_ref(one_local_ref, NULL);
N
Nick Hengeveld 已提交
1813 1814 1815 1816 1817
}

static void get_dav_remote_heads(void)
{
	remote_tail = &remote_refs;
1818
	remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL);
N
Nick Hengeveld 已提交
1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853
}

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);
1854
	if (!o || o->type != OBJ_COMMIT)
N
Nick Hengeveld 已提交
1855 1856 1857 1858
		return 0;
	old = (struct commit *) o;

	o = deref_tag(parse_object(new_sha1), NULL, 0);
1859
	if (!o || o->type != OBJ_COMMIT)
N
Nick Hengeveld 已提交
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 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905
		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;
}

static void mark_edge_parents_uninteresting(struct commit *commit)
{
	struct commit_list *parents;

	for (parents = commit->parents; parents; parents = parents->next) {
		struct commit *parent = parents->item;
		if (!(parent->object.flags & UNINTERESTING))
			continue;
		mark_tree_uninteresting(parent->tree);
	}
}

static void mark_edges_uninteresting(struct commit_list *list)
{
	for ( ; list; list = list->next) {
		struct commit *commit = list->item;

		if (commit->object.flags & UNINTERESTING) {
			mark_tree_uninteresting(commit->tree);
			continue;
		}
		mark_edge_parents_uninteresting(commit);
	}
}

1906 1907
static void add_remote_info_ref(struct remote_ls_ctx *ls)
{
M
Mike Hommey 已提交
1908
	struct strbuf *buf = (struct strbuf *)ls->userData;
1909 1910 1911
	struct object *o;
	int len;
	char *ref_info;
1912 1913
	struct ref *ref;

1914
	ref = alloc_ref_from_str(ls->dentry_name);
1915

1916
	if (http_fetch_ref(remote->url, ref) != 0) {
1917 1918 1919 1920
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
			ls->dentry_name, remote->url);
		aborted = 1;
1921
		free(ref);
1922 1923 1924
		return;
	}

1925
	o = parse_object(ref->old_sha1);
1926 1927 1928
	if (!o) {
		fprintf(stderr,
			"Unable to parse object %s for remote ref %s\n",
1929
			sha1_to_hex(ref->old_sha1), ls->dentry_name);
1930
		aborted = 1;
1931
		free(ref);
1932 1933 1934 1935 1936 1937
		return;
	}

	len = strlen(ls->dentry_name) + 42;
	ref_info = xcalloc(len + 1, 1);
	sprintf(ref_info, "%s	%s\n",
1938
		sha1_to_hex(ref->old_sha1), ls->dentry_name);
1939 1940 1941
	fwrite_buffer(ref_info, 1, len, buf);
	free(ref_info);

1942
	if (o->type == OBJ_TAG) {
1943 1944 1945 1946 1947 1948 1949 1950 1951 1952
		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);
		}
	}
1953
	free(ref);
1954 1955 1956 1957
}

static void update_remote_info_refs(struct remote_lock *lock)
{
M
Mike Hommey 已提交
1958
	struct buffer buffer = { STRBUF_INIT, 0 };
1959 1960 1961 1962 1963 1964
	struct active_request_slot *slot;
	struct slot_results results;
	char *if_header;
	struct curl_slist *dav_headers = NULL;

	remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
M
Mike Hommey 已提交
1965
		  add_remote_info_ref, &buffer.buf);
1966 1967 1968 1969 1970 1971 1972 1973
	if (!aborted) {
		if_header = xmalloc(strlen(lock->token) + 25);
		sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token);
		dav_headers = curl_slist_append(dav_headers, if_header);

		slot = get_active_slot();
		slot->results = &results;
		curl_easy_setopt(slot->curl, CURLOPT_INFILE, &buffer);
M
Mike Hommey 已提交
1974
		curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, buffer.buf.len);
1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992
		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);
			}
		}
		free(if_header);
	}
M
Mike Hommey 已提交
1993
	strbuf_release(&buffer.buf);
1994 1995 1996 1997 1998 1999 2000
}

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;
2001
	int ret = -1;
2002 2003 2004

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

M
Mike Hommey 已提交
2005
	slot = get_active_slot();
2006
	slot->results = &results;
M
Mike Hommey 已提交
2007 2008
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
2009

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

2022 2023
	free(url);
	return ret;
2024 2025
}

T
Timo Hirvonen 已提交
2026
static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
2027 2028
{
	char *url;
M
Mike Hommey 已提交
2029
	struct strbuf buffer = STRBUF_INIT;
2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052
	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);

2053
	free(*symref);
2054
	*symref = NULL;
2055
	hashclr(sha1);
2056

M
Mike Hommey 已提交
2057
	if (buffer.len == 0)
2058 2059 2060
		return;

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

M
Mike Hommey 已提交
2067
	strbuf_release(&buffer);
2068 2069 2070 2071
}

static int verify_merge_base(unsigned char *head_sha1, unsigned char *branch_sha1)
{
2072 2073 2074
	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);
2075

D
David Rientjes 已提交
2076
	return (merge_bases && !merge_bases->next && merge_bases->item == branch);
2077 2078 2079 2080 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
}

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)) {
2145 2146 2147 2148 2149
			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);
2150 2151 2152 2153 2154
		}
	}

	/* Send delete request */
	fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name);
2155 2156
	if (dry_run)
		return 0;
2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178
	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;
}

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

2197
	setup_git_directory();
2198

2199
	remote = xcalloc(sizeof(*remote), 1);
2200 2201 2202 2203 2204 2205

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

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

2247 2248 2249 2250
#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 已提交
2251 2252 2253
	if (!remote->url)
		usage(http_push_usage);

2254 2255 2256
	if (delete_branch && nr_refspec != 1)
		die("You must specify only one branch name when deleting a remote branch");

N
Nick Hengeveld 已提交
2257
	memset(remote_dir_exists, -1, 256);
2258

2259
	http_init(NULL);
2260 2261 2262

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

2263 2264 2265 2266 2267 2268 2269 2270
	if (remote->url && remote->url[strlen(remote->url)-1] != '/') {
		rewritten_url = malloc(strlen(remote->url)+2);
		strcpy(rewritten_url, remote->url);
		strcat(rewritten_url, "/");
		remote->url = rewritten_url;
		++remote->path_len;
	}

2271
	/* Verify DAV compliance/lock support */
N
Nick Hengeveld 已提交
2272
	if (!locking_available()) {
2273 2274 2275 2276
		rc = 1;
		goto cleanup;
	}

2277 2278 2279 2280
	signal(SIGINT, remove_locks_on_signal);
	signal(SIGHUP, remove_locks_on_signal);
	signal(SIGQUIT, remove_locks_on_signal);

2281 2282 2283 2284 2285 2286 2287 2288
	/* 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;
2289 2290 2291 2292 2293
		else {
			fprintf(stderr, "Error: cannot lock existing info/refs\n");
			rc = 1;
			goto cleanup;
		}
2294 2295 2296 2297
	}
	if (remote->has_info_packs)
		fetch_indices();

N
Nick Hengeveld 已提交
2298 2299 2300 2301 2302
	/* 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();

2303 2304 2305 2306 2307 2308 2309 2310
	/* 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 已提交
2311 2312 2313 2314
	/* match them up */
	if (!remote_tail)
		remote_tail = &remote_refs;
	if (match_refs(local_refs, remote_refs, &remote_tail,
2315 2316 2317 2318
		       nr_refspec, (const char **) refspec, push_all)) {
		rc = -1;
		goto cleanup;
	}
N
Nick Hengeveld 已提交
2319 2320
	if (!remote_refs) {
		fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
2321 2322
		rc = 0;
		goto cleanup;
N
Nick Hengeveld 已提交
2323 2324
	}

2325
	new_refs = 0;
N
Nick Hengeveld 已提交
2326 2327
	for (ref = remote_refs; ref; ref = ref->next) {
		char old_hex[60], *new_hex;
2328 2329 2330 2331
		const char *commit_argv[4];
		int commit_argc;
		char *new_sha1_hex, *old_sha1_hex;

N
Nick Hengeveld 已提交
2332 2333
		if (!ref->peer_ref)
			continue;
2334 2335 2336 2337 2338 2339 2340 2341 2342 2343

		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;
		}

2344
		if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
N
Nick Hengeveld 已提交
2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355
			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)) {
2356 2357
				/*
				 * We do not have the remote ref, or
N
Nick Hengeveld 已提交
2358 2359 2360 2361 2362 2363
				 * 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.
				 */
2364 2365 2366
				error("remote '%s' is not an ancestor of\n"
				      "local '%s'.\n"
				      "Maybe you are not up-to-date and "
N
Nick Hengeveld 已提交
2367 2368 2369
				      "need to pull first?",
				      ref->name,
				      ref->peer_ref->name);
N
Nick Hengeveld 已提交
2370
				rc = -2;
N
Nick Hengeveld 已提交
2371 2372
				continue;
			}
2373
		}
2374
		hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
N
Nick Hengeveld 已提交
2375 2376 2377 2378 2379 2380 2381 2382
		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);
2383 2384
		if (dry_run)
			continue;
2385 2386

		/* Lock remote branch ref */
N
Nick Hengeveld 已提交
2387 2388
		ref_lock = lock_remote(ref->name, LOCK_TIME);
		if (ref_lock == NULL) {
2389
			fprintf(stderr, "Unable to lock remote branch %s\n",
N
Nick Hengeveld 已提交
2390
				ref->name);
2391 2392 2393 2394
			rc = 1;
			continue;
		}

N
Nick Hengeveld 已提交
2395
		/* Set up revision info for this refspec */
2396
		commit_argc = 3;
2397
		new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1));
2398
		old_sha1_hex = NULL;
N
Nick Hengeveld 已提交
2399 2400
		commit_argv[1] = "--objects";
		commit_argv[2] = new_sha1_hex;
N
Nick Hengeveld 已提交
2401 2402 2403 2404
		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 已提交
2405
			commit_argv[3] = old_sha1_hex;
N
Nick Hengeveld 已提交
2406
			commit_argc++;
2407
		}
2408
		init_revisions(&revs, setup_git_directory());
N
Nick Hengeveld 已提交
2409 2410 2411 2412 2413
		setup_revisions(commit_argc, commit_argv, &revs, NULL);
		free(new_sha1_hex);
		if (old_sha1_hex) {
			free(old_sha1_hex);
			commit_argv[1] = NULL;
2414 2415
		}

N
Nick Hengeveld 已提交
2416
		/* Generate a list of objects that need to be pushed */
2417
		pushing = 0;
2418 2419
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
N
Nick Hengeveld 已提交
2420
		mark_edges_uninteresting(revs.commits);
N
Nick Hengeveld 已提交
2421
		objects_to_send = get_delta(&revs, ref_lock);
2422
		finish_all_active_slots();
2423 2424 2425 2426

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

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

N
Nick Hengeveld 已提交
2445 2446 2447
		if (!rc)
			fprintf(stderr, "    done\n");
		unlock_remote(ref_lock);
2448
		check_locks();
2449 2450
	}

2451 2452 2453 2454
	/* 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");
2455 2456
			if (!dry_run)
				update_remote_info_refs(info_ref_lock);
2457 2458 2459 2460 2461
		} else {
			fprintf(stderr, "Unable to update server info\n");
		}
	}

2462
 cleanup:
2463
	free(rewritten_url);
2464 2465
	if (info_ref_lock)
		unlock_remote(info_ref_lock);
2466 2467 2468 2469
	free(remote);

	curl_slist_free_all(no_pragma_header);

2470
	http_cleanup();
2471 2472 2473 2474 2475 2476 2477 2478 2479 2480

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

	return rc;
}