Elijah Newren | 36bf195 | 2023-02-24 00:09:24 +0000 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Elijah Newren | 0b027f6 | 2023-03-21 06:25:58 +0000 | [diff] [blame] | 2 | #include "abspath.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Elijah Newren | 73359a9 | 2023-04-11 03:00:40 +0000 | [diff] [blame] | 4 | #include "convert.h" |
Elijah Newren | 32a8f51 | 2023-03-21 06:26:03 +0000 | [diff] [blame] | 5 | #include "environment.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 6 | #include "gettext.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 7 | #include "hex.h" |
Elijah Newren | c339932 | 2023-05-16 06:33:59 +0000 | [diff] [blame] | 8 | #include "path.h" |
Elijah Newren | d4a4f92 | 2023-04-22 20:17:26 +0000 | [diff] [blame] | 9 | #include "pretty.h" |
Elijah Newren | e38da48 | 2023-03-21 06:26:05 +0000 | [diff] [blame] | 10 | #include "setup.h" |
Michael Haggerty | fb58c8d | 2015-06-22 16:03:05 +0200 | [diff] [blame] | 11 | #include "refs.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 12 | #include "object-store-ll.h" |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 13 | #include "commit.h" |
Elijah Newren | d4a4f92 | 2023-04-22 20:17:26 +0000 | [diff] [blame] | 14 | #include "tree.h" |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 15 | #include "tree-walk.h" |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 16 | #include "attr.h" |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 17 | #include "archive.h" |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 18 | #include "parse-options.h" |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 19 | #include "unpack-trees.h" |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 20 | #include "dir.h" |
Johannes Schindelin | de1f68a | 2022-05-28 16:11:13 -0700 | [diff] [blame] | 21 | #include "quote.h" |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 22 | |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 23 | static char const * const archive_usage[] = { |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 24 | N_("git archive [<options>] <tree-ish> [<path>...]"), |
Jean-Noël Avila | 959d670 | 2022-01-31 22:07:48 +0000 | [diff] [blame] | 25 | "git archive --list", |
Alex Henrie | 9c9b4f2 | 2015-01-13 00:44:47 -0700 | [diff] [blame] | 26 | N_("git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"), |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 27 | N_("git archive --remote <repo> [--exec <cmd>] --list"), |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 28 | NULL |
| 29 | }; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 30 | |
Jeff King | 13e0f88 | 2011-06-21 21:23:33 -0400 | [diff] [blame] | 31 | static const struct archiver **archivers; |
| 32 | static int nr_archivers; |
| 33 | static int alloc_archivers; |
Scott J. Goldman | 7671b63 | 2014-02-28 05:04:19 -0500 | [diff] [blame] | 34 | static int remote_allow_unreachable; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 35 | |
Jeff King | 13e0f88 | 2011-06-21 21:23:33 -0400 | [diff] [blame] | 36 | void register_archiver(struct archiver *ar) |
| 37 | { |
| 38 | ALLOC_GROW(archivers, nr_archivers + 1, alloc_archivers); |
| 39 | archivers[nr_archivers++] = ar; |
| 40 | } |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 41 | |
Josh Steadmon | 00436bf | 2018-10-25 13:32:14 -0700 | [diff] [blame] | 42 | void init_archivers(void) |
| 43 | { |
| 44 | init_tar_archiver(); |
| 45 | init_zip_archiver(); |
| 46 | } |
| 47 | |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 48 | static void format_subst(const struct commit *commit, |
Nguyễn Thái Ngọc Duy | ec36c42 | 2018-12-06 16:42:06 +0100 | [diff] [blame] | 49 | const char *src, size_t len, |
René Scharfe | 9609972 | 2021-02-28 12:22:47 +0100 | [diff] [blame] | 50 | struct strbuf *buf, struct pretty_print_context *ctx) |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 51 | { |
| 52 | char *to_free = NULL; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 53 | struct strbuf fmt = STRBUF_INIT; |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 54 | |
| 55 | if (src == buf->buf) |
| 56 | to_free = strbuf_detach(buf, NULL); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 57 | for (;;) { |
| 58 | const char *b, *c; |
| 59 | |
| 60 | b = memmem(src, len, "$Format:", 8); |
Ariel Badichi | 75b7dfb | 2008-04-23 04:06:27 +0300 | [diff] [blame] | 61 | if (!b) |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 62 | break; |
Ariel Badichi | 75b7dfb | 2008-04-23 04:06:27 +0300 | [diff] [blame] | 63 | c = memchr(b + 8, '$', (src + len) - b - 8); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 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); |
Ævar Arnfjörð Bjarmason | bab8216 | 2023-03-28 15:58:51 +0200 | [diff] [blame] | 71 | repo_format_commit_message(the_repository, commit, fmt.buf, |
| 72 | buf, ctx); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 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 | |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 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) |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 87 | { |
| 88 | void *buffer; |
Nguyễn Thái Ngọc Duy | 9cb513b | 2012-05-03 08:51:03 +0700 | [diff] [blame] | 89 | const struct commit *commit = args->convert ? args->commit : NULL; |
brian m. carlson | c397aac | 2020-03-16 18:05:03 +0000 | [diff] [blame] | 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); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 95 | |
Nguyễn Thái Ngọc Duy | 9cb513b | 2012-05-03 08:51:03 +0700 | [diff] [blame] | 96 | path += args->baselen; |
Ævar Arnfjörð Bjarmason | bc726bd | 2023-03-28 15:58:50 +0200 | [diff] [blame] | 97 | buffer = repo_read_object_file(the_repository, oid, type, sizep); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 98 | if (buffer && S_ISREG(mode)) { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 99 | struct strbuf buf = STRBUF_INIT; |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 100 | size_t size = 0; |
| 101 | |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 102 | strbuf_attach(&buf, buffer, *sizep, *sizep + 1); |
brian m. carlson | c397aac | 2020-03-16 18:05:03 +0000 | [diff] [blame] | 103 | convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf, &meta); |
René Scharfe | 1d11d5b | 2008-07-14 21:22:29 +0200 | [diff] [blame] | 104 | if (commit) |
René Scharfe | 9609972 | 2021-02-28 12:22:47 +0100 | [diff] [blame] | 105 | format_subst(commit, buf.buf, buf.len, &buf, args->pretty_ctx); |
Lars Hjemli | 1812564 | 2008-01-14 17:36:34 +0100 | [diff] [blame] | 106 | buffer = strbuf_detach(&buf, &size); |
| 107 | *sizep = size; |
| 108 | } |
| 109 | |
| 110 | return buffer; |
| 111 | } |
| 112 | |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 113 | struct directory { |
| 114 | struct directory *up; |
brian m. carlson | 1360967 | 2015-03-13 23:39:30 +0000 | [diff] [blame] | 115 | struct object_id oid; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 116 | int baselen, len; |
| 117 | unsigned mode; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 118 | char path[FLEX_ARRAY]; |
| 119 | }; |
| 120 | |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 121 | struct archiver_context { |
| 122 | struct archiver_args *args; |
| 123 | write_archive_entry_fn_t write_entry; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 124 | struct directory *bottom; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 125 | }; |
| 126 | |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 127 | static const struct attr_check *get_archive_attrs(struct index_state *istate, |
| 128 | const char *path) |
René Scharfe | c6c08f7 | 2017-08-19 07:29:43 +0200 | [diff] [blame] | 129 | { |
| 130 | static struct attr_check *check; |
| 131 | if (!check) |
| 132 | check = attr_check_initl("export-ignore", "export-subst", NULL); |
John Cai | 44451a2 | 2023-05-06 04:15:29 +0000 | [diff] [blame] | 133 | git_check_attr(istate, path, check); |
Torsten Bögershausen | d64324c | 2018-09-12 21:32:02 +0200 | [diff] [blame] | 134 | return check; |
René Scharfe | c6c08f7 | 2017-08-19 07:29:43 +0200 | [diff] [blame] | 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 | |
brian m. carlson | 015ff4f | 2018-03-12 02:27:35 +0000 | [diff] [blame] | 147 | static int write_archive_entry(const struct object_id *oid, const char *base, |
Ævar Arnfjörð Bjarmason | 7367d88 | 2021-03-20 23:37:49 +0100 | [diff] [blame] | 148 | int baselen, const char *filename, unsigned mode, |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 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; |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 156 | const char *path_without_prefix; |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 157 | unsigned long size; |
| 158 | void *buffer; |
| 159 | enum object_type type; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 160 | |
Nguyễn Thái Ngọc Duy | 9cb513b | 2012-05-03 08:51:03 +0700 | [diff] [blame] | 161 | args->convert = 0; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 162 | strbuf_reset(&path); |
| 163 | strbuf_grow(&path, PATH_MAX); |
René Scharfe | ebfbdb3 | 2009-10-08 18:46:54 +0200 | [diff] [blame] | 164 | strbuf_add(&path, args->base, args->baselen); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 165 | strbuf_add(&path, base, baselen); |
| 166 | strbuf_addstr(&path, filename); |
Jean-Noël AVILA | 94bc671 | 2012-12-08 21:04:39 +0100 | [diff] [blame] | 167 | if (S_ISDIR(mode) || S_ISGITLINK(mode)) |
| 168 | strbuf_addch(&path, '/'); |
René Scharfe | 1d11d5b | 2008-07-14 21:22:29 +0200 | [diff] [blame] | 169 | path_without_prefix = path.buf + args->baselen; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 170 | |
René Scharfe | 4318094 | 2017-09-13 00:43:57 +0200 | [diff] [blame] | 171 | if (!S_ISDIR(mode)) { |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 172 | const struct attr_check *check; |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 173 | check = get_archive_attrs(args->repo->index, path_without_prefix); |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 174 | if (check_attr_export_ignore(check)) |
René Scharfe | 1d11d5b | 2008-07-14 21:22:29 +0200 | [diff] [blame] | 175 | return 0; |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 176 | args->convert = check_attr_export_subst(check); |
René Scharfe | 1d11d5b | 2008-07-14 21:22:29 +0200 | [diff] [blame] | 177 | } |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 178 | |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 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 | |
René Scharfe | e3733b6 | 2022-10-11 11:29:38 +0200 | [diff] [blame] | 202 | if (args->verbose) |
| 203 | fprintf(stderr, "%.*s\n", (int)path.len, path.buf); |
| 204 | |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 205 | if (S_ISDIR(mode) || S_ISGITLINK(mode)) { |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 206 | err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 207 | if (err) |
| 208 | return err; |
Lars Hjemli | d3bee16 | 2009-01-25 01:52:05 +0100 | [diff] [blame] | 209 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 210 | } |
| 211 | |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 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) |
Jean-Noël Avila | c490437 | 2022-01-05 20:02:17 +0000 | [diff] [blame] | 220 | return error(_("cannot read '%s'"), oid_to_hex(oid)); |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 221 | err = write_entry(args, oid, path.buf, path.len, mode, buffer, size); |
| 222 | free(buffer); |
| 223 | return err; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 224 | } |
| 225 | |
René Scharfe | e124ecf | 2021-08-27 21:59:16 +0200 | [diff] [blame] | 226 | static void queue_directory(const struct object_id *oid, |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 227 | struct strbuf *base, const char *filename, |
Ævar Arnfjörð Bjarmason | 7367d88 | 2021-03-20 23:37:49 +0100 | [diff] [blame] | 228 | unsigned mode, struct archiver_context *c) |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 229 | { |
| 230 | struct directory *d; |
Jeff King | 50a6c8e | 2016-02-22 17:44:35 -0500 | [diff] [blame] | 231 | size_t len = st_add4(base->len, 1, strlen(filename), 1); |
| 232 | d = xmalloc(st_add(sizeof(*d), len)); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 233 | d->up = c->bottom; |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 234 | d->baselen = base->len; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 235 | d->mode = mode; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 236 | c->bottom = d; |
Jeff King | c7ab0ba | 2015-09-24 17:08:12 -0400 | [diff] [blame] | 237 | d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename); |
René Scharfe | e124ecf | 2021-08-27 21:59:16 +0200 | [diff] [blame] | 238 | oidcpy(&d->oid, oid); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 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) || |
brian m. carlson | 015ff4f | 2018-03-12 02:27:35 +0000 | [diff] [blame] | 252 | write_archive_entry(&d->oid, d->path, d->baselen, |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 253 | d->path + d->baselen, d->mode, |
Ævar Arnfjörð Bjarmason | 7367d88 | 2021-03-20 23:37:49 +0100 | [diff] [blame] | 254 | c) != READ_TREE_RECURSIVE; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 255 | free(d); |
| 256 | return ret ? -1 : 0; |
| 257 | } |
| 258 | |
brian m. carlson | df46d77 | 2018-03-12 02:27:26 +0000 | [diff] [blame] | 259 | static int queue_or_write_archive_entry(const struct object_id *oid, |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 260 | struct strbuf *base, const char *filename, |
Ævar Arnfjörð Bjarmason | 4795748 | 2021-03-20 23:37:51 +0100 | [diff] [blame] | 261 | unsigned mode, void *context) |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 262 | { |
| 263 | struct archiver_context *c = context; |
| 264 | |
| 265 | while (c->bottom && |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 266 | !(base->len >= c->bottom->len && |
| 267 | !strncmp(base->buf, c->bottom->path, c->bottom->len))) { |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 268 | struct directory *next = c->bottom->up; |
| 269 | free(c->bottom); |
| 270 | c->bottom = next; |
| 271 | } |
| 272 | |
| 273 | if (S_ISDIR(mode)) { |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 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, '/'); |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 280 | check = get_archive_attrs(c->args->repo->index, base->buf); |
René Scharfe | 5ff247a | 2017-08-19 07:32:37 +0200 | [diff] [blame] | 281 | strbuf_setlen(base, baselen); |
| 282 | |
| 283 | if (check_attr_export_ignore(check)) |
| 284 | return 0; |
René Scharfe | e124ecf | 2021-08-27 21:59:16 +0200 | [diff] [blame] | 285 | queue_directory(oid, base, filename, mode, c); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 286 | return READ_TREE_RECURSIVE; |
| 287 | } |
| 288 | |
| 289 | if (write_directory(c)) |
| 290 | return -1; |
brian m. carlson | 015ff4f | 2018-03-12 02:27:35 +0000 | [diff] [blame] | 291 | return write_archive_entry(oid, base->buf, base->len, filename, mode, |
Ævar Arnfjörð Bjarmason | 7367d88 | 2021-03-20 23:37:49 +0100 | [diff] [blame] | 292 | context); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 293 | } |
| 294 | |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 295 | struct extra_file_info { |
| 296 | char *base; |
| 297 | struct stat stat; |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 298 | void *content; |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 299 | }; |
| 300 | |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 301 | int write_archive_entries(struct archiver_args *args, |
| 302 | write_archive_entry_fn_t write_entry) |
| 303 | { |
| 304 | struct archiver_context context; |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 305 | struct unpack_trees_options opts; |
| 306 | struct tree_desc t; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 307 | int err; |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 308 | struct strbuf path_in_archive = STRBUF_INIT; |
| 309 | struct strbuf content = STRBUF_INIT; |
brian m. carlson | 1422844 | 2021-04-26 01:02:56 +0000 | [diff] [blame] | 310 | struct object_id fake_oid; |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 311 | int i; |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 312 | |
brian m. carlson | 1422844 | 2021-04-26 01:02:56 +0000 | [diff] [blame] | 313 | oidcpy(&fake_oid, null_oid()); |
| 314 | |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 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); |
brian m. carlson | 015ff4f | 2018-03-12 02:27:35 +0000 | [diff] [blame] | 322 | err = write_entry(args, &args->tree->object.oid, args->base, |
René Scharfe | 200589a | 2020-09-19 23:23:32 +0200 | [diff] [blame] | 323 | len, 040777, NULL, 0); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 324 | if (err) |
| 325 | return err; |
| 326 | } |
| 327 | |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 328 | memset(&context, 0, sizeof(context)); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 329 | context.args = args; |
| 330 | context.write_entry = write_entry; |
| 331 | |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 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; |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 339 | opts.src_index = args->repo->index; |
| 340 | opts.dst_index = args->repo->index; |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 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; |
Nguyễn Thái Ngọc Duy | c4500e2 | 2018-08-13 18:14:33 +0200 | [diff] [blame] | 345 | git_attr_set_direction(GIT_ATTR_INDEX); |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 346 | } |
| 347 | |
Ævar Arnfjörð Bjarmason | 4795748 | 2021-03-20 23:37:51 +0100 | [diff] [blame] | 348 | err = read_tree(args->repo, args->tree, |
| 349 | &args->pathspec, |
| 350 | queue_or_write_archive_entry, |
| 351 | &context); |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 352 | if (err == READ_TREE_RECURSIVE) |
| 353 | err = 0; |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 354 | while (context.bottom) { |
| 355 | struct directory *next = context.bottom->up; |
| 356 | free(context.bottom); |
| 357 | context.bottom = next; |
| 358 | } |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 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 | |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 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)); |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 372 | |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 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), |
Junio C Hamano | 6a61661 | 2022-05-12 14:31:09 -0700 | [diff] [blame] | 384 | canon_mode(info->stat.st_mode), |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 385 | info->content, info->stat.st_size); |
| 386 | } |
| 387 | |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 388 | if (err) |
| 389 | break; |
| 390 | } |
| 391 | strbuf_release(&path_in_archive); |
| 392 | strbuf_release(&content); |
| 393 | |
René Scharfe | 562e25a | 2008-07-14 21:22:24 +0200 | [diff] [blame] | 394 | return err; |
| 395 | } |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 396 | |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 397 | static const struct archiver *lookup_archiver(const char *name) |
| 398 | { |
| 399 | int i; |
| 400 | |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 401 | if (!name) |
| 402 | return NULL; |
| 403 | |
Jeff King | 13e0f88 | 2011-06-21 21:23:33 -0400 | [diff] [blame] | 404 | for (i = 0; i < nr_archivers; i++) { |
| 405 | if (!strcmp(name, archivers[i]->name)) |
| 406 | return archivers[i]; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 407 | } |
| 408 | return NULL; |
| 409 | } |
| 410 | |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 411 | struct path_exists_context { |
| 412 | struct pathspec pathspec; |
| 413 | struct archiver_args *args; |
| 414 | }; |
| 415 | |
Ævar Arnfjörð Bjarmason | 5cf88fd | 2022-08-25 19:09:48 +0200 | [diff] [blame] | 416 | static int reject_entry(const struct object_id *oid UNUSED, |
Jeff King | 555ff1c | 2022-08-19 06:08:49 -0400 | [diff] [blame] | 417 | struct strbuf *base, |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 418 | const char *filename, unsigned mode, |
Ævar Arnfjörð Bjarmason | 7367d88 | 2021-03-20 23:37:49 +0100 | [diff] [blame] | 419 | void *context) |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 420 | { |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 421 | int ret = -1; |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 422 | struct path_exists_context *ctx = context; |
| 423 | |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 424 | if (S_ISDIR(mode)) { |
| 425 | struct strbuf sb = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | 6a0b0b6 | 2014-11-30 16:05:00 +0700 | [diff] [blame] | 426 | strbuf_addbuf(&sb, base); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 427 | strbuf_addstr(&sb, filename); |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 428 | if (!match_pathspec(ctx->args->repo->index, |
| 429 | &ctx->pathspec, |
| 430 | sb.buf, sb.len, 0, NULL, 1)) |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 431 | ret = READ_TREE_RECURSIVE; |
| 432 | strbuf_release(&sb); |
| 433 | } |
| 434 | return ret; |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 435 | } |
| 436 | |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 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 | |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 458 | static int path_exists(struct archiver_args *args, const char *path) |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 459 | { |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 460 | const char *paths[] = { path, NULL }; |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 461 | struct path_exists_context ctx; |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 462 | int ret; |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 463 | |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 464 | ctx.args = args; |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 465 | parse_pathspec(&ctx.pathspec, 0, PATHSPEC_PREFER_CWD, |
| 466 | args->prefix, paths); |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 467 | ctx.pathspec.recursive = 1; |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 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); |
Ævar Arnfjörð Bjarmason | 4795748 | 2021-03-20 23:37:51 +0100 | [diff] [blame] | 472 | ret = read_tree(args->repo, args->tree, |
| 473 | &ctx.pathspec, |
| 474 | reject_entry, &ctx); |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 475 | clear_pathspec(&ctx.pathspec); |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 476 | return ret != 0; |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 477 | } |
| 478 | |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 479 | static void parse_pathspec_arg(const char **pathspec, |
| 480 | struct archiver_args *ar_args) |
| 481 | { |
Nguyễn Thái Ngọc Duy | f3e743a | 2013-07-14 15:35:44 +0700 | [diff] [blame] | 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 | */ |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 487 | parse_pathspec(&ar_args->pathspec, 0, PATHSPEC_PREFER_CWD, |
| 488 | ar_args->prefix, pathspec); |
Nguyễn Thái Ngọc Duy | ed22b41 | 2014-09-21 10:55:06 +0700 | [diff] [blame] | 489 | ar_args->pathspec.recursive = 1; |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 490 | if (pathspec) { |
| 491 | while (*pathspec) { |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 492 | if (**pathspec && !path_exists(ar_args, *pathspec)) |
Nguyễn Thái Ngọc Duy | f3e743a | 2013-07-14 15:35:44 +0700 | [diff] [blame] | 493 | die(_("pathspec '%s' did not match any files"), *pathspec); |
René Scharfe | d5f53d6 | 2009-12-12 16:00:41 +0100 | [diff] [blame] | 494 | pathspec++; |
| 495 | } |
| 496 | } |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | static void parse_treeish_arg(const char **argv, |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 500 | struct archiver_args *ar_args, int remote) |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 501 | { |
| 502 | const char *name = argv[0]; |
brian m. carlson | bbf05cf | 2019-02-19 00:05:20 +0000 | [diff] [blame] | 503 | const struct object_id *commit_oid; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 504 | time_t archive_time; |
| 505 | struct tree *tree; |
| 506 | const struct commit *commit; |
brian m. carlson | 1360967 | 2015-03-13 23:39:30 +0000 | [diff] [blame] | 507 | struct object_id oid; |
brian m. carlson | c397aac | 2020-03-16 18:05:03 +0000 | [diff] [blame] | 508 | char *ref = NULL; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 509 | |
Jeff King | ee27ca4 | 2011-11-17 18:04:22 -0500 | [diff] [blame] | 510 | /* Remotes are only allowed to fetch actual refs */ |
Scott J. Goldman | 7671b63 | 2014-02-28 05:04:19 -0500 | [diff] [blame] | 511 | if (remote && !remote_allow_unreachable) { |
Rohit Mani | 2c5495f | 2014-03-07 22:48:31 -0800 | [diff] [blame] | 512 | const char *colon = strchrnul(name, ':'); |
| 513 | int refnamelen = colon - name; |
Carlos Martín Nieto | 0f544ee | 2012-01-11 13:12:38 +0100 | [diff] [blame] | 514 | |
Ævar Arnfjörð Bjarmason | 12cb1c1 | 2023-03-28 15:58:54 +0200 | [diff] [blame] | 515 | if (!repo_dwim_ref(the_repository, name, refnamelen, &oid, &ref, 0)) |
Nguyễn Thái Ngọc Duy | c6e7965 | 2018-11-10 06:16:02 +0100 | [diff] [blame] | 516 | die(_("no such ref: %.*s"), refnamelen, name); |
brian m. carlson | c397aac | 2020-03-16 18:05:03 +0000 | [diff] [blame] | 517 | } else { |
Ævar Arnfjörð Bjarmason | 12cb1c1 | 2023-03-28 15:58:54 +0200 | [diff] [blame] | 518 | repo_dwim_ref(the_repository, name, strlen(name), &oid, &ref, |
| 519 | 0); |
Jeff King | ee27ca4 | 2011-11-17 18:04:22 -0500 | [diff] [blame] | 520 | } |
Carlos Martín Nieto | 0f544ee | 2012-01-11 13:12:38 +0100 | [diff] [blame] | 521 | |
Ævar Arnfjörð Bjarmason | d850b7a | 2023-03-28 15:58:46 +0200 | [diff] [blame] | 522 | if (repo_get_oid(the_repository, name, &oid)) |
Nguyễn Thái Ngọc Duy | c6e7965 | 2018-11-10 06:16:02 +0100 | [diff] [blame] | 523 | die(_("not a valid object name: %s"), name); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 524 | |
Nguyễn Thái Ngọc Duy | ce3a7ec | 2018-09-15 18:17:37 +0200 | [diff] [blame] | 525 | commit = lookup_commit_reference_gently(ar_args->repo, &oid, 1); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 526 | if (commit) { |
brian m. carlson | bbf05cf | 2019-02-19 00:05:20 +0000 | [diff] [blame] | 527 | commit_oid = &commit->object.oid; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 528 | archive_time = commit->date; |
| 529 | } else { |
brian m. carlson | bbf05cf | 2019-02-19 00:05:20 +0000 | [diff] [blame] | 530 | commit_oid = NULL; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 531 | archive_time = time(NULL); |
| 532 | } |
René Scharfe | fd2da4b | 2023-02-18 09:36:23 +0100 | [diff] [blame] | 533 | if (ar_args->mtime_option) |
| 534 | archive_time = approxidate(ar_args->mtime_option); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 535 | |
brian m. carlson | a9dbc17 | 2017-05-06 22:10:37 +0000 | [diff] [blame] | 536 | tree = parse_tree_indirect(&oid); |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 537 | if (!tree) |
Nguyễn Thái Ngọc Duy | c6e7965 | 2018-11-10 06:16:02 +0100 | [diff] [blame] | 538 | die(_("not a tree object: %s"), oid_to_hex(&oid)); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 539 | |
brian m. carlson | c397aac | 2020-03-16 18:05:03 +0000 | [diff] [blame] | 540 | ar_args->refname = ref; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 541 | ar_args->tree = tree; |
brian m. carlson | bbf05cf | 2019-02-19 00:05:20 +0000 | [diff] [blame] | 542 | ar_args->commit_oid = commit_oid; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 543 | ar_args->commit = commit; |
| 544 | ar_args->time = archive_time; |
| 545 | } |
| 546 | |
Jeff King | 1ee3471 | 2022-10-17 21:05:32 -0400 | [diff] [blame] | 547 | static void extra_file_info_clear(void *util, const char *str UNUSED) |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 548 | { |
| 549 | struct extra_file_info *info = util; |
| 550 | free(info->base); |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 551 | free(info->content); |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 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 | |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 573 | info = xmalloc(sizeof(*info)); |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 574 | info->base = xstrdup_or_null(base); |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 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")) { |
Johannes Schindelin | de1f68a | 2022-05-28 16:11:13 -0700 | [diff] [blame] | 584 | struct strbuf buf = STRBUF_INIT; |
| 585 | const char *p = arg; |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 586 | |
Johannes Schindelin | de1f68a | 2022-05-28 16:11:13 -0700 | [diff] [blame] | 587 | if (*p != '"') |
| 588 | p = strchr(p, ':'); |
| 589 | else if (unquote_c_style(&buf, p, &p) < 0) |
| 590 | die(_("unclosed quote: '%s'"), arg); |
| 591 | |
| 592 | if (!p || *p != ':') |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 593 | die(_("missing colon: '%s'"), arg); |
| 594 | |
Johannes Schindelin | de1f68a | 2022-05-28 16:11:13 -0700 | [diff] [blame] | 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); |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 605 | } |
| 606 | memset(&info->stat, 0, sizeof(info->stat)); |
| 607 | info->stat.st_mode = S_IFREG | 0644; |
Johannes Schindelin | de1f68a | 2022-05-28 16:11:13 -0700 | [diff] [blame] | 608 | info->content = xstrdup(p + 1); |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 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 | |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 616 | return 0; |
| 617 | } |
| 618 | |
René Scharfe | cde8ea9 | 2020-11-09 17:05:31 +0100 | [diff] [blame] | 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 | } |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 625 | |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 626 | static int parse_archive_args(int argc, const char **argv, |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 627 | const struct archiver **ar, struct archiver_args *args, |
Jeff King | 7b97730 | 2011-06-21 23:17:35 -0400 | [diff] [blame] | 628 | const char *name_hint, int is_remote) |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 629 | { |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 630 | const char *format = NULL; |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 631 | const char *base = NULL; |
| 632 | const char *remote = NULL; |
| 633 | const char *exec = NULL; |
Carlos Manuel Duclos Vergara | aec0c1b | 2009-02-16 18:20:25 +0100 | [diff] [blame] | 634 | const char *output = NULL; |
René Scharfe | fd2da4b | 2023-02-18 09:36:23 +0100 | [diff] [blame] | 635 | const char *mtime_option = NULL; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 636 | int compression_level = -1; |
| 637 | int verbose = 0; |
| 638 | int i; |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 639 | int list = 0; |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 640 | int worktree_attributes = 0; |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 641 | struct option opts[] = { |
| 642 | OPT_GROUP(""), |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 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")), |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 646 | { OPTION_CALLBACK, 0, "add-file", args, N_("file"), |
| 647 | N_("add untracked file to archive"), 0, add_file_cb, |
| 648 | (intptr_t)&base }, |
Johannes Schindelin | 237a1d1 | 2022-05-28 16:11:12 -0700 | [diff] [blame] | 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 }, |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 652 | OPT_STRING('o', "output", &output, N_("file"), |
| 653 | N_("write the archive to this file")), |
Junio C Hamano | f858c64 | 2011-09-27 16:59:01 -0700 | [diff] [blame] | 654 | OPT_BOOL(0, "worktree-attributes", &worktree_attributes, |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 655 | N_("read .gitattributes in working directory")), |
| 656 | OPT__VERBOSE(&verbose, N_("report archived files on stderr")), |
René Scharfe | fd2da4b | 2023-02-18 09:36:23 +0100 | [diff] [blame] | 657 | { OPTION_STRING, 0, "mtime", &mtime_option, N_("time"), |
| 658 | N_("set modification time of archive entries"), |
| 659 | PARSE_OPT_NONEG }, |
René Scharfe | cde8ea9 | 2020-11-09 17:05:31 +0100 | [diff] [blame] | 660 | OPT_NUMBER_CALLBACK(&compression_level, |
| 661 | N_("set compression level"), number_callback), |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 662 | OPT_GROUP(""), |
Junio C Hamano | f858c64 | 2011-09-27 16:59:01 -0700 | [diff] [blame] | 663 | OPT_BOOL('l', "list", &list, |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 664 | N_("list supported archive formats")), |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 665 | OPT_GROUP(""), |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 666 | OPT_STRING(0, "remote", &remote, N_("repo"), |
| 667 | N_("retrieve the archive from remote repository <repo>")), |
Nguyễn Thái Ngọc Duy | b0ff965 | 2012-08-20 19:32:54 +0700 | [diff] [blame] | 668 | OPT_STRING(0, "exec", &exec, N_("command"), |
Nguyễn Thái Ngọc Duy | 0012a38 | 2012-08-20 19:31:51 +0700 | [diff] [blame] | 669 | N_("path to the remote git-upload-archive command")), |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 670 | OPT_END() |
| 671 | }; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 672 | |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 673 | argc = parse_options(argc, argv, NULL, opts, archive_usage, 0); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 674 | |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 675 | if (remote) |
Vasco Almeida | 5a36d00 | 2016-08-08 11:16:00 +0000 | [diff] [blame] | 676 | die(_("Unexpected option --remote")); |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 677 | if (exec) |
Jean-Noël Avila | 6fa00ee | 2022-01-05 20:02:19 +0000 | [diff] [blame] | 678 | die(_("the option '%s' requires '%s'"), "--exec", "--remote"); |
René Scharfe | 52e7787 | 2009-03-08 19:21:53 +0100 | [diff] [blame] | 679 | if (output) |
Vasco Almeida | 5a36d00 | 2016-08-08 11:16:00 +0000 | [diff] [blame] | 680 | die(_("Unexpected option --output")); |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 681 | if (is_remote && args->extra_files.nr) |
Jean-Noël Avila | 12909b6 | 2022-01-05 20:02:16 +0000 | [diff] [blame] | 682 | die(_("options '%s' and '%s' cannot be used together"), "--add-file", "--remote"); |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 683 | |
| 684 | if (!base) |
| 685 | base = ""; |
| 686 | |
| 687 | if (list) { |
Jeff King | 13e0f88 | 2011-06-21 21:23:33 -0400 | [diff] [blame] | 688 | for (i = 0; i < nr_archivers; i++) |
Jeff King | 7b97730 | 2011-06-21 23:17:35 -0400 | [diff] [blame] | 689 | if (!is_remote || archivers[i]->flags & ARCHIVER_REMOTE) |
| 690 | printf("%s\n", archivers[i]->name); |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 691 | exit(0); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 692 | } |
| 693 | |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 694 | if (!format && name_hint) |
| 695 | format = archive_format_from_filename(name_hint); |
| 696 | if (!format) |
| 697 | format = "tar"; |
| 698 | |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 699 | /* We need at least one parameter -- tree-ish */ |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 700 | if (argc < 1) |
| 701 | usage_with_options(archive_usage, opts); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 702 | *ar = lookup_archiver(format); |
Jeff King | 7b97730 | 2011-06-21 23:17:35 -0400 | [diff] [blame] | 703 | if (!*ar || (is_remote && !((*ar)->flags & ARCHIVER_REMOTE))) |
Vasco Almeida | 5a36d00 | 2016-08-08 11:16:00 +0000 | [diff] [blame] | 704 | die(_("Unknown archive format '%s'"), format); |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 705 | |
| 706 | args->compression_level = Z_DEFAULT_COMPRESSION; |
| 707 | if (compression_level != -1) { |
René Scharfe | cde8ea9 | 2020-11-09 17:05:31 +0100 | [diff] [blame] | 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)) |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 711 | args->compression_level = compression_level; |
| 712 | else { |
Vasco Almeida | 5a36d00 | 2016-08-08 11:16:00 +0000 | [diff] [blame] | 713 | die(_("Argument not supported for format '%s': -%d"), |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 714 | format, compression_level); |
| 715 | } |
| 716 | } |
| 717 | args->verbose = verbose; |
| 718 | args->base = base; |
| 719 | args->baselen = strlen(base); |
Nguyễn Thái Ngọc Duy | ba053ea | 2009-04-18 00:18:05 +0200 | [diff] [blame] | 720 | args->worktree_attributes = worktree_attributes; |
René Scharfe | fd2da4b | 2023-02-18 09:36:23 +0100 | [diff] [blame] | 721 | args->mtime_option = mtime_option; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 722 | |
Rene Scharfe | 4fac1d3 | 2008-07-25 12:41:26 +0200 | [diff] [blame] | 723 | return argc; |
Rene Scharfe | c088543 | 2008-07-25 12:41:22 +0200 | [diff] [blame] | 724 | } |
| 725 | |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 726 | int write_archive(int argc, const char **argv, const char *prefix, |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 727 | struct repository *repo, |
Junio C Hamano | eb0224c | 2016-11-22 13:37:04 -0800 | [diff] [blame] | 728 | const char *name_hint, int remote) |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 729 | { |
| 730 | const struct archiver *ar = NULL; |
René Scharfe | 9609972 | 2021-02-28 12:22:47 +0100 | [diff] [blame] | 731 | struct pretty_print_describe_status describe_status = {0}; |
| 732 | struct pretty_print_context ctx = {0}; |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 733 | struct archiver_args args; |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 734 | int rc; |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 735 | |
Tanay Abhra | 95790ff | 2014-08-07 09:21:19 -0700 | [diff] [blame] | 736 | git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); |
| 737 | git_config(git_default_config, NULL); |
| 738 | |
René Scharfe | 9609972 | 2021-02-28 12:22:47 +0100 | [diff] [blame] | 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; |
Nguyễn Thái Ngọc Duy | b612ee2 | 2018-08-13 18:14:35 +0200 | [diff] [blame] | 744 | args.repo = repo; |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 745 | args.prefix = prefix; |
Ævar Arnfjörð Bjarmason | bc40dfb | 2021-07-01 12:51:29 +0200 | [diff] [blame] | 746 | string_list_init_dup(&args.extra_files); |
Jeff King | 7b97730 | 2011-06-21 23:17:35 -0400 | [diff] [blame] | 747 | argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote); |
Junio C Hamano | eb0224c | 2016-11-22 13:37:04 -0800 | [diff] [blame] | 748 | if (!startup_info->have_repository) { |
Jeff King | 2321286 | 2011-06-15 18:31:28 -0400 | [diff] [blame] | 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 | } |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 756 | |
René Scharfe | 92b1dd1 | 2023-03-24 23:27:11 +0100 | [diff] [blame] | 757 | parse_treeish_arg(argv, &args, remote); |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 758 | parse_pathspec_arg(argv + 1, &args); |
| 759 | |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 760 | rc = ar->write_archive(ar, &args); |
| 761 | |
| 762 | string_list_clear_func(&args.extra_files, extra_file_info_clear); |
René Scharfe | 1c3e412 | 2020-11-14 23:01:04 +0100 | [diff] [blame] | 763 | free(args.refname); |
Ævar Arnfjörð Bjarmason | 7615cf9 | 2023-02-07 00:07:40 +0100 | [diff] [blame] | 764 | clear_pathspec(&args.pathspec); |
René Scharfe | 2947a79 | 2020-09-19 23:23:42 +0200 | [diff] [blame] | 765 | |
| 766 | return rc; |
Rene Scharfe | 6e94e68 | 2008-07-25 12:41:21 +0200 | [diff] [blame] | 767 | } |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 768 | |
Jeff King | 08716b3 | 2011-06-21 21:25:25 -0400 | [diff] [blame] | 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 | */ |
Junio C Hamano | b1cdfb5 | 2013-10-15 15:27:17 -0700 | [diff] [blame] | 778 | if (prefixlen < 2 || filename[prefixlen - 1] != '.') |
Jeff King | 08716b3 | 2011-06-21 21:25:25 -0400 | [diff] [blame] | 779 | return 0; |
| 780 | return !strcmp(filename + prefixlen, ext); |
| 781 | } |
| 782 | |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 783 | const char *archive_format_from_filename(const char *filename) |
| 784 | { |
Jeff King | 08716b3 | 2011-06-21 21:25:25 -0400 | [diff] [blame] | 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; |
Jeff King | 56baa61 | 2011-06-21 21:24:48 -0400 | [diff] [blame] | 790 | return NULL; |
| 791 | } |