X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=d69c426b360db21820a4e180202ae4d71e0ba965;hb=001d4a27dbfaaa59c25dc35dafc69bd9b9bc21d3;hp=637aededbdc0a321519ecdaeeb6da61ce71319d5;hpb=aa03413467a2f2ada900817dc2a8e3904549b5fe;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 637aeded..d69c426b 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -6,14 +6,46 @@
 #include "tree.h"
 #include "blob.h"
 #include "tag.h"
+#include "delta.h"
 
 #define REACHABLE 0x0001
 
 static int show_root = 0;
 static int show_tags = 0;
 static int show_unreachable = 0;
+static int show_max_delta_depth = 0;
+static int keep_cache_objects = 0; 
 static unsigned char head_sha1[20];
 
+static void expand_deltas(void)
+{
+	int i, max_depth = 0;
+
+	/*
+	 * To be as efficient as possible we look for delta heads and
+	 * recursively process them going backward, and parsing
+	 * resulting objects along the way.  This allows for processing
+	 * each delta objects only once regardless of the delta depth.
+	 */
+	for (i = 0; i < nr_objs; i++) {
+		struct object *obj = objs[i];
+		if (obj->parsed && !obj->delta && obj->attached_deltas) {
+			int depth = 0;
+			char type[10];
+			unsigned long size;
+			void *buf = read_sha1_file(obj->sha1, type, &size);
+			if (!buf)
+				continue;
+			depth = process_deltas(buf, size, obj->type,
+					       obj->attached_deltas);
+			if (max_depth < depth)
+				max_depth = depth;
+		}
+	}
+	if (show_max_delta_depth)
+		printf("maximum delta depth = %d\n", max_depth);
+}
+															
 static void check_connectivity(void)
 {
 	int i;
@@ -24,7 +56,12 @@ static void check_connectivity(void)
 		struct object_list *refs;
 
 		if (!obj->parsed) {
-			printf("missing %s %s\n", obj->type, sha1_to_hex(obj->sha1));
+			if (obj->delta)
+				printf("unresolved delta %s\n",
+				       sha1_to_hex(obj->sha1));
+			else
+				printf("missing %s %s\n",
+				       obj->type, sha1_to_hex(obj->sha1));
 			continue;
 		}
 
@@ -42,7 +79,12 @@ static void check_connectivity(void)
 			continue;
 
 		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1));
+			if (obj->attached_deltas)
+				printf("foreign delta reference %s\n", 
+				       sha1_to_hex(obj->sha1));
+			else
+				printf("unreachable %s %s\n",
+				       obj->type, sha1_to_hex(obj->sha1));
 			continue;
 		}
 
@@ -61,6 +103,9 @@ static void check_connectivity(void)
  * So a directory called "a" is ordered _after_ a file
  * called "a.c", because "a/" sorts after "a.c".
  */
+#define TREE_UNORDERED (-1)
+#define TREE_HAS_DUPS  (-2)
+
 static int verify_ordered(struct tree_entry_list *a, struct tree_entry_list *b)
 {
 	int len1 = strlen(a->name);
@@ -73,7 +118,7 @@ static int verify_ordered(struct tree_entry_list *a, struct tree_entry_list *b)
 	if (cmp < 0)
 		return 0;
 	if (cmp > 0)
-		return -1;
+		return TREE_UNORDERED;
 
 	/*
 	 * Ok, the first <len> characters are the same.
@@ -82,11 +127,18 @@ static int verify_ordered(struct tree_entry_list *a, struct tree_entry_list *b)
 	 */
 	c1 = a->name[len];
 	c2 = b->name[len];
+	if (!c1 && !c2)
+		/*
+		 * git-write-tree used to write out a nonsense tree that has
+		 * entries with the same name, one blob and one tree.  Make
+		 * sure we do not have duplicate entries.
+		 */
+		return TREE_HAS_DUPS;
 	if (!c1 && a->directory)
 		c1 = '/';
 	if (!c2 && b->directory)
 		c2 = '/';
-	return c1 < c2 ? 0 : -1;
+	return c1 < c2 ? 0 : TREE_UNORDERED;
 }
 
 static int fsck_tree(struct tree *item)
@@ -99,11 +151,41 @@ static int fsck_tree(struct tree *item)
 		if (strchr(entry->name, '/'))
 			has_full_path = 1;
 
+		switch (entry->mode) {
+		/*
+		 * Standard modes.. 
+		 */
+		case S_IFREG | 0755:
+		case S_IFREG | 0644:
+		case S_IFLNK:
+		case S_IFDIR:
+			break;
+		/*
+		 * This is nonstandard, but we had a few of these
+		 * early on when we honored the full set of mode
+		 * bits..
+		 */
+		case S_IFREG | 0664:
+			break;
+		default:
+			printf("tree %s has entry %o %s\n",
+				sha1_to_hex(item->object.sha1),
+				entry->mode, entry->name);
+		}
+
 		if (last) {
-			if (verify_ordered(last, entry) < 0) {
+			switch (verify_ordered(last, entry)) {
+			case TREE_UNORDERED:
 				fprintf(stderr, "tree %s not ordered\n",
 					sha1_to_hex(item->object.sha1));
 				return -1;
+			case TREE_HAS_DUPS:
+				fprintf(stderr, "tree %s has duplicate entries for '%s'\n",
+					sha1_to_hex(item->object.sha1),
+					entry->name);
+				return -1;
+			default:
+				break;
 			}
 		}
 
@@ -111,7 +193,7 @@ static int fsck_tree(struct tree *item)
 	}
 
 	if (has_full_path) {
-		fprintf(stderr, "warning: fsck-cache: tree %s "
+		fprintf(stderr, "warning: git-fsck-cache: tree %s "
 			"has full pathnames in it\n", 
 			sha1_to_hex(item->object.sha1));
 	}
@@ -121,6 +203,8 @@ static int fsck_tree(struct tree *item)
 
 static int fsck_commit(struct commit *commit)
 {
+	free(commit->buffer);
+	commit->buffer = NULL;
 	if (!commit->tree)
 		return -1;
 	if (!commit->parents && show_root)
@@ -133,14 +217,17 @@ static int fsck_commit(struct commit *commit)
 
 static int fsck_tag(struct tag *tag)
 {
+	struct object *tagged = tag->tagged;
+
+	if (!tagged) {
+		printf("bad object in tag %s\n", sha1_to_hex(tag->object.sha1));
+		return -1;
+	}
 	if (!show_tags)
 		return 0;
 
-	printf("tagged %s %s",
-	       tag->tagged->type,
-	       sha1_to_hex(tag->tagged->sha1));
-	printf(" (%s) in %s\n",
-	       tag->tag, sha1_to_hex(tag->object.sha1));
+	printf("tagged %s %s", tagged->type, sha1_to_hex(tagged->sha1));
+	printf(" (%s) in %s\n", tag->tag, sha1_to_hex(tag->object.sha1));
 	return 0;
 }
 
@@ -157,6 +244,8 @@ static int fsck_sha1(unsigned char *sha1)
 		return fsck_commit((struct commit *) obj);
 	if (obj->type == tag_type)
 		return fsck_tag((struct tag *) obj);
+	if (!obj->type && obj->delta)
+		return 0;
 	return -1;
 }
 
@@ -252,6 +341,76 @@ static int fsck_dir(int i, char *path)
 	return 0;
 }
 
+static int read_sha1_reference(const char *path)
+{
+	char hexname[60];
+	unsigned char sha1[20];
+	int fd = open(path, O_RDONLY), len;
+	struct object *obj;
+
+	if (fd < 0)
+		return -1;
+
+	len = read(fd, hexname, sizeof(hexname));
+	close(fd);
+	if (len < 40)
+		return -1;
+
+	if (get_sha1_hex(hexname, sha1) < 0)
+		return -1;
+
+	obj = lookup_object(sha1);
+	if (!obj)
+		return error("%s: invalid sha1 pointer %.40s", path, hexname);
+
+	obj->used = 1;
+	mark_reachable(obj, REACHABLE);
+	return 0;
+}
+
+static int find_file_objects(const char *base, const char *name)
+{
+	int baselen = strlen(base);
+	int namelen = strlen(name);
+	char *path = xmalloc(baselen + namelen + 2);
+	struct stat st;
+
+	memcpy(path, base, baselen);
+	path[baselen] = '/';
+	memcpy(path + baselen + 1, name, namelen+1);
+	if (stat(path, &st) < 0)
+		return 0;
+
+	/*
+	 * Recurse into directories
+	 */
+	if (S_ISDIR(st.st_mode)) {
+		int count = 0;
+		DIR *dir = opendir(path);
+		if (dir) {
+			struct dirent *de;
+			while ((de = readdir(dir)) != NULL) {
+				if (de->d_name[0] == '.')
+					continue;
+				count += find_file_objects(path, de->d_name);
+			}
+			closedir(dir);
+		}
+		return count;
+	}
+	if (S_ISREG(st.st_mode))
+		return read_sha1_reference(path) == 0;
+	return 0;
+}
+
+static void get_default_heads(void)
+{
+	char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+	int count = find_file_objects(git_dir, "refs");
+	if (!count)
+		die("No default references");
+}
+
 int main(int argc, char **argv)
 {
 	int i, heads;
@@ -272,11 +431,19 @@ int main(int argc, char **argv)
 			show_root = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--delta-depth")) {
+			show_max_delta_depth = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--cache")) {
+			keep_cache_objects = 1;
+			continue;
+		}
 		if (*arg == '-')
-			usage("fsck-cache [--tags] [[--unreachable] <head-sha1>*]");
+			usage("git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
 	}
 
-	sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
+	sha1_dir = get_object_directory();
 	for (i = 0; i < 256; i++) {
 		static char dir[4096];
 		sprintf(dir, "%s/%02x", sha1_dir, i);
@@ -284,6 +451,8 @@ int main(int argc, char **argv)
 	}
 	fsck_sha1_list();
 
+	expand_deltas();
+
 	heads = 0;
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i]; 
@@ -292,14 +461,12 @@ int main(int argc, char **argv)
 			continue;
 
 		if (!get_sha1(arg, head_sha1)) {
-			struct commit *commit = lookup_commit(head_sha1);
-			struct object *obj;
+			struct object *obj = lookup_object(head_sha1);
 
-			/* Error is printed by lookup_commit(). */
-			if (!commit)
+			/* Error is printed by lookup_object(). */
+			if (!obj)
 				continue;
 
-			obj = &commit->object;
 			obj->used = 1;
 			mark_reachable(obj, REACHABLE);
 			heads++;
@@ -308,12 +475,28 @@ int main(int argc, char **argv)
 		error("expected sha1, got %s", arg);
 	}
 
+	/*
+	 * If we've not been given any explicit head information, do the
+	 * default ones from .git/refs. We also consider the index file
+	 * in this case (ie this implies --cache).
+	 */
 	if (!heads) {
-		if (show_unreachable) {
-			fprintf(stderr, "unable to do reachability without a head\n");
-			show_unreachable = 0; 
+		get_default_heads();
+		keep_cache_objects = 1;
+	}
+
+	if (keep_cache_objects) {
+		int i;
+		read_cache();
+		for (i = 0; i < active_nr; i++) {
+			struct blob *blob = lookup_blob(active_cache[i]->sha1);
+			struct object *obj;
+			if (!blob)
+				continue;
+			obj = &blob->object;
+			obj->used = 1;
+			mark_reachable(obj, REACHABLE);
 		}
-		fprintf(stderr, "expect dangling commits - potential heads - due to lack of head information\n");
 	}
 
 	check_connectivity();