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