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

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

14
#define THEY_HAVE (1U << 0)
15 16
#define OUR_REF (1U << 1)
#define WANTED (1U << 2)
J
Junio C Hamano 已提交
17 18
#define MAX_HAS 256
#define MAX_NEEDS 256
19
static int nr_has = 0, nr_needs = 0, multi_ack = 0, nr_our_refs = 0;
20
static int use_thin_pack = 0;
21 22
static unsigned char has_sha1[MAX_HAS][20];
static unsigned char needs_sha1[MAX_NEEDS][20];
23
static unsigned int timeout = 0;
24
static int use_sideband = 0;
25 26 27 28 29

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

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

38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
#define PACKET_MAX 1000
static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
{
	ssize_t ssz;
	const char *p;

	if (!data) {
		if (!use_sideband)
			return 0;
		packet_flush(1);
	}

	if (!use_sideband) {
		if (fd == 3)
			/* emergency quit */
			fd = 2;
		return safe_write(fd, data, sz);
	}
	p = data;
	ssz = sz;
	while (sz) {
		unsigned n;
		char hdr[5];

		n = sz;
		if (PACKET_MAX - 5 < n)
			n = PACKET_MAX - 5;
		sprintf(hdr, "%04x", n + 5);
		hdr[4] = fd;
		safe_write(1, hdr, 5);
		safe_write(1, p, n);
		p += n;
		sz -= n;
	}
	return ssz;
}

75 76
static void create_pack_file(void)
{
77 78 79 80
	/* 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];
81
	pid_t pid_rev_list, pid_pack_objects;
82
	int create_full_pack = (nr_our_refs == nr_needs && !nr_has);
83
	char data[8193], progress[128];
84 85
	char abort_msg[] = "aborting due to possible repository "
		"corruption on the remote side.";
86
	int buffered = -1;
87

88
	if (pipe(lp_pipe) < 0)
89
		die("git-upload-pack: unable to create pipe");
90 91
	pid_rev_list = fork();
	if (pid_rev_list < 0)
92 93
		die("git-upload-pack: unable to fork git-rev-list");

94
	if (!pid_rev_list) {
95
		int i;
96
		int args;
J
Junio C Hamano 已提交
97
		const char **argv;
T
Timo Hirvonen 已提交
98
		const char **p;
99 100
		char *buf;

101
		if (create_full_pack) {
102
			args = 10;
103 104
			use_thin_pack = 0; /* no point doing it */
		}
105 106
		else
			args = nr_has + nr_needs + 5;
J
Junio C Hamano 已提交
107 108
		p = xmalloc(args * sizeof(char *));
		argv = (const char **) p;
109
		buf = xmalloc(args * 45);
110

111
		dup2(lp_pipe[1], 1);
112
		close(0);
113 114
		close(lp_pipe[0]);
		close(lp_pipe[1]);
115
		*p++ = "rev-list";
116
		*p++ = use_thin_pack ? "--objects-edge" : "--objects";
117
		if (create_full_pack || MAX_NEEDS <= nr_needs)
118 119 120 121 122 123 124
			*p++ = "--all";
		else {
			for (i = 0; i < nr_needs; i++) {
				*p++ = buf;
				memcpy(buf, sha1_to_hex(needs_sha1[i]), 41);
				buf += 41;
			}
125
		}
126 127 128 129 130 131 132
		if (!create_full_pack)
			for (i = 0; i < nr_has; i++) {
				*p++ = buf;
				*buf++ = '^';
				memcpy(buf, sha1_to_hex(has_sha1[i]), 41);
				buf += 41;
			}
133
		*p++ = NULL;
134
		execv_git_cmd(argv);
135 136
		die("git-upload-pack: unable to exec git-rev-list");
	}
137 138 139

	if (pipe(pu_pipe) < 0)
		die("git-upload-pack: unable to create pipe");
140 141
	if (pipe(pe_pipe) < 0)
		die("git-upload-pack: unable to create pipe");
142 143 144 145 146 147 148 149 150
	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);
151
		dup2(pe_pipe[1], 2);
152 153 154 155 156

		close(lp_pipe[0]);
		close(lp_pipe[1]);
		close(pu_pipe[0]);
		close(pu_pipe[1]);
157 158 159
		close(pe_pipe[0]);
		close(pe_pipe[1]);
		execl_git_cmd("pack-objects", "--stdout", "--progress", NULL);
160 161 162 163 164 165 166
		kill(pid_rev_list, SIGKILL);
		die("git-upload-pack: unable to exec git-pack-objects");
	}

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

167 168
	/* We read from pe_pipe[0] to capture stderr output for
	 * progress bar, and pu_pipe[0] to capture the pack data.
169
	 */
170
	close(pe_pipe[1]);
171 172 173 174 175 176 177 178
	close(pu_pipe[1]);

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

		pollsize = 0;
182
		pe = pu = -1;
183 184 185 186 187 188 189

		if (0 <= pu_pipe[0]) {
			pfd[pollsize].fd = pu_pipe[0];
			pfd[pollsize].events = POLLIN;
			pu = pollsize;
			pollsize++;
		}
190 191 192 193 194 195
		if (0 <= pe_pipe[0]) {
			pfd[pollsize].fd = pe_pipe[0];
			pfd[pollsize].events = POLLIN;
			pe = pollsize;
			pollsize++;
		}
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 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240

		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;
241
				sz = send_client_data(1, data, sz);
242 243 244
				if (sz < 0)
					goto fail;
			}
245
			if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
246 247
				/* Status ready; we ship that in the side-band
				 * or dump to the standard error.
248 249 250 251
				 */
				sz = read(pe_pipe[0], progress,
					  sizeof(progress));
				if (0 < sz)
252
					send_client_data(2, progress, sz);
253 254 255 256 257 258 259
				else if (sz == 0) {
					close(pe_pipe[0]);
					pe_pipe[0] = -1;
				}
				else
					goto fail;
			}
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 292 293 294 295 296 297 298 299
		}

		/* 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;
300
			sz = send_client_data(1, data, 1);
301 302 303 304
			if (sz < 0)
				goto fail;
			fprintf(stderr, "flushed.\n");
		}
305
		send_client_data(1, NULL, 0);
306 307 308 309 310 311 312
		return;
	}
 fail:
	if (pid_pack_objects)
		kill(pid_pack_objects, SIGKILL);
	if (pid_rev_list)
		kill(pid_rev_list, SIGKILL);
313 314
	send_client_data(3, abort_msg, sizeof(abort_msg));
	die("git-upload-pack: %s", abort_msg);
315 316
}

317 318 319 320
static int got_sha1(char *hex, unsigned char *sha1)
{
	if (get_sha1_hex(hex, sha1))
		die("git-upload-pack: expected SHA1 object, got '%s'", hex);
321 322
	if (!has_sha1_file(sha1))
		return 0;
323 324 325 326 327 328
	if (nr_has < MAX_HAS) {
		struct object *o = lookup_object(sha1);
		if (!(o && o->parsed))
			o = parse_object(sha1);
		if (!o)
			die("oops (%s)", sha1_to_hex(sha1));
L
Linus Torvalds 已提交
329
		if (o->type == TYPE_COMMIT) {
330 331 332 333 334 335 336 337 338 339
			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;
		}
		memcpy(has_sha1[nr_has++], sha1, 20);
340 341
	}
	return 1;
342 343 344 345 346
}

static int get_common_commits(void)
{
	static char line[1000];
347
	unsigned char sha1[20], last_sha1[20];
348 349
	int len;

350 351 352
	track_object_refs = 0;
	save_commit_buffer = 0;

353 354
	for(;;) {
		len = packet_read_line(0, line, sizeof(line));
355
		reset_timeout();
356 357

		if (!len) {
358 359
			if (nr_has == 0 || multi_ack)
				packet_write(1, "NAK\n");
360 361
			continue;
		}
362
		len = strip(line, len);
363
		if (!strncmp(line, "have ", 5)) {
364 365 366 367 368 369 370 371 372
			if (got_sha1(line+5, sha1) &&
					(multi_ack || nr_has == 1)) {
				if (nr_has >= MAX_HAS)
					multi_ack = 0;
				packet_write(1, "ACK %s%s\n",
					sha1_to_hex(sha1),
					multi_ack ?  " continue" : "");
				if (multi_ack)
					memcpy(last_sha1, sha1, 20);
373
			}
374 375 376
			continue;
		}
		if (!strcmp(line, "done")) {
377 378 379 380 381 382
			if (nr_has > 0) {
				if (multi_ack)
					packet_write(1, "ACK %s\n",
							sha1_to_hex(last_sha1));
				return 0;
			}
383 384 385 386 387 388 389
			packet_write(1, "NAK\n");
			return -1;
		}
		die("git-upload-pack: expected SHA1 list, got '%s'", line);
	}
}

390 391 392 393 394 395 396
static int receive_needs(void)
{
	static char line[1000];
	int len, needs;

	needs = 0;
	for (;;) {
397
		struct object *o;
398
		unsigned char dummy[20], *sha1_buf;
399
		len = packet_read_line(0, line, sizeof(line));
400
		reset_timeout();
401 402 403
		if (!len)
			return needs;

404 405 406 407 408 409 410 411 412 413 414 415 416
		sha1_buf = dummy;
		if (needs == MAX_NEEDS) {
			fprintf(stderr,
				"warning: supporting only a max of %d requests. "
				"sending everything instead.\n",
				MAX_NEEDS);
		}
		else if (needs < MAX_NEEDS)
			sha1_buf = needs_sha1[needs];

		if (strncmp("want ", line, 5) || get_sha1_hex(line+5, sha1_buf))
			die("git-upload-pack: protocol error, "
			    "expected to get sha, not '%s'", line);
417 418
		if (strstr(line+45, "multi_ack"))
			multi_ack = 1;
419 420
		if (strstr(line+45, "thin-pack"))
			use_thin_pack = 1;
421 422
		if (strstr(line+45, "side-band"))
			use_sideband = 1;
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438

		/* 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;
			needs++;
		}
439 440 441
	}
}

442 443
static int send_ref(const char *refname, const unsigned char *sha1)
{
T
Timo Hirvonen 已提交
444
	static const char *capabilities = "multi_ack thin-pack side-band";
445 446
	struct object *o = parse_object(sha1);

447 448 449
	if (!o)
		die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));

J
Johannes Schindelin 已提交
450 451 452 453 454 455
	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;
456 457 458 459
	if (!(o->flags & OUR_REF)) {
		o->flags |= OUR_REF;
		nr_our_refs++;
	}
L
Linus Torvalds 已提交
460
	if (o->type == TYPE_TAG) {
461
		o = deref_tag(o, refname, 0);
462 463
		packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
	}
464 465 466 467 468
	return 0;
}

static int upload_pack(void)
{
469
	reset_timeout();
470
	head_ref(send_ref);
471 472
	for_each_ref(send_ref);
	packet_flush(1);
473 474 475
	nr_needs = receive_needs();
	if (!nr_needs)
		return 0;
476
	get_common_commits();
477
	create_pack_file();
478 479 480 481 482
	return 0;
}

int main(int argc, char **argv)
{
483
	char *dir;
484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506
	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)
507
		usage(upload_pack_usage);
508
	dir = argv[i];
509

510 511
	if (!enter_repo(dir, strict))
		die("'%s': unable to chdir or not a git archive", dir);
512

513 514 515
	upload_pack();
	return 0;
}