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