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