]>
Commit | Line | Data |
---|---|---|
1 | /* | |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
6 | #include "cache.h" | |
7 | #include "config.h" | |
8 | #include "diff.h" | |
9 | #include "diffcore.h" | |
10 | #include "tempfile.h" | |
11 | #include "lockfile.h" | |
12 | #include "cache-tree.h" | |
13 | #include "refs.h" | |
14 | #include "dir.h" | |
15 | #include "object-store.h" | |
16 | #include "tree.h" | |
17 | #include "commit.h" | |
18 | #include "blob.h" | |
19 | #include "resolve-undo.h" | |
20 | #include "run-command.h" | |
21 | #include "strbuf.h" | |
22 | #include "varint.h" | |
23 | #include "split-index.h" | |
24 | #include "utf8.h" | |
25 | #include "fsmonitor.h" | |
26 | #include "thread-utils.h" | |
27 | #include "progress.h" | |
28 | #include "sparse-index.h" | |
29 | #include "csum-file.h" | |
30 | #include "promisor-remote.h" | |
31 | ||
32 | /* Mask for the name length in ce_flags in the on-disk index */ | |
33 | ||
34 | #define CE_NAMEMASK (0x0fff) | |
35 | ||
36 | /* Index extensions. | |
37 | * | |
38 | * The first letter should be 'A'..'Z' for extensions that are not | |
39 | * necessary for a correct operation (i.e. optimization data). | |
40 | * When new extensions are added that _needs_ to be understood in | |
41 | * order to correctly interpret the index file, pick character that | |
42 | * is outside the range, to cause the reader to abort. | |
43 | */ | |
44 | ||
45 | #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) | |
46 | #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ | |
47 | #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ | |
48 | #define CACHE_EXT_LINK 0x6c696e6b /* "link" */ | |
49 | #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */ | |
50 | #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */ | |
51 | #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945 /* "EOIE" */ | |
52 | #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */ | |
53 | #define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */ | |
54 | ||
55 | /* changes that can be kept in $GIT_DIR/index (basically all extensions) */ | |
56 | #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ | |
57 | CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \ | |
58 | SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED) | |
59 | ||
60 | ||
61 | /* | |
62 | * This is an estimate of the pathname length in the index. We use | |
63 | * this for V4 index files to guess the un-deltafied size of the index | |
64 | * in memory because of pathname deltafication. This is not required | |
65 | * for V2/V3 index formats because their pathnames are not compressed. | |
66 | * If the initial amount of memory set aside is not sufficient, the | |
67 | * mem pool will allocate extra memory. | |
68 | */ | |
69 | #define CACHE_ENTRY_PATH_LENGTH 80 | |
70 | ||
71 | static inline struct cache_entry *mem_pool__ce_alloc(struct mem_pool *mem_pool, size_t len) | |
72 | { | |
73 | struct cache_entry *ce; | |
74 | ce = mem_pool_alloc(mem_pool, cache_entry_size(len)); | |
75 | ce->mem_pool_allocated = 1; | |
76 | return ce; | |
77 | } | |
78 | ||
79 | static inline struct cache_entry *mem_pool__ce_calloc(struct mem_pool *mem_pool, size_t len) | |
80 | { | |
81 | struct cache_entry * ce; | |
82 | ce = mem_pool_calloc(mem_pool, 1, cache_entry_size(len)); | |
83 | ce->mem_pool_allocated = 1; | |
84 | return ce; | |
85 | } | |
86 | ||
87 | static struct mem_pool *find_mem_pool(struct index_state *istate) | |
88 | { | |
89 | struct mem_pool **pool_ptr; | |
90 | ||
91 | if (istate->split_index && istate->split_index->base) | |
92 | pool_ptr = &istate->split_index->base->ce_mem_pool; | |
93 | else | |
94 | pool_ptr = &istate->ce_mem_pool; | |
95 | ||
96 | if (!*pool_ptr) { | |
97 | *pool_ptr = xmalloc(sizeof(**pool_ptr)); | |
98 | mem_pool_init(*pool_ptr, 0); | |
99 | } | |
100 | ||
101 | return *pool_ptr; | |
102 | } | |
103 | ||
104 | static const char *alternate_index_output; | |
105 | ||
106 | static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) | |
107 | { | |
108 | if (S_ISSPARSEDIR(ce->ce_mode)) | |
109 | istate->sparse_index = 1; | |
110 | ||
111 | istate->cache[nr] = ce; | |
112 | add_name_hash(istate, ce); | |
113 | } | |
114 | ||
115 | static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) | |
116 | { | |
117 | struct cache_entry *old = istate->cache[nr]; | |
118 | ||
119 | replace_index_entry_in_base(istate, old, ce); | |
120 | remove_name_hash(istate, old); | |
121 | discard_cache_entry(old); | |
122 | ce->ce_flags &= ~CE_HASHED; | |
123 | set_index_entry(istate, nr, ce); | |
124 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
125 | mark_fsmonitor_invalid(istate, ce); | |
126 | istate->cache_changed |= CE_ENTRY_CHANGED; | |
127 | } | |
128 | ||
129 | void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name) | |
130 | { | |
131 | struct cache_entry *old_entry = istate->cache[nr], *new_entry; | |
132 | int namelen = strlen(new_name); | |
133 | ||
134 | new_entry = make_empty_cache_entry(istate, namelen); | |
135 | copy_cache_entry(new_entry, old_entry); | |
136 | new_entry->ce_flags &= ~CE_HASHED; | |
137 | new_entry->ce_namelen = namelen; | |
138 | new_entry->index = 0; | |
139 | memcpy(new_entry->name, new_name, namelen + 1); | |
140 | ||
141 | cache_tree_invalidate_path(istate, old_entry->name); | |
142 | untracked_cache_remove_from_index(istate, old_entry->name); | |
143 | remove_index_entry_at(istate, nr); | |
144 | add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); | |
145 | } | |
146 | ||
147 | void fill_stat_data(struct stat_data *sd, struct stat *st) | |
148 | { | |
149 | sd->sd_ctime.sec = (unsigned int)st->st_ctime; | |
150 | sd->sd_mtime.sec = (unsigned int)st->st_mtime; | |
151 | sd->sd_ctime.nsec = ST_CTIME_NSEC(*st); | |
152 | sd->sd_mtime.nsec = ST_MTIME_NSEC(*st); | |
153 | sd->sd_dev = st->st_dev; | |
154 | sd->sd_ino = st->st_ino; | |
155 | sd->sd_uid = st->st_uid; | |
156 | sd->sd_gid = st->st_gid; | |
157 | sd->sd_size = st->st_size; | |
158 | } | |
159 | ||
160 | int match_stat_data(const struct stat_data *sd, struct stat *st) | |
161 | { | |
162 | int changed = 0; | |
163 | ||
164 | if (sd->sd_mtime.sec != (unsigned int)st->st_mtime) | |
165 | changed |= MTIME_CHANGED; | |
166 | if (trust_ctime && check_stat && | |
167 | sd->sd_ctime.sec != (unsigned int)st->st_ctime) | |
168 | changed |= CTIME_CHANGED; | |
169 | ||
170 | #ifdef USE_NSEC | |
171 | if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st)) | |
172 | changed |= MTIME_CHANGED; | |
173 | if (trust_ctime && check_stat && | |
174 | sd->sd_ctime.nsec != ST_CTIME_NSEC(*st)) | |
175 | changed |= CTIME_CHANGED; | |
176 | #endif | |
177 | ||
178 | if (check_stat) { | |
179 | if (sd->sd_uid != (unsigned int) st->st_uid || | |
180 | sd->sd_gid != (unsigned int) st->st_gid) | |
181 | changed |= OWNER_CHANGED; | |
182 | if (sd->sd_ino != (unsigned int) st->st_ino) | |
183 | changed |= INODE_CHANGED; | |
184 | } | |
185 | ||
186 | #ifdef USE_STDEV | |
187 | /* | |
188 | * st_dev breaks on network filesystems where different | |
189 | * clients will have different views of what "device" | |
190 | * the filesystem is on | |
191 | */ | |
192 | if (check_stat && sd->sd_dev != (unsigned int) st->st_dev) | |
193 | changed |= INODE_CHANGED; | |
194 | #endif | |
195 | ||
196 | if (sd->sd_size != (unsigned int) st->st_size) | |
197 | changed |= DATA_CHANGED; | |
198 | ||
199 | return changed; | |
200 | } | |
201 | ||
202 | /* | |
203 | * This only updates the "non-critical" parts of the directory | |
204 | * cache, ie the parts that aren't tracked by GIT, and only used | |
205 | * to validate the cache. | |
206 | */ | |
207 | void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st) | |
208 | { | |
209 | fill_stat_data(&ce->ce_stat_data, st); | |
210 | ||
211 | if (assume_unchanged) | |
212 | ce->ce_flags |= CE_VALID; | |
213 | ||
214 | if (S_ISREG(st->st_mode)) { | |
215 | ce_mark_uptodate(ce); | |
216 | mark_fsmonitor_valid(istate, ce); | |
217 | } | |
218 | } | |
219 | ||
220 | static int ce_compare_data(struct index_state *istate, | |
221 | const struct cache_entry *ce, | |
222 | struct stat *st) | |
223 | { | |
224 | int match = -1; | |
225 | int fd = git_open_cloexec(ce->name, O_RDONLY); | |
226 | ||
227 | if (fd >= 0) { | |
228 | struct object_id oid; | |
229 | if (!index_fd(istate, &oid, fd, st, OBJ_BLOB, ce->name, 0)) | |
230 | match = !oideq(&oid, &ce->oid); | |
231 | /* index_fd() closed the file descriptor already */ | |
232 | } | |
233 | return match; | |
234 | } | |
235 | ||
236 | static int ce_compare_link(const struct cache_entry *ce, size_t expected_size) | |
237 | { | |
238 | int match = -1; | |
239 | void *buffer; | |
240 | unsigned long size; | |
241 | enum object_type type; | |
242 | struct strbuf sb = STRBUF_INIT; | |
243 | ||
244 | if (strbuf_readlink(&sb, ce->name, expected_size)) | |
245 | return -1; | |
246 | ||
247 | buffer = read_object_file(&ce->oid, &type, &size); | |
248 | if (buffer) { | |
249 | if (size == sb.len) | |
250 | match = memcmp(buffer, sb.buf, size); | |
251 | free(buffer); | |
252 | } | |
253 | strbuf_release(&sb); | |
254 | return match; | |
255 | } | |
256 | ||
257 | static int ce_compare_gitlink(const struct cache_entry *ce) | |
258 | { | |
259 | struct object_id oid; | |
260 | ||
261 | /* | |
262 | * We don't actually require that the .git directory | |
263 | * under GITLINK directory be a valid git directory. It | |
264 | * might even be missing (in case nobody populated that | |
265 | * sub-project). | |
266 | * | |
267 | * If so, we consider it always to match. | |
268 | */ | |
269 | if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0) | |
270 | return 0; | |
271 | return !oideq(&oid, &ce->oid); | |
272 | } | |
273 | ||
274 | static int ce_modified_check_fs(struct index_state *istate, | |
275 | const struct cache_entry *ce, | |
276 | struct stat *st) | |
277 | { | |
278 | switch (st->st_mode & S_IFMT) { | |
279 | case S_IFREG: | |
280 | if (ce_compare_data(istate, ce, st)) | |
281 | return DATA_CHANGED; | |
282 | break; | |
283 | case S_IFLNK: | |
284 | if (ce_compare_link(ce, xsize_t(st->st_size))) | |
285 | return DATA_CHANGED; | |
286 | break; | |
287 | case S_IFDIR: | |
288 | if (S_ISGITLINK(ce->ce_mode)) | |
289 | return ce_compare_gitlink(ce) ? DATA_CHANGED : 0; | |
290 | /* else fallthrough */ | |
291 | default: | |
292 | return TYPE_CHANGED; | |
293 | } | |
294 | return 0; | |
295 | } | |
296 | ||
297 | static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st) | |
298 | { | |
299 | unsigned int changed = 0; | |
300 | ||
301 | if (ce->ce_flags & CE_REMOVE) | |
302 | return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; | |
303 | ||
304 | switch (ce->ce_mode & S_IFMT) { | |
305 | case S_IFREG: | |
306 | changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; | |
307 | /* We consider only the owner x bit to be relevant for | |
308 | * "mode changes" | |
309 | */ | |
310 | if (trust_executable_bit && | |
311 | (0100 & (ce->ce_mode ^ st->st_mode))) | |
312 | changed |= MODE_CHANGED; | |
313 | break; | |
314 | case S_IFLNK: | |
315 | if (!S_ISLNK(st->st_mode) && | |
316 | (has_symlinks || !S_ISREG(st->st_mode))) | |
317 | changed |= TYPE_CHANGED; | |
318 | break; | |
319 | case S_IFGITLINK: | |
320 | /* We ignore most of the st_xxx fields for gitlinks */ | |
321 | if (!S_ISDIR(st->st_mode)) | |
322 | changed |= TYPE_CHANGED; | |
323 | else if (ce_compare_gitlink(ce)) | |
324 | changed |= DATA_CHANGED; | |
325 | return changed; | |
326 | default: | |
327 | BUG("unsupported ce_mode: %o", ce->ce_mode); | |
328 | } | |
329 | ||
330 | changed |= match_stat_data(&ce->ce_stat_data, st); | |
331 | ||
332 | /* Racily smudged entry? */ | |
333 | if (!ce->ce_stat_data.sd_size) { | |
334 | if (!is_empty_blob_sha1(ce->oid.hash)) | |
335 | changed |= DATA_CHANGED; | |
336 | } | |
337 | ||
338 | return changed; | |
339 | } | |
340 | ||
341 | static int is_racy_stat(const struct index_state *istate, | |
342 | const struct stat_data *sd) | |
343 | { | |
344 | return (istate->timestamp.sec && | |
345 | #ifdef USE_NSEC | |
346 | /* nanosecond timestamped files can also be racy! */ | |
347 | (istate->timestamp.sec < sd->sd_mtime.sec || | |
348 | (istate->timestamp.sec == sd->sd_mtime.sec && | |
349 | istate->timestamp.nsec <= sd->sd_mtime.nsec)) | |
350 | #else | |
351 | istate->timestamp.sec <= sd->sd_mtime.sec | |
352 | #endif | |
353 | ); | |
354 | } | |
355 | ||
356 | int is_racy_timestamp(const struct index_state *istate, | |
357 | const struct cache_entry *ce) | |
358 | { | |
359 | return (!S_ISGITLINK(ce->ce_mode) && | |
360 | is_racy_stat(istate, &ce->ce_stat_data)); | |
361 | } | |
362 | ||
363 | int match_stat_data_racy(const struct index_state *istate, | |
364 | const struct stat_data *sd, struct stat *st) | |
365 | { | |
366 | if (is_racy_stat(istate, sd)) | |
367 | return MTIME_CHANGED; | |
368 | return match_stat_data(sd, st); | |
369 | } | |
370 | ||
371 | int ie_match_stat(struct index_state *istate, | |
372 | const struct cache_entry *ce, struct stat *st, | |
373 | unsigned int options) | |
374 | { | |
375 | unsigned int changed; | |
376 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; | |
377 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; | |
378 | int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; | |
379 | int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR; | |
380 | ||
381 | if (!ignore_fsmonitor) | |
382 | refresh_fsmonitor(istate); | |
383 | /* | |
384 | * If it's marked as always valid in the index, it's | |
385 | * valid whatever the checked-out copy says. | |
386 | * | |
387 | * skip-worktree has the same effect with higher precedence | |
388 | */ | |
389 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) | |
390 | return 0; | |
391 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) | |
392 | return 0; | |
393 | if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) | |
394 | return 0; | |
395 | ||
396 | /* | |
397 | * Intent-to-add entries have not been added, so the index entry | |
398 | * by definition never matches what is in the work tree until it | |
399 | * actually gets added. | |
400 | */ | |
401 | if (ce_intent_to_add(ce)) | |
402 | return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; | |
403 | ||
404 | changed = ce_match_stat_basic(ce, st); | |
405 | ||
406 | /* | |
407 | * Within 1 second of this sequence: | |
408 | * echo xyzzy >file && git-update-index --add file | |
409 | * running this command: | |
410 | * echo frotz >file | |
411 | * would give a falsely clean cache entry. The mtime and | |
412 | * length match the cache, and other stat fields do not change. | |
413 | * | |
414 | * We could detect this at update-index time (the cache entry | |
415 | * being registered/updated records the same time as "now") | |
416 | * and delay the return from git-update-index, but that would | |
417 | * effectively mean we can make at most one commit per second, | |
418 | * which is not acceptable. Instead, we check cache entries | |
419 | * whose mtime are the same as the index file timestamp more | |
420 | * carefully than others. | |
421 | */ | |
422 | if (!changed && is_racy_timestamp(istate, ce)) { | |
423 | if (assume_racy_is_modified) | |
424 | changed |= DATA_CHANGED; | |
425 | else | |
426 | changed |= ce_modified_check_fs(istate, ce, st); | |
427 | } | |
428 | ||
429 | return changed; | |
430 | } | |
431 | ||
432 | int ie_modified(struct index_state *istate, | |
433 | const struct cache_entry *ce, | |
434 | struct stat *st, unsigned int options) | |
435 | { | |
436 | int changed, changed_fs; | |
437 | ||
438 | changed = ie_match_stat(istate, ce, st, options); | |
439 | if (!changed) | |
440 | return 0; | |
441 | /* | |
442 | * If the mode or type has changed, there's no point in trying | |
443 | * to refresh the entry - it's not going to match | |
444 | */ | |
445 | if (changed & (MODE_CHANGED | TYPE_CHANGED)) | |
446 | return changed; | |
447 | ||
448 | /* | |
449 | * Immediately after read-tree or update-index --cacheinfo, | |
450 | * the length field is zero, as we have never even read the | |
451 | * lstat(2) information once, and we cannot trust DATA_CHANGED | |
452 | * returned by ie_match_stat() which in turn was returned by | |
453 | * ce_match_stat_basic() to signal that the filesize of the | |
454 | * blob changed. We have to actually go to the filesystem to | |
455 | * see if the contents match, and if so, should answer "unchanged". | |
456 | * | |
457 | * The logic does not apply to gitlinks, as ce_match_stat_basic() | |
458 | * already has checked the actual HEAD from the filesystem in the | |
459 | * subproject. If ie_match_stat() already said it is different, | |
460 | * then we know it is. | |
461 | */ | |
462 | if ((changed & DATA_CHANGED) && | |
463 | (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0)) | |
464 | return changed; | |
465 | ||
466 | changed_fs = ce_modified_check_fs(istate, ce, st); | |
467 | if (changed_fs) | |
468 | return changed | changed_fs; | |
469 | return 0; | |
470 | } | |
471 | ||
472 | int base_name_compare(const char *name1, int len1, int mode1, | |
473 | const char *name2, int len2, int mode2) | |
474 | { | |
475 | unsigned char c1, c2; | |
476 | int len = len1 < len2 ? len1 : len2; | |
477 | int cmp; | |
478 | ||
479 | cmp = memcmp(name1, name2, len); | |
480 | if (cmp) | |
481 | return cmp; | |
482 | c1 = name1[len]; | |
483 | c2 = name2[len]; | |
484 | if (!c1 && S_ISDIR(mode1)) | |
485 | c1 = '/'; | |
486 | if (!c2 && S_ISDIR(mode2)) | |
487 | c2 = '/'; | |
488 | return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; | |
489 | } | |
490 | ||
491 | /* | |
492 | * df_name_compare() is identical to base_name_compare(), except it | |
493 | * compares conflicting directory/file entries as equal. Note that | |
494 | * while a directory name compares as equal to a regular file, they | |
495 | * then individually compare _differently_ to a filename that has | |
496 | * a dot after the basename (because '\0' < '.' < '/'). | |
497 | * | |
498 | * This is used by routines that want to traverse the git namespace | |
499 | * but then handle conflicting entries together when possible. | |
500 | */ | |
501 | int df_name_compare(const char *name1, int len1, int mode1, | |
502 | const char *name2, int len2, int mode2) | |
503 | { | |
504 | int len = len1 < len2 ? len1 : len2, cmp; | |
505 | unsigned char c1, c2; | |
506 | ||
507 | cmp = memcmp(name1, name2, len); | |
508 | if (cmp) | |
509 | return cmp; | |
510 | /* Directories and files compare equal (same length, same name) */ | |
511 | if (len1 == len2) | |
512 | return 0; | |
513 | c1 = name1[len]; | |
514 | if (!c1 && S_ISDIR(mode1)) | |
515 | c1 = '/'; | |
516 | c2 = name2[len]; | |
517 | if (!c2 && S_ISDIR(mode2)) | |
518 | c2 = '/'; | |
519 | if (c1 == '/' && !c2) | |
520 | return 0; | |
521 | if (c2 == '/' && !c1) | |
522 | return 0; | |
523 | return c1 - c2; | |
524 | } | |
525 | ||
526 | int name_compare(const char *name1, size_t len1, const char *name2, size_t len2) | |
527 | { | |
528 | size_t min_len = (len1 < len2) ? len1 : len2; | |
529 | int cmp = memcmp(name1, name2, min_len); | |
530 | if (cmp) | |
531 | return cmp; | |
532 | if (len1 < len2) | |
533 | return -1; | |
534 | if (len1 > len2) | |
535 | return 1; | |
536 | return 0; | |
537 | } | |
538 | ||
539 | int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2) | |
540 | { | |
541 | int cmp; | |
542 | ||
543 | cmp = name_compare(name1, len1, name2, len2); | |
544 | if (cmp) | |
545 | return cmp; | |
546 | ||
547 | if (stage1 < stage2) | |
548 | return -1; | |
549 | if (stage1 > stage2) | |
550 | return 1; | |
551 | return 0; | |
552 | } | |
553 | ||
554 | static int index_name_stage_pos(struct index_state *istate, const char *name, int namelen, int stage) | |
555 | { | |
556 | int first, last; | |
557 | ||
558 | first = 0; | |
559 | last = istate->cache_nr; | |
560 | while (last > first) { | |
561 | int next = first + ((last - first) >> 1); | |
562 | struct cache_entry *ce = istate->cache[next]; | |
563 | int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce)); | |
564 | if (!cmp) | |
565 | return next; | |
566 | if (cmp < 0) { | |
567 | last = next; | |
568 | continue; | |
569 | } | |
570 | first = next+1; | |
571 | } | |
572 | ||
573 | if (istate->sparse_index && | |
574 | first > 0) { | |
575 | /* Note: first <= istate->cache_nr */ | |
576 | struct cache_entry *ce = istate->cache[first - 1]; | |
577 | ||
578 | /* | |
579 | * If we are in a sparse-index _and_ the entry before the | |
580 | * insertion position is a sparse-directory entry that is | |
581 | * an ancestor of 'name', then we need to expand the index | |
582 | * and search again. This will only trigger once, because | |
583 | * thereafter the index is fully expanded. | |
584 | */ | |
585 | if (S_ISSPARSEDIR(ce->ce_mode) && | |
586 | ce_namelen(ce) < namelen && | |
587 | !strncmp(name, ce->name, ce_namelen(ce))) { | |
588 | ensure_full_index(istate); | |
589 | return index_name_stage_pos(istate, name, namelen, stage); | |
590 | } | |
591 | } | |
592 | ||
593 | return -first-1; | |
594 | } | |
595 | ||
596 | int index_name_pos(struct index_state *istate, const char *name, int namelen) | |
597 | { | |
598 | return index_name_stage_pos(istate, name, namelen, 0); | |
599 | } | |
600 | ||
601 | int remove_index_entry_at(struct index_state *istate, int pos) | |
602 | { | |
603 | struct cache_entry *ce = istate->cache[pos]; | |
604 | ||
605 | record_resolve_undo(istate, ce); | |
606 | remove_name_hash(istate, ce); | |
607 | save_or_free_index_entry(istate, ce); | |
608 | istate->cache_changed |= CE_ENTRY_REMOVED; | |
609 | istate->cache_nr--; | |
610 | if (pos >= istate->cache_nr) | |
611 | return 0; | |
612 | MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1, | |
613 | istate->cache_nr - pos); | |
614 | return 1; | |
615 | } | |
616 | ||
617 | /* | |
618 | * Remove all cache entries marked for removal, that is where | |
619 | * CE_REMOVE is set in ce_flags. This is much more effective than | |
620 | * calling remove_index_entry_at() for each entry to be removed. | |
621 | */ | |
622 | void remove_marked_cache_entries(struct index_state *istate, int invalidate) | |
623 | { | |
624 | struct cache_entry **ce_array = istate->cache; | |
625 | unsigned int i, j; | |
626 | ||
627 | for (i = j = 0; i < istate->cache_nr; i++) { | |
628 | if (ce_array[i]->ce_flags & CE_REMOVE) { | |
629 | if (invalidate) { | |
630 | cache_tree_invalidate_path(istate, | |
631 | ce_array[i]->name); | |
632 | untracked_cache_remove_from_index(istate, | |
633 | ce_array[i]->name); | |
634 | } | |
635 | remove_name_hash(istate, ce_array[i]); | |
636 | save_or_free_index_entry(istate, ce_array[i]); | |
637 | } | |
638 | else | |
639 | ce_array[j++] = ce_array[i]; | |
640 | } | |
641 | if (j == istate->cache_nr) | |
642 | return; | |
643 | istate->cache_changed |= CE_ENTRY_REMOVED; | |
644 | istate->cache_nr = j; | |
645 | } | |
646 | ||
647 | int remove_file_from_index(struct index_state *istate, const char *path) | |
648 | { | |
649 | int pos = index_name_pos(istate, path, strlen(path)); | |
650 | if (pos < 0) | |
651 | pos = -pos-1; | |
652 | cache_tree_invalidate_path(istate, path); | |
653 | untracked_cache_remove_from_index(istate, path); | |
654 | while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) | |
655 | remove_index_entry_at(istate, pos); | |
656 | return 0; | |
657 | } | |
658 | ||
659 | static int compare_name(struct cache_entry *ce, const char *path, int namelen) | |
660 | { | |
661 | return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); | |
662 | } | |
663 | ||
664 | static int index_name_pos_also_unmerged(struct index_state *istate, | |
665 | const char *path, int namelen) | |
666 | { | |
667 | int pos = index_name_pos(istate, path, namelen); | |
668 | struct cache_entry *ce; | |
669 | ||
670 | if (pos >= 0) | |
671 | return pos; | |
672 | ||
673 | /* maybe unmerged? */ | |
674 | pos = -1 - pos; | |
675 | if (pos >= istate->cache_nr || | |
676 | compare_name((ce = istate->cache[pos]), path, namelen)) | |
677 | return -1; | |
678 | ||
679 | /* order of preference: stage 2, 1, 3 */ | |
680 | if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr && | |
681 | ce_stage((ce = istate->cache[pos + 1])) == 2 && | |
682 | !compare_name(ce, path, namelen)) | |
683 | pos++; | |
684 | return pos; | |
685 | } | |
686 | ||
687 | static int different_name(struct cache_entry *ce, struct cache_entry *alias) | |
688 | { | |
689 | int len = ce_namelen(ce); | |
690 | return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len); | |
691 | } | |
692 | ||
693 | /* | |
694 | * If we add a filename that aliases in the cache, we will use the | |
695 | * name that we already have - but we don't want to update the same | |
696 | * alias twice, because that implies that there were actually two | |
697 | * different files with aliasing names! | |
698 | * | |
699 | * So we use the CE_ADDED flag to verify that the alias was an old | |
700 | * one before we accept it as | |
701 | */ | |
702 | static struct cache_entry *create_alias_ce(struct index_state *istate, | |
703 | struct cache_entry *ce, | |
704 | struct cache_entry *alias) | |
705 | { | |
706 | int len; | |
707 | struct cache_entry *new_entry; | |
708 | ||
709 | if (alias->ce_flags & CE_ADDED) | |
710 | die(_("will not add file alias '%s' ('%s' already exists in index)"), | |
711 | ce->name, alias->name); | |
712 | ||
713 | /* Ok, create the new entry using the name of the existing alias */ | |
714 | len = ce_namelen(alias); | |
715 | new_entry = make_empty_cache_entry(istate, len); | |
716 | memcpy(new_entry->name, alias->name, len); | |
717 | copy_cache_entry(new_entry, ce); | |
718 | save_or_free_index_entry(istate, ce); | |
719 | return new_entry; | |
720 | } | |
721 | ||
722 | void set_object_name_for_intent_to_add_entry(struct cache_entry *ce) | |
723 | { | |
724 | struct object_id oid; | |
725 | if (write_object_file("", 0, blob_type, &oid)) | |
726 | die(_("cannot create an empty blob in the object database")); | |
727 | oidcpy(&ce->oid, &oid); | |
728 | } | |
729 | ||
730 | int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags) | |
731 | { | |
732 | int namelen, was_same; | |
733 | mode_t st_mode = st->st_mode; | |
734 | struct cache_entry *ce, *alias = NULL; | |
735 | unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; | |
736 | int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); | |
737 | int pretend = flags & ADD_CACHE_PRETEND; | |
738 | int intent_only = flags & ADD_CACHE_INTENT; | |
739 | int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| | |
740 | (intent_only ? ADD_CACHE_NEW_ONLY : 0)); | |
741 | int hash_flags = HASH_WRITE_OBJECT; | |
742 | struct object_id oid; | |
743 | ||
744 | if (flags & ADD_CACHE_RENORMALIZE) | |
745 | hash_flags |= HASH_RENORMALIZE; | |
746 | ||
747 | if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) | |
748 | return error(_("%s: can only add regular files, symbolic links or git-directories"), path); | |
749 | ||
750 | namelen = strlen(path); | |
751 | if (S_ISDIR(st_mode)) { | |
752 | if (resolve_gitlink_ref(path, "HEAD", &oid) < 0) | |
753 | return error(_("'%s' does not have a commit checked out"), path); | |
754 | while (namelen && path[namelen-1] == '/') | |
755 | namelen--; | |
756 | } | |
757 | ce = make_empty_cache_entry(istate, namelen); | |
758 | memcpy(ce->name, path, namelen); | |
759 | ce->ce_namelen = namelen; | |
760 | if (!intent_only) | |
761 | fill_stat_cache_info(istate, ce, st); | |
762 | else | |
763 | ce->ce_flags |= CE_INTENT_TO_ADD; | |
764 | ||
765 | ||
766 | if (trust_executable_bit && has_symlinks) { | |
767 | ce->ce_mode = create_ce_mode(st_mode); | |
768 | } else { | |
769 | /* If there is an existing entry, pick the mode bits and type | |
770 | * from it, otherwise assume unexecutable regular file. | |
771 | */ | |
772 | struct cache_entry *ent; | |
773 | int pos = index_name_pos_also_unmerged(istate, path, namelen); | |
774 | ||
775 | ent = (0 <= pos) ? istate->cache[pos] : NULL; | |
776 | ce->ce_mode = ce_mode_from_stat(ent, st_mode); | |
777 | } | |
778 | ||
779 | /* When core.ignorecase=true, determine if a directory of the same name but differing | |
780 | * case already exists within the Git repository. If it does, ensure the directory | |
781 | * case of the file being added to the repository matches (is folded into) the existing | |
782 | * entry's directory case. | |
783 | */ | |
784 | if (ignore_case) { | |
785 | adjust_dirname_case(istate, ce->name); | |
786 | } | |
787 | if (!(flags & ADD_CACHE_RENORMALIZE)) { | |
788 | alias = index_file_exists(istate, ce->name, | |
789 | ce_namelen(ce), ignore_case); | |
790 | if (alias && | |
791 | !ce_stage(alias) && | |
792 | !ie_match_stat(istate, alias, st, ce_option)) { | |
793 | /* Nothing changed, really */ | |
794 | if (!S_ISGITLINK(alias->ce_mode)) | |
795 | ce_mark_uptodate(alias); | |
796 | alias->ce_flags |= CE_ADDED; | |
797 | ||
798 | discard_cache_entry(ce); | |
799 | return 0; | |
800 | } | |
801 | } | |
802 | if (!intent_only) { | |
803 | if (index_path(istate, &ce->oid, path, st, hash_flags)) { | |
804 | discard_cache_entry(ce); | |
805 | return error(_("unable to index file '%s'"), path); | |
806 | } | |
807 | } else | |
808 | set_object_name_for_intent_to_add_entry(ce); | |
809 | ||
810 | if (ignore_case && alias && different_name(ce, alias)) | |
811 | ce = create_alias_ce(istate, ce, alias); | |
812 | ce->ce_flags |= CE_ADDED; | |
813 | ||
814 | /* It was suspected to be racily clean, but it turns out to be Ok */ | |
815 | was_same = (alias && | |
816 | !ce_stage(alias) && | |
817 | oideq(&alias->oid, &ce->oid) && | |
818 | ce->ce_mode == alias->ce_mode); | |
819 | ||
820 | if (pretend) | |
821 | discard_cache_entry(ce); | |
822 | else if (add_index_entry(istate, ce, add_option)) { | |
823 | discard_cache_entry(ce); | |
824 | return error(_("unable to add '%s' to index"), path); | |
825 | } | |
826 | if (verbose && !was_same) | |
827 | printf("add '%s'\n", path); | |
828 | return 0; | |
829 | } | |
830 | ||
831 | int add_file_to_index(struct index_state *istate, const char *path, int flags) | |
832 | { | |
833 | struct stat st; | |
834 | if (lstat(path, &st)) | |
835 | die_errno(_("unable to stat '%s'"), path); | |
836 | return add_to_index(istate, path, &st, flags); | |
837 | } | |
838 | ||
839 | struct cache_entry *make_empty_cache_entry(struct index_state *istate, size_t len) | |
840 | { | |
841 | return mem_pool__ce_calloc(find_mem_pool(istate), len); | |
842 | } | |
843 | ||
844 | struct cache_entry *make_empty_transient_cache_entry(size_t len, | |
845 | struct mem_pool *ce_mem_pool) | |
846 | { | |
847 | if (ce_mem_pool) | |
848 | return mem_pool__ce_calloc(ce_mem_pool, len); | |
849 | return xcalloc(1, cache_entry_size(len)); | |
850 | } | |
851 | ||
852 | struct cache_entry *make_cache_entry(struct index_state *istate, | |
853 | unsigned int mode, | |
854 | const struct object_id *oid, | |
855 | const char *path, | |
856 | int stage, | |
857 | unsigned int refresh_options) | |
858 | { | |
859 | struct cache_entry *ce, *ret; | |
860 | int len; | |
861 | ||
862 | if (!verify_path(path, mode)) { | |
863 | error(_("invalid path '%s'"), path); | |
864 | return NULL; | |
865 | } | |
866 | ||
867 | len = strlen(path); | |
868 | ce = make_empty_cache_entry(istate, len); | |
869 | ||
870 | oidcpy(&ce->oid, oid); | |
871 | memcpy(ce->name, path, len); | |
872 | ce->ce_flags = create_ce_flags(stage); | |
873 | ce->ce_namelen = len; | |
874 | ce->ce_mode = create_ce_mode(mode); | |
875 | ||
876 | ret = refresh_cache_entry(istate, ce, refresh_options); | |
877 | if (ret != ce) | |
878 | discard_cache_entry(ce); | |
879 | return ret; | |
880 | } | |
881 | ||
882 | struct cache_entry *make_transient_cache_entry(unsigned int mode, | |
883 | const struct object_id *oid, | |
884 | const char *path, | |
885 | int stage, | |
886 | struct mem_pool *ce_mem_pool) | |
887 | { | |
888 | struct cache_entry *ce; | |
889 | int len; | |
890 | ||
891 | if (!verify_path(path, mode)) { | |
892 | error(_("invalid path '%s'"), path); | |
893 | return NULL; | |
894 | } | |
895 | ||
896 | len = strlen(path); | |
897 | ce = make_empty_transient_cache_entry(len, ce_mem_pool); | |
898 | ||
899 | oidcpy(&ce->oid, oid); | |
900 | memcpy(ce->name, path, len); | |
901 | ce->ce_flags = create_ce_flags(stage); | |
902 | ce->ce_namelen = len; | |
903 | ce->ce_mode = create_ce_mode(mode); | |
904 | ||
905 | return ce; | |
906 | } | |
907 | ||
908 | /* | |
909 | * Chmod an index entry with either +x or -x. | |
910 | * | |
911 | * Returns -1 if the chmod for the particular cache entry failed (if it's | |
912 | * not a regular file), -2 if an invalid flip argument is passed in, 0 | |
913 | * otherwise. | |
914 | */ | |
915 | int chmod_index_entry(struct index_state *istate, struct cache_entry *ce, | |
916 | char flip) | |
917 | { | |
918 | if (!S_ISREG(ce->ce_mode)) | |
919 | return -1; | |
920 | switch (flip) { | |
921 | case '+': | |
922 | ce->ce_mode |= 0111; | |
923 | break; | |
924 | case '-': | |
925 | ce->ce_mode &= ~0111; | |
926 | break; | |
927 | default: | |
928 | return -2; | |
929 | } | |
930 | cache_tree_invalidate_path(istate, ce->name); | |
931 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
932 | mark_fsmonitor_invalid(istate, ce); | |
933 | istate->cache_changed |= CE_ENTRY_CHANGED; | |
934 | ||
935 | return 0; | |
936 | } | |
937 | ||
938 | int ce_same_name(const struct cache_entry *a, const struct cache_entry *b) | |
939 | { | |
940 | int len = ce_namelen(a); | |
941 | return ce_namelen(b) == len && !memcmp(a->name, b->name, len); | |
942 | } | |
943 | ||
944 | /* | |
945 | * We fundamentally don't like some paths: we don't want | |
946 | * dot or dot-dot anywhere, and for obvious reasons don't | |
947 | * want to recurse into ".git" either. | |
948 | * | |
949 | * Also, we don't want double slashes or slashes at the | |
950 | * end that can make pathnames ambiguous. | |
951 | */ | |
952 | static int verify_dotfile(const char *rest, unsigned mode) | |
953 | { | |
954 | /* | |
955 | * The first character was '.', but that | |
956 | * has already been discarded, we now test | |
957 | * the rest. | |
958 | */ | |
959 | ||
960 | /* "." is not allowed */ | |
961 | if (*rest == '\0' || is_dir_sep(*rest)) | |
962 | return 0; | |
963 | ||
964 | switch (*rest) { | |
965 | /* | |
966 | * ".git" followed by NUL or slash is bad. Note that we match | |
967 | * case-insensitively here, even if ignore_case is not set. | |
968 | * This outlaws ".GIT" everywhere out of an abundance of caution, | |
969 | * since there's really no good reason to allow it. | |
970 | * | |
971 | * Once we've seen ".git", we can also find ".gitmodules", etc (also | |
972 | * case-insensitively). | |
973 | */ | |
974 | case 'g': | |
975 | case 'G': | |
976 | if (rest[1] != 'i' && rest[1] != 'I') | |
977 | break; | |
978 | if (rest[2] != 't' && rest[2] != 'T') | |
979 | break; | |
980 | if (rest[3] == '\0' || is_dir_sep(rest[3])) | |
981 | return 0; | |
982 | if (S_ISLNK(mode)) { | |
983 | rest += 3; | |
984 | if (skip_iprefix(rest, "modules", &rest) && | |
985 | (*rest == '\0' || is_dir_sep(*rest))) | |
986 | return 0; | |
987 | } | |
988 | break; | |
989 | case '.': | |
990 | if (rest[1] == '\0' || is_dir_sep(rest[1])) | |
991 | return 0; | |
992 | } | |
993 | return 1; | |
994 | } | |
995 | ||
996 | int verify_path(const char *path, unsigned mode) | |
997 | { | |
998 | char c = 0; | |
999 | ||
1000 | if (has_dos_drive_prefix(path)) | |
1001 | return 0; | |
1002 | ||
1003 | if (!is_valid_path(path)) | |
1004 | return 0; | |
1005 | ||
1006 | goto inside; | |
1007 | for (;;) { | |
1008 | if (!c) | |
1009 | return 1; | |
1010 | if (is_dir_sep(c)) { | |
1011 | inside: | |
1012 | if (protect_hfs) { | |
1013 | ||
1014 | if (is_hfs_dotgit(path)) | |
1015 | return 0; | |
1016 | if (S_ISLNK(mode)) { | |
1017 | if (is_hfs_dotgitmodules(path)) | |
1018 | return 0; | |
1019 | } | |
1020 | } | |
1021 | if (protect_ntfs) { | |
1022 | #if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__ | |
1023 | if (c == '\\') | |
1024 | return 0; | |
1025 | #endif | |
1026 | if (is_ntfs_dotgit(path)) | |
1027 | return 0; | |
1028 | if (S_ISLNK(mode)) { | |
1029 | if (is_ntfs_dotgitmodules(path)) | |
1030 | return 0; | |
1031 | } | |
1032 | } | |
1033 | ||
1034 | c = *path++; | |
1035 | if ((c == '.' && !verify_dotfile(path, mode)) || | |
1036 | is_dir_sep(c)) | |
1037 | return 0; | |
1038 | /* | |
1039 | * allow terminating directory separators for | |
1040 | * sparse directory entries. | |
1041 | */ | |
1042 | if (c == '\0') | |
1043 | return S_ISDIR(mode); | |
1044 | } else if (c == '\\' && protect_ntfs) { | |
1045 | if (is_ntfs_dotgit(path)) | |
1046 | return 0; | |
1047 | if (S_ISLNK(mode)) { | |
1048 | if (is_ntfs_dotgitmodules(path)) | |
1049 | return 0; | |
1050 | } | |
1051 | } | |
1052 | ||
1053 | c = *path++; | |
1054 | } | |
1055 | } | |
1056 | ||
1057 | /* | |
1058 | * Do we have another file that has the beginning components being a | |
1059 | * proper superset of the name we're trying to add? | |
1060 | */ | |
1061 | static int has_file_name(struct index_state *istate, | |
1062 | const struct cache_entry *ce, int pos, int ok_to_replace) | |
1063 | { | |
1064 | int retval = 0; | |
1065 | int len = ce_namelen(ce); | |
1066 | int stage = ce_stage(ce); | |
1067 | const char *name = ce->name; | |
1068 | ||
1069 | while (pos < istate->cache_nr) { | |
1070 | struct cache_entry *p = istate->cache[pos++]; | |
1071 | ||
1072 | if (len >= ce_namelen(p)) | |
1073 | break; | |
1074 | if (memcmp(name, p->name, len)) | |
1075 | break; | |
1076 | if (ce_stage(p) != stage) | |
1077 | continue; | |
1078 | if (p->name[len] != '/') | |
1079 | continue; | |
1080 | if (p->ce_flags & CE_REMOVE) | |
1081 | continue; | |
1082 | retval = -1; | |
1083 | if (!ok_to_replace) | |
1084 | break; | |
1085 | remove_index_entry_at(istate, --pos); | |
1086 | } | |
1087 | return retval; | |
1088 | } | |
1089 | ||
1090 | ||
1091 | /* | |
1092 | * Like strcmp(), but also return the offset of the first change. | |
1093 | * If strings are equal, return the length. | |
1094 | */ | |
1095 | int strcmp_offset(const char *s1, const char *s2, size_t *first_change) | |
1096 | { | |
1097 | size_t k; | |
1098 | ||
1099 | if (!first_change) | |
1100 | return strcmp(s1, s2); | |
1101 | ||
1102 | for (k = 0; s1[k] == s2[k]; k++) | |
1103 | if (s1[k] == '\0') | |
1104 | break; | |
1105 | ||
1106 | *first_change = k; | |
1107 | return (unsigned char)s1[k] - (unsigned char)s2[k]; | |
1108 | } | |
1109 | ||
1110 | /* | |
1111 | * Do we have another file with a pathname that is a proper | |
1112 | * subset of the name we're trying to add? | |
1113 | * | |
1114 | * That is, is there another file in the index with a path | |
1115 | * that matches a sub-directory in the given entry? | |
1116 | */ | |
1117 | static int has_dir_name(struct index_state *istate, | |
1118 | const struct cache_entry *ce, int pos, int ok_to_replace) | |
1119 | { | |
1120 | int retval = 0; | |
1121 | int stage = ce_stage(ce); | |
1122 | const char *name = ce->name; | |
1123 | const char *slash = name + ce_namelen(ce); | |
1124 | size_t len_eq_last; | |
1125 | int cmp_last = 0; | |
1126 | ||
1127 | /* | |
1128 | * We are frequently called during an iteration on a sorted | |
1129 | * list of pathnames and while building a new index. Therefore, | |
1130 | * there is a high probability that this entry will eventually | |
1131 | * be appended to the index, rather than inserted in the middle. | |
1132 | * If we can confirm that, we can avoid binary searches on the | |
1133 | * components of the pathname. | |
1134 | * | |
1135 | * Compare the entry's full path with the last path in the index. | |
1136 | */ | |
1137 | if (istate->cache_nr > 0) { | |
1138 | cmp_last = strcmp_offset(name, | |
1139 | istate->cache[istate->cache_nr - 1]->name, | |
1140 | &len_eq_last); | |
1141 | if (cmp_last > 0) { | |
1142 | if (len_eq_last == 0) { | |
1143 | /* | |
1144 | * The entry sorts AFTER the last one in the | |
1145 | * index and their paths have no common prefix, | |
1146 | * so there cannot be a F/D conflict. | |
1147 | */ | |
1148 | return retval; | |
1149 | } else { | |
1150 | /* | |
1151 | * The entry sorts AFTER the last one in the | |
1152 | * index, but has a common prefix. Fall through | |
1153 | * to the loop below to disect the entry's path | |
1154 | * and see where the difference is. | |
1155 | */ | |
1156 | } | |
1157 | } else if (cmp_last == 0) { | |
1158 | /* | |
1159 | * The entry exactly matches the last one in the | |
1160 | * index, but because of multiple stage and CE_REMOVE | |
1161 | * items, we fall through and let the regular search | |
1162 | * code handle it. | |
1163 | */ | |
1164 | } | |
1165 | } | |
1166 | ||
1167 | for (;;) { | |
1168 | size_t len; | |
1169 | ||
1170 | for (;;) { | |
1171 | if (*--slash == '/') | |
1172 | break; | |
1173 | if (slash <= ce->name) | |
1174 | return retval; | |
1175 | } | |
1176 | len = slash - name; | |
1177 | ||
1178 | if (cmp_last > 0) { | |
1179 | /* | |
1180 | * (len + 1) is a directory boundary (including | |
1181 | * the trailing slash). And since the loop is | |
1182 | * decrementing "slash", the first iteration is | |
1183 | * the longest directory prefix; subsequent | |
1184 | * iterations consider parent directories. | |
1185 | */ | |
1186 | ||
1187 | if (len + 1 <= len_eq_last) { | |
1188 | /* | |
1189 | * The directory prefix (including the trailing | |
1190 | * slash) also appears as a prefix in the last | |
1191 | * entry, so the remainder cannot collide (because | |
1192 | * strcmp said the whole path was greater). | |
1193 | * | |
1194 | * EQ: last: xxx/A | |
1195 | * this: xxx/B | |
1196 | * | |
1197 | * LT: last: xxx/file_A | |
1198 | * this: xxx/file_B | |
1199 | */ | |
1200 | return retval; | |
1201 | } | |
1202 | ||
1203 | if (len > len_eq_last) { | |
1204 | /* | |
1205 | * This part of the directory prefix (excluding | |
1206 | * the trailing slash) is longer than the known | |
1207 | * equal portions, so this sub-directory cannot | |
1208 | * collide with a file. | |
1209 | * | |
1210 | * GT: last: xxxA | |
1211 | * this: xxxB/file | |
1212 | */ | |
1213 | return retval; | |
1214 | } | |
1215 | ||
1216 | /* | |
1217 | * This is a possible collision. Fall through and | |
1218 | * let the regular search code handle it. | |
1219 | * | |
1220 | * last: xxx | |
1221 | * this: xxx/file | |
1222 | */ | |
1223 | } | |
1224 | ||
1225 | pos = index_name_stage_pos(istate, name, len, stage); | |
1226 | if (pos >= 0) { | |
1227 | /* | |
1228 | * Found one, but not so fast. This could | |
1229 | * be a marker that says "I was here, but | |
1230 | * I am being removed". Such an entry is | |
1231 | * not a part of the resulting tree, and | |
1232 | * it is Ok to have a directory at the same | |
1233 | * path. | |
1234 | */ | |
1235 | if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) { | |
1236 | retval = -1; | |
1237 | if (!ok_to_replace) | |
1238 | break; | |
1239 | remove_index_entry_at(istate, pos); | |
1240 | continue; | |
1241 | } | |
1242 | } | |
1243 | else | |
1244 | pos = -pos-1; | |
1245 | ||
1246 | /* | |
1247 | * Trivial optimization: if we find an entry that | |
1248 | * already matches the sub-directory, then we know | |
1249 | * we're ok, and we can exit. | |
1250 | */ | |
1251 | while (pos < istate->cache_nr) { | |
1252 | struct cache_entry *p = istate->cache[pos]; | |
1253 | if ((ce_namelen(p) <= len) || | |
1254 | (p->name[len] != '/') || | |
1255 | memcmp(p->name, name, len)) | |
1256 | break; /* not our subdirectory */ | |
1257 | if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) | |
1258 | /* | |
1259 | * p is at the same stage as our entry, and | |
1260 | * is a subdirectory of what we are looking | |
1261 | * at, so we cannot have conflicts at our | |
1262 | * level or anything shorter. | |
1263 | */ | |
1264 | return retval; | |
1265 | pos++; | |
1266 | } | |
1267 | } | |
1268 | return retval; | |
1269 | } | |
1270 | ||
1271 | /* We may be in a situation where we already have path/file and path | |
1272 | * is being added, or we already have path and path/file is being | |
1273 | * added. Either one would result in a nonsense tree that has path | |
1274 | * twice when git-write-tree tries to write it out. Prevent it. | |
1275 | * | |
1276 | * If ok-to-replace is specified, we remove the conflicting entries | |
1277 | * from the cache so the caller should recompute the insert position. | |
1278 | * When this happens, we return non-zero. | |
1279 | */ | |
1280 | static int check_file_directory_conflict(struct index_state *istate, | |
1281 | const struct cache_entry *ce, | |
1282 | int pos, int ok_to_replace) | |
1283 | { | |
1284 | int retval; | |
1285 | ||
1286 | /* | |
1287 | * When ce is an "I am going away" entry, we allow it to be added | |
1288 | */ | |
1289 | if (ce->ce_flags & CE_REMOVE) | |
1290 | return 0; | |
1291 | ||
1292 | /* | |
1293 | * We check if the path is a sub-path of a subsequent pathname | |
1294 | * first, since removing those will not change the position | |
1295 | * in the array. | |
1296 | */ | |
1297 | retval = has_file_name(istate, ce, pos, ok_to_replace); | |
1298 | ||
1299 | /* | |
1300 | * Then check if the path might have a clashing sub-directory | |
1301 | * before it. | |
1302 | */ | |
1303 | return retval + has_dir_name(istate, ce, pos, ok_to_replace); | |
1304 | } | |
1305 | ||
1306 | static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option) | |
1307 | { | |
1308 | int pos; | |
1309 | int ok_to_add = option & ADD_CACHE_OK_TO_ADD; | |
1310 | int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; | |
1311 | int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; | |
1312 | int new_only = option & ADD_CACHE_NEW_ONLY; | |
1313 | ||
1314 | if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) | |
1315 | cache_tree_invalidate_path(istate, ce->name); | |
1316 | ||
1317 | /* | |
1318 | * If this entry's path sorts after the last entry in the index, | |
1319 | * we can avoid searching for it. | |
1320 | */ | |
1321 | if (istate->cache_nr > 0 && | |
1322 | strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0) | |
1323 | pos = index_pos_to_insert_pos(istate->cache_nr); | |
1324 | else | |
1325 | pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); | |
1326 | ||
1327 | /* existing match? Just replace it. */ | |
1328 | if (pos >= 0) { | |
1329 | if (!new_only) | |
1330 | replace_index_entry(istate, pos, ce); | |
1331 | return 0; | |
1332 | } | |
1333 | pos = -pos-1; | |
1334 | ||
1335 | if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) | |
1336 | untracked_cache_add_to_index(istate, ce->name); | |
1337 | ||
1338 | /* | |
1339 | * Inserting a merged entry ("stage 0") into the index | |
1340 | * will always replace all non-merged entries.. | |
1341 | */ | |
1342 | if (pos < istate->cache_nr && ce_stage(ce) == 0) { | |
1343 | while (ce_same_name(istate->cache[pos], ce)) { | |
1344 | ok_to_add = 1; | |
1345 | if (!remove_index_entry_at(istate, pos)) | |
1346 | break; | |
1347 | } | |
1348 | } | |
1349 | ||
1350 | if (!ok_to_add) | |
1351 | return -1; | |
1352 | if (!verify_path(ce->name, ce->ce_mode)) | |
1353 | return error(_("invalid path '%s'"), ce->name); | |
1354 | ||
1355 | if (!skip_df_check && | |
1356 | check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { | |
1357 | if (!ok_to_replace) | |
1358 | return error(_("'%s' appears as both a file and as a directory"), | |
1359 | ce->name); | |
1360 | pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); | |
1361 | pos = -pos-1; | |
1362 | } | |
1363 | return pos + 1; | |
1364 | } | |
1365 | ||
1366 | int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option) | |
1367 | { | |
1368 | int pos; | |
1369 | ||
1370 | if (option & ADD_CACHE_JUST_APPEND) | |
1371 | pos = istate->cache_nr; | |
1372 | else { | |
1373 | int ret; | |
1374 | ret = add_index_entry_with_check(istate, ce, option); | |
1375 | if (ret <= 0) | |
1376 | return ret; | |
1377 | pos = ret - 1; | |
1378 | } | |
1379 | ||
1380 | /* Make sure the array is big enough .. */ | |
1381 | ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc); | |
1382 | ||
1383 | /* Add it in.. */ | |
1384 | istate->cache_nr++; | |
1385 | if (istate->cache_nr > pos + 1) | |
1386 | MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos, | |
1387 | istate->cache_nr - pos - 1); | |
1388 | set_index_entry(istate, pos, ce); | |
1389 | istate->cache_changed |= CE_ENTRY_ADDED; | |
1390 | return 0; | |
1391 | } | |
1392 | ||
1393 | /* | |
1394 | * "refresh" does not calculate a new sha1 file or bring the | |
1395 | * cache up-to-date for mode/content changes. But what it | |
1396 | * _does_ do is to "re-match" the stat information of a file | |
1397 | * with the cache, so that you can refresh the cache for a | |
1398 | * file that hasn't been changed but where the stat entry is | |
1399 | * out of date. | |
1400 | * | |
1401 | * For example, you'd want to do this after doing a "git-read-tree", | |
1402 | * to link up the stat cache details with the proper files. | |
1403 | */ | |
1404 | static struct cache_entry *refresh_cache_ent(struct index_state *istate, | |
1405 | struct cache_entry *ce, | |
1406 | unsigned int options, int *err, | |
1407 | int *changed_ret, | |
1408 | int *t2_did_lstat, | |
1409 | int *t2_did_scan) | |
1410 | { | |
1411 | struct stat st; | |
1412 | struct cache_entry *updated; | |
1413 | int changed; | |
1414 | int refresh = options & CE_MATCH_REFRESH; | |
1415 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; | |
1416 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; | |
1417 | int ignore_missing = options & CE_MATCH_IGNORE_MISSING; | |
1418 | int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR; | |
1419 | ||
1420 | if (!refresh || ce_uptodate(ce)) | |
1421 | return ce; | |
1422 | ||
1423 | if (!ignore_fsmonitor) | |
1424 | refresh_fsmonitor(istate); | |
1425 | /* | |
1426 | * CE_VALID or CE_SKIP_WORKTREE means the user promised us | |
1427 | * that the change to the work tree does not matter and told | |
1428 | * us not to worry. | |
1429 | */ | |
1430 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) { | |
1431 | ce_mark_uptodate(ce); | |
1432 | return ce; | |
1433 | } | |
1434 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) { | |
1435 | ce_mark_uptodate(ce); | |
1436 | return ce; | |
1437 | } | |
1438 | if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) { | |
1439 | ce_mark_uptodate(ce); | |
1440 | return ce; | |
1441 | } | |
1442 | ||
1443 | if (has_symlink_leading_path(ce->name, ce_namelen(ce))) { | |
1444 | if (ignore_missing) | |
1445 | return ce; | |
1446 | if (err) | |
1447 | *err = ENOENT; | |
1448 | return NULL; | |
1449 | } | |
1450 | ||
1451 | if (t2_did_lstat) | |
1452 | *t2_did_lstat = 1; | |
1453 | if (lstat(ce->name, &st) < 0) { | |
1454 | if (ignore_missing && errno == ENOENT) | |
1455 | return ce; | |
1456 | if (err) | |
1457 | *err = errno; | |
1458 | return NULL; | |
1459 | } | |
1460 | ||
1461 | changed = ie_match_stat(istate, ce, &st, options); | |
1462 | if (changed_ret) | |
1463 | *changed_ret = changed; | |
1464 | if (!changed) { | |
1465 | /* | |
1466 | * The path is unchanged. If we were told to ignore | |
1467 | * valid bit, then we did the actual stat check and | |
1468 | * found that the entry is unmodified. If the entry | |
1469 | * is not marked VALID, this is the place to mark it | |
1470 | * valid again, under "assume unchanged" mode. | |
1471 | */ | |
1472 | if (ignore_valid && assume_unchanged && | |
1473 | !(ce->ce_flags & CE_VALID)) | |
1474 | ; /* mark this one VALID again */ | |
1475 | else { | |
1476 | /* | |
1477 | * We do not mark the index itself "modified" | |
1478 | * because CE_UPTODATE flag is in-core only; | |
1479 | * we are not going to write this change out. | |
1480 | */ | |
1481 | if (!S_ISGITLINK(ce->ce_mode)) { | |
1482 | ce_mark_uptodate(ce); | |
1483 | mark_fsmonitor_valid(istate, ce); | |
1484 | } | |
1485 | return ce; | |
1486 | } | |
1487 | } | |
1488 | ||
1489 | if (t2_did_scan) | |
1490 | *t2_did_scan = 1; | |
1491 | if (ie_modified(istate, ce, &st, options)) { | |
1492 | if (err) | |
1493 | *err = EINVAL; | |
1494 | return NULL; | |
1495 | } | |
1496 | ||
1497 | updated = make_empty_cache_entry(istate, ce_namelen(ce)); | |
1498 | copy_cache_entry(updated, ce); | |
1499 | memcpy(updated->name, ce->name, ce->ce_namelen + 1); | |
1500 | fill_stat_cache_info(istate, updated, &st); | |
1501 | /* | |
1502 | * If ignore_valid is not set, we should leave CE_VALID bit | |
1503 | * alone. Otherwise, paths marked with --no-assume-unchanged | |
1504 | * (i.e. things to be edited) will reacquire CE_VALID bit | |
1505 | * automatically, which is not really what we want. | |
1506 | */ | |
1507 | if (!ignore_valid && assume_unchanged && | |
1508 | !(ce->ce_flags & CE_VALID)) | |
1509 | updated->ce_flags &= ~CE_VALID; | |
1510 | ||
1511 | /* istate->cache_changed is updated in the caller */ | |
1512 | return updated; | |
1513 | } | |
1514 | ||
1515 | static void show_file(const char * fmt, const char * name, int in_porcelain, | |
1516 | int * first, const char *header_msg) | |
1517 | { | |
1518 | if (in_porcelain && *first && header_msg) { | |
1519 | printf("%s\n", header_msg); | |
1520 | *first = 0; | |
1521 | } | |
1522 | printf(fmt, name); | |
1523 | } | |
1524 | ||
1525 | int repo_refresh_and_write_index(struct repository *repo, | |
1526 | unsigned int refresh_flags, | |
1527 | unsigned int write_flags, | |
1528 | int gentle, | |
1529 | const struct pathspec *pathspec, | |
1530 | char *seen, const char *header_msg) | |
1531 | { | |
1532 | struct lock_file lock_file = LOCK_INIT; | |
1533 | int fd, ret = 0; | |
1534 | ||
1535 | fd = repo_hold_locked_index(repo, &lock_file, 0); | |
1536 | if (!gentle && fd < 0) | |
1537 | return -1; | |
1538 | if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg)) | |
1539 | ret = 1; | |
1540 | if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags)) | |
1541 | ret = -1; | |
1542 | return ret; | |
1543 | } | |
1544 | ||
1545 | ||
1546 | int refresh_index(struct index_state *istate, unsigned int flags, | |
1547 | const struct pathspec *pathspec, | |
1548 | char *seen, const char *header_msg) | |
1549 | { | |
1550 | int i; | |
1551 | int has_errors = 0; | |
1552 | int really = (flags & REFRESH_REALLY) != 0; | |
1553 | int allow_unmerged = (flags & REFRESH_UNMERGED) != 0; | |
1554 | int quiet = (flags & REFRESH_QUIET) != 0; | |
1555 | int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; | |
1556 | int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0; | |
1557 | int ignore_skip_worktree = (flags & REFRESH_IGNORE_SKIP_WORKTREE) != 0; | |
1558 | int first = 1; | |
1559 | int in_porcelain = (flags & REFRESH_IN_PORCELAIN); | |
1560 | unsigned int options = (CE_MATCH_REFRESH | | |
1561 | (really ? CE_MATCH_IGNORE_VALID : 0) | | |
1562 | (not_new ? CE_MATCH_IGNORE_MISSING : 0)); | |
1563 | const char *modified_fmt; | |
1564 | const char *deleted_fmt; | |
1565 | const char *typechange_fmt; | |
1566 | const char *added_fmt; | |
1567 | const char *unmerged_fmt; | |
1568 | struct progress *progress = NULL; | |
1569 | int t2_sum_lstat = 0; | |
1570 | int t2_sum_scan = 0; | |
1571 | ||
1572 | if (flags & REFRESH_PROGRESS && isatty(2)) | |
1573 | progress = start_delayed_progress(_("Refresh index"), | |
1574 | istate->cache_nr); | |
1575 | ||
1576 | trace_performance_enter(); | |
1577 | modified_fmt = in_porcelain ? "M\t%s\n" : "%s: needs update\n"; | |
1578 | deleted_fmt = in_porcelain ? "D\t%s\n" : "%s: needs update\n"; | |
1579 | typechange_fmt = in_porcelain ? "T\t%s\n" : "%s: needs update\n"; | |
1580 | added_fmt = in_porcelain ? "A\t%s\n" : "%s: needs update\n"; | |
1581 | unmerged_fmt = in_porcelain ? "U\t%s\n" : "%s: needs merge\n"; | |
1582 | /* | |
1583 | * Use the multi-threaded preload_index() to refresh most of the | |
1584 | * cache entries quickly then in the single threaded loop below, | |
1585 | * we only have to do the special cases that are left. | |
1586 | */ | |
1587 | preload_index(istate, pathspec, 0); | |
1588 | trace2_region_enter("index", "refresh", NULL); | |
1589 | ||
1590 | for (i = 0; i < istate->cache_nr; i++) { | |
1591 | struct cache_entry *ce, *new_entry; | |
1592 | int cache_errno = 0; | |
1593 | int changed = 0; | |
1594 | int filtered = 0; | |
1595 | int t2_did_lstat = 0; | |
1596 | int t2_did_scan = 0; | |
1597 | ||
1598 | ce = istate->cache[i]; | |
1599 | if (ignore_submodules && S_ISGITLINK(ce->ce_mode)) | |
1600 | continue; | |
1601 | if (ignore_skip_worktree && ce_skip_worktree(ce)) | |
1602 | continue; | |
1603 | ||
1604 | /* | |
1605 | * If this entry is a sparse directory, then there isn't | |
1606 | * any stat() information to update. Ignore the entry. | |
1607 | */ | |
1608 | if (S_ISSPARSEDIR(ce->ce_mode)) | |
1609 | continue; | |
1610 | ||
1611 | if (pathspec && !ce_path_match(istate, ce, pathspec, seen)) | |
1612 | filtered = 1; | |
1613 | ||
1614 | if (ce_stage(ce)) { | |
1615 | while ((i < istate->cache_nr) && | |
1616 | ! strcmp(istate->cache[i]->name, ce->name)) | |
1617 | i++; | |
1618 | i--; | |
1619 | if (allow_unmerged) | |
1620 | continue; | |
1621 | if (!filtered) | |
1622 | show_file(unmerged_fmt, ce->name, in_porcelain, | |
1623 | &first, header_msg); | |
1624 | has_errors = 1; | |
1625 | continue; | |
1626 | } | |
1627 | ||
1628 | if (filtered) | |
1629 | continue; | |
1630 | ||
1631 | new_entry = refresh_cache_ent(istate, ce, options, | |
1632 | &cache_errno, &changed, | |
1633 | &t2_did_lstat, &t2_did_scan); | |
1634 | t2_sum_lstat += t2_did_lstat; | |
1635 | t2_sum_scan += t2_did_scan; | |
1636 | if (new_entry == ce) | |
1637 | continue; | |
1638 | display_progress(progress, i); | |
1639 | if (!new_entry) { | |
1640 | const char *fmt; | |
1641 | ||
1642 | if (really && cache_errno == EINVAL) { | |
1643 | /* If we are doing --really-refresh that | |
1644 | * means the index is not valid anymore. | |
1645 | */ | |
1646 | ce->ce_flags &= ~CE_VALID; | |
1647 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
1648 | mark_fsmonitor_invalid(istate, ce); | |
1649 | istate->cache_changed |= CE_ENTRY_CHANGED; | |
1650 | } | |
1651 | if (quiet) | |
1652 | continue; | |
1653 | ||
1654 | if (cache_errno == ENOENT) | |
1655 | fmt = deleted_fmt; | |
1656 | else if (ce_intent_to_add(ce)) | |
1657 | fmt = added_fmt; /* must be before other checks */ | |
1658 | else if (changed & TYPE_CHANGED) | |
1659 | fmt = typechange_fmt; | |
1660 | else | |
1661 | fmt = modified_fmt; | |
1662 | show_file(fmt, | |
1663 | ce->name, in_porcelain, &first, header_msg); | |
1664 | has_errors = 1; | |
1665 | continue; | |
1666 | } | |
1667 | ||
1668 | replace_index_entry(istate, i, new_entry); | |
1669 | } | |
1670 | trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat); | |
1671 | trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan); | |
1672 | trace2_region_leave("index", "refresh", NULL); | |
1673 | display_progress(progress, istate->cache_nr); | |
1674 | stop_progress(&progress); | |
1675 | trace_performance_leave("refresh index"); | |
1676 | return has_errors; | |
1677 | } | |
1678 | ||
1679 | struct cache_entry *refresh_cache_entry(struct index_state *istate, | |
1680 | struct cache_entry *ce, | |
1681 | unsigned int options) | |
1682 | { | |
1683 | return refresh_cache_ent(istate, ce, options, NULL, NULL, NULL, NULL); | |
1684 | } | |
1685 | ||
1686 | ||
1687 | /***************************************************************** | |
1688 | * Index File I/O | |
1689 | *****************************************************************/ | |
1690 | ||
1691 | #define INDEX_FORMAT_DEFAULT 3 | |
1692 | ||
1693 | static unsigned int get_index_format_default(struct repository *r) | |
1694 | { | |
1695 | char *envversion = getenv("GIT_INDEX_VERSION"); | |
1696 | char *endp; | |
1697 | unsigned int version = INDEX_FORMAT_DEFAULT; | |
1698 | ||
1699 | if (!envversion) { | |
1700 | prepare_repo_settings(r); | |
1701 | ||
1702 | if (r->settings.index_version >= 0) | |
1703 | version = r->settings.index_version; | |
1704 | if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { | |
1705 | warning(_("index.version set, but the value is invalid.\n" | |
1706 | "Using version %i"), INDEX_FORMAT_DEFAULT); | |
1707 | return INDEX_FORMAT_DEFAULT; | |
1708 | } | |
1709 | return version; | |
1710 | } | |
1711 | ||
1712 | version = strtoul(envversion, &endp, 10); | |
1713 | if (*endp || | |
1714 | version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { | |
1715 | warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n" | |
1716 | "Using version %i"), INDEX_FORMAT_DEFAULT); | |
1717 | version = INDEX_FORMAT_DEFAULT; | |
1718 | } | |
1719 | return version; | |
1720 | } | |
1721 | ||
1722 | /* | |
1723 | * dev/ino/uid/gid/size are also just tracked to the low 32 bits | |
1724 | * Again - this is just a (very strong in practice) heuristic that | |
1725 | * the inode hasn't changed. | |
1726 | * | |
1727 | * We save the fields in big-endian order to allow using the | |
1728 | * index file over NFS transparently. | |
1729 | */ | |
1730 | struct ondisk_cache_entry { | |
1731 | struct cache_time ctime; | |
1732 | struct cache_time mtime; | |
1733 | uint32_t dev; | |
1734 | uint32_t ino; | |
1735 | uint32_t mode; | |
1736 | uint32_t uid; | |
1737 | uint32_t gid; | |
1738 | uint32_t size; | |
1739 | /* | |
1740 | * unsigned char hash[hashsz]; | |
1741 | * uint16_t flags; | |
1742 | * if (flags & CE_EXTENDED) | |
1743 | * uint16_t flags2; | |
1744 | */ | |
1745 | unsigned char data[GIT_MAX_RAWSZ + 2 * sizeof(uint16_t)]; | |
1746 | char name[FLEX_ARRAY]; | |
1747 | }; | |
1748 | ||
1749 | /* These are only used for v3 or lower */ | |
1750 | #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len) | |
1751 | #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,data) + (len) + 8) & ~7) | |
1752 | #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len) | |
1753 | #define ondisk_data_size(flags, len) (the_hash_algo->rawsz + \ | |
1754 | ((flags & CE_EXTENDED) ? 2 : 1) * sizeof(uint16_t) + len) | |
1755 | #define ondisk_data_size_max(len) (ondisk_data_size(CE_EXTENDED, len)) | |
1756 | #define ondisk_ce_size(ce) (ondisk_cache_entry_size(ondisk_data_size((ce)->ce_flags, ce_namelen(ce)))) | |
1757 | ||
1758 | /* Allow fsck to force verification of the index checksum. */ | |
1759 | int verify_index_checksum; | |
1760 | ||
1761 | /* Allow fsck to force verification of the cache entry order. */ | |
1762 | int verify_ce_order; | |
1763 | ||
1764 | static int verify_hdr(const struct cache_header *hdr, unsigned long size) | |
1765 | { | |
1766 | git_hash_ctx c; | |
1767 | unsigned char hash[GIT_MAX_RAWSZ]; | |
1768 | int hdr_version; | |
1769 | ||
1770 | if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) | |
1771 | return error(_("bad signature 0x%08x"), hdr->hdr_signature); | |
1772 | hdr_version = ntohl(hdr->hdr_version); | |
1773 | if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) | |
1774 | return error(_("bad index version %d"), hdr_version); | |
1775 | ||
1776 | if (!verify_index_checksum) | |
1777 | return 0; | |
1778 | ||
1779 | the_hash_algo->init_fn(&c); | |
1780 | the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz); | |
1781 | the_hash_algo->final_fn(hash, &c); | |
1782 | if (!hasheq(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz)) | |
1783 | return error(_("bad index file sha1 signature")); | |
1784 | return 0; | |
1785 | } | |
1786 | ||
1787 | static int read_index_extension(struct index_state *istate, | |
1788 | const char *ext, const char *data, unsigned long sz) | |
1789 | { | |
1790 | switch (CACHE_EXT(ext)) { | |
1791 | case CACHE_EXT_TREE: | |
1792 | istate->cache_tree = cache_tree_read(data, sz); | |
1793 | break; | |
1794 | case CACHE_EXT_RESOLVE_UNDO: | |
1795 | istate->resolve_undo = resolve_undo_read(data, sz); | |
1796 | break; | |
1797 | case CACHE_EXT_LINK: | |
1798 | if (read_link_extension(istate, data, sz)) | |
1799 | return -1; | |
1800 | break; | |
1801 | case CACHE_EXT_UNTRACKED: | |
1802 | istate->untracked = read_untracked_extension(data, sz); | |
1803 | break; | |
1804 | case CACHE_EXT_FSMONITOR: | |
1805 | read_fsmonitor_extension(istate, data, sz); | |
1806 | break; | |
1807 | case CACHE_EXT_ENDOFINDEXENTRIES: | |
1808 | case CACHE_EXT_INDEXENTRYOFFSETTABLE: | |
1809 | /* already handled in do_read_index() */ | |
1810 | break; | |
1811 | case CACHE_EXT_SPARSE_DIRECTORIES: | |
1812 | /* no content, only an indicator */ | |
1813 | istate->sparse_index = 1; | |
1814 | break; | |
1815 | default: | |
1816 | if (*ext < 'A' || 'Z' < *ext) | |
1817 | return error(_("index uses %.4s extension, which we do not understand"), | |
1818 | ext); | |
1819 | fprintf_ln(stderr, _("ignoring %.4s extension"), ext); | |
1820 | break; | |
1821 | } | |
1822 | return 0; | |
1823 | } | |
1824 | ||
1825 | static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool, | |
1826 | unsigned int version, | |
1827 | struct ondisk_cache_entry *ondisk, | |
1828 | unsigned long *ent_size, | |
1829 | const struct cache_entry *previous_ce) | |
1830 | { | |
1831 | struct cache_entry *ce; | |
1832 | size_t len; | |
1833 | const char *name; | |
1834 | const unsigned hashsz = the_hash_algo->rawsz; | |
1835 | const uint16_t *flagsp = (const uint16_t *)(ondisk->data + hashsz); | |
1836 | unsigned int flags; | |
1837 | size_t copy_len = 0; | |
1838 | /* | |
1839 | * Adjacent cache entries tend to share the leading paths, so it makes | |
1840 | * sense to only store the differences in later entries. In the v4 | |
1841 | * on-disk format of the index, each on-disk cache entry stores the | |
1842 | * number of bytes to be stripped from the end of the previous name, | |
1843 | * and the bytes to append to the result, to come up with its name. | |
1844 | */ | |
1845 | int expand_name_field = version == 4; | |
1846 | ||
1847 | /* On-disk flags are just 16 bits */ | |
1848 | flags = get_be16(flagsp); | |
1849 | len = flags & CE_NAMEMASK; | |
1850 | ||
1851 | if (flags & CE_EXTENDED) { | |
1852 | int extended_flags; | |
1853 | extended_flags = get_be16(flagsp + 1) << 16; | |
1854 | /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */ | |
1855 | if (extended_flags & ~CE_EXTENDED_FLAGS) | |
1856 | die(_("unknown index entry format 0x%08x"), extended_flags); | |
1857 | flags |= extended_flags; | |
1858 | name = (const char *)(flagsp + 2); | |
1859 | } | |
1860 | else | |
1861 | name = (const char *)(flagsp + 1); | |
1862 | ||
1863 | if (expand_name_field) { | |
1864 | const unsigned char *cp = (const unsigned char *)name; | |
1865 | size_t strip_len, previous_len; | |
1866 | ||
1867 | /* If we're at the beginning of a block, ignore the previous name */ | |
1868 | strip_len = decode_varint(&cp); | |
1869 | if (previous_ce) { | |
1870 | previous_len = previous_ce->ce_namelen; | |
1871 | if (previous_len < strip_len) | |
1872 | die(_("malformed name field in the index, near path '%s'"), | |
1873 | previous_ce->name); | |
1874 | copy_len = previous_len - strip_len; | |
1875 | } | |
1876 | name = (const char *)cp; | |
1877 | } | |
1878 | ||
1879 | if (len == CE_NAMEMASK) { | |
1880 | len = strlen(name); | |
1881 | if (expand_name_field) | |
1882 | len += copy_len; | |
1883 | } | |
1884 | ||
1885 | ce = mem_pool__ce_alloc(ce_mem_pool, len); | |
1886 | ||
1887 | ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec); | |
1888 | ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec); | |
1889 | ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec); | |
1890 | ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec); | |
1891 | ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev); | |
1892 | ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino); | |
1893 | ce->ce_mode = get_be32(&ondisk->mode); | |
1894 | ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid); | |
1895 | ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid); | |
1896 | ce->ce_stat_data.sd_size = get_be32(&ondisk->size); | |
1897 | ce->ce_flags = flags & ~CE_NAMEMASK; | |
1898 | ce->ce_namelen = len; | |
1899 | ce->index = 0; | |
1900 | oidread(&ce->oid, ondisk->data); | |
1901 | memcpy(ce->name, name, len); | |
1902 | ce->name[len] = '\0'; | |
1903 | ||
1904 | if (expand_name_field) { | |
1905 | if (copy_len) | |
1906 | memcpy(ce->name, previous_ce->name, copy_len); | |
1907 | memcpy(ce->name + copy_len, name, len + 1 - copy_len); | |
1908 | *ent_size = (name - ((char *)ondisk)) + len + 1 - copy_len; | |
1909 | } else { | |
1910 | memcpy(ce->name, name, len + 1); | |
1911 | *ent_size = ondisk_ce_size(ce); | |
1912 | } | |
1913 | return ce; | |
1914 | } | |
1915 | ||
1916 | static void check_ce_order(struct index_state *istate) | |
1917 | { | |
1918 | unsigned int i; | |
1919 | ||
1920 | if (!verify_ce_order) | |
1921 | return; | |
1922 | ||
1923 | for (i = 1; i < istate->cache_nr; i++) { | |
1924 | struct cache_entry *ce = istate->cache[i - 1]; | |
1925 | struct cache_entry *next_ce = istate->cache[i]; | |
1926 | int name_compare = strcmp(ce->name, next_ce->name); | |
1927 | ||
1928 | if (0 < name_compare) | |
1929 | die(_("unordered stage entries in index")); | |
1930 | if (!name_compare) { | |
1931 | if (!ce_stage(ce)) | |
1932 | die(_("multiple stage entries for merged file '%s'"), | |
1933 | ce->name); | |
1934 | if (ce_stage(ce) > ce_stage(next_ce)) | |
1935 | die(_("unordered stage entries for '%s'"), | |
1936 | ce->name); | |
1937 | } | |
1938 | } | |
1939 | } | |
1940 | ||
1941 | static void tweak_untracked_cache(struct index_state *istate) | |
1942 | { | |
1943 | struct repository *r = the_repository; | |
1944 | ||
1945 | prepare_repo_settings(r); | |
1946 | ||
1947 | if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) { | |
1948 | remove_untracked_cache(istate); | |
1949 | return; | |
1950 | } | |
1951 | ||
1952 | if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) | |
1953 | add_untracked_cache(istate); | |
1954 | } | |
1955 | ||
1956 | static void tweak_split_index(struct index_state *istate) | |
1957 | { | |
1958 | switch (git_config_get_split_index()) { | |
1959 | case -1: /* unset: do nothing */ | |
1960 | break; | |
1961 | case 0: /* false */ | |
1962 | remove_split_index(istate); | |
1963 | break; | |
1964 | case 1: /* true */ | |
1965 | add_split_index(istate); | |
1966 | break; | |
1967 | default: /* unknown value: do nothing */ | |
1968 | break; | |
1969 | } | |
1970 | } | |
1971 | ||
1972 | static void post_read_index_from(struct index_state *istate) | |
1973 | { | |
1974 | check_ce_order(istate); | |
1975 | tweak_untracked_cache(istate); | |
1976 | tweak_split_index(istate); | |
1977 | tweak_fsmonitor(istate); | |
1978 | } | |
1979 | ||
1980 | static size_t estimate_cache_size_from_compressed(unsigned int entries) | |
1981 | { | |
1982 | return entries * (sizeof(struct cache_entry) + CACHE_ENTRY_PATH_LENGTH); | |
1983 | } | |
1984 | ||
1985 | static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) | |
1986 | { | |
1987 | long per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry); | |
1988 | ||
1989 | /* | |
1990 | * Account for potential alignment differences. | |
1991 | */ | |
1992 | per_entry += align_padding_size(per_entry, 0); | |
1993 | return ondisk_size + entries * per_entry; | |
1994 | } | |
1995 | ||
1996 | struct index_entry_offset | |
1997 | { | |
1998 | /* starting byte offset into index file, count of index entries in this block */ | |
1999 | int offset, nr; | |
2000 | }; | |
2001 | ||
2002 | struct index_entry_offset_table | |
2003 | { | |
2004 | int nr; | |
2005 | struct index_entry_offset entries[FLEX_ARRAY]; | |
2006 | }; | |
2007 | ||
2008 | static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset); | |
2009 | static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot); | |
2010 | ||
2011 | static size_t read_eoie_extension(const char *mmap, size_t mmap_size); | |
2012 | static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset); | |
2013 | ||
2014 | struct load_index_extensions | |
2015 | { | |
2016 | pthread_t pthread; | |
2017 | struct index_state *istate; | |
2018 | const char *mmap; | |
2019 | size_t mmap_size; | |
2020 | unsigned long src_offset; | |
2021 | }; | |
2022 | ||
2023 | static void *load_index_extensions(void *_data) | |
2024 | { | |
2025 | struct load_index_extensions *p = _data; | |
2026 | unsigned long src_offset = p->src_offset; | |
2027 | ||
2028 | while (src_offset <= p->mmap_size - the_hash_algo->rawsz - 8) { | |
2029 | /* After an array of active_nr index entries, | |
2030 | * there can be arbitrary number of extended | |
2031 | * sections, each of which is prefixed with | |
2032 | * extension name (4-byte) and section length | |
2033 | * in 4-byte network byte order. | |
2034 | */ | |
2035 | uint32_t extsize = get_be32(p->mmap + src_offset + 4); | |
2036 | if (read_index_extension(p->istate, | |
2037 | p->mmap + src_offset, | |
2038 | p->mmap + src_offset + 8, | |
2039 | extsize) < 0) { | |
2040 | munmap((void *)p->mmap, p->mmap_size); | |
2041 | die(_("index file corrupt")); | |
2042 | } | |
2043 | src_offset += 8; | |
2044 | src_offset += extsize; | |
2045 | } | |
2046 | ||
2047 | return NULL; | |
2048 | } | |
2049 | ||
2050 | /* | |
2051 | * A helper function that will load the specified range of cache entries | |
2052 | * from the memory mapped file and add them to the given index. | |
2053 | */ | |
2054 | static unsigned long load_cache_entry_block(struct index_state *istate, | |
2055 | struct mem_pool *ce_mem_pool, int offset, int nr, const char *mmap, | |
2056 | unsigned long start_offset, const struct cache_entry *previous_ce) | |
2057 | { | |
2058 | int i; | |
2059 | unsigned long src_offset = start_offset; | |
2060 | ||
2061 | for (i = offset; i < offset + nr; i++) { | |
2062 | struct ondisk_cache_entry *disk_ce; | |
2063 | struct cache_entry *ce; | |
2064 | unsigned long consumed; | |
2065 | ||
2066 | disk_ce = (struct ondisk_cache_entry *)(mmap + src_offset); | |
2067 | ce = create_from_disk(ce_mem_pool, istate->version, disk_ce, &consumed, previous_ce); | |
2068 | set_index_entry(istate, i, ce); | |
2069 | ||
2070 | src_offset += consumed; | |
2071 | previous_ce = ce; | |
2072 | } | |
2073 | return src_offset - start_offset; | |
2074 | } | |
2075 | ||
2076 | static unsigned long load_all_cache_entries(struct index_state *istate, | |
2077 | const char *mmap, size_t mmap_size, unsigned long src_offset) | |
2078 | { | |
2079 | unsigned long consumed; | |
2080 | ||
2081 | istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); | |
2082 | if (istate->version == 4) { | |
2083 | mem_pool_init(istate->ce_mem_pool, | |
2084 | estimate_cache_size_from_compressed(istate->cache_nr)); | |
2085 | } else { | |
2086 | mem_pool_init(istate->ce_mem_pool, | |
2087 | estimate_cache_size(mmap_size, istate->cache_nr)); | |
2088 | } | |
2089 | ||
2090 | consumed = load_cache_entry_block(istate, istate->ce_mem_pool, | |
2091 | 0, istate->cache_nr, mmap, src_offset, NULL); | |
2092 | return consumed; | |
2093 | } | |
2094 | ||
2095 | /* | |
2096 | * Mostly randomly chosen maximum thread counts: we | |
2097 | * cap the parallelism to online_cpus() threads, and we want | |
2098 | * to have at least 10000 cache entries per thread for it to | |
2099 | * be worth starting a thread. | |
2100 | */ | |
2101 | ||
2102 | #define THREAD_COST (10000) | |
2103 | ||
2104 | struct load_cache_entries_thread_data | |
2105 | { | |
2106 | pthread_t pthread; | |
2107 | struct index_state *istate; | |
2108 | struct mem_pool *ce_mem_pool; | |
2109 | int offset; | |
2110 | const char *mmap; | |
2111 | struct index_entry_offset_table *ieot; | |
2112 | int ieot_start; /* starting index into the ieot array */ | |
2113 | int ieot_blocks; /* count of ieot entries to process */ | |
2114 | unsigned long consumed; /* return # of bytes in index file processed */ | |
2115 | }; | |
2116 | ||
2117 | /* | |
2118 | * A thread proc to run the load_cache_entries() computation | |
2119 | * across multiple background threads. | |
2120 | */ | |
2121 | static void *load_cache_entries_thread(void *_data) | |
2122 | { | |
2123 | struct load_cache_entries_thread_data *p = _data; | |
2124 | int i; | |
2125 | ||
2126 | /* iterate across all ieot blocks assigned to this thread */ | |
2127 | for (i = p->ieot_start; i < p->ieot_start + p->ieot_blocks; i++) { | |
2128 | p->consumed += load_cache_entry_block(p->istate, p->ce_mem_pool, | |
2129 | p->offset, p->ieot->entries[i].nr, p->mmap, p->ieot->entries[i].offset, NULL); | |
2130 | p->offset += p->ieot->entries[i].nr; | |
2131 | } | |
2132 | return NULL; | |
2133 | } | |
2134 | ||
2135 | static unsigned long load_cache_entries_threaded(struct index_state *istate, const char *mmap, size_t mmap_size, | |
2136 | int nr_threads, struct index_entry_offset_table *ieot) | |
2137 | { | |
2138 | int i, offset, ieot_blocks, ieot_start, err; | |
2139 | struct load_cache_entries_thread_data *data; | |
2140 | unsigned long consumed = 0; | |
2141 | ||
2142 | /* a little sanity checking */ | |
2143 | if (istate->name_hash_initialized) | |
2144 | BUG("the name hash isn't thread safe"); | |
2145 | ||
2146 | istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); | |
2147 | mem_pool_init(istate->ce_mem_pool, 0); | |
2148 | ||
2149 | /* ensure we have no more threads than we have blocks to process */ | |
2150 | if (nr_threads > ieot->nr) | |
2151 | nr_threads = ieot->nr; | |
2152 | CALLOC_ARRAY(data, nr_threads); | |
2153 | ||
2154 | offset = ieot_start = 0; | |
2155 | ieot_blocks = DIV_ROUND_UP(ieot->nr, nr_threads); | |
2156 | for (i = 0; i < nr_threads; i++) { | |
2157 | struct load_cache_entries_thread_data *p = &data[i]; | |
2158 | int nr, j; | |
2159 | ||
2160 | if (ieot_start + ieot_blocks > ieot->nr) | |
2161 | ieot_blocks = ieot->nr - ieot_start; | |
2162 | ||
2163 | p->istate = istate; | |
2164 | p->offset = offset; | |
2165 | p->mmap = mmap; | |
2166 | p->ieot = ieot; | |
2167 | p->ieot_start = ieot_start; | |
2168 | p->ieot_blocks = ieot_blocks; | |
2169 | ||
2170 | /* create a mem_pool for each thread */ | |
2171 | nr = 0; | |
2172 | for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++) | |
2173 | nr += p->ieot->entries[j].nr; | |
2174 | p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); | |
2175 | if (istate->version == 4) { | |
2176 | mem_pool_init(p->ce_mem_pool, | |
2177 | estimate_cache_size_from_compressed(nr)); | |
2178 | } else { | |
2179 | mem_pool_init(p->ce_mem_pool, | |
2180 | estimate_cache_size(mmap_size, nr)); | |
2181 | } | |
2182 | ||
2183 | err = pthread_create(&p->pthread, NULL, load_cache_entries_thread, p); | |
2184 | if (err) | |
2185 | die(_("unable to create load_cache_entries thread: %s"), strerror(err)); | |
2186 | ||
2187 | /* increment by the number of cache entries in the ieot block being processed */ | |
2188 | for (j = 0; j < ieot_blocks; j++) | |
2189 | offset += ieot->entries[ieot_start + j].nr; | |
2190 | ieot_start += ieot_blocks; | |
2191 | } | |
2192 | ||
2193 | for (i = 0; i < nr_threads; i++) { | |
2194 | struct load_cache_entries_thread_data *p = &data[i]; | |
2195 | ||
2196 | err = pthread_join(p->pthread, NULL); | |
2197 | if (err) | |
2198 | die(_("unable to join load_cache_entries thread: %s"), strerror(err)); | |
2199 | mem_pool_combine(istate->ce_mem_pool, p->ce_mem_pool); | |
2200 | consumed += p->consumed; | |
2201 | } | |
2202 | ||
2203 | free(data); | |
2204 | ||
2205 | return consumed; | |
2206 | } | |
2207 | ||
2208 | /* remember to discard_cache() before reading a different cache! */ | |
2209 | int do_read_index(struct index_state *istate, const char *path, int must_exist) | |
2210 | { | |
2211 | int fd; | |
2212 | struct stat st; | |
2213 | unsigned long src_offset; | |
2214 | const struct cache_header *hdr; | |
2215 | const char *mmap; | |
2216 | size_t mmap_size; | |
2217 | struct load_index_extensions p; | |
2218 | size_t extension_offset = 0; | |
2219 | int nr_threads, cpus; | |
2220 | struct index_entry_offset_table *ieot = NULL; | |
2221 | ||
2222 | if (istate->initialized) | |
2223 | return istate->cache_nr; | |
2224 | ||
2225 | istate->timestamp.sec = 0; | |
2226 | istate->timestamp.nsec = 0; | |
2227 | fd = open(path, O_RDONLY); | |
2228 | if (fd < 0) { | |
2229 | if (!must_exist && errno == ENOENT) | |
2230 | return 0; | |
2231 | die_errno(_("%s: index file open failed"), path); | |
2232 | } | |
2233 | ||
2234 | if (fstat(fd, &st)) | |
2235 | die_errno(_("%s: cannot stat the open index"), path); | |
2236 | ||
2237 | mmap_size = xsize_t(st.st_size); | |
2238 | if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz) | |
2239 | die(_("%s: index file smaller than expected"), path); | |
2240 | ||
2241 | mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0); | |
2242 | if (mmap == MAP_FAILED) | |
2243 | die_errno(_("%s: unable to map index file%s"), path, | |
2244 | mmap_os_err()); | |
2245 | close(fd); | |
2246 | ||
2247 | hdr = (const struct cache_header *)mmap; | |
2248 | if (verify_hdr(hdr, mmap_size) < 0) | |
2249 | goto unmap; | |
2250 | ||
2251 | oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz); | |
2252 | istate->version = ntohl(hdr->hdr_version); | |
2253 | istate->cache_nr = ntohl(hdr->hdr_entries); | |
2254 | istate->cache_alloc = alloc_nr(istate->cache_nr); | |
2255 | CALLOC_ARRAY(istate->cache, istate->cache_alloc); | |
2256 | istate->initialized = 1; | |
2257 | ||
2258 | p.istate = istate; | |
2259 | p.mmap = mmap; | |
2260 | p.mmap_size = mmap_size; | |
2261 | ||
2262 | src_offset = sizeof(*hdr); | |
2263 | ||
2264 | if (git_config_get_index_threads(&nr_threads)) | |
2265 | nr_threads = 1; | |
2266 | ||
2267 | /* TODO: does creating more threads than cores help? */ | |
2268 | if (!nr_threads) { | |
2269 | nr_threads = istate->cache_nr / THREAD_COST; | |
2270 | cpus = online_cpus(); | |
2271 | if (nr_threads > cpus) | |
2272 | nr_threads = cpus; | |
2273 | } | |
2274 | ||
2275 | if (!HAVE_THREADS) | |
2276 | nr_threads = 1; | |
2277 | ||
2278 | if (nr_threads > 1) { | |
2279 | extension_offset = read_eoie_extension(mmap, mmap_size); | |
2280 | if (extension_offset) { | |
2281 | int err; | |
2282 | ||
2283 | p.src_offset = extension_offset; | |
2284 | err = pthread_create(&p.pthread, NULL, load_index_extensions, &p); | |
2285 | if (err) | |
2286 | die(_("unable to create load_index_extensions thread: %s"), strerror(err)); | |
2287 | ||
2288 | nr_threads--; | |
2289 | } | |
2290 | } | |
2291 | ||
2292 | /* | |
2293 | * Locate and read the index entry offset table so that we can use it | |
2294 | * to multi-thread the reading of the cache entries. | |
2295 | */ | |
2296 | if (extension_offset && nr_threads > 1) | |
2297 | ieot = read_ieot_extension(mmap, mmap_size, extension_offset); | |
2298 | ||
2299 | if (ieot) { | |
2300 | src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot); | |
2301 | free(ieot); | |
2302 | } else { | |
2303 | src_offset += load_all_cache_entries(istate, mmap, mmap_size, src_offset); | |
2304 | } | |
2305 | ||
2306 | istate->timestamp.sec = st.st_mtime; | |
2307 | istate->timestamp.nsec = ST_MTIME_NSEC(st); | |
2308 | ||
2309 | /* if we created a thread, join it otherwise load the extensions on the primary thread */ | |
2310 | if (extension_offset) { | |
2311 | int ret = pthread_join(p.pthread, NULL); | |
2312 | if (ret) | |
2313 | die(_("unable to join load_index_extensions thread: %s"), strerror(ret)); | |
2314 | } else { | |
2315 | p.src_offset = src_offset; | |
2316 | load_index_extensions(&p); | |
2317 | } | |
2318 | munmap((void *)mmap, mmap_size); | |
2319 | ||
2320 | /* | |
2321 | * TODO trace2: replace "the_repository" with the actual repo instance | |
2322 | * that is associated with the given "istate". | |
2323 | */ | |
2324 | trace2_data_intmax("index", the_repository, "read/version", | |
2325 | istate->version); | |
2326 | trace2_data_intmax("index", the_repository, "read/cache_nr", | |
2327 | istate->cache_nr); | |
2328 | ||
2329 | if (!istate->repo) | |
2330 | istate->repo = the_repository; | |
2331 | prepare_repo_settings(istate->repo); | |
2332 | if (istate->repo->settings.command_requires_full_index) | |
2333 | ensure_full_index(istate); | |
2334 | ||
2335 | return istate->cache_nr; | |
2336 | ||
2337 | unmap: | |
2338 | munmap((void *)mmap, mmap_size); | |
2339 | die(_("index file corrupt")); | |
2340 | } | |
2341 | ||
2342 | /* | |
2343 | * Signal that the shared index is used by updating its mtime. | |
2344 | * | |
2345 | * This way, shared index can be removed if they have not been used | |
2346 | * for some time. | |
2347 | */ | |
2348 | static void freshen_shared_index(const char *shared_index, int warn) | |
2349 | { | |
2350 | if (!check_and_freshen_file(shared_index, 1) && warn) | |
2351 | warning(_("could not freshen shared index '%s'"), shared_index); | |
2352 | } | |
2353 | ||
2354 | int read_index_from(struct index_state *istate, const char *path, | |
2355 | const char *gitdir) | |
2356 | { | |
2357 | struct split_index *split_index; | |
2358 | int ret; | |
2359 | char *base_oid_hex; | |
2360 | char *base_path; | |
2361 | ||
2362 | /* istate->initialized covers both .git/index and .git/sharedindex.xxx */ | |
2363 | if (istate->initialized) | |
2364 | return istate->cache_nr; | |
2365 | ||
2366 | /* | |
2367 | * TODO trace2: replace "the_repository" with the actual repo instance | |
2368 | * that is associated with the given "istate". | |
2369 | */ | |
2370 | trace2_region_enter_printf("index", "do_read_index", the_repository, | |
2371 | "%s", path); | |
2372 | trace_performance_enter(); | |
2373 | ret = do_read_index(istate, path, 0); | |
2374 | trace_performance_leave("read cache %s", path); | |
2375 | trace2_region_leave_printf("index", "do_read_index", the_repository, | |
2376 | "%s", path); | |
2377 | ||
2378 | split_index = istate->split_index; | |
2379 | if (!split_index || is_null_oid(&split_index->base_oid)) { | |
2380 | post_read_index_from(istate); | |
2381 | return ret; | |
2382 | } | |
2383 | ||
2384 | trace_performance_enter(); | |
2385 | if (split_index->base) | |
2386 | discard_index(split_index->base); | |
2387 | else | |
2388 | CALLOC_ARRAY(split_index->base, 1); | |
2389 | ||
2390 | base_oid_hex = oid_to_hex(&split_index->base_oid); | |
2391 | base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex); | |
2392 | trace2_region_enter_printf("index", "shared/do_read_index", | |
2393 | the_repository, "%s", base_path); | |
2394 | ret = do_read_index(split_index->base, base_path, 0); | |
2395 | trace2_region_leave_printf("index", "shared/do_read_index", | |
2396 | the_repository, "%s", base_path); | |
2397 | if (!ret) { | |
2398 | char *path_copy = xstrdup(path); | |
2399 | const char *base_path2 = xstrfmt("%s/sharedindex.%s", | |
2400 | dirname(path_copy), | |
2401 | base_oid_hex); | |
2402 | free(path_copy); | |
2403 | trace2_region_enter_printf("index", "shared/do_read_index", | |
2404 | the_repository, "%s", base_path2); | |
2405 | ret = do_read_index(split_index->base, base_path2, 1); | |
2406 | trace2_region_leave_printf("index", "shared/do_read_index", | |
2407 | the_repository, "%s", base_path2); | |
2408 | } | |
2409 | if (!oideq(&split_index->base_oid, &split_index->base->oid)) | |
2410 | die(_("broken index, expect %s in %s, got %s"), | |
2411 | base_oid_hex, base_path, | |
2412 | oid_to_hex(&split_index->base->oid)); | |
2413 | ||
2414 | freshen_shared_index(base_path, 0); | |
2415 | merge_base_index(istate); | |
2416 | post_read_index_from(istate); | |
2417 | trace_performance_leave("read cache %s", base_path); | |
2418 | free(base_path); | |
2419 | return ret; | |
2420 | } | |
2421 | ||
2422 | int is_index_unborn(struct index_state *istate) | |
2423 | { | |
2424 | return (!istate->cache_nr && !istate->timestamp.sec); | |
2425 | } | |
2426 | ||
2427 | int discard_index(struct index_state *istate) | |
2428 | { | |
2429 | /* | |
2430 | * Cache entries in istate->cache[] should have been allocated | |
2431 | * from the memory pool associated with this index, or from an | |
2432 | * associated split_index. There is no need to free individual | |
2433 | * cache entries. validate_cache_entries can detect when this | |
2434 | * assertion does not hold. | |
2435 | */ | |
2436 | validate_cache_entries(istate); | |
2437 | ||
2438 | resolve_undo_clear_index(istate); | |
2439 | istate->cache_nr = 0; | |
2440 | istate->cache_changed = 0; | |
2441 | istate->timestamp.sec = 0; | |
2442 | istate->timestamp.nsec = 0; | |
2443 | free_name_hash(istate); | |
2444 | cache_tree_free(&(istate->cache_tree)); | |
2445 | istate->initialized = 0; | |
2446 | istate->fsmonitor_has_run_once = 0; | |
2447 | FREE_AND_NULL(istate->fsmonitor_last_update); | |
2448 | FREE_AND_NULL(istate->cache); | |
2449 | istate->cache_alloc = 0; | |
2450 | discard_split_index(istate); | |
2451 | free_untracked_cache(istate->untracked); | |
2452 | istate->untracked = NULL; | |
2453 | ||
2454 | if (istate->ce_mem_pool) { | |
2455 | mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries()); | |
2456 | FREE_AND_NULL(istate->ce_mem_pool); | |
2457 | } | |
2458 | ||
2459 | return 0; | |
2460 | } | |
2461 | ||
2462 | /* | |
2463 | * Validate the cache entries of this index. | |
2464 | * All cache entries associated with this index | |
2465 | * should have been allocated by the memory pool | |
2466 | * associated with this index, or by a referenced | |
2467 | * split index. | |
2468 | */ | |
2469 | void validate_cache_entries(const struct index_state *istate) | |
2470 | { | |
2471 | int i; | |
2472 | ||
2473 | if (!should_validate_cache_entries() ||!istate || !istate->initialized) | |
2474 | return; | |
2475 | ||
2476 | for (i = 0; i < istate->cache_nr; i++) { | |
2477 | if (!istate) { | |
2478 | BUG("cache entry is not allocated from expected memory pool"); | |
2479 | } else if (!istate->ce_mem_pool || | |
2480 | !mem_pool_contains(istate->ce_mem_pool, istate->cache[i])) { | |
2481 | if (!istate->split_index || | |
2482 | !istate->split_index->base || | |
2483 | !istate->split_index->base->ce_mem_pool || | |
2484 | !mem_pool_contains(istate->split_index->base->ce_mem_pool, istate->cache[i])) { | |
2485 | BUG("cache entry is not allocated from expected memory pool"); | |
2486 | } | |
2487 | } | |
2488 | } | |
2489 | ||
2490 | if (istate->split_index) | |
2491 | validate_cache_entries(istate->split_index->base); | |
2492 | } | |
2493 | ||
2494 | int unmerged_index(const struct index_state *istate) | |
2495 | { | |
2496 | int i; | |
2497 | for (i = 0; i < istate->cache_nr; i++) { | |
2498 | if (ce_stage(istate->cache[i])) | |
2499 | return 1; | |
2500 | } | |
2501 | return 0; | |
2502 | } | |
2503 | ||
2504 | int repo_index_has_changes(struct repository *repo, | |
2505 | struct tree *tree, | |
2506 | struct strbuf *sb) | |
2507 | { | |
2508 | struct index_state *istate = repo->index; | |
2509 | struct object_id cmp; | |
2510 | int i; | |
2511 | ||
2512 | if (tree) | |
2513 | cmp = tree->object.oid; | |
2514 | if (tree || !get_oid_tree("HEAD", &cmp)) { | |
2515 | struct diff_options opt; | |
2516 | ||
2517 | repo_diff_setup(repo, &opt); | |
2518 | opt.flags.exit_with_status = 1; | |
2519 | if (!sb) | |
2520 | opt.flags.quick = 1; | |
2521 | diff_setup_done(&opt); | |
2522 | do_diff_cache(&cmp, &opt); | |
2523 | diffcore_std(&opt); | |
2524 | for (i = 0; sb && i < diff_queued_diff.nr; i++) { | |
2525 | if (i) | |
2526 | strbuf_addch(sb, ' '); | |
2527 | strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path); | |
2528 | } | |
2529 | diff_flush(&opt); | |
2530 | return opt.flags.has_changes != 0; | |
2531 | } else { | |
2532 | /* TODO: audit for interaction with sparse-index. */ | |
2533 | ensure_full_index(istate); | |
2534 | for (i = 0; sb && i < istate->cache_nr; i++) { | |
2535 | if (i) | |
2536 | strbuf_addch(sb, ' '); | |
2537 | strbuf_addstr(sb, istate->cache[i]->name); | |
2538 | } | |
2539 | return !!istate->cache_nr; | |
2540 | } | |
2541 | } | |
2542 | ||
2543 | static int write_index_ext_header(struct hashfile *f, | |
2544 | git_hash_ctx *eoie_f, | |
2545 | unsigned int ext, | |
2546 | unsigned int sz) | |
2547 | { | |
2548 | hashwrite_be32(f, ext); | |
2549 | hashwrite_be32(f, sz); | |
2550 | ||
2551 | if (eoie_f) { | |
2552 | ext = htonl(ext); | |
2553 | sz = htonl(sz); | |
2554 | the_hash_algo->update_fn(eoie_f, &ext, sizeof(ext)); | |
2555 | the_hash_algo->update_fn(eoie_f, &sz, sizeof(sz)); | |
2556 | } | |
2557 | return 0; | |
2558 | } | |
2559 | ||
2560 | static void ce_smudge_racily_clean_entry(struct index_state *istate, | |
2561 | struct cache_entry *ce) | |
2562 | { | |
2563 | /* | |
2564 | * The only thing we care about in this function is to smudge the | |
2565 | * falsely clean entry due to touch-update-touch race, so we leave | |
2566 | * everything else as they are. We are called for entries whose | |
2567 | * ce_stat_data.sd_mtime match the index file mtime. | |
2568 | * | |
2569 | * Note that this actually does not do much for gitlinks, for | |
2570 | * which ce_match_stat_basic() always goes to the actual | |
2571 | * contents. The caller checks with is_racy_timestamp() which | |
2572 | * always says "no" for gitlinks, so we are not called for them ;-) | |
2573 | */ | |
2574 | struct stat st; | |
2575 | ||
2576 | if (lstat(ce->name, &st) < 0) | |
2577 | return; | |
2578 | if (ce_match_stat_basic(ce, &st)) | |
2579 | return; | |
2580 | if (ce_modified_check_fs(istate, ce, &st)) { | |
2581 | /* This is "racily clean"; smudge it. Note that this | |
2582 | * is a tricky code. At first glance, it may appear | |
2583 | * that it can break with this sequence: | |
2584 | * | |
2585 | * $ echo xyzzy >frotz | |
2586 | * $ git-update-index --add frotz | |
2587 | * $ : >frotz | |
2588 | * $ sleep 3 | |
2589 | * $ echo filfre >nitfol | |
2590 | * $ git-update-index --add nitfol | |
2591 | * | |
2592 | * but it does not. When the second update-index runs, | |
2593 | * it notices that the entry "frotz" has the same timestamp | |
2594 | * as index, and if we were to smudge it by resetting its | |
2595 | * size to zero here, then the object name recorded | |
2596 | * in index is the 6-byte file but the cached stat information | |
2597 | * becomes zero --- which would then match what we would | |
2598 | * obtain from the filesystem next time we stat("frotz"). | |
2599 | * | |
2600 | * However, the second update-index, before calling | |
2601 | * this function, notices that the cached size is 6 | |
2602 | * bytes and what is on the filesystem is an empty | |
2603 | * file, and never calls us, so the cached size information | |
2604 | * for "frotz" stays 6 which does not match the filesystem. | |
2605 | */ | |
2606 | ce->ce_stat_data.sd_size = 0; | |
2607 | } | |
2608 | } | |
2609 | ||
2610 | /* Copy miscellaneous fields but not the name */ | |
2611 | static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk, | |
2612 | struct cache_entry *ce) | |
2613 | { | |
2614 | short flags; | |
2615 | const unsigned hashsz = the_hash_algo->rawsz; | |
2616 | uint16_t *flagsp = (uint16_t *)(ondisk->data + hashsz); | |
2617 | ||
2618 | ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec); | |
2619 | ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec); | |
2620 | ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec); | |
2621 | ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec); | |
2622 | ondisk->dev = htonl(ce->ce_stat_data.sd_dev); | |
2623 | ondisk->ino = htonl(ce->ce_stat_data.sd_ino); | |
2624 | ondisk->mode = htonl(ce->ce_mode); | |
2625 | ondisk->uid = htonl(ce->ce_stat_data.sd_uid); | |
2626 | ondisk->gid = htonl(ce->ce_stat_data.sd_gid); | |
2627 | ondisk->size = htonl(ce->ce_stat_data.sd_size); | |
2628 | hashcpy(ondisk->data, ce->oid.hash); | |
2629 | ||
2630 | flags = ce->ce_flags & ~CE_NAMEMASK; | |
2631 | flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce)); | |
2632 | flagsp[0] = htons(flags); | |
2633 | if (ce->ce_flags & CE_EXTENDED) { | |
2634 | flagsp[1] = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16); | |
2635 | } | |
2636 | } | |
2637 | ||
2638 | static int ce_write_entry(struct hashfile *f, struct cache_entry *ce, | |
2639 | struct strbuf *previous_name, struct ondisk_cache_entry *ondisk) | |
2640 | { | |
2641 | int size; | |
2642 | unsigned int saved_namelen; | |
2643 | int stripped_name = 0; | |
2644 | static unsigned char padding[8] = { 0x00 }; | |
2645 | ||
2646 | if (ce->ce_flags & CE_STRIP_NAME) { | |
2647 | saved_namelen = ce_namelen(ce); | |
2648 | ce->ce_namelen = 0; | |
2649 | stripped_name = 1; | |
2650 | } | |
2651 | ||
2652 | size = offsetof(struct ondisk_cache_entry,data) + ondisk_data_size(ce->ce_flags, 0); | |
2653 | ||
2654 | if (!previous_name) { | |
2655 | int len = ce_namelen(ce); | |
2656 | copy_cache_entry_to_ondisk(ondisk, ce); | |
2657 | hashwrite(f, ondisk, size); | |
2658 | hashwrite(f, ce->name, len); | |
2659 | hashwrite(f, padding, align_padding_size(size, len)); | |
2660 | } else { | |
2661 | int common, to_remove, prefix_size; | |
2662 | unsigned char to_remove_vi[16]; | |
2663 | for (common = 0; | |
2664 | (ce->name[common] && | |
2665 | common < previous_name->len && | |
2666 | ce->name[common] == previous_name->buf[common]); | |
2667 | common++) | |
2668 | ; /* still matching */ | |
2669 | to_remove = previous_name->len - common; | |
2670 | prefix_size = encode_varint(to_remove, to_remove_vi); | |
2671 | ||
2672 | copy_cache_entry_to_ondisk(ondisk, ce); | |
2673 | hashwrite(f, ondisk, size); | |
2674 | hashwrite(f, to_remove_vi, prefix_size); | |
2675 | hashwrite(f, ce->name + common, ce_namelen(ce) - common); | |
2676 | hashwrite(f, padding, 1); | |
2677 | ||
2678 | strbuf_splice(previous_name, common, to_remove, | |
2679 | ce->name + common, ce_namelen(ce) - common); | |
2680 | } | |
2681 | if (stripped_name) { | |
2682 | ce->ce_namelen = saved_namelen; | |
2683 | ce->ce_flags &= ~CE_STRIP_NAME; | |
2684 | } | |
2685 | ||
2686 | return 0; | |
2687 | } | |
2688 | ||
2689 | /* | |
2690 | * This function verifies if index_state has the correct sha1 of the | |
2691 | * index file. Don't die if we have any other failure, just return 0. | |
2692 | */ | |
2693 | static int verify_index_from(const struct index_state *istate, const char *path) | |
2694 | { | |
2695 | int fd; | |
2696 | ssize_t n; | |
2697 | struct stat st; | |
2698 | unsigned char hash[GIT_MAX_RAWSZ]; | |
2699 | ||
2700 | if (!istate->initialized) | |
2701 | return 0; | |
2702 | ||
2703 | fd = open(path, O_RDONLY); | |
2704 | if (fd < 0) | |
2705 | return 0; | |
2706 | ||
2707 | if (fstat(fd, &st)) | |
2708 | goto out; | |
2709 | ||
2710 | if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz) | |
2711 | goto out; | |
2712 | ||
2713 | n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz); | |
2714 | if (n != the_hash_algo->rawsz) | |
2715 | goto out; | |
2716 | ||
2717 | if (!hasheq(istate->oid.hash, hash)) | |
2718 | goto out; | |
2719 | ||
2720 | close(fd); | |
2721 | return 1; | |
2722 | ||
2723 | out: | |
2724 | close(fd); | |
2725 | return 0; | |
2726 | } | |
2727 | ||
2728 | static int repo_verify_index(struct repository *repo) | |
2729 | { | |
2730 | return verify_index_from(repo->index, repo->index_file); | |
2731 | } | |
2732 | ||
2733 | static int has_racy_timestamp(struct index_state *istate) | |
2734 | { | |
2735 | int entries = istate->cache_nr; | |
2736 | int i; | |
2737 | ||
2738 | for (i = 0; i < entries; i++) { | |
2739 | struct cache_entry *ce = istate->cache[i]; | |
2740 | if (is_racy_timestamp(istate, ce)) | |
2741 | return 1; | |
2742 | } | |
2743 | return 0; | |
2744 | } | |
2745 | ||
2746 | void repo_update_index_if_able(struct repository *repo, | |
2747 | struct lock_file *lockfile) | |
2748 | { | |
2749 | if ((repo->index->cache_changed || | |
2750 | has_racy_timestamp(repo->index)) && | |
2751 | repo_verify_index(repo)) | |
2752 | write_locked_index(repo->index, lockfile, COMMIT_LOCK); | |
2753 | else | |
2754 | rollback_lock_file(lockfile); | |
2755 | } | |
2756 | ||
2757 | static int record_eoie(void) | |
2758 | { | |
2759 | int val; | |
2760 | ||
2761 | if (!git_config_get_bool("index.recordendofindexentries", &val)) | |
2762 | return val; | |
2763 | ||
2764 | /* | |
2765 | * As a convenience, the end of index entries extension | |
2766 | * used for threading is written by default if the user | |
2767 | * explicitly requested threaded index reads. | |
2768 | */ | |
2769 | return !git_config_get_index_threads(&val) && val != 1; | |
2770 | } | |
2771 | ||
2772 | static int record_ieot(void) | |
2773 | { | |
2774 | int val; | |
2775 | ||
2776 | if (!git_config_get_bool("index.recordoffsettable", &val)) | |
2777 | return val; | |
2778 | ||
2779 | /* | |
2780 | * As a convenience, the offset table used for threading is | |
2781 | * written by default if the user explicitly requested | |
2782 | * threaded index reads. | |
2783 | */ | |
2784 | return !git_config_get_index_threads(&val) && val != 1; | |
2785 | } | |
2786 | ||
2787 | /* | |
2788 | * On success, `tempfile` is closed. If it is the temporary file | |
2789 | * of a `struct lock_file`, we will therefore effectively perform | |
2790 | * a 'close_lock_file_gently()`. Since that is an implementation | |
2791 | * detail of lockfiles, callers of `do_write_index()` should not | |
2792 | * rely on it. | |
2793 | */ | |
2794 | static int do_write_index(struct index_state *istate, struct tempfile *tempfile, | |
2795 | int strip_extensions) | |
2796 | { | |
2797 | uint64_t start = getnanotime(); | |
2798 | struct hashfile *f; | |
2799 | git_hash_ctx *eoie_c = NULL; | |
2800 | struct cache_header hdr; | |
2801 | int i, err = 0, removed, extended, hdr_version; | |
2802 | struct cache_entry **cache = istate->cache; | |
2803 | int entries = istate->cache_nr; | |
2804 | struct stat st; | |
2805 | struct ondisk_cache_entry ondisk; | |
2806 | struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; | |
2807 | int drop_cache_tree = istate->drop_cache_tree; | |
2808 | off_t offset; | |
2809 | int ieot_entries = 1; | |
2810 | struct index_entry_offset_table *ieot = NULL; | |
2811 | int nr, nr_threads; | |
2812 | ||
2813 | f = hashfd(tempfile->fd, tempfile->filename.buf); | |
2814 | ||
2815 | for (i = removed = extended = 0; i < entries; i++) { | |
2816 | if (cache[i]->ce_flags & CE_REMOVE) | |
2817 | removed++; | |
2818 | ||
2819 | /* reduce extended entries if possible */ | |
2820 | cache[i]->ce_flags &= ~CE_EXTENDED; | |
2821 | if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) { | |
2822 | extended++; | |
2823 | cache[i]->ce_flags |= CE_EXTENDED; | |
2824 | } | |
2825 | } | |
2826 | ||
2827 | if (!istate->version) { | |
2828 | istate->version = get_index_format_default(the_repository); | |
2829 | if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) | |
2830 | init_split_index(istate); | |
2831 | } | |
2832 | ||
2833 | /* demote version 3 to version 2 when the latter suffices */ | |
2834 | if (istate->version == 3 || istate->version == 2) | |
2835 | istate->version = extended ? 3 : 2; | |
2836 | ||
2837 | hdr_version = istate->version; | |
2838 | ||
2839 | hdr.hdr_signature = htonl(CACHE_SIGNATURE); | |
2840 | hdr.hdr_version = htonl(hdr_version); | |
2841 | hdr.hdr_entries = htonl(entries - removed); | |
2842 | ||
2843 | hashwrite(f, &hdr, sizeof(hdr)); | |
2844 | ||
2845 | if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads)) | |
2846 | nr_threads = 1; | |
2847 | ||
2848 | if (nr_threads != 1 && record_ieot()) { | |
2849 | int ieot_blocks, cpus; | |
2850 | ||
2851 | /* | |
2852 | * ensure default number of ieot blocks maps evenly to the | |
2853 | * default number of threads that will process them leaving | |
2854 | * room for the thread to load the index extensions. | |
2855 | */ | |
2856 | if (!nr_threads) { | |
2857 | ieot_blocks = istate->cache_nr / THREAD_COST; | |
2858 | cpus = online_cpus(); | |
2859 | if (ieot_blocks > cpus - 1) | |
2860 | ieot_blocks = cpus - 1; | |
2861 | } else { | |
2862 | ieot_blocks = nr_threads; | |
2863 | if (ieot_blocks > istate->cache_nr) | |
2864 | ieot_blocks = istate->cache_nr; | |
2865 | } | |
2866 | ||
2867 | /* | |
2868 | * no reason to write out the IEOT extension if we don't | |
2869 | * have enough blocks to utilize multi-threading | |
2870 | */ | |
2871 | if (ieot_blocks > 1) { | |
2872 | ieot = xcalloc(1, sizeof(struct index_entry_offset_table) | |
2873 | + (ieot_blocks * sizeof(struct index_entry_offset))); | |
2874 | ieot_entries = DIV_ROUND_UP(entries, ieot_blocks); | |
2875 | } | |
2876 | } | |
2877 | ||
2878 | offset = hashfile_total(f); | |
2879 | ||
2880 | nr = 0; | |
2881 | previous_name = (hdr_version == 4) ? &previous_name_buf : NULL; | |
2882 | ||
2883 | for (i = 0; i < entries; i++) { | |
2884 | struct cache_entry *ce = cache[i]; | |
2885 | if (ce->ce_flags & CE_REMOVE) | |
2886 | continue; | |
2887 | if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce)) | |
2888 | ce_smudge_racily_clean_entry(istate, ce); | |
2889 | if (is_null_oid(&ce->oid)) { | |
2890 | static const char msg[] = "cache entry has null sha1: %s"; | |
2891 | static int allow = -1; | |
2892 | ||
2893 | if (allow < 0) | |
2894 | allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0); | |
2895 | if (allow) | |
2896 | warning(msg, ce->name); | |
2897 | else | |
2898 | err = error(msg, ce->name); | |
2899 | ||
2900 | drop_cache_tree = 1; | |
2901 | } | |
2902 | if (ieot && i && (i % ieot_entries == 0)) { | |
2903 | ieot->entries[ieot->nr].nr = nr; | |
2904 | ieot->entries[ieot->nr].offset = offset; | |
2905 | ieot->nr++; | |
2906 | /* | |
2907 | * If we have a V4 index, set the first byte to an invalid | |
2908 | * character to ensure there is nothing common with the previous | |
2909 | * entry | |
2910 | */ | |
2911 | if (previous_name) | |
2912 | previous_name->buf[0] = 0; | |
2913 | nr = 0; | |
2914 | ||
2915 | offset = hashfile_total(f); | |
2916 | } | |
2917 | if (ce_write_entry(f, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0) | |
2918 | err = -1; | |
2919 | ||
2920 | if (err) | |
2921 | break; | |
2922 | nr++; | |
2923 | } | |
2924 | if (ieot && nr) { | |
2925 | ieot->entries[ieot->nr].nr = nr; | |
2926 | ieot->entries[ieot->nr].offset = offset; | |
2927 | ieot->nr++; | |
2928 | } | |
2929 | strbuf_release(&previous_name_buf); | |
2930 | ||
2931 | if (err) { | |
2932 | free(ieot); | |
2933 | return err; | |
2934 | } | |
2935 | ||
2936 | offset = hashfile_total(f); | |
2937 | ||
2938 | /* | |
2939 | * The extension headers must be hashed on their own for the | |
2940 | * EOIE extension. Create a hashfile here to compute that hash. | |
2941 | */ | |
2942 | if (offset && record_eoie()) { | |
2943 | CALLOC_ARRAY(eoie_c, 1); | |
2944 | the_hash_algo->init_fn(eoie_c); | |
2945 | } | |
2946 | ||
2947 | /* | |
2948 | * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we | |
2949 | * can minimize the number of extensions we have to scan through to | |
2950 | * find it during load. Write it out regardless of the | |
2951 | * strip_extensions parameter as we need it when loading the shared | |
2952 | * index. | |
2953 | */ | |
2954 | if (ieot) { | |
2955 | struct strbuf sb = STRBUF_INIT; | |
2956 | ||
2957 | write_ieot_extension(&sb, ieot); | |
2958 | err = write_index_ext_header(f, eoie_c, CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0; | |
2959 | hashwrite(f, sb.buf, sb.len); | |
2960 | strbuf_release(&sb); | |
2961 | free(ieot); | |
2962 | if (err) | |
2963 | return -1; | |
2964 | } | |
2965 | ||
2966 | if (!strip_extensions && istate->split_index && | |
2967 | !is_null_oid(&istate->split_index->base_oid)) { | |
2968 | struct strbuf sb = STRBUF_INIT; | |
2969 | ||
2970 | err = write_link_extension(&sb, istate) < 0 || | |
2971 | write_index_ext_header(f, eoie_c, CACHE_EXT_LINK, | |
2972 | sb.len) < 0; | |
2973 | hashwrite(f, sb.buf, sb.len); | |
2974 | strbuf_release(&sb); | |
2975 | if (err) | |
2976 | return -1; | |
2977 | } | |
2978 | if (!strip_extensions && !drop_cache_tree && istate->cache_tree) { | |
2979 | struct strbuf sb = STRBUF_INIT; | |
2980 | ||
2981 | cache_tree_write(&sb, istate->cache_tree); | |
2982 | err = write_index_ext_header(f, eoie_c, CACHE_EXT_TREE, sb.len) < 0; | |
2983 | hashwrite(f, sb.buf, sb.len); | |
2984 | strbuf_release(&sb); | |
2985 | if (err) | |
2986 | return -1; | |
2987 | } | |
2988 | if (!strip_extensions && istate->resolve_undo) { | |
2989 | struct strbuf sb = STRBUF_INIT; | |
2990 | ||
2991 | resolve_undo_write(&sb, istate->resolve_undo); | |
2992 | err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO, | |
2993 | sb.len) < 0; | |
2994 | hashwrite(f, sb.buf, sb.len); | |
2995 | strbuf_release(&sb); | |
2996 | if (err) | |
2997 | return -1; | |
2998 | } | |
2999 | if (!strip_extensions && istate->untracked) { | |
3000 | struct strbuf sb = STRBUF_INIT; | |
3001 | ||
3002 | write_untracked_extension(&sb, istate->untracked); | |
3003 | err = write_index_ext_header(f, eoie_c, CACHE_EXT_UNTRACKED, | |
3004 | sb.len) < 0; | |
3005 | hashwrite(f, sb.buf, sb.len); | |
3006 | strbuf_release(&sb); | |
3007 | if (err) | |
3008 | return -1; | |
3009 | } | |
3010 | if (!strip_extensions && istate->fsmonitor_last_update) { | |
3011 | struct strbuf sb = STRBUF_INIT; | |
3012 | ||
3013 | write_fsmonitor_extension(&sb, istate); | |
3014 | err = write_index_ext_header(f, eoie_c, CACHE_EXT_FSMONITOR, sb.len) < 0; | |
3015 | hashwrite(f, sb.buf, sb.len); | |
3016 | strbuf_release(&sb); | |
3017 | if (err) | |
3018 | return -1; | |
3019 | } | |
3020 | if (istate->sparse_index) { | |
3021 | if (write_index_ext_header(f, eoie_c, CACHE_EXT_SPARSE_DIRECTORIES, 0) < 0) | |
3022 | return -1; | |
3023 | } | |
3024 | ||
3025 | /* | |
3026 | * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1 | |
3027 | * so that it can be found and processed before all the index entries are | |
3028 | * read. Write it out regardless of the strip_extensions parameter as we need it | |
3029 | * when loading the shared index. | |
3030 | */ | |
3031 | if (eoie_c) { | |
3032 | struct strbuf sb = STRBUF_INIT; | |
3033 | ||
3034 | write_eoie_extension(&sb, eoie_c, offset); | |
3035 | err = write_index_ext_header(f, NULL, CACHE_EXT_ENDOFINDEXENTRIES, sb.len) < 0; | |
3036 | hashwrite(f, sb.buf, sb.len); | |
3037 | strbuf_release(&sb); | |
3038 | if (err) | |
3039 | return -1; | |
3040 | } | |
3041 | ||
3042 | finalize_hashfile(f, istate->oid.hash, CSUM_HASH_IN_STREAM); | |
3043 | if (close_tempfile_gently(tempfile)) { | |
3044 | error(_("could not close '%s'"), get_tempfile_path(tempfile)); | |
3045 | return -1; | |
3046 | } | |
3047 | if (stat(get_tempfile_path(tempfile), &st)) | |
3048 | return -1; | |
3049 | istate->timestamp.sec = (unsigned int)st.st_mtime; | |
3050 | istate->timestamp.nsec = ST_MTIME_NSEC(st); | |
3051 | trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed); | |
3052 | ||
3053 | /* | |
3054 | * TODO trace2: replace "the_repository" with the actual repo instance | |
3055 | * that is associated with the given "istate". | |
3056 | */ | |
3057 | trace2_data_intmax("index", the_repository, "write/version", | |
3058 | istate->version); | |
3059 | trace2_data_intmax("index", the_repository, "write/cache_nr", | |
3060 | istate->cache_nr); | |
3061 | ||
3062 | return 0; | |
3063 | } | |
3064 | ||
3065 | void set_alternate_index_output(const char *name) | |
3066 | { | |
3067 | alternate_index_output = name; | |
3068 | } | |
3069 | ||
3070 | static int commit_locked_index(struct lock_file *lk) | |
3071 | { | |
3072 | if (alternate_index_output) | |
3073 | return commit_lock_file_to(lk, alternate_index_output); | |
3074 | else | |
3075 | return commit_lock_file(lk); | |
3076 | } | |
3077 | ||
3078 | static int do_write_locked_index(struct index_state *istate, struct lock_file *lock, | |
3079 | unsigned flags) | |
3080 | { | |
3081 | int ret; | |
3082 | int was_full = !istate->sparse_index; | |
3083 | ||
3084 | ret = convert_to_sparse(istate, 0); | |
3085 | ||
3086 | if (ret) { | |
3087 | warning(_("failed to convert to a sparse-index")); | |
3088 | return ret; | |
3089 | } | |
3090 | ||
3091 | /* | |
3092 | * TODO trace2: replace "the_repository" with the actual repo instance | |
3093 | * that is associated with the given "istate". | |
3094 | */ | |
3095 | trace2_region_enter_printf("index", "do_write_index", the_repository, | |
3096 | "%s", get_lock_file_path(lock)); | |
3097 | ret = do_write_index(istate, lock->tempfile, 0); | |
3098 | trace2_region_leave_printf("index", "do_write_index", the_repository, | |
3099 | "%s", get_lock_file_path(lock)); | |
3100 | ||
3101 | if (was_full) | |
3102 | ensure_full_index(istate); | |
3103 | ||
3104 | if (ret) | |
3105 | return ret; | |
3106 | if (flags & COMMIT_LOCK) | |
3107 | ret = commit_locked_index(lock); | |
3108 | else | |
3109 | ret = close_lock_file_gently(lock); | |
3110 | ||
3111 | run_hook_le(NULL, "post-index-change", | |
3112 | istate->updated_workdir ? "1" : "0", | |
3113 | istate->updated_skipworktree ? "1" : "0", NULL); | |
3114 | istate->updated_workdir = 0; | |
3115 | istate->updated_skipworktree = 0; | |
3116 | ||
3117 | return ret; | |
3118 | } | |
3119 | ||
3120 | static int write_split_index(struct index_state *istate, | |
3121 | struct lock_file *lock, | |
3122 | unsigned flags) | |
3123 | { | |
3124 | int ret; | |
3125 | prepare_to_write_split_index(istate); | |
3126 | ret = do_write_locked_index(istate, lock, flags); | |
3127 | finish_writing_split_index(istate); | |
3128 | return ret; | |
3129 | } | |
3130 | ||
3131 | static const char *shared_index_expire = "2.weeks.ago"; | |
3132 | ||
3133 | static unsigned long get_shared_index_expire_date(void) | |
3134 | { | |
3135 | static unsigned long shared_index_expire_date; | |
3136 | static int shared_index_expire_date_prepared; | |
3137 | ||
3138 | if (!shared_index_expire_date_prepared) { | |
3139 | git_config_get_expiry("splitindex.sharedindexexpire", | |
3140 | &shared_index_expire); | |
3141 | shared_index_expire_date = approxidate(shared_index_expire); | |
3142 | shared_index_expire_date_prepared = 1; | |
3143 | } | |
3144 | ||
3145 | return shared_index_expire_date; | |
3146 | } | |
3147 | ||
3148 | static int should_delete_shared_index(const char *shared_index_path) | |
3149 | { | |
3150 | struct stat st; | |
3151 | unsigned long expiration; | |
3152 | ||
3153 | /* Check timestamp */ | |
3154 | expiration = get_shared_index_expire_date(); | |
3155 | if (!expiration) | |
3156 | return 0; | |
3157 | if (stat(shared_index_path, &st)) | |
3158 | return error_errno(_("could not stat '%s'"), shared_index_path); | |
3159 | if (st.st_mtime > expiration) | |
3160 | return 0; | |
3161 | ||
3162 | return 1; | |
3163 | } | |
3164 | ||
3165 | static int clean_shared_index_files(const char *current_hex) | |
3166 | { | |
3167 | struct dirent *de; | |
3168 | DIR *dir = opendir(get_git_dir()); | |
3169 | ||
3170 | if (!dir) | |
3171 | return error_errno(_("unable to open git dir: %s"), get_git_dir()); | |
3172 | ||
3173 | while ((de = readdir(dir)) != NULL) { | |
3174 | const char *sha1_hex; | |
3175 | const char *shared_index_path; | |
3176 | if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex)) | |
3177 | continue; | |
3178 | if (!strcmp(sha1_hex, current_hex)) | |
3179 | continue; | |
3180 | shared_index_path = git_path("%s", de->d_name); | |
3181 | if (should_delete_shared_index(shared_index_path) > 0 && | |
3182 | unlink(shared_index_path)) | |
3183 | warning_errno(_("unable to unlink: %s"), shared_index_path); | |
3184 | } | |
3185 | closedir(dir); | |
3186 | ||
3187 | return 0; | |
3188 | } | |
3189 | ||
3190 | static int write_shared_index(struct index_state *istate, | |
3191 | struct tempfile **temp) | |
3192 | { | |
3193 | struct split_index *si = istate->split_index; | |
3194 | int ret, was_full = !istate->sparse_index; | |
3195 | ||
3196 | move_cache_to_base_index(istate); | |
3197 | convert_to_sparse(istate, 0); | |
3198 | ||
3199 | trace2_region_enter_printf("index", "shared/do_write_index", | |
3200 | the_repository, "%s", get_tempfile_path(*temp)); | |
3201 | ret = do_write_index(si->base, *temp, 1); | |
3202 | trace2_region_leave_printf("index", "shared/do_write_index", | |
3203 | the_repository, "%s", get_tempfile_path(*temp)); | |
3204 | ||
3205 | if (was_full) | |
3206 | ensure_full_index(istate); | |
3207 | ||
3208 | if (ret) | |
3209 | return ret; | |
3210 | ret = adjust_shared_perm(get_tempfile_path(*temp)); | |
3211 | if (ret) { | |
3212 | error(_("cannot fix permission bits on '%s'"), get_tempfile_path(*temp)); | |
3213 | return ret; | |
3214 | } | |
3215 | ret = rename_tempfile(temp, | |
3216 | git_path("sharedindex.%s", oid_to_hex(&si->base->oid))); | |
3217 | if (!ret) { | |
3218 | oidcpy(&si->base_oid, &si->base->oid); | |
3219 | clean_shared_index_files(oid_to_hex(&si->base->oid)); | |
3220 | } | |
3221 | ||
3222 | return ret; | |
3223 | } | |
3224 | ||
3225 | static const int default_max_percent_split_change = 20; | |
3226 | ||
3227 | static int too_many_not_shared_entries(struct index_state *istate) | |
3228 | { | |
3229 | int i, not_shared = 0; | |
3230 | int max_split = git_config_get_max_percent_split_change(); | |
3231 | ||
3232 | switch (max_split) { | |
3233 | case -1: | |
3234 | /* not or badly configured: use the default value */ | |
3235 | max_split = default_max_percent_split_change; | |
3236 | break; | |
3237 | case 0: | |
3238 | return 1; /* 0% means always write a new shared index */ | |
3239 | case 100: | |
3240 | return 0; /* 100% means never write a new shared index */ | |
3241 | default: | |
3242 | break; /* just use the configured value */ | |
3243 | } | |
3244 | ||
3245 | /* Count not shared entries */ | |
3246 | for (i = 0; i < istate->cache_nr; i++) { | |
3247 | struct cache_entry *ce = istate->cache[i]; | |
3248 | if (!ce->index) | |
3249 | not_shared++; | |
3250 | } | |
3251 | ||
3252 | return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100; | |
3253 | } | |
3254 | ||
3255 | int write_locked_index(struct index_state *istate, struct lock_file *lock, | |
3256 | unsigned flags) | |
3257 | { | |
3258 | int new_shared_index, ret; | |
3259 | struct split_index *si = istate->split_index; | |
3260 | ||
3261 | if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) | |
3262 | cache_tree_verify(the_repository, istate); | |
3263 | ||
3264 | if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) { | |
3265 | if (flags & COMMIT_LOCK) | |
3266 | rollback_lock_file(lock); | |
3267 | return 0; | |
3268 | } | |
3269 | ||
3270 | if (istate->fsmonitor_last_update) | |
3271 | fill_fsmonitor_bitmap(istate); | |
3272 | ||
3273 | if (!si || alternate_index_output || | |
3274 | (istate->cache_changed & ~EXTMASK)) { | |
3275 | if (si) | |
3276 | oidclr(&si->base_oid); | |
3277 | ret = do_write_locked_index(istate, lock, flags); | |
3278 | goto out; | |
3279 | } | |
3280 | ||
3281 | if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) { | |
3282 | int v = si->base_oid.hash[0]; | |
3283 | if ((v & 15) < 6) | |
3284 | istate->cache_changed |= SPLIT_INDEX_ORDERED; | |
3285 | } | |
3286 | if (too_many_not_shared_entries(istate)) | |
3287 | istate->cache_changed |= SPLIT_INDEX_ORDERED; | |
3288 | ||
3289 | new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED; | |
3290 | ||
3291 | if (new_shared_index) { | |
3292 | struct tempfile *temp; | |
3293 | int saved_errno; | |
3294 | ||
3295 | /* Same initial permissions as the main .git/index file */ | |
3296 | temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666); | |
3297 | if (!temp) { | |
3298 | oidclr(&si->base_oid); | |
3299 | ret = do_write_locked_index(istate, lock, flags); | |
3300 | goto out; | |
3301 | } | |
3302 | ret = write_shared_index(istate, &temp); | |
3303 | ||
3304 | saved_errno = errno; | |
3305 | if (is_tempfile_active(temp)) | |
3306 | delete_tempfile(&temp); | |
3307 | errno = saved_errno; | |
3308 | ||
3309 | if (ret) | |
3310 | goto out; | |
3311 | } | |
3312 | ||
3313 | ret = write_split_index(istate, lock, flags); | |
3314 | ||
3315 | /* Freshen the shared index only if the split-index was written */ | |
3316 | if (!ret && !new_shared_index && !is_null_oid(&si->base_oid)) { | |
3317 | const char *shared_index = git_path("sharedindex.%s", | |
3318 | oid_to_hex(&si->base_oid)); | |
3319 | freshen_shared_index(shared_index, 1); | |
3320 | } | |
3321 | ||
3322 | out: | |
3323 | if (flags & COMMIT_LOCK) | |
3324 | rollback_lock_file(lock); | |
3325 | return ret; | |
3326 | } | |
3327 | ||
3328 | /* | |
3329 | * Read the index file that is potentially unmerged into given | |
3330 | * index_state, dropping any unmerged entries to stage #0 (potentially | |
3331 | * resulting in a path appearing as both a file and a directory in the | |
3332 | * index; the caller is responsible to clear out the extra entries | |
3333 | * before writing the index to a tree). Returns true if the index is | |
3334 | * unmerged. Callers who want to refuse to work from an unmerged | |
3335 | * state can call this and check its return value, instead of calling | |
3336 | * read_cache(). | |
3337 | */ | |
3338 | int repo_read_index_unmerged(struct repository *repo) | |
3339 | { | |
3340 | struct index_state *istate; | |
3341 | int i; | |
3342 | int unmerged = 0; | |
3343 | ||
3344 | repo_read_index(repo); | |
3345 | istate = repo->index; | |
3346 | for (i = 0; i < istate->cache_nr; i++) { | |
3347 | struct cache_entry *ce = istate->cache[i]; | |
3348 | struct cache_entry *new_ce; | |
3349 | int len; | |
3350 | ||
3351 | if (!ce_stage(ce)) | |
3352 | continue; | |
3353 | unmerged = 1; | |
3354 | len = ce_namelen(ce); | |
3355 | new_ce = make_empty_cache_entry(istate, len); | |
3356 | memcpy(new_ce->name, ce->name, len); | |
3357 | new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED; | |
3358 | new_ce->ce_namelen = len; | |
3359 | new_ce->ce_mode = ce->ce_mode; | |
3360 | if (add_index_entry(istate, new_ce, ADD_CACHE_SKIP_DFCHECK)) | |
3361 | return error(_("%s: cannot drop to stage #0"), | |
3362 | new_ce->name); | |
3363 | } | |
3364 | return unmerged; | |
3365 | } | |
3366 | ||
3367 | /* | |
3368 | * Returns 1 if the path is an "other" path with respect to | |
3369 | * the index; that is, the path is not mentioned in the index at all, | |
3370 | * either as a file, a directory with some files in the index, | |
3371 | * or as an unmerged entry. | |
3372 | * | |
3373 | * We helpfully remove a trailing "/" from directories so that | |
3374 | * the output of read_directory can be used as-is. | |
3375 | */ | |
3376 | int index_name_is_other(struct index_state *istate, const char *name, | |
3377 | int namelen) | |
3378 | { | |
3379 | int pos; | |
3380 | if (namelen && name[namelen - 1] == '/') | |
3381 | namelen--; | |
3382 | pos = index_name_pos(istate, name, namelen); | |
3383 | if (0 <= pos) | |
3384 | return 0; /* exact match */ | |
3385 | pos = -pos - 1; | |
3386 | if (pos < istate->cache_nr) { | |
3387 | struct cache_entry *ce = istate->cache[pos]; | |
3388 | if (ce_namelen(ce) == namelen && | |
3389 | !memcmp(ce->name, name, namelen)) | |
3390 | return 0; /* Yup, this one exists unmerged */ | |
3391 | } | |
3392 | return 1; | |
3393 | } | |
3394 | ||
3395 | void *read_blob_data_from_index(struct index_state *istate, | |
3396 | const char *path, unsigned long *size) | |
3397 | { | |
3398 | int pos, len; | |
3399 | unsigned long sz; | |
3400 | enum object_type type; | |
3401 | void *data; | |
3402 | ||
3403 | len = strlen(path); | |
3404 | pos = index_name_pos(istate, path, len); | |
3405 | if (pos < 0) { | |
3406 | /* | |
3407 | * We might be in the middle of a merge, in which | |
3408 | * case we would read stage #2 (ours). | |
3409 | */ | |
3410 | int i; | |
3411 | for (i = -pos - 1; | |
3412 | (pos < 0 && i < istate->cache_nr && | |
3413 | !strcmp(istate->cache[i]->name, path)); | |
3414 | i++) | |
3415 | if (ce_stage(istate->cache[i]) == 2) | |
3416 | pos = i; | |
3417 | } | |
3418 | if (pos < 0) | |
3419 | return NULL; | |
3420 | data = read_object_file(&istate->cache[pos]->oid, &type, &sz); | |
3421 | if (!data || type != OBJ_BLOB) { | |
3422 | free(data); | |
3423 | return NULL; | |
3424 | } | |
3425 | if (size) | |
3426 | *size = sz; | |
3427 | return data; | |
3428 | } | |
3429 | ||
3430 | void stat_validity_clear(struct stat_validity *sv) | |
3431 | { | |
3432 | FREE_AND_NULL(sv->sd); | |
3433 | } | |
3434 | ||
3435 | int stat_validity_check(struct stat_validity *sv, const char *path) | |
3436 | { | |
3437 | struct stat st; | |
3438 | ||
3439 | if (stat(path, &st) < 0) | |
3440 | return sv->sd == NULL; | |
3441 | if (!sv->sd) | |
3442 | return 0; | |
3443 | return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st); | |
3444 | } | |
3445 | ||
3446 | void stat_validity_update(struct stat_validity *sv, int fd) | |
3447 | { | |
3448 | struct stat st; | |
3449 | ||
3450 | if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode)) | |
3451 | stat_validity_clear(sv); | |
3452 | else { | |
3453 | if (!sv->sd) | |
3454 | CALLOC_ARRAY(sv->sd, 1); | |
3455 | fill_stat_data(sv->sd, &st); | |
3456 | } | |
3457 | } | |
3458 | ||
3459 | void move_index_extensions(struct index_state *dst, struct index_state *src) | |
3460 | { | |
3461 | dst->untracked = src->untracked; | |
3462 | src->untracked = NULL; | |
3463 | dst->cache_tree = src->cache_tree; | |
3464 | src->cache_tree = NULL; | |
3465 | } | |
3466 | ||
3467 | struct cache_entry *dup_cache_entry(const struct cache_entry *ce, | |
3468 | struct index_state *istate) | |
3469 | { | |
3470 | unsigned int size = ce_size(ce); | |
3471 | int mem_pool_allocated; | |
3472 | struct cache_entry *new_entry = make_empty_cache_entry(istate, ce_namelen(ce)); | |
3473 | mem_pool_allocated = new_entry->mem_pool_allocated; | |
3474 | ||
3475 | memcpy(new_entry, ce, size); | |
3476 | new_entry->mem_pool_allocated = mem_pool_allocated; | |
3477 | return new_entry; | |
3478 | } | |
3479 | ||
3480 | void discard_cache_entry(struct cache_entry *ce) | |
3481 | { | |
3482 | if (ce && should_validate_cache_entries()) | |
3483 | memset(ce, 0xCD, cache_entry_size(ce->ce_namelen)); | |
3484 | ||
3485 | if (ce && ce->mem_pool_allocated) | |
3486 | return; | |
3487 | ||
3488 | free(ce); | |
3489 | } | |
3490 | ||
3491 | int should_validate_cache_entries(void) | |
3492 | { | |
3493 | static int validate_index_cache_entries = -1; | |
3494 | ||
3495 | if (validate_index_cache_entries < 0) { | |
3496 | if (getenv("GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES")) | |
3497 | validate_index_cache_entries = 1; | |
3498 | else | |
3499 | validate_index_cache_entries = 0; | |
3500 | } | |
3501 | ||
3502 | return validate_index_cache_entries; | |
3503 | } | |
3504 | ||
3505 | #define EOIE_SIZE (4 + GIT_SHA1_RAWSZ) /* <4-byte offset> + <20-byte hash> */ | |
3506 | #define EOIE_SIZE_WITH_HEADER (4 + 4 + EOIE_SIZE) /* <4-byte signature> + <4-byte length> + EOIE_SIZE */ | |
3507 | ||
3508 | static size_t read_eoie_extension(const char *mmap, size_t mmap_size) | |
3509 | { | |
3510 | /* | |
3511 | * The end of index entries (EOIE) extension is guaranteed to be last | |
3512 | * so that it can be found by scanning backwards from the EOF. | |
3513 | * | |
3514 | * "EOIE" | |
3515 | * <4-byte length> | |
3516 | * <4-byte offset> | |
3517 | * <20-byte hash> | |
3518 | */ | |
3519 | const char *index, *eoie; | |
3520 | uint32_t extsize; | |
3521 | size_t offset, src_offset; | |
3522 | unsigned char hash[GIT_MAX_RAWSZ]; | |
3523 | git_hash_ctx c; | |
3524 | ||
3525 | /* ensure we have an index big enough to contain an EOIE extension */ | |
3526 | if (mmap_size < sizeof(struct cache_header) + EOIE_SIZE_WITH_HEADER + the_hash_algo->rawsz) | |
3527 | return 0; | |
3528 | ||
3529 | /* validate the extension signature */ | |
3530 | index = eoie = mmap + mmap_size - EOIE_SIZE_WITH_HEADER - the_hash_algo->rawsz; | |
3531 | if (CACHE_EXT(index) != CACHE_EXT_ENDOFINDEXENTRIES) | |
3532 | return 0; | |
3533 | index += sizeof(uint32_t); | |
3534 | ||
3535 | /* validate the extension size */ | |
3536 | extsize = get_be32(index); | |
3537 | if (extsize != EOIE_SIZE) | |
3538 | return 0; | |
3539 | index += sizeof(uint32_t); | |
3540 | ||
3541 | /* | |
3542 | * Validate the offset we're going to look for the first extension | |
3543 | * signature is after the index header and before the eoie extension. | |
3544 | */ | |
3545 | offset = get_be32(index); | |
3546 | if (mmap + offset < mmap + sizeof(struct cache_header)) | |
3547 | return 0; | |
3548 | if (mmap + offset >= eoie) | |
3549 | return 0; | |
3550 | index += sizeof(uint32_t); | |
3551 | ||
3552 | /* | |
3553 | * The hash is computed over extension types and their sizes (but not | |
3554 | * their contents). E.g. if we have "TREE" extension that is N-bytes | |
3555 | * long, "REUC" extension that is M-bytes long, followed by "EOIE", | |
3556 | * then the hash would be: | |
3557 | * | |
3558 | * SHA-1("TREE" + <binary representation of N> + | |
3559 | * "REUC" + <binary representation of M>) | |
3560 | */ | |
3561 | src_offset = offset; | |
3562 | the_hash_algo->init_fn(&c); | |
3563 | while (src_offset < mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER) { | |
3564 | /* After an array of active_nr index entries, | |
3565 | * there can be arbitrary number of extended | |
3566 | * sections, each of which is prefixed with | |
3567 | * extension name (4-byte) and section length | |
3568 | * in 4-byte network byte order. | |
3569 | */ | |
3570 | uint32_t extsize; | |
3571 | memcpy(&extsize, mmap + src_offset + 4, 4); | |
3572 | extsize = ntohl(extsize); | |
3573 | ||
3574 | /* verify the extension size isn't so large it will wrap around */ | |
3575 | if (src_offset + 8 + extsize < src_offset) | |
3576 | return 0; | |
3577 | ||
3578 | the_hash_algo->update_fn(&c, mmap + src_offset, 8); | |
3579 | ||
3580 | src_offset += 8; | |
3581 | src_offset += extsize; | |
3582 | } | |
3583 | the_hash_algo->final_fn(hash, &c); | |
3584 | if (!hasheq(hash, (const unsigned char *)index)) | |
3585 | return 0; | |
3586 | ||
3587 | /* Validate that the extension offsets returned us back to the eoie extension. */ | |
3588 | if (src_offset != mmap_size - the_hash_algo->rawsz - EOIE_SIZE_WITH_HEADER) | |
3589 | return 0; | |
3590 | ||
3591 | return offset; | |
3592 | } | |
3593 | ||
3594 | static void write_eoie_extension(struct strbuf *sb, git_hash_ctx *eoie_context, size_t offset) | |
3595 | { | |
3596 | uint32_t buffer; | |
3597 | unsigned char hash[GIT_MAX_RAWSZ]; | |
3598 | ||
3599 | /* offset */ | |
3600 | put_be32(&buffer, offset); | |
3601 | strbuf_add(sb, &buffer, sizeof(uint32_t)); | |
3602 | ||
3603 | /* hash */ | |
3604 | the_hash_algo->final_fn(hash, eoie_context); | |
3605 | strbuf_add(sb, hash, the_hash_algo->rawsz); | |
3606 | } | |
3607 | ||
3608 | #define IEOT_VERSION (1) | |
3609 | ||
3610 | static struct index_entry_offset_table *read_ieot_extension(const char *mmap, size_t mmap_size, size_t offset) | |
3611 | { | |
3612 | const char *index = NULL; | |
3613 | uint32_t extsize, ext_version; | |
3614 | struct index_entry_offset_table *ieot; | |
3615 | int i, nr; | |
3616 | ||
3617 | /* find the IEOT extension */ | |
3618 | if (!offset) | |
3619 | return NULL; | |
3620 | while (offset <= mmap_size - the_hash_algo->rawsz - 8) { | |
3621 | extsize = get_be32(mmap + offset + 4); | |
3622 | if (CACHE_EXT((mmap + offset)) == CACHE_EXT_INDEXENTRYOFFSETTABLE) { | |
3623 | index = mmap + offset + 4 + 4; | |
3624 | break; | |
3625 | } | |
3626 | offset += 8; | |
3627 | offset += extsize; | |
3628 | } | |
3629 | if (!index) | |
3630 | return NULL; | |
3631 | ||
3632 | /* validate the version is IEOT_VERSION */ | |
3633 | ext_version = get_be32(index); | |
3634 | if (ext_version != IEOT_VERSION) { | |
3635 | error("invalid IEOT version %d", ext_version); | |
3636 | return NULL; | |
3637 | } | |
3638 | index += sizeof(uint32_t); | |
3639 | ||
3640 | /* extension size - version bytes / bytes per entry */ | |
3641 | nr = (extsize - sizeof(uint32_t)) / (sizeof(uint32_t) + sizeof(uint32_t)); | |
3642 | if (!nr) { | |
3643 | error("invalid number of IEOT entries %d", nr); | |
3644 | return NULL; | |
3645 | } | |
3646 | ieot = xmalloc(sizeof(struct index_entry_offset_table) | |
3647 | + (nr * sizeof(struct index_entry_offset))); | |
3648 | ieot->nr = nr; | |
3649 | for (i = 0; i < nr; i++) { | |
3650 | ieot->entries[i].offset = get_be32(index); | |
3651 | index += sizeof(uint32_t); | |
3652 | ieot->entries[i].nr = get_be32(index); | |
3653 | index += sizeof(uint32_t); | |
3654 | } | |
3655 | ||
3656 | return ieot; | |
3657 | } | |
3658 | ||
3659 | static void write_ieot_extension(struct strbuf *sb, struct index_entry_offset_table *ieot) | |
3660 | { | |
3661 | uint32_t buffer; | |
3662 | int i; | |
3663 | ||
3664 | /* version */ | |
3665 | put_be32(&buffer, IEOT_VERSION); | |
3666 | strbuf_add(sb, &buffer, sizeof(uint32_t)); | |
3667 | ||
3668 | /* ieot */ | |
3669 | for (i = 0; i < ieot->nr; i++) { | |
3670 | ||
3671 | /* offset */ | |
3672 | put_be32(&buffer, ieot->entries[i].offset); | |
3673 | strbuf_add(sb, &buffer, sizeof(uint32_t)); | |
3674 | ||
3675 | /* count */ | |
3676 | put_be32(&buffer, ieot->entries[i].nr); | |
3677 | strbuf_add(sb, &buffer, sizeof(uint32_t)); | |
3678 | } | |
3679 | } | |
3680 | ||
3681 | void prefetch_cache_entries(const struct index_state *istate, | |
3682 | must_prefetch_predicate must_prefetch) | |
3683 | { | |
3684 | int i; | |
3685 | struct oid_array to_fetch = OID_ARRAY_INIT; | |
3686 | ||
3687 | for (i = 0; i < istate->cache_nr; i++) { | |
3688 | struct cache_entry *ce = istate->cache[i]; | |
3689 | ||
3690 | if (S_ISGITLINK(ce->ce_mode) || !must_prefetch(ce)) | |
3691 | continue; | |
3692 | if (!oid_object_info_extended(the_repository, &ce->oid, | |
3693 | NULL, | |
3694 | OBJECT_INFO_FOR_PREFETCH)) | |
3695 | continue; | |
3696 | oid_array_append(&to_fetch, &ce->oid); | |
3697 | } | |
3698 | promisor_remote_get_direct(the_repository, | |
3699 | to_fetch.oid, to_fetch.nr); | |
3700 | oid_array_clear(&to_fetch); | |
3701 | } |