4 #include "object-store.h"
5 #include "repository.h"
10 #include "list-objects.h"
11 #include "run-command.h"
13 #include "argv-array.h"
15 static const char bundle_signature
[] = "# v2 git bundle\n";
17 static void add_to_ref_list(const struct object_id
*oid
, const char *name
,
18 struct ref_list
*list
)
20 ALLOC_GROW(list
->list
, list
->nr
+ 1, list
->alloc
);
21 oidcpy(&list
->list
[list
->nr
].oid
, oid
);
22 list
->list
[list
->nr
].name
= xstrdup(name
);
26 static int parse_bundle_header(int fd
, struct bundle_header
*header
,
27 const char *report_path
)
29 struct strbuf buf
= STRBUF_INIT
;
32 /* The bundle header begins with the signature */
33 if (strbuf_getwholeline_fd(&buf
, fd
, '\n') ||
34 strcmp(buf
.buf
, bundle_signature
)) {
36 error(_("'%s' does not look like a v2 bundle file"),
42 /* The bundle header ends with an empty line */
43 while (!strbuf_getwholeline_fd(&buf
, fd
, '\n') &&
44 buf
.len
&& buf
.buf
[0] != '\n') {
49 if (*buf
.buf
== '-') {
51 strbuf_remove(&buf
, 0, 1);
56 * Tip lines have object name, SP, and refname.
57 * Prerequisites have object name that is optionally
58 * followed by SP and subject line.
60 if (parse_oid_hex(buf
.buf
, &oid
, &p
) ||
61 (*p
&& !isspace(*p
)) ||
62 (!is_prereq
&& !*p
)) {
64 error(_("unrecognized header: %s%s (%d)"),
65 (is_prereq
? "-" : ""), buf
.buf
, (int)buf
.len
);
70 add_to_ref_list(&oid
, "", &header
->prerequisites
);
72 add_to_ref_list(&oid
, p
+ 1, &header
->references
);
85 int read_bundle_header(const char *path
, struct bundle_header
*header
)
87 int fd
= open(path
, O_RDONLY
);
90 return error(_("could not open '%s'"), path
);
91 return parse_bundle_header(fd
, header
, path
);
94 int is_bundle(const char *path
, int quiet
)
96 struct bundle_header header
;
97 int fd
= open(path
, O_RDONLY
);
101 memset(&header
, 0, sizeof(header
));
102 fd
= parse_bundle_header(fd
, &header
, quiet
? NULL
: path
);
108 static int list_refs(struct ref_list
*r
, int argc
, const char **argv
)
112 for (i
= 0; i
< r
->nr
; i
++) {
115 for (j
= 1; j
< argc
; j
++)
116 if (!strcmp(r
->list
[i
].name
, argv
[j
]))
121 printf("%s %s\n", oid_to_hex(&r
->list
[i
].oid
),
127 /* Remember to update object flag allocation in object.h */
128 #define PREREQ_MARK (1u<<16)
130 int verify_bundle(struct repository
*r
,
131 struct bundle_header
*header
,
135 * Do fast check, then if any prereqs are missing then go line by line
136 * to be verbose about the errors
138 struct ref_list
*p
= &header
->prerequisites
;
139 struct rev_info revs
;
140 const char *argv
[] = {NULL
, "--all", NULL
};
141 struct commit
*commit
;
142 int i
, ret
= 0, req_nr
;
143 const char *message
= _("Repository lacks these prerequisite commits:");
145 if (!r
|| !r
->objects
|| !r
->objects
->odb
)
146 return error(_("need a repository to verify a bundle"));
148 repo_init_revisions(r
, &revs
, NULL
);
149 for (i
= 0; i
< p
->nr
; i
++) {
150 struct ref_list_entry
*e
= p
->list
+ i
;
151 struct object
*o
= parse_object(r
, &e
->oid
);
153 o
->flags
|= PREREQ_MARK
;
154 add_pending_object(&revs
, o
, e
->name
);
158 error("%s", message
);
159 error("%s %s", oid_to_hex(&e
->oid
), e
->name
);
161 if (revs
.pending
.nr
!= p
->nr
)
163 req_nr
= revs
.pending
.nr
;
164 setup_revisions(2, argv
, &revs
, NULL
);
166 if (prepare_revision_walk(&revs
))
167 die(_("revision walk setup failed"));
170 while (i
&& (commit
= get_revision(&revs
)))
171 if (commit
->object
.flags
& PREREQ_MARK
)
174 for (i
= 0; i
< p
->nr
; i
++) {
175 struct ref_list_entry
*e
= p
->list
+ i
;
176 struct object
*o
= parse_object(r
, &e
->oid
);
177 assert(o
); /* otherwise we'd have returned early */
178 if (o
->flags
& SHOWN
)
181 error("%s", message
);
182 error("%s %s", oid_to_hex(&e
->oid
), e
->name
);
185 /* Clean up objects used, as they will be reused. */
186 for (i
= 0; i
< p
->nr
; i
++) {
187 struct ref_list_entry
*e
= p
->list
+ i
;
188 commit
= lookup_commit_reference_gently(r
, &e
->oid
, 1);
190 clear_commit_marks(commit
, ALL_REV_FLAGS
);
196 r
= &header
->references
;
197 printf_ln(Q_("The bundle contains this ref:",
198 "The bundle contains these %d refs:",
201 list_refs(r
, 0, NULL
);
202 r
= &header
->prerequisites
;
204 printf_ln(_("The bundle records a complete history."));
206 printf_ln(Q_("The bundle requires this ref:",
207 "The bundle requires these %d refs:",
210 list_refs(r
, 0, NULL
);
216 int list_bundle_refs(struct bundle_header
*header
, int argc
, const char **argv
)
218 return list_refs(&header
->references
, argc
, argv
);
221 static int is_tag_in_date_range(struct object
*tag
, struct rev_info
*revs
)
224 enum object_type type
;
225 char *buf
= NULL
, *line
, *lineend
;
229 if (revs
->max_age
== -1 && revs
->min_age
== -1)
232 buf
= read_object_file(&tag
->oid
, &type
, &size
);
235 line
= memmem(buf
, size
, "\ntagger ", 8);
238 lineend
= memchr(line
, '\n', buf
+ size
- line
);
239 line
= memchr(line
, '>', lineend
? lineend
- line
: buf
+ size
- line
);
242 date
= parse_timestamp(line
, NULL
, 10);
243 result
= (revs
->max_age
== -1 || revs
->max_age
< date
) &&
244 (revs
->min_age
== -1 || revs
->min_age
> date
);
251 /* Write the pack data to bundle_fd */
252 static int write_pack_data(int bundle_fd
, struct rev_info
*revs
)
254 struct child_process pack_objects
= CHILD_PROCESS_INIT
;
257 argv_array_pushl(&pack_objects
.args
,
258 "pack-objects", "--all-progress-implied",
259 "--stdout", "--thin", "--delta-base-offset",
261 pack_objects
.in
= -1;
262 pack_objects
.out
= bundle_fd
;
263 pack_objects
.git_cmd
= 1;
266 * start_command() will close our descriptor if it's >1. Duplicate it
267 * to avoid surprising the caller.
269 if (pack_objects
.out
> 1) {
270 pack_objects
.out
= dup(pack_objects
.out
);
271 if (pack_objects
.out
< 0) {
272 error_errno(_("unable to dup bundle descriptor"));
273 child_process_clear(&pack_objects
);
278 if (start_command(&pack_objects
))
279 return error(_("Could not spawn pack-objects"));
281 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
282 struct object
*object
= revs
->pending
.objects
[i
].item
;
283 if (object
->flags
& UNINTERESTING
)
284 write_or_die(pack_objects
.in
, "^", 1);
285 write_or_die(pack_objects
.in
, oid_to_hex(&object
->oid
), GIT_SHA1_HEXSZ
);
286 write_or_die(pack_objects
.in
, "\n", 1);
288 close(pack_objects
.in
);
289 if (finish_command(&pack_objects
))
290 return error(_("pack-objects died"));
294 static int compute_and_write_prerequisites(int bundle_fd
,
295 struct rev_info
*revs
,
296 int argc
, const char **argv
)
298 struct child_process rls
= CHILD_PROCESS_INIT
;
299 struct strbuf buf
= STRBUF_INIT
;
303 argv_array_pushl(&rls
.args
,
304 "rev-list", "--boundary", "--pretty=oneline",
306 for (i
= 1; i
< argc
; i
++)
307 argv_array_push(&rls
.args
, argv
[i
]);
310 if (start_command(&rls
))
312 rls_fout
= xfdopen(rls
.out
, "r");
313 while (strbuf_getwholeline(&buf
, rls_fout
, '\n') != EOF
) {
314 struct object_id oid
;
315 if (buf
.len
> 0 && buf
.buf
[0] == '-') {
316 write_or_die(bundle_fd
, buf
.buf
, buf
.len
);
317 if (!get_oid_hex(buf
.buf
+ 1, &oid
)) {
318 struct object
*object
= parse_object_or_die(&oid
,
320 object
->flags
|= UNINTERESTING
;
321 add_pending_object(revs
, object
, buf
.buf
);
323 } else if (!get_oid_hex(buf
.buf
, &oid
)) {
324 struct object
*object
= parse_object_or_die(&oid
,
326 object
->flags
|= SHOWN
;
329 strbuf_release(&buf
);
331 if (finish_command(&rls
))
332 return error(_("rev-list died"));
337 * Write out bundle refs based on the tips already
338 * parsed into revs.pending. As a side effect, may
339 * manipulate revs.pending to include additional
340 * necessary objects (like tags).
342 * Returns the number of refs written, or negative
345 static int write_bundle_refs(int bundle_fd
, struct rev_info
*revs
)
350 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
351 struct object_array_entry
*e
= revs
->pending
.objects
+ i
;
352 struct object_id oid
;
354 const char *display_ref
;
357 if (e
->item
->flags
& UNINTERESTING
)
359 if (dwim_ref(e
->name
, strlen(e
->name
), &oid
, &ref
) != 1)
361 if (read_ref_full(e
->name
, RESOLVE_REF_READING
, &oid
, &flag
))
363 display_ref
= (flag
& REF_ISSYMREF
) ? e
->name
: ref
;
365 if (e
->item
->type
== OBJ_TAG
&&
366 !is_tag_in_date_range(e
->item
, revs
)) {
367 e
->item
->flags
|= UNINTERESTING
;
372 * Make sure the refs we wrote out is correct; --max-count and
373 * other limiting options could have prevented all the tips
374 * from getting output.
376 * Non commit objects such as tags and blobs do not have
377 * this issue as they are not affected by those extra
380 if (!(e
->item
->flags
& SHOWN
) && e
->item
->type
== OBJ_COMMIT
) {
381 warning(_("ref '%s' is excluded by the rev-list options"),
386 * If you run "git bundle create bndl v1.0..v2.0", the
387 * name of the positive ref is "v2.0" but that is the
388 * commit that is referenced by the tag, and not the tag
391 if (!oideq(&oid
, &e
->item
->oid
)) {
393 * Is this the positive end of a range expressed
394 * in terms of a tag (e.g. v2.0 from the range
397 struct commit
*one
= lookup_commit_reference(revs
->repo
, &oid
);
400 if (e
->item
== &(one
->object
)) {
402 * Need to include e->name as an
403 * independent ref to the pack-objects
404 * input, so that the tag is included
405 * in the output; otherwise we would
406 * end up triggering "empty bundle"
409 obj
= parse_object_or_die(&oid
, e
->name
);
411 add_pending_object(revs
, obj
, e
->name
);
417 write_or_die(bundle_fd
, oid_to_hex(&e
->item
->oid
), 40);
418 write_or_die(bundle_fd
, " ", 1);
419 write_or_die(bundle_fd
, display_ref
, strlen(display_ref
));
420 write_or_die(bundle_fd
, "\n", 1);
426 write_or_die(bundle_fd
, "\n", 1);
430 int create_bundle(struct repository
*r
, const char *path
,
431 int argc
, const char **argv
)
433 struct lock_file lock
= LOCK_INIT
;
435 int bundle_to_stdout
;
437 struct rev_info revs
;
439 bundle_to_stdout
= !strcmp(path
, "-");
440 if (bundle_to_stdout
)
443 bundle_fd
= hold_lock_file_for_update(&lock
, path
,
446 /* write signature */
447 write_or_die(bundle_fd
, bundle_signature
, strlen(bundle_signature
));
449 /* init revs to list objects for pack-objects later */
450 save_commit_buffer
= 0;
451 repo_init_revisions(r
, &revs
, NULL
);
453 /* write prerequisites */
454 if (compute_and_write_prerequisites(bundle_fd
, &revs
, argc
, argv
))
457 argc
= setup_revisions(argc
, argv
, &revs
, NULL
);
460 error(_("unrecognized argument: %s"), argv
[1]);
464 object_array_remove_duplicates(&revs
.pending
);
466 ref_count
= write_bundle_refs(bundle_fd
, &revs
);
468 die(_("Refusing to create empty bundle."));
469 else if (ref_count
< 0)
473 if (write_pack_data(bundle_fd
, &revs
))
476 if (!bundle_to_stdout
) {
477 if (commit_lock_file(&lock
))
478 die_errno(_("cannot create '%s'"), path
);
482 rollback_lock_file(&lock
);
486 int unbundle(struct repository
*r
, struct bundle_header
*header
,
487 int bundle_fd
, int flags
)
489 const char *argv_index_pack
[] = {"index-pack",
490 "--fix-thin", "--stdin", NULL
, NULL
};
491 struct child_process ip
= CHILD_PROCESS_INIT
;
493 if (flags
& BUNDLE_VERBOSE
)
494 argv_index_pack
[3] = "-v";
496 if (verify_bundle(r
, header
, 0))
498 ip
.argv
= argv_index_pack
;
502 if (run_command(&ip
))
503 return error(_("index-pack died"));