Merge branch 'jk/shallow-update-fix'
[git.git] / bundle.c
bloba85e0e4532ad10934b3d9c510db9e26b338f14f1
1 #include "cache.h"
2 #include "bundle.h"
3 #include "object.h"
4 #include "commit.h"
5 #include "diff.h"
6 #include "revision.h"
7 #include "list-objects.h"
8 #include "run-command.h"
9 #include "refs.h"
10 #include "argv-array.h"
12 static const char bundle_signature[] = "# v2 git bundle\n";
14 static void add_to_ref_list(const unsigned char *sha1, const char *name,
15 struct ref_list *list)
17 ALLOC_GROW(list->list, list->nr + 1, list->alloc);
18 hashcpy(list->list[list->nr].sha1, sha1);
19 list->list[list->nr].name = xstrdup(name);
20 list->nr++;
23 static int parse_bundle_header(int fd, struct bundle_header *header,
24 const char *report_path)
26 struct strbuf buf = STRBUF_INIT;
27 int status = 0;
29 /* The bundle header begins with the signature */
30 if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
31 strcmp(buf.buf, bundle_signature)) {
32 if (report_path)
33 error(_("'%s' does not look like a v2 bundle file"),
34 report_path);
35 status = -1;
36 goto abort;
39 /* The bundle header ends with an empty line */
40 while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
41 buf.len && buf.buf[0] != '\n') {
42 unsigned char sha1[20];
43 int is_prereq = 0;
45 if (*buf.buf == '-') {
46 is_prereq = 1;
47 strbuf_remove(&buf, 0, 1);
49 strbuf_rtrim(&buf);
52 * Tip lines have object name, SP, and refname.
53 * Prerequisites have object name that is optionally
54 * followed by SP and subject line.
56 if (get_sha1_hex(buf.buf, sha1) ||
57 (buf.len > 40 && !isspace(buf.buf[40])) ||
58 (!is_prereq && buf.len <= 40)) {
59 if (report_path)
60 error(_("unrecognized header: %s%s (%d)"),
61 (is_prereq ? "-" : ""), buf.buf, (int)buf.len);
62 status = -1;
63 break;
64 } else {
65 if (is_prereq)
66 add_to_ref_list(sha1, "", &header->prerequisites);
67 else
68 add_to_ref_list(sha1, buf.buf + 41, &header->references);
72 abort:
73 if (status) {
74 close(fd);
75 fd = -1;
77 strbuf_release(&buf);
78 return fd;
81 int read_bundle_header(const char *path, struct bundle_header *header)
83 int fd = open(path, O_RDONLY);
85 if (fd < 0)
86 return error(_("could not open '%s'"), path);
87 return parse_bundle_header(fd, header, path);
90 int is_bundle(const char *path, int quiet)
92 struct bundle_header header;
93 int fd = open(path, O_RDONLY);
95 if (fd < 0)
96 return 0;
97 memset(&header, 0, sizeof(header));
98 fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
99 if (fd >= 0)
100 close(fd);
101 return (fd >= 0);
104 static int list_refs(struct ref_list *r, int argc, const char **argv)
106 int i;
108 for (i = 0; i < r->nr; i++) {
109 if (argc > 1) {
110 int j;
111 for (j = 1; j < argc; j++)
112 if (!strcmp(r->list[i].name, argv[j]))
113 break;
114 if (j == argc)
115 continue;
117 printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
118 r->list[i].name);
120 return 0;
123 #define PREREQ_MARK (1u<<16)
125 int verify_bundle(struct bundle_header *header, int verbose)
128 * Do fast check, then if any prereqs are missing then go line by line
129 * to be verbose about the errors
131 struct ref_list *p = &header->prerequisites;
132 struct rev_info revs;
133 const char *argv[] = {NULL, "--all", NULL};
134 struct object_array refs;
135 struct commit *commit;
136 int i, ret = 0, req_nr;
137 const char *message = _("Repository lacks these prerequisite commits:");
139 init_revisions(&revs, NULL);
140 for (i = 0; i < p->nr; i++) {
141 struct ref_list_entry *e = p->list + i;
142 struct object *o = parse_object(e->sha1);
143 if (o) {
144 o->flags |= PREREQ_MARK;
145 add_pending_object(&revs, o, e->name);
146 continue;
148 if (++ret == 1)
149 error("%s", message);
150 error("%s %s", sha1_to_hex(e->sha1), e->name);
152 if (revs.pending.nr != p->nr)
153 return ret;
154 req_nr = revs.pending.nr;
155 setup_revisions(2, argv, &revs, NULL);
157 refs = revs.pending;
158 revs.leak_pending = 1;
160 if (prepare_revision_walk(&revs))
161 die(_("revision walk setup failed"));
163 i = req_nr;
164 while (i && (commit = get_revision(&revs)))
165 if (commit->object.flags & PREREQ_MARK)
166 i--;
168 for (i = 0; i < req_nr; i++)
169 if (!(refs.objects[i].item->flags & SHOWN)) {
170 if (++ret == 1)
171 error("%s", message);
172 error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
173 refs.objects[i].name);
176 clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
177 free(refs.objects);
179 if (verbose) {
180 struct ref_list *r;
182 r = &header->references;
183 printf_ln(Q_("The bundle contains this ref:",
184 "The bundle contains these %d refs:",
185 r->nr),
186 r->nr);
187 list_refs(r, 0, NULL);
188 r = &header->prerequisites;
189 if (!r->nr) {
190 printf_ln(_("The bundle records a complete history."));
191 } else {
192 printf_ln(Q_("The bundle requires this ref:",
193 "The bundle requires these %d refs:",
194 r->nr),
195 r->nr);
196 list_refs(r, 0, NULL);
199 return ret;
202 int list_bundle_refs(struct bundle_header *header, int argc, const char **argv)
204 return list_refs(&header->references, argc, argv);
207 static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
209 unsigned long size;
210 enum object_type type;
211 char *buf, *line, *lineend;
212 unsigned long date;
214 if (revs->max_age == -1 && revs->min_age == -1)
215 return 1;
217 buf = read_sha1_file(tag->sha1, &type, &size);
218 if (!buf)
219 return 1;
220 line = memmem(buf, size, "\ntagger ", 8);
221 if (!line++)
222 return 1;
223 lineend = memchr(line, buf + size - line, '\n');
224 line = memchr(line, lineend ? lineend - line : buf + size - line, '>');
225 if (!line++)
226 return 1;
227 date = strtoul(line, NULL, 10);
228 free(buf);
229 return (revs->max_age == -1 || revs->max_age < date) &&
230 (revs->min_age == -1 || revs->min_age > date);
233 int create_bundle(struct bundle_header *header, const char *path,
234 int argc, const char **argv)
236 static struct lock_file lock;
237 int bundle_fd = -1;
238 int bundle_to_stdout;
239 struct argv_array argv_boundary = ARGV_ARRAY_INIT;
240 struct argv_array argv_pack = ARGV_ARRAY_INIT;
241 int i, ref_count = 0;
242 struct strbuf buf = STRBUF_INIT;
243 struct rev_info revs;
244 struct child_process rls;
245 FILE *rls_fout;
247 bundle_to_stdout = !strcmp(path, "-");
248 if (bundle_to_stdout)
249 bundle_fd = 1;
250 else
251 bundle_fd = hold_lock_file_for_update(&lock, path,
252 LOCK_DIE_ON_ERROR);
254 /* write signature */
255 write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
257 /* init revs to list objects for pack-objects later */
258 save_commit_buffer = 0;
259 init_revisions(&revs, NULL);
261 /* write prerequisites */
262 argv_array_pushl(&argv_boundary,
263 "rev-list", "--boundary", "--pretty=oneline",
264 NULL);
265 for (i = 1; i < argc; i++)
266 argv_array_push(&argv_boundary, argv[i]);
268 memset(&rls, 0, sizeof(rls));
269 rls.argv = argv_boundary.argv;
270 rls.out = -1;
271 rls.git_cmd = 1;
272 if (start_command(&rls))
273 return -1;
274 rls_fout = xfdopen(rls.out, "r");
275 while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
276 unsigned char sha1[20];
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)) {
280 struct object *object = parse_object_or_die(sha1, buf.buf);
281 object->flags |= UNINTERESTING;
282 add_pending_object(&revs, object, buf.buf);
284 } else if (!get_sha1_hex(buf.buf, sha1)) {
285 struct object *object = parse_object_or_die(sha1, buf.buf);
286 object->flags |= SHOWN;
289 strbuf_release(&buf);
290 fclose(rls_fout);
291 if (finish_command(&rls))
292 return error(_("rev-list died"));
294 /* write references */
295 argc = setup_revisions(argc, argv, &revs, NULL);
297 if (argc > 1)
298 return error(_("unrecognized argument: %s"), argv[1]);
300 object_array_remove_duplicates(&revs.pending);
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;
306 const char *display_ref;
307 int flag;
309 if (e->item->flags & UNINTERESTING)
310 continue;
311 if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
312 continue;
313 if (read_ref_full(e->name, sha1, 1, &flag))
314 flag = 0;
315 display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
317 if (e->item->type == OBJ_TAG &&
318 !is_tag_in_date_range(e->item, &revs)) {
319 e->item->flags |= UNINTERESTING;
320 continue;
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.
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.
332 if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
333 warning(_("ref '%s' is excluded by the rev-list options"),
334 e->name);
335 free(ref);
336 continue;
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.
344 if (hashcmp(sha1, e->item->sha1)) {
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")?
350 struct commit *one = lookup_commit_reference(sha1);
351 struct object *obj;
353 if (e->item == &(one->object)) {
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.
362 obj = parse_object_or_die(sha1, e->name);
363 obj->flags |= SHOWN;
364 add_pending_object(&revs, obj, e->name);
366 free(ref);
367 continue;
370 ref_count++;
371 write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
372 write_or_die(bundle_fd, " ", 1);
373 write_or_die(bundle_fd, display_ref, strlen(display_ref));
374 write_or_die(bundle_fd, "\n", 1);
375 free(ref);
377 if (!ref_count)
378 die(_("Refusing to create empty bundle."));
380 /* end header */
381 write_or_die(bundle_fd, "\n", 1);
383 /* write pack */
384 argv_array_pushl(&argv_pack,
385 "pack-objects", "--all-progress-implied",
386 "--stdout", "--thin", "--delta-base-offset",
387 NULL);
388 memset(&rls, 0, sizeof(rls));
389 rls.argv = argv_pack.argv;
390 rls.in = -1;
391 rls.out = bundle_fd;
392 rls.git_cmd = 1;
393 if (start_command(&rls))
394 return error(_("Could not spawn pack-objects"));
397 * start_command closed bundle_fd if it was > 1
398 * so set the lock fd to -1 so commit_lock_file()
399 * won't fail trying to close it.
401 lock.fd = -1;
403 for (i = 0; i < revs.pending.nr; i++) {
404 struct object *object = revs.pending.objects[i].item;
405 if (object->flags & UNINTERESTING)
406 write_or_die(rls.in, "^", 1);
407 write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
408 write_or_die(rls.in, "\n", 1);
410 close(rls.in);
411 if (finish_command(&rls))
412 return error(_("pack-objects died"));
413 if (!bundle_to_stdout) {
414 if (commit_lock_file(&lock))
415 die_errno(_("cannot create '%s'"), path);
417 return 0;
420 int unbundle(struct bundle_header *header, int bundle_fd, int flags)
422 const char *argv_index_pack[] = {"index-pack",
423 "--fix-thin", "--stdin", NULL, NULL};
424 struct child_process ip;
426 if (flags & BUNDLE_VERBOSE)
427 argv_index_pack[3] = "-v";
429 if (verify_bundle(header, 0))
430 return -1;
431 memset(&ip, 0, sizeof(ip));
432 ip.argv = argv_index_pack;
433 ip.in = bundle_fd;
434 ip.no_stdout = 1;
435 ip.git_cmd = 1;
436 if (run_command(&ip))
437 return error(_("index-pack died"));
438 return 0;