X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=object.c;h=1fdebe012ba8a6db0b6eae443e40a7f74ae2d597;hb=6d0de319d6249096fe934317e937177d07b1b84f;hp=5e8378857028afeb4d1cd91c0de26c8414e137de;hpb=5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6;p=git.git

diff --git a/object.c b/object.c
index 5e837885..1fdebe01 100644
--- a/object.c
+++ b/object.c
@@ -4,12 +4,13 @@
 #include "commit.h"
 #include "cache.h"
 #include "tag.h"
-#include "delta.h"
 
 struct object **objs;
 int nr_objs;
 static int obj_allocs;
 
+int track_object_refs = 1;
+
 static int find_object(const unsigned char *sha1)
 {
 	int first = 0, last = nr_objs;
@@ -68,9 +69,12 @@ void created_object(const unsigned char *sha1, struct object *obj)
 
 void add_ref(struct object *refer, struct object *target)
 {
-	struct object_list **pp = &refer->refs;
-	struct object_list *p;
-	
+	struct object_list **pp, *p;
+
+	if (!track_object_refs)
+		return;
+
+	pp = &refer->refs;
 	while ((p = *pp) != NULL) {
 		if (p->item == target)
 			return;
@@ -88,6 +92,8 @@ void mark_reachable(struct object *obj, unsigned int mask)
 {
 	struct object_list *p = obj->refs;
 
+	if (!track_object_refs)
+		die("cannot do reachability with object refs turned off");
 	/* If we've been here already, don't bother */
 	if (obj->flags & mask)
 		return;
@@ -98,27 +104,55 @@ void mark_reachable(struct object *obj, unsigned int mask)
 	}
 }
 
+struct object *lookup_object_type(const unsigned char *sha1, const char *type)
+{
+	if (!type) {
+		return lookup_unknown_object(sha1);
+	} else if (!strcmp(type, blob_type)) {
+		return &lookup_blob(sha1)->object;
+	} else if (!strcmp(type, tree_type)) {
+		return &lookup_tree(sha1)->object;
+	} else if (!strcmp(type, commit_type)) {
+		return &lookup_commit(sha1)->object;
+	} else if (!strcmp(type, tag_type)) {
+		return &lookup_tag(sha1)->object;
+	} else {
+		error("Unknown type %s", type);
+		return NULL;
+	}
+}
+
+union any_object {
+	struct object object;
+	struct commit commit;
+	struct tree tree;
+	struct blob blob;
+	struct tag tag;
+};
+
+struct object *lookup_unknown_object(const unsigned char *sha1)
+{
+	struct object *obj = lookup_object(sha1);
+	if (!obj) {
+		union any_object *ret = xmalloc(sizeof(*ret));
+		memset(ret, 0, sizeof(*ret));
+		created_object(sha1, &ret->object);
+		ret->object.type = NULL;
+		return &ret->object;
+	}
+	return obj;
+}
+
 struct object *parse_object(const unsigned char *sha1)
 {
-	unsigned long mapsize;
-	void *map = map_sha1_file(sha1, &mapsize);
-	if (map) {
-		int is_delta;
+	unsigned long size;
+	char type[20];
+	void *buffer = read_sha1_file(sha1, type, &size);
+	if (buffer) {
 		struct object *obj;
-		char type[100];
-		unsigned long size;
-		void *buffer = unpack_sha1_file(map, mapsize, type, &size);
-		munmap(map, mapsize);
-		if (!buffer)
-			return NULL;
-		is_delta = !strcmp(type, "delta");
-		if (!is_delta && check_sha1_signature(sha1, buffer, size, type) < 0)
+		if (check_sha1_signature(sha1, buffer, size, type) < 0)
 			printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
-		if (is_delta) {
-			struct delta *delta = lookup_delta(sha1);
-			parse_delta_buffer(delta, buffer, size);
-			obj = (struct object *) delta;
-		} else if (!strcmp(type, "blob")) {
+		if (!strcmp(type, "blob")) {
 			struct blob *blob = lookup_blob(sha1);
 			parse_blob_buffer(blob, buffer, size);
 			obj = &blob->object;
@@ -146,3 +180,44 @@ struct object *parse_object(const unsigned char *sha1)
 	}
 	return NULL;
 }
+
+struct object_list *object_list_insert(struct object *item,
+				       struct object_list **list_p)
+{
+	struct object_list *new_list = xmalloc(sizeof(struct object_list));
+        new_list->item = item;
+        new_list->next = *list_p;
+        *list_p = new_list;
+        return new_list;
+}
+
+void object_list_append(struct object *item,
+			struct object_list **list_p)
+{
+	while (*list_p) {
+		list_p = &((*list_p)->next);
+	}
+	*list_p = xmalloc(sizeof(struct object_list));
+	(*list_p)->next = NULL;
+	(*list_p)->item = item;
+}
+
+unsigned object_list_length(struct object_list *list)
+{
+	unsigned ret = 0;
+	while (list) {
+		list = list->next;
+		ret++;
+	}
+	return ret;
+}
+
+int object_list_contains(struct object_list *list, struct object *obj)
+{
+	while (list) {
+		if (list->item == obj)
+			return 1;
+		list = list->next;
+	}
+	return 0;
+}