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

M
Matt Kraai 已提交
14 15 16
#ifdef EXPAT_NEEDS_XMLPARSE_H
#include <xmlparse.h>
#else
17
#include <expat.h>
M
Matt Kraai 已提交
18
#endif
19 20

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

23 24 25 26 27 28 29 30 31
#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

32
#define PREV_BUF_SIZE 4096
33

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

/* 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 已提交
55 56 57
#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 已提交
58 59

/* DAV request body templates */
N
Nick Hengeveld 已提交
60 61
#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>"
62 63
#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>"

64 65 66
#define LOCK_TIME 600
#define LOCK_REFRESH 30

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

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

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

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

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

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

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

100
static struct repo *repo;
101 102

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

114
struct transfer_request {
N
Nick Hengeveld 已提交
115
	struct object *obj;
116 117
	char *url;
	char *dest;
N
Nick Hengeveld 已提交
118
	struct remote_lock *lock;
119 120 121 122 123 124
	struct curl_slist *headers;
	struct buffer buffer;
	enum transfer_state state;
	CURLcode curl_result;
	char errorstr[CURL_ERROR_SIZE];
	long http_code;
125
	void *userData;
126 127 128 129
	struct active_request_slot *slot;
	struct transfer_request *next;
};

130
static struct transfer_request *request_queue_head;
131

132
struct xml_ctx {
N
Nick Hengeveld 已提交
133 134 135 136 137 138 139
	char *name;
	int len;
	char *cdata;
	void (*userFunc)(struct xml_ctx *ctx, int tag_closed);
	void *userData;
};

140
struct remote_lock {
141
	char *url;
N
Nick Hengeveld 已提交
142
	char *owner;
143
	char *token;
144
	char tmpfile_suffix[41];
N
Nick Hengeveld 已提交
145 146
	time_t start_time;
	long timeout;
147
	int refreshing;
N
Nick Hengeveld 已提交
148 149 150
	struct remote_lock *next;
};

151 152 153 154 155 156 157 158
/* 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)

159
struct remote_ls_ctx {
160 161 162 163 164 165 166
	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 已提交
167 168
};

169 170 171 172 173 174 175
/* get_dav_token_headers options */
enum dav_header_flag {
	DAV_HEADER_IF = (1u << 0),
	DAV_HEADER_LOCK = (1u << 1),
	DAV_HEADER_TIMEOUT = (1u << 2)
};

176
static char *xml_entities(const char *s)
177 178
{
	struct strbuf buf = STRBUF_INIT;
179
	strbuf_addstr_xml_quoted(&buf, s);
180 181 182
	return strbuf_detach(&buf, NULL);
}

183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210
static void curl_setup_http_get(CURL *curl, const char *url,
		const char *custom_req)
{
	curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
	curl_easy_setopt(curl, CURLOPT_URL, url);
	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_null);
}

static void curl_setup_http(CURL *curl, const char *url,
		const char *custom_req, struct buffer *buffer,
		curl_write_callback write_fn)
{
	curl_easy_setopt(curl, CURLOPT_PUT, 1);
	curl_easy_setopt(curl, CURLOPT_URL, url);
	curl_easy_setopt(curl, CURLOPT_INFILE, buffer);
	curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len);
	curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
#ifndef NO_CURL_IOCTL
	curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
	curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer);
#endif
	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
	curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
	curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
}

J
Junio C Hamano 已提交
211 212
static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
{
213 214 215
	struct strbuf buf = STRBUF_INIT;
	struct curl_slist *dav_headers = NULL;

J
Junio C Hamano 已提交
216
	if (options & DAV_HEADER_IF) {
217 218 219 220
		strbuf_addf(&buf, "If: (<%s>)", lock->token);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
J
Junio C Hamano 已提交
221
	if (options & DAV_HEADER_LOCK) {
222 223 224 225
		strbuf_addf(&buf, "Lock-Token: <%s>", lock->token);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
J
Junio C Hamano 已提交
226
	if (options & DAV_HEADER_TIMEOUT) {
227 228 229 230 231 232 233 234 235
		strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout);
		dav_headers = curl_slist_append(dav_headers, buf.buf);
		strbuf_reset(&buf);
	}
	strbuf_release(&buf);

	return dav_headers;
}

236
static void finish_request(struct transfer_request *request);
237
static void release_request(struct transfer_request *request);
238

239
static void process_response(void *callback_data)
240
{
241 242
	struct transfer_request *request =
		(struct transfer_request *)callback_data;
243

244
	finish_request(request);
245 246
}

J
Junio C Hamano 已提交
247
#ifdef USE_CURL_MULTI
248

249 250 251
static void start_fetch_loose(struct transfer_request *request)
{
	struct active_request_slot *slot;
252
	struct http_object_request *obj_req;
253

254 255
	obj_req = new_http_object_request(repo->url, request->obj->sha1);
	if (obj_req == NULL) {
256 257 258 259
		request->state = ABORTED;
		return;
	}

260
	slot = obj_req->slot;
261 262 263
	slot->callback_func = process_response;
	slot->callback_data = request;
	request->slot = slot;
264
	request->userData = obj_req;
265 266 267 268 269

	/* 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");
270
		repo->can_update_info_refs = 0;
271
		release_http_object_request(obj_req);
272 273 274 275
		release_request(request);
	}
}

J
Junio C Hamano 已提交
276 277 278 279 280
static void start_mkcol(struct transfer_request *request)
{
	char *hex = sha1_to_hex(request->obj->sha1);
	struct active_request_slot *slot;

281
	request->url = get_remote_object_url(repo->url, hex, 1);
J
Junio C Hamano 已提交
282 283 284 285

	slot = get_active_slot();
	slot->callback_func = process_response;
	slot->callback_data = request;
286
	curl_setup_http_get(slot->curl, request->url, DAV_MKCOL);
J
Junio C Hamano 已提交
287 288 289 290 291 292 293 294 295 296 297 298 299
	curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr);

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

300 301 302 303 304
static void start_fetch_packed(struct transfer_request *request)
{
	struct packed_git *target;

	struct transfer_request *check_request = request_queue_head;
305
	struct http_pack_request *preq;
306

307
	target = find_sha1_pack(request->obj->sha1, repo->packs);
308 309
	if (!target) {
		fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1));
310
		repo->can_update_info_refs = 0;
311 312 313 314 315 316 317
		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));

318 319 320 321 322 323 324
	preq = new_http_pack_request(target, repo->url);
	if (preq == NULL) {
		release_http_pack_request(preq);
		repo->can_update_info_refs = 0;
		return;
	}
	preq->lst = &repo->packs;
325 326 327 328

	/* Make sure there isn't another open request for this pack */
	while (check_request) {
		if (check_request->state == RUN_FETCH_PACKED &&
329 330
		    !strcmp(check_request->url, preq->url)) {
			release_http_pack_request(preq);
331 332 333 334 335 336
			release_request(request);
			return;
		}
		check_request = check_request->next;
	}

337 338 339 340
	preq->slot->callback_func = process_response;
	preq->slot->callback_data = request;
	request->slot = preq->slot;
	request->userData = preq;
341 342 343

	/* Try to get the request started, abort the request on error */
	request->state = RUN_FETCH_PACKED;
344
	if (!start_active_slot(preq->slot)) {
345
		fprintf(stderr, "Unable to start GET request\n");
346
		release_http_pack_request(preq);
347
		repo->can_update_info_refs = 0;
348 349 350 351
		release_request(request);
	}
}

352 353
static void start_put(struct transfer_request *request)
{
N
Nick Hengeveld 已提交
354
	char *hex = sha1_to_hex(request->obj->sha1);
355
	struct active_request_slot *slot;
356
	struct strbuf buf = STRBUF_INIT;
357
	enum object_type type;
358 359 360 361 362
	char hdr[50];
	void *unpacked;
	unsigned long len;
	int hdrlen;
	ssize_t size;
363
	git_zstream stream;
364

365 366
	unpacked = read_sha1_file(request->obj->sha1, &type, &len);
	hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
367 368 369

	/* Set it up */
	memset(&stream, 0, sizeof(stream));
370
	git_deflate_init(&stream, zlib_compression_level);
J
Junio C Hamano 已提交
371
	size = git_deflate_bound(&stream, len + hdrlen);
M
Mike Hommey 已提交
372 373
	strbuf_init(&request->buffer.buf, size);
	request->buffer.posn = 0;
374 375

	/* Compress it */
M
Mike Hommey 已提交
376
	stream.next_out = (unsigned char *)request->buffer.buf.buf;
377 378 379 380 381
	stream.avail_out = size;

	/* First header.. */
	stream.next_in = (void *)hdr;
	stream.avail_in = hdrlen;
382 383
	while (git_deflate(&stream, 0) == Z_OK)
		; /* nothing */
384 385 386 387

	/* Then the data itself.. */
	stream.next_in = unpacked;
	stream.avail_in = len;
388 389 390
	while (git_deflate(&stream, Z_FINISH) == Z_OK)
		; /* nothing */
	git_deflate_end(&stream);
391 392
	free(unpacked);

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

395
	strbuf_addstr(&buf, "Destination: ");
396
	append_remote_object_url(&buf, repo->url, hex, 0);
397 398
	request->dest = strbuf_detach(&buf, NULL);

399
	append_remote_object_url(&buf, repo->url, hex, 0);
400
	strbuf_add(&buf, request->lock->tmpfile_suffix, 41);
401
	request->url = strbuf_detach(&buf, NULL);
402 403

	slot = get_active_slot();
404 405
	slot->callback_func = process_response;
	slot->callback_data = request;
406 407
	curl_setup_http(slot->curl, request->url, DAV_PUT,
			&request->buffer, fwrite_null);
408 409 410 411 412 413 414

	if (start_active_slot(slot)) {
		request->slot = slot;
		request->state = RUN_PUT;
	} else {
		request->state = ABORTED;
		free(request->url);
N
Nick Hengeveld 已提交
415
		request->url = NULL;
416 417 418 419 420 421 422 423 424
	}
}

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

	slot = get_active_slot();
425 426
	slot->callback_func = process_response;
	slot->callback_data = request;
427
	curl_setup_http_get(slot->curl, request->url, DAV_MOVE);
428 429 430 431 432 433 434 435 436 437
	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);

	if (start_active_slot(slot)) {
		request->slot = slot;
		request->state = RUN_MOVE;
	} else {
		request->state = ABORTED;
		free(request->url);
N
Nick Hengeveld 已提交
438
		request->url = NULL;
439 440 441
	}
}

442
static int refresh_lock(struct remote_lock *lock)
443 444
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
445
	struct slot_results results;
446
	struct curl_slist *dav_headers;
447
	int rc = 0;
448

449
	lock->refreshing = 1;
450

451
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT);
452

453 454
	slot = get_active_slot();
	slot->results = &results;
455
	curl_setup_http_get(slot->curl, lock->url, DAV_LOCK);
456
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
457

458 459 460 461 462 463 464 465 466 467
	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 已提交
468

469 470
	lock->refreshing = 0;
	curl_slist_free_all(dav_headers);
N
Nick Hengeveld 已提交
471

472 473 474
	return rc;
}

475
static void check_locks(void)
476
{
477
	struct remote_lock *lock = repo->locks;
478 479 480 481 482 483 484 485 486 487 488 489 490
	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 已提交
491
			}
492
		}
493
		lock = lock->next;
494
	}
N
Nick Hengeveld 已提交
495
}
496

N
Nick Hengeveld 已提交
497 498 499 500 501 502 503 504 505 506 507 508 509
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;
	}

510
	free(request->url);
N
Nick Hengeveld 已提交
511
	free(request);
512 513
}

514 515
static void finish_request(struct transfer_request *request)
{
516
	struct http_pack_request *preq;
517
	struct http_object_request *obj_req;
518 519

	request->curl_result = request->slot->curl_result;
520 521
	request->http_code = request->slot->http_code;
	request->slot = NULL;
522

N
Nick Hengeveld 已提交
523
	/* Keep locks active */
524
	check_locks();
525

526 527
	if (request->headers != NULL)
		curl_slist_free_all(request->headers);
N
Nick Hengeveld 已提交
528 529 530 531 532

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

N
Nick Hengeveld 已提交
535
	if (request->state == RUN_MKCOL) {
536 537
		if (request->curl_result == CURLE_OK ||
		    request->http_code == 405) {
N
Nick Hengeveld 已提交
538
			remote_dir_exists[request->obj->sha1[0]] = 1;
539 540 541
			start_put(request);
		} else {
			fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
542
				sha1_to_hex(request->obj->sha1),
543 544 545 546 547 548 549 550 551
				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 已提交
552
				sha1_to_hex(request->obj->sha1),
553 554 555 556 557 558
				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 已提交
559 560 561
			if (push_verbosely)
				fprintf(stderr, "    sent %s\n",
					sha1_to_hex(request->obj->sha1));
N
Nick Hengeveld 已提交
562 563
			request->obj->flags |= REMOTE;
			release_request(request);
564 565
		} else {
			fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n",
N
Nick Hengeveld 已提交
566
				sha1_to_hex(request->obj->sha1),
567 568 569 570
				request->curl_result, request->http_code);
			request->state = ABORTED;
			aborted = 1;
		}
571
	} else if (request->state == RUN_FETCH_LOOSE) {
572
		obj_req = (struct http_object_request *)request->userData;
573

574 575 576
		if (finish_http_object_request(obj_req) == 0)
			if (obj_req->rename == 0)
				request->obj->flags |= (LOCAL | REMOTE);
577 578

		/* Try fetching packed if necessary */
579 580
		if (request->obj->flags & LOCAL) {
			release_http_object_request(obj_req);
581
			release_request(request);
582
		} else
583 584 585
			start_fetch_packed(request);

	} else if (request->state == RUN_FETCH_PACKED) {
586
		int fail = 1;
587 588 589 590
		if (request->curl_result != CURLE_OK) {
			fprintf(stderr, "Unable to get pack file %s\n%s",
				request->url, curl_errorstr);
		} else {
591 592 593
			preq = (struct http_pack_request *)request->userData;

			if (preq) {
594
				if (finish_http_pack_request(preq) == 0)
595 596
					fail = 0;
				release_http_pack_request(preq);
597 598
			}
		}
599 600
		if (fail)
			repo->can_update_info_refs = 0;
601
		release_request(request);
602 603 604
	}
}

N
Nick Hengeveld 已提交
605
#ifdef USE_CURL_MULTI
606
static int is_running_queue;
607
static int fill_active_slot(void *unused)
608
{
609
	struct transfer_request *request;
610

611
	if (aborted || !is_running_queue)
612
		return 0;
613

614
	for (request = request_queue_head; request; request = request->next) {
615 616
		if (request->state == NEED_FETCH) {
			start_fetch_loose(request);
617
			return 1;
618
		} else if (pushing && request->state == NEED_PUSH) {
N
Nick Hengeveld 已提交
619
			if (remote_dir_exists[request->obj->sha1[0]] == 1) {
620
				start_put(request);
N
Nick Hengeveld 已提交
621
			} else {
622
				start_mkcol(request);
N
Nick Hengeveld 已提交
623
			}
624
			return 1;
625
		}
N
Nick Hengeveld 已提交
626
	}
627
	return 0;
628
}
N
Nick Hengeveld 已提交
629
#endif
630

N
Nick Hengeveld 已提交
631 632
static void get_remote_object_list(unsigned char parent);

633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657
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->state = NEED_FETCH;
	request->next = request_queue_head;
	request_queue_head = request;

N
Nick Hengeveld 已提交
658
#ifdef USE_CURL_MULTI
659 660
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
661
#endif
662 663
}

N
Nick Hengeveld 已提交
664
static int add_send_request(struct object *obj, struct remote_lock *lock)
665 666 667 668
{
	struct transfer_request *request = request_queue_head;
	struct packed_git *target;

669 670 671
	/* Keep locks active */
	check_locks();

N
Nick Hengeveld 已提交
672 673 674 675 676 677 678
	/*
	 * 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 已提交
679
		return 0;
680
	target = find_sha1_pack(obj->sha1, repo->packs);
N
Nick Hengeveld 已提交
681 682
	if (target) {
		obj->flags |= REMOTE;
N
Nick Hengeveld 已提交
683
		return 0;
N
Nick Hengeveld 已提交
684
	}
685

N
Nick Hengeveld 已提交
686
	obj->flags |= PUSHING;
687
	request = xmalloc(sizeof(*request));
N
Nick Hengeveld 已提交
688
	request->obj = obj;
689
	request->url = NULL;
N
Nick Hengeveld 已提交
690
	request->lock = lock;
691
	request->headers = NULL;
N
Nick Hengeveld 已提交
692
	request->state = NEED_PUSH;
693 694
	request->next = request_queue_head;
	request_queue_head = request;
695

N
Nick Hengeveld 已提交
696
#ifdef USE_CURL_MULTI
697 698
	fill_active_slots();
	step_active_slots();
N
Nick Hengeveld 已提交
699
#endif
N
Nick Hengeveld 已提交
700 701

	return 1;
702 703
}

704
static int fetch_indices(void)
705
{
T
Tay Ray Chuan 已提交
706
	int ret;
707 708 709

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

T
Tay Ray Chuan 已提交
711 712 713 714 715 716 717
	switch (http_get_info_packs(repo->url, &repo->packs)) {
	case HTTP_OK:
	case HTTP_MISSING_TARGET:
		ret = 0;
		break;
	default:
		ret = -1;
718 719
	}

T
Tay Ray Chuan 已提交
720
	return ret;
721 722
}

N
Nick Hengeveld 已提交
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740
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))
741
		object_list_insert(obj, &objects);
N
Nick Hengeveld 已提交
742 743
}

N
Nick Hengeveld 已提交
744
static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
745
{
N
Nick Hengeveld 已提交
746 747 748 749 750 751 752 753 754 755 756 757 758 759 760
	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 已提交
761 762
}

N
Nick Hengeveld 已提交
763
static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed)
N
Nick Hengeveld 已提交
764
{
N
Nick Hengeveld 已提交
765
	struct remote_lock *lock = (struct remote_lock *)ctx->userData;
766 767
	git_SHA_CTX sha_ctx;
	unsigned char lock_token_sha1[20];
N
Nick Hengeveld 已提交
768 769 770 771 772 773

	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)) {
774
			if (!prefixcmp(ctx->cdata, "Second-"))
N
Nick Hengeveld 已提交
775 776 777
				lock->timeout =
					strtol(ctx->cdata + 7, NULL, 10);
		} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) {
778 779
			lock->token = xmalloc(strlen(ctx->cdata) + 1);
			strcpy(lock->token, ctx->cdata);
780 781 782 783 784 785 786

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

			lock->tmpfile_suffix[0] = '_';
			memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40);
N
Nick Hengeveld 已提交
787
		}
N
Nick Hengeveld 已提交
788 789 790
	}
}

791
static void one_remote_ref(const char *refname);
N
Nick Hengeveld 已提交
792

N
Nick Hengeveld 已提交
793
static void
N
Nick Hengeveld 已提交
794
xml_start_tag(void *userData, const char *name, const char **atts)
N
Nick Hengeveld 已提交
795
{
N
Nick Hengeveld 已提交
796
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
797
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
798 799 800 801 802 803 804 805 806 807 808 809
	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 已提交
810
	}
N
Nick Hengeveld 已提交
811 812
	strcat(ctx->name, ".");
	strcat(ctx->name, c);
N
Nick Hengeveld 已提交
813

J
Junio C Hamano 已提交
814 815
	free(ctx->cdata);
	ctx->cdata = NULL;
N
Nick Hengeveld 已提交
816 817

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

820
static void
N
Nick Hengeveld 已提交
821
xml_end_tag(void *userData, const char *name)
822
{
N
Nick Hengeveld 已提交
823
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
D
Dennis Stosberg 已提交
824
	const char *c = strchr(name, ':');
N
Nick Hengeveld 已提交
825
	char *ep;
826

N
Nick Hengeveld 已提交
827 828 829 830 831 832 833 834 835
	ctx->userFunc(ctx, 1);

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

	ep = ctx->name + strlen(ctx->name) - strlen(c) - 1;
	*ep = 0;
836 837 838
}

static void
N
Nick Hengeveld 已提交
839
xml_cdata(void *userData, const XML_Char *s, int len)
840
{
N
Nick Hengeveld 已提交
841
	struct xml_ctx *ctx = (struct xml_ctx *)userData;
J
Junio C Hamano 已提交
842
	free(ctx->cdata);
P
Pierre Habouzit 已提交
843
	ctx->cdata = xmemdupz(s, len);
844 845
}

T
Timo Hirvonen 已提交
846
static struct remote_lock *lock_remote(const char *path, long timeout)
847 848
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
849
	struct slot_results results;
M
Mike Hommey 已提交
850 851
	struct buffer out_buffer = { STRBUF_INIT, 0 };
	struct strbuf in_buffer = STRBUF_INIT;
852
	char *url;
853
	char *ep;
854
	char timeout_header[25];
855
	struct remote_lock *lock = NULL;
856
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
857
	struct xml_ctx ctx;
858
	char *escaped;
859

860 861
	url = xmalloc(strlen(repo->url) + strlen(path) + 1);
	sprintf(url, "%s%s", repo->url, path);
N
Nick Hengeveld 已提交
862

863
	/* Make sure leading directories exist for the remote ref */
864
	ep = strchr(url + strlen(repo->url) + 1, '/');
865
	while (ep) {
866 867
		char saved_character = ep[1];
		ep[1] = '\0';
868
		slot = get_active_slot();
N
Nick Hengeveld 已提交
869
		slot->results = &results;
870
		curl_setup_http_get(slot->curl, url, DAV_MKCOL);
871 872
		if (start_active_slot(slot)) {
			run_active_slot(slot);
N
Nick Hengeveld 已提交
873 874
			if (results.curl_result != CURLE_OK &&
			    results.http_code != 405) {
875 876 877 878 879 880 881
				fprintf(stderr,
					"Unable to create branch path %s\n",
					url);
				free(url);
				return NULL;
			}
		} else {
N
Nick Hengeveld 已提交
882
			fprintf(stderr, "Unable to start MKCOL request\n");
883 884 885
			free(url);
			return NULL;
		}
886
		ep[1] = saved_character;
887 888 889
		ep = strchr(ep + 1, '/');
	}

890
	escaped = xml_entities(ident_default_email());
891 892
	strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped);
	free(escaped);
N
Nick Hengeveld 已提交
893

894
	sprintf(timeout_header, "Timeout: Second-%ld", timeout);
895 896 897 898
	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 已提交
899
	slot->results = &results;
900
	curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer);
901
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
902
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
903

N
Nick Hengeveld 已提交
904 905
	lock = xcalloc(1, sizeof(*lock));
	lock->timeout = -1;
N
Nick Hengeveld 已提交
906

907 908
	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
909
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
910 911
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
912 913 914 915
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
			ctx.userFunc = handle_new_lock_ctx;
N
Nick Hengeveld 已提交
916
			ctx.userData = lock;
N
Nick Hengeveld 已提交
917 918 919 920
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
921 922
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
923 924 925 926 927
			free(ctx.name);
			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
N
Nick Hengeveld 已提交
928
				lock->timeout = -1;
N
Nick Hengeveld 已提交
929
			}
M
Mike Hommey 已提交
930
			XML_ParserFree(parser);
931 932
		}
	} else {
N
Nick Hengeveld 已提交
933
		fprintf(stderr, "Unable to start LOCK request\n");
934 935
	}

N
Nick Hengeveld 已提交
936
	curl_slist_free_all(dav_headers);
M
Mike Hommey 已提交
937 938
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
939

N
Nick Hengeveld 已提交
940
	if (lock->token == NULL || lock->timeout <= 0) {
941 942
		free(lock->token);
		free(lock->owner);
943
		free(url);
N
Nick Hengeveld 已提交
944 945
		free(lock);
		lock = NULL;
N
Nick Hengeveld 已提交
946
	} else {
N
Nick Hengeveld 已提交
947 948
		lock->url = url;
		lock->start_time = time(NULL);
949 950
		lock->next = repo->locks;
		repo->locks = lock;
N
Nick Hengeveld 已提交
951 952
	}

N
Nick Hengeveld 已提交
953
	return lock;
954 955
}

N
Nick Hengeveld 已提交
956
static int unlock_remote(struct remote_lock *lock)
957 958
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
959
	struct slot_results results;
960
	struct remote_lock *prev = repo->locks;
961
	struct curl_slist *dav_headers;
962 963
	int rc = 0;

964
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK);
965 966

	slot = get_active_slot();
N
Nick Hengeveld 已提交
967
	slot->results = &results;
968
	curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK);
969 970 971 972
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
973
		if (results.curl_result == CURLE_OK)
974 975
			rc = 1;
		else
976
			fprintf(stderr, "UNLOCK HTTP error %ld\n",
N
Nick Hengeveld 已提交
977
				results.http_code);
978
	} else {
979
		fprintf(stderr, "Unable to start UNLOCK request\n");
980 981 982
	}

	curl_slist_free_all(dav_headers);
983

984 985
	if (repo->locks == lock) {
		repo->locks = lock->next;
986 987 988 989 990 991 992
	} else {
		while (prev && prev->next != lock)
			prev = prev->next;
		if (prev)
			prev->next = prev->next->next;
	}

993
	free(lock->owner);
994 995 996
	free(lock->url);
	free(lock->token);
	free(lock);
997 998 999 1000

	return rc;
}

1001 1002
static void remove_locks(void)
{
1003
	struct remote_lock *lock = repo->locks;
1004 1005 1006

	fprintf(stderr, "Removing remote locks...\n");
	while (lock) {
1007
		struct remote_lock *next = lock->next;
1008
		unlock_remote(lock);
1009
		lock = next;
1010 1011 1012 1013 1014 1015
	}
}

static void remove_locks_on_signal(int signo)
{
	remove_locks();
1016
	sigchain_pop(signo);
1017 1018 1019
	raise(signo);
}

1020 1021 1022
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData);
N
Nick Hengeveld 已提交
1023

1024 1025 1026 1027 1028
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 已提交
1029

1030 1031 1032 1033
	if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) {
		remote_dir_exists[*parent] = 1;
		return;
	}
N
Nick Hengeveld 已提交
1034

1035 1036 1037 1038
	if (strlen(path) != 49)
		return;
	path += 8;
	obj_hex = xmalloc(strlen(path));
1039 1040
	/* NB: path is not null-terminated, can not use strlcpy here */
	memcpy(obj_hex, path, 2);
1041 1042 1043 1044
	strcpy(obj_hex + 2, path + 3);
	one_remote_object(obj_hex);
	free(obj_hex);
}
N
Nick Hengeveld 已提交
1045

1046 1047 1048 1049 1050 1051
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 已提交
1052

1053 1054 1055
	if (!(ls->dentry_flags & IS_DIR))
		one_remote_ref(ls->dentry_name);
}
N
Nick Hengeveld 已提交
1056

1057 1058 1059
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 已提交
1060

1061 1062 1063
	if (tag_closed) {
		if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) {
			if (ls->dentry_flags & IS_DIR) {
1064 1065 1066 1067

				/* ensure collection names end with slash */
				str_end_url_with_slash(ls->dentry_name, &ls->dentry_name);

1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079
				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 已提交
1080
			}
1081
		} else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) {
1082 1083 1084 1085 1086 1087 1088 1089
			char *path = ctx->cdata;
			if (*ctx->cdata == 'h') {
				path = strstr(path, "//");
				if (path) {
					path = strchr(path+2, '/');
				}
			}
			if (path) {
1090 1091 1092 1093
				const char *url = repo->url;
				if (repo->path)
					url = repo->path;
				if (strncmp(path, url, repo->path_len))
1094
					error("Parsed path '%s' does not match url: '%s'",
1095 1096 1097 1098 1099
					      path, url);
				else {
					path += repo->path_len;
					ls->dentry_name = xstrdup(path);
				}
1100
			}
1101 1102
		} else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
			ls->dentry_flags |= IS_DIR;
N
Nick Hengeveld 已提交
1103
		}
1104
	} else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {
J
Junio C Hamano 已提交
1105
		free(ls->dentry_name);
1106 1107
		ls->dentry_name = NULL;
		ls->dentry_flags = 0;
N
Nick Hengeveld 已提交
1108 1109 1110
	}
}

1111 1112 1113 1114 1115 1116
/*
 * NEEDSWORK: remote_ls() ignores info/refs on the remote side.  But it
 * should _only_ heed the information from that file, instead of trying to
 * determine the refs from the remote file system (badly: it does not even
 * know about packed-refs).
 */
1117 1118 1119
static void remote_ls(const char *path, int flags,
		      void (*userFunc)(struct remote_ls_ctx *ls),
		      void *userData)
N
Nick Hengeveld 已提交
1120
{
1121
	char *url = xmalloc(strlen(repo->url) + strlen(path) + 1);
N
Nick Hengeveld 已提交
1122
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1123
	struct slot_results results;
M
Mike Hommey 已提交
1124 1125
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
N
Nick Hengeveld 已提交
1126 1127
	struct curl_slist *dav_headers = NULL;
	struct xml_ctx ctx;
1128 1129 1130
	struct remote_ls_ctx ls;

	ls.flags = flags;
1131
	ls.path = xstrdup(path);
1132 1133 1134 1135
	ls.dentry_name = NULL;
	ls.dentry_flags = 0;
	ls.userData = userData;
	ls.userFunc = userFunc;
N
Nick Hengeveld 已提交
1136

1137
	sprintf(url, "%s%s", repo->url, path);
N
Nick Hengeveld 已提交
1138

M
Mike Hommey 已提交
1139
	strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST);
N
Nick Hengeveld 已提交
1140 1141 1142 1143 1144

	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 已提交
1145
	slot->results = &results;
1146 1147
	curl_setup_http(slot->curl, url, DAV_PROPFIND,
			&out_buffer, fwrite_buffer);
N
Nick Hengeveld 已提交
1148
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
1149
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
N
Nick Hengeveld 已提交
1150 1151 1152

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1153
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1154 1155
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1156 1157 1158
			ctx.name = xcalloc(10, 1);
			ctx.len = 0;
			ctx.cdata = NULL;
1159 1160
			ctx.userFunc = handle_remote_ls_ctx;
			ctx.userData = &ls;
N
Nick Hengeveld 已提交
1161 1162 1163 1164
			XML_SetUserData(parser, &ctx);
			XML_SetElementHandler(parser, xml_start_tag,
					      xml_end_tag);
			XML_SetCharacterDataHandler(parser, xml_cdata);
M
Mike Hommey 已提交
1165 1166
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1167 1168 1169 1170 1171 1172 1173
			free(ctx.name);

			if (result != XML_STATUS_OK) {
				fprintf(stderr, "XML error: %s\n",
					XML_ErrorString(
						XML_GetErrorCode(parser)));
			}
M
Mike Hommey 已提交
1174
			XML_ParserFree(parser);
N
Nick Hengeveld 已提交
1175 1176
		}
	} else {
1177
		fprintf(stderr, "Unable to start PROPFIND request\n");
N
Nick Hengeveld 已提交
1178 1179
	}

1180
	free(ls.path);
N
Nick Hengeveld 已提交
1181
	free(url);
M
Mike Hommey 已提交
1182 1183
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1184 1185 1186
	curl_slist_free_all(dav_headers);
}

1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199
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 已提交
1200
static int locking_available(void)
1201 1202
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1203
	struct slot_results results;
M
Mike Hommey 已提交
1204 1205
	struct strbuf in_buffer = STRBUF_INIT;
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1206
	struct curl_slist *dav_headers = NULL;
N
Nick Hengeveld 已提交
1207 1208
	struct xml_ctx ctx;
	int lock_flags = 0;
1209
	char *escaped;
1210

1211 1212 1213
	escaped = xml_entities(repo->url);
	strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, escaped);
	free(escaped);
1214 1215 1216

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

1218
	slot = get_active_slot();
N
Nick Hengeveld 已提交
1219
	slot->results = &results;
1220 1221
	curl_setup_http(slot->curl, repo->url, DAV_PROPFIND,
			&out_buffer, fwrite_buffer);
1222
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
1223
	curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
1224 1225 1226

	if (start_active_slot(slot)) {
		run_active_slot(slot);
N
Nick Hengeveld 已提交
1227
		if (results.curl_result == CURLE_OK) {
M
Mike Hommey 已提交
1228 1229
			XML_Parser parser = XML_ParserCreate(NULL);
			enum XML_Status result;
N
Nick Hengeveld 已提交
1230 1231 1232 1233 1234 1235 1236 1237
			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 已提交
1238 1239
			result = XML_Parse(parser, in_buffer.buf,
					   in_buffer.len, 1);
N
Nick Hengeveld 已提交
1240 1241 1242 1243 1244 1245 1246 1247
			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 已提交
1248
			XML_ParserFree(parser);
1249
			if (!lock_flags)
1250
				error("no DAV locking support on %s",
1251
				      repo->url);
1252 1253 1254

		} else {
			error("Cannot access URL %s, return code %d",
1255
			      repo->url, results.curl_result);
1256
			lock_flags = 0;
1257 1258
		}
	} else {
1259
		error("Unable to start PROPFIND request on %s", repo->url);
1260 1261
	}

M
Mike Hommey 已提交
1262 1263
	strbuf_release(&out_buffer.buf);
	strbuf_release(&in_buffer);
N
Nick Hengeveld 已提交
1264 1265 1266
	curl_slist_free_all(dav_headers);

	return lock_flags;
1267 1268
}

P
Pierre Habouzit 已提交
1269
static struct object_list **add_one_object(struct object *obj, struct object_list **p)
1270 1271 1272 1273 1274 1275 1276 1277
{
	struct object_list *entry = xmalloc(sizeof(struct object_list));
	entry->item = obj;
	entry->next = *p;
	*p = entry;
	return &entry->next;
}

N
Nick Hengeveld 已提交
1278 1279 1280 1281
static struct object_list **process_blob(struct blob *blob,
					 struct object_list **p,
					 struct name_path *path,
					 const char *name)
1282
{
N
Nick Hengeveld 已提交
1283
	struct object *obj = &blob->object;
1284

N
Nick Hengeveld 已提交
1285 1286 1287 1288 1289 1290
	obj->flags |= LOCAL;

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

	obj->flags |= SEEN;
1291
	return add_one_object(obj, p);
N
Nick Hengeveld 已提交
1292 1293 1294 1295 1296 1297 1298 1299
}

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;
1300
	struct tree_desc desc;
1301
	struct name_entry entry;
N
Nick Hengeveld 已提交
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311
	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;
1312
	name = xstrdup(name);
1313
	p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1314 1315 1316
	me.up = path;
	me.elem = name;
	me.elem_len = strlen(name);
1317

1318
	init_tree_desc(&desc, tree->buffer, tree->size);
1319

1320 1321 1322
	while (tree_entry(&desc, &entry))
		switch (object_type(entry.mode)) {
		case OBJ_TREE:
1323
			p = process_tree(lookup_tree(entry.sha1), p, &me, name);
1324 1325
			break;
		case OBJ_BLOB:
1326
			p = process_blob(lookup_blob(entry.sha1), p, &me, name);
1327 1328 1329 1330 1331 1332
			break;
		default:
			/* Subproject commit - not in this repository */
			break;
		}

1333 1334
	free(tree->buffer);
	tree->buffer = NULL;
N
Nick Hengeveld 已提交
1335
	return p;
1336 1337
}

N
Nick Hengeveld 已提交
1338
static int get_delta(struct rev_info *revs, struct remote_lock *lock)
1339
{
1340
	int i;
1341
	struct commit *commit;
1342
	struct object_list **p = &objects;
N
Nick Hengeveld 已提交
1343
	int count = 0;
1344

N
Nick Hengeveld 已提交
1345 1346 1347 1348
	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 已提交
1349
			count += add_send_request(&commit->object, lock);
N
Nick Hengeveld 已提交
1350
	}
1351

1352 1353 1354 1355
	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;
1356

N
Nick Hengeveld 已提交
1357 1358
		if (obj->flags & (UNINTERESTING | SEEN))
			continue;
1359
		if (obj->type == OBJ_TAG) {
N
Nick Hengeveld 已提交
1360
			obj->flags |= SEEN;
1361
			p = add_one_object(obj, p);
N
Nick Hengeveld 已提交
1362
			continue;
1363
		}
1364
		if (obj->type == OBJ_TREE) {
N
Nick Hengeveld 已提交
1365 1366
			p = process_tree((struct tree *)obj, p, NULL, name);
			continue;
1367
		}
1368
		if (obj->type == OBJ_BLOB) {
N
Nick Hengeveld 已提交
1369 1370
			p = process_blob((struct blob *)obj, p, NULL, name);
			continue;
1371
		}
N
Nick Hengeveld 已提交
1372 1373 1374 1375 1376
		die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
	}

	while (objects) {
		if (!(objects->item->flags & UNINTERESTING))
N
Nick Hengeveld 已提交
1377
			count += add_send_request(objects->item, lock);
N
Nick Hengeveld 已提交
1378
		objects = objects->next;
1379
	}
N
Nick Hengeveld 已提交
1380 1381

	return count;
1382 1383
}

N
Nick Hengeveld 已提交
1384
static int update_remote(unsigned char *sha1, struct remote_lock *lock)
1385 1386
{
	struct active_request_slot *slot;
N
Nick Hengeveld 已提交
1387
	struct slot_results results;
M
Mike Hommey 已提交
1388
	struct buffer out_buffer = { STRBUF_INIT, 0 };
1389
	struct curl_slist *dav_headers;
1390

1391
	dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1392

M
Mike Hommey 已提交
1393
	strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
1394 1395

	slot = get_active_slot();
N
Nick Hengeveld 已提交
1396
	slot->results = &results;
1397 1398
	curl_setup_http(slot->curl, lock->url, DAV_PUT,
			&out_buffer, fwrite_null);
1399 1400 1401 1402
	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

	if (start_active_slot(slot)) {
		run_active_slot(slot);
M
Mike Hommey 已提交
1403
		strbuf_release(&out_buffer.buf);
N
Nick Hengeveld 已提交
1404
		if (results.curl_result != CURLE_OK) {
1405 1406
			fprintf(stderr,
				"PUT error: curl result=%d, HTTP code=%ld\n",
N
Nick Hengeveld 已提交
1407
				results.curl_result, results.http_code);
1408 1409 1410 1411
			/* We should attempt recovery? */
			return 0;
		}
	} else {
M
Mike Hommey 已提交
1412
		strbuf_release(&out_buffer.buf);
1413 1414 1415 1416 1417 1418 1419
		fprintf(stderr, "Unable to start PUT request\n");
		return 0;
	}

	return 1;
}

1420
static struct ref *remote_refs;
N
Nick Hengeveld 已提交
1421

1422
static void one_remote_ref(const char *refname)
N
Nick Hengeveld 已提交
1423 1424
{
	struct ref *ref;
1425
	struct object *obj;
N
Nick Hengeveld 已提交
1426

1427
	ref = alloc_ref(refname);
1428

1429
	if (http_fetch_ref(repo->url, ref) != 0) {
N
Nick Hengeveld 已提交
1430 1431
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
1432
			refname, repo->url);
1433
		free(ref);
N
Nick Hengeveld 已提交
1434 1435 1436
		return;
	}

1437 1438 1439 1440
	/*
	 * Fetch a copy of the object if it doesn't exist locally - it
	 * may be required for updating server info later.
	 */
1441
	if (repo->can_update_info_refs && !has_sha1_file(ref->old_sha1)) {
1442
		obj = lookup_unknown_object(ref->old_sha1);
1443 1444
		if (obj) {
			fprintf(stderr,	"  fetch %s for %s\n",
1445
				sha1_to_hex(ref->old_sha1), refname);
1446 1447 1448 1449
			add_fetch_request(obj);
		}
	}

1450 1451
	ref->next = remote_refs;
	remote_refs = ref;
N
Nick Hengeveld 已提交
1452 1453 1454 1455
}

static void get_dav_remote_heads(void)
{
1456
	remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL);
N
Nick Hengeveld 已提交
1457 1458
}

1459 1460
static void add_remote_info_ref(struct remote_ls_ctx *ls)
{
M
Mike Hommey 已提交
1461
	struct strbuf *buf = (struct strbuf *)ls->userData;
1462 1463 1464
	struct object *o;
	int len;
	char *ref_info;
1465 1466
	struct ref *ref;

1467
	ref = alloc_ref(ls->dentry_name);
1468

1469
	if (http_fetch_ref(repo->url, ref) != 0) {
1470 1471
		fprintf(stderr,
			"Unable to fetch ref %s from %s\n",
1472
			ls->dentry_name, repo->url);
1473
		aborted = 1;
1474
		free(ref);
1475 1476 1477
		return;
	}

1478
	o = parse_object(ref->old_sha1);
1479 1480 1481
	if (!o) {
		fprintf(stderr,
			"Unable to parse object %s for remote ref %s\n",
1482
			sha1_to_hex(ref->old_sha1), ls->dentry_name);
1483
		aborted = 1;
1484
		free(ref);
1485 1486 1487 1488 1489 1490
		return;
	}

	len = strlen(ls->dentry_name) + 42;
	ref_info = xcalloc(len + 1, 1);
	sprintf(ref_info, "%s	%s\n",
1491
		sha1_to_hex(ref->old_sha1), ls->dentry_name);
1492 1493 1494
	fwrite_buffer(ref_info, 1, len, buf);
	free(ref_info);

1495
	if (o->type == OBJ_TAG) {
1496 1497 1498 1499 1500 1501 1502 1503 1504 1505
		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);
		}
	}
1506
	free(ref);
1507 1508 1509 1510
}

static void update_remote_info_refs(struct remote_lock *lock)
{
M
Mike Hommey 已提交
1511
	struct buffer buffer = { STRBUF_INIT, 0 };
1512 1513
	struct active_request_slot *slot;
	struct slot_results results;
1514
	struct curl_slist *dav_headers;
1515 1516

	remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
M
Mike Hommey 已提交
1517
		  add_remote_info_ref, &buffer.buf);
1518
	if (!aborted) {
1519
		dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1520 1521 1522

		slot = get_active_slot();
		slot->results = &results;
1523 1524
		curl_setup_http(slot->curl, lock->url, DAV_PUT,
				&buffer, fwrite_null);
1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535
		curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);

		if (start_active_slot(slot)) {
			run_active_slot(slot);
			if (results.curl_result != CURLE_OK) {
				fprintf(stderr,
					"PUT error: curl result=%d, HTTP code=%ld\n",
					results.curl_result, results.http_code);
			}
		}
	}
M
Mike Hommey 已提交
1536
	strbuf_release(&buffer.buf);
1537 1538 1539 1540
}

static int remote_exists(const char *path)
{
1541
	char *url = xmalloc(strlen(repo->url) + strlen(path) + 1);
1542
	int ret;
1543

1544
	sprintf(url, "%s%s", repo->url, path);
1545

1546
	switch (http_get_strbuf(url, NULL, NULL, 0)) {
1547 1548 1549 1550 1551 1552 1553
	case HTTP_OK:
		ret = 1;
		break;
	case HTTP_MISSING_TARGET:
		ret = 0;
		break;
	case HTTP_ERROR:
J
Jeff King 已提交
1554
		error("unable to access '%s': %s", url, curl_errorstr);
1555 1556
	default:
		ret = -1;
1557
	}
1558 1559
	free(url);
	return ret;
1560 1561
}

T
Timo Hirvonen 已提交
1562
static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
1563 1564
{
	char *url;
M
Mike Hommey 已提交
1565
	struct strbuf buffer = STRBUF_INIT;
1566

1567 1568
	url = xmalloc(strlen(repo->url) + strlen(path) + 1);
	sprintf(url, "%s%s", repo->url, path);
1569

1570
	if (http_get_strbuf(url, NULL, &buffer, 0) != HTTP_OK)
1571 1572
		die("Couldn't get %s for remote symref\n%s", url,
		    curl_errorstr);
1573 1574
	free(url);

1575
	free(*symref);
1576
	*symref = NULL;
1577
	hashclr(sha1);
1578

M
Mike Hommey 已提交
1579
	if (buffer.len == 0)
1580 1581 1582
		return;

	/* If it's a symref, set the refname; otherwise try for a sha1 */
M
Mike Hommey 已提交
1583 1584
	if (!prefixcmp((char *)buffer.buf, "ref: ")) {
		*symref = xmemdupz((char *)buffer.buf + 5, buffer.len - 6);
1585
	} else {
M
Mike Hommey 已提交
1586
		get_sha1_hex(buffer.buf, sha1);
1587 1588
	}

M
Mike Hommey 已提交
1589
	strbuf_release(&buffer);
1590 1591
}

1592
static int verify_merge_base(unsigned char *head_sha1, struct ref *remote)
1593
{
1594 1595
	struct commit *head = lookup_commit_or_die(head_sha1, "HEAD");
	struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name);
1596

1597
	return in_merge_bases(branch, head);
1598 1599
}

1600
static int delete_remote_branch(const char *pattern, int force)
1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639
{
	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 */
1640
	for (i = 0; symref && i < MAXDEPTH; i++) {
1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651
		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");
1652
		if (is_null_sha1(head_sha1))
1653 1654 1655 1656 1657
			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 */
1658
		if (is_null_sha1(remote_ref->old_sha1))
1659 1660 1661 1662 1663 1664
			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 */
1665
		if (!verify_merge_base(head_sha1, remote_ref)) {
1666 1667 1668 1669
			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'",
1670
				     remote_ref->name, repo->url, pattern);
1671 1672 1673 1674 1675
		}
	}

	/* Send delete request */
	fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name);
1676 1677
	if (dry_run)
		return 0;
1678 1679
	url = xmalloc(strlen(repo->url) + strlen(remote_ref->name) + 1);
	sprintf(url, "%s%s", repo->url, remote_ref->name);
1680 1681
	slot = get_active_slot();
	slot->results = &results;
1682
	curl_setup_http_get(slot->curl, url, DAV_DELETE);
1683 1684 1685 1686
	if (start_active_slot(slot)) {
		run_active_slot(slot);
		free(url);
		if (results.curl_result != CURLE_OK)
1687
			return error("DELETE request failed (%d/%ld)",
1688 1689 1690 1691 1692 1693 1694 1695 1696
				     results.curl_result, results.http_code);
	} else {
		free(url);
		return error("Unable to start DELETE request");
	}

	return 0;
}

1697
static void run_request_queue(void)
1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715
{
#ifdef USE_CURL_MULTI
	is_running_queue = 1;
	fill_active_slots();
	add_fill_function(NULL, fill_active_slot);
#endif
	do {
		finish_all_active_slots();
#ifdef USE_CURL_MULTI
		fill_active_slots();
#endif
	} while (request_queue_head && !aborted);

#ifdef USE_CURL_MULTI
	is_running_queue = 0;
#endif
}

1716 1717 1718 1719 1720 1721
int main(int argc, char **argv)
{
	struct transfer_request *request;
	struct transfer_request *next_request;
	int nr_refspec = 0;
	char **refspec = NULL;
1722
	struct remote_lock *ref_lock = NULL;
1723
	struct remote_lock *info_ref_lock = NULL;
N
Nick Hengeveld 已提交
1724
	struct rev_info revs;
1725 1726
	int delete_branch = 0;
	int force_delete = 0;
N
Nick Hengeveld 已提交
1727
	int objects_to_send;
1728 1729
	int rc = 0;
	int i;
1730
	int new_refs;
1731
	struct ref *ref, *local_refs;
1732

1733 1734
	git_setup_gettext();

1735 1736
	git_extract_argv0_path(argv[0]);

1737
	repo = xcalloc(sizeof(*repo), 1);
1738 1739 1740 1741 1742 1743

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

		if (*arg == '-') {
N
Nick Hengeveld 已提交
1744
			if (!strcmp(arg, "--all")) {
A
Andy Whitcroft 已提交
1745
				push_all = MATCH_REFS_ALL;
1746 1747 1748 1749 1750 1751
				continue;
			}
			if (!strcmp(arg, "--force")) {
				force_all = 1;
				continue;
			}
1752 1753 1754 1755
			if (!strcmp(arg, "--dry-run")) {
				dry_run = 1;
				continue;
			}
1756 1757 1758 1759
			if (!strcmp(arg, "--helper-status")) {
				helper_status = 1;
				continue;
			}
1760 1761
			if (!strcmp(arg, "--verbose")) {
				push_verbosely = 1;
1762
				http_is_verbose = 1;
1763 1764
				continue;
			}
1765 1766 1767 1768 1769 1770 1771 1772 1773
			if (!strcmp(arg, "-d")) {
				delete_branch = 1;
				continue;
			}
			if (!strcmp(arg, "-D")) {
				delete_branch = 1;
				force_delete = 1;
				continue;
			}
1774 1775
			if (!strcmp(arg, "-h"))
				usage(http_push_usage);
1776
		}
1777
		if (!repo->url) {
N
Nick Hengeveld 已提交
1778
			char *path = strstr(arg, "//");
1779 1780
			str_end_url_with_slash(arg, &repo->url);
			repo->path_len = strlen(repo->url);
N
Nick Hengeveld 已提交
1781
			if (path) {
1782 1783 1784
				repo->path = strchr(path+2, '/');
				if (repo->path)
					repo->path_len = strlen(repo->path);
N
Nick Hengeveld 已提交
1785
			}
1786 1787 1788 1789 1790 1791 1792
			continue;
		}
		refspec = argv;
		nr_refspec = argc - i;
		break;
	}

1793 1794 1795 1796
#ifndef USE_CURL_MULTI
	die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
#endif

1797
	if (!repo->url)
N
Nick Hengeveld 已提交
1798 1799
		usage(http_push_usage);

1800 1801 1802
	if (delete_branch && nr_refspec != 1)
		die("You must specify only one branch name when deleting a remote branch");

1803 1804
	setup_git_directory();

N
Nick Hengeveld 已提交
1805
	memset(remote_dir_exists, -1, 256);
1806

J
Jeff King 已提交
1807
	http_init(NULL, repo->url, 1);
1808

1809
#ifdef USE_CURL_MULTI
1810
	is_running_queue = 0;
1811
#endif
1812

1813
	/* Verify DAV compliance/lock support */
N
Nick Hengeveld 已提交
1814
	if (!locking_available()) {
1815 1816 1817 1818
		rc = 1;
		goto cleanup;
	}

1819
	sigchain_push_common(remove_locks_on_signal);
1820

1821
	/* Check whether the remote has server info files */
1822 1823 1824 1825
	repo->can_update_info_refs = 0;
	repo->has_info_refs = remote_exists("info/refs");
	repo->has_info_packs = remote_exists("objects/info/packs");
	if (repo->has_info_refs) {
1826 1827
		info_ref_lock = lock_remote("info/refs", LOCK_TIME);
		if (info_ref_lock)
1828
			repo->can_update_info_refs = 1;
1829
		else {
1830
			error("cannot lock existing info/refs");
1831 1832 1833
			rc = 1;
			goto cleanup;
		}
1834
	}
1835
	if (repo->has_info_packs)
1836 1837
		fetch_indices();

N
Nick Hengeveld 已提交
1838
	/* Get a list of all local and remote heads to validate refspecs */
1839
	local_refs = get_local_heads();
N
Nick Hengeveld 已提交
1840 1841
	fprintf(stderr, "Fetching remote heads...\n");
	get_dav_remote_heads();
1842
	run_request_queue();
N
Nick Hengeveld 已提交
1843

1844 1845
	/* Remove a remote branch if -d or -D was specified */
	if (delete_branch) {
1846
		if (delete_remote_branch(refspec[0], force_delete) == -1) {
1847 1848
			fprintf(stderr, "Unable to delete remote branch %s\n",
				refspec[0]);
1849 1850 1851
			if (helper_status)
				printf("error %s cannot remove\n", refspec[0]);
		}
1852 1853 1854
		goto cleanup;
	}

N
Nick Hengeveld 已提交
1855
	/* match them up */
1856 1857
	if (match_push_refs(local_refs, &remote_refs,
			    nr_refspec, (const char **) refspec, push_all)) {
1858 1859 1860
		rc = -1;
		goto cleanup;
	}
N
Nick Hengeveld 已提交
1861 1862
	if (!remote_refs) {
		fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
1863 1864
		if (helper_status)
			printf("error null no match\n");
1865 1866
		rc = 0;
		goto cleanup;
N
Nick Hengeveld 已提交
1867 1868
	}

1869
	new_refs = 0;
N
Nick Hengeveld 已提交
1870 1871
	for (ref = remote_refs; ref; ref = ref->next) {
		char old_hex[60], *new_hex;
1872
		const char *commit_argv[5];
1873 1874 1875
		int commit_argc;
		char *new_sha1_hex, *old_sha1_hex;

N
Nick Hengeveld 已提交
1876 1877
		if (!ref->peer_ref)
			continue;
1878

1879
		if (is_null_sha1(ref->peer_ref->new_sha1)) {
1880 1881
			if (delete_remote_branch(ref->name, 1) == -1) {
				error("Could not remove %s", ref->name);
1882 1883
				if (helper_status)
					printf("error %s cannot remove\n", ref->name);
1884 1885
				rc = -4;
			}
1886 1887
			else if (helper_status)
				printf("ok %s\n", ref->name);
1888 1889 1890 1891
			new_refs++;
			continue;
		}

1892
		if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
1893
			if (push_verbosely)
N
Nick Hengeveld 已提交
1894
				fprintf(stderr, "'%s': up-to-date\n", ref->name);
1895 1896
			if (helper_status)
				printf("ok %s up to date\n", ref->name);
N
Nick Hengeveld 已提交
1897 1898 1899 1900
			continue;
		}

		if (!force_all &&
1901
		    !is_null_sha1(ref->old_sha1) &&
N
Nick Hengeveld 已提交
1902 1903 1904 1905
		    !ref->force) {
			if (!has_sha1_file(ref->old_sha1) ||
			    !ref_newer(ref->peer_ref->new_sha1,
				       ref->old_sha1)) {
1906 1907
				/*
				 * We do not have the remote ref, or
N
Nick Hengeveld 已提交
1908 1909 1910 1911 1912 1913
				 * 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.
				 */
1914 1915 1916
				error("remote '%s' is not an ancestor of\n"
				      "local '%s'.\n"
				      "Maybe you are not up-to-date and "
N
Nick Hengeveld 已提交
1917 1918 1919
				      "need to pull first?",
				      ref->name,
				      ref->peer_ref->name);
1920 1921
				if (helper_status)
					printf("error %s non-fast forward\n", ref->name);
N
Nick Hengeveld 已提交
1922
				rc = -2;
N
Nick Hengeveld 已提交
1923 1924
				continue;
			}
1925
		}
1926
		hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
N
Nick Hengeveld 已提交
1927 1928 1929 1930 1931 1932 1933 1934
		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);
1935 1936 1937
		if (dry_run) {
			if (helper_status)
				printf("ok %s\n", ref->name);
1938
			continue;
1939
		}
1940 1941

		/* Lock remote branch ref */
N
Nick Hengeveld 已提交
1942 1943
		ref_lock = lock_remote(ref->name, LOCK_TIME);
		if (ref_lock == NULL) {
1944
			fprintf(stderr, "Unable to lock remote branch %s\n",
N
Nick Hengeveld 已提交
1945
				ref->name);
1946 1947
			if (helper_status)
				printf("error %s lock error\n", ref->name);
1948 1949 1950 1951
			rc = 1;
			continue;
		}

N
Nick Hengeveld 已提交
1952
		/* Set up revision info for this refspec */
1953
		commit_argc = 3;
1954
		new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1));
1955
		old_sha1_hex = NULL;
N
Nick Hengeveld 已提交
1956 1957
		commit_argv[1] = "--objects";
		commit_argv[2] = new_sha1_hex;
1958
		if (!push_all && !is_null_sha1(ref->old_sha1)) {
N
Nick Hengeveld 已提交
1959 1960 1961
			old_sha1_hex = xmalloc(42);
			sprintf(old_sha1_hex, "^%s",
				sha1_to_hex(ref->old_sha1));
N
Nick Hengeveld 已提交
1962
			commit_argv[3] = old_sha1_hex;
N
Nick Hengeveld 已提交
1963
			commit_argc++;
1964
		}
1965
		commit_argv[commit_argc] = NULL;
1966
		init_revisions(&revs, setup_git_directory());
N
Nick Hengeveld 已提交
1967
		setup_revisions(commit_argc, commit_argv, &revs, NULL);
1968
		revs.edge_hint = 0; /* just in case */
N
Nick Hengeveld 已提交
1969 1970 1971 1972
		free(new_sha1_hex);
		if (old_sha1_hex) {
			free(old_sha1_hex);
			commit_argv[1] = NULL;
1973 1974
		}

N
Nick Hengeveld 已提交
1975
		/* Generate a list of objects that need to be pushed */
1976
		pushing = 0;
1977 1978
		if (prepare_revision_walk(&revs))
			die("revision walk setup failed");
1979
		mark_edges_uninteresting(revs.commits, &revs, NULL);
N
Nick Hengeveld 已提交
1980
		objects_to_send = get_delta(&revs, ref_lock);
1981
		finish_all_active_slots();
1982 1983 1984 1985

		/* Push missing objects to remote, this would be a
		   convenient time to pack them first if appropriate. */
		pushing = 1;
N
Nick Hengeveld 已提交
1986 1987 1988
		if (objects_to_send)
			fprintf(stderr, "    sending %d objects\n",
				objects_to_send);
1989 1990

		run_request_queue();
1991 1992

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

N
Nick Hengeveld 已提交
1996 1997
		if (!rc)
			fprintf(stderr, "    done\n");
1998 1999
		if (helper_status)
			printf("%s %s\n", !rc ? "ok" : "error", ref->name);
N
Nick Hengeveld 已提交
2000
		unlock_remote(ref_lock);
2001
		check_locks();
2002 2003
	}

2004
	/* Update remote server info if appropriate */
2005 2006
	if (repo->has_info_refs && new_refs) {
		if (info_ref_lock && repo->can_update_info_refs) {
2007
			fprintf(stderr, "Updating remote server info\n");
2008 2009
			if (!dry_run)
				update_remote_info_refs(info_ref_lock);
2010 2011 2012 2013 2014
		} else {
			fprintf(stderr, "Unable to update server info\n");
		}
	}

2015
 cleanup:
2016 2017
	if (info_ref_lock)
		unlock_remote(info_ref_lock);
2018
	free(repo);
2019

2020
	http_cleanup();
2021 2022 2023 2024 2025 2026 2027 2028 2029 2030

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

	return rc;
}