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