Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 3 | #include "pack.h" |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 4 | #include "fetch.h" |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 5 | #include "http.h" |
Johannes Schindelin | 7baa3e8 | 2005-10-15 11:10:46 -0700 | [diff] [blame] | 6 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 7 | #define PREV_BUF_SIZE 4096 |
| 8 | #define RANGE_HEADER_SIZE 30 |
| 9 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 10 | static int commits_on_stdin; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 11 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 12 | static int got_alternates = -1; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 13 | static int corrupt_object_found; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 14 | |
Sergey Vlasov | 1db69b5 | 2005-09-13 19:38:58 +0400 | [diff] [blame] | 15 | static struct curl_slist *no_pragma_header; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 16 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 17 | struct alt_base |
| 18 | { |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 19 | char *base; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 20 | int got_indices; |
| 21 | struct packed_git *packs; |
| 22 | struct alt_base *next; |
| 23 | }; |
| 24 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 25 | static struct alt_base *alt; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 26 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 27 | enum object_request_state { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 28 | WAITING, |
| 29 | ABORTED, |
| 30 | ACTIVE, |
| 31 | COMPLETE, |
| 32 | }; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 33 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 34 | struct object_request |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 35 | { |
| 36 | unsigned char sha1[20]; |
| 37 | struct alt_base *repo; |
| 38 | char *url; |
| 39 | char filename[PATH_MAX]; |
| 40 | char tmpfile[PATH_MAX]; |
| 41 | int local; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 42 | enum object_request_state state; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 43 | CURLcode curl_result; |
| 44 | char errorstr[CURL_ERROR_SIZE]; |
| 45 | long http_code; |
| 46 | unsigned char real_sha1[20]; |
| 47 | SHA_CTX c; |
| 48 | z_stream stream; |
| 49 | int zret; |
| 50 | int rename; |
| 51 | struct active_request_slot *slot; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 52 | struct object_request *next; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 53 | }; |
| 54 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 55 | struct alternates_request { |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 56 | const char *base; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 57 | char *url; |
| 58 | struct buffer *buffer; |
| 59 | struct active_request_slot *slot; |
| 60 | int http_specific; |
| 61 | }; |
| 62 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 63 | static struct object_request *object_queue_head; |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 64 | |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 65 | static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, |
| 66 | void *data) |
| 67 | { |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 68 | unsigned char expn[4096]; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 69 | size_t size = eltsize * nmemb; |
| 70 | int posn = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 71 | struct object_request *obj_req = (struct object_request *)data; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 72 | do { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 73 | ssize_t retval = xwrite(obj_req->local, |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 74 | (char *) ptr + posn, size - posn); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 75 | if (retval < 0) |
| 76 | return posn; |
| 77 | posn += retval; |
| 78 | } while (posn < size); |
| 79 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 80 | obj_req->stream.avail_in = size; |
| 81 | obj_req->stream.next_in = ptr; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 82 | do { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 83 | obj_req->stream.next_out = expn; |
| 84 | obj_req->stream.avail_out = sizeof(expn); |
| 85 | obj_req->zret = inflate(&obj_req->stream, Z_SYNC_FLUSH); |
| 86 | SHA1_Update(&obj_req->c, expn, |
| 87 | sizeof(expn) - obj_req->stream.avail_out); |
| 88 | } while (obj_req->stream.avail_in && obj_req->zret == Z_OK); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 89 | data_received++; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 90 | return size; |
| 91 | } |
| 92 | |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 93 | static int missing__target(int code, int result) |
| 94 | { |
| 95 | return /* file:// URL -- do we ever use one??? */ |
| 96 | (result == CURLE_FILE_COULDNT_READ_FILE) || |
| 97 | /* http:// and https:// URL */ |
Junio C Hamano | 4adffc7 | 2006-09-16 11:06:02 -0700 | [diff] [blame] | 98 | (code == 404 && result == CURLE_HTTP_RETURNED_ERROR) || |
| 99 | /* ftp:// URL */ |
| 100 | (code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE) |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 101 | ; |
| 102 | } |
| 103 | |
| 104 | #define missing_target(a) missing__target((a)->http_code, (a)->curl_result) |
| 105 | |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 106 | static void fetch_alternates(const char *base); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 107 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 108 | static void process_object_response(void *callback_data); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 109 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 110 | static void start_object_request(struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 111 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 112 | char *hex = sha1_to_hex(obj_req->sha1); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 113 | char prevfile[PATH_MAX]; |
| 114 | char *url; |
| 115 | char *posn; |
| 116 | int prevlocal; |
| 117 | unsigned char prev_buf[PREV_BUF_SIZE]; |
| 118 | ssize_t prev_read = 0; |
| 119 | long prev_posn = 0; |
| 120 | char range[RANGE_HEADER_SIZE]; |
| 121 | struct curl_slist *range_header = NULL; |
| 122 | struct active_request_slot *slot; |
| 123 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 124 | snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 125 | unlink(prevfile); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 126 | rename(obj_req->tmpfile, prevfile); |
| 127 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 128 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 129 | if (obj_req->local != -1) |
| 130 | error("fd leakage in start: %d", obj_req->local); |
| 131 | obj_req->local = open(obj_req->tmpfile, |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 132 | O_WRONLY | O_CREAT | O_EXCL, 0666); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 133 | /* This could have failed due to the "lazy directory creation"; |
| 134 | * try to mkdir the last path component. |
| 135 | */ |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 136 | if (obj_req->local < 0 && errno == ENOENT) { |
| 137 | char *dir = strrchr(obj_req->tmpfile, '/'); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 138 | if (dir) { |
| 139 | *dir = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 140 | mkdir(obj_req->tmpfile, 0777); |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 141 | *dir = '/'; |
| 142 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 143 | obj_req->local = open(obj_req->tmpfile, |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 144 | O_WRONLY | O_CREAT | O_EXCL, 0666); |
| 145 | } |
| 146 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 147 | if (obj_req->local < 0) { |
| 148 | obj_req->state = ABORTED; |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 149 | error("Couldn't create temporary file %s for %s: %s", |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 150 | obj_req->tmpfile, obj_req->filename, strerror(errno)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 151 | return; |
| 152 | } |
| 153 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 154 | memset(&obj_req->stream, 0, sizeof(obj_req->stream)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 155 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 156 | inflateInit(&obj_req->stream); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 157 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 158 | SHA1_Init(&obj_req->c); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 159 | |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 160 | url = xmalloc(strlen(obj_req->repo->base) + 51); |
| 161 | obj_req->url = xmalloc(strlen(obj_req->repo->base) + 51); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 162 | strcpy(url, obj_req->repo->base); |
| 163 | posn = url + strlen(obj_req->repo->base); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 164 | strcpy(posn, "/objects/"); |
| 165 | posn += 9; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 166 | memcpy(posn, hex, 2); |
| 167 | posn += 2; |
| 168 | *(posn++) = '/'; |
| 169 | strcpy(posn, hex + 2); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 170 | strcpy(obj_req->url, url); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 171 | |
| 172 | /* If a previous temp file is present, process what was already |
| 173 | fetched. */ |
| 174 | prevlocal = open(prevfile, O_RDONLY); |
| 175 | if (prevlocal != -1) { |
| 176 | do { |
Andy Whitcroft | 93d26e4 | 2007-01-08 15:58:08 +0000 | [diff] [blame] | 177 | prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 178 | if (prev_read>0) { |
| 179 | if (fwrite_sha1_file(prev_buf, |
| 180 | 1, |
| 181 | prev_read, |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 182 | obj_req) == prev_read) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 183 | prev_posn += prev_read; |
| 184 | } else { |
| 185 | prev_read = -1; |
| 186 | } |
| 187 | } |
| 188 | } while (prev_read > 0); |
| 189 | close(prevlocal); |
| 190 | } |
| 191 | unlink(prevfile); |
| 192 | |
| 193 | /* Reset inflate/SHA1 if there was an error reading the previous temp |
| 194 | file; also rewind to the beginning of the local file. */ |
| 195 | if (prev_read == -1) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 196 | memset(&obj_req->stream, 0, sizeof(obj_req->stream)); |
| 197 | inflateInit(&obj_req->stream); |
| 198 | SHA1_Init(&obj_req->c); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 199 | if (prev_posn>0) { |
| 200 | prev_posn = 0; |
Dana How | b5da246 | 2007-04-05 12:05:57 -0700 | [diff] [blame] | 201 | lseek(obj_req->local, 0, SEEK_SET); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 202 | ftruncate(obj_req->local, 0); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 203 | } |
| 204 | } |
| 205 | |
| 206 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 207 | slot->callback_func = process_object_response; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 208 | slot->callback_data = obj_req; |
| 209 | obj_req->slot = slot; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 210 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 211 | curl_easy_setopt(slot->curl, CURLOPT_FILE, obj_req); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 212 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 213 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, obj_req->errorstr); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 214 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Nick Hengeveld | 0312600 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 215 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 216 | |
| 217 | /* If we have successfully processed data from a previous fetch |
| 218 | attempt, only fetch the data we don't already have. */ |
| 219 | if (prev_posn>0) { |
| 220 | if (get_verbosely) |
| 221 | fprintf(stderr, |
| 222 | "Resuming fetch of object %s at byte %ld\n", |
| 223 | hex, prev_posn); |
| 224 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 225 | range_header = curl_slist_append(range_header, range); |
| 226 | curl_easy_setopt(slot->curl, |
| 227 | CURLOPT_HTTPHEADER, range_header); |
| 228 | } |
| 229 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 230 | /* Try to get the request started, abort the request on error */ |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 231 | obj_req->state = ACTIVE; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 232 | if (!start_active_slot(slot)) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 233 | obj_req->state = ABORTED; |
| 234 | obj_req->slot = NULL; |
| 235 | close(obj_req->local); obj_req->local = -1; |
| 236 | free(obj_req->url); |
| 237 | return; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 238 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 239 | } |
| 240 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 241 | static void finish_object_request(struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 242 | { |
Nick Hengeveld | 50496b2 | 2005-11-03 17:54:52 -0800 | [diff] [blame] | 243 | struct stat st; |
| 244 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 245 | fchmod(obj_req->local, 0444); |
| 246 | close(obj_req->local); obj_req->local = -1; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 247 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 248 | if (obj_req->http_code == 416) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 249 | fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n"); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 250 | } else if (obj_req->curl_result != CURLE_OK) { |
| 251 | if (stat(obj_req->tmpfile, &st) == 0) |
Nick Hengeveld | 50496b2 | 2005-11-03 17:54:52 -0800 | [diff] [blame] | 252 | if (st.st_size == 0) |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 253 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 254 | return; |
| 255 | } |
| 256 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 257 | inflateEnd(&obj_req->stream); |
| 258 | SHA1_Final(obj_req->real_sha1, &obj_req->c); |
| 259 | if (obj_req->zret != Z_STREAM_END) { |
| 260 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 261 | return; |
| 262 | } |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 263 | if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 264 | unlink(obj_req->tmpfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 265 | return; |
| 266 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 267 | obj_req->rename = |
| 268 | move_temp_to_file(obj_req->tmpfile, obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 269 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 270 | if (obj_req->rename == 0) |
| 271 | pull_say("got %s\n", sha1_to_hex(obj_req->sha1)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 272 | } |
| 273 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 274 | static void process_object_response(void *callback_data) |
| 275 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 276 | struct object_request *obj_req = |
| 277 | (struct object_request *)callback_data; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 278 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 279 | obj_req->curl_result = obj_req->slot->curl_result; |
| 280 | obj_req->http_code = obj_req->slot->http_code; |
| 281 | obj_req->slot = NULL; |
| 282 | obj_req->state = COMPLETE; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 283 | |
| 284 | /* Use alternates if necessary */ |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 285 | if (missing_target(obj_req)) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 286 | fetch_alternates(alt->base); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 287 | if (obj_req->repo->next != NULL) { |
| 288 | obj_req->repo = |
| 289 | obj_req->repo->next; |
| 290 | close(obj_req->local); |
| 291 | obj_req->local = -1; |
| 292 | start_object_request(obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 293 | return; |
| 294 | } |
| 295 | } |
| 296 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 297 | finish_object_request(obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 298 | } |
| 299 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 300 | static void release_object_request(struct object_request *obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 301 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 302 | struct object_request *entry = object_queue_head; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 303 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 304 | if (obj_req->local != -1) |
| 305 | error("fd leakage in release: %d", obj_req->local); |
| 306 | if (obj_req == object_queue_head) { |
| 307 | object_queue_head = obj_req->next; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 308 | } else { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 309 | while (entry->next != NULL && entry->next != obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 310 | entry = entry->next; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 311 | if (entry->next == obj_req) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 312 | entry->next = entry->next->next; |
| 313 | } |
| 314 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 315 | free(obj_req->url); |
| 316 | free(obj_req); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 317 | } |
| 318 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 319 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 320 | void fill_active_slots(void) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 321 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 322 | struct object_request *obj_req = object_queue_head; |
Nick Hengeveld | f1a906a | 2005-10-21 12:06:10 -0700 | [diff] [blame] | 323 | struct active_request_slot *slot = active_queue_head; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 324 | int num_transfers; |
| 325 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 326 | while (active_requests < max_requests && obj_req != NULL) { |
| 327 | if (obj_req->state == WAITING) { |
| 328 | if (has_sha1_file(obj_req->sha1)) |
Mark Wooding | 09db444 | 2006-02-01 11:44:28 +0000 | [diff] [blame] | 329 | obj_req->state = COMPLETE; |
Nick Hengeveld | 11f0daf | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 330 | else |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 331 | start_object_request(obj_req); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 332 | curl_multi_perform(curlm, &num_transfers); |
| 333 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 334 | obj_req = obj_req->next; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 335 | } |
Nick Hengeveld | f1a906a | 2005-10-21 12:06:10 -0700 | [diff] [blame] | 336 | |
| 337 | while (slot != NULL) { |
| 338 | if (!slot->in_use && slot->curl != NULL) { |
| 339 | curl_easy_cleanup(slot->curl); |
| 340 | slot->curl = NULL; |
| 341 | } |
| 342 | slot = slot->next; |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 343 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 344 | } |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 345 | #endif |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 346 | |
| 347 | void prefetch(unsigned char *sha1) |
| 348 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 349 | struct object_request *newreq; |
| 350 | struct object_request *tail; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 351 | char *filename = sha1_file_name(sha1); |
| 352 | |
| 353 | newreq = xmalloc(sizeof(*newreq)); |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 354 | hashcpy(newreq->sha1, sha1); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 355 | newreq->repo = alt; |
| 356 | newreq->url = NULL; |
| 357 | newreq->local = -1; |
| 358 | newreq->state = WAITING; |
| 359 | snprintf(newreq->filename, sizeof(newreq->filename), "%s", filename); |
| 360 | snprintf(newreq->tmpfile, sizeof(newreq->tmpfile), |
| 361 | "%s.temp", filename); |
Nick Hengeveld | e8dff6b | 2006-06-06 22:22:35 -0700 | [diff] [blame] | 362 | newreq->slot = NULL; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 363 | newreq->next = NULL; |
| 364 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 365 | if (object_queue_head == NULL) { |
| 366 | object_queue_head = newreq; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 367 | } else { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 368 | tail = object_queue_head; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 369 | while (tail->next != NULL) { |
| 370 | tail = tail->next; |
| 371 | } |
| 372 | tail->next = newreq; |
| 373 | } |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 374 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 375 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 376 | fill_active_slots(); |
| 377 | step_active_slots(); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 378 | #endif |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 379 | } |
| 380 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 381 | static int fetch_index(struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 382 | { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 383 | char *hex = sha1_to_hex(sha1); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 384 | char *filename; |
| 385 | char *url; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 386 | char tmpfile[PATH_MAX]; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 387 | long prev_posn = 0; |
| 388 | char range[RANGE_HEADER_SIZE]; |
| 389 | struct curl_slist *range_header = NULL; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 390 | |
| 391 | FILE *indexfile; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 392 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 393 | struct slot_results results; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 394 | |
| 395 | if (has_pack_index(sha1)) |
| 396 | return 0; |
| 397 | |
| 398 | if (get_verbosely) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 399 | fprintf(stderr, "Getting index for pack %s\n", hex); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 400 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 401 | url = xmalloc(strlen(repo->base) + 64); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 402 | sprintf(url, "%s/objects/pack/pack-%s.idx", repo->base, hex); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 403 | |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 404 | filename = sha1_pack_index_name(sha1); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 405 | snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); |
| 406 | indexfile = fopen(tmpfile, "a"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 407 | if (!indexfile) |
| 408 | return error("Unable to open local file %s for pack index", |
| 409 | filename); |
| 410 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 411 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 412 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 413 | curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile); |
| 414 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); |
| 415 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Nick Hengeveld | 0312600 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 416 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 417 | slot->local = indexfile; |
| 418 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 419 | /* If there is data present from a previous transfer attempt, |
| 420 | resume where it left off */ |
| 421 | prev_posn = ftell(indexfile); |
| 422 | if (prev_posn>0) { |
| 423 | if (get_verbosely) |
| 424 | fprintf(stderr, |
| 425 | "Resuming fetch of index for pack %s at byte %ld\n", |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 426 | hex, prev_posn); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 427 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 428 | range_header = curl_slist_append(range_header, range); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 429 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 430 | } |
| 431 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 432 | if (start_active_slot(slot)) { |
| 433 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 434 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 435 | fclose(indexfile); |
| 436 | return error("Unable to get pack index %s\n%s", url, |
| 437 | curl_errorstr); |
| 438 | } |
| 439 | } else { |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 440 | fclose(indexfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 441 | return error("Unable to start request"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 442 | } |
| 443 | |
| 444 | fclose(indexfile); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 445 | |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 446 | return move_temp_to_file(tmpfile, filename); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 447 | } |
| 448 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 449 | static int setup_index(struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 450 | { |
| 451 | struct packed_git *new_pack; |
| 452 | if (has_pack_file(sha1)) |
Pavel Roskin | a9486b0 | 2006-07-10 02:57:51 -0400 | [diff] [blame] | 453 | return 0; /* don't list this as something we can get */ |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 454 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 455 | if (fetch_index(repo, sha1)) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 456 | return -1; |
| 457 | |
| 458 | new_pack = parse_pack_index(sha1); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 459 | new_pack->next = repo->packs; |
| 460 | repo->packs = new_pack; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 461 | return 0; |
| 462 | } |
| 463 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 464 | static void process_alternates_response(void *callback_data) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 465 | { |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 466 | struct alternates_request *alt_req = |
| 467 | (struct alternates_request *)callback_data; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 468 | struct active_request_slot *slot = alt_req->slot; |
| 469 | struct alt_base *tail = alt; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 470 | const char *base = alt_req->base; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 471 | static const char null_byte = '\0'; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 472 | char *data; |
| 473 | int i = 0; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 474 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 475 | if (alt_req->http_specific) { |
| 476 | if (slot->curl_result != CURLE_OK || |
| 477 | !alt_req->buffer->posn) { |
Junio C Hamano | dc1b5ea | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 478 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 479 | /* Try reusing the slot to get non-http alternates */ |
| 480 | alt_req->http_specific = 0; |
| 481 | sprintf(alt_req->url, "%s/objects/info/alternates", |
| 482 | base); |
| 483 | curl_easy_setopt(slot->curl, CURLOPT_URL, |
| 484 | alt_req->url); |
| 485 | active_requests++; |
| 486 | slot->in_use = 1; |
Nick Hengeveld | c982647 | 2006-03-15 08:59:52 -0800 | [diff] [blame] | 487 | if (slot->finished != NULL) |
| 488 | (*slot->finished) = 0; |
Mark Wooding | a3f583c | 2006-02-01 11:44:39 +0000 | [diff] [blame] | 489 | if (!start_active_slot(slot)) { |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 490 | got_alternates = -1; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 491 | slot->in_use = 0; |
Nick Hengeveld | c982647 | 2006-03-15 08:59:52 -0800 | [diff] [blame] | 492 | if (slot->finished != NULL) |
| 493 | (*slot->finished) = 1; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 494 | } |
Mark Wooding | a3f583c | 2006-02-01 11:44:39 +0000 | [diff] [blame] | 495 | return; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 496 | } |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 497 | } else if (slot->curl_result != CURLE_OK) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 498 | if (!missing_target(slot)) { |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 499 | got_alternates = -1; |
| 500 | return; |
| 501 | } |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 502 | } |
| 503 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 504 | fwrite_buffer(&null_byte, 1, 1, alt_req->buffer); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 505 | alt_req->buffer->posn--; |
| 506 | data = alt_req->buffer->buffer; |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 507 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 508 | while (i < alt_req->buffer->posn) { |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 509 | int posn = i; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 510 | while (posn < alt_req->buffer->posn && data[posn] != '\n') |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 511 | posn++; |
| 512 | if (data[posn] == '\n') { |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 513 | int okay = 0; |
| 514 | int serverlen = 0; |
| 515 | struct alt_base *newalt; |
| 516 | char *target = NULL; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 517 | if (data[i] == '/') { |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 518 | /* This counts |
| 519 | * http://git.host/pub/scm/linux.git/ |
| 520 | * -----------here^ |
| 521 | * so memcpy(dst, base, serverlen) will |
| 522 | * copy up to "...git.host". |
| 523 | */ |
| 524 | const char *colon_ss = strstr(base,"://"); |
| 525 | if (colon_ss) { |
| 526 | serverlen = (strchr(colon_ss + 3, '/') |
| 527 | - base); |
| 528 | okay = 1; |
| 529 | } |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 530 | } else if (!memcmp(data + i, "../", 3)) { |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 531 | /* Relative URL; chop the corresponding |
| 532 | * number of subpath from base (and ../ |
| 533 | * from data), and concatenate the result. |
| 534 | * |
| 535 | * The code first drops ../ from data, and |
| 536 | * then drops one ../ from data and one path |
| 537 | * from base. IOW, one extra ../ is dropped |
| 538 | * from data than path is dropped from base. |
| 539 | * |
| 540 | * This is not wrong. The alternate in |
| 541 | * http://git.host/pub/scm/linux.git/ |
| 542 | * to borrow from |
| 543 | * http://git.host/pub/scm/linus.git/ |
| 544 | * is ../../linus.git/objects/. You need |
| 545 | * two ../../ to borrow from your direct |
| 546 | * neighbour. |
| 547 | */ |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 548 | i += 3; |
| 549 | serverlen = strlen(base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 550 | while (i + 2 < posn && |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 551 | !memcmp(data + i, "../", 3)) { |
| 552 | do { |
| 553 | serverlen--; |
| 554 | } while (serverlen && |
| 555 | base[serverlen - 1] != '/'); |
| 556 | i += 3; |
| 557 | } |
Pavel Roskin | a9486b0 | 2006-07-10 02:57:51 -0400 | [diff] [blame] | 558 | /* If the server got removed, give up. */ |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 559 | okay = strchr(base, ':') - base + 3 < |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 560 | serverlen; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 561 | } else if (alt_req->http_specific) { |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 562 | char *colon = strchr(data + i, ':'); |
| 563 | char *slash = strchr(data + i, '/'); |
| 564 | if (colon && slash && colon < data + posn && |
| 565 | slash < data + posn && colon < slash) { |
| 566 | okay = 1; |
| 567 | } |
| 568 | } |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 569 | /* skip "objects\n" at end */ |
Daniel Barkalow | 1b0c1e6 | 2005-09-18 14:14:19 -0400 | [diff] [blame] | 570 | if (okay) { |
| 571 | target = xmalloc(serverlen + posn - i - 6); |
Junio C Hamano | 5df1e0d | 2006-09-12 23:53:27 -0700 | [diff] [blame] | 572 | memcpy(target, base, serverlen); |
| 573 | memcpy(target + serverlen, data + i, |
| 574 | posn - i - 7); |
| 575 | target[serverlen + posn - i - 7] = 0; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 576 | if (get_verbosely) |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 577 | fprintf(stderr, |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 578 | "Also look at %s\n", target); |
| 579 | newalt = xmalloc(sizeof(*newalt)); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 580 | newalt->next = NULL; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 581 | newalt->base = target; |
| 582 | newalt->got_indices = 0; |
| 583 | newalt->packs = NULL; |
Nick Hengeveld | 8d9fbe5 | 2006-04-04 05:33:18 -0700 | [diff] [blame] | 584 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 585 | while (tail->next != NULL) |
| 586 | tail = tail->next; |
| 587 | tail->next = newalt; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 588 | } |
| 589 | } |
| 590 | i = posn + 1; |
| 591 | } |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 592 | |
Nick Hengeveld | f7eb290 | 2005-10-21 12:06:20 -0700 | [diff] [blame] | 593 | got_alternates = 1; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 594 | } |
| 595 | |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 596 | static void fetch_alternates(const char *base) |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 597 | { |
| 598 | struct buffer buffer; |
| 599 | char *url; |
| 600 | char *data; |
| 601 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 602 | struct alternates_request alt_req; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 603 | |
| 604 | /* If another request has already started fetching alternates, |
| 605 | wait for them to arrive and return to processing this request's |
| 606 | curl message */ |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 607 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 608 | while (got_alternates == 0) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 609 | step_active_slots(); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 610 | } |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 611 | #endif |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 612 | |
| 613 | /* Nothing to do if they've already been fetched */ |
| 614 | if (got_alternates == 1) |
| 615 | return; |
| 616 | |
| 617 | /* Start the fetch */ |
| 618 | got_alternates = 0; |
| 619 | |
| 620 | data = xmalloc(4096); |
| 621 | buffer.size = 4096; |
| 622 | buffer.posn = 0; |
| 623 | buffer.buffer = data; |
| 624 | |
| 625 | if (get_verbosely) |
| 626 | fprintf(stderr, "Getting alternates list for %s\n", base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 627 | |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 628 | url = xmalloc(strlen(base) + 31); |
| 629 | sprintf(url, "%s/objects/info/http-alternates", base); |
| 630 | |
| 631 | /* Use a callback to process the result, since another request |
| 632 | may fail and need to have alternates loaded before continuing */ |
| 633 | slot = get_active_slot(); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 634 | slot->callback_func = process_alternates_response; |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 635 | slot->callback_data = &alt_req; |
| 636 | |
| 637 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 638 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
Nick Hengeveld | acc075a | 2005-11-12 09:11:32 -0800 | [diff] [blame] | 639 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 640 | |
| 641 | alt_req.base = base; |
| 642 | alt_req.url = url; |
| 643 | alt_req.buffer = &buffer; |
| 644 | alt_req.http_specific = 1; |
| 645 | alt_req.slot = slot; |
| 646 | |
| 647 | if (start_active_slot(slot)) |
| 648 | run_active_slot(slot); |
| 649 | else |
| 650 | got_alternates = -1; |
| 651 | |
| 652 | free(data); |
| 653 | free(url); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 654 | } |
| 655 | |
| 656 | static int fetch_indices(struct alt_base *repo) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 657 | { |
| 658 | unsigned char sha1[20]; |
| 659 | char *url; |
| 660 | struct buffer buffer; |
| 661 | char *data; |
| 662 | int i = 0; |
| 663 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 664 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 665 | struct slot_results results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 666 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 667 | if (repo->got_indices) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 668 | return 0; |
| 669 | |
| 670 | data = xmalloc(4096); |
| 671 | buffer.size = 4096; |
| 672 | buffer.posn = 0; |
| 673 | buffer.buffer = data; |
| 674 | |
| 675 | if (get_verbosely) |
Petr Baudis | 6fd72e3 | 2005-11-12 01:49:59 +0100 | [diff] [blame] | 676 | fprintf(stderr, "Getting pack list for %s\n", repo->base); |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 677 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 678 | url = xmalloc(strlen(repo->base) + 21); |
| 679 | sprintf(url, "%s/objects/info/packs", repo->base); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 680 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 681 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 682 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 683 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 684 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 685 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 686 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); |
| 687 | if (start_active_slot(slot)) { |
| 688 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 689 | if (results.curl_result != CURLE_OK) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 690 | if (missing_target(&results)) { |
Nick Hengeveld | 5e3a769 | 2005-11-18 11:03:11 -0800 | [diff] [blame] | 691 | repo->got_indices = 1; |
| 692 | free(buffer.buffer); |
| 693 | return 0; |
| 694 | } else { |
| 695 | repo->got_indices = 0; |
| 696 | free(buffer.buffer); |
| 697 | return error("%s", curl_errorstr); |
| 698 | } |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 699 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 700 | } else { |
Nick Hengeveld | 5e3a769 | 2005-11-18 11:03:11 -0800 | [diff] [blame] | 701 | repo->got_indices = 0; |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 702 | free(buffer.buffer); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 703 | return error("Unable to start request"); |
| 704 | } |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 705 | |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 706 | data = buffer.buffer; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 707 | while (i < buffer.posn) { |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 708 | switch (data[i]) { |
| 709 | case 'P': |
| 710 | i++; |
Junio C Hamano | 455c161 | 2005-12-21 12:10:10 -0800 | [diff] [blame] | 711 | if (i + 52 <= buffer.posn && |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 712 | !prefixcmp(data + i, " pack-") && |
Junio C Hamano | 1968d77 | 2007-02-20 01:55:07 -0800 | [diff] [blame] | 713 | !prefixcmp(data + i + 46, ".pack\n")) { |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 714 | get_sha1_hex(data + i + 6, sha1); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 715 | setup_index(repo, sha1); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 716 | i += 51; |
| 717 | break; |
| 718 | } |
| 719 | default: |
Junio C Hamano | 455c161 | 2005-12-21 12:10:10 -0800 | [diff] [blame] | 720 | while (i < buffer.posn && data[i] != '\n') |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 721 | i++; |
| 722 | } |
| 723 | i++; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 724 | } |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 725 | |
Sergey Vlasov | bc8f265 | 2005-10-13 10:49:53 -0700 | [diff] [blame] | 726 | free(buffer.buffer); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 727 | repo->got_indices = 1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 728 | return 0; |
| 729 | } |
| 730 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 731 | static int fetch_pack(struct alt_base *repo, unsigned char *sha1) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 732 | { |
| 733 | char *url; |
| 734 | struct packed_git *target; |
| 735 | struct packed_git **lst; |
| 736 | FILE *packfile; |
| 737 | char *filename; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 738 | char tmpfile[PATH_MAX]; |
| 739 | int ret; |
| 740 | long prev_posn = 0; |
| 741 | char range[RANGE_HEADER_SIZE]; |
| 742 | struct curl_slist *range_header = NULL; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 743 | |
| 744 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 745 | struct slot_results results; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 746 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 747 | if (fetch_indices(repo)) |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 748 | return -1; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 749 | target = find_sha1_pack(sha1, repo->packs); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 750 | if (!target) |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 751 | return -1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 752 | |
| 753 | if (get_verbosely) { |
| 754 | fprintf(stderr, "Getting pack %s\n", |
| 755 | sha1_to_hex(target->sha1)); |
| 756 | fprintf(stderr, " which contains %s\n", |
| 757 | sha1_to_hex(sha1)); |
| 758 | } |
| 759 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 760 | url = xmalloc(strlen(repo->base) + 65); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 761 | sprintf(url, "%s/objects/pack/pack-%s.pack", |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 762 | repo->base, sha1_to_hex(target->sha1)); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 763 | |
| 764 | filename = sha1_pack_name(target->sha1); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 765 | snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); |
| 766 | packfile = fopen(tmpfile, "a"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 767 | if (!packfile) |
| 768 | return error("Unable to open local file %s for pack", |
| 769 | filename); |
| 770 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 771 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 772 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 773 | curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile); |
| 774 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); |
| 775 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
Nick Hengeveld | 0312600 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 776 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 777 | slot->local = packfile; |
Nick Hengeveld | 1ddea77 | 2005-09-26 10:52:11 -0700 | [diff] [blame] | 778 | |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 779 | /* If there is data present from a previous transfer attempt, |
| 780 | resume where it left off */ |
| 781 | prev_posn = ftell(packfile); |
| 782 | if (prev_posn>0) { |
| 783 | if (get_verbosely) |
| 784 | fprintf(stderr, |
| 785 | "Resuming fetch of pack %s at byte %ld\n", |
| 786 | sha1_to_hex(target->sha1), prev_posn); |
| 787 | sprintf(range, "Range: bytes=%ld-", prev_posn); |
| 788 | range_header = curl_slist_append(range_header, range); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 789 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 790 | } |
| 791 | |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 792 | if (start_active_slot(slot)) { |
| 793 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 794 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 795 | fclose(packfile); |
| 796 | return error("Unable to get pack file %s\n%s", url, |
| 797 | curl_errorstr); |
| 798 | } |
| 799 | } else { |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 800 | fclose(packfile); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 801 | return error("Unable to start request"); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 802 | } |
| 803 | |
Shawn O. Pearce | 1c23d79 | 2007-01-09 20:04:52 -0500 | [diff] [blame] | 804 | target->pack_size = ftell(packfile); |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 805 | fclose(packfile); |
| 806 | |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 807 | ret = move_temp_to_file(tmpfile, filename); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 808 | if (ret) |
Junio C Hamano | b721e01 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 809 | return ret; |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 810 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 811 | lst = &repo->packs; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 812 | while (*lst != target) |
| 813 | lst = &((*lst)->next); |
| 814 | *lst = (*lst)->next; |
| 815 | |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 816 | if (verify_pack(target, 0)) |
| 817 | return -1; |
barkalow@iabervon.org | 182005b | 2005-07-31 20:54:17 -0400 | [diff] [blame] | 818 | install_packed_git(target); |
| 819 | |
| 820 | return 0; |
| 821 | } |
| 822 | |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 823 | static void abort_object_request(struct object_request *obj_req) |
| 824 | { |
| 825 | if (obj_req->local >= 0) { |
| 826 | close(obj_req->local); |
| 827 | obj_req->local = -1; |
| 828 | } |
| 829 | unlink(obj_req->tmpfile); |
| 830 | if (obj_req->slot) { |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 831 | release_active_slot(obj_req->slot); |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 832 | obj_req->slot = NULL; |
| 833 | } |
| 834 | release_object_request(obj_req); |
| 835 | } |
| 836 | |
Peter Hagervall | a7928f8 | 2005-09-28 14:04:54 +0200 | [diff] [blame] | 837 | static int fetch_object(struct alt_base *repo, unsigned char *sha1) |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 838 | { |
| 839 | char *hex = sha1_to_hex(sha1); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 840 | int ret = 0; |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 841 | struct object_request *obj_req = object_queue_head; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 842 | |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 843 | while (obj_req != NULL && hashcmp(obj_req->sha1, sha1)) |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 844 | obj_req = obj_req->next; |
| 845 | if (obj_req == NULL) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 846 | return error("Couldn't find request for %s in the queue", hex); |
Junio C Hamano | 271421c | 2005-09-30 00:07:39 -0700 | [diff] [blame] | 847 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 848 | if (has_sha1_file(obj_req->sha1)) { |
Mark Wooding | 53f3138 | 2006-02-07 10:07:39 +0000 | [diff] [blame] | 849 | abort_object_request(obj_req); |
Nick Hengeveld | 11f0daf | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 850 | return 0; |
| 851 | } |
| 852 | |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 853 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 854 | while (obj_req->state == WAITING) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 855 | step_active_slots(); |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 856 | } |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 857 | #else |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 858 | start_object_request(obj_req); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 859 | #endif |
Nick Hengeveld | 49a0f24 | 2005-09-28 10:14:04 -0700 | [diff] [blame] | 860 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 861 | while (obj_req->state == ACTIVE) { |
| 862 | run_active_slot(obj_req->slot); |
Nick Hengeveld | a7a8d37 | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 863 | } |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 864 | if (obj_req->local != -1) { |
| 865 | close(obj_req->local); obj_req->local = -1; |
Petr Baudis | 313c471 | 2005-11-12 00:55:16 +0100 | [diff] [blame] | 866 | } |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 867 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 868 | if (obj_req->state == ABORTED) { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 869 | ret = error("Request for %s aborted", hex); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 870 | } else if (obj_req->curl_result != CURLE_OK && |
| 871 | obj_req->http_code != 416) { |
Junio C Hamano | be4a015 | 2006-09-16 10:58:20 -0700 | [diff] [blame] | 872 | if (missing_target(obj_req)) |
Petr Baudis | e2029eb | 2005-10-21 18:18:46 +0200 | [diff] [blame] | 873 | ret = -1; /* Be silent, it is probably in a pack. */ |
| 874 | else |
| 875 | ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)", |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 876 | obj_req->errorstr, obj_req->curl_result, |
| 877 | obj_req->http_code, hex); |
| 878 | } else if (obj_req->zret != Z_STREAM_END) { |
Junio C Hamano | bb52807 | 2006-03-20 14:07:59 -0800 | [diff] [blame] | 879 | corrupt_object_found++; |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 880 | ret = error("File %s (%s) corrupt", hex, obj_req->url); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 881 | } else if (hashcmp(obj_req->sha1, obj_req->real_sha1)) { |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 882 | ret = error("File %s has bad hash", hex); |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 883 | } else if (obj_req->rename < 0) { |
Mark Wooding | 7b934ec | 2006-02-01 11:44:35 +0000 | [diff] [blame] | 884 | ret = error("unable to write sha1 filename %s", |
| 885 | obj_req->filename); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 886 | } |
| 887 | |
Nick Hengeveld | e388ab7 | 2005-11-18 11:03:04 -0800 | [diff] [blame] | 888 | release_object_request(obj_req); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 889 | return ret; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 890 | } |
| 891 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 892 | int fetch(unsigned char *sha1) |
| 893 | { |
| 894 | struct alt_base *altbase = alt; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 895 | |
| 896 | if (!fetch_object(altbase, sha1)) |
| 897 | return 0; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 898 | while (altbase) { |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 899 | if (!fetch_pack(altbase, sha1)) |
| 900 | return 0; |
Nick Hengeveld | f7eb290 | 2005-10-21 12:06:20 -0700 | [diff] [blame] | 901 | fetch_alternates(alt->base); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 902 | altbase = altbase->next; |
| 903 | } |
Junio C Hamano | bd2afde | 2006-02-22 17:47:10 -0800 | [diff] [blame] | 904 | return error("Unable to find %s under %s", sha1_to_hex(sha1), |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 905 | alt->base); |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 906 | } |
| 907 | |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 908 | static inline int needs_quote(int ch) |
| 909 | { |
Florian Forster | cfd432e6 | 2006-06-18 17:18:03 +0200 | [diff] [blame] | 910 | if (((ch >= 'A') && (ch <= 'Z')) |
| 911 | || ((ch >= 'a') && (ch <= 'z')) |
| 912 | || ((ch >= '0') && (ch <= '9')) |
| 913 | || (ch == '/') |
| 914 | || (ch == '-') |
| 915 | || (ch == '.')) |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 916 | return 0; |
Florian Forster | cfd432e6 | 2006-06-18 17:18:03 +0200 | [diff] [blame] | 917 | return 1; |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 918 | } |
| 919 | |
| 920 | static inline int hex(int v) |
| 921 | { |
| 922 | if (v < 10) return '0' + v; |
| 923 | else return 'A' + v - 10; |
| 924 | } |
| 925 | |
| 926 | static char *quote_ref_url(const char *base, const char *ref) |
| 927 | { |
| 928 | const char *cp; |
| 929 | char *dp, *qref; |
| 930 | int len, baselen, ch; |
| 931 | |
| 932 | baselen = strlen(base); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 933 | len = baselen + 7; /* "/refs/" + NUL */ |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 934 | for (cp = ref; (ch = *cp) != 0; cp++, len++) |
| 935 | if (needs_quote(ch)) |
| 936 | len += 2; /* extra two hex plus replacement % */ |
| 937 | qref = xmalloc(len); |
| 938 | memcpy(qref, base, baselen); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 939 | memcpy(qref + baselen, "/refs/", 6); |
| 940 | for (cp = ref, dp = qref + baselen + 6; (ch = *cp) != 0; cp++) { |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 941 | if (needs_quote(ch)) { |
| 942 | *dp++ = '%'; |
| 943 | *dp++ = hex((ch >> 4) & 0xF); |
| 944 | *dp++ = hex(ch & 0xF); |
| 945 | } |
| 946 | else |
| 947 | *dp++ = ch; |
| 948 | } |
| 949 | *dp = 0; |
| 950 | |
| 951 | return qref; |
| 952 | } |
| 953 | |
Daniel Barkalow | cd541a6 | 2005-06-06 16:38:26 -0400 | [diff] [blame] | 954 | int fetch_ref(char *ref, unsigned char *sha1) |
| 955 | { |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 956 | char *url; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 957 | char hex[42]; |
| 958 | struct buffer buffer; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 959 | const char *base = alt->base; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 960 | struct active_request_slot *slot; |
Nick Hengeveld | cb754fd | 2006-01-31 18:00:37 -0800 | [diff] [blame] | 961 | struct slot_results results; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 962 | buffer.size = 41; |
| 963 | buffer.posn = 0; |
| 964 | buffer.buffer = hex; |
| 965 | hex[41] = '\0'; |
Junio C Hamano | 8fcf7f9 | 2006-01-31 18:15:51 -0800 | [diff] [blame] | 966 | |
Junio C Hamano | 94fa447 | 2005-10-10 23:22:02 -0700 | [diff] [blame] | 967 | url = quote_ref_url(base, ref); |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 968 | slot = get_active_slot(); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 969 | slot->results = &results; |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 970 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
| 971 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
| 972 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); |
| 973 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
| 974 | if (start_active_slot(slot)) { |
| 975 | run_active_slot(slot); |
Nick Hengeveld | c8568e1 | 2006-01-31 11:06:55 -0800 | [diff] [blame] | 976 | if (results.curl_result != CURLE_OK) |
Nick Hengeveld | 1d389ab | 2005-10-10 23:22:01 -0700 | [diff] [blame] | 977 | return error("Couldn't get %s for %s\n%s", |
| 978 | url, ref, curl_errorstr); |
| 979 | } else { |
| 980 | return error("Unable to start request"); |
| 981 | } |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 982 | |
| 983 | hex[40] = '\0'; |
| 984 | get_sha1_hex(hex, sha1); |
| 985 | return 0; |
Daniel Barkalow | cd541a6 | 2005-06-06 16:38:26 -0400 | [diff] [blame] | 986 | } |
| 987 | |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 988 | int main(int argc, const char **argv) |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 989 | { |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 990 | int commits; |
| 991 | const char **write_ref = NULL; |
| 992 | char **commit_id; |
| 993 | const char *url; |
Gerrit Pape | 9c880b3 | 2007-03-28 09:47:35 +0000 | [diff] [blame] | 994 | char *s; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 995 | int arg = 1; |
Nick Hengeveld | 7b9ae53 | 2005-10-21 12:06:27 -0700 | [diff] [blame] | 996 | int rc = 0; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 997 | |
Junio C Hamano | 5a32771 | 2005-11-26 00:47:59 -0800 | [diff] [blame] | 998 | setup_git_directory(); |
Shawn Pearce | d0740d9 | 2006-05-19 03:29:26 -0400 | [diff] [blame] | 999 | git_config(git_default_config); |
Junio C Hamano | 5a32771 | 2005-11-26 00:47:59 -0800 | [diff] [blame] | 1000 | |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1001 | while (arg < argc && argv[arg][0] == '-') { |
| 1002 | if (argv[arg][1] == 't') { |
Daniel Barkalow | 4250a5e | 2005-04-30 16:53:56 -0700 | [diff] [blame] | 1003 | get_tree = 1; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1004 | } else if (argv[arg][1] == 'c') { |
Daniel Barkalow | 4250a5e | 2005-04-30 16:53:56 -0700 | [diff] [blame] | 1005 | get_history = 1; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1006 | } else if (argv[arg][1] == 'a') { |
Daniel Barkalow | 4250a5e | 2005-04-30 16:53:56 -0700 | [diff] [blame] | 1007 | get_all = 1; |
| 1008 | get_tree = 1; |
| 1009 | get_history = 1; |
Junio C Hamano | e78d977 | 2005-05-06 01:37:21 -0700 | [diff] [blame] | 1010 | } else if (argv[arg][1] == 'v') { |
| 1011 | get_verbosely = 1; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 1012 | } else if (argv[arg][1] == 'w') { |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1013 | write_ref = &argv[arg + 1]; |
Daniel Barkalow | fa3e065 | 2005-06-21 20:45:49 -0400 | [diff] [blame] | 1014 | arg++; |
Daniel Barkalow | 820eca6 | 2005-09-26 21:38:08 -0400 | [diff] [blame] | 1015 | } else if (!strcmp(argv[arg], "--recover")) { |
| 1016 | get_recover = 1; |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1017 | } else if (!strcmp(argv[arg], "--stdin")) { |
| 1018 | commits_on_stdin = 1; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1019 | } |
| 1020 | arg++; |
| 1021 | } |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1022 | if (argc < arg + 2 - commits_on_stdin) { |
| 1023 | usage("git-http-fetch [-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url"); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1024 | return 1; |
| 1025 | } |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1026 | if (commits_on_stdin) { |
| 1027 | commits = pull_targets_stdin(&commit_id, &write_ref); |
| 1028 | } else { |
| 1029 | commit_id = (char **) &argv[arg++]; |
| 1030 | commits = 1; |
| 1031 | } |
| 1032 | url = argv[arg]; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1033 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 1034 | http_init(); |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1035 | |
Sergey Vlasov | 1db69b5 | 2005-09-13 19:38:58 +0400 | [diff] [blame] | 1036 | no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:"); |
Darrin Thompson | 3dcb90f | 2005-07-12 21:12:40 -0500 | [diff] [blame] | 1037 | |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 1038 | alt = xmalloc(sizeof(*alt)); |
Gerrit Pape | 2afea3b | 2007-03-28 09:46:15 +0000 | [diff] [blame] | 1039 | alt->base = xmalloc(strlen(url) + 1); |
| 1040 | strcpy(alt->base, url); |
Gerrit Pape | 9c880b3 | 2007-03-28 09:47:35 +0000 | [diff] [blame] | 1041 | for (s = alt->base + strlen(alt->base) - 1; *s == '/'; --s) |
| 1042 | *s = 0; |
Daniel Barkalow | b366156 | 2005-09-14 23:26:08 -0400 | [diff] [blame] | 1043 | alt->got_indices = 0; |
| 1044 | alt->packs = NULL; |
| 1045 | alt->next = NULL; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1046 | |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1047 | if (pull(commits, commit_id, write_ref, url)) |
Nick Hengeveld | 7b9ae53 | 2005-10-21 12:06:27 -0700 | [diff] [blame] | 1048 | rc = 1; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1049 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 1050 | http_cleanup(); |
| 1051 | |
Sean | 07001f9 | 2006-05-20 18:46:33 -0400 | [diff] [blame] | 1052 | curl_slist_free_all(no_pragma_header); |
| 1053 | |
Petr Baudis | 8e29f6a | 2006-07-27 23:56:22 +0200 | [diff] [blame] | 1054 | if (commits_on_stdin) |
| 1055 | pull_targets_free(commits, commit_id, write_ref); |
| 1056 | |
Junio C Hamano | bb52807 | 2006-03-20 14:07:59 -0800 | [diff] [blame] | 1057 | if (corrupt_object_found) { |
| 1058 | fprintf(stderr, |
| 1059 | "Some loose object were found to be corrupt, but they might be just\n" |
| 1060 | "a false '404 Not Found' error message sent with incorrect HTTP\n" |
Junio C Hamano | df391b1 | 2007-01-28 16:33:58 -0800 | [diff] [blame] | 1061 | "status code. Suggest running git-fsck.\n"); |
Junio C Hamano | bb52807 | 2006-03-20 14:07:59 -0800 | [diff] [blame] | 1062 | } |
Nick Hengeveld | 7b9ae53 | 2005-10-21 12:06:27 -0700 | [diff] [blame] | 1063 | return rc; |
Daniel Barkalow | 6eb7ed5 | 2005-04-23 18:47:23 -0700 | [diff] [blame] | 1064 | } |