lockfile.h: extract new header file for the functions in lockfile.c
[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"
697cc8ef 8#include "lockfile.h"
ee6566e8
DB
9#include "object.h"
10#include "tree.h"
1ccf5a34 11#include "tree-walk.h"
bad68ec9 12#include "cache-tree.h"
16da134b 13#include "unpack-trees.h"
f8a9d428 14#include "dir.h"
d147e501 15#include "builtin.h"
5a56da58 16#include "parse-options.h"
cfc5789a 17#include "resolve-undo.h"
ee6566e8 18
933bf40a 19static int nr_trees;
fb1bb965 20static int read_empty;
ca885a4f 21static struct tree *trees[MAX_UNPACK_TREES];
ee6566e8 22
ee6566e8
DB
23static int list_tree(unsigned char *sha1)
24{
933bf40a
LT
25 struct tree *tree;
26
ca885a4f
JH
27 if (nr_trees >= MAX_UNPACK_TREES)
28 die("I cannot read more than %d trees", MAX_UNPACK_TREES);
933bf40a 29 tree = parse_tree_indirect(sha1);
ee6566e8
DB
30 if (!tree)
31 return -1;
933bf40a 32 trees[nr_trees++] = tree;
ee6566e8
DB
33 return 0;
34}
35
5a56da58 36static const char * const read_tree_usage[] = {
230c6cdb 37 N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
5a56da58
SB
38 NULL
39};
40
41static int index_output_cb(const struct option *opt, const char *arg,
42 int unset)
43{
44 set_alternate_index_output(arg);
45 return 0;
46}
47
48static int exclude_per_directory_cb(const struct option *opt, const char *arg,
49 int unset)
50{
51 struct dir_struct *dir;
52 struct unpack_trees_options *opts;
53
54 opts = (struct unpack_trees_options *)opt->value;
55
56 if (opts->dir)
57 die("more than one --exclude-per-directory given.");
58
59 dir = xcalloc(1, sizeof(*opts->dir));
60 dir->flags |= DIR_SHOW_IGNORED;
61 dir->exclude_per_dir = arg;
62 opts->dir = dir;
63 /* We do not need to nor want to do read-directory
64 * here; we are merely interested in reusing the
65 * per directory ignore stack mechanism.
66 */
67 return 0;
68}
c5bac17a 69
eb9ae4b5 70static void debug_stage(const char *label, const struct cache_entry *ce,
ba655da5
JH
71 struct unpack_trees_options *o)
72{
73 printf("%s ", label);
74 if (!ce)
75 printf("(missing)\n");
76 else if (ce == o->df_conflict_entry)
77 printf("(conflict)\n");
78 else
79 printf("%06o #%d %s %.8s\n",
80 ce->ce_mode, ce_stage(ce), ce->name,
81 sha1_to_hex(ce->sha1));
82}
83
5828e835
RS
84static int debug_merge(const struct cache_entry * const *stages,
85 struct unpack_trees_options *o)
ba655da5
JH
86{
87 int i;
88
89 printf("* %d-way merge\n", o->merge_size);
90 debug_stage("index", stages[0], o);
91 for (i = 1; i <= o->merge_size; i++) {
92 char buf[24];
93 sprintf(buf, "ent#%d", i);
94 debug_stage(buf, stages[i], o);
95 }
96 return 0;
97}
98
021b6e45 99static struct lock_file lock_file;
96cd5429 100
a91af794 101int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
e83c5163 102{
03b86647 103 int i, stage = 0;
e83c5163 104 unsigned char sha1[20];
ca885a4f 105 struct tree_desc t[MAX_UNPACK_TREES];
16da134b 106 struct unpack_trees_options opts;
5a56da58
SB
107 int prefix_set = 0;
108 const struct option read_tree_options[] = {
230c6cdb
NTND
109 { OPTION_CALLBACK, 0, "index-output", NULL, N_("file"),
110 N_("write resulting index to <file>"),
5a56da58 111 PARSE_OPT_NONEG, index_output_cb },
fb1bb965 112 OPT_SET_INT(0, "empty", &read_empty,
230c6cdb
NTND
113 N_("only empty the index"), 1),
114 OPT__VERBOSE(&opts.verbose_update, N_("be verbose")),
115 OPT_GROUP(N_("Merging")),
5a56da58 116 OPT_SET_INT('m', NULL, &opts.merge,
230c6cdb 117 N_("perform a merge in addition to a read"), 1),
5a56da58 118 OPT_SET_INT(0, "trivial", &opts.trivial_merges_only,
230c6cdb 119 N_("3-way merge if no file level merging required"), 1),
5a56da58 120 OPT_SET_INT(0, "aggressive", &opts.aggressive,
230c6cdb 121 N_("3-way merge in presence of adds and removes"), 1),
5a56da58 122 OPT_SET_INT(0, "reset", &opts.reset,
230c6cdb
NTND
123 N_("same as -m, but discard unmerged entries"), 1),
124 { OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"),
125 N_("read the tree into the index under <subdirectory>/"),
5a56da58
SB
126 PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
127 OPT_SET_INT('u', NULL, &opts.update,
230c6cdb 128 N_("update working tree with merge result"), 1),
5a56da58 129 { OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
230c6cdb
NTND
130 N_("gitignore"),
131 N_("allow explicitly ignored files to be overwritten"),
5a56da58
SB
132 PARSE_OPT_NONEG, exclude_per_directory_cb },
133 OPT_SET_INT('i', NULL, &opts.index_only,
230c6cdb
NTND
134 N_("don't check the working tree after merging"), 1),
135 OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")),
a5d07d0f 136 OPT_SET_INT(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
230c6cdb 137 N_("skip applying sparse checkout filter"), 1),
ba655da5 138 OPT_SET_INT(0, "debug-unpack", &opts.debug_unpack,
230c6cdb 139 N_("debug unpack-trees"), 1),
5a56da58
SB
140 OPT_END()
141 };
bb233d69 142
16da134b
JS
143 memset(&opts, 0, sizeof(opts));
144 opts.head_idx = -1;
34110cd4
LT
145 opts.src_index = &the_index;
146 opts.dst_index = &the_index;
344c52ae 147
ef90d6d4 148 git_config(git_default_config, NULL);
53228a5f 149
5a56da58
SB
150 argc = parse_options(argc, argv, unused_prefix, read_tree_options,
151 read_tree_usage, 0);
83adac3c 152
03b86647 153 hold_locked_index(&lock_file, 1);
99caeed0 154
5a56da58
SB
155 prefix_set = opts.prefix ? 1 : 0;
156 if (1 < opts.merge + opts.reset + prefix_set)
157 die("Which one? -m, --reset, or --prefix?");
db137fe9 158
5a092ceb
NTND
159 /*
160 * NEEDSWORK
161 *
162 * The old index should be read anyway even if we're going to
163 * destroy all index entries because we still need to preserve
164 * certain information such as index version or split-index
165 * mode.
166 */
167
db137fe9
AJ
168 if (opts.reset || opts.merge || opts.prefix) {
169 if (read_cache_unmerged() && (opts.prefix || opts.merge))
170 die("You need to resolve your current index first");
171 stage = opts.merge = 1;
172 }
cfc5789a 173 resolve_undo_clear();
5a56da58
SB
174
175 for (i = 0; i < argc; i++) {
176 const char *arg = argv[i];
720d150c 177
31fff305
DL
178 if (get_sha1(arg, sha1))
179 die("Not a valid object name %s", arg);
ee6566e8 180 if (list_tree(sha1) < 0)
2de381f9 181 die("failed to unpack tree object %s", arg);
d99082e0 182 stage++;
83adac3c 183 }
fb1bb965
JK
184 if (nr_trees == 0 && !read_empty)
185 warning("read-tree: emptying the index with no arguments is deprecated; use --empty");
186 else if (nr_trees > 0 && read_empty)
187 die("passing trees as arguments contradicts --empty");
188
5a56da58
SB
189 if (1 < opts.index_only + opts.update)
190 die("-u and -i at the same time makes no sense");
c01499ef 191 if ((opts.update || opts.index_only) && !opts.merge)
a429d2dd
SB
192 die("%s is meaningless without -m, --reset, or --prefix",
193 opts.update ? "-u" : "-i");
f8a9d428
JH
194 if ((opts.dir && !opts.update))
195 die("--exclude-per-directory is meaningless unless -u");
b6469a81
NTND
196 if (opts.merge && !opts.index_only)
197 setup_work_tree();
7dd43575 198
16da134b 199 if (opts.merge) {
ee6566e8 200 if (stage < 2)
a3a65234 201 die("just how do you expect me to merge %d trees?", stage-1);
ee6566e8
DB
202 switch (stage - 1) {
203 case 1:
16da134b 204 opts.fn = opts.prefix ? bind_merge : oneway_merge;
ee6566e8
DB
205 break;
206 case 2:
16da134b 207 opts.fn = twoway_merge;
fa7b3c2f 208 opts.initial_checkout = is_cache_unborn();
ee6566e8
DB
209 break;
210 case 3:
ee6566e8 211 default:
16da134b 212 opts.fn = threeway_merge;
ee6566e8 213 break;
03efa6d9 214 }
ee6566e8 215
ee6566e8 216 if (stage - 1 >= 3)
16da134b 217 opts.head_idx = stage - 2;
ee6566e8 218 else
16da134b 219 opts.head_idx = 1;
ee6566e8
DB
220 }
221
ba655da5
JH
222 if (opts.debug_unpack)
223 opts.fn = debug_merge;
224
8cc21ce7 225 cache_tree_free(&active_cache_tree);
933bf40a
LT
226 for (i = 0; i < nr_trees; i++) {
227 struct tree *tree = trees[i];
228 parse_tree(tree);
229 init_tree_desc(t+i, tree->buffer, tree->size);
230 }
203a2fe1
DB
231 if (unpack_trees(nr_trees, t, &opts))
232 return 128;
7927a55d 233
ea5070c9 234 if (opts.debug_unpack || opts.dry_run)
ba655da5
JH
235 return 0; /* do not write the index out */
236
7927a55d
JH
237 /*
238 * When reading only one tree (either the most basic form,
239 * "-m ent" or "--reset ent" form), we can obtain a fully
240 * valid cache-tree because the index must match exactly
241 * what came from the tree.
242 */
8cc21ce7 243 if (nr_trees == 1 && !opts.prefix)
e6c286e8 244 prime_cache_tree(&the_index, trees[0]);
7927a55d 245
03b86647 246 if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
2de381f9 247 die("unable to write new index file");
9614b8dc 248 return 0;
e83c5163 249}