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

14
#include <expat.h>
15 16

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

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

28
#define PREV_BUF_SIZE 4096
29 30
#define RANGE_HEADER_SIZE 30

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

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

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

61 62 63
#define LOCK_TIME 600
#define LOCK_REFRESH 30

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

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

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

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

static struct curl_slist *no_pragma_header;

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

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

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

98
static struct repo *remote;
99 100

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

struct transfer_request
{
N
Nick Hengeveld 已提交
114
	struct object *obj;
115 116
	char *url;
	char *dest;
N
Nick Hengeveld 已提交
117
	struct remote_lock *lock;
118 119 120 121
	struct curl_slist *headers;
	struct buffer buffer;
	char filename[PATH_MAX];
	char tmpfile[PATH_MAX];
122 123
	int local_fileno;
	FILE *local_stream;
124 125 126 127 128 129 130 131 132
	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;
133
	void *userData;
134 135 136 137
	struct active_request_slot *slot;
	struct transfer_request *next;
};

138
static struct transfer_request *request_queue_head;
139

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

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

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

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

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

187
	finish_request(request);
188 189
}

J
Junio C Hamano 已提交
190
#ifdef USE_CURL_MULTI
191 192 193 194 195 196 197 198
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 {
199
		ssize_t retval = xwrite(request->local_fileno,
200
				       (char *) ptr + posn, size - posn);
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 291
		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 {
292
			prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);
293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315
			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;
316
			lseek(request->local_fileno, 0, SEEK_SET);
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 353
			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 已提交
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 388
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

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 435
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",
436
			request->tmpfile);
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 477
		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);
	}
}

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

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

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

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

J
Junio C Hamano 已提交
521
	request->url = xmalloc(strlen(remote->url) +
N
Nick Hengeveld 已提交
522
			       strlen(request->lock->token) + 51);
523 524 525 526 527 528 529 530 531 532 533
	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;
534
	*(posn++) = '_';
N
Nick Hengeveld 已提交
535
	strcpy(posn, request->lock->token);
536 537

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

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

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

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

595
	lock->refreshing = 1;
596

597 598 599 600 601
	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);
602

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

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

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

626 627 628
	return rc;
}

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

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

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

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

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

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

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

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

N
Nick Hengeveld 已提交
694
	if (request->state == RUN_MKCOL) {
695 696
		if (request->curl_result == CURLE_OK ||
		    request->http_code == 405) {
N
Nick Hengeveld 已提交
697
			remote_dir_exists[request->obj->sha1[0]] = 1;
698 699 700
			start_put(request);
		} else {
			fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
701
				sha1_to_hex(request->obj->sha1),
702 703 704 705 706 707 708 709 710
				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 已提交
711
				sha1_to_hex(request->obj->sha1),
712 713 714 715 716 717
				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 已提交
718 719 720
			if (push_verbosely)
				fprintf(stderr, "    sent %s\n",
					sha1_to_hex(request->obj->sha1));
N
Nick Hengeveld 已提交
721 722
			request->obj->flags |= REMOTE;
			release_request(request);
723 724
		} else {
			fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
725
				sha1_to_hex(request->obj->sha1),
726 727 728 729
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747
	} 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);
748
			} else if (hashcmp(request->obj->sha1, request->real_sha1)) {
749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772
				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 {
773 774
			off_t pack_size = ftell(request->local_stream);

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

786
				if (!verify_pack(target))
787 788 789 790 791 792
					install_packed_git(target);
				else
					remote->can_update_info_refs = 0;
			}
		}
		release_request(request);
793 794 795
	}
}

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

	if (aborted)
802
		return 0;
803

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

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

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 849
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 已提交
850
#ifdef USE_CURL_MULTI
851 852
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
853
#endif
854 855
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1160
static void
N
Nick Hengeveld 已提交
1161
xml_end_tag(void *userData, const char *name)
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
	char *ep;
1166

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	curl_slist_free_all(dav_headers);
	free(lock_token_header);
1335

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

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

	return rc;
}

1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370
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);
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return lock_flags;
1599 1600
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return count;
1714 1715
}

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

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

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

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

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

	return 1;
}

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

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

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

1783
	ref = alloc_ref_from_str(refname);
1784 1785

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

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

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

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

static void get_dav_remote_heads(void)
{
	remote_tail = &remote_refs;
1819
	remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL);
N
Nick Hengeveld 已提交
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 1854
}

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

	o = deref_tag(parse_object(new_sha1), NULL, 0);
1860
	if (!o || o->type != OBJ_COMMIT)
N
Nick Hengeveld 已提交
1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881
		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;
}

1882 1883
static void add_remote_info_ref(struct remote_ls_ctx *ls)
{
M
Mike Hommey 已提交
1884
	struct strbuf *buf = (struct strbuf *)ls->userData;
1885 1886 1887
	struct object *o;
	int len;
	char *ref_info;
1888 1889
	struct ref *ref;

1890
	ref = alloc_ref_from_str(ls->dentry_name);
1891

1892
	if (http_fetch_ref(remote->url, ref) != 0) {
1893 1894 1895 1896
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
			ls->dentry_name, remote->url);
		aborted = 1;
1897
		free(ref);
1898 1899 1900
		return;
	}

1901
	o = parse_object(ref->old_sha1);
1902 1903 1904
	if (!o) {
		fprintf(stderr,
			"Unable to parse object %s for remote ref %s\n",
1905
			sha1_to_hex(ref->old_sha1), ls->dentry_name);
1906
		aborted = 1;
1907
		free(ref);
1908 1909 1910 1911 1912 1913
		return;
	}

	len = strlen(ls->dentry_name) + 42;
	ref_info = xcalloc(len + 1, 1);
	sprintf(ref_info, "%s	%s\n",
1914
		sha1_to_hex(ref->old_sha1), ls->dentry_name);
1915 1916 1917
	fwrite_buffer(ref_info, 1, len, buf);
	free(ref_info);

1918
	if (o->type == OBJ_TAG) {
1919 1920 1921 1922 1923 1924 1925 1926 1927 1928
		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);
		}
	}
1929
	free(ref);
1930 1931 1932 1933
}

static void update_remote_info_refs(struct remote_lock *lock)
{
M
Mike Hommey 已提交
1934
	struct buffer buffer = { STRBUF_INIT, 0 };
1935 1936 1937 1938 1939 1940
	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 已提交
1941
		  add_remote_info_ref, &buffer.buf);
1942 1943 1944 1945 1946 1947 1948 1949
	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 已提交
1950
		curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, buffer.buf.len);
1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968
		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 已提交
1969
	strbuf_release(&buffer.buf);
1970 1971 1972 1973 1974 1975 1976
}

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;
1977
	int ret = -1;
1978 1979 1980

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

M
Mike Hommey 已提交
1981
	slot = get_active_slot();
1982
	slot->results = &results;
M
Mike Hommey 已提交
1983 1984
	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
1985

M
Mike Hommey 已提交
1986
	if (start_active_slot(slot)) {
1987 1988
		run_active_slot(slot);
		if (results.http_code == 404)
1989
			ret = 0;
1990
		else if (results.curl_result == CURLE_OK)
1991
			ret = 1;
1992 1993 1994 1995 1996 1997
		else
			fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code);
	} else {
		fprintf(stderr, "Unable to start HEAD request\n");
	}

1998 1999
	free(url);
	return ret;
2000 2001
}

T
Timo Hirvonen 已提交
2002
static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
2003 2004
{
	char *url;
M
Mike Hommey 已提交
2005
	struct strbuf buffer = STRBUF_INIT;
2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028
	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);

2029
	free(*symref);
2030
	*symref = NULL;
2031
	hashclr(sha1);
2032

M
Mike Hommey 已提交
2033
	if (buffer.len == 0)
2034 2035 2036
		return;

	/* If it's a symref, set the refname; otherwise try for a sha1 */
M
Mike Hommey 已提交
2037 2038
	if (!prefixcmp((char *)buffer.buf, "ref: ")) {
		*symref = xmemdupz((char *)buffer.buf + 5, buffer.len - 6);
2039
	} else {
M
Mike Hommey 已提交
2040
		get_sha1_hex(buffer.buf, sha1);
2041 2042
	}

M
Mike Hommey 已提交
2043
	strbuf_release(&buffer);
2044 2045 2046 2047
}

static int verify_merge_base(unsigned char *head_sha1, unsigned char *branch_sha1)
{
2048 2049 2050
	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);
2051

D
David Rientjes 已提交
2052
	return (merge_bases && !merge_bases->next && merge_bases->item == branch);
2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 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
}

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)) {
2121 2122 2123 2124 2125
			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);
2126 2127 2128 2129 2130
		}
	}

	/* Send delete request */
	fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name);
2131 2132
	if (dry_run)
		return 0;
2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154
	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;
}

2155 2156 2157 2158 2159 2160
int main(int argc, char **argv)
{
	struct transfer_request *request;
	struct transfer_request *next_request;
	int nr_refspec = 0;
	char **refspec = NULL;
2161
	struct remote_lock *ref_lock = NULL;
2162
	struct remote_lock *info_ref_lock = NULL;
N
Nick Hengeveld 已提交
2163
	struct rev_info revs;
2164 2165
	int delete_branch = 0;
	int force_delete = 0;
N
Nick Hengeveld 已提交
2166
	int objects_to_send;
2167 2168
	int rc = 0;
	int i;
2169 2170
	int new_refs;
	struct ref *ref;
2171
	char *rewritten_url = NULL;
2172

2173
	setup_git_directory();
2174

2175
	remote = xcalloc(sizeof(*remote), 1);
2176 2177 2178 2179 2180 2181

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

		if (*arg == '-') {
N
Nick Hengeveld 已提交
2182
			if (!strcmp(arg, "--all")) {
A
Andy Whitcroft 已提交
2183
				push_all = MATCH_REFS_ALL;
2184 2185 2186 2187 2188 2189
				continue;
			}
			if (!strcmp(arg, "--force")) {
				force_all = 1;
				continue;
			}
2190 2191 2192 2193
			if (!strcmp(arg, "--dry-run")) {
				dry_run = 1;
				continue;
			}
2194 2195 2196 2197
			if (!strcmp(arg, "--verbose")) {
				push_verbosely = 1;
				continue;
			}
2198 2199 2200 2201 2202 2203 2204 2205 2206
			if (!strcmp(arg, "-d")) {
				delete_branch = 1;
				continue;
			}
			if (!strcmp(arg, "-D")) {
				delete_branch = 1;
				force_delete = 1;
				continue;
			}
2207 2208
		}
		if (!remote->url) {
N
Nick Hengeveld 已提交
2209
			char *path = strstr(arg, "//");
2210
			remote->url = arg;
N
Nick Hengeveld 已提交
2211
			if (path) {
D
Dennis Stosberg 已提交
2212
				path = strchr(path+2, '/');
N
Nick Hengeveld 已提交
2213 2214 2215
				if (path)
					remote->path_len = strlen(path);
			}
2216 2217 2218 2219 2220 2221 2222
			continue;
		}
		refspec = argv;
		nr_refspec = argc - i;
		break;
	}

2223 2224 2225 2226
#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 已提交
2227 2228 2229
	if (!remote->url)
		usage(http_push_usage);

2230 2231 2232
	if (delete_branch && nr_refspec != 1)
		die("You must specify only one branch name when deleting a remote branch");

N
Nick Hengeveld 已提交
2233
	memset(remote_dir_exists, -1, 256);
2234

2235
	http_init(NULL);
2236 2237 2238

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

2239 2240 2241 2242 2243 2244 2245 2246
	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;
	}

2247
	/* Verify DAV compliance/lock support */
N
Nick Hengeveld 已提交
2248
	if (!locking_available()) {
2249 2250 2251 2252
		rc = 1;
		goto cleanup;
	}

2253 2254 2255
	signal(SIGINT, remove_locks_on_signal);
	signal(SIGHUP, remove_locks_on_signal);
	signal(SIGQUIT, remove_locks_on_signal);
2256
	signal(SIGTERM, remove_locks_on_signal);
2257

2258 2259 2260 2261 2262 2263 2264 2265
	/* 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;
2266 2267 2268 2269 2270
		else {
			fprintf(stderr, "Error: cannot lock existing info/refs\n");
			rc = 1;
			goto cleanup;
		}
2271 2272 2273 2274
	}
	if (remote->has_info_packs)
		fetch_indices();

N
Nick Hengeveld 已提交
2275 2276 2277 2278 2279
	/* 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();

2280 2281 2282 2283 2284 2285 2286 2287
	/* 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 已提交
2288 2289 2290 2291
	/* match them up */
	if (!remote_tail)
		remote_tail = &remote_refs;
	if (match_refs(local_refs, remote_refs, &remote_tail,
2292 2293 2294 2295
		       nr_refspec, (const char **) refspec, push_all)) {
		rc = -1;
		goto cleanup;
	}
N
Nick Hengeveld 已提交
2296 2297
	if (!remote_refs) {
		fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
2298 2299
		rc = 0;
		goto cleanup;
N
Nick Hengeveld 已提交
2300 2301
	}

2302
	new_refs = 0;
N
Nick Hengeveld 已提交
2303 2304
	for (ref = remote_refs; ref; ref = ref->next) {
		char old_hex[60], *new_hex;
2305 2306 2307 2308
		const char *commit_argv[4];
		int commit_argc;
		char *new_sha1_hex, *old_sha1_hex;

N
Nick Hengeveld 已提交
2309 2310
		if (!ref->peer_ref)
			continue;
2311 2312 2313 2314 2315 2316 2317 2318 2319 2320

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

2321
		if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
N
Nick Hengeveld 已提交
2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332
			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)) {
2333 2334
				/*
				 * We do not have the remote ref, or
N
Nick Hengeveld 已提交
2335 2336 2337 2338 2339 2340
				 * 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.
				 */
2341 2342 2343
				error("remote '%s' is not an ancestor of\n"
				      "local '%s'.\n"
				      "Maybe you are not up-to-date and "
N
Nick Hengeveld 已提交
2344 2345 2346
				      "need to pull first?",
				      ref->name,
				      ref->peer_ref->name);
N
Nick Hengeveld 已提交
2347
				rc = -2;
N
Nick Hengeveld 已提交
2348 2349
				continue;
			}
2350
		}
2351
		hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
N
Nick Hengeveld 已提交
2352 2353 2354 2355 2356 2357 2358 2359
		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);
2360 2361
		if (dry_run)
			continue;
2362 2363

		/* Lock remote branch ref */
N
Nick Hengeveld 已提交
2364 2365
		ref_lock = lock_remote(ref->name, LOCK_TIME);
		if (ref_lock == NULL) {
2366
			fprintf(stderr, "Unable to lock remote branch %s\n",
N
Nick Hengeveld 已提交
2367
				ref->name);
2368 2369 2370 2371
			rc = 1;
			continue;
		}

N
Nick Hengeveld 已提交
2372
		/* Set up revision info for this refspec */
2373
		commit_argc = 3;
2374
		new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1));
2375
		old_sha1_hex = NULL;
N
Nick Hengeveld 已提交
2376 2377
		commit_argv[1] = "--objects";
		commit_argv[2] = new_sha1_hex;
N
Nick Hengeveld 已提交
2378 2379 2380 2381
		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 已提交
2382
			commit_argv[3] = old_sha1_hex;
N
Nick Hengeveld 已提交
2383
			commit_argc++;
2384
		}
2385
		init_revisions(&revs, setup_git_directory());
N
Nick Hengeveld 已提交
2386
		setup_revisions(commit_argc, commit_argv, &revs, NULL);
2387
		revs.edge_hint = 0; /* just in case */
N
Nick Hengeveld 已提交
2388 2389 2390 2391
		free(new_sha1_hex);
		if (old_sha1_hex) {
			free(old_sha1_hex);
			commit_argv[1] = NULL;
2392 2393
		}

N
Nick Hengeveld 已提交
2394
		/* Generate a list of objects that need to be pushed */
2395
		pushing = 0;
2396 2397
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
2398
		mark_edges_uninteresting(revs.commits, &revs, NULL);
N
Nick Hengeveld 已提交
2399
		objects_to_send = get_delta(&revs, ref_lock);
2400
		finish_all_active_slots();
2401 2402 2403 2404

		/* Push missing objects to remote, this would be a
		   convenient time to pack them first if appropriate. */
		pushing = 1;
N
Nick Hengeveld 已提交
2405 2406 2407
		if (objects_to_send)
			fprintf(stderr, "    sending %d objects\n",
				objects_to_send);
N
Nick Hengeveld 已提交
2408
#ifdef USE_CURL_MULTI
2409
		fill_active_slots();
2410
		add_fill_function(NULL, fill_active_slot);
N
Nick Hengeveld 已提交
2411
#endif
2412 2413 2414 2415 2416 2417
		do {
			finish_all_active_slots();
#ifdef USE_CURL_MULTI
			fill_active_slots();
#endif
		} while (request_queue_head && !aborted);
2418 2419

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

N
Nick Hengeveld 已提交
2423 2424 2425
		if (!rc)
			fprintf(stderr, "    done\n");
		unlock_remote(ref_lock);
2426
		check_locks();
2427 2428
	}

2429 2430 2431 2432
	/* 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");
2433 2434
			if (!dry_run)
				update_remote_info_refs(info_ref_lock);
2435 2436 2437 2438 2439
		} else {
			fprintf(stderr, "Unable to update server info\n");
		}
	}

2440
 cleanup:
2441
	free(rewritten_url);
2442 2443
	if (info_ref_lock)
		unlock_remote(info_ref_lock);
2444 2445 2446 2447
	free(remote);

	curl_slist_free_all(no_pragma_header);

2448
	http_cleanup();
2449 2450 2451 2452 2453 2454 2455 2456 2457 2458

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

	return rc;
}