upload-pack.c 10.9 KB
Newer Older
1 2 3
#include <signal.h>
#include <sys/wait.h>
#include <sys/poll.h>
4 5 6
#include "cache.h"
#include "refs.h"
#include "pkt-line.h"
7
#include "sideband.h"
8 9
#include "tag.h"
#include "object.h"
10
#include "commit.h"
11
#include "exec_cmd.h"
12

13
static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
14

15
#define THEY_HAVE (1U << 0)
16 17
#define OUR_REF (1U << 1)
#define WANTED (1U << 2)
18 19
static int multi_ack, nr_our_refs;
static int use_thin_pack;
20 21
static struct object_array have_obj;
static struct object_array want_obj;
22
static unsigned int timeout;
23 24 25
/* 0 for no sideband,
 * otherwise maximum packet size (up to 65520 bytes).
 */
26
static int use_sideband;
27 28 29 30 31

static void reset_timeout(void)
{
	alarm(timeout);
}
32

33 34 35 36 37 38 39
static int strip(char *line, int len)
{
	if (len && line[len-1] == '\n')
		line[--len] = 0;
	return len;
}

40 41
static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
{
42
	if (use_sideband)
43
		return send_sideband(1, fd, data, sz, use_sideband);
44 45 46 47 48 49
	if (fd == 3)
		/* emergency quit */
		fd = 2;
	if (fd == 2) {
		xwrite(fd, data, sz);
		return sz;
50
	}
51
	return safe_write(fd, data, sz);
52 53
}

54 55
static void create_pack_file(void)
{
56 57 58 59
	/* Pipes between rev-list to pack-objects, pack-objects to us
	 * and pack-objects error stream for progress bar.
	 */
	int lp_pipe[2], pu_pipe[2], pe_pipe[2];
60
	pid_t pid_rev_list, pid_pack_objects;
61
	int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
62
	char data[8193], progress[128];
63 64
	char abort_msg[] = "aborting due to possible repository "
		"corruption on the remote side.";
65
	int buffered = -1;
66

67
	if (pipe(lp_pipe) < 0)
68
		die("git-upload-pack: unable to create pipe");
69 70
	pid_rev_list = fork();
	if (pid_rev_list < 0)
71 72
		die("git-upload-pack: unable to fork git-rev-list");

73
	if (!pid_rev_list) {
74
		int i;
75
		int args;
J
Junio C Hamano 已提交
76
		const char **argv;
T
Timo Hirvonen 已提交
77
		const char **p;
78 79
		char *buf;

80
		if (create_full_pack) {
81
			args = 10;
82 83
			use_thin_pack = 0; /* no point doing it */
		}
84
		else
85
			args = have_obj.nr + want_obj.nr + 5;
J
Junio C Hamano 已提交
86 87
		p = xmalloc(args * sizeof(char *));
		argv = (const char **) p;
88
		buf = xmalloc(args * 45);
89

90
		dup2(lp_pipe[1], 1);
91
		close(0);
92 93
		close(lp_pipe[0]);
		close(lp_pipe[1]);
94
		*p++ = "rev-list";
95
		*p++ = use_thin_pack ? "--objects-edge" : "--objects";
96
		if (create_full_pack)
97 98
			*p++ = "--all";
		else {
99 100
			for (i = 0; i < want_obj.nr; i++) {
				struct object *o = want_obj.objects[i].item;
101
				*p++ = buf;
102
				memcpy(buf, sha1_to_hex(o->sha1), 41);
103 104
				buf += 41;
			}
105
		}
106
		if (!create_full_pack)
107 108
			for (i = 0; i < have_obj.nr; i++) {
				struct object *o = have_obj.objects[i].item;
109 110
				*p++ = buf;
				*buf++ = '^';
111
				memcpy(buf, sha1_to_hex(o->sha1), 41);
112 113
				buf += 41;
			}
114
		*p++ = NULL;
115
		execv_git_cmd(argv);
116 117
		die("git-upload-pack: unable to exec git-rev-list");
	}
118 119 120

	if (pipe(pu_pipe) < 0)
		die("git-upload-pack: unable to create pipe");
121 122
	if (pipe(pe_pipe) < 0)
		die("git-upload-pack: unable to create pipe");
123 124 125 126 127 128 129 130 131
	pid_pack_objects = fork();
	if (pid_pack_objects < 0) {
		/* daemon sets things up to ignore TERM */
		kill(pid_rev_list, SIGKILL);
		die("git-upload-pack: unable to fork git-pack-objects");
	}
	if (!pid_pack_objects) {
		dup2(lp_pipe[0], 0);
		dup2(pu_pipe[1], 1);
132
		dup2(pe_pipe[1], 2);
133 134 135 136 137

		close(lp_pipe[0]);
		close(lp_pipe[1]);
		close(pu_pipe[0]);
		close(pu_pipe[1]);
138 139 140
		close(pe_pipe[0]);
		close(pe_pipe[1]);
		execl_git_cmd("pack-objects", "--stdout", "--progress", NULL);
141 142 143 144 145 146 147
		kill(pid_rev_list, SIGKILL);
		die("git-upload-pack: unable to exec git-pack-objects");
	}

	close(lp_pipe[0]);
	close(lp_pipe[1]);

148 149
	/* We read from pe_pipe[0] to capture stderr output for
	 * progress bar, and pu_pipe[0] to capture the pack data.
150
	 */
151
	close(pe_pipe[1]);
152 153 154 155 156 157 158 159
	close(pu_pipe[1]);

	while (1) {
		const char *who;
		struct pollfd pfd[2];
		pid_t pid;
		int status;
		ssize_t sz;
160
		int pe, pu, pollsize;
161

162 163
		reset_timeout();

164
		pollsize = 0;
165
		pe = pu = -1;
166 167 168 169 170 171 172

		if (0 <= pu_pipe[0]) {
			pfd[pollsize].fd = pu_pipe[0];
			pfd[pollsize].events = POLLIN;
			pu = pollsize;
			pollsize++;
		}
173 174 175 176 177 178
		if (0 <= pe_pipe[0]) {
			pfd[pollsize].fd = pe_pipe[0];
			pfd[pollsize].events = POLLIN;
			pe = pollsize;
			pollsize++;
		}
179 180 181 182 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 211 212 213 214 215 216 217 218 219 220 221 222 223

		if (pollsize) {
			if (poll(pfd, pollsize, -1) < 0) {
				if (errno != EINTR) {
					error("poll failed, resuming: %s",
					      strerror(errno));
					sleep(1);
				}
				continue;
			}
			if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
				/* Data ready; we keep the last byte
				 * to ourselves in case we detect
				 * broken rev-list, so that we can
				 * leave the stream corrupted.  This
				 * is unfortunate -- unpack-objects
				 * would happily accept a valid pack
				 * data with trailing garbage, so
				 * appending garbage after we pass all
				 * the pack data is not good enough to
				 * signal breakage to downstream.
				 */
				char *cp = data;
				ssize_t outsz = 0;
				if (0 <= buffered) {
					*cp++ = buffered;
					outsz++;
				}
				sz = read(pu_pipe[0], cp,
					  sizeof(data) - outsz);
				if (0 < sz)
						;
				else if (sz == 0) {
					close(pu_pipe[0]);
					pu_pipe[0] = -1;
				}
				else
					goto fail;
				sz += outsz;
				if (1 < sz) {
					buffered = data[sz-1] & 0xFF;
					sz--;
				}
				else
					buffered = -1;
224
				sz = send_client_data(1, data, sz);
225 226 227
				if (sz < 0)
					goto fail;
			}
228
			if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
229 230
				/* Status ready; we ship that in the side-band
				 * or dump to the standard error.
231 232 233 234
				 */
				sz = read(pe_pipe[0], progress,
					  sizeof(progress));
				if (0 < sz)
235
					send_client_data(2, progress, sz);
236 237 238 239 240 241 242
				else if (sz == 0) {
					close(pe_pipe[0]);
					pe_pipe[0] = -1;
				}
				else
					goto fail;
			}
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
		}

		/* See if the children are still there */
		if (pid_rev_list || pid_pack_objects) {
			pid = waitpid(-1, &status, WNOHANG);
			if (!pid)
				continue;
			who = ((pid == pid_rev_list) ? "git-rev-list" :
			       (pid == pid_pack_objects) ? "git-pack-objects" :
			       NULL);
			if (!who) {
				if (pid < 0) {
					error("git-upload-pack: %s",
					      strerror(errno));
					goto fail;
				}
				error("git-upload-pack: we weren't "
				      "waiting for %d", pid);
				continue;
			}
			if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) {
				error("git-upload-pack: %s died with error.",
				      who);
				goto fail;
			}
			if (pid == pid_rev_list)
				pid_rev_list = 0;
			if (pid == pid_pack_objects)
				pid_pack_objects = 0;
			if (pid_rev_list || pid_pack_objects)
				continue;
		}

		/* both died happily */
		if (pollsize)
			continue;

		/* flush the data */
		if (0 <= buffered) {
			data[0] = buffered;
283
			sz = send_client_data(1, data, 1);
284 285 286 287
			if (sz < 0)
				goto fail;
			fprintf(stderr, "flushed.\n");
		}
288 289
		if (use_sideband)
			packet_flush(1);
290 291 292 293 294 295 296
		return;
	}
 fail:
	if (pid_pack_objects)
		kill(pid_pack_objects, SIGKILL);
	if (pid_rev_list)
		kill(pid_rev_list, SIGKILL);
297 298
	send_client_data(3, abort_msg, sizeof(abort_msg));
	die("git-upload-pack: %s", abort_msg);
299 300
}

301 302
static int got_sha1(char *hex, unsigned char *sha1)
{
303 304
	struct object *o;

305 306
	if (get_sha1_hex(hex, sha1))
		die("git-upload-pack: expected SHA1 object, got '%s'", hex);
307 308
	if (!has_sha1_file(sha1))
		return 0;
309 310 311 312 313 314

	o = lookup_object(sha1);
	if (!(o && o->parsed))
		o = parse_object(sha1);
	if (!o)
		die("oops (%s)", sha1_to_hex(sha1));
J
Junio C Hamano 已提交
315
	if (o->type == OBJ_COMMIT) {
316 317 318 319 320 321 322 323
		struct commit_list *parents;
		if (o->flags & THEY_HAVE)
			return 0;
		o->flags |= THEY_HAVE;
		for (parents = ((struct commit*)o)->parents;
		     parents;
		     parents = parents->next)
			parents->item->object.flags |= THEY_HAVE;
324
	}
325
	add_object_array(o, NULL, &have_obj);
326
	return 1;
327 328 329 330 331
}

static int get_common_commits(void)
{
	static char line[1000];
332 333
	unsigned char sha1[20];
	char hex[41], last_hex[41];
334 335
	int len;

336 337 338
	track_object_refs = 0;
	save_commit_buffer = 0;

339 340
	for(;;) {
		len = packet_read_line(0, line, sizeof(line));
341
		reset_timeout();
342 343

		if (!len) {
344
			if (have_obj.nr == 0 || multi_ack)
345
				packet_write(1, "NAK\n");
346 347
			continue;
		}
348
		len = strip(line, len);
349
		if (!strncmp(line, "have ", 5)) {
350 351 352 353 354 355 356 357 358
			if (got_sha1(line+5, sha1)) {
				memcpy(hex, sha1_to_hex(sha1), 41);
				if (multi_ack) {
					const char *msg = "ACK %s continue\n";
					packet_write(1, msg, hex);
					memcpy(last_hex, hex, 41);
				}
				else if (have_obj.nr == 1)
					packet_write(1, "ACK %s\n", hex);
359
			}
360 361 362
			continue;
		}
		if (!strcmp(line, "done")) {
363
			if (have_obj.nr > 0) {
364
				if (multi_ack)
365
					packet_write(1, "ACK %s\n", last_hex);
366 367
				return 0;
			}
368 369 370 371 372 373 374
			packet_write(1, "NAK\n");
			return -1;
		}
		die("git-upload-pack: expected SHA1 list, got '%s'", line);
	}
}

375
static void receive_needs(void)
376 377
{
	static char line[1000];
378
	int len;
379 380

	for (;;) {
381
		struct object *o;
382
		unsigned char sha1_buf[20];
383
		len = packet_read_line(0, line, sizeof(line));
384
		reset_timeout();
385
		if (!len)
386
			return;
387

388 389
		if (strncmp("want ", line, 5) ||
		    get_sha1_hex(line+5, sha1_buf))
390 391
			die("git-upload-pack: protocol error, "
			    "expected to get sha, not '%s'", line);
392 393
		if (strstr(line+45, "multi_ack"))
			multi_ack = 1;
394 395
		if (strstr(line+45, "thin-pack"))
			use_thin_pack = 1;
396 397 398 399
		if (strstr(line+45, "side-band-64k"))
			use_sideband = LARGE_PACKET_MAX;
		else if (strstr(line+45, "side-band"))
			use_sideband = DEFAULT_PACKET_MAX;
400 401 402 403 404 405 406 407 408 409 410 411 412 413

		/* We have sent all our refs already, and the other end
		 * should have chosen out of them; otherwise they are
		 * asking for nonsense.
		 *
		 * Hmph.  We may later want to allow "want" line that
		 * asks for something like "master~10" (symbolic)...
		 * would it make sense?  I don't know.
		 */
		o = lookup_object(sha1_buf);
		if (!o || !(o->flags & OUR_REF))
			die("git-upload-pack: not our ref %s", line+5);
		if (!(o->flags & WANTED)) {
			o->flags |= WANTED;
414
			add_object_array(o, NULL, &want_obj);
415
		}
416 417 418
	}
}

419
static int send_ref(const char *refname, const unsigned char *sha1, void *cb_data)
420
{
421
	static const char *capabilities = "multi_ack thin-pack side-band side-band-64k";
422 423
	struct object *o = parse_object(sha1);

424 425 426
	if (!o)
		die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));

J
Johannes Schindelin 已提交
427 428 429 430 431 432
	if (capabilities)
		packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
			0, capabilities);
	else
		packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
	capabilities = NULL;
433 434 435 436
	if (!(o->flags & OUR_REF)) {
		o->flags |= OUR_REF;
		nr_our_refs++;
	}
437
	if (o->type == OBJ_TAG) {
438
		o = deref_tag(o, refname, 0);
439 440
		packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
	}
441 442 443
	return 0;
}

444
static void upload_pack(void)
445
{
446
	reset_timeout();
447 448
	head_ref(send_ref, NULL);
	for_each_ref(send_ref, NULL);
449
	packet_flush(1);
450
	receive_needs();
451 452 453 454
	if (want_obj.nr) {
		get_common_commits();
		create_pack_file();
	}
455 456 457 458
}

int main(int argc, char **argv)
{
459
	char *dir;
460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482
	int i;
	int strict = 0;

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

		if (arg[0] != '-')
			break;
		if (!strcmp(arg, "--strict")) {
			strict = 1;
			continue;
		}
		if (!strncmp(arg, "--timeout=", 10)) {
			timeout = atoi(arg+10);
			continue;
		}
		if (!strcmp(arg, "--")) {
			i++;
			break;
		}
	}
	
	if (i != argc-1)
483
		usage(upload_pack_usage);
484
	dir = argv[i];
485

486 487
	if (!enter_repo(dir, strict))
		die("'%s': unable to chdir or not a git archive", dir);
488

489 490 491
	upload_pack();
	return 0;
}