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