X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=update-cache.c;h=bb25fa114c1017380c8441f514ae2e66beef1e68;hb=0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812;hp=7d1d8e512617dc4a3b77a922f2765e79201895ab;hpb=e44794706eeb57f2ee38ed1604821aa38b8ad9d2;p=git.git diff --git a/update-cache.c b/update-cache.c index 7d1d8e51..bb25fa11 100644 --- a/update-cache.c +++ b/update-cache.c @@ -3,6 +3,7 @@ * * Copyright (C) Linus Torvalds, 2005 */ +#include #include "cache.h" /* @@ -12,53 +13,22 @@ * like "update-cache *" and suddenly having all the object * files be revision controlled. */ -static int allow_add = 0, allow_remove = 0; +static int allow_add = 0, allow_remove = 0, not_new = 0; -static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st) +/* Three functions to allow overloaded pointer return; see linux/err.h */ +static inline void *ERR_PTR(long error) { - z_stream stream; - unsigned long size = st->st_size; - int max_out_bytes = namelen + size + 200; - void *out = malloc(max_out_bytes); - void *metadata = malloc(namelen + 200); - void *in; - SHA_CTX c; - - in = ""; - if (size) - in = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - close(fd); - if (!out || (int)(long)in == -1) - return -1; - - memset(&stream, 0, sizeof(stream)); - deflateInit(&stream, Z_BEST_COMPRESSION); + return (void *) error; +} - /* - * ASCII size + nul byte - */ - stream.next_in = metadata; - stream.avail_in = 1+sprintf(metadata, "blob %lu", size); - stream.next_out = out; - stream.avail_out = max_out_bytes; - while (deflate(&stream, 0) == Z_OK) - /* nothing */; +static inline long PTR_ERR(const void *ptr) +{ + return (long) ptr; +} - /* - * File content - */ - stream.next_in = in; - stream.avail_in = size; - while (deflate(&stream, Z_FINISH) == Z_OK) - /*nothing */; - - deflateEnd(&stream); - - SHA1_Init(&c); - SHA1_Update(&c, out, stream.total_out); - SHA1_Final(ce->sha1, &c); - - return write_sha1_buffer(ce->sha1, out, stream.total_out); +static inline long IS_ERR(const void *ptr) +{ + return (unsigned long)ptr > (unsigned long)-1000L; } /* @@ -90,7 +60,7 @@ static int add_file_to_cache(char *path) fd = open(path, O_RDONLY); if (fd < 0) { - if (errno == ENOENT) { + if (errno == ENOENT || errno == ENOTDIR) { if (allow_remove) return remove_file_from_cache(path); } @@ -102,14 +72,14 @@ static int add_file_to_cache(char *path) } namelen = strlen(path); size = cache_entry_size(namelen); - ce = malloc(size); + ce = xmalloc(size); memset(ce, 0, size); memcpy(ce->name, path, namelen); fill_stat_cache_info(ce, &st); ce->ce_mode = create_ce_mode(st.st_mode); ce->ce_flags = htons(namelen); - if (index_fd(path, namelen, ce, fd, &st) < 0) + if (index_fd(ce->sha1, fd, &st) < 0) return -1; return add_cache_entry(ce, allow_add); @@ -168,7 +138,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) int changed, size; if (stat(ce->name, &st) < 0) - return NULL; + return ERR_PTR(-errno); changed = cache_match_stat(ce, &st); if (!changed) @@ -179,32 +149,47 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce) * to refresh the entry - it's not going to match */ if (changed & MODE_CHANGED) - return NULL; + return ERR_PTR(-EINVAL); if (compare_data(ce, st.st_size)) - return NULL; + return ERR_PTR(-EINVAL); size = ce_size(ce); - updated = malloc(size); + updated = xmalloc(size); memcpy(updated, ce, size); fill_stat_cache_info(updated, &st); return updated; } -static void refresh_cache(void) +static int refresh_cache(void) { int i; + int has_errors = 0; for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - struct cache_entry *new = refresh_entry(ce); + struct cache_entry *ce, *new; + ce = active_cache[i]; + if (ce_stage(ce)) { + printf("%s: needs merge\n", ce->name); + has_errors = 1; + while ((i < active_nr) && + ! strcmp(active_cache[i]->name, ce->name)) + i++; + i--; + continue; + } - if (!new) { - printf("%s: needs update\n", ce->name); + new = refresh_entry(ce); + if (IS_ERR(new)) { + if (!(not_new && PTR_ERR(new) == -ENOENT)) { + printf("%s: needs update\n", ce->name); + has_errors = 1; + } continue; } active_cache[i] = new; } + return has_errors; } /* @@ -244,17 +229,14 @@ static int add_cacheinfo(char *arg1, char *arg2, char *arg3) if (sscanf(arg1, "%o", &mode) != 1) return -1; - printf("got mode %o\n", mode); if (get_sha1_hex(arg2, sha1)) return -1; - printf("got sha1 %s\n", sha1_to_hex(sha1)); if (!verify_path(arg3)) return -1; - printf("got path %s\n", arg3); len = strlen(arg3); size = cache_entry_size(len); - ce = malloc(size); + ce = xmalloc(size); memset(ce, 0, size); memcpy(ce->sha1, sha1, 20); @@ -264,25 +246,35 @@ static int add_cacheinfo(char *arg1, char *arg2, char *arg3) return add_cache_entry(ce, allow_add); } -static int remove_lock = 0; +static const char *lockfile_name = NULL; static void remove_lock_file(void) { - if (remove_lock) - unlink(".git/index.lock"); + if (lockfile_name) + unlink(lockfile_name); +} + +static void remove_lock_file_on_signal(int signo) +{ + remove_lock_file(); } int main(int argc, char **argv) { - int i, newfd, entries; + int i, newfd, entries, has_errors = 0; int allow_options = 1; + static char lockfile[MAXPATHLEN+1]; + const char *indexfile = get_index_file(); + + snprintf(lockfile, sizeof(lockfile), "%s.lock", indexfile); - newfd = open(".git/index.lock", O_RDWR | O_CREAT | O_EXCL, 0600); + newfd = open(lockfile, O_RDWR | O_CREAT | O_EXCL, 0600); if (newfd < 0) die("unable to create new cachefile"); + signal(SIGINT, remove_lock_file_on_signal); atexit(remove_lock_file); - remove_lock = 1; + lockfile_name = lockfile; entries = read_cache(); if (entries < 0) @@ -305,7 +297,7 @@ int main(int argc, char **argv) continue; } if (!strcmp(path, "--refresh")) { - refresh_cache(); + has_errors |= refresh_cache(); continue; } if (!strcmp(path, "--cacheinfo")) { @@ -314,6 +306,19 @@ int main(int argc, char **argv) i += 3; continue; } + if (!strcmp(path, "--force-remove")) { + if (argc <= i + 1) + die("update-cache: --force-remove "); + if (remove_file_from_cache(argv[i+1])) + die("update-cache: --force-remove cannot remove %s", argv[i+1]); + i++; + continue; + } + + if (!strcmp(path, "--ignore-missing")) { + not_new = 1; + continue; + } die("unknown option %s", path); } if (!verify_path(path)) { @@ -323,10 +328,9 @@ int main(int argc, char **argv) if (add_file_to_cache(path)) die("Unable to add %s to database", path); } - if (write_cache(newfd, active_cache, active_nr) || - rename(".git/index.lock", ".git/index")) + if (write_cache(newfd, active_cache, active_nr) || rename(lockfile, indexfile)) die("Unable to write new cachefile"); - remove_lock = 0; - return 0; + lockfile_name = NULL; + return has_errors; }