Make 'unpack_trees()' take the index to work on as an argument
[git/git.git] / builtin-read-tree.c
CommitLineData
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 17static int nr_trees;
f34f2b0b 18static struct tree *trees[MAX_TREES];
ee6566e8 19
ee6566e8
DB
20static 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
33static 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
57static 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
83static 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 92static 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 94static struct lock_file lock_file;
96cd5429 95
a91af794 96int 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;
bc052d7f 105 opts.index = &the_index;
344c52ae 106
84a9b58c 107 git_config(git_default_config);
53228a5f 108
30ca07a2 109 newfd = hold_locked_index(&lock_file, 1);
83adac3c 110
39b4ac99
AR
111 git_config(git_default_config);
112
83adac3c
LT
113 for (i = 1; i < argc; i++) {
114 const char *arg = argv[i];
115
720d150c
JH
116 /* "-u" means "update", meaning that a merge will update
117 * the working tree.
118 */
220a0b52 119 if (!strcmp(arg, "-u")) {
16da134b 120 opts.update = 1;
220a0b52
LT
121 continue;
122 }
123
744633cb 124 if (!strcmp(arg, "-v")) {
16da134b 125 opts.verbose_update = 1;
744633cb
JH
126 continue;
127 }
128
720d150c
JH
129 /* "-i" means "index only", meaning that a merge will
130 * not even look at the working tree.
131 */
132 if (!strcmp(arg, "-i")) {
16da134b 133 opts.index_only = 1;
720d150c
JH
134 continue;
135 }
136
5e7f56ac
JH
137 if (!prefixcmp(arg, "--index-output=")) {
138 set_alternate_index_output(arg + 15);
139 continue;
140 }
141
f4c6f2d3
JH
142 /* "--prefix=<subdirectory>/" means keep the current index
143 * entries and put the entries from the tree under the
144 * given subdirectory.
145 */
cc44c765 146 if (!prefixcmp(arg, "--prefix=")) {
16da134b 147 if (stage || opts.merge || opts.prefix)
f4c6f2d3 148 usage(read_tree_usage);
16da134b
JS
149 opts.prefix = arg + 9;
150 opts.merge = 1;
f4c6f2d3
JH
151 stage = 1;
152 if (read_cache_unmerged())
153 die("you need to resolve your current index first");
154 continue;
155 }
156
b0d6e646
JH
157 /* This differs from "-m" in that we'll silently ignore
158 * unmerged entries and overwrite working tree files that
159 * correspond to them.
160 */
438195cc 161 if (!strcmp(arg, "--reset")) {
16da134b 162 if (stage || opts.merge || opts.prefix)
438195cc 163 usage(read_tree_usage);
16da134b
JS
164 opts.reset = 1;
165 opts.merge = 1;
438195cc
LT
166 stage = 1;
167 read_cache_unmerged();
7875b50d 168 continue;
438195cc
LT
169 }
170
23822a35 171 if (!strcmp(arg, "--trivial")) {
16da134b 172 opts.trivial_merges_only = 1;
23822a35
LT
173 continue;
174 }
175
1b1fdf8c 176 if (!strcmp(arg, "--aggressive")) {
16da134b 177 opts.aggressive = 1;
1b1fdf8c
JH
178 continue;
179 }
180
d99082e0 181 /* "-m" stands for "merge", meaning we start in stage 1 */
83adac3c 182 if (!strcmp(arg, "-m")) {
16da134b 183 if (stage || opts.merge || opts.prefix)
438195cc
LT
184 usage(read_tree_usage);
185 if (read_cache_unmerged())
186 die("you need to resolve your current index first");
d99082e0 187 stage = 1;
16da134b 188 opts.merge = 1;
83adac3c
LT
189 continue;
190 }
03efa6d9 191
cc44c765 192 if (!prefixcmp(arg, "--exclude-per-directory=")) {
f8a9d428
JH
193 struct dir_struct *dir;
194
195 if (opts.dir)
196 die("more than one --exclude-per-directory are given.");
197
aa4cfa85 198 dir = xcalloc(1, sizeof(*opts.dir));
f8a9d428
JH
199 dir->show_ignored = 1;
200 dir->exclude_per_dir = arg + 24;
201 opts.dir = dir;
202 /* We do not need to nor want to do read-directory
203 * here; we are merely interested in reusing the
204 * per directory ignore stack mechanism.
205 */
206 continue;
207 }
208
720d150c 209 /* using -u and -i at the same time makes no sense */
16da134b 210 if (1 < opts.index_only + opts.update)
720d150c
JH
211 usage(read_tree_usage);
212
31fff305
DL
213 if (get_sha1(arg, sha1))
214 die("Not a valid object name %s", arg);
ee6566e8 215 if (list_tree(sha1) < 0)
2de381f9 216 die("failed to unpack tree object %s", arg);
d99082e0 217 stage++;
83adac3c 218 }
16da134b 219 if ((opts.update||opts.index_only) && !opts.merge)
a57f0b58 220 usage(read_tree_usage);
f8a9d428
JH
221 if ((opts.dir && !opts.update))
222 die("--exclude-per-directory is meaningless unless -u");
7dd43575 223
16da134b
JS
224 if (opts.prefix) {
225 int pfxlen = strlen(opts.prefix);
f4c6f2d3 226 int pos;
16da134b 227 if (opts.prefix[pfxlen-1] != '/')
f4c6f2d3
JH
228 die("prefix must end with /");
229 if (stage != 2)
230 die("binding merge takes only one tree");
16da134b 231 pos = cache_name_pos(opts.prefix, pfxlen);
f4c6f2d3
JH
232 if (0 <= pos)
233 die("corrupt index file");
234 pos = -pos-1;
235 if (pos < active_nr &&
16da134b
JS
236 !strncmp(active_cache[pos]->name, opts.prefix, pfxlen))
237 die("subdirectory '%s' already exists.", opts.prefix);
238 pos = cache_name_pos(opts.prefix, pfxlen-1);
f4c6f2d3 239 if (0 <= pos)
16da134b
JS
240 die("file '%.*s' already exists.",
241 pfxlen-1, opts.prefix);
2960a1d9 242 opts.pos = -1 - pos;
f4c6f2d3
JH
243 }
244
16da134b 245 if (opts.merge) {
ee6566e8 246 if (stage < 2)
a3a65234 247 die("just how do you expect me to merge %d trees?", stage-1);
ee6566e8
DB
248 switch (stage - 1) {
249 case 1:
16da134b 250 opts.fn = opts.prefix ? bind_merge : oneway_merge;
ee6566e8
DB
251 break;
252 case 2:
16da134b 253 opts.fn = twoway_merge;
ee6566e8
DB
254 break;
255 case 3:
ee6566e8 256 default:
16da134b 257 opts.fn = threeway_merge;
b34c39cf 258 cache_tree_free(&active_cache_tree);
ee6566e8 259 break;
03efa6d9 260 }
ee6566e8 261
ee6566e8 262 if (stage - 1 >= 3)
16da134b 263 opts.head_idx = stage - 2;
ee6566e8 264 else
16da134b 265 opts.head_idx = 1;
ee6566e8
DB
266 }
267
933bf40a
LT
268 for (i = 0; i < nr_trees; i++) {
269 struct tree *tree = trees[i];
270 parse_tree(tree);
271 init_tree_desc(t+i, tree->buffer, tree->size);
272 }
203a2fe1
DB
273 if (unpack_trees(nr_trees, t, &opts))
274 return 128;
7927a55d
JH
275
276 /*
277 * When reading only one tree (either the most basic form,
278 * "-m ent" or "--reset ent" form), we can obtain a fully
279 * valid cache-tree because the index must match exactly
280 * what came from the tree.
281 */
933bf40a 282 if (nr_trees && !opts.prefix && (!opts.merge || (stage == 2))) {
b6c4a480 283 cache_tree_free(&active_cache_tree);
7927a55d
JH
284 prime_cache_tree();
285 }
286
96cd5429 287 if (write_cache(newfd, active_cache, active_nr) ||
4ed7cd3a 288 commit_locked_index(&lock_file))
2de381f9 289 die("unable to write new index file");
9614b8dc 290 return 0;
e83c5163 291}