Make "read-tree" know how to do a "1-way merge".
[alt-git.git] / update-cache.c
blob68d2f95c1cfc90cc6d39bb4ec2f25f4ebd944d69
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
8 /*
9 * Default to not allowing changes to the list of files. The
10 * tool doesn't actually care, but this makes it harder to add
11 * files to the revision control by mistake by doing something
12 * like "update-cache *" and suddenly having all the object
13 * files be revision controlled.
15 static int allow_add = 0, allow_remove = 0;
17 static int index_fd(unsigned char *sha1, int fd, struct stat *st)
19 z_stream stream;
20 unsigned long size = st->st_size;
21 int max_out_bytes = size + 200;
22 void *out = malloc(max_out_bytes);
23 void *metadata = malloc(200);
24 void *in;
25 SHA_CTX c;
27 in = "";
28 if (size)
29 in = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
30 close(fd);
31 if (!out || (int)(long)in == -1)
32 return -1;
34 memset(&stream, 0, sizeof(stream));
35 deflateInit(&stream, Z_BEST_COMPRESSION);
38 * ASCII size + nul byte
39 */
40 stream.next_in = metadata;
41 stream.avail_in = 1+sprintf(metadata, "blob %lu", size);
42 stream.next_out = out;
43 stream.avail_out = max_out_bytes;
44 while (deflate(&stream, 0) == Z_OK)
45 /* nothing */;
48 * File content
50 stream.next_in = in;
51 stream.avail_in = size;
52 while (deflate(&stream, Z_FINISH) == Z_OK)
53 /*nothing */;
55 deflateEnd(&stream);
57 SHA1_Init(&c);
58 SHA1_Update(&c, out, stream.total_out);
59 SHA1_Final(sha1, &c);
61 return write_sha1_buffer(sha1, out, stream.total_out);
65 * This only updates the "non-critical" parts of the directory
66 * cache, ie the parts that aren't tracked by GIT, and only used
67 * to validate the cache.
69 static void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
71 ce->ce_ctime.sec = htonl(st->st_ctime);
72 ce->ce_mtime.sec = htonl(st->st_mtime);
73 #ifdef NSEC
74 ce->ce_ctime.nsec = htonl(st->st_ctim.tv_nsec);
75 ce->ce_mtime.nsec = htonl(st->st_mtim.tv_nsec);
76 #endif
77 ce->ce_dev = htonl(st->st_dev);
78 ce->ce_ino = htonl(st->st_ino);
79 ce->ce_uid = htonl(st->st_uid);
80 ce->ce_gid = htonl(st->st_gid);
81 ce->ce_size = htonl(st->st_size);
84 static int add_file_to_cache(char *path)
86 int size, namelen;
87 struct cache_entry *ce;
88 struct stat st;
89 int fd;
91 fd = open(path, O_RDONLY);
92 if (fd < 0) {
93 if (errno == ENOENT) {
94 if (allow_remove)
95 return remove_file_from_cache(path);
97 return -1;
99 if (fstat(fd, &st) < 0) {
100 close(fd);
101 return -1;
103 namelen = strlen(path);
104 size = cache_entry_size(namelen);
105 ce = malloc(size);
106 memset(ce, 0, size);
107 memcpy(ce->name, path, namelen);
108 fill_stat_cache_info(ce, &st);
109 ce->ce_mode = create_ce_mode(st.st_mode);
110 ce->ce_flags = htons(namelen);
112 if (index_fd(ce->sha1, fd, &st) < 0)
113 return -1;
115 return add_cache_entry(ce, allow_add);
118 static int match_data(int fd, void *buffer, unsigned long size)
120 while (size) {
121 char compare[1024];
122 int ret = read(fd, compare, sizeof(compare));
124 if (ret <= 0 || ret > size || memcmp(buffer, compare, ret))
125 return -1;
126 size -= ret;
127 buffer += ret;
129 return 0;
132 static int compare_data(struct cache_entry *ce, unsigned long expected_size)
134 int match = -1;
135 int fd = open(ce->name, O_RDONLY);
137 if (fd >= 0) {
138 void *buffer;
139 unsigned long size;
140 char type[10];
142 buffer = read_sha1_file(ce->sha1, type, &size);
143 if (buffer) {
144 if (size == expected_size && !strcmp(type, "blob"))
145 match = match_data(fd, buffer, size);
146 free(buffer);
148 close(fd);
150 return match;
154 * "refresh" does not calculate a new sha1 file or bring the
155 * cache up-to-date for mode/content changes. But what it
156 * _does_ do is to "re-match" the stat information of a file
157 * with the cache, so that you can refresh the cache for a
158 * file that hasn't been changed but where the stat entry is
159 * out of date.
161 * For example, you'd want to do this after doing a "read-tree",
162 * to link up the stat cache details with the proper files.
164 static struct cache_entry *refresh_entry(struct cache_entry *ce)
166 struct stat st;
167 struct cache_entry *updated;
168 int changed, size;
170 if (stat(ce->name, &st) < 0)
171 return NULL;
173 changed = cache_match_stat(ce, &st);
174 if (!changed)
175 return ce;
178 * If the mode has changed, there's no point in trying
179 * to refresh the entry - it's not going to match
181 if (changed & MODE_CHANGED)
182 return NULL;
184 if (compare_data(ce, st.st_size))
185 return NULL;
187 size = ce_size(ce);
188 updated = malloc(size);
189 memcpy(updated, ce, size);
190 fill_stat_cache_info(updated, &st);
191 return updated;
194 static void refresh_cache(void)
196 int i;
198 for (i = 0; i < active_nr; i++) {
199 struct cache_entry *ce, *new;
200 ce = active_cache[i];
201 if (ce_stage(ce)) {
202 printf("%s: needs merge\n", ce->name);
203 while ((i < active_nr) &&
204 ! strcmp(active_cache[i]->name, ce->name))
205 i++;
206 i--;
207 continue;
210 new = refresh_entry(ce);
211 if (!new) {
212 printf("%s: needs update\n", ce->name);
213 continue;
215 active_cache[i] = new;
220 * We fundamentally don't like some paths: we don't want
221 * dot or dot-dot anywhere, and in fact, we don't even want
222 * any other dot-files (.git or anything else). They
223 * are hidden, for chist sake.
225 * Also, we don't want double slashes or slashes at the
226 * end that can make pathnames ambiguous.
228 static int verify_path(char *path)
230 char c;
232 goto inside;
233 for (;;) {
234 if (!c)
235 return 1;
236 if (c == '/') {
237 inside:
238 c = *path++;
239 if (c != '/' && c != '.' && c != '\0')
240 continue;
241 return 0;
243 c = *path++;
247 static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
249 int size, len;
250 unsigned int mode;
251 unsigned char sha1[20];
252 struct cache_entry *ce;
254 if (sscanf(arg1, "%o", &mode) != 1)
255 return -1;
256 if (get_sha1_hex(arg2, sha1))
257 return -1;
258 if (!verify_path(arg3))
259 return -1;
261 len = strlen(arg3);
262 size = cache_entry_size(len);
263 ce = malloc(size);
264 memset(ce, 0, size);
266 memcpy(ce->sha1, sha1, 20);
267 memcpy(ce->name, arg3, len);
268 ce->ce_flags = htons(len);
269 ce->ce_mode = create_ce_mode(mode);
270 return add_cache_entry(ce, allow_add);
273 static int remove_lock = 0;
275 static void remove_lock_file(void)
277 if (remove_lock)
278 unlink(".git/index.lock");
281 int main(int argc, char **argv)
283 int i, newfd, entries;
284 int allow_options = 1;
286 newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600);
287 if (newfd < 0)
288 die("unable to create new cachefile");
290 atexit(remove_lock_file);
291 remove_lock = 1;
293 entries = read_cache();
294 if (entries < 0)
295 die("cache corrupted");
297 for (i = 1 ; i < argc; i++) {
298 char *path = argv[i];
300 if (allow_options && *path == '-') {
301 if (!strcmp(path, "--")) {
302 allow_options = 0;
303 continue;
305 if (!strcmp(path, "--add")) {
306 allow_add = 1;
307 continue;
309 if (!strcmp(path, "--remove")) {
310 allow_remove = 1;
311 continue;
313 if (!strcmp(path, "--refresh")) {
314 refresh_cache();
315 continue;
317 if (!strcmp(path, "--cacheinfo")) {
318 if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
319 die("update-cache: --cacheinfo <mode> <sha1> <path>");
320 i += 3;
321 continue;
323 die("unknown option %s", path);
325 if (!verify_path(path)) {
326 fprintf(stderr, "Ignoring path %s\n", argv[i]);
327 continue;
329 if (add_file_to_cache(path))
330 die("Unable to add %s to database", path);
332 if (write_cache(newfd, active_cache, active_nr) ||
333 rename(".git/index.lock", ".git/index"))
334 die("Unable to write new cachefile");
336 remove_lock = 0;
337 return 0;