X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-cache.c;h=4353b80890ba2afbe22248a4dc25060aa4a429b2;hb=90ffd0952f61717d93858b154d2505d0ba051b14;hp=85d0591c8500ac916b573ca3934cea84fe0f8106;hpb=ccc4feb579265266d0a4a73c0c9443ecc0c26ce3;p=git.git

diff --git a/update-cache.c b/update-cache.c
index 85d0591c..4353b808 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -14,13 +14,14 @@
  */
 static int allow_add = 0, allow_remove = 0;
 
-static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st)
+static int index_fd(unsigned char *sha1, int fd, struct stat *st)
 {
 	z_stream stream;
 	unsigned long size = st->st_size;
-	int max_out_bytes = namelen + size + 200;
+	int max_out_bytes = size + 200;
 	void *out = malloc(max_out_bytes);
-	void *metadata = malloc(namelen + 200);
+	void *metadata = malloc(200);
+	int metadata_size;
 	void *in;
 	SHA_CTX c;
 
@@ -31,6 +32,13 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
 	if (!out || (int)(long)in == -1)
 		return -1;
 
+	metadata_size = 1+sprintf(metadata, "blob %lu", size);
+
+	SHA1_Init(&c);
+	SHA1_Update(&c, metadata, metadata_size);
+	SHA1_Update(&c, in, size);
+	SHA1_Final(sha1, &c);
+
 	memset(&stream, 0, sizeof(stream));
 	deflateInit(&stream, Z_BEST_COMPRESSION);
 
@@ -38,7 +46,7 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
 	 * ASCII size + nul byte
 	 */	
 	stream.next_in = metadata;
-	stream.avail_in = 1+sprintf(metadata, "blob %lu", size);
+	stream.avail_in = metadata_size;
 	stream.next_out = out;
 	stream.avail_out = max_out_bytes;
 	while (deflate(&stream, 0) == Z_OK)
@@ -54,11 +62,7 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
 
 	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);
+	return write_sha1_buffer(sha1, out, stream.total_out);
 }
 
 /*
@@ -106,10 +110,10 @@ static int add_file_to_cache(char *path)
 	memset(ce, 0, size);
 	memcpy(ce->name, path, namelen);
 	fill_stat_cache_info(ce, &st);
-	ce->ce_mode = htonl(st.st_mode);
-	ce->ce_namelen = htons(namelen);
+	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);
@@ -196,9 +200,18 @@ static void refresh_cache(void)
 	int i;
 
 	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);
+			while ((i < active_nr) &&
+			       ! strcmp(active_cache[i]->name, ce->name))
+				i++;
+			i--;
+			continue;
+		}
 
+		new = refresh_entry(ce);
 		if (!new) {
 			printf("%s: needs update\n", ce->name);
 			continue;
@@ -235,25 +248,55 @@ inside:
 	}
 }
 
-static int remove_lock = 0;
+static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
+{
+	int size, len;
+	unsigned int mode;
+	unsigned char sha1[20];
+	struct cache_entry *ce;
+
+	if (sscanf(arg1, "%o", &mode) != 1)
+		return -1;
+	if (get_sha1_hex(arg2, sha1))
+		return -1;
+	if (!verify_path(arg3))
+		return -1;
+
+	len = strlen(arg3);
+	size = cache_entry_size(len);
+	ce = malloc(size);
+	memset(ce, 0, size);
+
+	memcpy(ce->sha1, sha1, 20);
+	memcpy(ce->name, arg3, len);
+	ce->ce_flags = htons(len);
+	ce->ce_mode = create_ce_mode(mode);
+	return add_cache_entry(ce, allow_add);
+}
+
+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);
 }
 
 int main(int argc, char **argv)
 {
 	int i, newfd, entries;
 	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");
 
 	atexit(remove_lock_file);
-	remove_lock = 1;
+	lockfile_name = lockfile;
 
 	entries = read_cache();
 	if (entries < 0)
@@ -279,6 +322,12 @@ int main(int argc, char **argv)
 				refresh_cache();
 				continue;
 			}
+			if (!strcmp(path, "--cacheinfo")) {
+				if (i+3 >= argc || add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
+					die("update-cache: --cacheinfo <mode> <sha1> <path>");
+				i += 3;
+				continue;
+			}
 			die("unknown option %s", path);
 		}
 		if (!verify_path(path)) {
@@ -288,10 +337,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;
+	lockfile_name = NULL;
 	return 0;
 }