4 #include "object-store.h"
9 #include "list-objects.h"
10 #include "run-command.h"
12 #include "argv-array.h"
14 static const char bundle_signature
[] = "# v2 git bundle\n";
16 static void add_to_ref_list(const struct object_id
*oid
, const char *name
,
17 struct ref_list
*list
)
19 ALLOC_GROW(list
->list
, list
->nr
+ 1, list
->alloc
);
20 oidcpy(&list
->list
[list
->nr
].oid
, oid
);
21 list
->list
[list
->nr
].name
= xstrdup(name
);
25 static int parse_bundle_header(int fd
, struct bundle_header
*header
,
26 const char *report_path
)
28 struct strbuf buf
= STRBUF_INIT
;
31 /* The bundle header begins with the signature */
32 if (strbuf_getwholeline_fd(&buf
, fd
, '\n') ||
33 strcmp(buf
.buf
, bundle_signature
)) {
35 error(_("'%s' does not look like a v2 bundle file"),
41 /* The bundle header ends with an empty line */
42 while (!strbuf_getwholeline_fd(&buf
, fd
, '\n') &&
43 buf
.len
&& buf
.buf
[0] != '\n') {
48 if (*buf
.buf
== '-') {
50 strbuf_remove(&buf
, 0, 1);
55 * Tip lines have object name, SP, and refname.
56 * Prerequisites have object name that is optionally
57 * followed by SP and subject line.
59 if (parse_oid_hex(buf
.buf
, &oid
, &p
) ||
60 (*p
&& !isspace(*p
)) ||
61 (!is_prereq
&& !*p
)) {
63 error(_("unrecognized header: %s%s (%d)"),
64 (is_prereq
? "-" : ""), buf
.buf
, (int)buf
.len
);
69 add_to_ref_list(&oid
, "", &header
->prerequisites
);
71 add_to_ref_list(&oid
, p
+ 1, &header
->references
);
84 int read_bundle_header(const char *path
, struct bundle_header
*header
)
86 int fd
= open(path
, O_RDONLY
);
89 return error(_("could not open '%s'"), path
);
90 return parse_bundle_header(fd
, header
, path
);
93 int is_bundle(const char *path
, int quiet
)
95 struct bundle_header header
;
96 int fd
= open(path
, O_RDONLY
);
100 memset(&header
, 0, sizeof(header
));
101 fd
= parse_bundle_header(fd
, &header
, quiet
? NULL
: path
);
107 static int list_refs(struct ref_list
*r
, int argc
, const char **argv
)
111 for (i
= 0; i
< r
->nr
; i
++) {
114 for (j
= 1; j
< argc
; j
++)
115 if (!strcmp(r
->list
[i
].name
, argv
[j
]))
120 printf("%s %s\n", oid_to_hex(&r
->list
[i
].oid
),
126 /* Remember to update object flag allocation in object.h */
127 #define PREREQ_MARK (1u<<16)
129 int verify_bundle(struct bundle_header
*header
, int verbose
)
132 * Do fast check, then if any prereqs are missing then go line by line
133 * to be verbose about the errors
135 struct ref_list
*p
= &header
->prerequisites
;
136 struct rev_info revs
;
137 const char *argv
[] = {NULL
, "--all", NULL
};
138 struct commit
*commit
;
139 int i
, ret
= 0, req_nr
;
140 const char *message
= _("Repository lacks these prerequisite commits:");
142 init_revisions(&revs
, NULL
);
143 for (i
= 0; i
< p
->nr
; i
++) {
144 struct ref_list_entry
*e
= p
->list
+ i
;
145 struct object
*o
= parse_object(&e
->oid
);
147 o
->flags
|= PREREQ_MARK
;
148 add_pending_object(&revs
, o
, e
->name
);
152 error("%s", message
);
153 error("%s %s", oid_to_hex(&e
->oid
), e
->name
);
155 if (revs
.pending
.nr
!= p
->nr
)
157 req_nr
= revs
.pending
.nr
;
158 setup_revisions(2, argv
, &revs
, NULL
);
160 if (prepare_revision_walk(&revs
))
161 die(_("revision walk setup failed"));
164 while (i
&& (commit
= get_revision(&revs
)))
165 if (commit
->object
.flags
& PREREQ_MARK
)
168 for (i
= 0; i
< p
->nr
; i
++) {
169 struct ref_list_entry
*e
= p
->list
+ i
;
170 struct object
*o
= parse_object(&e
->oid
);
171 assert(o
); /* otherwise we'd have returned early */
172 if (o
->flags
& SHOWN
)
175 error("%s", message
);
176 error("%s %s", oid_to_hex(&e
->oid
), e
->name
);
179 /* Clean up objects used, as they will be reused. */
180 for (i
= 0; i
< p
->nr
; i
++) {
181 struct ref_list_entry
*e
= p
->list
+ i
;
182 commit
= lookup_commit_reference_gently(&e
->oid
, 1);
184 clear_commit_marks(commit
, ALL_REV_FLAGS
);
190 r
= &header
->references
;
191 printf_ln(Q_("The bundle contains this ref:",
192 "The bundle contains these %d refs:",
195 list_refs(r
, 0, NULL
);
196 r
= &header
->prerequisites
;
198 printf_ln(_("The bundle records a complete history."));
200 printf_ln(Q_("The bundle requires this ref:",
201 "The bundle requires these %d refs:",
204 list_refs(r
, 0, NULL
);
210 int list_bundle_refs(struct bundle_header
*header
, int argc
, const char **argv
)
212 return list_refs(&header
->references
, argc
, argv
);
215 static int is_tag_in_date_range(struct object
*tag
, struct rev_info
*revs
)
218 enum object_type type
;
219 char *buf
= NULL
, *line
, *lineend
;
223 if (revs
->max_age
== -1 && revs
->min_age
== -1)
226 buf
= read_object_file(&tag
->oid
, &type
, &size
);
229 line
= memmem(buf
, size
, "\ntagger ", 8);
232 lineend
= memchr(line
, '\n', buf
+ size
- line
);
233 line
= memchr(line
, '>', lineend
? lineend
- line
: buf
+ size
- line
);
236 date
= parse_timestamp(line
, NULL
, 10);
237 result
= (revs
->max_age
== -1 || revs
->max_age
< date
) &&
238 (revs
->min_age
== -1 || revs
->min_age
> date
);
245 /* Write the pack data to bundle_fd, then close it if it is > 1. */
246 static int write_pack_data(int bundle_fd
, struct rev_info
*revs
)
248 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
251 argv_array_pushl(&pack_objects
.args
,
252 "pack-objects", "--all-progress-implied",
253 "--stdout", "--thin", "--delta-base-offset",
255 pack_objects
.in
= -1;
256 pack_objects
.out
= bundle_fd
;
257 pack_objects
.git_cmd
= 1;
258 if (start_command(&pack_objects
))
259 return error(_("Could not spawn pack-objects"));
261 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
262 struct object
*object
= revs
->pending
.objects
[i
].item
;
263 if (object
->flags
& UNINTERESTING
)
264 write_or_die(pack_objects
.in
, "^", 1);
265 write_or_die(pack_objects
.in
, oid_to_hex(&object
->oid
), GIT_SHA1_HEXSZ
);
266 write_or_die(pack_objects
.in
, "\n", 1);
268 close(pack_objects
.in
);
269 if (finish_command(&pack_objects
))
270 return error(_("pack-objects died"));
274 static int compute_and_write_prerequisites(int bundle_fd
,
275 struct rev_info
*revs
,
276 int argc
, const char **argv
)
278 struct child_process rls
= CHILD_PROCESS_INIT
;
279 struct strbuf buf
= STRBUF_INIT
;
283 argv_array_pushl(&rls
.args
,
284 "rev-list", "--boundary", "--pretty=oneline",
286 for (i
= 1; i
< argc
; i
++)
287 argv_array_push(&rls
.args
, argv
[i
]);
290 if (start_command(&rls
))
292 rls_fout
= xfdopen(rls
.out
, "r");
293 while (strbuf_getwholeline(&buf
, rls_fout
, '\n') != EOF
) {
294 struct object_id oid
;
295 if (buf
.len
> 0 && buf
.buf
[0] == '-') {
296 write_or_die(bundle_fd
, buf
.buf
, buf
.len
);
297 if (!get_oid_hex(buf
.buf
+ 1, &oid
)) {
298 struct object
*object
= parse_object_or_die(&oid
,
300 object
->flags
|= UNINTERESTING
;
301 add_pending_object(revs
, object
, buf
.buf
);
303 } else if (!get_oid_hex(buf
.buf
, &oid
)) {
304 struct object
*object
= parse_object_or_die(&oid
,
306 object
->flags
|= SHOWN
;
309 strbuf_release(&buf
);
311 if (finish_command(&rls
))
312 return error(_("rev-list died"));
317 * Write out bundle refs based on the tips already
318 * parsed into revs.pending. As a side effect, may
319 * manipulate revs.pending to include additional
320 * necessary objects (like tags).
322 * Returns the number of refs written, or negative
325 static int write_bundle_refs(int bundle_fd
, struct rev_info
*revs
)
330 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
331 struct object_array_entry
*e
= revs
->pending
.objects
+ i
;
332 struct object_id oid
;
334 const char *display_ref
;
337 if (e
->item
->flags
& UNINTERESTING
)
339 if (dwim_ref(e
->name
, strlen(e
->name
), &oid
, &ref
) != 1)
341 if (read_ref_full(e
->name
, RESOLVE_REF_READING
, &oid
, &flag
))
343 display_ref
= (flag
& REF_ISSYMREF
) ? e
->name
: ref
;
345 if (e
->item
->type
== OBJ_TAG
&&
346 !is_tag_in_date_range(e
->item
, revs
)) {
347 e
->item
->flags
|= UNINTERESTING
;
352 * Make sure the refs we wrote out is correct; --max-count and
353 * other limiting options could have prevented all the tips
354 * from getting output.
356 * Non commit objects such as tags and blobs do not have
357 * this issue as they are not affected by those extra
360 if (!(e
->item
->flags
& SHOWN
) && e
->item
->type
== OBJ_COMMIT
) {
361 warning(_("ref '%s' is excluded by the rev-list options"),
366 * If you run "git bundle create bndl v1.0..v2.0", the
367 * name of the positive ref is "v2.0" but that is the
368 * commit that is referenced by the tag, and not the tag
371 if (oidcmp(&oid
, &e
->item
->oid
)) {
373 * Is this the positive end of a range expressed
374 * in terms of a tag (e.g. v2.0 from the range
377 struct commit
*one
= lookup_commit_reference(&oid
);
380 if (e
->item
== &(one
->object
)) {
382 * Need to include e->name as an
383 * independent ref to the pack-objects
384 * input, so that the tag is included
385 * in the output; otherwise we would
386 * end up triggering "empty bundle"
389 obj
= parse_object_or_die(&oid
, e
->name
);
391 add_pending_object(revs
, obj
, e
->name
);
397 write_or_die(bundle_fd
, oid_to_hex(&e
->item
->oid
), 40);
398 write_or_die(bundle_fd
, " ", 1);
399 write_or_die(bundle_fd
, display_ref
, strlen(display_ref
));
400 write_or_die(bundle_fd
, "\n", 1);
406 write_or_die(bundle_fd
, "\n", 1);
410 int create_bundle(struct bundle_header
*header
, const char *path
,
411 int argc
, const char **argv
)
413 struct lock_file lock
= LOCK_INIT
;
415 int bundle_to_stdout
;
417 struct rev_info revs
;
419 bundle_to_stdout
= !strcmp(path
, "-");
420 if (bundle_to_stdout
)
423 bundle_fd
= hold_lock_file_for_update(&lock
, path
,
427 * write_pack_data() will close the fd passed to it,
428 * but commit_lock_file() will also try to close the
429 * lockfile's fd. So make a copy of the file
430 * descriptor to avoid trying to close it twice.
432 bundle_fd
= dup(bundle_fd
);
434 die_errno("unable to dup file descriptor");
437 /* write signature */
438 write_or_die(bundle_fd
, bundle_signature
, strlen(bundle_signature
));
440 /* init revs to list objects for pack-objects later */
441 save_commit_buffer
= 0;
442 init_revisions(&revs
, NULL
);
444 /* write prerequisites */
445 if (compute_and_write_prerequisites(bundle_fd
, &revs
, argc
, argv
))
448 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
451 error(_("unrecognized argument: %s"), argv
[1]);
455 object_array_remove_duplicates(&revs
.pending
);
457 ref_count
= write_bundle_refs(bundle_fd
, &revs
);
459 die(_("Refusing to create empty bundle."));
460 else if (ref_count
< 0)
464 if (write_pack_data(bundle_fd
, &revs
)) {
465 bundle_fd
= -1; /* already closed by the above call */
469 if (!bundle_to_stdout
) {
470 if (commit_lock_file(&lock
))
471 die_errno(_("cannot create '%s'"), path
);
475 if (!bundle_to_stdout
) {
478 rollback_lock_file(&lock
);
483 int unbundle(struct bundle_header
*header
, int bundle_fd
, int flags
)
485 const char *argv_index_pack
[] = {"index-pack",
486 "--fix-thin", "--stdin", NULL
, NULL
};
487 struct child_process ip
= CHILD_PROCESS_INIT
;
489 if (flags
& BUNDLE_VERBOSE
)
490 argv_index_pack
[3] = "-v";
492 if (verify_bundle(header
, 0))
494 ip
.argv
= argv_index_pack
;
498 if (run_command(&ip
))
499 return error(_("index-pack died"));