Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 400 lines (358 sloc) 10.506 kb
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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"
fa30383 @gitster Merge branch 'maint'
gitster authored
9 #include "refs.h"
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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 */
f3fa183 @gitster Style: place opening brace of a function definition at column 1
gitster authored
27 int read_bundle_header(const char *path, struct bundle_header *header)
28 {
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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
872c930 @meyering Don't access line[-1] for a zero-length "line" from fgets.
meyering authored
51 if (len && buffer[len - 1] == '\n')
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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;
a80aad7 @pclouds Terminate argv with NULL before calling setup_revisions()
pclouds authored
101 const char *argv[] = {NULL, "--all", NULL};
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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)
9db56f7 @dlowe-net Fix non-literal format in printf-style calls
dlowe-net authored
117 error("%s", message);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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
3d51e1b check return code of prepare_revision_walk
Martin Koegler authored
131 if (prepare_revision_walk(&revs))
132 die("revision walk setup failed");
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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)
9db56f7 @dlowe-net Fix non-literal format in printf-style calls
dlowe-net authored
142 error("%s", message);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
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
c9a42c4 @dscho bundle: allow rev-list options to exclude annotated tags
dscho authored
170 static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
171 {
172 unsigned long size;
173 enum object_type type;
174 char *buf, *line, *lineend;
175 unsigned long date;
176
177 if (revs->max_age == -1 && revs->min_age == -1)
178 return 1;
179
180 buf = read_sha1_file(tag->sha1, &type, &size);
181 if (!buf)
182 return 1;
183 line = memmem(buf, size, "\ntagger ", 8);
184 if (!line++)
185 return 1;
186 lineend = memchr(line, buf + size - line, '\n');
187 line = memchr(line, lineend ? lineend - line : buf + size - line, '>');
188 if (!line++)
189 return 1;
190 date = strtoul(line, NULL, 10);
191 free(buf);
192 return (revs->max_age == -1 || revs->max_age < date) &&
193 (revs->min_age == -1 || revs->min_age > date);
194 }
195
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
196 int create_bundle(struct bundle_header *header, const char *path,
197 int argc, const char **argv)
198 {
199 static struct lock_file lock;
200 int bundle_fd = -1;
201 int bundle_to_stdout;
202 const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
787d2a7 @spearce bundle: Use OFS_DELTA in bundle files
spearce authored
203 const char **argv_pack = xmalloc(6 * sizeof(const char *));
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
204 int i, ref_count = 0;
205 char buffer[1024];
206 struct rev_info revs;
207 struct child_process rls;
208 FILE *rls_fout;
209
210 bundle_to_stdout = !strcmp(path, "-");
211 if (bundle_to_stdout)
212 bundle_fd = 1;
213 else
acd3b9e @gitster Enhance hold_lock_file_for_{update,append}() API
gitster authored
214 bundle_fd = hold_lock_file_for_update(&lock, path,
215 LOCK_DIE_ON_ERROR);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
216
217 /* write signature */
218 write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
219
220 /* init revs to list objects for pack-objects later */
221 save_commit_buffer = 0;
222 init_revisions(&revs, NULL);
223
224 /* write prerequisites */
225 memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *));
226 argv_boundary[0] = "rev-list";
227 argv_boundary[1] = "--boundary";
228 argv_boundary[2] = "--pretty=oneline";
229 argv_boundary[argc + 2] = NULL;
230 memset(&rls, 0, sizeof(rls));
231 rls.argv = argv_boundary;
232 rls.out = -1;
233 rls.git_cmd = 1;
234 if (start_command(&rls))
235 return -1;
4169837 don't dereference NULL upon fdopen failure
Jim Meyering authored
236 rls_fout = xfdopen(rls.out, "r");
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
237 while (fgets(buffer, sizeof(buffer), rls_fout)) {
238 unsigned char sha1[20];
239 if (buffer[0] == '-') {
240 write_or_die(bundle_fd, buffer, strlen(buffer));
241 if (!get_sha1_hex(buffer + 1, sha1)) {
242 struct object *object = parse_object(sha1);
243 object->flags |= UNINTERESTING;
244 add_pending_object(&revs, object, buffer);
245 }
246 } else if (!get_sha1_hex(buffer, sha1)) {
247 struct object *object = parse_object(sha1);
248 object->flags |= SHOWN;
249 }
250 }
251 fclose(rls_fout);
252 if (finish_command(&rls))
253 return error("rev-list died");
254
255 /* write references */
256 argc = setup_revisions(argc, argv, &revs, NULL);
22568f0 @adambrewster Teach git-bundle to read revision arguments from stdin like git-rev-list...
adambrewster authored
257
8b3dce5 @gitster Teach --stdin option to "log" family
gitster authored
258 if (argc > 1)
259 return error("unrecognized argument: %s'", argv[1]);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
260
b2a6d1c @gitster bundle: allow the same ref to be given more than once
gitster authored
261 object_array_remove_duplicates(&revs.pending);
262
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
263 for (i = 0; i < revs.pending.nr; i++) {
264 struct object_array_entry *e = revs.pending.objects + i;
265 unsigned char sha1[20];
266 char *ref;
fa30383 @gitster Merge branch 'maint'
gitster authored
267 const char *display_ref;
268 int flag;
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
269
270 if (e->item->flags & UNINTERESTING)
271 continue;
272 if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
273 continue;
fa30383 @gitster Merge branch 'maint'
gitster authored
274 if (!resolve_ref(e->name, sha1, 1, &flag))
275 flag = 0;
276 display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
277
c9a42c4 @dscho bundle: allow rev-list options to exclude annotated tags
dscho authored
278 if (e->item->type == OBJ_TAG &&
279 !is_tag_in_date_range(e->item, &revs)) {
280 e->item->flags |= UNINTERESTING;
281 continue;
282 }
283
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
284 /*
285 * Make sure the refs we wrote out is correct; --max-count and
286 * other limiting options could have prevented all the tips
287 * from getting output.
288 *
289 * Non commit objects such as tags and blobs do not have
290 * this issue as they are not affected by those extra
291 * constraints.
292 */
293 if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
294 warning("ref '%s' is excluded by the rev-list options",
295 e->name);
296 free(ref);
297 continue;
298 }
299 /*
300 * If you run "git bundle create bndl v1.0..v2.0", the
301 * name of the positive ref is "v2.0" but that is the
302 * commit that is referenced by the tag, and not the tag
303 * itself.
304 */
305 if (hashcmp(sha1, e->item->sha1)) {
306 /*
307 * Is this the positive end of a range expressed
308 * in terms of a tag (e.g. v2.0 from the range
309 * "v1.0..v2.0")?
310 */
311 struct commit *one = lookup_commit_reference(sha1);
312 struct object *obj;
313
314 if (e->item == &(one->object)) {
315 /*
316 * Need to include e->name as an
317 * independent ref to the pack-objects
318 * input, so that the tag is included
319 * in the output; otherwise we would
320 * end up triggering "empty bundle"
321 * error.
322 */
323 obj = parse_object(sha1);
324 obj->flags |= SHOWN;
325 add_pending_object(&revs, obj, e->name);
326 }
327 free(ref);
328 continue;
329 }
330
331 ref_count++;
332 write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
333 write_or_die(bundle_fd, " ", 1);
fa30383 @gitster Merge branch 'maint'
gitster authored
334 write_or_die(bundle_fd, display_ref, strlen(display_ref));
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
335 write_or_die(bundle_fd, "\n", 1);
336 free(ref);
337 }
338 if (!ref_count)
339 die ("Refusing to create empty bundle.");
340
341 /* end header */
342 write_or_die(bundle_fd, "\n", 1);
343
344 /* write pack */
345 argv_pack[0] = "pack-objects";
4f36627 @npitre pack-objects: split implications of --all-progress from progress activat...
npitre authored
346 argv_pack[1] = "--all-progress-implied";
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
347 argv_pack[2] = "--stdout";
348 argv_pack[3] = "--thin";
787d2a7 @spearce bundle: Use OFS_DELTA in bundle files
spearce authored
349 argv_pack[4] = "--delta-base-offset";
350 argv_pack[5] = NULL;
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
351 memset(&rls, 0, sizeof(rls));
352 rls.argv = argv_pack;
353 rls.in = -1;
354 rls.out = bundle_fd;
355 rls.git_cmd = 1;
356 if (start_command(&rls))
357 return error("Could not spawn pack-objects");
4ed7cd3 Improve use of lockfile API
Brandon Casey authored
358
359 /*
360 * start_command closed bundle_fd if it was > 1
361 * so set the lock fd to -1 so commit_lock_file()
362 * won't fail trying to close it.
363 */
364 lock.fd = -1;
365
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
366 for (i = 0; i < revs.pending.nr; i++) {
367 struct object *object = revs.pending.objects[i].item;
368 if (object->flags & UNINTERESTING)
95693d4 @meyering bundle, fast-import: detect write failure
meyering authored
369 write_or_die(rls.in, "^", 1);
370 write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
371 write_or_die(rls.in, "\n", 1);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
372 }
e72ae28 start_command(), .in/.out/.err = -1: Callers must close the file descrip...
Johannes Sixt authored
373 close(rls.in);
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
374 if (finish_command(&rls))
375 return error ("pack-objects died");
0f5cdf6 @csabahenk bundle: detect if bundle file cannot be created
csabahenk authored
376 if (!bundle_to_stdout) {
377 if (commit_lock_file(&lock))
378 die_errno("cannot create '%s'", path);
379 }
c20181e start_command(), if .in/.out > 0, closes file descriptors, not the calle...
Johannes Sixt authored
380 return 0;
30415d5 @dscho Move bundle specific stuff into bundle.[ch]
dscho authored
381 }
382
383 int unbundle(struct bundle_header *header, int bundle_fd)
384 {
385 const char *argv_index_pack[] = {"index-pack",
386 "--fix-thin", "--stdin", NULL};
387 struct child_process ip;
388
389 if (verify_bundle(header, 0))
390 return -1;
391 memset(&ip, 0, sizeof(ip));
392 ip.argv = argv_index_pack;
393 ip.in = bundle_fd;
394 ip.no_stdout = 1;
395 ip.git_cmd = 1;
396 if (run_command(&ip))
397 return error("index-pack died");
398 return 0;
399 }
Something went wrong with that request. Please try again.