Matthias Kestenholz | 6441363 | 2006-08-03 17:24:37 +0200 | [diff] [blame] | 1 | #include "builtin.h" |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 2 | #include "cache.h" |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 3 | #include "object.h" |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 4 | #include "delta.h" |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 5 | #include "pack.h" |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 6 | #include "blob.h" |
| 7 | #include "commit.h" |
| 8 | #include "tag.h" |
| 9 | #include "tree.h" |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 10 | #include "tree-walk.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 11 | #include "progress.h" |
Martin Koegler | 2add1e6 | 2008-02-25 22:46:10 +0100 | [diff] [blame] | 12 | #include "decorate.h" |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 13 | #include "fsck.h" |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 14 | |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 15 | static int dry_run, quiet, recover, has_errors, strict; |
Heikki Orsila | f18d244 | 2008-09-13 20:18:36 +0300 | [diff] [blame] | 16 | static const char unpack_usage[] = "git unpack-objects [-n] [-q] [-r] [--strict] < pack-file"; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 17 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 18 | /* We always read in 4kB chunks. */ |
| 19 | static unsigned char buffer[4096]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 20 | static unsigned int offset, len; |
| 21 | static off_t consumed_bytes; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 22 | static git_SHA_CTX ctx; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 23 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 24 | /* |
| 25 | * When running under --strict mode, objects whose reachability are |
| 26 | * suspect are kept in core without getting written in the object |
| 27 | * store. |
| 28 | */ |
Martin Koegler | 2add1e6 | 2008-02-25 22:46:10 +0100 | [diff] [blame] | 29 | struct obj_buffer { |
| 30 | char *buffer; |
| 31 | unsigned long size; |
| 32 | }; |
| 33 | |
| 34 | static struct decoration obj_decorate; |
| 35 | |
| 36 | static struct obj_buffer *lookup_object_buffer(struct object *base) |
| 37 | { |
| 38 | return lookup_decoration(&obj_decorate, base); |
| 39 | } |
| 40 | |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 41 | static void add_object_buffer(struct object *object, char *buffer, unsigned long size) |
| 42 | { |
| 43 | struct obj_buffer *obj; |
| 44 | obj = xcalloc(1, sizeof(struct obj_buffer)); |
| 45 | obj->buffer = buffer; |
| 46 | obj->size = size; |
| 47 | if (add_decoration(&obj_decorate, object, obj)) |
| 48 | die("object %s tried to add buffer twice!", sha1_to_hex(object->sha1)); |
| 49 | } |
| 50 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 51 | /* |
| 52 | * Make sure at least "min" bytes are available in the buffer, and |
| 53 | * return the pointer to the buffer. |
| 54 | */ |
Edgar Toernig | 79a6569 | 2006-10-30 17:44:27 -0800 | [diff] [blame] | 55 | static void *fill(int min) |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 56 | { |
| 57 | if (min <= len) |
| 58 | return buffer + offset; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 59 | if (min > sizeof(buffer)) |
| 60 | die("cannot fill %d bytes", min); |
| 61 | if (offset) { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 62 | git_SHA1_Update(&ctx, buffer, offset); |
Edgar Toernig | 79a6569 | 2006-10-30 17:44:27 -0800 | [diff] [blame] | 63 | memmove(buffer, buffer + offset, len); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 64 | offset = 0; |
| 65 | } |
| 66 | do { |
Johan Herland | 8a912bc | 2007-05-15 14:49:22 +0200 | [diff] [blame] | 67 | ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 68 | if (ret <= 0) { |
| 69 | if (!ret) |
| 70 | die("early EOF"); |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 71 | die_errno("read error on input"); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 72 | } |
| 73 | len += ret; |
| 74 | } while (len < min); |
| 75 | return buffer; |
| 76 | } |
| 77 | |
| 78 | static void use(int bytes) |
| 79 | { |
| 80 | if (bytes > len) |
| 81 | die("used more bytes than were available"); |
| 82 | len -= bytes; |
| 83 | offset += bytes; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 84 | |
| 85 | /* make sure off_t is sufficiently large not to wrap */ |
| 86 | if (consumed_bytes > consumed_bytes + bytes) |
| 87 | die("pack too large for current definition of off_t"); |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 88 | consumed_bytes += bytes; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 89 | } |
| 90 | |
| 91 | static void *get_data(unsigned long size) |
| 92 | { |
| 93 | z_stream stream; |
| 94 | void *buf = xmalloc(size); |
| 95 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 96 | memset(&stream, 0, sizeof(stream)); |
| 97 | |
| 98 | stream.next_out = buf; |
| 99 | stream.avail_out = size; |
| 100 | stream.next_in = fill(1); |
| 101 | stream.avail_in = len; |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 102 | git_inflate_init(&stream); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 103 | |
| 104 | for (;;) { |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 105 | int ret = git_inflate(&stream, 0); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 106 | use(len - stream.avail_in); |
| 107 | if (stream.total_out == size && ret == Z_STREAM_END) |
| 108 | break; |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 109 | if (ret != Z_OK) { |
| 110 | error("inflate returned %d\n", ret); |
| 111 | free(buf); |
| 112 | buf = NULL; |
Junio C Hamano | 3b67d29 | 2006-09-13 12:59:20 -0700 | [diff] [blame] | 113 | if (!recover) |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 114 | exit(1); |
| 115 | has_errors = 1; |
| 116 | break; |
| 117 | } |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 118 | stream.next_in = fill(1); |
| 119 | stream.avail_in = len; |
| 120 | } |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 121 | git_inflate_end(&stream); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 122 | return buf; |
| 123 | } |
| 124 | |
| 125 | struct delta_info { |
| 126 | unsigned char base_sha1[20]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 127 | unsigned nr; |
| 128 | off_t base_offset; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 129 | unsigned long size; |
| 130 | void *delta; |
| 131 | struct delta_info *next; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 132 | }; |
| 133 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 134 | static struct delta_info *delta_list; |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 135 | |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 136 | static void add_delta_to_list(unsigned nr, unsigned const char *base_sha1, |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 137 | off_t base_offset, |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 138 | void *delta, unsigned long size) |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 139 | { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 140 | struct delta_info *info = xmalloc(sizeof(*info)); |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 141 | |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 142 | hashcpy(info->base_sha1, base_sha1); |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 143 | info->base_offset = base_offset; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 144 | info->size = size; |
| 145 | info->delta = delta; |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 146 | info->nr = nr; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 147 | info->next = delta_list; |
| 148 | delta_list = info; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 149 | } |
| 150 | |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 151 | struct obj_info { |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 152 | off_t offset; |
Linus Torvalds | cca7081 | 2005-06-29 09:38:02 -0700 | [diff] [blame] | 153 | unsigned char sha1[20]; |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 154 | struct object *obj; |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 155 | }; |
| 156 | |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 157 | #define FLAG_OPEN (1u<<20) |
| 158 | #define FLAG_WRITTEN (1u<<21) |
| 159 | |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 160 | static struct obj_info *obj_list; |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 161 | static unsigned nr_objects; |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 162 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 163 | /* |
| 164 | * Called only from check_object() after it verified this object |
| 165 | * is Ok. |
| 166 | */ |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 167 | static void write_cached_object(struct object *obj) |
| 168 | { |
| 169 | unsigned char sha1[20]; |
| 170 | struct obj_buffer *obj_buf = lookup_object_buffer(obj); |
| 171 | if (write_sha1_file(obj_buf->buffer, obj_buf->size, typename(obj->type), sha1) < 0) |
| 172 | die("failed to write object %s", sha1_to_hex(obj->sha1)); |
| 173 | obj->flags |= FLAG_WRITTEN; |
| 174 | } |
| 175 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 176 | /* |
| 177 | * At the very end of the processing, write_rest() scans the objects |
| 178 | * that have reachability requirements and calls this function. |
| 179 | * Verify its reachability and validity recursively and write it out. |
| 180 | */ |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 181 | static int check_object(struct object *obj, int type, void *data) |
| 182 | { |
| 183 | if (!obj) |
| 184 | return 0; |
| 185 | |
| 186 | if (obj->flags & FLAG_WRITTEN) |
| 187 | return 1; |
| 188 | |
| 189 | if (type != OBJ_ANY && obj->type != type) |
| 190 | die("object type mismatch"); |
| 191 | |
| 192 | if (!(obj->flags & FLAG_OPEN)) { |
| 193 | unsigned long size; |
| 194 | int type = sha1_object_info(obj->sha1, &size); |
| 195 | if (type != obj->type || type <= 0) |
| 196 | die("object of unexpected type"); |
| 197 | obj->flags |= FLAG_WRITTEN; |
| 198 | return 1; |
| 199 | } |
| 200 | |
| 201 | if (fsck_object(obj, 1, fsck_error_function)) |
| 202 | die("Error in object"); |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 203 | if (!fsck_walk(obj, check_object, NULL)) |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 204 | die("Error on reachable objects of %s", sha1_to_hex(obj->sha1)); |
| 205 | write_cached_object(obj); |
| 206 | return 1; |
| 207 | } |
| 208 | |
| 209 | static void write_rest(void) |
| 210 | { |
| 211 | unsigned i; |
| 212 | for (i = 0; i < nr_objects; i++) |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 213 | check_object(obj_list[i].obj, OBJ_ANY, NULL); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 214 | } |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 215 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 216 | static void added_object(unsigned nr, enum object_type type, |
| 217 | void *data, unsigned long size); |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 218 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 219 | /* |
| 220 | * Write out nr-th object from the list, now we know the contents |
| 221 | * of it. Under --strict, this buffers structured objects in-core, |
| 222 | * to be checked at the end. |
| 223 | */ |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 224 | static void write_object(unsigned nr, enum object_type type, |
| 225 | void *buf, unsigned long size) |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 226 | { |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 227 | if (!strict) { |
| 228 | if (write_sha1_file(buf, size, typename(type), obj_list[nr].sha1) < 0) |
| 229 | die("failed to write object"); |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 230 | added_object(nr, type, buf, size); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 231 | free(buf); |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 232 | obj_list[nr].obj = NULL; |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 233 | } else if (type == OBJ_BLOB) { |
| 234 | struct blob *blob; |
| 235 | if (write_sha1_file(buf, size, typename(type), obj_list[nr].sha1) < 0) |
| 236 | die("failed to write object"); |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 237 | added_object(nr, type, buf, size); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 238 | free(buf); |
| 239 | |
| 240 | blob = lookup_blob(obj_list[nr].sha1); |
| 241 | if (blob) |
| 242 | blob->object.flags |= FLAG_WRITTEN; |
| 243 | else |
| 244 | die("invalid blob object"); |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 245 | obj_list[nr].obj = NULL; |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 246 | } else { |
| 247 | struct object *obj; |
| 248 | int eaten; |
| 249 | hash_sha1_file(buf, size, typename(type), obj_list[nr].sha1); |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 250 | added_object(nr, type, buf, size); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 251 | obj = parse_object_buffer(obj_list[nr].sha1, type, size, buf, &eaten); |
| 252 | if (!obj) |
| 253 | die("invalid %s", typename(type)); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 254 | add_object_buffer(obj, buf, size); |
| 255 | obj->flags |= FLAG_OPEN; |
| 256 | obj_list[nr].obj = obj; |
| 257 | } |
Linus Torvalds | cca7081 | 2005-06-29 09:38:02 -0700 | [diff] [blame] | 258 | } |
| 259 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 260 | static void resolve_delta(unsigned nr, enum object_type type, |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 261 | void *base, unsigned long base_size, |
| 262 | void *delta, unsigned long delta_size) |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 263 | { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 264 | void *result; |
| 265 | unsigned long result_size; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 266 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 267 | result = patch_delta(base, base_size, |
| 268 | delta, delta_size, |
| 269 | &result_size); |
| 270 | if (!result) |
| 271 | die("failed to apply delta"); |
| 272 | free(delta); |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 273 | write_object(nr, type, result, result_size); |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 274 | } |
| 275 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 276 | /* |
| 277 | * We now know the contents of an object (which is nr-th in the pack); |
| 278 | * resolve all the deltified objects that are based on it. |
| 279 | */ |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 280 | static void added_object(unsigned nr, enum object_type type, |
| 281 | void *data, unsigned long size) |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 282 | { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 283 | struct delta_info **p = &delta_list; |
| 284 | struct delta_info *info; |
| 285 | |
| 286 | while ((info = *p) != NULL) { |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 287 | if (!hashcmp(info->base_sha1, obj_list[nr].sha1) || |
| 288 | info->base_offset == obj_list[nr].offset) { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 289 | *p = info->next; |
| 290 | p = &delta_list; |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 291 | resolve_delta(info->nr, type, data, size, |
| 292 | info->delta, info->size); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 293 | free(info); |
| 294 | continue; |
| 295 | } |
| 296 | p = &info->next; |
| 297 | } |
| 298 | } |
| 299 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 300 | static void unpack_non_delta_entry(enum object_type type, unsigned long size, |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 301 | unsigned nr) |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 302 | { |
| 303 | void *buf = get_data(size); |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 304 | |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 305 | if (!dry_run && buf) |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 306 | write_object(nr, type, buf, size); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 307 | else |
| 308 | free(buf); |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 309 | } |
| 310 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 311 | static int resolve_against_held(unsigned nr, const unsigned char *base, |
| 312 | void *delta_data, unsigned long delta_size) |
| 313 | { |
| 314 | struct object *obj; |
| 315 | struct obj_buffer *obj_buffer; |
| 316 | obj = lookup_object(base); |
| 317 | if (!obj) |
| 318 | return 0; |
| 319 | obj_buffer = lookup_object_buffer(obj); |
| 320 | if (!obj_buffer) |
| 321 | return 0; |
| 322 | resolve_delta(nr, obj->type, obj_buffer->buffer, |
| 323 | obj_buffer->size, delta_data, delta_size); |
| 324 | return 1; |
| 325 | } |
| 326 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 327 | static void unpack_delta_entry(enum object_type type, unsigned long delta_size, |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 328 | unsigned nr) |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 329 | { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 330 | void *delta_data, *base; |
| 331 | unsigned long base_size; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 332 | unsigned char base_sha1[20]; |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 333 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 334 | if (type == OBJ_REF_DELTA) { |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 335 | hashcpy(base_sha1, fill(20)); |
| 336 | use(20); |
| 337 | delta_data = get_data(delta_size); |
| 338 | if (dry_run || !delta_data) { |
| 339 | free(delta_data); |
| 340 | return; |
| 341 | } |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 342 | if (has_sha1_file(base_sha1)) |
| 343 | ; /* Ok we have this one */ |
| 344 | else if (resolve_against_held(nr, base_sha1, |
| 345 | delta_data, delta_size)) |
| 346 | return; /* we are done */ |
| 347 | else { |
| 348 | /* cannot resolve yet --- queue it */ |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 349 | hashcpy(obj_list[nr].sha1, null_sha1); |
| 350 | add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size); |
| 351 | return; |
| 352 | } |
| 353 | } else { |
| 354 | unsigned base_found = 0; |
| 355 | unsigned char *pack, c; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 356 | off_t base_offset; |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 357 | unsigned lo, mid, hi; |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 358 | |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 359 | pack = fill(1); |
| 360 | c = *pack; |
| 361 | use(1); |
| 362 | base_offset = c & 127; |
| 363 | while (c & 128) { |
| 364 | base_offset += 1; |
Nicolas Pitre | 8723f21 | 2007-04-09 01:06:29 -0400 | [diff] [blame] | 365 | if (!base_offset || MSB(base_offset, 7)) |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 366 | die("offset value overflow for delta base object"); |
| 367 | pack = fill(1); |
| 368 | c = *pack; |
| 369 | use(1); |
| 370 | base_offset = (base_offset << 7) + (c & 127); |
| 371 | } |
| 372 | base_offset = obj_list[nr].offset - base_offset; |
Nicolas Pitre | d8f3255 | 2008-10-29 19:02:45 -0400 | [diff] [blame] | 373 | if (base_offset <= 0 || base_offset >= obj_list[nr].offset) |
| 374 | die("offset value out of bound for delta base object"); |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 375 | |
| 376 | delta_data = get_data(delta_size); |
| 377 | if (dry_run || !delta_data) { |
| 378 | free(delta_data); |
| 379 | return; |
| 380 | } |
| 381 | lo = 0; |
| 382 | hi = nr; |
| 383 | while (lo < hi) { |
| 384 | mid = (lo + hi)/2; |
| 385 | if (base_offset < obj_list[mid].offset) { |
| 386 | hi = mid; |
| 387 | } else if (base_offset > obj_list[mid].offset) { |
| 388 | lo = mid + 1; |
| 389 | } else { |
| 390 | hashcpy(base_sha1, obj_list[mid].sha1); |
| 391 | base_found = !is_null_sha1(base_sha1); |
| 392 | break; |
| 393 | } |
| 394 | } |
| 395 | if (!base_found) { |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 396 | /* |
| 397 | * The delta base object is itself a delta that |
| 398 | * has not been resolved yet. |
| 399 | */ |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 400 | hashcpy(obj_list[nr].sha1, null_sha1); |
| 401 | add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size); |
| 402 | return; |
| 403 | } |
Linus Torvalds | dddafff | 2005-06-29 09:53:20 -0700 | [diff] [blame] | 404 | } |
Linus Torvalds | c4fb06c | 2005-06-26 08:40:08 -0700 | [diff] [blame] | 405 | |
Junio C Hamano | f2898cf | 2008-03-04 23:46:51 -0800 | [diff] [blame] | 406 | if (resolve_against_held(nr, base_sha1, delta_data, delta_size)) |
| 407 | return; |
Martin Koegler | 2add1e6 | 2008-02-25 22:46:10 +0100 | [diff] [blame] | 408 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 409 | base = read_sha1_file(base_sha1, &type, &base_size); |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 410 | if (!base) { |
| 411 | error("failed to read delta-pack base object %s", |
| 412 | sha1_to_hex(base_sha1)); |
Junio C Hamano | 3b67d29 | 2006-09-13 12:59:20 -0700 | [diff] [blame] | 413 | if (!recover) |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 414 | exit(1); |
| 415 | has_errors = 1; |
| 416 | return; |
| 417 | } |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 418 | resolve_delta(nr, type, base, base_size, delta_data, delta_size); |
Sergey Vlasov | ee63914 | 2005-08-03 16:11:00 +0400 | [diff] [blame] | 419 | free(base); |
Junio C Hamano | 8ee378a | 2005-06-26 04:29:18 -0700 | [diff] [blame] | 420 | } |
| 421 | |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 422 | static void unpack_one(unsigned nr) |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 423 | { |
Linus Torvalds | 01247d8 | 2005-06-28 22:15:57 -0700 | [diff] [blame] | 424 | unsigned shift; |
Linus Torvalds | 48fb7de | 2009-06-17 17:22:27 -0700 | [diff] [blame] | 425 | unsigned char *pack; |
| 426 | unsigned long size, c; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 427 | enum object_type type; |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 428 | |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 429 | obj_list[nr].offset = consumed_bytes; |
| 430 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 431 | pack = fill(1); |
| 432 | c = *pack; |
| 433 | use(1); |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 434 | type = (c >> 4) & 7; |
| 435 | size = (c & 15); |
Linus Torvalds | 01247d8 | 2005-06-28 22:15:57 -0700 | [diff] [blame] | 436 | shift = 4; |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 437 | while (c & 0x80) { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 438 | pack = fill(1); |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 439 | c = *pack; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 440 | use(1); |
Linus Torvalds | 01247d8 | 2005-06-28 22:15:57 -0700 | [diff] [blame] | 441 | size += (c & 0x7f) << shift; |
| 442 | shift += 7; |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 443 | } |
Linus Torvalds | d36f7b8 | 2005-07-09 10:43:02 -0700 | [diff] [blame] | 444 | |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 445 | switch (type) { |
| 446 | case OBJ_COMMIT: |
| 447 | case OBJ_TREE: |
| 448 | case OBJ_BLOB: |
| 449 | case OBJ_TAG: |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 450 | unpack_non_delta_entry(type, size, nr); |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 451 | return; |
Nicolas Pitre | eb32d23 | 2006-09-21 00:06:49 -0400 | [diff] [blame] | 452 | case OBJ_REF_DELTA: |
Nicolas Pitre | 209c554 | 2006-09-21 00:07:39 -0400 | [diff] [blame] | 453 | case OBJ_OFS_DELTA: |
| 454 | unpack_delta_entry(type, size, nr); |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 455 | return; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 456 | default: |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 457 | error("bad object type %d", type); |
| 458 | has_errors = 1; |
Junio C Hamano | 3b67d29 | 2006-09-13 12:59:20 -0700 | [diff] [blame] | 459 | if (recover) |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 460 | return; |
| 461 | exit(1); |
Linus Torvalds | a733cb6 | 2005-06-28 14:21:02 -0700 | [diff] [blame] | 462 | } |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 463 | } |
| 464 | |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 465 | static void unpack_all(void) |
| 466 | { |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 467 | int i; |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 468 | struct progress *progress = NULL; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 469 | struct pack_header *hdr = fill(sizeof(struct pack_header)); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 470 | |
| 471 | nr_objects = ntohl(hdr->hdr_entries); |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 472 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 473 | if (ntohl(hdr->hdr_signature) != PACK_SIGNATURE) |
| 474 | die("bad pack file"); |
Nicolas Pitre | d60fc1c | 2006-02-09 17:50:04 -0500 | [diff] [blame] | 475 | if (!pack_version_ok(hdr->hdr_version)) |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 476 | die("unknown pack file version %"PRIu32, |
| 477 | ntohl(hdr->hdr_version)); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 478 | use(sizeof(struct pack_header)); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 479 | |
Nicolas Pitre | 13aaf14 | 2007-04-20 14:10:07 -0400 | [diff] [blame] | 480 | if (!quiet) |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 481 | progress = start_progress("Unpacking objects", nr_objects); |
Brandon Casey | 19d4b41 | 2008-10-06 18:39:10 -0500 | [diff] [blame] | 482 | obj_list = xcalloc(nr_objects, sizeof(*obj_list)); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 483 | for (i = 0; i < nr_objects; i++) { |
| 484 | unpack_one(i); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 485 | display_progress(progress, i + 1); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 486 | } |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 487 | stop_progress(&progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 488 | |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 489 | if (delta_list) |
| 490 | die("unresolved deltas left after unpacking"); |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 491 | } |
| 492 | |
Matthias Kestenholz | 6441363 | 2006-08-03 17:24:37 +0200 | [diff] [blame] | 493 | int cmd_unpack_objects(int argc, const char **argv, const char *prefix) |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 494 | { |
| 495 | int i; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 496 | unsigned char sha1[20]; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 497 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 498 | git_config(git_default_config, NULL); |
Junio C Hamano | 53228a5 | 2005-11-26 00:50:02 -0800 | [diff] [blame] | 499 | |
Junio C Hamano | 476e801 | 2006-01-06 18:53:16 -0800 | [diff] [blame] | 500 | quiet = !isatty(2); |
| 501 | |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 502 | for (i = 1 ; i < argc; i++) { |
| 503 | const char *arg = argv[i]; |
| 504 | |
| 505 | if (*arg == '-') { |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 506 | if (!strcmp(arg, "-n")) { |
| 507 | dry_run = 1; |
| 508 | continue; |
| 509 | } |
Linus Torvalds | d36f7b8 | 2005-07-09 10:43:02 -0700 | [diff] [blame] | 510 | if (!strcmp(arg, "-q")) { |
| 511 | quiet = 1; |
| 512 | continue; |
| 513 | } |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 514 | if (!strcmp(arg, "-r")) { |
Junio C Hamano | 3b67d29 | 2006-09-13 12:59:20 -0700 | [diff] [blame] | 515 | recover = 1; |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 516 | continue; |
| 517 | } |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 518 | if (!strcmp(arg, "--strict")) { |
| 519 | strict = 1; |
| 520 | continue; |
| 521 | } |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 522 | if (!prefixcmp(arg, "--pack_header=")) { |
Nicolas Pitre | bed006f | 2006-11-01 17:06:20 -0500 | [diff] [blame] | 523 | struct pack_header *hdr; |
| 524 | char *c; |
| 525 | |
| 526 | hdr = (struct pack_header *)buffer; |
| 527 | hdr->hdr_signature = htonl(PACK_SIGNATURE); |
| 528 | hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10)); |
| 529 | if (*c != ',') |
| 530 | die("bad %s", arg); |
| 531 | hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10)); |
| 532 | if (*c) |
| 533 | die("bad %s", arg); |
| 534 | len = sizeof(*hdr); |
| 535 | continue; |
| 536 | } |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 537 | usage(unpack_usage); |
| 538 | } |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 539 | |
| 540 | /* We don't take any non-flag arguments now.. Maybe some day */ |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 541 | usage(unpack_usage); |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 542 | } |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 543 | git_SHA1_Init(&ctx); |
Linus Torvalds | 7453695 | 2005-06-25 15:59:31 -0700 | [diff] [blame] | 544 | unpack_all(); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 545 | git_SHA1_Update(&ctx, buffer, offset); |
| 546 | git_SHA1_Final(sha1, &ctx); |
Martin Koegler | b41860b | 2008-02-25 22:46:11 +0100 | [diff] [blame] | 547 | if (strict) |
| 548 | write_rest(); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 549 | if (hashcmp(fill(20), sha1)) |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 550 | die("final sha1 did not match"); |
| 551 | use(20); |
| 552 | |
| 553 | /* Write the last part of the buffer to stdout */ |
| 554 | while (len) { |
Junio C Hamano | 1c15afb | 2005-12-19 16:18:28 -0800 | [diff] [blame] | 555 | int ret = xwrite(1, buffer + offset, len); |
| 556 | if (ret <= 0) |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 557 | break; |
Linus Torvalds | 67e5a5e | 2005-06-28 20:34:23 -0700 | [diff] [blame] | 558 | len -= ret; |
| 559 | offset += ret; |
| 560 | } |
| 561 | |
| 562 | /* All done */ |
Junio C Hamano | f986f2c | 2006-09-03 22:55:54 -0700 | [diff] [blame] | 563 | return has_errors; |
Linus Torvalds | bad50dc | 2005-06-25 15:27:14 -0700 | [diff] [blame] | 564 | } |