Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 6 | #define NO_THE_INDEX_COMPATIBILITY_MACROS |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 7 | #include "cache.h" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 8 | #include "cache-tree.h" |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 9 | #include "refs.h" |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 10 | #include "dir.h" |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 11 | #include "tree.h" |
| 12 | #include "commit.h" |
| 13 | #include "diff.h" |
| 14 | #include "diffcore.h" |
| 15 | #include "revision.h" |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 16 | #include "blob.h" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 17 | |
| 18 | /* Index extensions. |
| 19 | * |
| 20 | * The first letter should be 'A'..'Z' for extensions that are not |
| 21 | * necessary for a correct operation (i.e. optimization data). |
| 22 | * When new extensions are added that _needs_ to be understood in |
| 23 | * order to correctly interpret the index file, pick character that |
| 24 | * is outside the range, to cause the reader to abort. |
| 25 | */ |
| 26 | |
| 27 | #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) |
| 28 | #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 29 | |
Junio C Hamano | 228e94f | 2007-04-01 18:14:06 -0700 | [diff] [blame] | 30 | struct index_state the_index; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 31 | |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 32 | static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 33 | { |
| 34 | istate->cache[nr] = ce; |
Linus Torvalds | 96872bc | 2008-03-21 13:16:24 -0700 | [diff] [blame] | 35 | add_name_hash(istate, ce); |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 36 | } |
| 37 | |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 38 | static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 39 | { |
| 40 | struct cache_entry *old = istate->cache[nr]; |
| 41 | |
Linus Torvalds | 96872bc | 2008-03-21 13:16:24 -0700 | [diff] [blame] | 42 | remove_name_hash(old); |
Linus Torvalds | a22c637 | 2008-02-22 20:37:40 -0800 | [diff] [blame] | 43 | set_index_entry(istate, nr, ce); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 44 | istate->cache_changed = 1; |
| 45 | } |
| 46 | |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 47 | void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name) |
| 48 | { |
| 49 | struct cache_entry *old = istate->cache[nr], *new; |
| 50 | int namelen = strlen(new_name); |
| 51 | |
| 52 | new = xmalloc(cache_entry_size(namelen)); |
| 53 | copy_cache_entry(new, old); |
| 54 | new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK); |
| 55 | new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen); |
| 56 | memcpy(new->name, new_name, namelen + 1); |
| 57 | |
| 58 | cache_tree_invalidate_path(istate->cache_tree, old->name); |
| 59 | remove_index_entry_at(istate, nr); |
| 60 | add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); |
| 61 | } |
| 62 | |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 63 | /* |
| 64 | * This only updates the "non-critical" parts of the directory |
| 65 | * cache, ie the parts that aren't tracked by GIT, and only used |
| 66 | * to validate the cache. |
| 67 | */ |
| 68 | void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) |
| 69 | { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 70 | ce->ce_ctime = st->st_ctime; |
| 71 | ce->ce_mtime = st->st_mtime; |
| 72 | ce->ce_dev = st->st_dev; |
| 73 | ce->ce_ino = st->st_ino; |
| 74 | ce->ce_uid = st->st_uid; |
| 75 | ce->ce_gid = st->st_gid; |
| 76 | ce->ce_size = st->st_size; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 77 | |
| 78 | if (assume_unchanged) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 79 | ce->ce_flags |= CE_VALID; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 80 | |
| 81 | if (S_ISREG(st->st_mode)) |
| 82 | ce_mark_uptodate(ce); |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 83 | } |
| 84 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 85 | static int ce_compare_data(struct cache_entry *ce, struct stat *st) |
| 86 | { |
| 87 | int match = -1; |
| 88 | int fd = open(ce->name, O_RDONLY); |
| 89 | |
| 90 | if (fd >= 0) { |
| 91 | unsigned char sha1[20]; |
Junio C Hamano | 53bca91 | 2007-02-28 11:52:04 -0800 | [diff] [blame] | 92 | if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name)) |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 93 | match = hashcmp(sha1, ce->sha1); |
Linus Torvalds | 7f8508e | 2006-07-31 09:55:15 -0700 | [diff] [blame] | 94 | /* index_fd() closed the file descriptor already */ |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 95 | } |
| 96 | return match; |
| 97 | } |
| 98 | |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 99 | static int ce_compare_link(struct cache_entry *ce, size_t expected_size) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 100 | { |
| 101 | int match = -1; |
| 102 | char *target; |
| 103 | void *buffer; |
| 104 | unsigned long size; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 105 | enum object_type type; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 106 | int len; |
| 107 | |
| 108 | target = xmalloc(expected_size); |
| 109 | len = readlink(ce->name, target, expected_size); |
| 110 | if (len != expected_size) { |
| 111 | free(target); |
| 112 | return -1; |
| 113 | } |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 114 | buffer = read_sha1_file(ce->sha1, &type, &size); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 115 | if (!buffer) { |
| 116 | free(target); |
| 117 | return -1; |
| 118 | } |
| 119 | if (size == expected_size) |
| 120 | match = memcmp(buffer, target, size); |
| 121 | free(buffer); |
| 122 | free(target); |
| 123 | return match; |
| 124 | } |
| 125 | |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 126 | static int ce_compare_gitlink(struct cache_entry *ce) |
| 127 | { |
| 128 | unsigned char sha1[20]; |
| 129 | |
| 130 | /* |
| 131 | * We don't actually require that the .git directory |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 132 | * under GITLINK directory be a valid git directory. It |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 133 | * might even be missing (in case nobody populated that |
| 134 | * sub-project). |
| 135 | * |
| 136 | * If so, we consider it always to match. |
| 137 | */ |
| 138 | if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0) |
| 139 | return 0; |
| 140 | return hashcmp(sha1, ce->sha1); |
| 141 | } |
| 142 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 143 | static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st) |
| 144 | { |
| 145 | switch (st->st_mode & S_IFMT) { |
| 146 | case S_IFREG: |
| 147 | if (ce_compare_data(ce, st)) |
| 148 | return DATA_CHANGED; |
| 149 | break; |
| 150 | case S_IFLNK: |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 151 | if (ce_compare_link(ce, xsize_t(st->st_size))) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 152 | return DATA_CHANGED; |
| 153 | break; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 154 | case S_IFDIR: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 155 | if (S_ISGITLINK(ce->ce_mode)) |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 156 | return ce_compare_gitlink(ce) ? DATA_CHANGED : 0; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 157 | default: |
| 158 | return TYPE_CHANGED; |
| 159 | } |
| 160 | return 0; |
| 161 | } |
| 162 | |
Jeff King | f55527f | 2008-10-21 09:54:19 -0400 | [diff] [blame] | 163 | int is_empty_blob_sha1(const unsigned char *sha1) |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 164 | { |
| 165 | static const unsigned char empty_blob_sha1[20] = { |
| 166 | 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b, |
| 167 | 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91 |
| 168 | }; |
| 169 | |
| 170 | return !hashcmp(sha1, empty_blob_sha1); |
| 171 | } |
| 172 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 173 | static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 174 | { |
| 175 | unsigned int changed = 0; |
| 176 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 177 | if (ce->ce_flags & CE_REMOVE) |
| 178 | return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; |
| 179 | |
| 180 | switch (ce->ce_mode & S_IFMT) { |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 181 | case S_IFREG: |
| 182 | changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 183 | /* We consider only the owner x bit to be relevant for |
| 184 | * "mode changes" |
| 185 | */ |
| 186 | if (trust_executable_bit && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 187 | (0100 & (ce->ce_mode ^ st->st_mode))) |
Kay Sievers | ffbe1ad | 2005-05-06 15:45:01 +0200 | [diff] [blame] | 188 | changed |= MODE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 189 | break; |
| 190 | case S_IFLNK: |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 191 | if (!S_ISLNK(st->st_mode) && |
| 192 | (has_symlinks || !S_ISREG(st->st_mode))) |
| 193 | changed |= TYPE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 194 | break; |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 195 | case S_IFGITLINK: |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 196 | /* We ignore most of the st_xxx fields for gitlinks */ |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 197 | if (!S_ISDIR(st->st_mode)) |
| 198 | changed |= TYPE_CHANGED; |
| 199 | else if (ce_compare_gitlink(ce)) |
| 200 | changed |= DATA_CHANGED; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 201 | return changed; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 202 | default: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 203 | die("internal error: ce_mode is %o", ce->ce_mode); |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 204 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 205 | if (ce->ce_mtime != (unsigned int) st->st_mtime) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 206 | changed |= MTIME_CHANGED; |
Alex Riesen | 1ce4790 | 2008-07-28 08:31:28 +0200 | [diff] [blame] | 207 | if (trust_ctime && ce->ce_ctime != (unsigned int) st->st_ctime) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 208 | changed |= CTIME_CHANGED; |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 209 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 210 | if (ce->ce_uid != (unsigned int) st->st_uid || |
| 211 | ce->ce_gid != (unsigned int) st->st_gid) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 212 | changed |= OWNER_CHANGED; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 213 | if (ce->ce_ino != (unsigned int) st->st_ino) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 214 | changed |= INODE_CHANGED; |
Linus Torvalds | 2cb45e9 | 2005-05-22 15:08:15 -0700 | [diff] [blame] | 215 | |
| 216 | #ifdef USE_STDEV |
| 217 | /* |
| 218 | * st_dev breaks on network filesystems where different |
| 219 | * clients will have different views of what "device" |
| 220 | * the filesystem is on |
| 221 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 222 | if (ce->ce_dev != (unsigned int) st->st_dev) |
Linus Torvalds | 2cb45e9 | 2005-05-22 15:08:15 -0700 | [diff] [blame] | 223 | changed |= INODE_CHANGED; |
| 224 | #endif |
| 225 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 226 | if (ce->ce_size != (unsigned int) st->st_size) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 227 | changed |= DATA_CHANGED; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 228 | |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 229 | /* Racily smudged entry? */ |
| 230 | if (!ce->ce_size) { |
| 231 | if (!is_empty_blob_sha1(ce->sha1)) |
| 232 | changed |= DATA_CHANGED; |
| 233 | } |
| 234 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 235 | return changed; |
| 236 | } |
| 237 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 238 | static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce) |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 239 | { |
Junio C Hamano | 050288d | 2008-05-03 17:24:28 -0700 | [diff] [blame] | 240 | return (!S_ISGITLINK(ce->ce_mode) && |
| 241 | istate->timestamp && |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 242 | ((unsigned int)istate->timestamp) <= ce->ce_mtime); |
| 243 | } |
| 244 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 245 | int ie_match_stat(const struct index_state *istate, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 246 | struct cache_entry *ce, struct stat *st, |
| 247 | unsigned int options) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 248 | { |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 249 | unsigned int changed; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 250 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
| 251 | int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 252 | |
| 253 | /* |
| 254 | * If it's marked as always valid in the index, it's |
| 255 | * valid whatever the checked-out copy says. |
| 256 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 257 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 258 | return 0; |
| 259 | |
| 260 | changed = ce_match_stat_basic(ce, st); |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 261 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 262 | /* |
| 263 | * Within 1 second of this sequence: |
| 264 | * echo xyzzy >file && git-update-index --add file |
| 265 | * running this command: |
| 266 | * echo frotz >file |
| 267 | * would give a falsely clean cache entry. The mtime and |
| 268 | * length match the cache, and other stat fields do not change. |
| 269 | * |
| 270 | * We could detect this at update-index time (the cache entry |
| 271 | * being registered/updated records the same time as "now") |
| 272 | * and delay the return from git-update-index, but that would |
| 273 | * effectively mean we can make at most one commit per second, |
| 274 | * which is not acceptable. Instead, we check cache entries |
| 275 | * whose mtime are the same as the index file timestamp more |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 276 | * carefully than others. |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 277 | */ |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 278 | if (!changed && is_racy_timestamp(istate, ce)) { |
Junio C Hamano | 42f7740 | 2006-08-15 21:38:07 -0700 | [diff] [blame] | 279 | if (assume_racy_is_modified) |
| 280 | changed |= DATA_CHANGED; |
| 281 | else |
| 282 | changed |= ce_modified_check_fs(ce, st); |
| 283 | } |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 284 | |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 285 | return changed; |
| 286 | } |
| 287 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 288 | int ie_modified(const struct index_state *istate, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 289 | struct cache_entry *ce, struct stat *st, unsigned int options) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 290 | { |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 291 | int changed, changed_fs; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 292 | |
| 293 | changed = ie_match_stat(istate, ce, st, options); |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 294 | if (!changed) |
| 295 | return 0; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 296 | /* |
| 297 | * If the mode or type has changed, there's no point in trying |
| 298 | * to refresh the entry - it's not going to match |
| 299 | */ |
| 300 | if (changed & (MODE_CHANGED | TYPE_CHANGED)) |
| 301 | return changed; |
| 302 | |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 303 | /* |
| 304 | * Immediately after read-tree or update-index --cacheinfo, |
| 305 | * the length field is zero, as we have never even read the |
| 306 | * lstat(2) information once, and we cannot trust DATA_CHANGED |
| 307 | * returned by ie_match_stat() which in turn was returned by |
| 308 | * ce_match_stat_basic() to signal that the filesize of the |
| 309 | * blob changed. We have to actually go to the filesystem to |
| 310 | * see if the contents match, and if so, should answer "unchanged". |
| 311 | * |
| 312 | * The logic does not apply to gitlinks, as ce_match_stat_basic() |
| 313 | * already has checked the actual HEAD from the filesystem in the |
| 314 | * subproject. If ie_match_stat() already said it is different, |
| 315 | * then we know it is. |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 316 | */ |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 317 | if ((changed & DATA_CHANGED) && |
| 318 | (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0)) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 319 | return changed; |
| 320 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 321 | changed_fs = ce_modified_check_fs(ce, st); |
| 322 | if (changed_fs) |
| 323 | return changed | changed_fs; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 324 | return 0; |
| 325 | } |
| 326 | |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 327 | int base_name_compare(const char *name1, int len1, int mode1, |
| 328 | const char *name2, int len2, int mode2) |
| 329 | { |
| 330 | unsigned char c1, c2; |
| 331 | int len = len1 < len2 ? len1 : len2; |
| 332 | int cmp; |
| 333 | |
| 334 | cmp = memcmp(name1, name2, len); |
| 335 | if (cmp) |
| 336 | return cmp; |
| 337 | c1 = name1[len]; |
| 338 | c2 = name2[len]; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 339 | if (!c1 && S_ISDIR(mode1)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 340 | c1 = '/'; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 341 | if (!c2 && S_ISDIR(mode2)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 342 | c2 = '/'; |
| 343 | return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; |
| 344 | } |
| 345 | |
Linus Torvalds | 0ab9e1e | 2008-03-05 18:25:10 -0800 | [diff] [blame] | 346 | /* |
| 347 | * df_name_compare() is identical to base_name_compare(), except it |
| 348 | * compares conflicting directory/file entries as equal. Note that |
| 349 | * while a directory name compares as equal to a regular file, they |
| 350 | * then individually compare _differently_ to a filename that has |
| 351 | * a dot after the basename (because '\0' < '.' < '/'). |
| 352 | * |
| 353 | * This is used by routines that want to traverse the git namespace |
| 354 | * but then handle conflicting entries together when possible. |
| 355 | */ |
| 356 | int df_name_compare(const char *name1, int len1, int mode1, |
| 357 | const char *name2, int len2, int mode2) |
| 358 | { |
| 359 | int len = len1 < len2 ? len1 : len2, cmp; |
| 360 | unsigned char c1, c2; |
| 361 | |
| 362 | cmp = memcmp(name1, name2, len); |
| 363 | if (cmp) |
| 364 | return cmp; |
| 365 | /* Directories and files compare equal (same length, same name) */ |
| 366 | if (len1 == len2) |
| 367 | return 0; |
| 368 | c1 = name1[len]; |
| 369 | if (!c1 && S_ISDIR(mode1)) |
| 370 | c1 = '/'; |
| 371 | c2 = name2[len]; |
| 372 | if (!c2 && S_ISDIR(mode2)) |
| 373 | c2 = '/'; |
| 374 | if (c1 == '/' && !c2) |
| 375 | return 0; |
| 376 | if (c2 == '/' && !c1) |
| 377 | return 0; |
| 378 | return c1 - c2; |
| 379 | } |
| 380 | |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 381 | int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2) |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 382 | { |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 383 | int len1 = flags1 & CE_NAMEMASK; |
| 384 | int len2 = flags2 & CE_NAMEMASK; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 385 | int len = len1 < len2 ? len1 : len2; |
| 386 | int cmp; |
| 387 | |
| 388 | cmp = memcmp(name1, name2, len); |
| 389 | if (cmp) |
| 390 | return cmp; |
| 391 | if (len1 < len2) |
| 392 | return -1; |
| 393 | if (len1 > len2) |
| 394 | return 1; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 395 | |
Junio C Hamano | 7b80be1 | 2006-02-12 23:46:25 -0800 | [diff] [blame] | 396 | /* Compare stages */ |
| 397 | flags1 &= CE_STAGEMASK; |
| 398 | flags2 &= CE_STAGEMASK; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 399 | |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 400 | if (flags1 < flags2) |
| 401 | return -1; |
| 402 | if (flags1 > flags2) |
| 403 | return 1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 404 | return 0; |
| 405 | } |
| 406 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 407 | int index_name_pos(const struct index_state *istate, const char *name, int namelen) |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 408 | { |
| 409 | int first, last; |
| 410 | |
| 411 | first = 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 412 | last = istate->cache_nr; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 413 | while (last > first) { |
| 414 | int next = (last + first) >> 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 415 | struct cache_entry *ce = istate->cache[next]; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 416 | int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags); |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 417 | if (!cmp) |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 418 | return next; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 419 | if (cmp < 0) { |
| 420 | last = next; |
| 421 | continue; |
| 422 | } |
| 423 | first = next+1; |
| 424 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 425 | return -first-1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 426 | } |
| 427 | |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 428 | /* Remove entry, return true if there are more entries to go.. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 429 | int remove_index_entry_at(struct index_state *istate, int pos) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 430 | { |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 431 | struct cache_entry *ce = istate->cache[pos]; |
| 432 | |
Linus Torvalds | 96872bc | 2008-03-21 13:16:24 -0700 | [diff] [blame] | 433 | remove_name_hash(ce); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 434 | istate->cache_changed = 1; |
| 435 | istate->cache_nr--; |
| 436 | if (pos >= istate->cache_nr) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 437 | return 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 438 | memmove(istate->cache + pos, |
| 439 | istate->cache + pos + 1, |
| 440 | (istate->cache_nr - pos) * sizeof(struct cache_entry *)); |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 441 | return 1; |
| 442 | } |
| 443 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 444 | int remove_file_from_index(struct index_state *istate, const char *path) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 445 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 446 | int pos = index_name_pos(istate, path, strlen(path)); |
Junio C Hamano | c4e3cca | 2005-04-17 09:53:35 -0700 | [diff] [blame] | 447 | if (pos < 0) |
| 448 | pos = -pos-1; |
Junio C Hamano | 09d5dc3 | 2007-09-13 20:33:11 -0700 | [diff] [blame] | 449 | cache_tree_invalidate_path(istate->cache_tree, path); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 450 | while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) |
| 451 | remove_index_entry_at(istate, pos); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 452 | return 0; |
| 453 | } |
| 454 | |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 455 | static int compare_name(struct cache_entry *ce, const char *path, int namelen) |
| 456 | { |
| 457 | return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); |
| 458 | } |
| 459 | |
| 460 | static int index_name_pos_also_unmerged(struct index_state *istate, |
| 461 | const char *path, int namelen) |
| 462 | { |
| 463 | int pos = index_name_pos(istate, path, namelen); |
| 464 | struct cache_entry *ce; |
| 465 | |
| 466 | if (pos >= 0) |
| 467 | return pos; |
| 468 | |
| 469 | /* maybe unmerged? */ |
| 470 | pos = -1 - pos; |
| 471 | if (pos >= istate->cache_nr || |
| 472 | compare_name((ce = istate->cache[pos]), path, namelen)) |
| 473 | return -1; |
| 474 | |
| 475 | /* order of preference: stage 2, 1, 3 */ |
| 476 | if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr && |
| 477 | ce_stage((ce = istate->cache[pos + 1])) == 2 && |
| 478 | !compare_name(ce, path, namelen)) |
| 479 | pos++; |
| 480 | return pos; |
| 481 | } |
| 482 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 483 | static int different_name(struct cache_entry *ce, struct cache_entry *alias) |
| 484 | { |
| 485 | int len = ce_namelen(ce); |
| 486 | return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len); |
| 487 | } |
| 488 | |
| 489 | /* |
| 490 | * If we add a filename that aliases in the cache, we will use the |
| 491 | * name that we already have - but we don't want to update the same |
| 492 | * alias twice, because that implies that there were actually two |
| 493 | * different files with aliasing names! |
| 494 | * |
| 495 | * So we use the CE_ADDED flag to verify that the alias was an old |
| 496 | * one before we accept it as |
| 497 | */ |
| 498 | static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias) |
| 499 | { |
| 500 | int len; |
| 501 | struct cache_entry *new; |
| 502 | |
| 503 | if (alias->ce_flags & CE_ADDED) |
| 504 | die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); |
| 505 | |
| 506 | /* Ok, create the new entry using the name of the existing alias */ |
| 507 | len = ce_namelen(alias); |
| 508 | new = xcalloc(1, cache_entry_size(len)); |
| 509 | memcpy(new->name, alias->name, len); |
| 510 | copy_cache_entry(new, ce); |
| 511 | free(ce); |
| 512 | return new; |
| 513 | } |
| 514 | |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 515 | static void record_intent_to_add(struct cache_entry *ce) |
| 516 | { |
| 517 | unsigned char sha1[20]; |
| 518 | if (write_sha1_file("", 0, blob_type, sha1)) |
| 519 | die("cannot create an empty blob in the object database"); |
| 520 | hashcpy(ce->sha1, sha1); |
| 521 | } |
| 522 | |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 523 | int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags) |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 524 | { |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 525 | int size, namelen, was_same; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 526 | mode_t st_mode = st->st_mode; |
Linus Torvalds | 6835550 | 2008-03-22 13:19:49 -0700 | [diff] [blame] | 527 | struct cache_entry *ce, *alias; |
Junio C Hamano | fb63d7f | 2007-11-09 18:22:52 -0800 | [diff] [blame] | 528 | unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_RACY_IS_DIRTY; |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 529 | int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); |
| 530 | int pretend = flags & ADD_CACHE_PRETEND; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 531 | int intent_only = flags & ADD_CACHE_INTENT; |
| 532 | int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| |
| 533 | (intent_only ? ADD_CACHE_NEW_ONLY : 0)); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 534 | |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 535 | if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) |
Alex Riesen | 960b8ad | 2008-05-12 19:57:45 +0200 | [diff] [blame] | 536 | return error("%s: can only add regular files, symbolic links or git-directories", path); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 537 | |
| 538 | namelen = strlen(path); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 539 | if (S_ISDIR(st_mode)) { |
Linus Torvalds | 0959525 | 2007-04-11 14:49:44 -0700 | [diff] [blame] | 540 | while (namelen && path[namelen-1] == '/') |
| 541 | namelen--; |
| 542 | } |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 543 | size = cache_entry_size(namelen); |
| 544 | ce = xcalloc(1, size); |
| 545 | memcpy(ce->name, path, namelen); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 546 | ce->ce_flags = namelen; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 547 | if (!intent_only) |
| 548 | fill_stat_cache_info(ce, st); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 549 | |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 550 | if (trust_executable_bit && has_symlinks) |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 551 | ce->ce_mode = create_ce_mode(st_mode); |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 552 | else { |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 553 | /* If there is an existing entry, pick the mode bits and type |
| 554 | * from it, otherwise assume unexecutable regular file. |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 555 | */ |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 556 | struct cache_entry *ent; |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 557 | int pos = index_name_pos_also_unmerged(istate, path, namelen); |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 558 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 559 | ent = (0 <= pos) ? istate->cache[pos] : NULL; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 560 | ce->ce_mode = ce_mode_from_stat(ent, st_mode); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 561 | } |
| 562 | |
Linus Torvalds | 6835550 | 2008-03-22 13:19:49 -0700 | [diff] [blame] | 563 | alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 564 | if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { |
Junio C Hamano | 0781b8a | 2007-07-30 17:12:58 -0700 | [diff] [blame] | 565 | /* Nothing changed, really */ |
| 566 | free(ce); |
Linus Torvalds | 6835550 | 2008-03-22 13:19:49 -0700 | [diff] [blame] | 567 | ce_mark_uptodate(alias); |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 568 | alias->ce_flags |= CE_ADDED; |
Junio C Hamano | 0781b8a | 2007-07-30 17:12:58 -0700 | [diff] [blame] | 569 | return 0; |
| 570 | } |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 571 | if (!intent_only) { |
| 572 | if (index_path(ce->sha1, path, st, 1)) |
| 573 | return error("unable to index file %s", path); |
| 574 | } else |
| 575 | record_intent_to_add(ce); |
| 576 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 577 | if (ignore_case && alias && different_name(ce, alias)) |
| 578 | ce = create_alias_ce(ce, alias); |
| 579 | ce->ce_flags |= CE_ADDED; |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 580 | |
Junio C Hamano | 3bf0dd1 | 2008-07-16 18:48:58 -0700 | [diff] [blame] | 581 | /* It was suspected to be racily clean, but it turns out to be Ok */ |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 582 | was_same = (alias && |
| 583 | !ce_stage(alias) && |
| 584 | !hashcmp(alias->sha1, ce->sha1) && |
| 585 | ce->ce_mode == alias->ce_mode); |
| 586 | |
| 587 | if (pretend) |
| 588 | ; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 589 | else if (add_index_entry(istate, ce, add_option)) |
Alex Riesen | 960b8ad | 2008-05-12 19:57:45 +0200 | [diff] [blame] | 590 | return error("unable to add %s to index",path); |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 591 | if (verbose && !was_same) |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 592 | printf("add '%s'\n", path); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 593 | return 0; |
| 594 | } |
| 595 | |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 596 | int add_file_to_index(struct index_state *istate, const char *path, int flags) |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 597 | { |
| 598 | struct stat st; |
| 599 | if (lstat(path, &st)) |
| 600 | die("%s: unable to stat (%s)", path, strerror(errno)); |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 601 | return add_to_index(istate, path, &st, flags); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 602 | } |
| 603 | |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 604 | struct cache_entry *make_cache_entry(unsigned int mode, |
| 605 | const unsigned char *sha1, const char *path, int stage, |
| 606 | int refresh) |
| 607 | { |
| 608 | int size, len; |
| 609 | struct cache_entry *ce; |
| 610 | |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 611 | if (!verify_path(path)) { |
| 612 | error("Invalid path '%s'", path); |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 613 | return NULL; |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 614 | } |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 615 | |
| 616 | len = strlen(path); |
| 617 | size = cache_entry_size(len); |
| 618 | ce = xcalloc(1, size); |
| 619 | |
| 620 | hashcpy(ce->sha1, sha1); |
| 621 | memcpy(ce->name, path, len); |
| 622 | ce->ce_flags = create_ce_flags(len, stage); |
| 623 | ce->ce_mode = create_ce_mode(mode); |
| 624 | |
| 625 | if (refresh) |
| 626 | return refresh_cache_entry(ce, 0); |
| 627 | |
| 628 | return ce; |
| 629 | } |
| 630 | |
Brad Roberts | dbbce55 | 2005-05-14 19:04:25 -0700 | [diff] [blame] | 631 | int ce_same_name(struct cache_entry *a, struct cache_entry *b) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 632 | { |
| 633 | int len = ce_namelen(a); |
| 634 | return ce_namelen(b) == len && !memcmp(a->name, b->name, len); |
| 635 | } |
| 636 | |
Linus Torvalds | c0fd1f5 | 2005-07-14 16:55:06 -0700 | [diff] [blame] | 637 | int ce_path_match(const struct cache_entry *ce, const char **pathspec) |
| 638 | { |
| 639 | const char *match, *name; |
| 640 | int len; |
| 641 | |
| 642 | if (!pathspec) |
| 643 | return 1; |
| 644 | |
| 645 | len = ce_namelen(ce); |
| 646 | name = ce->name; |
| 647 | while ((match = *pathspec++) != NULL) { |
| 648 | int matchlen = strlen(match); |
| 649 | if (matchlen > len) |
| 650 | continue; |
| 651 | if (memcmp(name, match, matchlen)) |
| 652 | continue; |
| 653 | if (matchlen && name[matchlen-1] == '/') |
| 654 | return 1; |
| 655 | if (name[matchlen] == '/' || !name[matchlen]) |
| 656 | return 1; |
Linus Torvalds | f332726 | 2005-08-16 20:44:32 -0700 | [diff] [blame] | 657 | if (!matchlen) |
| 658 | return 1; |
Linus Torvalds | c0fd1f5 | 2005-07-14 16:55:06 -0700 | [diff] [blame] | 659 | } |
| 660 | return 0; |
| 661 | } |
| 662 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 663 | /* |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 664 | * We fundamentally don't like some paths: we don't want |
| 665 | * dot or dot-dot anywhere, and for obvious reasons don't |
| 666 | * want to recurse into ".git" either. |
| 667 | * |
| 668 | * Also, we don't want double slashes or slashes at the |
| 669 | * end that can make pathnames ambiguous. |
| 670 | */ |
| 671 | static int verify_dotfile(const char *rest) |
| 672 | { |
| 673 | /* |
| 674 | * The first character was '.', but that |
| 675 | * has already been discarded, we now test |
| 676 | * the rest. |
| 677 | */ |
| 678 | switch (*rest) { |
| 679 | /* "." is not allowed */ |
| 680 | case '\0': case '/': |
| 681 | return 0; |
| 682 | |
| 683 | /* |
| 684 | * ".git" followed by NUL or slash is bad. This |
| 685 | * shares the path end test with the ".." case. |
| 686 | */ |
| 687 | case 'g': |
| 688 | if (rest[1] != 'i') |
| 689 | break; |
| 690 | if (rest[2] != 't') |
| 691 | break; |
| 692 | rest += 2; |
| 693 | /* fallthrough */ |
| 694 | case '.': |
| 695 | if (rest[1] == '\0' || rest[1] == '/') |
| 696 | return 0; |
| 697 | } |
| 698 | return 1; |
| 699 | } |
| 700 | |
| 701 | int verify_path(const char *path) |
| 702 | { |
| 703 | char c; |
| 704 | |
| 705 | goto inside; |
| 706 | for (;;) { |
| 707 | if (!c) |
| 708 | return 1; |
| 709 | if (c == '/') { |
| 710 | inside: |
| 711 | c = *path++; |
| 712 | switch (c) { |
| 713 | default: |
| 714 | continue; |
| 715 | case '/': case '\0': |
| 716 | break; |
| 717 | case '.': |
| 718 | if (verify_dotfile(path)) |
| 719 | continue; |
| 720 | } |
| 721 | return 0; |
| 722 | } |
| 723 | c = *path++; |
| 724 | } |
| 725 | } |
| 726 | |
| 727 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 728 | * Do we have another file that has the beginning components being a |
| 729 | * proper superset of the name we're trying to add? |
| 730 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 731 | static int has_file_name(struct index_state *istate, |
| 732 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 733 | { |
| 734 | int retval = 0; |
| 735 | int len = ce_namelen(ce); |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 736 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 737 | const char *name = ce->name; |
| 738 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 739 | while (pos < istate->cache_nr) { |
| 740 | struct cache_entry *p = istate->cache[pos++]; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 741 | |
| 742 | if (len >= ce_namelen(p)) |
| 743 | break; |
| 744 | if (memcmp(name, p->name, len)) |
| 745 | break; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 746 | if (ce_stage(p) != stage) |
| 747 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 748 | if (p->name[len] != '/') |
| 749 | continue; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 750 | if (p->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 751 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 752 | retval = -1; |
| 753 | if (!ok_to_replace) |
| 754 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 755 | remove_index_entry_at(istate, --pos); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 756 | } |
| 757 | return retval; |
| 758 | } |
| 759 | |
| 760 | /* |
| 761 | * Do we have another file with a pathname that is a proper |
| 762 | * subset of the name we're trying to add? |
| 763 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 764 | static int has_dir_name(struct index_state *istate, |
| 765 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 766 | { |
| 767 | int retval = 0; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 768 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 769 | const char *name = ce->name; |
| 770 | const char *slash = name + ce_namelen(ce); |
| 771 | |
| 772 | for (;;) { |
| 773 | int len; |
| 774 | |
| 775 | for (;;) { |
| 776 | if (*--slash == '/') |
| 777 | break; |
| 778 | if (slash <= ce->name) |
| 779 | return retval; |
| 780 | } |
| 781 | len = slash - name; |
| 782 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 783 | pos = index_name_pos(istate, name, create_ce_flags(len, stage)); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 784 | if (pos >= 0) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 785 | /* |
| 786 | * Found one, but not so fast. This could |
| 787 | * be a marker that says "I was here, but |
| 788 | * I am being removed". Such an entry is |
| 789 | * not a part of the resulting tree, and |
| 790 | * it is Ok to have a directory at the same |
| 791 | * path. |
| 792 | */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 793 | if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 794 | retval = -1; |
| 795 | if (!ok_to_replace) |
| 796 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 797 | remove_index_entry_at(istate, pos); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 798 | continue; |
| 799 | } |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 800 | } |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 801 | else |
| 802 | pos = -pos-1; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 803 | |
| 804 | /* |
| 805 | * Trivial optimization: if we find an entry that |
| 806 | * already matches the sub-directory, then we know |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 807 | * we're ok, and we can exit. |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 808 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 809 | while (pos < istate->cache_nr) { |
| 810 | struct cache_entry *p = istate->cache[pos]; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 811 | if ((ce_namelen(p) <= len) || |
| 812 | (p->name[len] != '/') || |
| 813 | memcmp(p->name, name, len)) |
| 814 | break; /* not our subdirectory */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 815 | if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) |
| 816 | /* |
| 817 | * p is at the same stage as our entry, and |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 818 | * is a subdirectory of what we are looking |
| 819 | * at, so we cannot have conflicts at our |
| 820 | * level or anything shorter. |
| 821 | */ |
| 822 | return retval; |
| 823 | pos++; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 824 | } |
| 825 | } |
| 826 | return retval; |
| 827 | } |
| 828 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 829 | /* We may be in a situation where we already have path/file and path |
| 830 | * is being added, or we already have path and path/file is being |
| 831 | * added. Either one would result in a nonsense tree that has path |
| 832 | * twice when git-write-tree tries to write it out. Prevent it. |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 833 | * |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 834 | * If ok-to-replace is specified, we remove the conflicting entries |
| 835 | * from the cache so the caller should recompute the insert position. |
| 836 | * When this happens, we return non-zero. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 837 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 838 | static int check_file_directory_conflict(struct index_state *istate, |
| 839 | const struct cache_entry *ce, |
| 840 | int pos, int ok_to_replace) |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 841 | { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 842 | int retval; |
| 843 | |
| 844 | /* |
| 845 | * When ce is an "I am going away" entry, we allow it to be added |
| 846 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 847 | if (ce->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 848 | return 0; |
| 849 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 850 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 851 | * We check if the path is a sub-path of a subsequent pathname |
| 852 | * first, since removing those will not change the position |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 853 | * in the array. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 854 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 855 | retval = has_file_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 856 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 857 | /* |
| 858 | * Then check if the path might have a clashing sub-directory |
| 859 | * before it. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 860 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 861 | return retval + has_dir_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 862 | } |
| 863 | |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 864 | static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 865 | { |
| 866 | int pos; |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 867 | int ok_to_add = option & ADD_CACHE_OK_TO_ADD; |
| 868 | int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 869 | int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 870 | int new_only = option & ADD_CACHE_NEW_ONLY; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 871 | |
Junio C Hamano | 09d5dc3 | 2007-09-13 20:33:11 -0700 | [diff] [blame] | 872 | cache_tree_invalidate_path(istate->cache_tree, ce->name); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 873 | pos = index_name_pos(istate, ce->name, ce->ce_flags); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 874 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 875 | /* existing match? Just replace it. */ |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 876 | if (pos >= 0) { |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 877 | if (!new_only) |
| 878 | replace_index_entry(istate, pos, ce); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 879 | return 0; |
| 880 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 881 | pos = -pos-1; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 882 | |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 883 | /* |
| 884 | * Inserting a merged entry ("stage 0") into the index |
| 885 | * will always replace all non-merged entries.. |
| 886 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 887 | if (pos < istate->cache_nr && ce_stage(ce) == 0) { |
| 888 | while (ce_same_name(istate->cache[pos], ce)) { |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 889 | ok_to_add = 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 890 | if (!remove_index_entry_at(istate, pos)) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 891 | break; |
| 892 | } |
| 893 | } |
| 894 | |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 895 | if (!ok_to_add) |
| 896 | return -1; |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 897 | if (!verify_path(ce->name)) |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 898 | return error("Invalid path '%s'", ce->name); |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 899 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 900 | if (!skip_df_check && |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 901 | check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 902 | if (!ok_to_replace) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 903 | return error("'%s' appears as both a file and as a directory", |
| 904 | ce->name); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 905 | pos = index_name_pos(istate, ce->name, ce->ce_flags); |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 906 | pos = -pos-1; |
| 907 | } |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 908 | return pos + 1; |
| 909 | } |
| 910 | |
| 911 | int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option) |
| 912 | { |
| 913 | int pos; |
| 914 | |
| 915 | if (option & ADD_CACHE_JUST_APPEND) |
| 916 | pos = istate->cache_nr; |
| 917 | else { |
| 918 | int ret; |
| 919 | ret = add_index_entry_with_check(istate, ce, option); |
| 920 | if (ret <= 0) |
| 921 | return ret; |
| 922 | pos = ret - 1; |
| 923 | } |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 924 | |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 925 | /* Make sure the array is big enough .. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 926 | if (istate->cache_nr == istate->cache_alloc) { |
| 927 | istate->cache_alloc = alloc_nr(istate->cache_alloc); |
| 928 | istate->cache = xrealloc(istate->cache, |
| 929 | istate->cache_alloc * sizeof(struct cache_entry *)); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 930 | } |
| 931 | |
| 932 | /* Add it in.. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 933 | istate->cache_nr++; |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 934 | if (istate->cache_nr > pos + 1) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 935 | memmove(istate->cache + pos + 1, |
| 936 | istate->cache + pos, |
| 937 | (istate->cache_nr - pos - 1) * sizeof(ce)); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 938 | set_index_entry(istate, pos, ce); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 939 | istate->cache_changed = 1; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 940 | return 0; |
| 941 | } |
| 942 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 943 | /* |
| 944 | * "refresh" does not calculate a new sha1 file or bring the |
| 945 | * cache up-to-date for mode/content changes. But what it |
| 946 | * _does_ do is to "re-match" the stat information of a file |
| 947 | * with the cache, so that you can refresh the cache for a |
| 948 | * file that hasn't been changed but where the stat entry is |
| 949 | * out of date. |
| 950 | * |
| 951 | * For example, you'd want to do this after doing a "git-read-tree", |
| 952 | * to link up the stat cache details with the proper files. |
| 953 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 954 | static struct cache_entry *refresh_cache_ent(struct index_state *istate, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 955 | struct cache_entry *ce, |
| 956 | unsigned int options, int *err) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 957 | { |
| 958 | struct stat st; |
| 959 | struct cache_entry *updated; |
| 960 | int changed, size; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 961 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 962 | |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 963 | if (ce_uptodate(ce)) |
| 964 | return ce; |
| 965 | |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 966 | /* |
| 967 | * CE_VALID means the user promised us that the change to |
| 968 | * the work tree does not matter and told us not to worry. |
| 969 | */ |
| 970 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) { |
| 971 | ce_mark_uptodate(ce); |
| 972 | return ce; |
| 973 | } |
| 974 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 975 | if (lstat(ce->name, &st) < 0) { |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 976 | if (err) |
| 977 | *err = errno; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 978 | return NULL; |
| 979 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 980 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 981 | changed = ie_match_stat(istate, ce, &st, options); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 982 | if (!changed) { |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 983 | /* |
| 984 | * The path is unchanged. If we were told to ignore |
| 985 | * valid bit, then we did the actual stat check and |
| 986 | * found that the entry is unmodified. If the entry |
| 987 | * is not marked VALID, this is the place to mark it |
| 988 | * valid again, under "assume unchanged" mode. |
| 989 | */ |
| 990 | if (ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 991 | !(ce->ce_flags & CE_VALID)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 992 | ; /* mark this one VALID again */ |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 993 | else { |
| 994 | /* |
| 995 | * We do not mark the index itself "modified" |
| 996 | * because CE_UPTODATE flag is in-core only; |
| 997 | * we are not going to write this change out. |
| 998 | */ |
| 999 | ce_mark_uptodate(ce); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1000 | return ce; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1001 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1002 | } |
| 1003 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1004 | if (ie_modified(istate, ce, &st, options)) { |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1005 | if (err) |
| 1006 | *err = EINVAL; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1007 | return NULL; |
| 1008 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1009 | |
| 1010 | size = ce_size(ce); |
| 1011 | updated = xmalloc(size); |
| 1012 | memcpy(updated, ce, size); |
| 1013 | fill_stat_cache_info(updated, &st); |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1014 | /* |
| 1015 | * If ignore_valid is not set, we should leave CE_VALID bit |
| 1016 | * alone. Otherwise, paths marked with --no-assume-unchanged |
| 1017 | * (i.e. things to be edited) will reacquire CE_VALID bit |
| 1018 | * automatically, which is not really what we want. |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1019 | */ |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1020 | if (!ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1021 | !(ce->ce_flags & CE_VALID)) |
| 1022 | updated->ce_flags &= ~CE_VALID; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1023 | |
| 1024 | return updated; |
| 1025 | } |
| 1026 | |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 1027 | int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1028 | { |
| 1029 | int i; |
| 1030 | int has_errors = 0; |
| 1031 | int really = (flags & REFRESH_REALLY) != 0; |
| 1032 | int allow_unmerged = (flags & REFRESH_UNMERGED) != 0; |
| 1033 | int quiet = (flags & REFRESH_QUIET) != 0; |
| 1034 | int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1035 | int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1036 | unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; |
Junio C Hamano | d14e740 | 2008-07-20 00:21:38 -0700 | [diff] [blame] | 1037 | const char *needs_update_message; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1038 | |
Junio C Hamano | d14e740 | 2008-07-20 00:21:38 -0700 | [diff] [blame] | 1039 | needs_update_message = ((flags & REFRESH_SAY_CHANGED) |
| 1040 | ? "locally modified" : "needs update"); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1041 | for (i = 0; i < istate->cache_nr; i++) { |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1042 | struct cache_entry *ce, *new; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1043 | int cache_errno = 0; |
| 1044 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1045 | ce = istate->cache[i]; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1046 | if (ignore_submodules && S_ISGITLINK(ce->ce_mode)) |
| 1047 | continue; |
| 1048 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1049 | if (ce_stage(ce)) { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1050 | while ((i < istate->cache_nr) && |
| 1051 | ! strcmp(istate->cache[i]->name, ce->name)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1052 | i++; |
| 1053 | i--; |
| 1054 | if (allow_unmerged) |
| 1055 | continue; |
| 1056 | printf("%s: needs merge\n", ce->name); |
| 1057 | has_errors = 1; |
| 1058 | continue; |
| 1059 | } |
| 1060 | |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 1061 | if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen)) |
| 1062 | continue; |
| 1063 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1064 | new = refresh_cache_ent(istate, ce, options, &cache_errno); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1065 | if (new == ce) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1066 | continue; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1067 | if (!new) { |
| 1068 | if (not_new && cache_errno == ENOENT) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1069 | continue; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1070 | if (really && cache_errno == EINVAL) { |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1071 | /* If we are doing --really-refresh that |
| 1072 | * means the index is not valid anymore. |
| 1073 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1074 | ce->ce_flags &= ~CE_VALID; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1075 | istate->cache_changed = 1; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1076 | } |
| 1077 | if (quiet) |
| 1078 | continue; |
Junio C Hamano | d14e740 | 2008-07-20 00:21:38 -0700 | [diff] [blame] | 1079 | printf("%s: %s\n", ce->name, needs_update_message); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1080 | has_errors = 1; |
| 1081 | continue; |
| 1082 | } |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1083 | |
| 1084 | replace_index_entry(istate, i, new); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1085 | } |
| 1086 | return has_errors; |
| 1087 | } |
| 1088 | |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1089 | struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really) |
| 1090 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1091 | return refresh_cache_ent(&the_index, ce, really, NULL); |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1092 | } |
| 1093 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1094 | static int verify_hdr(struct cache_header *hdr, unsigned long size) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1095 | { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1096 | git_SHA_CTX c; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1097 | unsigned char sha1[20]; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1098 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 1099 | if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1100 | return error("bad signature"); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1101 | if (hdr->hdr_version != htonl(2)) |
| 1102 | return error("bad index version"); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1103 | git_SHA1_Init(&c); |
| 1104 | git_SHA1_Update(&c, hdr, size - 20); |
| 1105 | git_SHA1_Final(sha1, &c); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 1106 | if (hashcmp(sha1, (unsigned char *)hdr + size - 20)) |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1107 | return error("bad index file sha1 signature"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1108 | return 0; |
| 1109 | } |
| 1110 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1111 | static int read_index_extension(struct index_state *istate, |
| 1112 | const char *ext, void *data, unsigned long sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1113 | { |
| 1114 | switch (CACHE_EXT(ext)) { |
| 1115 | case CACHE_EXT_TREE: |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1116 | istate->cache_tree = cache_tree_read(data, sz); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1117 | break; |
| 1118 | default: |
| 1119 | if (*ext < 'A' || 'Z' < *ext) |
| 1120 | return error("index uses %.4s extension, which we do not understand", |
| 1121 | ext); |
| 1122 | fprintf(stderr, "ignoring %.4s extension\n", ext); |
| 1123 | break; |
| 1124 | } |
| 1125 | return 0; |
| 1126 | } |
| 1127 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1128 | int read_index(struct index_state *istate) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1129 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1130 | return read_index_from(istate, get_index_file()); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1131 | } |
| 1132 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1133 | static void convert_from_disk(struct ondisk_cache_entry *ondisk, struct cache_entry *ce) |
| 1134 | { |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1135 | size_t len; |
| 1136 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1137 | ce->ce_ctime = ntohl(ondisk->ctime.sec); |
| 1138 | ce->ce_mtime = ntohl(ondisk->mtime.sec); |
| 1139 | ce->ce_dev = ntohl(ondisk->dev); |
| 1140 | ce->ce_ino = ntohl(ondisk->ino); |
| 1141 | ce->ce_mode = ntohl(ondisk->mode); |
| 1142 | ce->ce_uid = ntohl(ondisk->uid); |
| 1143 | ce->ce_gid = ntohl(ondisk->gid); |
| 1144 | ce->ce_size = ntohl(ondisk->size); |
| 1145 | /* On-disk flags are just 16 bits */ |
| 1146 | ce->ce_flags = ntohs(ondisk->flags); |
Junio C Hamano | 16ce2e4 | 2008-08-16 23:02:08 -0700 | [diff] [blame] | 1147 | |
| 1148 | /* For future extension: we do not understand this entry yet */ |
| 1149 | if (ce->ce_flags & CE_EXTENDED) |
| 1150 | die("Unknown index entry format"); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1151 | hashcpy(ce->sha1, ondisk->sha1); |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1152 | |
| 1153 | len = ce->ce_flags & CE_NAMEMASK; |
| 1154 | if (len == CE_NAMEMASK) |
| 1155 | len = strlen(ondisk->name); |
| 1156 | /* |
| 1157 | * NEEDSWORK: If the original index is crafted, this copy could |
| 1158 | * go unchecked. |
| 1159 | */ |
| 1160 | memcpy(ce->name, ondisk->name, len + 1); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1161 | } |
| 1162 | |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1163 | static inline size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) |
| 1164 | { |
| 1165 | long per_entry; |
| 1166 | |
| 1167 | per_entry = sizeof(struct cache_entry) - sizeof(struct ondisk_cache_entry); |
| 1168 | |
| 1169 | /* |
| 1170 | * Alignment can cause differences. This should be "alignof", but |
| 1171 | * since that's a gcc'ism, just use the size of a pointer. |
| 1172 | */ |
| 1173 | per_entry += sizeof(void *); |
| 1174 | return ondisk_size + entries*per_entry; |
| 1175 | } |
| 1176 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1177 | /* remember to discard_cache() before reading a different cache! */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1178 | int read_index_from(struct index_state *istate, const char *path) |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1179 | { |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1180 | int fd, i; |
| 1181 | struct stat st; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1182 | unsigned long src_offset, dst_offset; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1183 | struct cache_header *hdr; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1184 | void *mmap; |
| 1185 | size_t mmap_size; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1186 | |
| 1187 | errno = EBUSY; |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1188 | if (istate->initialized) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1189 | return istate->cache_nr; |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1190 | |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1191 | errno = ENOENT; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1192 | istate->timestamp = 0; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1193 | fd = open(path, O_RDONLY); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1194 | if (fd < 0) { |
| 1195 | if (errno == ENOENT) |
| 1196 | return 0; |
| 1197 | die("index file open failed (%s)", strerror(errno)); |
| 1198 | } |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1199 | |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1200 | if (fstat(fd, &st)) |
Shawn O. Pearce | 5fe5c83 | 2006-12-25 23:40:58 -0500 | [diff] [blame] | 1201 | die("cannot stat the open index (%s)", strerror(errno)); |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1202 | |
| 1203 | errno = EINVAL; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1204 | mmap_size = xsize_t(st.st_size); |
| 1205 | if (mmap_size < sizeof(struct cache_header) + 20) |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1206 | die("index file smaller than expected"); |
| 1207 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1208 | mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1209 | close(fd); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1210 | if (mmap == MAP_FAILED) |
| 1211 | die("unable to map index file"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1212 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1213 | hdr = mmap; |
| 1214 | if (verify_hdr(hdr, mmap_size) < 0) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1215 | goto unmap; |
| 1216 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1217 | istate->cache_nr = ntohl(hdr->hdr_entries); |
| 1218 | istate->cache_alloc = alloc_nr(istate->cache_nr); |
| 1219 | istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *)); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1220 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1221 | /* |
| 1222 | * The disk format is actually larger than the in-memory format, |
| 1223 | * due to space for nsec etc, so even though the in-memory one |
| 1224 | * has room for a few more flags, we can allocate using the same |
| 1225 | * index size |
| 1226 | */ |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1227 | istate->alloc = xmalloc(estimate_cache_size(mmap_size, istate->cache_nr)); |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1228 | istate->initialized = 1; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1229 | |
| 1230 | src_offset = sizeof(*hdr); |
| 1231 | dst_offset = 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1232 | for (i = 0; i < istate->cache_nr; i++) { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1233 | struct ondisk_cache_entry *disk_ce; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1234 | struct cache_entry *ce; |
| 1235 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1236 | disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset); |
| 1237 | ce = (struct cache_entry *)((char *)istate->alloc + dst_offset); |
| 1238 | convert_from_disk(disk_ce, ce); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1239 | set_index_entry(istate, i, ce); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1240 | |
| 1241 | src_offset += ondisk_ce_size(ce); |
| 1242 | dst_offset += ce_size(ce); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1243 | } |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1244 | istate->timestamp = st.st_mtime; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1245 | while (src_offset <= mmap_size - 20 - 8) { |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1246 | /* After an array of active_nr index entries, |
| 1247 | * there can be arbitrary number of extended |
| 1248 | * sections, each of which is prefixed with |
| 1249 | * extension name (4-byte) and section length |
| 1250 | * in 4-byte network byte order. |
| 1251 | */ |
| 1252 | unsigned long extsize; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1253 | memcpy(&extsize, (char *)mmap + src_offset + 4, 4); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1254 | extsize = ntohl(extsize); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1255 | if (read_index_extension(istate, |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1256 | (const char *) mmap + src_offset, |
| 1257 | (char *) mmap + src_offset + 8, |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 1258 | extsize) < 0) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1259 | goto unmap; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1260 | src_offset += 8; |
| 1261 | src_offset += extsize; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1262 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1263 | munmap(mmap, mmap_size); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1264 | return istate->cache_nr; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1265 | |
| 1266 | unmap: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1267 | munmap(mmap, mmap_size); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1268 | errno = EINVAL; |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1269 | die("index file corrupt"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1270 | } |
| 1271 | |
Junio C Hamano | fa7b3c2 | 2008-11-12 11:52:35 -0800 | [diff] [blame] | 1272 | int is_index_unborn(struct index_state *istate) |
| 1273 | { |
| 1274 | return (!istate->cache_nr && !istate->alloc && !istate->timestamp); |
| 1275 | } |
| 1276 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1277 | int discard_index(struct index_state *istate) |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1278 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1279 | istate->cache_nr = 0; |
| 1280 | istate->cache_changed = 0; |
| 1281 | istate->timestamp = 0; |
Junio C Hamano | 64ca23a | 2008-08-23 13:05:10 -0700 | [diff] [blame] | 1282 | istate->name_hash_initialized = 0; |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1283 | free_hash(&istate->name_hash); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1284 | cache_tree_free(&(istate->cache_tree)); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1285 | free(istate->alloc); |
| 1286 | istate->alloc = NULL; |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1287 | istate->initialized = 0; |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1288 | |
| 1289 | /* no need to throw away allocated active_cache */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1290 | return 0; |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1291 | } |
| 1292 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 1293 | int unmerged_index(const struct index_state *istate) |
Daniel Barkalow | 94a5728 | 2008-02-07 11:40:13 -0500 | [diff] [blame] | 1294 | { |
| 1295 | int i; |
| 1296 | for (i = 0; i < istate->cache_nr; i++) { |
| 1297 | if (ce_stage(istate->cache[i])) |
| 1298 | return 1; |
| 1299 | } |
| 1300 | return 0; |
| 1301 | } |
| 1302 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1303 | #define WRITE_BUFFER_SIZE 8192 |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 1304 | static unsigned char write_buffer[WRITE_BUFFER_SIZE]; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1305 | static unsigned long write_buffer_len; |
| 1306 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1307 | static int ce_write_flush(git_SHA_CTX *context, int fd) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1308 | { |
| 1309 | unsigned int buffered = write_buffer_len; |
| 1310 | if (buffered) { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1311 | git_SHA1_Update(context, write_buffer, buffered); |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1312 | if (write_in_full(fd, write_buffer, buffered) != buffered) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1313 | return -1; |
| 1314 | write_buffer_len = 0; |
| 1315 | } |
| 1316 | return 0; |
| 1317 | } |
| 1318 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1319 | static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1320 | { |
| 1321 | while (len) { |
| 1322 | unsigned int buffered = write_buffer_len; |
| 1323 | unsigned int partial = WRITE_BUFFER_SIZE - buffered; |
| 1324 | if (partial > len) |
| 1325 | partial = len; |
| 1326 | memcpy(write_buffer + buffered, data, partial); |
| 1327 | buffered += partial; |
| 1328 | if (buffered == WRITE_BUFFER_SIZE) { |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1329 | write_buffer_len = buffered; |
| 1330 | if (ce_write_flush(context, fd)) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1331 | return -1; |
| 1332 | buffered = 0; |
| 1333 | } |
| 1334 | write_buffer_len = buffered; |
| 1335 | len -= partial; |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 1336 | data = (char *) data + partial; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 1337 | } |
| 1338 | return 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1339 | } |
| 1340 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1341 | static int write_index_ext_header(git_SHA_CTX *context, int fd, |
Dennis Stosberg | ac58c7b | 2006-05-28 21:08:08 +0200 | [diff] [blame] | 1342 | unsigned int ext, unsigned int sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1343 | { |
| 1344 | ext = htonl(ext); |
| 1345 | sz = htonl(sz); |
David Rientjes | 968a1d6 | 2006-08-14 13:38:14 -0700 | [diff] [blame] | 1346 | return ((ce_write(context, fd, &ext, 4) < 0) || |
| 1347 | (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1348 | } |
| 1349 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1350 | static int ce_flush(git_SHA_CTX *context, int fd) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1351 | { |
| 1352 | unsigned int left = write_buffer_len; |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1353 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1354 | if (left) { |
| 1355 | write_buffer_len = 0; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1356 | git_SHA1_Update(context, write_buffer, left); |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1357 | } |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1358 | |
Qingning Huo | 2c865d9 | 2005-09-11 14:27:47 +0100 | [diff] [blame] | 1359 | /* Flush first if not enough space for SHA1 signature */ |
| 1360 | if (left + 20 > WRITE_BUFFER_SIZE) { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1361 | if (write_in_full(fd, write_buffer, left) != left) |
Qingning Huo | 2c865d9 | 2005-09-11 14:27:47 +0100 | [diff] [blame] | 1362 | return -1; |
| 1363 | left = 0; |
| 1364 | } |
| 1365 | |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1366 | /* Append the SHA1 signature at the end */ |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1367 | git_SHA1_Final(write_buffer + left, context); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1368 | left += 20; |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1369 | return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1370 | } |
| 1371 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1372 | static void ce_smudge_racily_clean_entry(struct cache_entry *ce) |
| 1373 | { |
| 1374 | /* |
| 1375 | * The only thing we care about in this function is to smudge the |
| 1376 | * falsely clean entry due to touch-update-touch race, so we leave |
| 1377 | * everything else as they are. We are called for entries whose |
| 1378 | * ce_mtime match the index file mtime. |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 1379 | * |
| 1380 | * Note that this actually does not do much for gitlinks, for |
| 1381 | * which ce_match_stat_basic() always goes to the actual |
| 1382 | * contents. The caller checks with is_racy_timestamp() which |
| 1383 | * always says "no" for gitlinks, so we are not called for them ;-) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1384 | */ |
| 1385 | struct stat st; |
| 1386 | |
| 1387 | if (lstat(ce->name, &st) < 0) |
| 1388 | return; |
| 1389 | if (ce_match_stat_basic(ce, &st)) |
| 1390 | return; |
| 1391 | if (ce_modified_check_fs(ce, &st)) { |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1392 | /* This is "racily clean"; smudge it. Note that this |
| 1393 | * is a tricky code. At first glance, it may appear |
| 1394 | * that it can break with this sequence: |
| 1395 | * |
| 1396 | * $ echo xyzzy >frotz |
| 1397 | * $ git-update-index --add frotz |
| 1398 | * $ : >frotz |
| 1399 | * $ sleep 3 |
| 1400 | * $ echo filfre >nitfol |
| 1401 | * $ git-update-index --add nitfol |
| 1402 | * |
Junio C Hamano | b7e58b1 | 2006-08-05 04:16:02 -0700 | [diff] [blame] | 1403 | * but it does not. When the second update-index runs, |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1404 | * it notices that the entry "frotz" has the same timestamp |
| 1405 | * as index, and if we were to smudge it by resetting its |
| 1406 | * size to zero here, then the object name recorded |
| 1407 | * in index is the 6-byte file but the cached stat information |
| 1408 | * becomes zero --- which would then match what we would |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 1409 | * obtain from the filesystem next time we stat("frotz"). |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1410 | * |
| 1411 | * However, the second update-index, before calling |
| 1412 | * this function, notices that the cached size is 6 |
| 1413 | * bytes and what is on the filesystem is an empty |
| 1414 | * file, and never calls us, so the cached size information |
| 1415 | * for "frotz" stays 6 which does not match the filesystem. |
| 1416 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1417 | ce->ce_size = 0; |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1418 | } |
| 1419 | } |
| 1420 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1421 | static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1422 | { |
| 1423 | int size = ondisk_ce_size(ce); |
| 1424 | struct ondisk_cache_entry *ondisk = xcalloc(1, size); |
| 1425 | |
| 1426 | ondisk->ctime.sec = htonl(ce->ce_ctime); |
| 1427 | ondisk->ctime.nsec = 0; |
| 1428 | ondisk->mtime.sec = htonl(ce->ce_mtime); |
| 1429 | ondisk->mtime.nsec = 0; |
| 1430 | ondisk->dev = htonl(ce->ce_dev); |
| 1431 | ondisk->ino = htonl(ce->ce_ino); |
| 1432 | ondisk->mode = htonl(ce->ce_mode); |
| 1433 | ondisk->uid = htonl(ce->ce_uid); |
| 1434 | ondisk->gid = htonl(ce->ce_gid); |
| 1435 | ondisk->size = htonl(ce->ce_size); |
| 1436 | hashcpy(ondisk->sha1, ce->sha1); |
| 1437 | ondisk->flags = htons(ce->ce_flags); |
| 1438 | memcpy(ondisk->name, ce->name, ce_namelen(ce)); |
| 1439 | |
| 1440 | return ce_write(c, fd, ondisk, size); |
| 1441 | } |
| 1442 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 1443 | int write_index(const struct index_state *istate, int newfd) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1444 | { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1445 | git_SHA_CTX c; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1446 | struct cache_header hdr; |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 1447 | int i, err, removed; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1448 | struct cache_entry **cache = istate->cache; |
| 1449 | int entries = istate->cache_nr; |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1450 | |
| 1451 | for (i = removed = 0; i < entries; i++) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1452 | if (cache[i]->ce_flags & CE_REMOVE) |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1453 | removed++; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1454 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 1455 | hdr.hdr_signature = htonl(CACHE_SIGNATURE); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1456 | hdr.hdr_version = htonl(2); |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1457 | hdr.hdr_entries = htonl(entries - removed); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1458 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1459 | git_SHA1_Init(&c); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1460 | if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1461 | return -1; |
| 1462 | |
| 1463 | for (i = 0; i < entries; i++) { |
| 1464 | struct cache_entry *ce = cache[i]; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1465 | if (ce->ce_flags & CE_REMOVE) |
Linus Torvalds | aa16021 | 2005-06-09 15:34:04 -0700 | [diff] [blame] | 1466 | continue; |
Junio C Hamano | e06c43c | 2008-03-30 09:25:52 -0700 | [diff] [blame] | 1467 | if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce)) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1468 | ce_smudge_racily_clean_entry(ce); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1469 | if (ce_write_entry(&c, newfd, ce) < 0) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1470 | return -1; |
| 1471 | } |
Junio C Hamano | 1af1c2b | 2006-04-23 16:52:08 -0700 | [diff] [blame] | 1472 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1473 | /* Write extension data here */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1474 | if (istate->cache_tree) { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 1475 | struct strbuf sb = STRBUF_INIT; |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 1476 | |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 1477 | cache_tree_write(&sb, istate->cache_tree); |
| 1478 | err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0 |
| 1479 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 1480 | strbuf_release(&sb); |
| 1481 | if (err) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1482 | return -1; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1483 | } |
| 1484 | return ce_flush(&c, newfd); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1485 | } |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1486 | |
| 1487 | /* |
| 1488 | * Read the index file that is potentially unmerged into given |
| 1489 | * index_state, dropping any unmerged entries. Returns true is |
| 1490 | * the index is unmerged. Callers who want to refuse to work |
| 1491 | * from an unmerged state can call this and check its return value, |
| 1492 | * instead of calling read_cache(). |
| 1493 | */ |
| 1494 | int read_index_unmerged(struct index_state *istate) |
| 1495 | { |
| 1496 | int i; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1497 | int unmerged = 0; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1498 | |
| 1499 | read_index(istate); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1500 | for (i = 0; i < istate->cache_nr; i++) { |
| 1501 | struct cache_entry *ce = istate->cache[i]; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1502 | struct cache_entry *new_ce; |
| 1503 | int size, len; |
| 1504 | |
| 1505 | if (!ce_stage(ce)) |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1506 | continue; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1507 | unmerged = 1; |
| 1508 | len = strlen(ce->name); |
| 1509 | size = cache_entry_size(len); |
| 1510 | new_ce = xcalloc(1, size); |
| 1511 | hashcpy(new_ce->sha1, ce->sha1); |
| 1512 | memcpy(new_ce->name, ce->name, len); |
| 1513 | new_ce->ce_flags = create_ce_flags(len, 0); |
| 1514 | new_ce->ce_mode = ce->ce_mode; |
| 1515 | if (add_index_entry(istate, new_ce, 0)) |
| 1516 | return error("%s: cannot drop to stage #0", |
| 1517 | ce->name); |
| 1518 | i = index_name_pos(istate, new_ce->name, len); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1519 | } |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1520 | return unmerged; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1521 | } |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 1522 | |
| 1523 | struct update_callback_data |
| 1524 | { |
| 1525 | int flags; |
| 1526 | int add_errors; |
| 1527 | }; |
| 1528 | |
| 1529 | static void update_callback(struct diff_queue_struct *q, |
| 1530 | struct diff_options *opt, void *cbdata) |
| 1531 | { |
| 1532 | int i; |
| 1533 | struct update_callback_data *data = cbdata; |
| 1534 | |
| 1535 | for (i = 0; i < q->nr; i++) { |
| 1536 | struct diff_filepair *p = q->queue[i]; |
| 1537 | const char *path = p->one->path; |
| 1538 | switch (p->status) { |
| 1539 | default: |
| 1540 | die("unexpected diff status %c", p->status); |
| 1541 | case DIFF_STATUS_UNMERGED: |
| 1542 | case DIFF_STATUS_MODIFIED: |
| 1543 | case DIFF_STATUS_TYPE_CHANGED: |
| 1544 | if (add_file_to_index(&the_index, path, data->flags)) { |
| 1545 | if (!(data->flags & ADD_CACHE_IGNORE_ERRORS)) |
| 1546 | die("updating files failed"); |
| 1547 | data->add_errors++; |
| 1548 | } |
| 1549 | break; |
| 1550 | case DIFF_STATUS_DELETED: |
| 1551 | if (data->flags & ADD_CACHE_IGNORE_REMOVAL) |
| 1552 | break; |
| 1553 | if (!(data->flags & ADD_CACHE_PRETEND)) |
| 1554 | remove_file_from_index(&the_index, path); |
| 1555 | if (data->flags & (ADD_CACHE_PRETEND|ADD_CACHE_VERBOSE)) |
| 1556 | printf("remove '%s'\n", path); |
| 1557 | break; |
| 1558 | } |
| 1559 | } |
| 1560 | } |
| 1561 | |
| 1562 | int add_files_to_cache(const char *prefix, const char **pathspec, int flags) |
| 1563 | { |
| 1564 | struct update_callback_data data; |
| 1565 | struct rev_info rev; |
| 1566 | init_revisions(&rev, prefix); |
| 1567 | setup_revisions(0, NULL, &rev, NULL); |
| 1568 | rev.prune_data = pathspec; |
| 1569 | rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; |
| 1570 | rev.diffopt.format_callback = update_callback; |
| 1571 | data.flags = flags; |
| 1572 | data.add_errors = 0; |
| 1573 | rev.diffopt.format_callback_data = &data; |
| 1574 | run_diff_files(&rev, DIFF_RACY_IS_MODIFIED); |
| 1575 | return !!data.add_errors; |
| 1576 | } |
| 1577 | |
Jeff King | 98fa473 | 2008-10-16 11:07:26 -0400 | [diff] [blame] | 1578 | /* |
| 1579 | * Returns 1 if the path is an "other" path with respect to |
| 1580 | * the index; that is, the path is not mentioned in the index at all, |
| 1581 | * either as a file, a directory with some files in the index, |
| 1582 | * or as an unmerged entry. |
| 1583 | * |
| 1584 | * We helpfully remove a trailing "/" from directories so that |
| 1585 | * the output of read_directory can be used as-is. |
| 1586 | */ |
| 1587 | int index_name_is_other(const struct index_state *istate, const char *name, |
| 1588 | int namelen) |
| 1589 | { |
| 1590 | int pos; |
| 1591 | if (namelen && name[namelen - 1] == '/') |
| 1592 | namelen--; |
| 1593 | pos = index_name_pos(istate, name, namelen); |
| 1594 | if (0 <= pos) |
| 1595 | return 0; /* exact match */ |
| 1596 | pos = -pos - 1; |
| 1597 | if (pos < istate->cache_nr) { |
| 1598 | struct cache_entry *ce = istate->cache[pos]; |
| 1599 | if (ce_namelen(ce) == namelen && |
| 1600 | !memcmp(ce->name, name, namelen)) |
| 1601 | return 0; /* Yup, this one exists unmerged */ |
| 1602 | } |
| 1603 | return 1; |
| 1604 | } |