bundle.c 11.1 KB
Newer Older
1 2 3 4 5 6 7 8
#include "cache.h"
#include "bundle.h"
#include "object.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
#include "run-command.h"
Junio C Hamano's avatar
Junio C Hamano committed
9
#include "refs.h"
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25

static const char bundle_signature[] = "# v2 git bundle\n";

static void add_to_ref_list(const unsigned char *sha1, const char *name,
		struct ref_list *list)
{
	if (list->nr + 1 >= list->alloc) {
		list->alloc = alloc_nr(list->nr + 1);
		list->list = xrealloc(list->list,
				list->alloc * sizeof(list->list[0]));
	}
	memcpy(list->list[list->nr].sha1, sha1, 20);
	list->list[list->nr].name = xstrdup(name);
	list->nr++;
}

26 27
static int parse_bundle_header(int fd, struct bundle_header *header,
			       const char *report_path)
28
{
29 30
	struct strbuf buf = STRBUF_INIT;
	int status = 0;
31

32
	/* The bundle header begins with the signature */
33
	if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
34
	    strcmp(buf.buf, bundle_signature)) {
35
		if (report_path)
36
			error(_("'%s' does not look like a v2 bundle file"),
37
			      report_path);
38 39
		status = -1;
		goto abort;
40
	}
41 42

	/* The bundle header ends with an empty line */
43
	while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
44
	       buf.len && buf.buf[0] != '\n') {
45
		unsigned char sha1[20];
46 47 48 49 50
		int is_prereq = 0;

		if (*buf.buf == '-') {
			is_prereq = 1;
			strbuf_remove(&buf, 0, 1);
51
		}
52
		strbuf_rtrim(&buf);
53

54 55 56 57 58 59
		/*
		 * Tip lines have object name, SP, and refname.
		 * Prerequisites have object name that is optionally
		 * followed by SP and subject line.
		 */
		if (get_sha1_hex(buf.buf, sha1) ||
60
		    (buf.len > 40 && !isspace(buf.buf[40])) ||
61
		    (!is_prereq && buf.len <= 40)) {
62
			if (report_path)
63
				error(_("unrecognized header: %s%s (%d)"),
64
				      (is_prereq ? "-" : ""), buf.buf, (int)buf.len);
65 66 67 68 69 70 71
			status = -1;
			break;
		} else {
			if (is_prereq)
				add_to_ref_list(sha1, "", &header->prerequisites);
			else
				add_to_ref_list(sha1, buf.buf + 41, &header->references);
72 73
		}
	}
74 75 76 77 78

 abort:
	if (status) {
		close(fd);
		fd = -1;
79
	}
80
	strbuf_release(&buf);
81 82 83
	return fd;
}

84 85 86 87
int read_bundle_header(const char *path, struct bundle_header *header)
{
	int fd = open(path, O_RDONLY);

88
	if (fd < 0)
89
		return error(_("could not open '%s'"), path);
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
	return parse_bundle_header(fd, header, path);
}

int is_bundle(const char *path, int quiet)
{
	struct bundle_header header;
	int fd = open(path, O_RDONLY);

	if (fd < 0)
		return 0;
	memset(&header, 0, sizeof(header));
	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
	if (fd >= 0)
		close(fd);
	return (fd >= 0);
105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
}

static int list_refs(struct ref_list *r, int argc, const char **argv)
{
	int i;

	for (i = 0; i < r->nr; i++) {
		if (argc > 1) {
			int j;
			for (j = 1; j < argc; j++)
				if (!strcmp(r->list[i].name, argv[j]))
					break;
			if (j == argc)
				continue;
		}
		printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
				r->list[i].name);
	}
	return 0;
}

#define PREREQ_MARK (1u<<16)

int verify_bundle(struct bundle_header *header, int verbose)
{
	/*
	 * Do fast check, then if any prereqs are missing then go line by line
	 * to be verbose about the errors
	 */
	struct ref_list *p = &header->prerequisites;
	struct rev_info revs;
136
	const char *argv[] = {NULL, "--all", NULL};
137 138 139
	struct object_array refs;
	struct commit *commit;
	int i, ret = 0, req_nr;
140
	const char *message = _("Repository lacks these prerequisite commits:");
141 142 143 144 145 146 147 148 149 150 151

	init_revisions(&revs, NULL);
	for (i = 0; i < p->nr; i++) {
		struct ref_list_entry *e = p->list + i;
		struct object *o = parse_object(e->sha1);
		if (o) {
			o->flags |= PREREQ_MARK;
			add_pending_object(&revs, o, e->name);
			continue;
		}
		if (++ret == 1)
152
			error("%s", message);
153 154 155 156 157 158 159
		error("%s %s", sha1_to_hex(e->sha1), e->name);
	}
	if (revs.pending.nr != p->nr)
		return ret;
	req_nr = revs.pending.nr;
	setup_revisions(2, argv, &revs, NULL);

160 161
	refs = revs.pending;
	revs.leak_pending = 1;
162

163
	if (prepare_revision_walk(&revs))
164
		die(_("revision walk setup failed"));
165 166 167 168 169 170 171 172 173

	i = req_nr;
	while (i && (commit = get_revision(&revs)))
		if (commit->object.flags & PREREQ_MARK)
			i--;

	for (i = 0; i < req_nr; i++)
		if (!(refs.objects[i].item->flags & SHOWN)) {
			if (++ret == 1)
174
				error("%s", message);
175 176 177 178
			error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
				refs.objects[i].name);
		}

179
	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
180
	free(refs.objects);
181 182 183 184 185

	if (verbose) {
		struct ref_list *r;

		r = &header->references;
186 187
		printf_ln(Q_("The bundle contains this ref:",
			     "The bundle contains these %d refs:",
188 189
			     r->nr),
			  r->nr);
190
		list_refs(r, 0, NULL);
191
		r = &header->prerequisites;
192 193 194
		if (!r->nr) {
			printf_ln(_("The bundle records a complete history."));
		} else {
195 196
			printf_ln(Q_("The bundle requires this ref:",
				     "The bundle requires these %d refs:",
197 198 199 200
				     r->nr),
				  r->nr);
			list_refs(r, 0, NULL);
		}
201 202 203 204 205 206 207 208 209
	}
	return ret;
}

int list_bundle_refs(struct bundle_header *header, int argc, const char **argv)
{
	return list_refs(&header->references, argc, argv);
}

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
static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
{
	unsigned long size;
	enum object_type type;
	char *buf, *line, *lineend;
	unsigned long date;

	if (revs->max_age == -1 && revs->min_age == -1)
		return 1;

	buf = read_sha1_file(tag->sha1, &type, &size);
	if (!buf)
		return 1;
	line = memmem(buf, size, "\ntagger ", 8);
	if (!line++)
		return 1;
	lineend = memchr(line, buf + size - line, '\n');
	line = memchr(line, lineend ? lineend - line : buf + size - line, '>');
	if (!line++)
		return 1;
	date = strtoul(line, NULL, 10);
	free(buf);
	return (revs->max_age == -1 || revs->max_age < date) &&
		(revs->min_age == -1 || revs->min_age > date);
}

236 237 238 239 240 241 242
int create_bundle(struct bundle_header *header, const char *path,
		int argc, const char **argv)
{
	static struct lock_file lock;
	int bundle_fd = -1;
	int bundle_to_stdout;
	const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
243
	const char **argv_pack = xmalloc(6 * sizeof(const char *));
244
	int i, ref_count = 0;
245
	struct strbuf buf = STRBUF_INIT;
246 247 248 249 250 251 252 253
	struct rev_info revs;
	struct child_process rls;
	FILE *rls_fout;

	bundle_to_stdout = !strcmp(path, "-");
	if (bundle_to_stdout)
		bundle_fd = 1;
	else
254 255
		bundle_fd = hold_lock_file_for_update(&lock, path,
						      LOCK_DIE_ON_ERROR);
256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275

	/* write signature */
	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));

	/* init revs to list objects for pack-objects later */
	save_commit_buffer = 0;
	init_revisions(&revs, NULL);

	/* write prerequisites */
	memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *));
	argv_boundary[0] = "rev-list";
	argv_boundary[1] = "--boundary";
	argv_boundary[2] = "--pretty=oneline";
	argv_boundary[argc + 2] = NULL;
	memset(&rls, 0, sizeof(rls));
	rls.argv = argv_boundary;
	rls.out = -1;
	rls.git_cmd = 1;
	if (start_command(&rls))
		return -1;
276
	rls_fout = xfdopen(rls.out, "r");
277
	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
278
		unsigned char sha1[20];
279 280 281
		if (buf.len > 0 && buf.buf[0] == '-') {
			write_or_die(bundle_fd, buf.buf, buf.len);
			if (!get_sha1_hex(buf.buf + 1, sha1)) {
282
				struct object *object = parse_object_or_die(sha1, buf.buf);
283
				object->flags |= UNINTERESTING;
284
				add_pending_object(&revs, object, buf.buf);
285
			}
286
		} else if (!get_sha1_hex(buf.buf, sha1)) {
287
			struct object *object = parse_object_or_die(sha1, buf.buf);
288 289 290
			object->flags |= SHOWN;
		}
	}
291
	strbuf_release(&buf);
292 293
	fclose(rls_fout);
	if (finish_command(&rls))
294
		return error(_("rev-list died"));
295 296 297

	/* write references */
	argc = setup_revisions(argc, argv, &revs, NULL);
298

299
	if (argc > 1)
Junio C Hamano's avatar
Junio C Hamano committed
300
		return error(_("unrecognized argument: %s"), argv[1]);
301

302 303
	object_array_remove_duplicates(&revs.pending);

304 305 306 307
	for (i = 0; i < revs.pending.nr; i++) {
		struct object_array_entry *e = revs.pending.objects + i;
		unsigned char sha1[20];
		char *ref;
Junio C Hamano's avatar
Junio C Hamano committed
308 309
		const char *display_ref;
		int flag;
310 311 312 313 314

		if (e->item->flags & UNINTERESTING)
			continue;
		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
			continue;
315
		if (read_ref_full(e->name, sha1, 1, &flag))
Junio C Hamano's avatar
Junio C Hamano committed
316 317 318
			flag = 0;
		display_ref = (flag & REF_ISSYMREF) ? e->name : ref;

319 320 321 322 323 324
		if (e->item->type == OBJ_TAG &&
				!is_tag_in_date_range(e->item, &revs)) {
			e->item->flags |= UNINTERESTING;
			continue;
		}

325 326 327 328 329 330 331 332 333 334
		/*
		 * Make sure the refs we wrote out is correct; --max-count and
		 * other limiting options could have prevented all the tips
		 * from getting output.
		 *
		 * Non commit objects such as tags and blobs do not have
		 * this issue as they are not affected by those extra
		 * constraints.
		 */
		if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
335
			warning(_("ref '%s' is excluded by the rev-list options"),
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363
				e->name);
			free(ref);
			continue;
		}
		/*
		 * If you run "git bundle create bndl v1.0..v2.0", the
		 * name of the positive ref is "v2.0" but that is the
		 * commit that is referenced by the tag, and not the tag
		 * itself.
		 */
		if (hashcmp(sha1, e->item->sha1)) {
			/*
			 * Is this the positive end of a range expressed
			 * in terms of a tag (e.g. v2.0 from the range
			 * "v1.0..v2.0")?
			 */
			struct commit *one = lookup_commit_reference(sha1);
			struct object *obj;

			if (e->item == &(one->object)) {
				/*
				 * Need to include e->name as an
				 * independent ref to the pack-objects
				 * input, so that the tag is included
				 * in the output; otherwise we would
				 * end up triggering "empty bundle"
				 * error.
				 */
364
				obj = parse_object_or_die(sha1, e->name);
365 366 367 368 369 370 371 372 373 374
				obj->flags |= SHOWN;
				add_pending_object(&revs, obj, e->name);
			}
			free(ref);
			continue;
		}

		ref_count++;
		write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
		write_or_die(bundle_fd, " ", 1);
Junio C Hamano's avatar
Junio C Hamano committed
375
		write_or_die(bundle_fd, display_ref, strlen(display_ref));
376 377 378 379
		write_or_die(bundle_fd, "\n", 1);
		free(ref);
	}
	if (!ref_count)
380
		die(_("Refusing to create empty bundle."));
381 382 383 384 385 386

	/* end header */
	write_or_die(bundle_fd, "\n", 1);

	/* write pack */
	argv_pack[0] = "pack-objects";
387
	argv_pack[1] = "--all-progress-implied";
388 389
	argv_pack[2] = "--stdout";
	argv_pack[3] = "--thin";
390 391
	argv_pack[4] = "--delta-base-offset";
	argv_pack[5] = NULL;
392 393 394 395 396 397
	memset(&rls, 0, sizeof(rls));
	rls.argv = argv_pack;
	rls.in = -1;
	rls.out = bundle_fd;
	rls.git_cmd = 1;
	if (start_command(&rls))
398
		return error(_("Could not spawn pack-objects"));
Brandon Casey's avatar
Brandon Casey committed
399 400 401 402 403 404 405 406

	/*
	 * start_command closed bundle_fd if it was > 1
	 * so set the lock fd to -1 so commit_lock_file()
	 * won't fail trying to close it.
	 */
	lock.fd = -1;

407 408 409
	for (i = 0; i < revs.pending.nr; i++) {
		struct object *object = revs.pending.objects[i].item;
		if (object->flags & UNINTERESTING)
410 411 412
			write_or_die(rls.in, "^", 1);
		write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
		write_or_die(rls.in, "\n", 1);
413
	}
414
	close(rls.in);
415
	if (finish_command(&rls))
416
		return error(_("pack-objects died"));
417 418
	if (!bundle_to_stdout) {
		if (commit_lock_file(&lock))
419
			die_errno(_("cannot create '%s'"), path);
420
	}
421
	return 0;
422 423
}

424
int unbundle(struct bundle_header *header, int bundle_fd, int flags)
425 426
{
	const char *argv_index_pack[] = {"index-pack",
427
					 "--fix-thin", "--stdin", NULL, NULL};
428 429
	struct child_process ip;

430 431 432
	if (flags & BUNDLE_VERBOSE)
		argv_index_pack[3] = "-v";

433 434 435 436 437 438 439 440
	if (verify_bundle(header, 0))
		return -1;
	memset(&ip, 0, sizeof(ip));
	ip.argv = argv_index_pack;
	ip.in = bundle_fd;
	ip.no_stdout = 1;
	ip.git_cmd = 1;
	if (run_command(&ip))
441
		return error(_("index-pack died"));
442 443
	return 0;
}