]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
4d3fe0c5 | 6 | |
e83c5163 | 7 | #include "cache.h" |
ee6566e8 DB |
8 | #include "object.h" |
9 | #include "tree.h" | |
1ccf5a34 | 10 | #include "tree-walk.h" |
bad68ec9 | 11 | #include "cache-tree.h" |
16da134b | 12 | #include "unpack-trees.h" |
f8a9d428 | 13 | #include "dir.h" |
d147e501 | 14 | #include "builtin.h" |
ee6566e8 | 15 | |
a9ab2009 | 16 | #define MAX_TREES 8 |
933bf40a | 17 | static int nr_trees; |
f34f2b0b | 18 | static struct tree *trees[MAX_TREES]; |
ee6566e8 | 19 | |
ee6566e8 DB |
20 | static int list_tree(unsigned char *sha1) |
21 | { | |
933bf40a LT |
22 | struct tree *tree; |
23 | ||
a9ab2009 JH |
24 | if (nr_trees >= MAX_TREES) |
25 | die("I cannot read more than %d trees", MAX_TREES); | |
933bf40a | 26 | tree = parse_tree_indirect(sha1); |
ee6566e8 DB |
27 | if (!tree) |
28 | return -1; | |
933bf40a | 29 | trees[nr_trees++] = tree; |
ee6566e8 DB |
30 | return 0; |
31 | } | |
32 | ||
438195cc LT |
33 | static int read_cache_unmerged(void) |
34 | { | |
b0d6e646 | 35 | int i; |
438195cc | 36 | struct cache_entry **dst; |
b0d6e646 | 37 | struct cache_entry *last = NULL; |
438195cc LT |
38 | |
39 | read_cache(); | |
40 | dst = active_cache; | |
438195cc LT |
41 | for (i = 0; i < active_nr; i++) { |
42 | struct cache_entry *ce = active_cache[i]; | |
43 | if (ce_stage(ce)) { | |
d070e3a3 | 44 | remove_index_entry(ce); |
b0d6e646 JH |
45 | if (last && !strcmp(ce->name, last->name)) |
46 | continue; | |
076b0adc | 47 | cache_tree_invalidate_path(active_cache_tree, ce->name); |
b0d6e646 | 48 | last = ce; |
f5ed3b30 | 49 | continue; |
438195cc | 50 | } |
b0d6e646 | 51 | *dst++ = ce; |
438195cc | 52 | } |
b0d6e646 JH |
53 | active_nr = dst - active_cache; |
54 | return !!last; | |
438195cc LT |
55 | } |
56 | ||
7927a55d JH |
57 | static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) |
58 | { | |
1ccf5a34 | 59 | struct tree_desc desc; |
4c068a98 | 60 | struct name_entry entry; |
7927a55d | 61 | int cnt; |
283c8eef | 62 | |
e702496e | 63 | hashcpy(it->sha1, tree->object.sha1); |
6fda5e51 | 64 | init_tree_desc(&desc, tree->buffer, tree->size); |
1ccf5a34 | 65 | cnt = 0; |
4c068a98 LT |
66 | while (tree_entry(&desc, &entry)) { |
67 | if (!S_ISDIR(entry.mode)) | |
7927a55d JH |
68 | cnt++; |
69 | else { | |
70 | struct cache_tree_sub *sub; | |
4c068a98 | 71 | struct tree *subtree = lookup_tree(entry.sha1); |
7927a55d JH |
72 | if (!subtree->object.parsed) |
73 | parse_tree(subtree); | |
4c068a98 | 74 | sub = cache_tree_sub(it, entry.path); |
7927a55d JH |
75 | sub->cache_tree = cache_tree(); |
76 | prime_cache_tree_rec(sub->cache_tree, subtree); | |
77 | cnt += sub->cache_tree->entry_count; | |
78 | } | |
79 | } | |
80 | it->entry_count = cnt; | |
81 | } | |
82 | ||
83 | static void prime_cache_tree(void) | |
84 | { | |
933bf40a | 85 | if (!nr_trees) |
7927a55d JH |
86 | return; |
87 | active_cache_tree = cache_tree(); | |
933bf40a | 88 | prime_cache_tree_rec(active_cache_tree, trees[0]); |
7927a55d JH |
89 | |
90 | } | |
91 | ||
6da08783 | 92 | static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] [--exclude-per-directory=<gitignore>] [--index-output=<file>] <sha1> [<sha2> [<sha3>]])"; |
c5bac17a | 93 | |
021b6e45 | 94 | static struct lock_file lock_file; |
96cd5429 | 95 | |
a91af794 | 96 | int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) |
e83c5163 | 97 | { |
6d6776cb | 98 | int i, newfd, stage = 0; |
e83c5163 | 99 | unsigned char sha1[20]; |
f34f2b0b | 100 | struct tree_desc t[MAX_TREES]; |
16da134b | 101 | struct unpack_trees_options opts; |
bb233d69 | 102 | |
16da134b JS |
103 | memset(&opts, 0, sizeof(opts)); |
104 | opts.head_idx = -1; | |
344c52ae | 105 | |
84a9b58c | 106 | git_config(git_default_config); |
53228a5f | 107 | |
30ca07a2 | 108 | newfd = hold_locked_index(&lock_file, 1); |
83adac3c | 109 | |
39b4ac99 AR |
110 | git_config(git_default_config); |
111 | ||
83adac3c LT |
112 | for (i = 1; i < argc; i++) { |
113 | const char *arg = argv[i]; | |
114 | ||
720d150c JH |
115 | /* "-u" means "update", meaning that a merge will update |
116 | * the working tree. | |
117 | */ | |
220a0b52 | 118 | if (!strcmp(arg, "-u")) { |
16da134b | 119 | opts.update = 1; |
220a0b52 LT |
120 | continue; |
121 | } | |
122 | ||
744633cb | 123 | if (!strcmp(arg, "-v")) { |
16da134b | 124 | opts.verbose_update = 1; |
744633cb JH |
125 | continue; |
126 | } | |
127 | ||
720d150c JH |
128 | /* "-i" means "index only", meaning that a merge will |
129 | * not even look at the working tree. | |
130 | */ | |
131 | if (!strcmp(arg, "-i")) { | |
16da134b | 132 | opts.index_only = 1; |
720d150c JH |
133 | continue; |
134 | } | |
135 | ||
5e7f56ac JH |
136 | if (!prefixcmp(arg, "--index-output=")) { |
137 | set_alternate_index_output(arg + 15); | |
138 | continue; | |
139 | } | |
140 | ||
f4c6f2d3 JH |
141 | /* "--prefix=<subdirectory>/" means keep the current index |
142 | * entries and put the entries from the tree under the | |
143 | * given subdirectory. | |
144 | */ | |
cc44c765 | 145 | if (!prefixcmp(arg, "--prefix=")) { |
16da134b | 146 | if (stage || opts.merge || opts.prefix) |
f4c6f2d3 | 147 | usage(read_tree_usage); |
16da134b JS |
148 | opts.prefix = arg + 9; |
149 | opts.merge = 1; | |
f4c6f2d3 JH |
150 | stage = 1; |
151 | if (read_cache_unmerged()) | |
152 | die("you need to resolve your current index first"); | |
153 | continue; | |
154 | } | |
155 | ||
b0d6e646 JH |
156 | /* This differs from "-m" in that we'll silently ignore |
157 | * unmerged entries and overwrite working tree files that | |
158 | * correspond to them. | |
159 | */ | |
438195cc | 160 | if (!strcmp(arg, "--reset")) { |
16da134b | 161 | if (stage || opts.merge || opts.prefix) |
438195cc | 162 | usage(read_tree_usage); |
16da134b JS |
163 | opts.reset = 1; |
164 | opts.merge = 1; | |
438195cc LT |
165 | stage = 1; |
166 | read_cache_unmerged(); | |
7875b50d | 167 | continue; |
438195cc LT |
168 | } |
169 | ||
23822a35 | 170 | if (!strcmp(arg, "--trivial")) { |
16da134b | 171 | opts.trivial_merges_only = 1; |
23822a35 LT |
172 | continue; |
173 | } | |
174 | ||
1b1fdf8c | 175 | if (!strcmp(arg, "--aggressive")) { |
16da134b | 176 | opts.aggressive = 1; |
1b1fdf8c JH |
177 | continue; |
178 | } | |
179 | ||
d99082e0 | 180 | /* "-m" stands for "merge", meaning we start in stage 1 */ |
83adac3c | 181 | if (!strcmp(arg, "-m")) { |
16da134b | 182 | if (stage || opts.merge || opts.prefix) |
438195cc LT |
183 | usage(read_tree_usage); |
184 | if (read_cache_unmerged()) | |
185 | die("you need to resolve your current index first"); | |
d99082e0 | 186 | stage = 1; |
16da134b | 187 | opts.merge = 1; |
83adac3c LT |
188 | continue; |
189 | } | |
03efa6d9 | 190 | |
cc44c765 | 191 | if (!prefixcmp(arg, "--exclude-per-directory=")) { |
f8a9d428 JH |
192 | struct dir_struct *dir; |
193 | ||
194 | if (opts.dir) | |
195 | die("more than one --exclude-per-directory are given."); | |
196 | ||
aa4cfa85 | 197 | dir = xcalloc(1, sizeof(*opts.dir)); |
f8a9d428 JH |
198 | dir->show_ignored = 1; |
199 | dir->exclude_per_dir = arg + 24; | |
200 | opts.dir = dir; | |
201 | /* We do not need to nor want to do read-directory | |
202 | * here; we are merely interested in reusing the | |
203 | * per directory ignore stack mechanism. | |
204 | */ | |
205 | continue; | |
206 | } | |
207 | ||
720d150c | 208 | /* using -u and -i at the same time makes no sense */ |
16da134b | 209 | if (1 < opts.index_only + opts.update) |
720d150c JH |
210 | usage(read_tree_usage); |
211 | ||
31fff305 DL |
212 | if (get_sha1(arg, sha1)) |
213 | die("Not a valid object name %s", arg); | |
ee6566e8 | 214 | if (list_tree(sha1) < 0) |
2de381f9 | 215 | die("failed to unpack tree object %s", arg); |
d99082e0 | 216 | stage++; |
83adac3c | 217 | } |
16da134b | 218 | if ((opts.update||opts.index_only) && !opts.merge) |
a57f0b58 | 219 | usage(read_tree_usage); |
f8a9d428 JH |
220 | if ((opts.dir && !opts.update)) |
221 | die("--exclude-per-directory is meaningless unless -u"); | |
7dd43575 | 222 | |
16da134b JS |
223 | if (opts.prefix) { |
224 | int pfxlen = strlen(opts.prefix); | |
f4c6f2d3 | 225 | int pos; |
16da134b | 226 | if (opts.prefix[pfxlen-1] != '/') |
f4c6f2d3 JH |
227 | die("prefix must end with /"); |
228 | if (stage != 2) | |
229 | die("binding merge takes only one tree"); | |
16da134b | 230 | pos = cache_name_pos(opts.prefix, pfxlen); |
f4c6f2d3 JH |
231 | if (0 <= pos) |
232 | die("corrupt index file"); | |
233 | pos = -pos-1; | |
234 | if (pos < active_nr && | |
16da134b JS |
235 | !strncmp(active_cache[pos]->name, opts.prefix, pfxlen)) |
236 | die("subdirectory '%s' already exists.", opts.prefix); | |
237 | pos = cache_name_pos(opts.prefix, pfxlen-1); | |
f4c6f2d3 | 238 | if (0 <= pos) |
16da134b JS |
239 | die("file '%.*s' already exists.", |
240 | pfxlen-1, opts.prefix); | |
2960a1d9 | 241 | opts.pos = -1 - pos; |
f4c6f2d3 JH |
242 | } |
243 | ||
16da134b | 244 | if (opts.merge) { |
ee6566e8 | 245 | if (stage < 2) |
a3a65234 | 246 | die("just how do you expect me to merge %d trees?", stage-1); |
ee6566e8 DB |
247 | switch (stage - 1) { |
248 | case 1: | |
16da134b | 249 | opts.fn = opts.prefix ? bind_merge : oneway_merge; |
ee6566e8 DB |
250 | break; |
251 | case 2: | |
16da134b | 252 | opts.fn = twoway_merge; |
ee6566e8 DB |
253 | break; |
254 | case 3: | |
ee6566e8 | 255 | default: |
16da134b | 256 | opts.fn = threeway_merge; |
b34c39cf | 257 | cache_tree_free(&active_cache_tree); |
ee6566e8 | 258 | break; |
03efa6d9 | 259 | } |
ee6566e8 | 260 | |
ee6566e8 | 261 | if (stage - 1 >= 3) |
16da134b | 262 | opts.head_idx = stage - 2; |
ee6566e8 | 263 | else |
16da134b | 264 | opts.head_idx = 1; |
ee6566e8 DB |
265 | } |
266 | ||
933bf40a LT |
267 | for (i = 0; i < nr_trees; i++) { |
268 | struct tree *tree = trees[i]; | |
269 | parse_tree(tree); | |
270 | init_tree_desc(t+i, tree->buffer, tree->size); | |
271 | } | |
203a2fe1 DB |
272 | if (unpack_trees(nr_trees, t, &opts)) |
273 | return 128; | |
7927a55d JH |
274 | |
275 | /* | |
276 | * When reading only one tree (either the most basic form, | |
277 | * "-m ent" or "--reset ent" form), we can obtain a fully | |
278 | * valid cache-tree because the index must match exactly | |
279 | * what came from the tree. | |
280 | */ | |
933bf40a | 281 | if (nr_trees && !opts.prefix && (!opts.merge || (stage == 2))) { |
b6c4a480 | 282 | cache_tree_free(&active_cache_tree); |
7927a55d JH |
283 | prime_cache_tree(); |
284 | } | |
285 | ||
96cd5429 | 286 | if (write_cache(newfd, active_cache, active_nr) || |
4ed7cd3a | 287 | commit_locked_index(&lock_file)) |
2de381f9 | 288 | die("unable to write new index file"); |
9614b8dc | 289 | return 0; |
e83c5163 | 290 | } |