X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=6ac122b71cf9a5eec298a003032c5724d47f306d;hb=d1af002dc608be3213ba18df1a99ced0ab42e6d6;hp=164fc2eaeeac42a5bbec45845d852da8104e2459;hpb=e1a1388d858fa8522f187d3fdea92ff84e21528c;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 164fc2ea..6ac122b7 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -1,20 +1,51 @@
-#include "cache.h"
-
 #include <sys/types.h>
 #include <dirent.h>
 
+#include "cache.h"
 #include "commit.h"
 #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,37 +55,149 @@ static void check_connectivity(void)
 		struct object *obj = objs[i];
 		struct object_list *refs;
 
-		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1));
+		if (!obj->parsed) {
+			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;
 		}
 
-		if (!obj->parsed) {
-			printf("missing %s %s\n", obj->type, 
-			       sha1_to_hex(obj->sha1));
+		for (refs = obj->refs; refs; refs = refs->next) {
+			if (refs->item->parsed)
+				continue;
+			printf("broken link from %7s %s\n",
+			       obj->type, sha1_to_hex(obj->sha1));
+			printf("              to %7s %s\n",
+			       refs->item->type, sha1_to_hex(refs->item->sha1));
+		}
+
+		/* Don't bother with tag reachability. */
+		if (obj->type == tag_type)
+			continue;
+
+		if (show_unreachable && !(obj->flags & REACHABLE)) {
+			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;
 		}
+
 		if (!obj->used) {
 			printf("dangling %s %s\n", obj->type, 
 			       sha1_to_hex(obj->sha1));
 		}
-		for (refs = obj->refs; refs; refs = refs->next) {
-			if (!refs->item->parsed) {
-				printf("broken link from %s\n",
-				       sha1_to_hex(obj->sha1));
-				printf("              to %s\n",
-				       sha1_to_hex(refs->item->sha1));
-			}
-		}
 	}
 }
 
+/*
+ * The entries in a tree are ordered in the _path_ order,
+ * which means that a directory entry is ordered by adding
+ * a slash to the end of it.
+ *
+ * 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);
+	int len2 = strlen(b->name);
+	int len = len1 < len2 ? len1 : len2;
+	unsigned char c1, c2;
+	int cmp;
+
+	cmp = memcmp(a->name, b->name, len);
+	if (cmp < 0)
+		return 0;
+	if (cmp > 0)
+		return TREE_UNORDERED;
+
+	/*
+	 * Ok, the first <len> characters are the same.
+	 * Now we need to order the next one, but turn
+	 * a '\0' into a '/' for a directory entry.
+	 */
+	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 : TREE_UNORDERED;
+}
+
 static int fsck_tree(struct tree *item)
 {
-	if (item->has_full_path) {
-		fprintf(stderr, "warning: fsck-cache: tree %s "
+	int has_full_path = 0;
+	struct tree_entry_list *entry, *last;
+
+	last = NULL;
+	for (entry = item->entries; entry; entry = entry->next) {
+		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) {
+			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;
+			}
+		}
+
+		last = entry;
+	}
+
+	if (has_full_path) {
+		fprintf(stderr, "warning: git-fsck-cache: tree %s "
 			"has full pathnames in it\n", 
 			sha1_to_hex(item->object.sha1));
 	}
+
 	return 0;
 }
 
@@ -72,34 +215,92 @@ 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;
 }
 
-static int fsck_name(char *hex)
+static int fsck_sha1(unsigned char *sha1)
 {
+	struct object *obj = parse_object(sha1);
+	if (!obj)
+		return -1;
+	if (obj->type == blob_type)
+		return 0;
+	if (obj->type == tree_type)
+		return fsck_tree((struct tree *) obj);
+	if (obj->type == commit_type)
+		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;
+}
+
+/*
+ * This is the sorting chunk size: make it reasonably
+ * big so that we can sort well..
+ */
+#define MAX_SHA1_ENTRIES (1024)
+
+struct sha1_entry {
+	unsigned long ino;
 	unsigned char sha1[20];
-	if (!get_sha1_hex(hex, sha1)) {
-		struct object *obj = parse_object(sha1);
-		if (!obj)
-			return -1;
-		if (obj->type == blob_type)
-			return 0;
-		if (obj->type == tree_type)
-			return fsck_tree((struct tree *) obj);
-		if (obj->type == commit_type)
-			return fsck_commit((struct commit *) obj);
-		if (obj->type == tag_type)
-			return fsck_tag((struct tag *) obj);
+};
+
+static struct {
+	unsigned long nr;
+	struct sha1_entry *entry[MAX_SHA1_ENTRIES];
+} sha1_list;
+
+static int ino_compare(const void *_a, const void *_b)
+{
+	const struct sha1_entry *a = _a, *b = _b;
+	unsigned long ino1 = a->ino, ino2 = b->ino;
+	return ino1 < ino2 ? -1 : ino1 > ino2 ? 1 : 0;
+}
+
+static void fsck_sha1_list(void)
+{
+	int i, nr = sha1_list.nr;
+
+	qsort(sha1_list.entry, nr, sizeof(struct sha1_entry *), ino_compare);
+	for (i = 0; i < nr; i++) {
+		struct sha1_entry *entry = sha1_list.entry[i];
+		unsigned char *sha1 = entry->sha1;
+
+		sha1_list.entry[i] = NULL;
+		if (fsck_sha1(sha1) < 0)
+			fprintf(stderr, "bad sha1 entry '%s'\n", sha1_to_hex(sha1));
+		free(entry);
 	}
-	return -1;
+	sha1_list.nr = 0;
+}
+
+static void add_sha1_list(unsigned char *sha1, unsigned long ino)
+{
+	struct sha1_entry *entry = xmalloc(sizeof(*entry));
+	int nr;
+
+	entry->ino = ino;
+	memcpy(entry->sha1, sha1, 20);
+	nr = sha1_list.nr;
+	if (nr == MAX_SHA1_ENTRIES) {
+		fsck_sha1_list();
+		nr = 0;
+	}
+	sha1_list.entry[nr] = entry;
+	sha1_list.nr = ++nr;
 }
 
 static int fsck_dir(int i, char *path)
@@ -113,6 +314,7 @@ static int fsck_dir(int i, char *path)
 
 	while ((de = readdir(dir)) != NULL) {
 		char name[100];
+		unsigned char sha1[20];
 		int len = strlen(de->d_name);
 
 		switch (len) {
@@ -126,8 +328,10 @@ static int fsck_dir(int i, char *path)
 		case 38:
 			sprintf(name, "%02x", i);
 			memcpy(name+2, de->d_name, len+1);
-			if (!fsck_name(name))
-				continue;
+			if (get_sha1_hex(name, sha1) < 0)
+				break;
+			add_sha1_list(sha1, de->d_ino);
+			continue;
 		}
 		fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
 	}
@@ -135,6 +339,74 @@ 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 void 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;
+
+	/*
+	 * Recurse into directories
+	 */
+	if (S_ISDIR(st.st_mode)) {
+		DIR *dir = opendir(path);
+		if (dir) {
+			struct dirent *de;
+			while ((de = readdir(dir)) != NULL) {
+				if (de->d_name[0] == '.')
+					continue;
+				find_file_objects(path, de->d_name);
+			}
+			closedir(dir);
+		}
+		return;
+	}
+	if (S_ISREG(st.st_mode)) {
+		read_sha1_reference(path);
+		return;
+	}
+}
+
+static void get_default_heads(void)
+{
+	char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+	find_file_objects(git_dir, "refs");
+}
+
 int main(int argc, char **argv)
 {
 	int i, heads;
@@ -155,16 +427,27 @@ 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);
 		fsck_dir(i, dir);
 	}
+	fsck_sha1_list();
+
+	expand_deltas();
 
 	heads = 0;
 	for (i = 1; i < argc; i++) {
@@ -173,15 +456,13 @@ int main(int argc, char **argv)
 		if (*arg == '-')
 			continue;
 
-		if (!get_sha1_hex(arg, head_sha1)) {
-			struct commit *commit = lookup_commit(head_sha1);
-			struct object *obj;
+		if (!get_sha1(arg, head_sha1)) {
+			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++;
@@ -190,12 +471,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();