upload-pack.c 11.0 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 8
#include "tag.h"
#include "object.h"
9
#include "commit.h"
10
#include "exec_cmd.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)
17
static int multi_ack = 0, nr_our_refs = 0;
18
static int use_thin_pack = 0;
19 20
static struct object_array have_obj;
static struct object_array want_obj;
21
static unsigned int timeout = 0;
22
static int use_sideband = 0;
23 24 25 26 27

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

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

36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
#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;
52 53 54 55
		if (fd == 2) {
			xwrite(fd, data, sz);
			return sz;
		}
56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
		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;
}

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

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

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

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

113
		dup2(lp_pipe[1], 1);
114
		close(0);
115 116
		close(lp_pipe[0]);
		close(lp_pipe[1]);
117
		*p++ = "rev-list";
118
		*p++ = use_thin_pack ? "--objects-edge" : "--objects";
119
		if (create_full_pack)
120 121
			*p++ = "--all";
		else {
122 123
			for (i = 0; i < want_obj.nr; i++) {
				struct object *o = want_obj.objects[i].item;
124
				*p++ = buf;
125
				memcpy(buf, sha1_to_hex(o->sha1), 41);
126 127
				buf += 41;
			}
128
		}
129
		if (!create_full_pack)
130 131
			for (i = 0; i < have_obj.nr; i++) {
				struct object *o = have_obj.objects[i].item;
132 133
				*p++ = buf;
				*buf++ = '^';
134
				memcpy(buf, sha1_to_hex(o->sha1), 41);
135 136
				buf += 41;
			}
137
		*p++ = NULL;
138
		execv_git_cmd(argv);
139 140
		die("git-upload-pack: unable to exec git-rev-list");
	}
141 142 143

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

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

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

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

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

185 186
		reset_timeout();

187
		pollsize = 0;
188
		pe = pu = -1;
189 190 191 192 193 194 195

		if (0 <= pu_pipe[0]) {
			pfd[pollsize].fd = pu_pipe[0];
			pfd[pollsize].events = POLLIN;
			pu = pollsize;
			pollsize++;
		}
196 197 198 199 200 201
		if (0 <= pe_pipe[0]) {
			pfd[pollsize].fd = pe_pipe[0];
			pfd[pollsize].events = POLLIN;
			pe = pollsize;
			pollsize++;
		}
202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246

		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;
247
				sz = send_client_data(1, data, sz);
248 249 250
				if (sz < 0)
					goto fail;
			}
251
			if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
252 253
				/* Status ready; we ship that in the side-band
				 * or dump to the standard error.
254 255 256 257
				 */
				sz = read(pe_pipe[0], progress,
					  sizeof(progress));
				if (0 < sz)
258
					send_client_data(2, progress, sz);
259 260 261 262 263 264 265
				else if (sz == 0) {
					close(pe_pipe[0]);
					pe_pipe[0] = -1;
				}
				else
					goto fail;
			}
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 300 301 302 303 304 305
		}

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

323 324
static int got_sha1(char *hex, unsigned char *sha1)
{
325 326
	struct object *o;

327 328
	if (get_sha1_hex(hex, sha1))
		die("git-upload-pack: expected SHA1 object, got '%s'", hex);
329 330
	if (!has_sha1_file(sha1))
		return 0;
331 332 333 334 335 336

	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 已提交
337
	if (o->type == OBJ_COMMIT) {
338 339 340 341 342 343 344 345
		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;
346
	}
347
	add_object_array(o, NULL, &have_obj);
348
	return 1;
349 350 351 352 353
}

static int get_common_commits(void)
{
	static char line[1000];
354
	unsigned char sha1[20], last_sha1[20];
355 356
	int len;

357 358 359
	track_object_refs = 0;
	save_commit_buffer = 0;

360 361
	for(;;) {
		len = packet_read_line(0, line, sizeof(line));
362
		reset_timeout();
363 364

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

395
static void receive_needs(void)
396 397
{
	static char line[1000];
398
	int len;
399 400

	for (;;) {
401
		struct object *o;
402
		unsigned char sha1_buf[20];
403
		len = packet_read_line(0, line, sizeof(line));
404
		reset_timeout();
405
		if (!len)
406
			return;
407

408 409
		if (strncmp("want ", line, 5) ||
		    get_sha1_hex(line+5, sha1_buf))
410 411
			die("git-upload-pack: protocol error, "
			    "expected to get sha, not '%s'", line);
412 413
		if (strstr(line+45, "multi_ack"))
			multi_ack = 1;
414 415
		if (strstr(line+45, "thin-pack"))
			use_thin_pack = 1;
416 417
		if (strstr(line+45, "side-band"))
			use_sideband = 1;
418 419 420 421 422 423 424 425 426 427 428 429 430 431

		/* 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;
432
			add_object_array(o, NULL, &want_obj);
433
		}
434 435 436
	}
}

437 438
static int send_ref(const char *refname, const unsigned char *sha1)
{
T
Timo Hirvonen 已提交
439
	static const char *capabilities = "multi_ack thin-pack side-band";
440 441
	struct object *o = parse_object(sha1);

442 443 444
	if (!o)
		die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));

J
Johannes Schindelin 已提交
445 446 447 448 449 450
	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;
451 452 453 454
	if (!(o->flags & OUR_REF)) {
		o->flags |= OUR_REF;
		nr_our_refs++;
	}
455
	if (o->type == OBJ_TAG) {
456
		o = deref_tag(o, refname, 0);
457 458
		packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
	}
459 460 461
	return 0;
}

462
static void upload_pack(void)
463
{
464
	reset_timeout();
465
	head_ref(send_ref);
466 467
	for_each_ref(send_ref);
	packet_flush(1);
468
	receive_needs();
469 470 471 472
	if (want_obj.nr) {
		get_common_commits();
		create_pack_file();
	}
473 474 475 476
}

int main(int argc, char **argv)
{
477
	char *dir;
478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500
	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)
501
		usage(upload_pack_usage);
502
	dir = argv[i];
503

504 505
	if (!enter_repo(dir, strict))
		die("'%s': unable to chdir or not a git archive", dir);
506

507 508 509
	upload_pack();
	return 0;
}