]>
Commit | Line | Data |
---|---|---|
30415d50 JS |
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" | |
fa303836 | 9 | #include "refs.h" |
30415d50 JS |
10 | |
11 | static const char bundle_signature[] = "# v2 git bundle\n"; | |
12 | ||
13 | static void add_to_ref_list(const unsigned char *sha1, const char *name, | |
14 | struct ref_list *list) | |
15 | { | |
16 | if (list->nr + 1 >= list->alloc) { | |
17 | list->alloc = alloc_nr(list->nr + 1); | |
18 | list->list = xrealloc(list->list, | |
19 | list->alloc * sizeof(list->list[0])); | |
20 | } | |
21 | memcpy(list->list[list->nr].sha1, sha1, 20); | |
22 | list->list[list->nr].name = xstrdup(name); | |
23 | list->nr++; | |
24 | } | |
25 | ||
26 | /* returns an fd */ | |
f3fa1838 JH |
27 | int read_bundle_header(const char *path, struct bundle_header *header) |
28 | { | |
30415d50 JS |
29 | char buffer[1024]; |
30 | int fd; | |
31 | long fpos; | |
32 | FILE *ffd = fopen(path, "rb"); | |
33 | ||
34 | if (!ffd) | |
35 | return error("could not open '%s'", path); | |
36 | if (!fgets(buffer, sizeof(buffer), ffd) || | |
37 | strcmp(buffer, bundle_signature)) { | |
38 | fclose(ffd); | |
39 | return error("'%s' does not look like a v2 bundle file", path); | |
40 | } | |
41 | while (fgets(buffer, sizeof(buffer), ffd) | |
42 | && buffer[0] != '\n') { | |
43 | int is_prereq = buffer[0] == '-'; | |
44 | int offset = is_prereq ? 1 : 0; | |
45 | int len = strlen(buffer); | |
46 | unsigned char sha1[20]; | |
47 | struct ref_list *list = is_prereq ? &header->prerequisites | |
48 | : &header->references; | |
49 | char delim; | |
50 | ||
872c930d | 51 | if (len && buffer[len - 1] == '\n') |
30415d50 JS |
52 | buffer[len - 1] = '\0'; |
53 | if (get_sha1_hex(buffer + offset, sha1)) { | |
54 | warning("unrecognized header: %s", buffer); | |
55 | continue; | |
56 | } | |
57 | delim = buffer[40 + offset]; | |
58 | if (!isspace(delim) && (delim != '\0' || !is_prereq)) | |
59 | die ("invalid header: %s", buffer); | |
60 | add_to_ref_list(sha1, isspace(delim) ? | |
61 | buffer + 41 + offset : "", list); | |
62 | } | |
63 | fpos = ftell(ffd); | |
64 | fclose(ffd); | |
65 | fd = open(path, O_RDONLY); | |
66 | if (fd < 0) | |
67 | return error("could not open '%s'", path); | |
68 | lseek(fd, fpos, SEEK_SET); | |
69 | return fd; | |
70 | } | |
71 | ||
72 | static int list_refs(struct ref_list *r, int argc, const char **argv) | |
73 | { | |
74 | int i; | |
75 | ||
76 | for (i = 0; i < r->nr; i++) { | |
77 | if (argc > 1) { | |
78 | int j; | |
79 | for (j = 1; j < argc; j++) | |
80 | if (!strcmp(r->list[i].name, argv[j])) | |
81 | break; | |
82 | if (j == argc) | |
83 | continue; | |
84 | } | |
85 | printf("%s %s\n", sha1_to_hex(r->list[i].sha1), | |
86 | r->list[i].name); | |
87 | } | |
88 | return 0; | |
89 | } | |
90 | ||
91 | #define PREREQ_MARK (1u<<16) | |
92 | ||
93 | int verify_bundle(struct bundle_header *header, int verbose) | |
94 | { | |
95 | /* | |
96 | * Do fast check, then if any prereqs are missing then go line by line | |
97 | * to be verbose about the errors | |
98 | */ | |
99 | struct ref_list *p = &header->prerequisites; | |
100 | struct rev_info revs; | |
101 | const char *argv[] = {NULL, "--all"}; | |
102 | struct object_array refs; | |
103 | struct commit *commit; | |
104 | int i, ret = 0, req_nr; | |
105 | const char *message = "Repository lacks these prerequisite commits:"; | |
106 | ||
107 | init_revisions(&revs, NULL); | |
108 | for (i = 0; i < p->nr; i++) { | |
109 | struct ref_list_entry *e = p->list + i; | |
110 | struct object *o = parse_object(e->sha1); | |
111 | if (o) { | |
112 | o->flags |= PREREQ_MARK; | |
113 | add_pending_object(&revs, o, e->name); | |
114 | continue; | |
115 | } | |
116 | if (++ret == 1) | |
9db56f71 | 117 | error("%s", message); |
30415d50 JS |
118 | error("%s %s", sha1_to_hex(e->sha1), e->name); |
119 | } | |
120 | if (revs.pending.nr != p->nr) | |
121 | return ret; | |
122 | req_nr = revs.pending.nr; | |
123 | setup_revisions(2, argv, &revs, NULL); | |
124 | ||
125 | memset(&refs, 0, sizeof(struct object_array)); | |
126 | for (i = 0; i < revs.pending.nr; i++) { | |
127 | struct object_array_entry *e = revs.pending.objects + i; | |
128 | add_object_array(e->item, e->name, &refs); | |
129 | } | |
130 | ||
3d51e1b5 MK |
131 | if (prepare_revision_walk(&revs)) |
132 | die("revision walk setup failed"); | |
30415d50 JS |
133 | |
134 | i = req_nr; | |
135 | while (i && (commit = get_revision(&revs))) | |
136 | if (commit->object.flags & PREREQ_MARK) | |
137 | i--; | |
138 | ||
139 | for (i = 0; i < req_nr; i++) | |
140 | if (!(refs.objects[i].item->flags & SHOWN)) { | |
141 | if (++ret == 1) | |
9db56f71 | 142 | error("%s", message); |
30415d50 JS |
143 | error("%s %s", sha1_to_hex(refs.objects[i].item->sha1), |
144 | refs.objects[i].name); | |
145 | } | |
146 | ||
147 | for (i = 0; i < refs.nr; i++) | |
148 | clear_commit_marks((struct commit *)refs.objects[i].item, -1); | |
149 | ||
150 | if (verbose) { | |
151 | struct ref_list *r; | |
152 | ||
153 | r = &header->references; | |
154 | printf("The bundle contains %d ref%s\n", | |
155 | r->nr, (1 < r->nr) ? "s" : ""); | |
156 | list_refs(r, 0, NULL); | |
157 | r = &header->prerequisites; | |
158 | printf("The bundle requires these %d ref%s\n", | |
159 | r->nr, (1 < r->nr) ? "s" : ""); | |
160 | list_refs(r, 0, NULL); | |
161 | } | |
162 | return ret; | |
163 | } | |
164 | ||
165 | int list_bundle_refs(struct bundle_header *header, int argc, const char **argv) | |
166 | { | |
167 | return list_refs(&header->references, argc, argv); | |
168 | } | |
169 | ||
170 | int create_bundle(struct bundle_header *header, const char *path, | |
171 | int argc, const char **argv) | |
172 | { | |
173 | static struct lock_file lock; | |
174 | int bundle_fd = -1; | |
175 | int bundle_to_stdout; | |
176 | const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *)); | |
177 | const char **argv_pack = xmalloc(5 * sizeof(const char *)); | |
178 | int i, ref_count = 0; | |
179 | char buffer[1024]; | |
180 | struct rev_info revs; | |
22568f0a | 181 | int read_from_stdin = 0; |
30415d50 JS |
182 | struct child_process rls; |
183 | FILE *rls_fout; | |
184 | ||
185 | bundle_to_stdout = !strcmp(path, "-"); | |
186 | if (bundle_to_stdout) | |
187 | bundle_fd = 1; | |
188 | else | |
acd3b9ec JH |
189 | bundle_fd = hold_lock_file_for_update(&lock, path, |
190 | LOCK_DIE_ON_ERROR); | |
30415d50 JS |
191 | |
192 | /* write signature */ | |
193 | write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature)); | |
194 | ||
195 | /* init revs to list objects for pack-objects later */ | |
196 | save_commit_buffer = 0; | |
197 | init_revisions(&revs, NULL); | |
198 | ||
199 | /* write prerequisites */ | |
200 | memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *)); | |
201 | argv_boundary[0] = "rev-list"; | |
202 | argv_boundary[1] = "--boundary"; | |
203 | argv_boundary[2] = "--pretty=oneline"; | |
204 | argv_boundary[argc + 2] = NULL; | |
205 | memset(&rls, 0, sizeof(rls)); | |
206 | rls.argv = argv_boundary; | |
207 | rls.out = -1; | |
208 | rls.git_cmd = 1; | |
209 | if (start_command(&rls)) | |
210 | return -1; | |
211 | rls_fout = fdopen(rls.out, "r"); | |
212 | while (fgets(buffer, sizeof(buffer), rls_fout)) { | |
213 | unsigned char sha1[20]; | |
214 | if (buffer[0] == '-') { | |
215 | write_or_die(bundle_fd, buffer, strlen(buffer)); | |
216 | if (!get_sha1_hex(buffer + 1, sha1)) { | |
217 | struct object *object = parse_object(sha1); | |
218 | object->flags |= UNINTERESTING; | |
219 | add_pending_object(&revs, object, buffer); | |
220 | } | |
221 | } else if (!get_sha1_hex(buffer, sha1)) { | |
222 | struct object *object = parse_object(sha1); | |
223 | object->flags |= SHOWN; | |
224 | } | |
225 | } | |
226 | fclose(rls_fout); | |
227 | if (finish_command(&rls)) | |
228 | return error("rev-list died"); | |
229 | ||
230 | /* write references */ | |
231 | argc = setup_revisions(argc, argv, &revs, NULL); | |
22568f0a AB |
232 | |
233 | for (i = 1; i < argc; i++) { | |
234 | if (!strcmp(argv[i], "--stdin")) { | |
235 | if (read_from_stdin++) | |
236 | die("--stdin given twice?"); | |
237 | read_revisions_from_stdin(&revs); | |
238 | continue; | |
239 | } | |
240 | return error("unrecognized argument: %s'", argv[i]); | |
241 | } | |
30415d50 | 242 | |
b2a6d1c6 JH |
243 | object_array_remove_duplicates(&revs.pending); |
244 | ||
30415d50 JS |
245 | for (i = 0; i < revs.pending.nr; i++) { |
246 | struct object_array_entry *e = revs.pending.objects + i; | |
247 | unsigned char sha1[20]; | |
248 | char *ref; | |
fa303836 JH |
249 | const char *display_ref; |
250 | int flag; | |
30415d50 JS |
251 | |
252 | if (e->item->flags & UNINTERESTING) | |
253 | continue; | |
254 | if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1) | |
255 | continue; | |
fa303836 JH |
256 | if (!resolve_ref(e->name, sha1, 1, &flag)) |
257 | flag = 0; | |
258 | display_ref = (flag & REF_ISSYMREF) ? e->name : ref; | |
259 | ||
30415d50 JS |
260 | /* |
261 | * Make sure the refs we wrote out is correct; --max-count and | |
262 | * other limiting options could have prevented all the tips | |
263 | * from getting output. | |
264 | * | |
265 | * Non commit objects such as tags and blobs do not have | |
266 | * this issue as they are not affected by those extra | |
267 | * constraints. | |
268 | */ | |
269 | if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { | |
270 | warning("ref '%s' is excluded by the rev-list options", | |
271 | e->name); | |
272 | free(ref); | |
273 | continue; | |
274 | } | |
275 | /* | |
276 | * If you run "git bundle create bndl v1.0..v2.0", the | |
277 | * name of the positive ref is "v2.0" but that is the | |
278 | * commit that is referenced by the tag, and not the tag | |
279 | * itself. | |
280 | */ | |
281 | if (hashcmp(sha1, e->item->sha1)) { | |
282 | /* | |
283 | * Is this the positive end of a range expressed | |
284 | * in terms of a tag (e.g. v2.0 from the range | |
285 | * "v1.0..v2.0")? | |
286 | */ | |
287 | struct commit *one = lookup_commit_reference(sha1); | |
288 | struct object *obj; | |
289 | ||
290 | if (e->item == &(one->object)) { | |
291 | /* | |
292 | * Need to include e->name as an | |
293 | * independent ref to the pack-objects | |
294 | * input, so that the tag is included | |
295 | * in the output; otherwise we would | |
296 | * end up triggering "empty bundle" | |
297 | * error. | |
298 | */ | |
299 | obj = parse_object(sha1); | |
300 | obj->flags |= SHOWN; | |
301 | add_pending_object(&revs, obj, e->name); | |
302 | } | |
303 | free(ref); | |
304 | continue; | |
305 | } | |
306 | ||
307 | ref_count++; | |
308 | write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40); | |
309 | write_or_die(bundle_fd, " ", 1); | |
fa303836 | 310 | write_or_die(bundle_fd, display_ref, strlen(display_ref)); |
30415d50 JS |
311 | write_or_die(bundle_fd, "\n", 1); |
312 | free(ref); | |
313 | } | |
314 | if (!ref_count) | |
315 | die ("Refusing to create empty bundle."); | |
316 | ||
317 | /* end header */ | |
318 | write_or_die(bundle_fd, "\n", 1); | |
319 | ||
320 | /* write pack */ | |
321 | argv_pack[0] = "pack-objects"; | |
322 | argv_pack[1] = "--all-progress"; | |
323 | argv_pack[2] = "--stdout"; | |
324 | argv_pack[3] = "--thin"; | |
325 | argv_pack[4] = NULL; | |
326 | memset(&rls, 0, sizeof(rls)); | |
327 | rls.argv = argv_pack; | |
328 | rls.in = -1; | |
329 | rls.out = bundle_fd; | |
330 | rls.git_cmd = 1; | |
331 | if (start_command(&rls)) | |
332 | return error("Could not spawn pack-objects"); | |
4ed7cd3a BC |
333 | |
334 | /* | |
335 | * start_command closed bundle_fd if it was > 1 | |
336 | * so set the lock fd to -1 so commit_lock_file() | |
337 | * won't fail trying to close it. | |
338 | */ | |
339 | lock.fd = -1; | |
340 | ||
30415d50 JS |
341 | for (i = 0; i < revs.pending.nr; i++) { |
342 | struct object *object = revs.pending.objects[i].item; | |
343 | if (object->flags & UNINTERESTING) | |
95693d45 JM |
344 | write_or_die(rls.in, "^", 1); |
345 | write_or_die(rls.in, sha1_to_hex(object->sha1), 40); | |
346 | write_or_die(rls.in, "\n", 1); | |
30415d50 | 347 | } |
e72ae288 | 348 | close(rls.in); |
30415d50 JS |
349 | if (finish_command(&rls)) |
350 | return error ("pack-objects died"); | |
c20181e3 JS |
351 | if (!bundle_to_stdout) |
352 | commit_lock_file(&lock); | |
353 | return 0; | |
30415d50 JS |
354 | } |
355 | ||
356 | int unbundle(struct bundle_header *header, int bundle_fd) | |
357 | { | |
358 | const char *argv_index_pack[] = {"index-pack", | |
359 | "--fix-thin", "--stdin", NULL}; | |
360 | struct child_process ip; | |
361 | ||
362 | if (verify_bundle(header, 0)) | |
363 | return -1; | |
364 | memset(&ip, 0, sizeof(ip)); | |
365 | ip.argv = argv_index_pack; | |
366 | ip.in = bundle_fd; | |
367 | ip.no_stdout = 1; | |
368 | ip.git_cmd = 1; | |
369 | if (run_command(&ip)) | |
370 | return error("index-pack died"); | |
371 | return 0; | |
372 | } |