]>
Commit | Line | Data |
---|---|---|
36bf1958 EN |
1 | #include "git-compat-util.h" |
2 | #include "alloc.h" | |
b2141fc1 | 3 | #include "config.h" |
f394e093 | 4 | #include "gettext.h" |
41771fa4 | 5 | #include "hex.h" |
fb58c8d5 | 6 | #include "refs.h" |
cbd53a21 | 7 | #include "object-store.h" |
18125644 | 8 | #include "commit.h" |
c0885435 | 9 | #include "tree-walk.h" |
18125644 | 10 | #include "attr.h" |
562e25ab | 11 | #include "archive.h" |
4fac1d3a | 12 | #include "parse-options.h" |
ba053ea9 | 13 | #include "unpack-trees.h" |
ed22b417 | 14 | #include "dir.h" |
de1f68a9 | 15 | #include "quote.h" |
4fac1d3a RS |
16 | |
17 | static char const * const archive_usage[] = { | |
9c9b4f2f | 18 | N_("git archive [<options>] <tree-ish> [<path>...]"), |
959d670d | 19 | "git archive --list", |
9c9b4f2f | 20 | N_("git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"), |
0012a387 | 21 | N_("git archive --remote <repo> [--exec <cmd>] --list"), |
4fac1d3a RS |
22 | NULL |
23 | }; | |
c0885435 | 24 | |
13e0f88d JK |
25 | static const struct archiver **archivers; |
26 | static int nr_archivers; | |
27 | static int alloc_archivers; | |
7671b632 | 28 | static int remote_allow_unreachable; |
13e0f88d JK |
29 | |
30 | void register_archiver(struct archiver *ar) | |
31 | { | |
32 | ALLOC_GROW(archivers, nr_archivers + 1, alloc_archivers); | |
33 | archivers[nr_archivers++] = ar; | |
34 | } | |
c0885435 | 35 | |
00436bf1 JS |
36 | void init_archivers(void) |
37 | { | |
38 | init_tar_archiver(); | |
39 | init_zip_archiver(); | |
40 | } | |
41 | ||
18125644 | 42 | static void format_subst(const struct commit *commit, |
ec36c42a | 43 | const char *src, size_t len, |
96099726 | 44 | struct strbuf *buf, struct pretty_print_context *ctx) |
18125644 LH |
45 | { |
46 | char *to_free = NULL; | |
f285a2d7 | 47 | struct strbuf fmt = STRBUF_INIT; |
18125644 LH |
48 | |
49 | if (src == buf->buf) | |
50 | to_free = strbuf_detach(buf, NULL); | |
18125644 LH |
51 | for (;;) { |
52 | const char *b, *c; | |
53 | ||
54 | b = memmem(src, len, "$Format:", 8); | |
75b7dfbd | 55 | if (!b) |
18125644 | 56 | break; |
75b7dfbd | 57 | c = memchr(b + 8, '$', (src + len) - b - 8); |
18125644 LH |
58 | if (!c) |
59 | break; | |
60 | ||
61 | strbuf_reset(&fmt); | |
62 | strbuf_add(&fmt, b + 8, c - b - 8); | |
63 | ||
64 | strbuf_add(buf, src, b - src); | |
96099726 | 65 | format_commit_message(commit, fmt.buf, buf, ctx); |
18125644 LH |
66 | len -= c + 1 - src; |
67 | src = c + 1; | |
68 | } | |
69 | strbuf_add(buf, src, len); | |
70 | strbuf_release(&fmt); | |
71 | free(to_free); | |
72 | } | |
73 | ||
200589ab RS |
74 | static void *object_file_to_archive(const struct archiver_args *args, |
75 | const char *path, | |
76 | const struct object_id *oid, | |
77 | unsigned int mode, | |
78 | enum object_type *type, | |
79 | unsigned long *sizep) | |
18125644 LH |
80 | { |
81 | void *buffer; | |
9cb513b7 | 82 | const struct commit *commit = args->convert ? args->commit : NULL; |
c397aac0 | 83 | struct checkout_metadata meta; |
84 | ||
85 | init_checkout_metadata(&meta, args->refname, | |
86 | args->commit_oid ? args->commit_oid : | |
87 | (args->tree ? &args->tree->object.oid : NULL), oid); | |
18125644 | 88 | |
9cb513b7 | 89 | path += args->baselen; |
b4f5aca4 | 90 | buffer = read_object_file(oid, type, sizep); |
18125644 | 91 | if (buffer && S_ISREG(mode)) { |
f285a2d7 | 92 | struct strbuf buf = STRBUF_INIT; |
18125644 LH |
93 | size_t size = 0; |
94 | ||
18125644 | 95 | strbuf_attach(&buf, buffer, *sizep, *sizep + 1); |
c397aac0 | 96 | convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf, &meta); |
1d11d5bb | 97 | if (commit) |
96099726 | 98 | format_subst(commit, buf.buf, buf.len, &buf, args->pretty_ctx); |
18125644 LH |
99 | buffer = strbuf_detach(&buf, &size); |
100 | *sizep = size; | |
101 | } | |
102 | ||
103 | return buffer; | |
104 | } | |
105 | ||
ed22b417 NTND |
106 | struct directory { |
107 | struct directory *up; | |
13609673 | 108 | struct object_id oid; |
ed22b417 NTND |
109 | int baselen, len; |
110 | unsigned mode; | |
ed22b417 NTND |
111 | char path[FLEX_ARRAY]; |
112 | }; | |
113 | ||
562e25ab RS |
114 | struct archiver_context { |
115 | struct archiver_args *args; | |
116 | write_archive_entry_fn_t write_entry; | |
ed22b417 | 117 | struct directory *bottom; |
562e25ab RS |
118 | }; |
119 | ||
b612ee20 NTND |
120 | static const struct attr_check *get_archive_attrs(struct index_state *istate, |
121 | const char *path) | |
c6c08f7e RS |
122 | { |
123 | static struct attr_check *check; | |
124 | if (!check) | |
125 | check = attr_check_initl("export-ignore", "export-subst", NULL); | |
47cfc9bd | 126 | git_check_attr(istate, NULL, path, check); |
d64324cb | 127 | return check; |
c6c08f7e RS |
128 | } |
129 | ||
130 | static int check_attr_export_ignore(const struct attr_check *check) | |
131 | { | |
132 | return check && ATTR_TRUE(check->items[0].value); | |
133 | } | |
134 | ||
135 | static int check_attr_export_subst(const struct attr_check *check) | |
136 | { | |
137 | return check && ATTR_TRUE(check->items[1].value); | |
138 | } | |
139 | ||
015ff4f8 | 140 | static int write_archive_entry(const struct object_id *oid, const char *base, |
7367d882 | 141 | int baselen, const char *filename, unsigned mode, |
562e25ab RS |
142 | void *context) |
143 | { | |
144 | static struct strbuf path = STRBUF_INIT; | |
145 | struct archiver_context *c = context; | |
146 | struct archiver_args *args = c->args; | |
147 | write_archive_entry_fn_t write_entry = c->write_entry; | |
148 | int err; | |
5ff247ac | 149 | const char *path_without_prefix; |
200589ab RS |
150 | unsigned long size; |
151 | void *buffer; | |
152 | enum object_type type; | |
562e25ab | 153 | |
9cb513b7 | 154 | args->convert = 0; |
562e25ab RS |
155 | strbuf_reset(&path); |
156 | strbuf_grow(&path, PATH_MAX); | |
ebfbdb34 | 157 | strbuf_add(&path, args->base, args->baselen); |
562e25ab RS |
158 | strbuf_add(&path, base, baselen); |
159 | strbuf_addstr(&path, filename); | |
94bc671a JNA |
160 | if (S_ISDIR(mode) || S_ISGITLINK(mode)) |
161 | strbuf_addch(&path, '/'); | |
1d11d5bb | 162 | path_without_prefix = path.buf + args->baselen; |
562e25ab | 163 | |
43180940 | 164 | if (!S_ISDIR(mode)) { |
5ff247ac | 165 | const struct attr_check *check; |
b612ee20 | 166 | check = get_archive_attrs(args->repo->index, path_without_prefix); |
5ff247ac | 167 | if (check_attr_export_ignore(check)) |
1d11d5bb | 168 | return 0; |
5ff247ac | 169 | args->convert = check_attr_export_subst(check); |
1d11d5bb | 170 | } |
562e25ab | 171 | |
e3733b64 RS |
172 | if (args->verbose) |
173 | fprintf(stderr, "%.*s\n", (int)path.len, path.buf); | |
174 | ||
562e25ab | 175 | if (S_ISDIR(mode) || S_ISGITLINK(mode)) { |
200589ab | 176 | err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0); |
562e25ab RS |
177 | if (err) |
178 | return err; | |
d3bee161 | 179 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
562e25ab RS |
180 | } |
181 | ||
200589ab RS |
182 | /* Stream it? */ |
183 | if (S_ISREG(mode) && !args->convert && | |
184 | oid_object_info(args->repo, oid, &size) == OBJ_BLOB && | |
185 | size > big_file_threshold) | |
186 | return write_entry(args, oid, path.buf, path.len, mode, NULL, size); | |
187 | ||
188 | buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size); | |
189 | if (!buffer) | |
c4904377 | 190 | return error(_("cannot read '%s'"), oid_to_hex(oid)); |
200589ab RS |
191 | err = write_entry(args, oid, path.buf, path.len, mode, buffer, size); |
192 | free(buffer); | |
193 | return err; | |
562e25ab RS |
194 | } |
195 | ||
e124ecf7 | 196 | static void queue_directory(const struct object_id *oid, |
6a0b0b6d | 197 | struct strbuf *base, const char *filename, |
7367d882 | 198 | unsigned mode, struct archiver_context *c) |
ed22b417 NTND |
199 | { |
200 | struct directory *d; | |
50a6c8ef JK |
201 | size_t len = st_add4(base->len, 1, strlen(filename), 1); |
202 | d = xmalloc(st_add(sizeof(*d), len)); | |
ed22b417 | 203 | d->up = c->bottom; |
6a0b0b6d | 204 | d->baselen = base->len; |
ed22b417 | 205 | d->mode = mode; |
ed22b417 | 206 | c->bottom = d; |
c7ab0ba3 | 207 | d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename); |
e124ecf7 | 208 | oidcpy(&d->oid, oid); |
ed22b417 NTND |
209 | } |
210 | ||
211 | static int write_directory(struct archiver_context *c) | |
212 | { | |
213 | struct directory *d = c->bottom; | |
214 | int ret; | |
215 | ||
216 | if (!d) | |
217 | return 0; | |
218 | c->bottom = d->up; | |
219 | d->path[d->len - 1] = '\0'; /* no trailing slash */ | |
220 | ret = | |
221 | write_directory(c) || | |
015ff4f8 | 222 | write_archive_entry(&d->oid, d->path, d->baselen, |
ed22b417 | 223 | d->path + d->baselen, d->mode, |
7367d882 | 224 | c) != READ_TREE_RECURSIVE; |
ed22b417 NTND |
225 | free(d); |
226 | return ret ? -1 : 0; | |
227 | } | |
228 | ||
df46d77e | 229 | static int queue_or_write_archive_entry(const struct object_id *oid, |
6a0b0b6d | 230 | struct strbuf *base, const char *filename, |
47957485 | 231 | unsigned mode, void *context) |
ed22b417 NTND |
232 | { |
233 | struct archiver_context *c = context; | |
234 | ||
235 | while (c->bottom && | |
6a0b0b6d NTND |
236 | !(base->len >= c->bottom->len && |
237 | !strncmp(base->buf, c->bottom->path, c->bottom->len))) { | |
ed22b417 NTND |
238 | struct directory *next = c->bottom->up; |
239 | free(c->bottom); | |
240 | c->bottom = next; | |
241 | } | |
242 | ||
243 | if (S_ISDIR(mode)) { | |
5ff247ac RS |
244 | size_t baselen = base->len; |
245 | const struct attr_check *check; | |
246 | ||
247 | /* Borrow base, but restore its original value when done. */ | |
248 | strbuf_addstr(base, filename); | |
249 | strbuf_addch(base, '/'); | |
b612ee20 | 250 | check = get_archive_attrs(c->args->repo->index, base->buf); |
5ff247ac RS |
251 | strbuf_setlen(base, baselen); |
252 | ||
253 | if (check_attr_export_ignore(check)) | |
254 | return 0; | |
e124ecf7 | 255 | queue_directory(oid, base, filename, mode, c); |
ed22b417 NTND |
256 | return READ_TREE_RECURSIVE; |
257 | } | |
258 | ||
259 | if (write_directory(c)) | |
260 | return -1; | |
015ff4f8 | 261 | return write_archive_entry(oid, base->buf, base->len, filename, mode, |
7367d882 | 262 | context); |
ed22b417 NTND |
263 | } |
264 | ||
2947a793 RS |
265 | struct extra_file_info { |
266 | char *base; | |
267 | struct stat stat; | |
237a1d13 | 268 | void *content; |
2947a793 RS |
269 | }; |
270 | ||
562e25ab RS |
271 | int write_archive_entries(struct archiver_args *args, |
272 | write_archive_entry_fn_t write_entry) | |
273 | { | |
274 | struct archiver_context context; | |
ba053ea9 NTND |
275 | struct unpack_trees_options opts; |
276 | struct tree_desc t; | |
562e25ab | 277 | int err; |
2947a793 RS |
278 | struct strbuf path_in_archive = STRBUF_INIT; |
279 | struct strbuf content = STRBUF_INIT; | |
14228447 | 280 | struct object_id fake_oid; |
2947a793 | 281 | int i; |
562e25ab | 282 | |
14228447 | 283 | oidcpy(&fake_oid, null_oid()); |
284 | ||
562e25ab RS |
285 | if (args->baselen > 0 && args->base[args->baselen - 1] == '/') { |
286 | size_t len = args->baselen; | |
287 | ||
288 | while (len > 1 && args->base[len - 2] == '/') | |
289 | len--; | |
290 | if (args->verbose) | |
291 | fprintf(stderr, "%.*s\n", (int)len, args->base); | |
015ff4f8 | 292 | err = write_entry(args, &args->tree->object.oid, args->base, |
200589ab | 293 | len, 040777, NULL, 0); |
562e25ab RS |
294 | if (err) |
295 | return err; | |
296 | } | |
297 | ||
ed22b417 | 298 | memset(&context, 0, sizeof(context)); |
562e25ab RS |
299 | context.args = args; |
300 | context.write_entry = write_entry; | |
301 | ||
ba053ea9 NTND |
302 | /* |
303 | * Setup index and instruct attr to read index only | |
304 | */ | |
305 | if (!args->worktree_attributes) { | |
306 | memset(&opts, 0, sizeof(opts)); | |
307 | opts.index_only = 1; | |
308 | opts.head_idx = -1; | |
b612ee20 NTND |
309 | opts.src_index = args->repo->index; |
310 | opts.dst_index = args->repo->index; | |
ba053ea9 NTND |
311 | opts.fn = oneway_merge; |
312 | init_tree_desc(&t, args->tree->buffer, args->tree->size); | |
313 | if (unpack_trees(1, &t, &opts)) | |
314 | return -1; | |
c4500e25 | 315 | git_attr_set_direction(GIT_ATTR_INDEX); |
ba053ea9 NTND |
316 | } |
317 | ||
47957485 ÆAB |
318 | err = read_tree(args->repo, args->tree, |
319 | &args->pathspec, | |
320 | queue_or_write_archive_entry, | |
321 | &context); | |
562e25ab RS |
322 | if (err == READ_TREE_RECURSIVE) |
323 | err = 0; | |
ed22b417 NTND |
324 | while (context.bottom) { |
325 | struct directory *next = context.bottom->up; | |
326 | free(context.bottom); | |
327 | context.bottom = next; | |
328 | } | |
2947a793 RS |
329 | |
330 | for (i = 0; i < args->extra_files.nr; i++) { | |
331 | struct string_list_item *item = args->extra_files.items + i; | |
332 | char *path = item->string; | |
333 | struct extra_file_info *info = item->util; | |
334 | ||
335 | put_be64(fake_oid.hash, i + 1); | |
336 | ||
237a1d13 JS |
337 | if (!info->content) { |
338 | strbuf_reset(&path_in_archive); | |
339 | if (info->base) | |
340 | strbuf_addstr(&path_in_archive, info->base); | |
341 | strbuf_addstr(&path_in_archive, basename(path)); | |
342 | ||
343 | strbuf_reset(&content); | |
344 | if (strbuf_read_file(&content, path, info->stat.st_size) < 0) | |
345 | err = error_errno(_("cannot read '%s'"), path); | |
346 | else | |
347 | err = write_entry(args, &fake_oid, path_in_archive.buf, | |
348 | path_in_archive.len, | |
349 | canon_mode(info->stat.st_mode), | |
350 | content.buf, content.len); | |
351 | } else { | |
352 | err = write_entry(args, &fake_oid, | |
353 | path, strlen(path), | |
6a616619 | 354 | canon_mode(info->stat.st_mode), |
237a1d13 JS |
355 | info->content, info->stat.st_size); |
356 | } | |
357 | ||
2947a793 RS |
358 | if (err) |
359 | break; | |
360 | } | |
361 | strbuf_release(&path_in_archive); | |
362 | strbuf_release(&content); | |
363 | ||
562e25ab RS |
364 | return err; |
365 | } | |
6e94e683 | 366 | |
c0885435 RS |
367 | static const struct archiver *lookup_archiver(const char *name) |
368 | { | |
369 | int i; | |
370 | ||
4fac1d3a RS |
371 | if (!name) |
372 | return NULL; | |
373 | ||
13e0f88d JK |
374 | for (i = 0; i < nr_archivers; i++) { |
375 | if (!strcmp(name, archivers[i]->name)) | |
376 | return archivers[i]; | |
c0885435 RS |
377 | } |
378 | return NULL; | |
379 | } | |
380 | ||
b612ee20 NTND |
381 | struct path_exists_context { |
382 | struct pathspec pathspec; | |
383 | struct archiver_args *args; | |
384 | }; | |
385 | ||
5cf88fd8 | 386 | static int reject_entry(const struct object_id *oid UNUSED, |
555ff1c8 | 387 | struct strbuf *base, |
6a0b0b6d | 388 | const char *filename, unsigned mode, |
7367d882 | 389 | void *context) |
d5f53d6d | 390 | { |
ed22b417 | 391 | int ret = -1; |
b612ee20 NTND |
392 | struct path_exists_context *ctx = context; |
393 | ||
ed22b417 NTND |
394 | if (S_ISDIR(mode)) { |
395 | struct strbuf sb = STRBUF_INIT; | |
6a0b0b6d | 396 | strbuf_addbuf(&sb, base); |
ed22b417 | 397 | strbuf_addstr(&sb, filename); |
b612ee20 NTND |
398 | if (!match_pathspec(ctx->args->repo->index, |
399 | &ctx->pathspec, | |
400 | sb.buf, sb.len, 0, NULL, 1)) | |
ed22b417 NTND |
401 | ret = READ_TREE_RECURSIVE; |
402 | strbuf_release(&sb); | |
403 | } | |
404 | return ret; | |
d5f53d6d RS |
405 | } |
406 | ||
b612ee20 | 407 | static int path_exists(struct archiver_args *args, const char *path) |
d5f53d6d | 408 | { |
f0096c06 | 409 | const char *paths[] = { path, NULL }; |
b612ee20 | 410 | struct path_exists_context ctx; |
f0096c06 NTND |
411 | int ret; |
412 | ||
b612ee20 NTND |
413 | ctx.args = args; |
414 | parse_pathspec(&ctx.pathspec, 0, 0, "", paths); | |
415 | ctx.pathspec.recursive = 1; | |
47957485 ÆAB |
416 | ret = read_tree(args->repo, args->tree, |
417 | &ctx.pathspec, | |
418 | reject_entry, &ctx); | |
b612ee20 | 419 | clear_pathspec(&ctx.pathspec); |
f0096c06 | 420 | return ret != 0; |
d5f53d6d RS |
421 | } |
422 | ||
c0885435 RS |
423 | static void parse_pathspec_arg(const char **pathspec, |
424 | struct archiver_args *ar_args) | |
425 | { | |
f3e743a0 NTND |
426 | /* |
427 | * must be consistent with parse_pathspec in path_exists() | |
428 | * Also if pathspec patterns are dependent, we're in big | |
429 | * trouble as we test each one separately | |
430 | */ | |
431 | parse_pathspec(&ar_args->pathspec, 0, | |
432 | PATHSPEC_PREFER_FULL, | |
433 | "", pathspec); | |
ed22b417 | 434 | ar_args->pathspec.recursive = 1; |
d5f53d6d RS |
435 | if (pathspec) { |
436 | while (*pathspec) { | |
b612ee20 | 437 | if (**pathspec && !path_exists(ar_args, *pathspec)) |
f3e743a0 | 438 | die(_("pathspec '%s' did not match any files"), *pathspec); |
d5f53d6d RS |
439 | pathspec++; |
440 | } | |
441 | } | |
c0885435 RS |
442 | } |
443 | ||
444 | static void parse_treeish_arg(const char **argv, | |
ee27ca4a JK |
445 | struct archiver_args *ar_args, const char *prefix, |
446 | int remote) | |
c0885435 RS |
447 | { |
448 | const char *name = argv[0]; | |
bbf05cf7 | 449 | const struct object_id *commit_oid; |
c0885435 RS |
450 | time_t archive_time; |
451 | struct tree *tree; | |
452 | const struct commit *commit; | |
13609673 | 453 | struct object_id oid; |
c397aac0 | 454 | char *ref = NULL; |
c0885435 | 455 | |
ee27ca4a | 456 | /* Remotes are only allowed to fetch actual refs */ |
7671b632 | 457 | if (remote && !remote_allow_unreachable) { |
2c5495f7 RM |
458 | const char *colon = strchrnul(name, ':'); |
459 | int refnamelen = colon - name; | |
c51a351a | 460 | |
f24c30e0 | 461 | if (!dwim_ref(name, refnamelen, &oid, &ref, 0)) |
c6e7965d | 462 | die(_("no such ref: %.*s"), refnamelen, name); |
c397aac0 | 463 | } else { |
f24c30e0 | 464 | dwim_ref(name, strlen(name), &oid, &ref, 0); |
ee27ca4a | 465 | } |
0f544ee8 | 466 | |
e82caf38 | 467 | if (get_oid(name, &oid)) |
c6e7965d | 468 | die(_("not a valid object name: %s"), name); |
c0885435 | 469 | |
ce3a7ec8 | 470 | commit = lookup_commit_reference_gently(ar_args->repo, &oid, 1); |
c0885435 | 471 | if (commit) { |
bbf05cf7 | 472 | commit_oid = &commit->object.oid; |
c0885435 RS |
473 | archive_time = commit->date; |
474 | } else { | |
bbf05cf7 | 475 | commit_oid = NULL; |
c0885435 RS |
476 | archive_time = time(NULL); |
477 | } | |
fd2da4b1 RS |
478 | if (ar_args->mtime_option) |
479 | archive_time = approxidate(ar_args->mtime_option); | |
c0885435 | 480 | |
a9dbc179 | 481 | tree = parse_tree_indirect(&oid); |
afe8a907 | 482 | if (!tree) |
c6e7965d | 483 | die(_("not a tree object: %s"), oid_to_hex(&oid)); |
c0885435 RS |
484 | |
485 | if (prefix) { | |
13609673 | 486 | struct object_id tree_oid; |
5ec1e728 | 487 | unsigned short mode; |
c0885435 RS |
488 | int err; |
489 | ||
50ddb089 NTND |
490 | err = get_tree_entry(ar_args->repo, |
491 | &tree->object.oid, | |
492 | prefix, &tree_oid, | |
916bc35b | 493 | &mode); |
c0885435 | 494 | if (err || !S_ISDIR(mode)) |
c6e7965d | 495 | die(_("current working directory is untracked")); |
c0885435 | 496 | |
a9dbc179 | 497 | tree = parse_tree_indirect(&tree_oid); |
c0885435 | 498 | } |
c397aac0 | 499 | ar_args->refname = ref; |
c0885435 | 500 | ar_args->tree = tree; |
bbf05cf7 | 501 | ar_args->commit_oid = commit_oid; |
c0885435 RS |
502 | ar_args->commit = commit; |
503 | ar_args->time = archive_time; | |
504 | } | |
505 | ||
1ee34710 | 506 | static void extra_file_info_clear(void *util, const char *str UNUSED) |
2947a793 RS |
507 | { |
508 | struct extra_file_info *info = util; | |
509 | free(info->base); | |
237a1d13 | 510 | free(info->content); |
2947a793 RS |
511 | free(info); |
512 | } | |
513 | ||
514 | static int add_file_cb(const struct option *opt, const char *arg, int unset) | |
515 | { | |
516 | struct archiver_args *args = opt->value; | |
517 | const char **basep = (const char **)opt->defval; | |
518 | const char *base = *basep; | |
519 | char *path; | |
520 | struct string_list_item *item; | |
521 | struct extra_file_info *info; | |
522 | ||
523 | if (unset) { | |
524 | string_list_clear_func(&args->extra_files, | |
525 | extra_file_info_clear); | |
526 | return 0; | |
527 | } | |
528 | ||
529 | if (!arg) | |
530 | return -1; | |
531 | ||
237a1d13 | 532 | info = xmalloc(sizeof(*info)); |
2947a793 | 533 | info->base = xstrdup_or_null(base); |
237a1d13 JS |
534 | |
535 | if (!strcmp(opt->long_name, "add-file")) { | |
536 | path = prefix_filename(args->prefix, arg); | |
537 | if (stat(path, &info->stat)) | |
538 | die(_("File not found: %s"), path); | |
539 | if (!S_ISREG(info->stat.st_mode)) | |
540 | die(_("Not a regular file: %s"), path); | |
541 | info->content = NULL; /* read the file later */ | |
542 | } else if (!strcmp(opt->long_name, "add-virtual-file")) { | |
de1f68a9 JS |
543 | struct strbuf buf = STRBUF_INIT; |
544 | const char *p = arg; | |
545 | ||
546 | if (*p != '"') | |
547 | p = strchr(p, ':'); | |
548 | else if (unquote_c_style(&buf, p, &p) < 0) | |
549 | die(_("unclosed quote: '%s'"), arg); | |
237a1d13 | 550 | |
de1f68a9 | 551 | if (!p || *p != ':') |
237a1d13 JS |
552 | die(_("missing colon: '%s'"), arg); |
553 | ||
de1f68a9 JS |
554 | if (p == arg) |
555 | die(_("empty file name: '%s'"), arg); | |
556 | ||
557 | path = buf.len ? | |
558 | strbuf_detach(&buf, NULL) : xstrndup(arg, p - arg); | |
559 | ||
560 | if (args->prefix) { | |
561 | char *save = path; | |
562 | path = prefix_filename(args->prefix, path); | |
563 | free(save); | |
237a1d13 JS |
564 | } |
565 | memset(&info->stat, 0, sizeof(info->stat)); | |
566 | info->stat.st_mode = S_IFREG | 0644; | |
de1f68a9 | 567 | info->content = xstrdup(p + 1); |
237a1d13 JS |
568 | info->stat.st_size = strlen(info->content); |
569 | } else { | |
570 | BUG("add_file_cb() called for %s", opt->long_name); | |
571 | } | |
572 | item = string_list_append_nodup(&args->extra_files, path); | |
573 | item->util = info; | |
574 | ||
2947a793 RS |
575 | return 0; |
576 | } | |
577 | ||
cde8ea9c RS |
578 | static int number_callback(const struct option *opt, const char *arg, int unset) |
579 | { | |
580 | BUG_ON_OPT_NEG(unset); | |
581 | *(int *)opt->value = strtol(arg, NULL, 10); | |
582 | return 0; | |
583 | } | |
4fac1d3a | 584 | |
c0885435 | 585 | static int parse_archive_args(int argc, const char **argv, |
56baa61d | 586 | const struct archiver **ar, struct archiver_args *args, |
7b97730b | 587 | const char *name_hint, int is_remote) |
c0885435 | 588 | { |
56baa61d | 589 | const char *format = NULL; |
4fac1d3a RS |
590 | const char *base = NULL; |
591 | const char *remote = NULL; | |
592 | const char *exec = NULL; | |
aec0c1bb | 593 | const char *output = NULL; |
fd2da4b1 | 594 | const char *mtime_option = NULL; |
c0885435 RS |
595 | int compression_level = -1; |
596 | int verbose = 0; | |
597 | int i; | |
4fac1d3a | 598 | int list = 0; |
ba053ea9 | 599 | int worktree_attributes = 0; |
4fac1d3a RS |
600 | struct option opts[] = { |
601 | OPT_GROUP(""), | |
0012a387 NTND |
602 | OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")), |
603 | OPT_STRING(0, "prefix", &base, N_("prefix"), | |
604 | N_("prepend prefix to each pathname in the archive")), | |
2947a793 RS |
605 | { OPTION_CALLBACK, 0, "add-file", args, N_("file"), |
606 | N_("add untracked file to archive"), 0, add_file_cb, | |
607 | (intptr_t)&base }, | |
237a1d13 JS |
608 | { OPTION_CALLBACK, 0, "add-virtual-file", args, |
609 | N_("path:content"), N_("add untracked file to archive"), 0, | |
610 | add_file_cb, (intptr_t)&base }, | |
0012a387 NTND |
611 | OPT_STRING('o', "output", &output, N_("file"), |
612 | N_("write the archive to this file")), | |
f858c646 | 613 | OPT_BOOL(0, "worktree-attributes", &worktree_attributes, |
0012a387 NTND |
614 | N_("read .gitattributes in working directory")), |
615 | OPT__VERBOSE(&verbose, N_("report archived files on stderr")), | |
fd2da4b1 RS |
616 | { OPTION_STRING, 0, "mtime", &mtime_option, N_("time"), |
617 | N_("set modification time of archive entries"), | |
618 | PARSE_OPT_NONEG }, | |
cde8ea9c RS |
619 | OPT_NUMBER_CALLBACK(&compression_level, |
620 | N_("set compression level"), number_callback), | |
4fac1d3a | 621 | OPT_GROUP(""), |
f858c646 | 622 | OPT_BOOL('l', "list", &list, |
0012a387 | 623 | N_("list supported archive formats")), |
4fac1d3a | 624 | OPT_GROUP(""), |
0012a387 NTND |
625 | OPT_STRING(0, "remote", &remote, N_("repo"), |
626 | N_("retrieve the archive from remote repository <repo>")), | |
b0ff9654 | 627 | OPT_STRING(0, "exec", &exec, N_("command"), |
0012a387 | 628 | N_("path to the remote git-upload-archive command")), |
4fac1d3a RS |
629 | OPT_END() |
630 | }; | |
631 | ||
37782920 | 632 | argc = parse_options(argc, argv, NULL, opts, archive_usage, 0); |
4fac1d3a RS |
633 | |
634 | if (remote) | |
5a36d00c | 635 | die(_("Unexpected option --remote")); |
4fac1d3a | 636 | if (exec) |
6fa00ee8 | 637 | die(_("the option '%s' requires '%s'"), "--exec", "--remote"); |
52e77876 | 638 | if (output) |
5a36d00c | 639 | die(_("Unexpected option --output")); |
2947a793 | 640 | if (is_remote && args->extra_files.nr) |
12909b6b | 641 | die(_("options '%s' and '%s' cannot be used together"), "--add-file", "--remote"); |
4fac1d3a RS |
642 | |
643 | if (!base) | |
644 | base = ""; | |
645 | ||
646 | if (list) { | |
13e0f88d | 647 | for (i = 0; i < nr_archivers; i++) |
7b97730b JK |
648 | if (!is_remote || archivers[i]->flags & ARCHIVER_REMOTE) |
649 | printf("%s\n", archivers[i]->name); | |
4fac1d3a | 650 | exit(0); |
c0885435 RS |
651 | } |
652 | ||
56baa61d JK |
653 | if (!format && name_hint) |
654 | format = archive_format_from_filename(name_hint); | |
655 | if (!format) | |
656 | format = "tar"; | |
657 | ||
c0885435 | 658 | /* We need at least one parameter -- tree-ish */ |
4fac1d3a RS |
659 | if (argc < 1) |
660 | usage_with_options(archive_usage, opts); | |
c0885435 | 661 | *ar = lookup_archiver(format); |
7b97730b | 662 | if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE))) |
5a36d00c | 663 | die(_("Unknown archive format '%s'"), format); |
c0885435 RS |
664 | |
665 | args->compression_level = Z_DEFAULT_COMPRESSION; | |
666 | if (compression_level != -1) { | |
cde8ea9c RS |
667 | int levels_ok = (*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS; |
668 | int high_ok = (*ar)->flags & ARCHIVER_HIGH_COMPRESSION_LEVELS; | |
669 | if (levels_ok && (compression_level <= 9 || high_ok)) | |
c0885435 RS |
670 | args->compression_level = compression_level; |
671 | else { | |
5a36d00c | 672 | die(_("Argument not supported for format '%s': -%d"), |
c0885435 RS |
673 | format, compression_level); |
674 | } | |
675 | } | |
676 | args->verbose = verbose; | |
677 | args->base = base; | |
678 | args->baselen = strlen(base); | |
ba053ea9 | 679 | args->worktree_attributes = worktree_attributes; |
fd2da4b1 | 680 | args->mtime_option = mtime_option; |
c0885435 | 681 | |
4fac1d3a | 682 | return argc; |
c0885435 RS |
683 | } |
684 | ||
6e94e683 | 685 | int write_archive(int argc, const char **argv, const char *prefix, |
b612ee20 | 686 | struct repository *repo, |
eb0224c6 | 687 | const char *name_hint, int remote) |
6e94e683 RS |
688 | { |
689 | const struct archiver *ar = NULL; | |
96099726 RS |
690 | struct pretty_print_describe_status describe_status = {0}; |
691 | struct pretty_print_context ctx = {0}; | |
6e94e683 | 692 | struct archiver_args args; |
2947a793 | 693 | int rc; |
6e94e683 | 694 | |
95790ff6 TA |
695 | git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); |
696 | git_config(git_default_config, NULL); | |
697 | ||
96099726 RS |
698 | describe_status.max_invocations = 1; |
699 | ctx.date_mode.type = DATE_NORMAL; | |
700 | ctx.abbrev = DEFAULT_ABBREV; | |
701 | ctx.describe_status = &describe_status; | |
702 | args.pretty_ctx = &ctx; | |
b612ee20 | 703 | args.repo = repo; |
2947a793 | 704 | args.prefix = prefix; |
bc40dfb1 | 705 | string_list_init_dup(&args.extra_files); |
7b97730b | 706 | argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote); |
eb0224c6 | 707 | if (!startup_info->have_repository) { |
23212862 JK |
708 | /* |
709 | * We know this will die() with an error, so we could just | |
710 | * die ourselves; but its error message will be more specific | |
711 | * than what we could write here. | |
712 | */ | |
713 | setup_git_directory(); | |
714 | } | |
6e94e683 | 715 | |
ee27ca4a | 716 | parse_treeish_arg(argv, &args, prefix, remote); |
6e94e683 RS |
717 | parse_pathspec_arg(argv + 1, &args); |
718 | ||
2947a793 RS |
719 | rc = ar->write_archive(ar, &args); |
720 | ||
721 | string_list_clear_func(&args.extra_files, extra_file_info_clear); | |
1c3e4129 | 722 | free(args.refname); |
7615cf94 | 723 | clear_pathspec(&args.pathspec); |
2947a793 RS |
724 | |
725 | return rc; | |
6e94e683 | 726 | } |
56baa61d | 727 | |
08716b3c JK |
728 | static int match_extension(const char *filename, const char *ext) |
729 | { | |
730 | int prefixlen = strlen(filename) - strlen(ext); | |
731 | ||
732 | /* | |
733 | * We need 1 character for the '.', and 1 character to ensure that the | |
734 | * prefix is non-empty (k.e., we don't match .tar.gz with no actual | |
735 | * filename). | |
736 | */ | |
b1cdfb54 | 737 | if (prefixlen < 2 || filename[prefixlen - 1] != '.') |
08716b3c JK |
738 | return 0; |
739 | return !strcmp(filename + prefixlen, ext); | |
740 | } | |
741 | ||
56baa61d JK |
742 | const char *archive_format_from_filename(const char *filename) |
743 | { | |
08716b3c JK |
744 | int i; |
745 | ||
746 | for (i = 0; i < nr_archivers; i++) | |
747 | if (match_extension(filename, archivers[i]->name)) | |
748 | return archivers[i]->name; | |
56baa61d JK |
749 | return NULL; |
750 | } |