Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "delta.h" |
| 3 | #include "pack.h" |
| 4 | #include "csum-file.h" |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 5 | #include "blob.h" |
| 6 | #include "commit.h" |
| 7 | #include "tag.h" |
| 8 | #include "tree.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 9 | #include "progress.h" |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 10 | #include "fsck.h" |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 11 | #include "exec_cmd.h" |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 12 | |
| 13 | static const char index_pack_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 14 | "git index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }"; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 15 | |
| 16 | struct object_entry |
| 17 | { |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 18 | struct pack_idx_entry idx; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 19 | unsigned long size; |
| 20 | unsigned int hdr_size; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 21 | enum object_type type; |
| 22 | enum object_type real_type; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 23 | }; |
| 24 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 25 | union delta_base { |
| 26 | unsigned char sha1[20]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 27 | off_t offset; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 28 | }; |
| 29 | |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 30 | struct base_data { |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 31 | struct base_data *base; |
| 32 | struct base_data *child; |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 33 | struct object_entry *obj; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 34 | void *data; |
| 35 | unsigned long size; |
| 36 | }; |
| 37 | |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 38 | /* |
| 39 | * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want |
| 40 | * to memcmp() only the first 20 bytes. |
| 41 | */ |
| 42 | #define UNION_BASE_SZ 20 |
| 43 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 44 | #define FLAG_LINK (1u<<20) |
| 45 | #define FLAG_CHECKED (1u<<21) |
| 46 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 47 | struct delta_entry |
| 48 | { |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 49 | union delta_base base; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 50 | int obj_no; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 51 | }; |
| 52 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 53 | static struct object_entry *objects; |
| 54 | static struct delta_entry *deltas; |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 55 | static struct base_data *base_cache; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 56 | static size_t base_cache_used; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 57 | static int nr_objects; |
| 58 | static int nr_deltas; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 59 | static int nr_resolved_deltas; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 60 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 61 | static int from_stdin; |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 62 | static int strict; |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 63 | static int verbose; |
| 64 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 65 | static struct progress *progress; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 66 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 67 | /* We always read in 4kB chunks. */ |
| 68 | static unsigned char input_buffer[4096]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 69 | static unsigned int input_offset, input_len; |
| 70 | static off_t consumed_bytes; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 71 | static git_SHA_CTX input_ctx; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 72 | static uint32_t input_crc32; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 73 | static int input_fd, output_fd, pack_fd; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 74 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 75 | static int mark_link(struct object *obj, int type, void *data) |
| 76 | { |
| 77 | if (!obj) |
| 78 | return -1; |
| 79 | |
| 80 | if (type != OBJ_ANY && obj->type != type) |
| 81 | die("object type mismatch at %s", sha1_to_hex(obj->sha1)); |
| 82 | |
| 83 | obj->flags |= FLAG_LINK; |
| 84 | return 0; |
| 85 | } |
| 86 | |
| 87 | /* The content of each linked object must have been checked |
| 88 | or it must be already present in the object database */ |
| 89 | static void check_object(struct object *obj) |
| 90 | { |
| 91 | if (!obj) |
| 92 | return; |
| 93 | |
| 94 | if (!(obj->flags & FLAG_LINK)) |
| 95 | return; |
| 96 | |
| 97 | if (!(obj->flags & FLAG_CHECKED)) { |
| 98 | unsigned long size; |
| 99 | int type = sha1_object_info(obj->sha1, &size); |
| 100 | if (type != obj->type || type <= 0) |
| 101 | die("object of unexpected type"); |
| 102 | obj->flags |= FLAG_CHECKED; |
| 103 | return; |
| 104 | } |
| 105 | } |
| 106 | |
| 107 | static void check_objects(void) |
| 108 | { |
| 109 | unsigned i, max; |
| 110 | |
| 111 | max = get_max_object_index(); |
| 112 | for (i = 0; i < max; i++) |
| 113 | check_object(get_indexed_object(i)); |
| 114 | } |
| 115 | |
| 116 | |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 117 | /* Discard current buffer used content. */ |
Rene Scharfe | a6e8a76 | 2006-11-18 13:07:06 +0100 | [diff] [blame] | 118 | static void flush(void) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 119 | { |
| 120 | if (input_offset) { |
| 121 | if (output_fd >= 0) |
| 122 | write_or_die(output_fd, input_buffer, input_offset); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 123 | git_SHA1_Update(&input_ctx, input_buffer, input_offset); |
Jim Meyering | 554a263 | 2006-12-11 19:06:34 +0100 | [diff] [blame] | 124 | memmove(input_buffer, input_buffer + input_offset, input_len); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 125 | input_offset = 0; |
| 126 | } |
| 127 | } |
| 128 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 129 | /* |
| 130 | * Make sure at least "min" bytes are available in the buffer, and |
| 131 | * return the pointer to the buffer. |
| 132 | */ |
Nicolas Pitre | b89c4e9 | 2006-10-27 16:14:23 -0400 | [diff] [blame] | 133 | static void *fill(int min) |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 134 | { |
| 135 | if (min <= input_len) |
| 136 | return input_buffer + input_offset; |
| 137 | if (min > sizeof(input_buffer)) |
| 138 | die("cannot fill %d bytes", min); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 139 | flush(); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 140 | do { |
Johan Herland | 8a912bc | 2007-05-15 14:49:22 +0200 | [diff] [blame] | 141 | ssize_t ret = xread(input_fd, input_buffer + input_len, |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 142 | sizeof(input_buffer) - input_len); |
| 143 | if (ret <= 0) { |
| 144 | if (!ret) |
| 145 | die("early EOF"); |
| 146 | die("read error on input: %s", strerror(errno)); |
| 147 | } |
| 148 | input_len += ret; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 149 | if (from_stdin) |
| 150 | display_throughput(progress, consumed_bytes + input_len); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 151 | } while (input_len < min); |
| 152 | return input_buffer; |
| 153 | } |
| 154 | |
| 155 | static void use(int bytes) |
| 156 | { |
| 157 | if (bytes > input_len) |
| 158 | die("used more bytes than were available"); |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 159 | input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 160 | input_len -= bytes; |
| 161 | input_offset += bytes; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 162 | |
| 163 | /* make sure off_t is sufficiently large not to wrap */ |
| 164 | if (consumed_bytes > consumed_bytes + bytes) |
| 165 | die("pack too large for current definition of off_t"); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 166 | consumed_bytes += bytes; |
| 167 | } |
| 168 | |
Nicolas Pitre | 4049b9c | 2007-10-16 21:55:49 -0400 | [diff] [blame] | 169 | static char *open_pack_file(char *pack_name) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 170 | { |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 171 | if (from_stdin) { |
| 172 | input_fd = 0; |
| 173 | if (!pack_name) { |
| 174 | static char tmpfile[PATH_MAX]; |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 175 | output_fd = odb_mkstemp(tmpfile, sizeof(tmpfile), |
| 176 | "pack/tmp_pack_XXXXXX"); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 177 | pack_name = xstrdup(tmpfile); |
| 178 | } else |
| 179 | output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600); |
| 180 | if (output_fd < 0) |
Alexander Potashev | d753070 | 2009-01-04 21:38:41 +0300 | [diff] [blame] | 181 | die("unable to create %s: %s", pack_name, strerror(errno)); |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 182 | pack_fd = output_fd; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 183 | } else { |
| 184 | input_fd = open(pack_name, O_RDONLY); |
| 185 | if (input_fd < 0) |
| 186 | die("cannot open packfile '%s': %s", |
| 187 | pack_name, strerror(errno)); |
| 188 | output_fd = -1; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 189 | pack_fd = input_fd; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 190 | } |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 191 | git_SHA1_Init(&input_ctx); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 192 | return pack_name; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 193 | } |
| 194 | |
| 195 | static void parse_pack_header(void) |
| 196 | { |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 197 | struct pack_header *hdr = fill(sizeof(struct pack_header)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 198 | |
| 199 | /* Header consistency check */ |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 200 | if (hdr->hdr_signature != htonl(PACK_SIGNATURE)) |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 201 | die("pack signature mismatch"); |
Nicolas Pitre | d60fc1c | 2006-02-09 17:50:04 -0500 | [diff] [blame] | 202 | if (!pack_version_ok(hdr->hdr_version)) |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 203 | die("pack version %"PRIu32" unsupported", |
| 204 | ntohl(hdr->hdr_version)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 205 | |
| 206 | nr_objects = ntohl(hdr->hdr_entries); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 207 | use(sizeof(struct pack_header)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 208 | } |
| 209 | |
| 210 | static void bad_object(unsigned long offset, const char *format, |
| 211 | ...) NORETURN __attribute__((format (printf, 2, 3))); |
| 212 | |
| 213 | static void bad_object(unsigned long offset, const char *format, ...) |
| 214 | { |
| 215 | va_list params; |
| 216 | char buf[1024]; |
| 217 | |
| 218 | va_start(params, format); |
| 219 | vsnprintf(buf, sizeof(buf), format, params); |
| 220 | va_end(params); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 221 | die("pack has bad object at offset %lu: %s", offset, buf); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 222 | } |
| 223 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 224 | static void free_base_data(struct base_data *c) |
| 225 | { |
| 226 | if (c->data) { |
| 227 | free(c->data); |
| 228 | c->data = NULL; |
| 229 | base_cache_used -= c->size; |
| 230 | } |
| 231 | } |
| 232 | |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 233 | static void prune_base_data(struct base_data *retain) |
| 234 | { |
Benjamin Kramer | 8e24cba | 2009-03-15 22:01:20 +0100 | [diff] [blame] | 235 | struct base_data *b; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 236 | for (b = base_cache; |
| 237 | base_cache_used > delta_base_cache_limit && b; |
| 238 | b = b->child) { |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 239 | if (b->data && b != retain) |
| 240 | free_base_data(b); |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 241 | } |
| 242 | } |
| 243 | |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 244 | static void link_base_data(struct base_data *base, struct base_data *c) |
| 245 | { |
| 246 | if (base) |
| 247 | base->child = c; |
| 248 | else |
| 249 | base_cache = c; |
| 250 | |
| 251 | c->base = base; |
| 252 | c->child = NULL; |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 253 | if (c->data) |
| 254 | base_cache_used += c->size; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 255 | prune_base_data(c); |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 256 | } |
| 257 | |
| 258 | static void unlink_base_data(struct base_data *c) |
| 259 | { |
| 260 | struct base_data *base = c->base; |
| 261 | if (base) |
| 262 | base->child = NULL; |
| 263 | else |
| 264 | base_cache = NULL; |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 265 | free_base_data(c); |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 266 | } |
| 267 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 268 | static void *unpack_entry_data(unsigned long offset, unsigned long size) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 269 | { |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 270 | z_stream stream; |
| 271 | void *buf = xmalloc(size); |
| 272 | |
| 273 | memset(&stream, 0, sizeof(stream)); |
| 274 | stream.next_out = buf; |
| 275 | stream.avail_out = size; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 276 | stream.next_in = fill(1); |
| 277 | stream.avail_in = input_len; |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 278 | git_inflate_init(&stream); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 279 | |
| 280 | for (;;) { |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 281 | int ret = git_inflate(&stream, 0); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 282 | use(input_len - stream.avail_in); |
| 283 | if (stream.total_out == size && ret == Z_STREAM_END) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 284 | break; |
| 285 | if (ret != Z_OK) |
| 286 | bad_object(offset, "inflate returned %d", ret); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 287 | stream.next_in = fill(1); |
| 288 | stream.avail_in = input_len; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 289 | } |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 290 | git_inflate_end(&stream); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 291 | return buf; |
| 292 | } |
| 293 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 294 | static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_base) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 295 | { |
Linus Torvalds | 48fb7de | 2009-06-17 17:22:27 -0700 | [diff] [blame] | 296 | unsigned char *p; |
| 297 | unsigned long size, c; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 298 | off_t base_offset; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 299 | unsigned shift; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 300 | void *data; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 301 | |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 302 | obj->idx.offset = consumed_bytes; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 303 | input_crc32 = crc32(0, Z_NULL, 0); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 304 | |
| 305 | p = fill(1); |
| 306 | c = *p; |
| 307 | use(1); |
| 308 | obj->type = (c >> 4) & 7; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 309 | size = (c & 15); |
| 310 | shift = 4; |
| 311 | while (c & 0x80) { |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 312 | p = fill(1); |
| 313 | c = *p; |
| 314 | use(1); |
Linus Torvalds | 48fb7de | 2009-06-17 17:22:27 -0700 | [diff] [blame] | 315 | size += (c & 0x7f) << shift; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 316 | shift += 7; |
| 317 | } |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 318 | obj->size = size; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 319 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 320 | switch (obj->type) { |
Nicolas Pitre | eb32d23 | 2006-09-21 00:06:49 -0400 | [diff] [blame] | 321 | case OBJ_REF_DELTA: |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 322 | hashcpy(delta_base->sha1, fill(20)); |
| 323 | use(20); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 324 | break; |
| 325 | case OBJ_OFS_DELTA: |
| 326 | memset(delta_base, 0, sizeof(*delta_base)); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 327 | p = fill(1); |
| 328 | c = *p; |
| 329 | use(1); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 330 | base_offset = c & 127; |
| 331 | while (c & 128) { |
| 332 | base_offset += 1; |
Nicolas Pitre | 8723f21 | 2007-04-09 01:06:29 -0400 | [diff] [blame] | 333 | if (!base_offset || MSB(base_offset, 7)) |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 334 | bad_object(obj->idx.offset, "offset value overflow for delta base object"); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 335 | p = fill(1); |
| 336 | c = *p; |
| 337 | use(1); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 338 | base_offset = (base_offset << 7) + (c & 127); |
| 339 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 340 | delta_base->offset = obj->idx.offset - base_offset; |
Nicolas Pitre | d8f3255 | 2008-10-29 19:02:45 -0400 | [diff] [blame] | 341 | if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset) |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 342 | bad_object(obj->idx.offset, "delta base offset is out of bound"); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 343 | break; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 344 | case OBJ_COMMIT: |
| 345 | case OBJ_TREE: |
| 346 | case OBJ_BLOB: |
| 347 | case OBJ_TAG: |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 348 | break; |
| 349 | default: |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 350 | bad_object(obj->idx.offset, "unknown object type %d", obj->type); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 351 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 352 | obj->hdr_size = consumed_bytes - obj->idx.offset; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 353 | |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 354 | data = unpack_entry_data(obj->idx.offset, obj->size); |
| 355 | obj->idx.crc32 = input_crc32; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 356 | return data; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 357 | } |
| 358 | |
Nicolas Pitre | b89c4e9 | 2006-10-27 16:14:23 -0400 | [diff] [blame] | 359 | static void *get_data_from_pack(struct object_entry *obj) |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 360 | { |
Nicolas Pitre | a91ef6e | 2007-11-10 23:29:10 -0500 | [diff] [blame] | 361 | off_t from = obj[0].idx.offset + obj[0].hdr_size; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 362 | unsigned long len = obj[1].idx.offset - from; |
Shawn O. Pearce | a91d49c | 2007-02-27 23:47:19 -0500 | [diff] [blame] | 363 | unsigned long rdy = 0; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 364 | unsigned char *src, *data; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 365 | z_stream stream; |
| 366 | int st; |
| 367 | |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 368 | src = xmalloc(len); |
Shawn O. Pearce | a91d49c | 2007-02-27 23:47:19 -0500 | [diff] [blame] | 369 | data = src; |
| 370 | do { |
| 371 | ssize_t n = pread(pack_fd, data + rdy, len - rdy, from + rdy); |
Samuel Tardieu | fb74243 | 2008-10-06 19:28:41 +0200 | [diff] [blame] | 372 | if (n < 0) |
Shawn O. Pearce | a91d49c | 2007-02-27 23:47:19 -0500 | [diff] [blame] | 373 | die("cannot pread pack file: %s", strerror(errno)); |
Samuel Tardieu | fb74243 | 2008-10-06 19:28:41 +0200 | [diff] [blame] | 374 | if (!n) |
| 375 | die("premature end of pack file, %lu bytes missing", |
| 376 | len - rdy); |
Shawn O. Pearce | a91d49c | 2007-02-27 23:47:19 -0500 | [diff] [blame] | 377 | rdy += n; |
| 378 | } while (rdy < len); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 379 | data = xmalloc(obj->size); |
| 380 | memset(&stream, 0, sizeof(stream)); |
| 381 | stream.next_out = data; |
| 382 | stream.avail_out = obj->size; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 383 | stream.next_in = src; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 384 | stream.avail_in = len; |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 385 | git_inflate_init(&stream); |
| 386 | while ((st = git_inflate(&stream, Z_FINISH)) == Z_OK); |
| 387 | git_inflate_end(&stream); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 388 | if (st != Z_STREAM_END || stream.total_out != obj->size) |
| 389 | die("serious inflate inconsistency"); |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 390 | free(src); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 391 | return data; |
| 392 | } |
| 393 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 394 | static int find_delta(const union delta_base *base) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 395 | { |
| 396 | int first = 0, last = nr_deltas; |
| 397 | |
| 398 | while (first < last) { |
| 399 | int next = (first + last) / 2; |
| 400 | struct delta_entry *delta = &deltas[next]; |
| 401 | int cmp; |
| 402 | |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 403 | cmp = memcmp(base, &delta->base, UNION_BASE_SZ); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 404 | if (!cmp) |
| 405 | return next; |
| 406 | if (cmp < 0) { |
| 407 | last = next; |
| 408 | continue; |
| 409 | } |
| 410 | first = next+1; |
| 411 | } |
| 412 | return -first-1; |
| 413 | } |
| 414 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 415 | static void find_delta_children(const union delta_base *base, |
| 416 | int *first_index, int *last_index) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 417 | { |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 418 | int first = find_delta(base); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 419 | int last = first; |
| 420 | int end = nr_deltas - 1; |
| 421 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 422 | if (first < 0) { |
| 423 | *first_index = 0; |
| 424 | *last_index = -1; |
| 425 | return; |
| 426 | } |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 427 | while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ)) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 428 | --first; |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 429 | while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ)) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 430 | ++last; |
| 431 | *first_index = first; |
| 432 | *last_index = last; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 433 | } |
| 434 | |
| 435 | static void sha1_object(const void *data, unsigned long size, |
Nicolas Pitre | 9096c66 | 2007-03-20 17:07:48 -0400 | [diff] [blame] | 436 | enum object_type type, unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 437 | { |
Nicolas Pitre | ce9fbf1 | 2007-03-20 16:02:09 -0400 | [diff] [blame] | 438 | hash_sha1_file(data, size, typename(type), sha1); |
Nicolas Pitre | 9096c66 | 2007-03-20 17:07:48 -0400 | [diff] [blame] | 439 | if (has_sha1_file(sha1)) { |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 440 | void *has_data; |
| 441 | enum object_type has_type; |
| 442 | unsigned long has_size; |
| 443 | has_data = read_sha1_file(sha1, &has_type, &has_size); |
| 444 | if (!has_data) |
| 445 | die("cannot read existing object %s", sha1_to_hex(sha1)); |
| 446 | if (size != has_size || type != has_type || |
| 447 | memcmp(data, has_data, size) != 0) |
| 448 | die("SHA1 COLLISION FOUND WITH %s !", sha1_to_hex(sha1)); |
Nicolas Pitre | bbf4b41 | 2007-04-03 12:33:46 -0400 | [diff] [blame] | 449 | free(has_data); |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 450 | } |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 451 | if (strict) { |
| 452 | if (type == OBJ_BLOB) { |
| 453 | struct blob *blob = lookup_blob(sha1); |
| 454 | if (blob) |
| 455 | blob->object.flags |= FLAG_CHECKED; |
| 456 | else |
| 457 | die("invalid blob object %s", sha1_to_hex(sha1)); |
| 458 | } else { |
| 459 | struct object *obj; |
| 460 | int eaten; |
| 461 | void *buf = (void *) data; |
| 462 | |
| 463 | /* |
| 464 | * we do not need to free the memory here, as the |
| 465 | * buf is deleted by the caller. |
| 466 | */ |
| 467 | obj = parse_object_buffer(sha1, type, size, buf, &eaten); |
| 468 | if (!obj) |
| 469 | die("invalid %s", typename(type)); |
| 470 | if (fsck_object(obj, 1, fsck_error_function)) |
| 471 | die("Error in object"); |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 472 | if (fsck_walk(obj, mark_link, NULL)) |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 473 | die("Not all child objects of %s are reachable", sha1_to_hex(obj->sha1)); |
| 474 | |
| 475 | if (obj->type == OBJ_TREE) { |
| 476 | struct tree *item = (struct tree *) obj; |
| 477 | item->buffer = NULL; |
| 478 | } |
| 479 | if (obj->type == OBJ_COMMIT) { |
| 480 | struct commit *commit = (struct commit *) obj; |
| 481 | commit->buffer = NULL; |
| 482 | } |
| 483 | obj->flags |= FLAG_CHECKED; |
| 484 | } |
| 485 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 486 | } |
| 487 | |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 488 | static void *get_base_data(struct base_data *c) |
| 489 | { |
| 490 | if (!c->data) { |
| 491 | struct object_entry *obj = c->obj; |
| 492 | |
| 493 | if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) { |
| 494 | void *base = get_base_data(c->base); |
| 495 | void *raw = get_data_from_pack(obj); |
| 496 | c->data = patch_delta( |
| 497 | base, c->base->size, |
| 498 | raw, obj->size, |
| 499 | &c->size); |
| 500 | free(raw); |
| 501 | if (!c->data) |
| 502 | bad_object(obj->idx.offset, "failed to apply delta"); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 503 | } else { |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 504 | c->data = get_data_from_pack(obj); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 505 | c->size = obj->size; |
| 506 | } |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 507 | |
| 508 | base_cache_used += c->size; |
| 509 | prune_base_data(c); |
| 510 | } |
| 511 | return c->data; |
| 512 | } |
| 513 | |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 514 | static void resolve_delta(struct object_entry *delta_obj, |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 515 | struct base_data *base, struct base_data *result) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 516 | { |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 517 | void *base_data, *delta_data; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 518 | |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 519 | delta_obj->real_type = base->obj->real_type; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 520 | delta_data = get_data_from_pack(delta_obj); |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 521 | base_data = get_base_data(base); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 522 | result->obj = delta_obj; |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 523 | result->data = patch_delta(base_data, base->size, |
| 524 | delta_data, delta_obj->size, &result->size); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 525 | free(delta_data); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 526 | if (!result->data) |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 527 | bad_object(delta_obj->idx.offset, "failed to apply delta"); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 528 | sha1_object(result->data, result->size, delta_obj->real_type, |
| 529 | delta_obj->idx.sha1); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 530 | nr_resolved_deltas++; |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 531 | } |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 532 | |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 533 | static void find_unresolved_deltas(struct base_data *base, |
| 534 | struct base_data *prev_base) |
| 535 | { |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 536 | int i, ref_first, ref_last, ofs_first, ofs_last; |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 537 | |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 538 | /* |
| 539 | * This is a recursive function. Those brackets should help reducing |
| 540 | * stack usage by limiting the scope of the delta_base union. |
| 541 | */ |
| 542 | { |
| 543 | union delta_base base_spec; |
| 544 | |
| 545 | hashcpy(base_spec.sha1, base->obj->idx.sha1); |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 546 | find_delta_children(&base_spec, &ref_first, &ref_last); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 547 | |
| 548 | memset(&base_spec, 0, sizeof(base_spec)); |
| 549 | base_spec.offset = base->obj->idx.offset; |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 550 | find_delta_children(&base_spec, &ofs_first, &ofs_last); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 551 | } |
| 552 | |
Nicolas Pitre | 9ed1961 | 2008-10-23 15:05:59 -0400 | [diff] [blame] | 553 | if (ref_last == -1 && ofs_last == -1) { |
| 554 | free(base->data); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 555 | return; |
Nicolas Pitre | 9ed1961 | 2008-10-23 15:05:59 -0400 | [diff] [blame] | 556 | } |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 557 | |
| 558 | link_base_data(prev_base, base); |
| 559 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 560 | for (i = ref_first; i <= ref_last; i++) { |
| 561 | struct object_entry *child = objects + deltas[i].obj_no; |
| 562 | if (child->real_type == OBJ_REF_DELTA) { |
| 563 | struct base_data result; |
| 564 | resolve_delta(child, base, &result); |
| 565 | if (i == ref_last && ofs_last == -1) |
| 566 | free_base_data(base); |
| 567 | find_unresolved_deltas(&result, base); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 568 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 569 | } |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 570 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 571 | for (i = ofs_first; i <= ofs_last; i++) { |
| 572 | struct object_entry *child = objects + deltas[i].obj_no; |
| 573 | if (child->real_type == OBJ_OFS_DELTA) { |
| 574 | struct base_data result; |
| 575 | resolve_delta(child, base, &result); |
| 576 | if (i == ofs_last) |
| 577 | free_base_data(base); |
| 578 | find_unresolved_deltas(&result, base); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 579 | } |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 580 | } |
| 581 | |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 582 | unlink_base_data(base); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 583 | } |
| 584 | |
| 585 | static int compare_delta_entry(const void *a, const void *b) |
| 586 | { |
| 587 | const struct delta_entry *delta_a = a; |
| 588 | const struct delta_entry *delta_b = b; |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 589 | return memcmp(&delta_a->base, &delta_b->base, UNION_BASE_SZ); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 590 | } |
| 591 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 592 | /* Parse all objects and return the pack content SHA1 hash */ |
| 593 | static void parse_pack_objects(unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 594 | { |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 595 | int i; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 596 | struct delta_entry *delta = deltas; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 597 | struct stat st; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 598 | |
| 599 | /* |
| 600 | * First pass: |
| 601 | * - find locations of all objects; |
| 602 | * - calculate SHA1 of all non-delta objects; |
Nicolas Pitre | b89c4e9 | 2006-10-27 16:14:23 -0400 | [diff] [blame] | 603 | * - remember base (SHA1 or offset) for all deltas. |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 604 | */ |
Nicolas Pitre | 13aaf14 | 2007-04-20 14:10:07 -0400 | [diff] [blame] | 605 | if (verbose) |
Nicolas Pitre | 29e63ed | 2007-10-30 14:57:35 -0400 | [diff] [blame] | 606 | progress = start_progress( |
| 607 | from_stdin ? "Receiving objects" : "Indexing objects", |
| 608 | nr_objects); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 609 | for (i = 0; i < nr_objects; i++) { |
| 610 | struct object_entry *obj = &objects[i]; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 611 | void *data = unpack_raw_entry(obj, &delta->base); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 612 | obj->real_type = obj->type; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 613 | if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) { |
| 614 | nr_deltas++; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 615 | delta->obj_no = i; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 616 | delta++; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 617 | } else |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 618 | sha1_object(data, obj->size, obj->type, obj->idx.sha1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 619 | free(data); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 620 | display_progress(progress, i+1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 621 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 622 | objects[i].idx.offset = consumed_bytes; |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 623 | stop_progress(&progress); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 624 | |
| 625 | /* Check pack integrity */ |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 626 | flush(); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 627 | git_SHA1_Final(sha1, &input_ctx); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 628 | if (hashcmp(fill(20), sha1)) |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 629 | die("pack is corrupted (SHA1 mismatch)"); |
Nicolas Pitre | 9bee247 | 2006-10-25 23:31:53 -0400 | [diff] [blame] | 630 | use(20); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 631 | |
| 632 | /* If input_fd is a file, we should have reached its end now. */ |
| 633 | if (fstat(input_fd, &st)) |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 634 | die("cannot fstat packfile: %s", strerror(errno)); |
Johannes Schindelin | fa257b0 | 2007-02-22 19:14:14 +0100 | [diff] [blame] | 635 | if (S_ISREG(st.st_mode) && |
| 636 | lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size) |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 637 | die("pack has junk at the end"); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 638 | |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 639 | if (!nr_deltas) |
| 640 | return; |
| 641 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 642 | /* Sort deltas by base SHA1/offset for fast searching */ |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 643 | qsort(deltas, nr_deltas, sizeof(struct delta_entry), |
| 644 | compare_delta_entry); |
| 645 | |
| 646 | /* |
| 647 | * Second pass: |
| 648 | * - for all non-delta objects, look if it is used as a base for |
| 649 | * deltas; |
| 650 | * - if used as a base, uncompress the object and apply all deltas, |
| 651 | * recursively checking if the resulting object is used as a base |
| 652 | * for some more deltas. |
| 653 | */ |
Nicolas Pitre | 13aaf14 | 2007-04-20 14:10:07 -0400 | [diff] [blame] | 654 | if (verbose) |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 655 | progress = start_progress("Resolving deltas", nr_deltas); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 656 | for (i = 0; i < nr_objects; i++) { |
| 657 | struct object_entry *obj = &objects[i]; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 658 | struct base_data base_obj; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 659 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 660 | if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 661 | continue; |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 662 | base_obj.obj = obj; |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 663 | base_obj.data = NULL; |
| 664 | find_unresolved_deltas(&base_obj, NULL); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 665 | display_progress(progress, nr_resolved_deltas); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 666 | } |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 667 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 668 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 669 | static int write_compressed(struct sha1file *f, void *in, unsigned int size) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 670 | { |
| 671 | z_stream stream; |
| 672 | unsigned long maxsize; |
| 673 | void *out; |
| 674 | |
| 675 | memset(&stream, 0, sizeof(stream)); |
| 676 | deflateInit(&stream, zlib_compression_level); |
| 677 | maxsize = deflateBound(&stream, size); |
| 678 | out = xmalloc(maxsize); |
| 679 | |
| 680 | /* Compress it */ |
| 681 | stream.next_in = in; |
| 682 | stream.avail_in = size; |
| 683 | stream.next_out = out; |
| 684 | stream.avail_out = maxsize; |
| 685 | while (deflate(&stream, Z_FINISH) == Z_OK); |
| 686 | deflateEnd(&stream); |
| 687 | |
| 688 | size = stream.total_out; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 689 | sha1write(f, out, size); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 690 | free(out); |
| 691 | return size; |
| 692 | } |
| 693 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 694 | static struct object_entry *append_obj_to_pack(struct sha1file *f, |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 695 | const unsigned char *sha1, void *buf, |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 696 | unsigned long size, enum object_type type) |
| 697 | { |
| 698 | struct object_entry *obj = &objects[nr_objects++]; |
| 699 | unsigned char header[10]; |
| 700 | unsigned long s = size; |
| 701 | int n = 0; |
| 702 | unsigned char c = (type << 4) | (s & 15); |
| 703 | s >>= 4; |
| 704 | while (s) { |
| 705 | header[n++] = c | 0x80; |
| 706 | c = s & 0x7f; |
| 707 | s >>= 7; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 708 | } |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 709 | header[n++] = c; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 710 | crc32_begin(f); |
| 711 | sha1write(f, header, n); |
Björn Steinbrink | 72de288 | 2008-07-24 18:32:00 +0100 | [diff] [blame] | 712 | obj[0].size = size; |
| 713 | obj[0].hdr_size = n; |
| 714 | obj[0].type = type; |
| 715 | obj[0].real_type = type; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 716 | obj[1].idx.offset = obj[0].idx.offset + n; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 717 | obj[1].idx.offset += write_compressed(f, buf, size); |
| 718 | obj[0].idx.crc32 = crc32_end(f); |
Nicolas Pitre | 838cd34 | 2008-10-09 22:08:51 -0400 | [diff] [blame] | 719 | sha1flush(f); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 720 | hashcpy(obj->idx.sha1, sha1); |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 721 | return obj; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 722 | } |
| 723 | |
| 724 | static int delta_pos_compare(const void *_a, const void *_b) |
| 725 | { |
| 726 | struct delta_entry *a = *(struct delta_entry **)_a; |
| 727 | struct delta_entry *b = *(struct delta_entry **)_b; |
| 728 | return a->obj_no - b->obj_no; |
| 729 | } |
| 730 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 731 | static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 732 | { |
| 733 | struct delta_entry **sorted_by_pos; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 734 | int i, n = 0; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 735 | |
| 736 | /* |
| 737 | * Since many unresolved deltas may well be themselves base objects |
| 738 | * for more unresolved deltas, we really want to include the |
| 739 | * smallest number of base objects that would cover as much delta |
| 740 | * as possible by picking the |
| 741 | * trunc deltas first, allowing for other deltas to resolve without |
| 742 | * additional base objects. Since most base objects are to be found |
| 743 | * before deltas depending on them, a good heuristic is to start |
| 744 | * resolving deltas in the same order as their position in the pack. |
| 745 | */ |
| 746 | sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos)); |
| 747 | for (i = 0; i < nr_deltas; i++) { |
| 748 | if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA) |
| 749 | continue; |
| 750 | sorted_by_pos[n++] = &deltas[i]; |
| 751 | } |
| 752 | qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare); |
| 753 | |
| 754 | for (i = 0; i < n; i++) { |
| 755 | struct delta_entry *d = sorted_by_pos[i]; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 756 | enum object_type type; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 757 | struct base_data base_obj; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 758 | |
| 759 | if (objects[d->obj_no].real_type != OBJ_REF_DELTA) |
| 760 | continue; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 761 | base_obj.data = read_sha1_file(d->base.sha1, &type, &base_obj.size); |
| 762 | if (!base_obj.data) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 763 | continue; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 764 | |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 765 | if (check_sha1_signature(d->base.sha1, base_obj.data, |
| 766 | base_obj.size, typename(type))) |
| 767 | die("local object %s is corrupt", sha1_to_hex(d->base.sha1)); |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 768 | base_obj.obj = append_obj_to_pack(f, d->base.sha1, |
| 769 | base_obj.data, base_obj.size, type); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 770 | find_unresolved_deltas(&base_obj, NULL); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 771 | display_progress(progress, nr_resolved_deltas); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 772 | } |
| 773 | free(sorted_by_pos); |
| 774 | } |
| 775 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 776 | static void final(const char *final_pack_name, const char *curr_pack_name, |
| 777 | const char *final_index_name, const char *curr_index_name, |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 778 | const char *keep_name, const char *keep_msg, |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 779 | unsigned char *sha1) |
| 780 | { |
Shawn O. Pearce | 3a55602 | 2007-03-06 20:44:17 -0500 | [diff] [blame] | 781 | const char *report = "pack"; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 782 | char name[PATH_MAX]; |
| 783 | int err; |
| 784 | |
| 785 | if (!from_stdin) { |
| 786 | close(input_fd); |
| 787 | } else { |
Linus Torvalds | 4c81b03 | 2008-05-30 08:42:16 -0700 | [diff] [blame] | 788 | fsync_or_die(output_fd, curr_pack_name); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 789 | err = close(output_fd); |
| 790 | if (err) |
| 791 | die("error while closing pack file: %s", strerror(errno)); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 792 | } |
| 793 | |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 794 | if (keep_msg) { |
| 795 | int keep_fd, keep_msg_len = strlen(keep_msg); |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 796 | |
| 797 | if (!keep_name) |
| 798 | keep_fd = odb_pack_keep(name, sizeof(name), sha1); |
| 799 | else |
| 800 | keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600); |
| 801 | |
Nicolas Pitre | 9ca4a20 | 2006-11-01 17:06:24 -0500 | [diff] [blame] | 802 | if (keep_fd < 0) { |
| 803 | if (errno != EEXIST) |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 804 | die("cannot write keep file '%s' (%s)", |
| 805 | keep_name, strerror(errno)); |
Nicolas Pitre | 9ca4a20 | 2006-11-01 17:06:24 -0500 | [diff] [blame] | 806 | } else { |
| 807 | if (keep_msg_len > 0) { |
| 808 | write_or_die(keep_fd, keep_msg, keep_msg_len); |
| 809 | write_or_die(keep_fd, "\n", 1); |
| 810 | } |
Jim Meyering | 91c8d59 | 2007-06-24 21:20:41 +0200 | [diff] [blame] | 811 | if (close(keep_fd) != 0) |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 812 | die("cannot close written keep file '%s' (%s)", |
| 813 | keep_name, strerror(errno)); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 814 | report = "keep"; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 815 | } |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 816 | } |
| 817 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 818 | if (final_pack_name != curr_pack_name) { |
| 819 | if (!final_pack_name) { |
| 820 | snprintf(name, sizeof(name), "%s/pack/pack-%s.pack", |
| 821 | get_object_directory(), sha1_to_hex(sha1)); |
| 822 | final_pack_name = name; |
| 823 | } |
| 824 | if (move_temp_to_file(curr_pack_name, final_pack_name)) |
| 825 | die("cannot store pack file"); |
Johan Herland | fb8b193 | 2009-03-26 16:16:47 +0100 | [diff] [blame] | 826 | } else if (from_stdin) |
Petr Baudis | 33b6503 | 2008-10-03 12:20:43 +0200 | [diff] [blame] | 827 | chmod(final_pack_name, 0444); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 828 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 829 | if (final_index_name != curr_index_name) { |
| 830 | if (!final_index_name) { |
| 831 | snprintf(name, sizeof(name), "%s/pack/pack-%s.idx", |
| 832 | get_object_directory(), sha1_to_hex(sha1)); |
| 833 | final_index_name = name; |
| 834 | } |
| 835 | if (move_temp_to_file(curr_index_name, final_index_name)) |
| 836 | die("cannot store index file"); |
Johan Herland | fb8b193 | 2009-03-26 16:16:47 +0100 | [diff] [blame] | 837 | } else |
| 838 | chmod(final_index_name, 0444); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 839 | |
| 840 | if (!from_stdin) { |
| 841 | printf("%s\n", sha1_to_hex(sha1)); |
| 842 | } else { |
| 843 | char buf[48]; |
| 844 | int len = snprintf(buf, sizeof(buf), "%s\t%s\n", |
| 845 | report, sha1_to_hex(sha1)); |
Junio C Hamano | d1b2ddc | 2007-01-11 13:15:51 -0800 | [diff] [blame] | 846 | write_or_die(1, buf, len); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 847 | |
| 848 | /* |
| 849 | * Let's just mimic git-unpack-objects here and write |
| 850 | * the last part of the input buffer to stdout. |
| 851 | */ |
| 852 | while (input_len) { |
| 853 | err = xwrite(1, input_buffer + input_offset, input_len); |
| 854 | if (err <= 0) |
| 855 | break; |
| 856 | input_len -= err; |
| 857 | input_offset += err; |
| 858 | } |
| 859 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 860 | } |
| 861 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 862 | static int git_index_pack_config(const char *k, const char *v, void *cb) |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 863 | { |
| 864 | if (!strcmp(k, "pack.indexversion")) { |
| 865 | pack_idx_default_version = git_config_int(k, v); |
| 866 | if (pack_idx_default_version > 2) |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 867 | die("bad pack.indexversion=%"PRIu32, |
| 868 | pack_idx_default_version); |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 869 | return 0; |
| 870 | } |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 871 | return git_default_config(k, v, cb); |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 872 | } |
| 873 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 874 | int main(int argc, char **argv) |
| 875 | { |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 876 | int i, fix_thin_pack = 0; |
Nicolas Pitre | 4049b9c | 2007-10-16 21:55:49 -0400 | [diff] [blame] | 877 | char *curr_pack, *pack_name = NULL; |
| 878 | char *curr_index, *index_name = NULL; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 879 | const char *keep_name = NULL, *keep_msg = NULL; |
| 880 | char *index_name_buf = NULL, *keep_name_buf = NULL; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 881 | struct pack_idx_entry **idx_objects; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 882 | unsigned char pack_sha1[20]; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 883 | |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 884 | git_extract_argv0_path(argv[0]); |
| 885 | |
Nicolas Pitre | a672ea6 | 2008-10-20 21:17:07 -0400 | [diff] [blame] | 886 | /* |
| 887 | * We wish to read the repository's config file if any, and |
| 888 | * for that it is necessary to call setup_git_directory_gently(). |
| 889 | * However if the cwd was inside .git/objects/pack/ then we need |
| 890 | * to go back there or all the pack name arguments will be wrong. |
| 891 | * And in that case we cannot rely on any prefix returned by |
| 892 | * setup_git_directory_gently() either. |
| 893 | */ |
| 894 | { |
| 895 | char cwd[PATH_MAX+1]; |
| 896 | int nongit; |
| 897 | |
| 898 | if (!getcwd(cwd, sizeof(cwd)-1)) |
| 899 | die("Unable to get current working directory"); |
| 900 | setup_git_directory_gently(&nongit); |
| 901 | git_config(git_index_pack_config, NULL); |
| 902 | if (chdir(cwd)) |
| 903 | die("Cannot come back to cwd"); |
| 904 | } |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 905 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 906 | for (i = 1; i < argc; i++) { |
Nicolas Pitre | 4049b9c | 2007-10-16 21:55:49 -0400 | [diff] [blame] | 907 | char *arg = argv[i]; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 908 | |
| 909 | if (*arg == '-') { |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 910 | if (!strcmp(arg, "--stdin")) { |
| 911 | from_stdin = 1; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 912 | } else if (!strcmp(arg, "--fix-thin")) { |
| 913 | fix_thin_pack = 1; |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 914 | } else if (!strcmp(arg, "--strict")) { |
| 915 | strict = 1; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 916 | } else if (!strcmp(arg, "--keep")) { |
| 917 | keep_msg = ""; |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 918 | } else if (!prefixcmp(arg, "--keep=")) { |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 919 | keep_msg = arg + 7; |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 920 | } else if (!prefixcmp(arg, "--pack_header=")) { |
Nicolas Pitre | bed006f | 2006-11-01 17:06:20 -0500 | [diff] [blame] | 921 | struct pack_header *hdr; |
| 922 | char *c; |
| 923 | |
| 924 | hdr = (struct pack_header *)input_buffer; |
| 925 | hdr->hdr_signature = htonl(PACK_SIGNATURE); |
| 926 | hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10)); |
| 927 | if (*c != ',') |
| 928 | die("bad %s", arg); |
| 929 | hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10)); |
| 930 | if (*c) |
| 931 | die("bad %s", arg); |
| 932 | input_len = sizeof(*hdr); |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 933 | } else if (!strcmp(arg, "-v")) { |
| 934 | verbose = 1; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 935 | } else if (!strcmp(arg, "-o")) { |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 936 | if (index_name || (i+1) >= argc) |
| 937 | usage(index_pack_usage); |
| 938 | index_name = argv[++i]; |
Nicolas Pitre | 4ba7d71 | 2007-04-09 17:32:03 -0400 | [diff] [blame] | 939 | } else if (!prefixcmp(arg, "--index-version=")) { |
| 940 | char *c; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 941 | pack_idx_default_version = strtoul(arg + 16, &c, 10); |
| 942 | if (pack_idx_default_version > 2) |
Nicolas Pitre | 4ba7d71 | 2007-04-09 17:32:03 -0400 | [diff] [blame] | 943 | die("bad %s", arg); |
| 944 | if (*c == ',') |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 945 | pack_idx_off32_limit = strtoul(c+1, &c, 0); |
| 946 | if (*c || pack_idx_off32_limit & 0x80000000) |
Nicolas Pitre | 4ba7d71 | 2007-04-09 17:32:03 -0400 | [diff] [blame] | 947 | die("bad %s", arg); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 948 | } else |
| 949 | usage(index_pack_usage); |
| 950 | continue; |
| 951 | } |
| 952 | |
| 953 | if (pack_name) |
| 954 | usage(index_pack_usage); |
| 955 | pack_name = arg; |
| 956 | } |
| 957 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 958 | if (!pack_name && !from_stdin) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 959 | usage(index_pack_usage); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 960 | if (fix_thin_pack && !from_stdin) |
| 961 | die("--fix-thin cannot be used without --stdin"); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 962 | if (!index_name && pack_name) { |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 963 | int len = strlen(pack_name); |
Rene Scharfe | 5bb1cda | 2006-08-11 14:01:45 +0200 | [diff] [blame] | 964 | if (!has_extension(pack_name, ".pack")) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 965 | die("packfile name '%s' does not end with '.pack'", |
| 966 | pack_name); |
Pavel Roskin | 6689f08 | 2005-12-21 15:35:48 -0500 | [diff] [blame] | 967 | index_name_buf = xmalloc(len); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 968 | memcpy(index_name_buf, pack_name, len - 5); |
| 969 | strcpy(index_name_buf + len - 5, ".idx"); |
| 970 | index_name = index_name_buf; |
| 971 | } |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 972 | if (keep_msg && !keep_name && pack_name) { |
| 973 | int len = strlen(pack_name); |
| 974 | if (!has_extension(pack_name, ".pack")) |
| 975 | die("packfile name '%s' does not end with '.pack'", |
| 976 | pack_name); |
| 977 | keep_name_buf = xmalloc(len); |
| 978 | memcpy(keep_name_buf, pack_name, len - 5); |
| 979 | strcpy(keep_name_buf + len - 5, ".keep"); |
| 980 | keep_name = keep_name_buf; |
| 981 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 982 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 983 | curr_pack = open_pack_file(pack_name); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 984 | parse_pack_header(); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 985 | objects = xmalloc((nr_objects + 1) * sizeof(struct object_entry)); |
| 986 | deltas = xmalloc(nr_objects * sizeof(struct delta_entry)); |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 987 | parse_pack_objects(pack_sha1); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 988 | if (nr_deltas == nr_resolved_deltas) { |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 989 | stop_progress(&progress); |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 990 | /* Flush remaining pack final 20-byte SHA1. */ |
| 991 | flush(); |
| 992 | } else { |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 993 | if (fix_thin_pack) { |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 994 | struct sha1file *f; |
| 995 | unsigned char read_sha1[20], tail_sha1[20]; |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 996 | char msg[48]; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 997 | int nr_unresolved = nr_deltas - nr_resolved_deltas; |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 998 | int nr_objects_initial = nr_objects; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 999 | if (nr_unresolved <= 0) |
| 1000 | die("confusion beyond insanity"); |
| 1001 | objects = xrealloc(objects, |
| 1002 | (nr_objects + nr_unresolved + 1) |
| 1003 | * sizeof(*objects)); |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1004 | f = sha1fd(output_fd, curr_pack); |
| 1005 | fix_unresolved_deltas(f, nr_unresolved); |
Nicolas Pitre | a984a06 | 2007-11-08 15:45:41 -0500 | [diff] [blame] | 1006 | sprintf(msg, "completed with %d local objects", |
| 1007 | nr_objects - nr_objects_initial); |
| 1008 | stop_progress_msg(&progress, msg); |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1009 | sha1close(f, tail_sha1, 0); |
| 1010 | hashcpy(read_sha1, pack_sha1); |
| 1011 | fixup_pack_header_footer(output_fd, pack_sha1, |
Nicolas Pitre | abeb40e | 2008-08-29 16:07:59 -0400 | [diff] [blame] | 1012 | curr_pack, nr_objects, |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1013 | read_sha1, consumed_bytes-20); |
| 1014 | if (hashcmp(read_sha1, tail_sha1) != 0) |
| 1015 | die("Unexpected tail checksum for %s " |
| 1016 | "(disk corruption?)", curr_pack); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1017 | } |
| 1018 | if (nr_deltas != nr_resolved_deltas) |
| 1019 | die("pack has %d unresolved deltas", |
| 1020 | nr_deltas - nr_resolved_deltas); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1021 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1022 | free(deltas); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 1023 | if (strict) |
| 1024 | check_objects(); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1025 | |
| 1026 | idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *)); |
| 1027 | for (i = 0; i < nr_objects; i++) |
| 1028 | idx_objects[i] = &objects[i].idx; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1029 | curr_index = write_idx_file(index_name, idx_objects, nr_objects, pack_sha1); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1030 | free(idx_objects); |
| 1031 | |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1032 | final(pack_name, curr_pack, |
| 1033 | index_name, curr_index, |
| 1034 | keep_name, keep_msg, |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1035 | pack_sha1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1036 | free(objects); |
| 1037 | free(index_name_buf); |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1038 | free(keep_name_buf); |
Nicolas Pitre | c85228e | 2007-10-16 21:55:50 -0400 | [diff] [blame] | 1039 | if (pack_name == NULL) |
| 1040 | free(curr_pack); |
| 1041 | if (index_name == NULL) |
| 1042 | free(curr_index); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1043 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1044 | return 0; |
| 1045 | } |