[thirdparty/git.git] / bundle.c

#include "cache.h"
#include "lockfile.h"
#include "bundle.h"
#include "object.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
#include "run-command.h"
#include "refs.h"
#include "argv-array.h"

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)
{
	ALLOC_GROW(list->list, list->nr + 1, list->alloc);
	hashcpy(list->list[list->nr].sha1, sha1);
	list->list[list->nr].name = xstrdup(name);
	list->nr++;
}

static int parse_bundle_header(int fd, struct bundle_header *header,
			       const char *report_path)
{
	struct strbuf buf = STRBUF_INIT;
	int status = 0;

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

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

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

		/*
		 * 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) ||
		    (buf.len > 40 && !isspace(buf.buf[40])) ||
		    (!is_prereq && buf.len <= 40)) {
			if (report_path)
				error(_("unrecognized header: %s%s (%d)"),
				      (is_prereq ? "-" : ""), buf.buf, (int)buf.len);
			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);
		}
	}

 abort:
	if (status) {
		close(fd);
		fd = -1;
	}
	strbuf_release(&buf);
	return fd;
}

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

	if (fd < 0)
		return error(_("could not open '%s'"), path);
	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);
}

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;
}

/* Remember to update object flag allocation in object.h */
#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;
	const char *argv[] = {NULL, "--all", NULL};
	struct object_array refs;
	struct commit *commit;
	int i, ret = 0, req_nr;
	const char *message = _("Repository lacks these prerequisite commits:");

	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)
			error("%s", message);
		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);

	refs = revs.pending;
	revs.leak_pending = 1;

	if (prepare_revision_walk(&revs))
		die(_("revision walk setup failed"));

	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)
				error("%s", message);
			error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
				refs.objects[i].name);
		}

	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
	free(refs.objects);

	if (verbose) {
		struct ref_list *r;

		r = &header->references;
		printf_ln(Q_("The bundle contains this ref:",
			     "The bundle contains these %d refs:",
			     r->nr),
			  r->nr);
		list_refs(r, 0, NULL);
		r = &header->prerequisites;
		if (!r->nr) {
			printf_ln(_("The bundle records a complete history."));
		} else {
			printf_ln(Q_("The bundle requires this ref:",
				     "The bundle requires these %d refs:",
				     r->nr),
				  r->nr);
			list_refs(r, 0, NULL);
		}
	}
	return ret;
}

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

static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
{
	unsigned long size;
	enum object_type type;
	char *buf = NULL, *line, *lineend;
	unsigned long date;
	int result = 1;

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

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

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;
	int i, ref_count = 0;
	struct strbuf buf = STRBUF_INIT;
	struct rev_info revs;
	struct child_process rls = CHILD_PROCESS_INIT;
	FILE *rls_fout;

	bundle_to_stdout = !strcmp(path, "-");
	if (bundle_to_stdout)
		bundle_fd = 1;
	else
		bundle_fd = hold_lock_file_for_update(&lock, path,
						      LOCK_DIE_ON_ERROR);

	/* 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 */
	argv_array_pushl(&rls.args,
			 "rev-list", "--boundary", "--pretty=oneline",
			 NULL);
	for (i = 1; i < argc; i++)
		argv_array_push(&rls.args, argv[i]);
	rls.out = -1;
	rls.git_cmd = 1;
	if (start_command(&rls))
		return -1;
	rls_fout = xfdopen(rls.out, "r");
	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
		unsigned char sha1[20];
		if (buf.len > 0 && buf.buf[0] == '-') {
			write_or_die(bundle_fd, buf.buf, buf.len);
			if (!get_sha1_hex(buf.buf + 1, sha1)) {
				struct object *object = parse_object_or_die(sha1, buf.buf);
				object->flags |= UNINTERESTING;
				add_pending_object(&revs, object, buf.buf);
			}
		} else if (!get_sha1_hex(buf.buf, sha1)) {
			struct object *object = parse_object_or_die(sha1, buf.buf);
			object->flags |= SHOWN;
		}
	}
	strbuf_release(&buf);
	fclose(rls_fout);
	if (finish_command(&rls))
		return error(_("rev-list died"));

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

	if (argc > 1)
		return error(_("unrecognized argument: %s"), argv[1]);

	object_array_remove_duplicates(&revs.pending);

	for (i = 0; i < revs.pending.nr; i++) {
		struct object_array_entry *e = revs.pending.objects + i;
		unsigned char sha1[20];
		char *ref;
		const char *display_ref;
		int flag;

		if (e->item->flags & UNINTERESTING)
			continue;
		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
			continue;
		if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag))
			flag = 0;
		display_ref = (flag & REF_ISSYMREF) ? e->name : ref;

		if (e->item->type == OBJ_TAG &&
				!is_tag_in_date_range(e->item, &revs)) {
			e->item->flags |= UNINTERESTING;
			continue;
		}

		/*
		 * 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) {
			warning(_("ref '%s' is excluded by the rev-list options"),
				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.
				 */
				obj = parse_object_or_die(sha1, e->name);
				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);
		write_or_die(bundle_fd, display_ref, strlen(display_ref));
		write_or_die(bundle_fd, "\n", 1);
		free(ref);
	}
	if (!ref_count)
		die(_("Refusing to create empty bundle."));

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

	/* write pack */
	child_process_init(&rls);
	argv_array_pushl(&rls.args,
			 "pack-objects", "--all-progress-implied",
			 "--stdout", "--thin", "--delta-base-offset",
			 NULL);
	rls.in = -1;
	rls.out = bundle_fd;
	rls.git_cmd = 1;
	if (start_command(&rls))
		return error(_("Could not spawn pack-objects"));

	/*
	 * 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;

	for (i = 0; i < revs.pending.nr; i++) {
		struct object *object = revs.pending.objects[i].item;
		if (object->flags & UNINTERESTING)
			write_or_die(rls.in, "^", 1);
		write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
		write_or_die(rls.in, "\n", 1);
	}
	close(rls.in);
	if (finish_command(&rls))
		return error(_("pack-objects died"));
	if (!bundle_to_stdout) {
		if (commit_lock_file(&lock))
			die_errno(_("cannot create '%s'"), path);
	}
	return 0;
}

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

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

	if (verify_bundle(header, 0))
		return -1;
	ip.argv = argv_index_pack;
	ip.in = bundle_fd;
	ip.no_stdout = 1;
	ip.git_cmd = 1;
	if (run_command(&ip))
		return error(_("index-pack died"));
	return 0;
}
Commit	Line	Data
30415d50	1	#include "cache.h"
697cc8ef	2	#include "lockfile.h"
30415d50 JS	3	#include "bundle.h"
	4	#include "object.h"
	5	#include "commit.h"
	6	#include "diff.h"
	7	#include "revision.h"
	8	#include "list-objects.h"
	9	#include "run-command.h"
fa303836	10	#include "refs.h"
1e2371ea	11	#include "argv-array.h"
30415d50 JS	12
	13	static const char bundle_signature[] = "# v2 git bundle\n";
	14
	15	static void add_to_ref_list(const unsigned char sha1, const char name,
	16	struct ref_list *list)
	17	{
5cbbe13a	18	ALLOC_GROW(list->list, list->nr + 1, list->alloc);
50546b15	19	hashcpy(list->list[list->nr].sha1, sha1);
30415d50 JS	20	list->list[list->nr].name = xstrdup(name);
	21	list->nr++;
	22	}
	23
2727b71f JH	24	static int parse_bundle_header(int fd, struct bundle_header *header,
2727b71f JH	25	const char *report_path)
f3fa1838	26	{
e9ee84cf	27	struct strbuf buf = STRBUF_INIT;
e9ee84cf	28	int status = 0;
30415d50	29
e9ee84cf	30	/* The bundle header begins with the signature */
5e8617f5	31	if (strbuf_getwholeline_fd(&buf, fd, '\n') \|\|
e9ee84cf	32	strcmp(buf.buf, bundle_signature)) {
2727b71f	33	if (report_path)
8a1e7eac	34	error(_("'%s' does not look like a v2 bundle file"),
2727b71f	35	report_path);
e9ee84cf JH	36	status = -1;
e9ee84cf JH	37	goto abort;
30415d50	38	}
e9ee84cf JH	39
e9ee84cf JH	40	/* The bundle header ends with an empty line */
5e8617f5	41	while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
e9ee84cf	42	buf.len && buf.buf[0] != '\n') {
30415d50	43	unsigned char sha1[20];
e9ee84cf JH	44	int is_prereq = 0;
	45
	46	if (*buf.buf == '-') {
	47	is_prereq = 1;
	48	strbuf_remove(&buf, 0, 1);
30415d50	49	}
e9ee84cf	50	strbuf_rtrim(&buf);
30415d50	51
e9ee84cf JH	52	/*
	53	* Tip lines have object name, SP, and refname.
	54	* Prerequisites have object name that is optionally
	55	* followed by SP and subject line.
	56	*/
	57	if (get_sha1_hex(buf.buf, sha1) \|\|
5446e33f	58	(buf.len > 40 && !isspace(buf.buf[40])) \|\|
e9ee84cf	59	(!is_prereq && buf.len <= 40)) {
2727b71f	60	if (report_path)
8a1e7eac	61	error(_("unrecognized header: %s%s (%d)"),
2727b71f	62	(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
e9ee84cf JH	63	status = -1;
	64	break;
	65	} else {
	66	if (is_prereq)
	67	add_to_ref_list(sha1, "", &header->prerequisites);
	68	else
	69	add_to_ref_list(sha1, buf.buf + 41, &header->references);
30415d50	70	}
30415d50	71	}
e9ee84cf JH	72
	73	abort:
	74	if (status) {
	75	close(fd);
	76	fd = -1;
30415d50	77	}
e9ee84cf	78	strbuf_release(&buf);
30415d50 JS	79	return fd;
	80	}
	81
2727b71f JH	82	int read_bundle_header(const char path, struct bundle_header header)
	83	{
	84	int fd = open(path, O_RDONLY);
	85
30415d50	86	if (fd < 0)
8a1e7eac	87	return error(_("could not open '%s'"), path);
2727b71f JH	88	return parse_bundle_header(fd, header, path);
	89	}
	90
	91	int is_bundle(const char *path, int quiet)
	92	{
	93	struct bundle_header header;
	94	int fd = open(path, O_RDONLY);
	95
	96	if (fd < 0)
	97	return 0;
	98	memset(&header, 0, sizeof(header));
	99	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
	100	if (fd >= 0)
	101	close(fd);
	102	return (fd >= 0);
30415d50 JS	103	}
	104
	105	static int list_refs(struct ref_list r, int argc, const char *argv)
	106	{
	107	int i;
	108
	109	for (i = 0; i < r->nr; i++) {
	110	if (argc > 1) {
	111	int j;
	112	for (j = 1; j < argc; j++)
	113	if (!strcmp(r->list[i].name, argv[j]))
	114	break;
	115	if (j == argc)
	116	continue;
	117	}
	118	printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
	119	r->list[i].name);
	120	}
	121	return 0;
	122	}
	123
208acbfb	124	/* Remember to update object flag allocation in object.h */
30415d50 JS	125	#define PREREQ_MARK (1u<<16)
	126
	127	int verify_bundle(struct bundle_header *header, int verbose)
	128	{
	129	/*
	130	* Do fast check, then if any prereqs are missing then go line by line
	131	* to be verbose about the errors
	132	*/
	133	struct ref_list *p = &header->prerequisites;
	134	struct rev_info revs;
a80aad7b	135	const char *argv[] = {NULL, "--all", NULL};
30415d50 JS	136	struct object_array refs;
	137	struct commit *commit;
	138	int i, ret = 0, req_nr;
8a1e7eac	139	const char *message = _("Repository lacks these prerequisite commits:");
30415d50 JS	140
	141	init_revisions(&revs, NULL);
	142	for (i = 0; i < p->nr; i++) {
	143	struct ref_list_entry *e = p->list + i;
	144	struct object *o = parse_object(e->sha1);
	145	if (o) {
	146	o->flags \|= PREREQ_MARK;
	147	add_pending_object(&revs, o, e->name);
	148	continue;
	149	}
	150	if (++ret == 1)
9db56f71	151	error("%s", message);
30415d50 JS	152	error("%s %s", sha1_to_hex(e->sha1), e->name);
	153	}
	154	if (revs.pending.nr != p->nr)
	155	return ret;
	156	req_nr = revs.pending.nr;
	157	setup_revisions(2, argv, &revs, NULL);
	158
5be78599 RS	159	refs = revs.pending;
5be78599 RS	160	revs.leak_pending = 1;
30415d50	161
3d51e1b5	162	if (prepare_revision_walk(&revs))
8a1e7eac	163	die(_("revision walk setup failed"));
30415d50 JS	164
	165	i = req_nr;
	166	while (i && (commit = get_revision(&revs)))
	167	if (commit->object.flags & PREREQ_MARK)
	168	i--;
	169
	170	for (i = 0; i < req_nr; i++)
	171	if (!(refs.objects[i].item->flags & SHOWN)) {
	172	if (++ret == 1)
9db56f71	173	error("%s", message);
30415d50 JS	174	error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
	175	refs.objects[i].name);
	176	}
	177
86a0a408	178	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
5be78599	179	free(refs.objects);
30415d50 JS	180
	181	if (verbose) {
	182	struct ref_list *r;
	183
	184	r = &header->references;
a02ffe0e LF	185	printf_ln(Q_("The bundle contains this ref:",
a02ffe0e LF	186	"The bundle contains these %d refs:",
8a1e7eac NTND	187	r->nr),
8a1e7eac NTND	188	r->nr);
30415d50	189	list_refs(r, 0, NULL);
71ba6b10	190	r = &header->prerequisites;
8c3710fd JH	191	if (!r->nr) {
	192	printf_ln(_("The bundle records a complete history."));
	193	} else {
a02ffe0e LF	194	printf_ln(Q_("The bundle requires this ref:",
a02ffe0e LF	195	"The bundle requires these %d refs:",
8c3710fd JH	196	r->nr),
	197	r->nr);
	198	list_refs(r, 0, NULL);
	199	}
30415d50 JS	200	}
	201	return ret;
	202	}
	203
	204	int list_bundle_refs(struct bundle_header header, int argc, const char *argv)
	205	{
	206	return list_refs(&header->references, argc, argv);
	207	}
	208
c9a42c4a JS	209	static int is_tag_in_date_range(struct object tag, struct rev_info revs)
	210	{
	211	unsigned long size;
	212	enum object_type type;
64045940	213	char buf = NULL, line, *lineend;
c9a42c4a	214	unsigned long date;
64045940	215	int result = 1;
c9a42c4a JS	216
c9a42c4a JS	217	if (revs->max_age == -1 && revs->min_age == -1)
64045940	218	goto out;
c9a42c4a JS	219
	220	buf = read_sha1_file(tag->sha1, &type, &size);
	221	if (!buf)
64045940	222	goto out;
c9a42c4a JS	223	line = memmem(buf, size, "\ntagger ", 8);
c9a42c4a JS	224	if (!line++)
64045940	225	goto out;
2c8544ab LF	226	lineend = memchr(line, '\n', buf + size - line);
2c8544ab LF	227	line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
c9a42c4a	228	if (!line++)
64045940	229	goto out;
c9a42c4a	230	date = strtoul(line, NULL, 10);
64045940	231	result = (revs->max_age == -1 \|\| revs->max_age < date) &&
c9a42c4a	232	(revs->min_age == -1 \|\| revs->min_age > date);
64045940 RS	233	out:
	234	free(buf);
	235	return result;
c9a42c4a JS	236	}
c9a42c4a JS	237
30415d50	238	int create_bundle(struct bundle_header header, const char path,
1e2371ea	239	int argc, const char **argv)
30415d50 JS	240	{
	241	static struct lock_file lock;
	242	int bundle_fd = -1;
	243	int bundle_to_stdout;
30415d50	244	int i, ref_count = 0;
bc2fed49	245	struct strbuf buf = STRBUF_INIT;
30415d50	246	struct rev_info revs;
d3180279	247	struct child_process rls = CHILD_PROCESS_INIT;
30415d50 JS	248	FILE *rls_fout;
	249
	250	bundle_to_stdout = !strcmp(path, "-");
	251	if (bundle_to_stdout)
	252	bundle_fd = 1;
	253	else
acd3b9ec JH	254	bundle_fd = hold_lock_file_for_update(&lock, path,
acd3b9ec JH	255	LOCK_DIE_ON_ERROR);
30415d50 JS	256
	257	/* write signature */
	258	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
	259
	260	/* init revs to list objects for pack-objects later */
	261	save_commit_buffer = 0;
	262	init_revisions(&revs, NULL);
	263
	264	/* write prerequisites */
92859f3a	265	argv_array_pushl(&rls.args,
1e2371ea JH	266	"rev-list", "--boundary", "--pretty=oneline",
	267	NULL);
	268	for (i = 1; i < argc; i++)
92859f3a	269	argv_array_push(&rls.args, argv[i]);
30415d50 JS	270	rls.out = -1;
	271	rls.git_cmd = 1;
	272	if (start_command(&rls))
	273	return -1;
41698375	274	rls_fout = xfdopen(rls.out, "r");
bc2fed49	275	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
30415d50	276	unsigned char sha1[20];
bc2fed49 TR	277	if (buf.len > 0 && buf.buf[0] == '-') {
	278	write_or_die(bundle_fd, buf.buf, buf.len);
	279	if (!get_sha1_hex(buf.buf + 1, sha1)) {
75a95490	280	struct object *object = parse_object_or_die(sha1, buf.buf);
30415d50	281	object->flags \|= UNINTERESTING;
31faeb20	282	add_pending_object(&revs, object, buf.buf);
30415d50	283	}
bc2fed49	284	} else if (!get_sha1_hex(buf.buf, sha1)) {
75a95490	285	struct object *object = parse_object_or_die(sha1, buf.buf);
30415d50 JS	286	object->flags \|= SHOWN;
	287	}
	288	}
bc2fed49	289	strbuf_release(&buf);
30415d50 JS	290	fclose(rls_fout);
30415d50 JS	291	if (finish_command(&rls))
8a1e7eac	292	return error(_("rev-list died"));
30415d50 JS	293
	294	/* write references */
	295	argc = setup_revisions(argc, argv, &revs, NULL);
22568f0a	296
8b3dce56	297	if (argc > 1)
1be65eda	298	return error(_("unrecognized argument: %s"), argv[1]);
30415d50	299
b2a6d1c6 JH	300	object_array_remove_duplicates(&revs.pending);
b2a6d1c6 JH	301
30415d50 JS	302	for (i = 0; i < revs.pending.nr; i++) {
	303	struct object_array_entry *e = revs.pending.objects + i;
	304	unsigned char sha1[20];
	305	char *ref;
fa303836 JH	306	const char *display_ref;
fa303836 JH	307	int flag;
30415d50 JS	308
	309	if (e->item->flags & UNINTERESTING)
	310	continue;
	311	if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
	312	continue;
7695d118	313	if (read_ref_full(e->name, RESOLVE_REF_READING, sha1, &flag))
fa303836 JH	314	flag = 0;
	315	display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
	316
c9a42c4a JS	317	if (e->item->type == OBJ_TAG &&
	318	!is_tag_in_date_range(e->item, &revs)) {
	319	e->item->flags \|= UNINTERESTING;
	320	continue;
	321	}
	322
30415d50 JS	323	/*
	324	* Make sure the refs we wrote out is correct; --max-count and
	325	* other limiting options could have prevented all the tips
	326	* from getting output.
	327	*
	328	* Non commit objects such as tags and blobs do not have
	329	* this issue as they are not affected by those extra
	330	* constraints.
	331	*/
	332	if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
8a1e7eac	333	warning(_("ref '%s' is excluded by the rev-list options"),
30415d50 JS	334	e->name);
	335	free(ref);
	336	continue;
	337	}
	338	/*
	339	* If you run "git bundle create bndl v1.0..v2.0", the
	340	* name of the positive ref is "v2.0" but that is the
	341	* commit that is referenced by the tag, and not the tag
	342	* itself.
	343	*/
	344	if (hashcmp(sha1, e->item->sha1)) {
	345	/*
	346	* Is this the positive end of a range expressed
	347	* in terms of a tag (e.g. v2.0 from the range
	348	* "v1.0..v2.0")?
	349	*/
	350	struct commit *one = lookup_commit_reference(sha1);
	351	struct object *obj;
	352
	353	if (e->item == &(one->object)) {
	354	/*
	355	* Need to include e->name as an
	356	* independent ref to the pack-objects
	357	* input, so that the tag is included
	358	* in the output; otherwise we would
	359	* end up triggering "empty bundle"
	360	* error.
	361	*/
75a95490	362	obj = parse_object_or_die(sha1, e->name);
30415d50 JS	363	obj->flags \|= SHOWN;
	364	add_pending_object(&revs, obj, e->name);
	365	}
	366	free(ref);
	367	continue;
	368	}
	369
	370	ref_count++;
	371	write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
	372	write_or_die(bundle_fd, " ", 1);
fa303836	373	write_or_die(bundle_fd, display_ref, strlen(display_ref));
30415d50 JS	374	write_or_die(bundle_fd, "\n", 1);
	375	free(ref);
	376	}
	377	if (!ref_count)
8a1e7eac	378	die(_("Refusing to create empty bundle."));
30415d50 JS	379
	380	/* end header */
	381	write_or_die(bundle_fd, "\n", 1);
	382
	383	/* write pack */
8828f298	384	child_process_init(&rls);
92859f3a	385	argv_array_pushl(&rls.args,
1e2371ea JH	386	"pack-objects", "--all-progress-implied",
	387	"--stdout", "--thin", "--delta-base-offset",
	388	NULL);
30415d50 JS	389	rls.in = -1;
	390	rls.out = bundle_fd;
	391	rls.git_cmd = 1;
	392	if (start_command(&rls))
8a1e7eac	393	return error(_("Could not spawn pack-objects"));
4ed7cd3a BC	394
	395	/*
	396	* start_command closed bundle_fd if it was > 1
	397	* so set the lock fd to -1 so commit_lock_file()
	398	* won't fail trying to close it.
	399	*/
	400	lock.fd = -1;
	401
30415d50 JS	402	for (i = 0; i < revs.pending.nr; i++) {
	403	struct object *object = revs.pending.objects[i].item;
	404	if (object->flags & UNINTERESTING)
95693d45 JM	405	write_or_die(rls.in, "^", 1);
	406	write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
	407	write_or_die(rls.in, "\n", 1);
30415d50	408	}
e72ae288	409	close(rls.in);
30415d50	410	if (finish_command(&rls))
8a1e7eac	411	return error(_("pack-objects died"));
0f5cdf65 CH	412	if (!bundle_to_stdout) {
0f5cdf65 CH	413	if (commit_lock_file(&lock))
8a1e7eac	414	die_errno(_("cannot create '%s'"), path);
0f5cdf65	415	}
c20181e3	416	return 0;
30415d50 JS	417	}
30415d50 JS	418
be042aff	419	int unbundle(struct bundle_header *header, int bundle_fd, int flags)
30415d50 JS	420	{
30415d50 JS	421	const char *argv_index_pack[] = {"index-pack",
be042aff	422	"--fix-thin", "--stdin", NULL, NULL};
d3180279	423	struct child_process ip = CHILD_PROCESS_INIT;
30415d50	424
be042aff JH	425	if (flags & BUNDLE_VERBOSE)
	426	argv_index_pack[3] = "-v";
	427
30415d50 JS	428	if (verify_bundle(header, 0))
30415d50 JS	429	return -1;
30415d50 JS	430	ip.argv = argv_index_pack;
	431	ip.in = bundle_fd;
	432	ip.no_stdout = 1;
	433	ip.git_cmd = 1;
	434	if (run_command(&ip))
8a1e7eac	435	return error(_("index-pack died"));
30415d50 JS	436	return 0;
30415d50 JS	437	}