]>
Commit | Line | Data |
---|---|---|
58e60dd2 NH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
3 | #include "pack.h" | |
4 | #include "fetch.h" | |
5 | #include "tag.h" | |
6 | #include "blob.h" | |
29508e1e | 7 | #include "http.h" |
aa1dbc98 | 8 | #include "refs.h" |
c4e05b1a | 9 | #include "diff.h" |
aa1dbc98 | 10 | #include "revision.h" |
3dfaf7bc | 11 | #include "exec_cmd.h" |
6b62816c | 12 | #include "remote.h" |
29508e1e | 13 | |
bee8e79d | 14 | #include <expat.h> |
58e60dd2 NH |
15 | |
16 | static const char http_push_usage[] = | |
1a703cba | 17 | "git-http-push [--all] [--force] [--verbose] <remote> [<head>...]\n"; |
58e60dd2 | 18 | |
92e2eb9c JS |
19 | #ifndef XML_STATUS_OK |
20 | enum XML_Status { | |
21 | XML_STATUS_OK = 1, | |
22 | XML_STATUS_ERROR = 0 | |
23 | }; | |
24 | #define XML_STATUS_OK 1 | |
25 | #define XML_STATUS_ERROR 0 | |
26 | #endif | |
27 | ||
197e8951 | 28 | #define PREV_BUF_SIZE 4096 |
58e60dd2 NH |
29 | #define RANGE_HEADER_SIZE 30 |
30 | ||
acf59575 | 31 | /* DAV methods */ |
58e60dd2 NH |
32 | #define DAV_LOCK "LOCK" |
33 | #define DAV_MKCOL "MKCOL" | |
34 | #define DAV_MOVE "MOVE" | |
35 | #define DAV_PROPFIND "PROPFIND" | |
36 | #define DAV_PUT "PUT" | |
37 | #define DAV_UNLOCK "UNLOCK" | |
3dfaf7bc | 38 | #define DAV_DELETE "DELETE" |
acf59575 NH |
39 | |
40 | /* DAV lock flags */ | |
41 | #define DAV_PROP_LOCKWR (1u << 0) | |
42 | #define DAV_PROP_LOCKEX (1u << 1) | |
43 | #define DAV_LOCK_OK (1u << 2) | |
44 | ||
45 | /* DAV XML properties */ | |
46 | #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry" | |
47 | #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write" | |
48 | #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive" | |
49 | #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href" | |
50 | #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout" | |
51 | #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href" | |
aa1dbc98 NH |
52 | #define DAV_PROPFIND_RESP ".multistatus.response" |
53 | #define DAV_PROPFIND_NAME ".multistatus.response.href" | |
54 | #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection" | |
acf59575 NH |
55 | |
56 | /* DAV request body templates */ | |
aa1dbc98 NH |
57 | #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>" |
58 | #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>" | |
58e60dd2 NH |
59 | #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>" |
60 | ||
75187c9d NH |
61 | #define LOCK_TIME 600 |
62 | #define LOCK_REFRESH 30 | |
63 | ||
1b65a5aa | 64 | /* bits #0-15 in revision.h */ |
aa1dbc98 | 65 | |
1b65a5aa JH |
66 | #define LOCAL (1u<<16) |
67 | #define REMOTE (1u<<17) | |
68 | #define FETCHING (1u<<18) | |
69 | #define PUSHING (1u<<19) | |
aa1dbc98 | 70 | |
3dfaf7bc NH |
71 | /* We allow "recursive" symbolic refs. Only within reason, though */ |
72 | #define MAXDEPTH 5 | |
73 | ||
96f1e58f DR |
74 | static int pushing; |
75 | static int aborted; | |
a3c57c9a | 76 | static signed char remote_dir_exists[256]; |
58e60dd2 | 77 | |
58e60dd2 NH |
78 | static struct curl_slist *no_pragma_header; |
79 | static struct curl_slist *default_headers; | |
58e60dd2 | 80 | |
96f1e58f DR |
81 | static int push_verbosely; |
82 | static int push_all; | |
83 | static int force_all; | |
58e60dd2 | 84 | |
96f1e58f | 85 | static struct object_list *objects; |
aa1dbc98 | 86 | |
58e60dd2 NH |
87 | struct repo |
88 | { | |
89 | char *url; | |
aa1dbc98 | 90 | int path_len; |
197e8951 NH |
91 | int has_info_refs; |
92 | int can_update_info_refs; | |
93 | int has_info_packs; | |
58e60dd2 | 94 | struct packed_git *packs; |
512d632c | 95 | struct remote_lock *locks; |
58e60dd2 NH |
96 | }; |
97 | ||
96f1e58f | 98 | static struct repo *remote; |
58e60dd2 NH |
99 | |
100 | enum transfer_state { | |
197e8951 NH |
101 | NEED_FETCH, |
102 | RUN_FETCH_LOOSE, | |
103 | RUN_FETCH_PACKED, | |
58e60dd2 NH |
104 | NEED_PUSH, |
105 | RUN_MKCOL, | |
106 | RUN_PUT, | |
107 | RUN_MOVE, | |
108 | ABORTED, | |
109 | COMPLETE, | |
110 | }; | |
111 | ||
112 | struct transfer_request | |
113 | { | |
aa1dbc98 | 114 | struct object *obj; |
58e60dd2 NH |
115 | char *url; |
116 | char *dest; | |
aa1dbc98 | 117 | struct remote_lock *lock; |
58e60dd2 NH |
118 | struct curl_slist *headers; |
119 | struct buffer buffer; | |
120 | char filename[PATH_MAX]; | |
121 | char tmpfile[PATH_MAX]; | |
197e8951 NH |
122 | int local_fileno; |
123 | FILE *local_stream; | |
58e60dd2 NH |
124 | enum transfer_state state; |
125 | CURLcode curl_result; | |
126 | char errorstr[CURL_ERROR_SIZE]; | |
127 | long http_code; | |
128 | unsigned char real_sha1[20]; | |
129 | SHA_CTX c; | |
130 | z_stream stream; | |
131 | int zret; | |
132 | int rename; | |
197e8951 | 133 | void *userData; |
58e60dd2 NH |
134 | struct active_request_slot *slot; |
135 | struct transfer_request *next; | |
136 | }; | |
137 | ||
96f1e58f | 138 | static struct transfer_request *request_queue_head; |
58e60dd2 | 139 | |
acf59575 NH |
140 | struct xml_ctx |
141 | { | |
142 | char *name; | |
143 | int len; | |
144 | char *cdata; | |
145 | void (*userFunc)(struct xml_ctx *ctx, int tag_closed); | |
146 | void *userData; | |
147 | }; | |
148 | ||
aa1dbc98 | 149 | struct remote_lock |
26349b2e | 150 | { |
75187c9d | 151 | char *url; |
26349b2e | 152 | char *owner; |
75187c9d | 153 | char *token; |
26349b2e NH |
154 | time_t start_time; |
155 | long timeout; | |
75187c9d | 156 | int refreshing; |
aa1dbc98 NH |
157 | struct remote_lock *next; |
158 | }; | |
159 | ||
3030baa7 NH |
160 | /* Flags that control remote_ls processing */ |
161 | #define PROCESS_FILES (1u << 0) | |
162 | #define PROCESS_DIRS (1u << 1) | |
163 | #define RECURSIVE (1u << 2) | |
164 | ||
165 | /* Flags that remote_ls passes to callback functions */ | |
166 | #define IS_DIR (1u << 0) | |
167 | ||
168 | struct remote_ls_ctx | |
aa1dbc98 | 169 | { |
3030baa7 NH |
170 | char *path; |
171 | void (*userFunc)(struct remote_ls_ctx *ls); | |
172 | void *userData; | |
173 | int flags; | |
174 | char *dentry_name; | |
175 | int dentry_flags; | |
176 | struct remote_ls_ctx *parent; | |
26349b2e NH |
177 | }; |
178 | ||
29508e1e | 179 | static void finish_request(struct transfer_request *request); |
197e8951 | 180 | static void release_request(struct transfer_request *request); |
58e60dd2 | 181 | |
29508e1e | 182 | static void process_response(void *callback_data) |
58e60dd2 | 183 | { |
29508e1e NH |
184 | struct transfer_request *request = |
185 | (struct transfer_request *)callback_data; | |
58e60dd2 | 186 | |
29508e1e | 187 | finish_request(request); |
58e60dd2 NH |
188 | } |
189 | ||
dd8239f9 | 190 | #ifdef USE_CURL_MULTI |
197e8951 NH |
191 | static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb, |
192 | void *data) | |
193 | { | |
194 | unsigned char expn[4096]; | |
195 | size_t size = eltsize * nmemb; | |
196 | int posn = 0; | |
197 | struct transfer_request *request = (struct transfer_request *)data; | |
198 | do { | |
93822c22 | 199 | ssize_t retval = xwrite(request->local_fileno, |
1d7f171c | 200 | (char *) ptr + posn, size - posn); |
197e8951 NH |
201 | if (retval < 0) |
202 | return posn; | |
203 | posn += retval; | |
204 | } while (posn < size); | |
205 | ||
206 | request->stream.avail_in = size; | |
207 | request->stream.next_in = ptr; | |
208 | do { | |
209 | request->stream.next_out = expn; | |
210 | request->stream.avail_out = sizeof(expn); | |
211 | request->zret = inflate(&request->stream, Z_SYNC_FLUSH); | |
212 | SHA1_Update(&request->c, expn, | |
213 | sizeof(expn) - request->stream.avail_out); | |
214 | } while (request->stream.avail_in && request->zret == Z_OK); | |
215 | data_received++; | |
216 | return size; | |
217 | } | |
218 | ||
219 | static void start_fetch_loose(struct transfer_request *request) | |
220 | { | |
221 | char *hex = sha1_to_hex(request->obj->sha1); | |
222 | char *filename; | |
223 | char prevfile[PATH_MAX]; | |
224 | char *url; | |
225 | char *posn; | |
226 | int prevlocal; | |
227 | unsigned char prev_buf[PREV_BUF_SIZE]; | |
228 | ssize_t prev_read = 0; | |
229 | long prev_posn = 0; | |
230 | char range[RANGE_HEADER_SIZE]; | |
231 | struct curl_slist *range_header = NULL; | |
232 | struct active_request_slot *slot; | |
233 | ||
234 | filename = sha1_file_name(request->obj->sha1); | |
235 | snprintf(request->filename, sizeof(request->filename), "%s", filename); | |
236 | snprintf(request->tmpfile, sizeof(request->tmpfile), | |
237 | "%s.temp", filename); | |
238 | ||
239 | snprintf(prevfile, sizeof(prevfile), "%s.prev", request->filename); | |
240 | unlink(prevfile); | |
241 | rename(request->tmpfile, prevfile); | |
242 | unlink(request->tmpfile); | |
243 | ||
244 | if (request->local_fileno != -1) | |
245 | error("fd leakage in start: %d", request->local_fileno); | |
246 | request->local_fileno = open(request->tmpfile, | |
247 | O_WRONLY | O_CREAT | O_EXCL, 0666); | |
248 | /* This could have failed due to the "lazy directory creation"; | |
249 | * try to mkdir the last path component. | |
250 | */ | |
251 | if (request->local_fileno < 0 && errno == ENOENT) { | |
252 | char *dir = strrchr(request->tmpfile, '/'); | |
253 | if (dir) { | |
254 | *dir = 0; | |
255 | mkdir(request->tmpfile, 0777); | |
256 | *dir = '/'; | |
257 | } | |
258 | request->local_fileno = open(request->tmpfile, | |
259 | O_WRONLY | O_CREAT | O_EXCL, 0666); | |
260 | } | |
261 | ||
262 | if (request->local_fileno < 0) { | |
263 | request->state = ABORTED; | |
264 | error("Couldn't create temporary file %s for %s: %s", | |
265 | request->tmpfile, request->filename, strerror(errno)); | |
266 | return; | |
267 | } | |
268 | ||
269 | memset(&request->stream, 0, sizeof(request->stream)); | |
270 | ||
271 | inflateInit(&request->stream); | |
272 | ||
273 | SHA1_Init(&request->c); | |
274 | ||
275 | url = xmalloc(strlen(remote->url) + 50); | |
276 | request->url = xmalloc(strlen(remote->url) + 50); | |
277 | strcpy(url, remote->url); | |
278 | posn = url + strlen(remote->url); | |
279 | strcpy(posn, "objects/"); | |
280 | posn += 8; | |
281 | memcpy(posn, hex, 2); | |
282 | posn += 2; | |
283 | *(posn++) = '/'; | |
284 | strcpy(posn, hex + 2); | |
285 | strcpy(request->url, url); | |
286 | ||
287 | /* If a previous temp file is present, process what was already | |
288 | fetched. */ | |
289 | prevlocal = open(prevfile, O_RDONLY); | |
290 | if (prevlocal != -1) { | |
291 | do { | |
93d26e4c | 292 | prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE); |
197e8951 NH |
293 | if (prev_read>0) { |
294 | if (fwrite_sha1_file(prev_buf, | |
295 | 1, | |
296 | prev_read, | |
297 | request) == prev_read) { | |
298 | prev_posn += prev_read; | |
299 | } else { | |
300 | prev_read = -1; | |
301 | } | |
302 | } | |
303 | } while (prev_read > 0); | |
304 | close(prevlocal); | |
305 | } | |
306 | unlink(prevfile); | |
307 | ||
308 | /* Reset inflate/SHA1 if there was an error reading the previous temp | |
309 | file; also rewind to the beginning of the local file. */ | |
310 | if (prev_read == -1) { | |
311 | memset(&request->stream, 0, sizeof(request->stream)); | |
312 | inflateInit(&request->stream); | |
313 | SHA1_Init(&request->c); | |
314 | if (prev_posn>0) { | |
315 | prev_posn = 0; | |
b5da2467 | 316 | lseek(request->local_fileno, 0, SEEK_SET); |
197e8951 NH |
317 | ftruncate(request->local_fileno, 0); |
318 | } | |
319 | } | |
320 | ||
321 | slot = get_active_slot(); | |
322 | slot->callback_func = process_response; | |
323 | slot->callback_data = request; | |
324 | request->slot = slot; | |
325 | ||
326 | curl_easy_setopt(slot->curl, CURLOPT_FILE, request); | |
327 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file); | |
328 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); | |
329 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
330 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); | |
331 | ||
332 | /* If we have successfully processed data from a previous fetch | |
333 | attempt, only fetch the data we don't already have. */ | |
334 | if (prev_posn>0) { | |
335 | if (push_verbosely) | |
336 | fprintf(stderr, | |
337 | "Resuming fetch of object %s at byte %ld\n", | |
338 | hex, prev_posn); | |
339 | sprintf(range, "Range: bytes=%ld-", prev_posn); | |
340 | range_header = curl_slist_append(range_header, range); | |
341 | curl_easy_setopt(slot->curl, | |
342 | CURLOPT_HTTPHEADER, range_header); | |
343 | } | |
344 | ||
345 | /* Try to get the request started, abort the request on error */ | |
346 | request->state = RUN_FETCH_LOOSE; | |
347 | if (!start_active_slot(slot)) { | |
348 | fprintf(stderr, "Unable to start GET request\n"); | |
349 | remote->can_update_info_refs = 0; | |
350 | release_request(request); | |
351 | } | |
352 | } | |
353 | ||
dd8239f9 JH |
354 | static void start_mkcol(struct transfer_request *request) |
355 | { | |
356 | char *hex = sha1_to_hex(request->obj->sha1); | |
357 | struct active_request_slot *slot; | |
358 | char *posn; | |
359 | ||
360 | request->url = xmalloc(strlen(remote->url) + 13); | |
361 | strcpy(request->url, remote->url); | |
362 | posn = request->url + strlen(remote->url); | |
363 | strcpy(posn, "objects/"); | |
364 | posn += 8; | |
365 | memcpy(posn, hex, 2); | |
366 | posn += 2; | |
367 | strcpy(posn, "/"); | |
368 | ||
369 | slot = get_active_slot(); | |
370 | slot->callback_func = process_response; | |
371 | slot->callback_data = request; | |
372 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); /* undo PUT setup */ | |
373 | curl_easy_setopt(slot->curl, CURLOPT_URL, request->url); | |
374 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); | |
375 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MKCOL); | |
376 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
377 | ||
378 | if (start_active_slot(slot)) { | |
379 | request->slot = slot; | |
380 | request->state = RUN_MKCOL; | |
381 | } else { | |
382 | request->state = ABORTED; | |
383 | free(request->url); | |
384 | request->url = NULL; | |
385 | } | |
386 | } | |
387 | #endif | |
388 | ||
197e8951 NH |
389 | static void start_fetch_packed(struct transfer_request *request) |
390 | { | |
391 | char *url; | |
392 | struct packed_git *target; | |
393 | FILE *packfile; | |
394 | char *filename; | |
395 | long prev_posn = 0; | |
396 | char range[RANGE_HEADER_SIZE]; | |
397 | struct curl_slist *range_header = NULL; | |
398 | ||
399 | struct transfer_request *check_request = request_queue_head; | |
400 | struct active_request_slot *slot; | |
401 | ||
402 | target = find_sha1_pack(request->obj->sha1, remote->packs); | |
403 | if (!target) { | |
404 | fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1)); | |
405 | remote->can_update_info_refs = 0; | |
406 | release_request(request); | |
407 | return; | |
408 | } | |
409 | ||
410 | fprintf(stderr, "Fetching pack %s\n", sha1_to_hex(target->sha1)); | |
411 | fprintf(stderr, " which contains %s\n", sha1_to_hex(request->obj->sha1)); | |
412 | ||
413 | filename = sha1_pack_name(target->sha1); | |
414 | snprintf(request->filename, sizeof(request->filename), "%s", filename); | |
415 | snprintf(request->tmpfile, sizeof(request->tmpfile), | |
416 | "%s.temp", filename); | |
417 | ||
418 | url = xmalloc(strlen(remote->url) + 64); | |
419 | sprintf(url, "%sobjects/pack/pack-%s.pack", | |
420 | remote->url, sha1_to_hex(target->sha1)); | |
421 | ||
422 | /* Make sure there isn't another open request for this pack */ | |
423 | while (check_request) { | |
424 | if (check_request->state == RUN_FETCH_PACKED && | |
425 | !strcmp(check_request->url, url)) { | |
426 | free(url); | |
427 | release_request(request); | |
428 | return; | |
429 | } | |
430 | check_request = check_request->next; | |
431 | } | |
432 | ||
433 | packfile = fopen(request->tmpfile, "a"); | |
434 | if (!packfile) { | |
435 | fprintf(stderr, "Unable to open local file %s for pack", | |
436 | filename); | |
437 | remote->can_update_info_refs = 0; | |
438 | free(url); | |
439 | return; | |
440 | } | |
441 | ||
442 | slot = get_active_slot(); | |
443 | slot->callback_func = process_response; | |
444 | slot->callback_data = request; | |
445 | request->slot = slot; | |
446 | request->local_stream = packfile; | |
447 | request->userData = target; | |
448 | ||
449 | request->url = url; | |
450 | curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile); | |
451 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); | |
452 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
453 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); | |
454 | slot->local = packfile; | |
455 | ||
456 | /* If there is data present from a previous transfer attempt, | |
457 | resume where it left off */ | |
458 | prev_posn = ftell(packfile); | |
459 | if (prev_posn>0) { | |
460 | if (push_verbosely) | |
461 | fprintf(stderr, | |
462 | "Resuming fetch of pack %s at byte %ld\n", | |
463 | sha1_to_hex(target->sha1), prev_posn); | |
464 | sprintf(range, "Range: bytes=%ld-", prev_posn); | |
465 | range_header = curl_slist_append(range_header, range); | |
466 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); | |
467 | } | |
468 | ||
469 | /* Try to get the request started, abort the request on error */ | |
470 | request->state = RUN_FETCH_PACKED; | |
471 | if (!start_active_slot(slot)) { | |
472 | fprintf(stderr, "Unable to start GET request\n"); | |
473 | remote->can_update_info_refs = 0; | |
474 | release_request(request); | |
475 | } | |
476 | } | |
477 | ||
58e60dd2 NH |
478 | static void start_put(struct transfer_request *request) |
479 | { | |
aa1dbc98 | 480 | char *hex = sha1_to_hex(request->obj->sha1); |
58e60dd2 NH |
481 | struct active_request_slot *slot; |
482 | char *posn; | |
21666f1a | 483 | enum object_type type; |
58e60dd2 NH |
484 | char hdr[50]; |
485 | void *unpacked; | |
486 | unsigned long len; | |
487 | int hdrlen; | |
488 | ssize_t size; | |
489 | z_stream stream; | |
490 | ||
21666f1a NP |
491 | unpacked = read_sha1_file(request->obj->sha1, &type, &len); |
492 | hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1; | |
58e60dd2 NH |
493 | |
494 | /* Set it up */ | |
495 | memset(&stream, 0, sizeof(stream)); | |
12f6c308 | 496 | deflateInit(&stream, zlib_compression_level); |
58e60dd2 NH |
497 | size = deflateBound(&stream, len + hdrlen); |
498 | request->buffer.buffer = xmalloc(size); | |
499 | ||
500 | /* Compress it */ | |
501 | stream.next_out = request->buffer.buffer; | |
502 | stream.avail_out = size; | |
503 | ||
504 | /* First header.. */ | |
505 | stream.next_in = (void *)hdr; | |
506 | stream.avail_in = hdrlen; | |
507 | while (deflate(&stream, 0) == Z_OK) | |
508 | /* nothing */; | |
509 | ||
510 | /* Then the data itself.. */ | |
511 | stream.next_in = unpacked; | |
512 | stream.avail_in = len; | |
513 | while (deflate(&stream, Z_FINISH) == Z_OK) | |
514 | /* nothing */; | |
515 | deflateEnd(&stream); | |
516 | free(unpacked); | |
517 | ||
518 | request->buffer.size = stream.total_out; | |
519 | request->buffer.posn = 0; | |
520 | ||
a6080a0a | 521 | request->url = xmalloc(strlen(remote->url) + |
26349b2e | 522 | strlen(request->lock->token) + 51); |
58e60dd2 NH |
523 | strcpy(request->url, remote->url); |
524 | posn = request->url + strlen(remote->url); | |
525 | strcpy(posn, "objects/"); | |
526 | posn += 8; | |
527 | memcpy(posn, hex, 2); | |
528 | posn += 2; | |
529 | *(posn++) = '/'; | |
530 | strcpy(posn, hex + 2); | |
531 | request->dest = xmalloc(strlen(request->url) + 14); | |
532 | sprintf(request->dest, "Destination: %s", request->url); | |
533 | posn += 38; | |
1e8d3045 | 534 | *(posn++) = '_'; |
26349b2e | 535 | strcpy(posn, request->lock->token); |
58e60dd2 NH |
536 | |
537 | slot = get_active_slot(); | |
29508e1e NH |
538 | slot->callback_func = process_response; |
539 | slot->callback_data = request; | |
58e60dd2 NH |
540 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &request->buffer); |
541 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, request->buffer.size); | |
542 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
543 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
544 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT); | |
545 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
546 | curl_easy_setopt(slot->curl, CURLOPT_PUT, 1); | |
547 | curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0); | |
548 | curl_easy_setopt(slot->curl, CURLOPT_URL, request->url); | |
549 | ||
550 | if (start_active_slot(slot)) { | |
551 | request->slot = slot; | |
552 | request->state = RUN_PUT; | |
553 | } else { | |
554 | request->state = ABORTED; | |
555 | free(request->url); | |
7b899967 | 556 | request->url = NULL; |
58e60dd2 NH |
557 | } |
558 | } | |
559 | ||
560 | static void start_move(struct transfer_request *request) | |
561 | { | |
562 | struct active_request_slot *slot; | |
563 | struct curl_slist *dav_headers = NULL; | |
564 | ||
565 | slot = get_active_slot(); | |
29508e1e NH |
566 | slot->callback_func = process_response; |
567 | slot->callback_data = request; | |
58e60dd2 NH |
568 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); /* undo PUT setup */ |
569 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MOVE); | |
570 | dav_headers = curl_slist_append(dav_headers, request->dest); | |
571 | dav_headers = curl_slist_append(dav_headers, "Overwrite: T"); | |
572 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
573 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
574 | curl_easy_setopt(slot->curl, CURLOPT_URL, request->url); | |
575 | ||
576 | if (start_active_slot(slot)) { | |
577 | request->slot = slot; | |
578 | request->state = RUN_MOVE; | |
579 | } else { | |
580 | request->state = ABORTED; | |
581 | free(request->url); | |
7b899967 | 582 | request->url = NULL; |
58e60dd2 NH |
583 | } |
584 | } | |
585 | ||
512d632c | 586 | static int refresh_lock(struct remote_lock *lock) |
75187c9d NH |
587 | { |
588 | struct active_request_slot *slot; | |
baa7b67d | 589 | struct slot_results results; |
75187c9d NH |
590 | char *if_header; |
591 | char timeout_header[25]; | |
592 | struct curl_slist *dav_headers = NULL; | |
512d632c | 593 | int rc = 0; |
75187c9d | 594 | |
512d632c | 595 | lock->refreshing = 1; |
75187c9d | 596 | |
512d632c NH |
597 | if_header = xmalloc(strlen(lock->token) + 25); |
598 | sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token); | |
599 | sprintf(timeout_header, "Timeout: Second-%ld", lock->timeout); | |
600 | dav_headers = curl_slist_append(dav_headers, if_header); | |
601 | dav_headers = curl_slist_append(dav_headers, timeout_header); | |
75187c9d | 602 | |
512d632c NH |
603 | slot = get_active_slot(); |
604 | slot->results = &results; | |
605 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); | |
606 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
607 | curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url); | |
608 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK); | |
609 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
75187c9d | 610 | |
512d632c NH |
611 | if (start_active_slot(slot)) { |
612 | run_active_slot(slot); | |
613 | if (results.curl_result != CURLE_OK) { | |
614 | fprintf(stderr, "LOCK HTTP error %ld\n", | |
615 | results.http_code); | |
616 | } else { | |
617 | lock->start_time = time(NULL); | |
618 | rc = 1; | |
619 | } | |
620 | } | |
aa1dbc98 | 621 | |
512d632c NH |
622 | lock->refreshing = 0; |
623 | curl_slist_free_all(dav_headers); | |
624 | free(if_header); | |
aa1dbc98 | 625 | |
512d632c NH |
626 | return rc; |
627 | } | |
628 | ||
ec26b4d6 | 629 | static void check_locks(void) |
512d632c NH |
630 | { |
631 | struct remote_lock *lock = remote->locks; | |
632 | time_t current_time = time(NULL); | |
633 | int time_remaining; | |
634 | ||
635 | while (lock) { | |
636 | time_remaining = lock->start_time + lock->timeout - | |
637 | current_time; | |
638 | if (!lock->refreshing && time_remaining < LOCK_REFRESH) { | |
639 | if (!refresh_lock(lock)) { | |
640 | fprintf(stderr, | |
641 | "Unable to refresh lock for %s\n", | |
642 | lock->url); | |
643 | aborted = 1; | |
644 | return; | |
aa1dbc98 | 645 | } |
75187c9d | 646 | } |
512d632c | 647 | lock = lock->next; |
75187c9d | 648 | } |
aa1dbc98 | 649 | } |
75187c9d | 650 | |
aa1dbc98 NH |
651 | static void release_request(struct transfer_request *request) |
652 | { | |
653 | struct transfer_request *entry = request_queue_head; | |
654 | ||
655 | if (request == request_queue_head) { | |
656 | request_queue_head = request->next; | |
657 | } else { | |
658 | while (entry->next != NULL && entry->next != request) | |
659 | entry = entry->next; | |
660 | if (entry->next == request) | |
661 | entry->next = entry->next->next; | |
662 | } | |
663 | ||
197e8951 NH |
664 | if (request->local_fileno != -1) |
665 | close(request->local_fileno); | |
666 | if (request->local_stream) | |
667 | fclose(request->local_stream); | |
aa1dbc98 NH |
668 | if (request->url != NULL) |
669 | free(request->url); | |
670 | free(request); | |
75187c9d NH |
671 | } |
672 | ||
58e60dd2 NH |
673 | static void finish_request(struct transfer_request *request) |
674 | { | |
197e8951 NH |
675 | struct stat st; |
676 | struct packed_git *target; | |
677 | struct packed_git **lst; | |
678 | ||
679 | request->curl_result = request->slot->curl_result; | |
58e60dd2 NH |
680 | request->http_code = request->slot->http_code; |
681 | request->slot = NULL; | |
75187c9d | 682 | |
aa1dbc98 | 683 | /* Keep locks active */ |
512d632c | 684 | check_locks(); |
75187c9d | 685 | |
58e60dd2 NH |
686 | if (request->headers != NULL) |
687 | curl_slist_free_all(request->headers); | |
7b899967 NH |
688 | |
689 | /* URL is reused for MOVE after PUT */ | |
690 | if (request->state != RUN_PUT) { | |
691 | free(request->url); | |
692 | request->url = NULL; | |
aa1dbc98 | 693 | } |
7b899967 | 694 | |
aa1dbc98 | 695 | if (request->state == RUN_MKCOL) { |
58e60dd2 NH |
696 | if (request->curl_result == CURLE_OK || |
697 | request->http_code == 405) { | |
aa1dbc98 | 698 | remote_dir_exists[request->obj->sha1[0]] = 1; |
58e60dd2 NH |
699 | start_put(request); |
700 | } else { | |
701 | fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n", | |
aa1dbc98 | 702 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
703 | request->curl_result, request->http_code); |
704 | request->state = ABORTED; | |
705 | aborted = 1; | |
706 | } | |
707 | } else if (request->state == RUN_PUT) { | |
708 | if (request->curl_result == CURLE_OK) { | |
709 | start_move(request); | |
710 | } else { | |
711 | fprintf(stderr, "PUT %s failed, aborting (%d/%ld)\n", | |
aa1dbc98 | 712 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
713 | request->curl_result, request->http_code); |
714 | request->state = ABORTED; | |
715 | aborted = 1; | |
716 | } | |
717 | } else if (request->state == RUN_MOVE) { | |
718 | if (request->curl_result == CURLE_OK) { | |
1a703cba NH |
719 | if (push_verbosely) |
720 | fprintf(stderr, " sent %s\n", | |
721 | sha1_to_hex(request->obj->sha1)); | |
aa1dbc98 NH |
722 | request->obj->flags |= REMOTE; |
723 | release_request(request); | |
58e60dd2 NH |
724 | } else { |
725 | fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n", | |
aa1dbc98 | 726 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
727 | request->curl_result, request->http_code); |
728 | request->state = ABORTED; | |
729 | aborted = 1; | |
730 | } | |
197e8951 NH |
731 | } else if (request->state == RUN_FETCH_LOOSE) { |
732 | fchmod(request->local_fileno, 0444); | |
733 | close(request->local_fileno); request->local_fileno = -1; | |
734 | ||
735 | if (request->curl_result != CURLE_OK && | |
736 | request->http_code != 416) { | |
737 | if (stat(request->tmpfile, &st) == 0) { | |
738 | if (st.st_size == 0) | |
739 | unlink(request->tmpfile); | |
740 | } | |
741 | } else { | |
742 | if (request->http_code == 416) | |
743 | fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n"); | |
744 | ||
745 | inflateEnd(&request->stream); | |
746 | SHA1_Final(request->real_sha1, &request->c); | |
747 | if (request->zret != Z_STREAM_END) { | |
748 | unlink(request->tmpfile); | |
a89fccd2 | 749 | } else if (hashcmp(request->obj->sha1, request->real_sha1)) { |
197e8951 NH |
750 | unlink(request->tmpfile); |
751 | } else { | |
752 | request->rename = | |
753 | move_temp_to_file( | |
754 | request->tmpfile, | |
755 | request->filename); | |
756 | if (request->rename == 0) { | |
757 | request->obj->flags |= (LOCAL | REMOTE); | |
758 | } | |
759 | } | |
760 | } | |
761 | ||
762 | /* Try fetching packed if necessary */ | |
763 | if (request->obj->flags & LOCAL) | |
764 | release_request(request); | |
765 | else | |
766 | start_fetch_packed(request); | |
767 | ||
768 | } else if (request->state == RUN_FETCH_PACKED) { | |
769 | if (request->curl_result != CURLE_OK) { | |
770 | fprintf(stderr, "Unable to get pack file %s\n%s", | |
771 | request->url, curl_errorstr); | |
772 | remote->can_update_info_refs = 0; | |
773 | } else { | |
1c23d794 SP |
774 | off_t pack_size = ftell(request->local_stream); |
775 | ||
197e8951 NH |
776 | fclose(request->local_stream); |
777 | request->local_stream = NULL; | |
778 | if (!move_temp_to_file(request->tmpfile, | |
779 | request->filename)) { | |
780 | target = (struct packed_git *)request->userData; | |
1c23d794 | 781 | target->pack_size = pack_size; |
197e8951 NH |
782 | lst = &remote->packs; |
783 | while (*lst != target) | |
784 | lst = &((*lst)->next); | |
785 | *lst = (*lst)->next; | |
786 | ||
787 | if (!verify_pack(target, 0)) | |
788 | install_packed_git(target); | |
789 | else | |
790 | remote->can_update_info_refs = 0; | |
791 | } | |
792 | } | |
793 | release_request(request); | |
58e60dd2 NH |
794 | } |
795 | } | |
796 | ||
b3ca4e4e | 797 | #ifdef USE_CURL_MULTI |
29508e1e | 798 | void fill_active_slots(void) |
58e60dd2 NH |
799 | { |
800 | struct transfer_request *request = request_queue_head; | |
197e8951 | 801 | struct transfer_request *next; |
58e60dd2 NH |
802 | struct active_request_slot *slot = active_queue_head; |
803 | int num_transfers; | |
804 | ||
805 | if (aborted) | |
806 | return; | |
807 | ||
808 | while (active_requests < max_requests && request != NULL) { | |
197e8951 NH |
809 | next = request->next; |
810 | if (request->state == NEED_FETCH) { | |
811 | start_fetch_loose(request); | |
812 | } else if (pushing && request->state == NEED_PUSH) { | |
aa1dbc98 | 813 | if (remote_dir_exists[request->obj->sha1[0]] == 1) { |
0dd276b8 | 814 | start_put(request); |
aa1dbc98 | 815 | } else { |
0dd276b8 | 816 | start_mkcol(request); |
aa1dbc98 | 817 | } |
58e60dd2 NH |
818 | curl_multi_perform(curlm, &num_transfers); |
819 | } | |
197e8951 | 820 | request = next; |
58e60dd2 NH |
821 | } |
822 | ||
823 | while (slot != NULL) { | |
824 | if (!slot->in_use && slot->curl != NULL) { | |
825 | curl_easy_cleanup(slot->curl); | |
826 | slot->curl = NULL; | |
827 | } | |
828 | slot = slot->next; | |
aa1dbc98 | 829 | } |
58e60dd2 | 830 | } |
b3ca4e4e | 831 | #endif |
58e60dd2 | 832 | |
aa1dbc98 NH |
833 | static void get_remote_object_list(unsigned char parent); |
834 | ||
197e8951 NH |
835 | static void add_fetch_request(struct object *obj) |
836 | { | |
837 | struct transfer_request *request; | |
838 | ||
839 | check_locks(); | |
840 | ||
841 | /* | |
842 | * Don't fetch the object if it's known to exist locally | |
843 | * or is already in the request queue | |
844 | */ | |
845 | if (remote_dir_exists[obj->sha1[0]] == -1) | |
846 | get_remote_object_list(obj->sha1[0]); | |
847 | if (obj->flags & (LOCAL | FETCHING)) | |
848 | return; | |
849 | ||
850 | obj->flags |= FETCHING; | |
851 | request = xmalloc(sizeof(*request)); | |
852 | request->obj = obj; | |
853 | request->url = NULL; | |
854 | request->lock = NULL; | |
855 | request->headers = NULL; | |
856 | request->local_fileno = -1; | |
857 | request->local_stream = NULL; | |
858 | request->state = NEED_FETCH; | |
859 | request->next = request_queue_head; | |
860 | request_queue_head = request; | |
861 | ||
b3ca4e4e | 862 | #ifdef USE_CURL_MULTI |
197e8951 NH |
863 | fill_active_slots(); |
864 | step_active_slots(); | |
b3ca4e4e | 865 | #endif |
197e8951 NH |
866 | } |
867 | ||
1a703cba | 868 | static int add_send_request(struct object *obj, struct remote_lock *lock) |
58e60dd2 NH |
869 | { |
870 | struct transfer_request *request = request_queue_head; | |
58e60dd2 | 871 | struct packed_git *target; |
58e60dd2 | 872 | |
512d632c NH |
873 | /* Keep locks active */ |
874 | check_locks(); | |
875 | ||
aa1dbc98 NH |
876 | /* |
877 | * Don't push the object if it's known to exist on the remote | |
878 | * or is already in the request queue | |
879 | */ | |
880 | if (remote_dir_exists[obj->sha1[0]] == -1) | |
881 | get_remote_object_list(obj->sha1[0]); | |
882 | if (obj->flags & (REMOTE | PUSHING)) | |
1a703cba | 883 | return 0; |
aa1dbc98 NH |
884 | target = find_sha1_pack(obj->sha1, remote->packs); |
885 | if (target) { | |
886 | obj->flags |= REMOTE; | |
1a703cba | 887 | return 0; |
aa1dbc98 | 888 | } |
58e60dd2 | 889 | |
aa1dbc98 | 890 | obj->flags |= PUSHING; |
58e60dd2 | 891 | request = xmalloc(sizeof(*request)); |
aa1dbc98 | 892 | request->obj = obj; |
58e60dd2 | 893 | request->url = NULL; |
26349b2e | 894 | request->lock = lock; |
58e60dd2 | 895 | request->headers = NULL; |
197e8951 NH |
896 | request->local_fileno = -1; |
897 | request->local_stream = NULL; | |
aa1dbc98 | 898 | request->state = NEED_PUSH; |
c17fb6ee NH |
899 | request->next = request_queue_head; |
900 | request_queue_head = request; | |
29508e1e | 901 | |
b3ca4e4e | 902 | #ifdef USE_CURL_MULTI |
29508e1e NH |
903 | fill_active_slots(); |
904 | step_active_slots(); | |
b3ca4e4e | 905 | #endif |
1a703cba NH |
906 | |
907 | return 1; | |
58e60dd2 NH |
908 | } |
909 | ||
910 | static int fetch_index(unsigned char *sha1) | |
911 | { | |
912 | char *hex = sha1_to_hex(sha1); | |
913 | char *filename; | |
914 | char *url; | |
915 | char tmpfile[PATH_MAX]; | |
916 | long prev_posn = 0; | |
917 | char range[RANGE_HEADER_SIZE]; | |
918 | struct curl_slist *range_header = NULL; | |
919 | ||
920 | FILE *indexfile; | |
921 | struct active_request_slot *slot; | |
baa7b67d | 922 | struct slot_results results; |
58e60dd2 | 923 | |
c17fb6ee | 924 | /* Don't use the index if the pack isn't there */ |
1a703cba NH |
925 | url = xmalloc(strlen(remote->url) + 64); |
926 | sprintf(url, "%sobjects/pack/pack-%s.pack", remote->url, hex); | |
c17fb6ee | 927 | slot = get_active_slot(); |
baa7b67d | 928 | slot->results = &results; |
c17fb6ee NH |
929 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
930 | curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1); | |
931 | if (start_active_slot(slot)) { | |
932 | run_active_slot(slot); | |
baa7b67d | 933 | if (results.curl_result != CURLE_OK) { |
c17fb6ee NH |
934 | free(url); |
935 | return error("Unable to verify pack %s is available", | |
936 | hex); | |
937 | } | |
938 | } else { | |
939 | return error("Unable to start request"); | |
940 | } | |
941 | ||
58e60dd2 NH |
942 | if (has_pack_index(sha1)) |
943 | return 0; | |
944 | ||
945 | if (push_verbosely) | |
946 | fprintf(stderr, "Getting index for pack %s\n", hex); | |
1a703cba NH |
947 | |
948 | sprintf(url, "%sobjects/pack/pack-%s.idx", remote->url, hex); | |
949 | ||
58e60dd2 NH |
950 | filename = sha1_pack_index_name(sha1); |
951 | snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename); | |
952 | indexfile = fopen(tmpfile, "a"); | |
953 | if (!indexfile) | |
954 | return error("Unable to open local file %s for pack index", | |
955 | filename); | |
956 | ||
957 | slot = get_active_slot(); | |
baa7b67d | 958 | slot->results = &results; |
c17fb6ee NH |
959 | curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0); |
960 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); | |
58e60dd2 NH |
961 | curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile); |
962 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); | |
963 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
964 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header); | |
965 | slot->local = indexfile; | |
966 | ||
967 | /* If there is data present from a previous transfer attempt, | |
968 | resume where it left off */ | |
969 | prev_posn = ftell(indexfile); | |
970 | if (prev_posn>0) { | |
971 | if (push_verbosely) | |
972 | fprintf(stderr, | |
973 | "Resuming fetch of index for pack %s at byte %ld\n", | |
974 | hex, prev_posn); | |
975 | sprintf(range, "Range: bytes=%ld-", prev_posn); | |
976 | range_header = curl_slist_append(range_header, range); | |
977 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, range_header); | |
978 | } | |
979 | ||
980 | if (start_active_slot(slot)) { | |
981 | run_active_slot(slot); | |
baa7b67d | 982 | if (results.curl_result != CURLE_OK) { |
58e60dd2 NH |
983 | free(url); |
984 | fclose(indexfile); | |
985 | return error("Unable to get pack index %s\n%s", url, | |
986 | curl_errorstr); | |
987 | } | |
988 | } else { | |
989 | free(url); | |
7b899967 | 990 | fclose(indexfile); |
58e60dd2 NH |
991 | return error("Unable to start request"); |
992 | } | |
993 | ||
994 | free(url); | |
995 | fclose(indexfile); | |
996 | ||
997 | return move_temp_to_file(tmpfile, filename); | |
998 | } | |
999 | ||
1000 | static int setup_index(unsigned char *sha1) | |
1001 | { | |
1002 | struct packed_git *new_pack; | |
58e60dd2 NH |
1003 | |
1004 | if (fetch_index(sha1)) | |
1005 | return -1; | |
1006 | ||
1007 | new_pack = parse_pack_index(sha1); | |
1008 | new_pack->next = remote->packs; | |
1009 | remote->packs = new_pack; | |
1010 | return 0; | |
1011 | } | |
1012 | ||
f4f440a0 | 1013 | static int fetch_indices(void) |
58e60dd2 NH |
1014 | { |
1015 | unsigned char sha1[20]; | |
1016 | char *url; | |
1017 | struct buffer buffer; | |
1018 | char *data; | |
1019 | int i = 0; | |
1020 | ||
1021 | struct active_request_slot *slot; | |
baa7b67d | 1022 | struct slot_results results; |
58e60dd2 | 1023 | |
90321c10 | 1024 | data = xcalloc(1, 4096); |
58e60dd2 NH |
1025 | buffer.size = 4096; |
1026 | buffer.posn = 0; | |
1027 | buffer.buffer = data; | |
1028 | ||
1029 | if (push_verbosely) | |
1030 | fprintf(stderr, "Getting pack list\n"); | |
1a703cba NH |
1031 | |
1032 | url = xmalloc(strlen(remote->url) + 20); | |
1033 | sprintf(url, "%sobjects/info/packs", remote->url); | |
58e60dd2 NH |
1034 | |
1035 | slot = get_active_slot(); | |
baa7b67d | 1036 | slot->results = &results; |
58e60dd2 | 1037 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
29508e1e | 1038 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
58e60dd2 NH |
1039 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
1040 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); | |
1041 | if (start_active_slot(slot)) { | |
1042 | run_active_slot(slot); | |
baa7b67d | 1043 | if (results.curl_result != CURLE_OK) { |
58e60dd2 NH |
1044 | free(buffer.buffer); |
1045 | free(url); | |
baa7b67d | 1046 | if (results.http_code == 404) |
58e60dd2 NH |
1047 | return 0; |
1048 | else | |
1049 | return error("%s", curl_errorstr); | |
1050 | } | |
1051 | } else { | |
1052 | free(buffer.buffer); | |
1053 | free(url); | |
1054 | return error("Unable to start request"); | |
1055 | } | |
1056 | free(url); | |
1057 | ||
1058 | data = buffer.buffer; | |
1059 | while (i < buffer.posn) { | |
1060 | switch (data[i]) { | |
1061 | case 'P': | |
1062 | i++; | |
1063 | if (i + 52 < buffer.posn && | |
cc44c765 | 1064 | !prefixcmp(data + i, " pack-") && |
1968d77d | 1065 | !prefixcmp(data + i + 46, ".pack\n")) { |
58e60dd2 NH |
1066 | get_sha1_hex(data + i + 6, sha1); |
1067 | setup_index(sha1); | |
1068 | i += 51; | |
1069 | break; | |
1070 | } | |
1071 | default: | |
1072 | while (data[i] != '\n') | |
1073 | i++; | |
1074 | } | |
1075 | i++; | |
1076 | } | |
1077 | ||
1078 | free(buffer.buffer); | |
1079 | return 0; | |
1080 | } | |
1081 | ||
1082 | static inline int needs_quote(int ch) | |
1083 | { | |
cfd432e6 FF |
1084 | if (((ch >= 'A') && (ch <= 'Z')) |
1085 | || ((ch >= 'a') && (ch <= 'z')) | |
1086 | || ((ch >= '0') && (ch <= '9')) | |
1087 | || (ch == '/') | |
1088 | || (ch == '-') | |
1089 | || (ch == '.')) | |
58e60dd2 | 1090 | return 0; |
cfd432e6 | 1091 | return 1; |
58e60dd2 NH |
1092 | } |
1093 | ||
1094 | static inline int hex(int v) | |
1095 | { | |
1096 | if (v < 10) return '0' + v; | |
1097 | else return 'A' + v - 10; | |
1098 | } | |
1099 | ||
1100 | static char *quote_ref_url(const char *base, const char *ref) | |
1101 | { | |
1102 | const char *cp; | |
1103 | char *dp, *qref; | |
1104 | int len, baselen, ch; | |
1105 | ||
1106 | baselen = strlen(base); | |
aa1dbc98 | 1107 | len = baselen + 1; |
58e60dd2 NH |
1108 | for (cp = ref; (ch = *cp) != 0; cp++, len++) |
1109 | if (needs_quote(ch)) | |
1110 | len += 2; /* extra two hex plus replacement % */ | |
1111 | qref = xmalloc(len); | |
1112 | memcpy(qref, base, baselen); | |
aa1dbc98 | 1113 | for (cp = ref, dp = qref + baselen; (ch = *cp) != 0; cp++) { |
58e60dd2 NH |
1114 | if (needs_quote(ch)) { |
1115 | *dp++ = '%'; | |
1116 | *dp++ = hex((ch >> 4) & 0xF); | |
1117 | *dp++ = hex(ch & 0xF); | |
1118 | } | |
1119 | else | |
1120 | *dp++ = ch; | |
1121 | } | |
1122 | *dp = 0; | |
1123 | ||
1124 | return qref; | |
1125 | } | |
1126 | ||
1127 | int fetch_ref(char *ref, unsigned char *sha1) | |
1128 | { | |
1129 | char *url; | |
1130 | char hex[42]; | |
1131 | struct buffer buffer; | |
1132 | char *base = remote->url; | |
1133 | struct active_request_slot *slot; | |
baa7b67d | 1134 | struct slot_results results; |
58e60dd2 NH |
1135 | buffer.size = 41; |
1136 | buffer.posn = 0; | |
1137 | buffer.buffer = hex; | |
1138 | hex[41] = '\0'; | |
baa7b67d | 1139 | |
58e60dd2 NH |
1140 | url = quote_ref_url(base, ref); |
1141 | slot = get_active_slot(); | |
baa7b67d | 1142 | slot->results = &results; |
58e60dd2 | 1143 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); |
29508e1e | 1144 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
58e60dd2 NH |
1145 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); |
1146 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
1147 | if (start_active_slot(slot)) { | |
1148 | run_active_slot(slot); | |
baa7b67d | 1149 | if (results.curl_result != CURLE_OK) |
58e60dd2 NH |
1150 | return error("Couldn't get %s for %s\n%s", |
1151 | url, ref, curl_errorstr); | |
1152 | } else { | |
1153 | return error("Unable to start request"); | |
1154 | } | |
1155 | ||
1156 | hex[40] = '\0'; | |
1157 | get_sha1_hex(hex, sha1); | |
1158 | return 0; | |
1159 | } | |
1160 | ||
aa1dbc98 NH |
1161 | static void one_remote_object(const char *hex) |
1162 | { | |
1163 | unsigned char sha1[20]; | |
1164 | struct object *obj; | |
1165 | ||
1166 | if (get_sha1_hex(hex, sha1) != 0) | |
1167 | return; | |
1168 | ||
1169 | obj = lookup_object(sha1); | |
1170 | if (!obj) | |
1171 | obj = parse_object(sha1); | |
1172 | ||
1173 | /* Ignore remote objects that don't exist locally */ | |
1174 | if (!obj) | |
1175 | return; | |
1176 | ||
1177 | obj->flags |= REMOTE; | |
1178 | if (!object_list_contains(objects, obj)) | |
1f1e895f | 1179 | object_list_insert(obj, &objects); |
aa1dbc98 NH |
1180 | } |
1181 | ||
acf59575 | 1182 | static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed) |
26349b2e | 1183 | { |
acf59575 NH |
1184 | int *lock_flags = (int *)ctx->userData; |
1185 | ||
1186 | if (tag_closed) { | |
1187 | if (!strcmp(ctx->name, DAV_CTX_LOCKENTRY)) { | |
1188 | if ((*lock_flags & DAV_PROP_LOCKEX) && | |
1189 | (*lock_flags & DAV_PROP_LOCKWR)) { | |
1190 | *lock_flags |= DAV_LOCK_OK; | |
1191 | } | |
1192 | *lock_flags &= DAV_LOCK_OK; | |
1193 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_WRITE)) { | |
1194 | *lock_flags |= DAV_PROP_LOCKWR; | |
1195 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_EXCLUSIVE)) { | |
1196 | *lock_flags |= DAV_PROP_LOCKEX; | |
1197 | } | |
1198 | } | |
26349b2e NH |
1199 | } |
1200 | ||
acf59575 | 1201 | static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed) |
26349b2e | 1202 | { |
aa1dbc98 | 1203 | struct remote_lock *lock = (struct remote_lock *)ctx->userData; |
acf59575 NH |
1204 | |
1205 | if (tag_closed && ctx->cdata) { | |
1206 | if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) { | |
1207 | lock->owner = xmalloc(strlen(ctx->cdata) + 1); | |
1208 | strcpy(lock->owner, ctx->cdata); | |
1209 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) { | |
cc44c765 | 1210 | if (!prefixcmp(ctx->cdata, "Second-")) |
acf59575 NH |
1211 | lock->timeout = |
1212 | strtol(ctx->cdata + 7, NULL, 10); | |
1213 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) { | |
cc44c765 | 1214 | if (!prefixcmp(ctx->cdata, "opaquelocktoken:")) { |
3e2f62be | 1215 | lock->token = xmalloc(strlen(ctx->cdata) - 15); |
acf59575 NH |
1216 | strcpy(lock->token, ctx->cdata + 16); |
1217 | } | |
1218 | } | |
26349b2e NH |
1219 | } |
1220 | } | |
1221 | ||
aa1dbc98 | 1222 | static void one_remote_ref(char *refname); |
aa1dbc98 | 1223 | |
26349b2e | 1224 | static void |
acf59575 | 1225 | xml_start_tag(void *userData, const char *name, const char **atts) |
26349b2e | 1226 | { |
acf59575 | 1227 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 1228 | const char *c = strchr(name, ':'); |
acf59575 NH |
1229 | int new_len; |
1230 | ||
1231 | if (c == NULL) | |
1232 | c = name; | |
1233 | else | |
1234 | c++; | |
1235 | ||
1236 | new_len = strlen(ctx->name) + strlen(c) + 2; | |
1237 | ||
1238 | if (new_len > ctx->len) { | |
1239 | ctx->name = xrealloc(ctx->name, new_len); | |
1240 | ctx->len = new_len; | |
26349b2e | 1241 | } |
acf59575 NH |
1242 | strcat(ctx->name, "."); |
1243 | strcat(ctx->name, c); | |
26349b2e | 1244 | |
4cac42b1 JH |
1245 | free(ctx->cdata); |
1246 | ctx->cdata = NULL; | |
acf59575 NH |
1247 | |
1248 | ctx->userFunc(ctx, 0); | |
26349b2e NH |
1249 | } |
1250 | ||
58e60dd2 | 1251 | static void |
acf59575 | 1252 | xml_end_tag(void *userData, const char *name) |
58e60dd2 | 1253 | { |
acf59575 | 1254 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 1255 | const char *c = strchr(name, ':'); |
acf59575 | 1256 | char *ep; |
58e60dd2 | 1257 | |
acf59575 NH |
1258 | ctx->userFunc(ctx, 1); |
1259 | ||
1260 | if (c == NULL) | |
1261 | c = name; | |
1262 | else | |
1263 | c++; | |
1264 | ||
1265 | ep = ctx->name + strlen(ctx->name) - strlen(c) - 1; | |
1266 | *ep = 0; | |
58e60dd2 NH |
1267 | } |
1268 | ||
1269 | static void | |
acf59575 | 1270 | xml_cdata(void *userData, const XML_Char *s, int len) |
58e60dd2 | 1271 | { |
acf59575 | 1272 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
4cac42b1 | 1273 | free(ctx->cdata); |
bfbd0bb6 | 1274 | ctx->cdata = xmalloc(len + 1); |
eecc8367 ER |
1275 | /* NB: 's' is not null-terminated, can not use strlcpy here */ |
1276 | memcpy(ctx->cdata, s, len); | |
1277 | ctx->cdata[len] = '\0'; | |
58e60dd2 NH |
1278 | } |
1279 | ||
554fe20d | 1280 | static struct remote_lock *lock_remote(const char *path, long timeout) |
58e60dd2 NH |
1281 | { |
1282 | struct active_request_slot *slot; | |
baa7b67d | 1283 | struct slot_results results; |
58e60dd2 | 1284 | struct buffer out_buffer; |
26349b2e | 1285 | struct buffer in_buffer; |
58e60dd2 | 1286 | char *out_data; |
26349b2e | 1287 | char *in_data; |
58e60dd2 | 1288 | char *url; |
0772b9a6 | 1289 | char *ep; |
58e60dd2 | 1290 | char timeout_header[25]; |
512d632c | 1291 | struct remote_lock *lock = NULL; |
26349b2e NH |
1292 | XML_Parser parser = XML_ParserCreate(NULL); |
1293 | enum XML_Status result; | |
58e60dd2 | 1294 | struct curl_slist *dav_headers = NULL; |
acf59575 | 1295 | struct xml_ctx ctx; |
58e60dd2 | 1296 | |
aa1dbc98 NH |
1297 | url = xmalloc(strlen(remote->url) + strlen(path) + 1); |
1298 | sprintf(url, "%s%s", remote->url, path); | |
1299 | ||
0772b9a6 | 1300 | /* Make sure leading directories exist for the remote ref */ |
2c46759d | 1301 | ep = strchr(url + strlen(remote->url) + 1, '/'); |
0772b9a6 NH |
1302 | while (ep) { |
1303 | *ep = 0; | |
1304 | slot = get_active_slot(); | |
baa7b67d | 1305 | slot->results = &results; |
0772b9a6 NH |
1306 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); |
1307 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
1308 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_MKCOL); | |
1309 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
1310 | if (start_active_slot(slot)) { | |
1311 | run_active_slot(slot); | |
baa7b67d NH |
1312 | if (results.curl_result != CURLE_OK && |
1313 | results.http_code != 405) { | |
0772b9a6 NH |
1314 | fprintf(stderr, |
1315 | "Unable to create branch path %s\n", | |
1316 | url); | |
1317 | free(url); | |
1318 | return NULL; | |
1319 | } | |
1320 | } else { | |
1a703cba | 1321 | fprintf(stderr, "Unable to start MKCOL request\n"); |
0772b9a6 NH |
1322 | free(url); |
1323 | return NULL; | |
1324 | } | |
1325 | *ep = '/'; | |
1326 | ep = strchr(ep + 1, '/'); | |
1327 | } | |
1328 | ||
58e60dd2 NH |
1329 | out_buffer.size = strlen(LOCK_REQUEST) + strlen(git_default_email) - 2; |
1330 | out_data = xmalloc(out_buffer.size + 1); | |
1331 | snprintf(out_data, out_buffer.size + 1, LOCK_REQUEST, git_default_email); | |
1332 | out_buffer.posn = 0; | |
1333 | out_buffer.buffer = out_data; | |
1334 | ||
26349b2e NH |
1335 | in_buffer.size = 4096; |
1336 | in_data = xmalloc(in_buffer.size); | |
1337 | in_buffer.posn = 0; | |
1338 | in_buffer.buffer = in_data; | |
1339 | ||
75187c9d | 1340 | sprintf(timeout_header, "Timeout: Second-%ld", timeout); |
58e60dd2 NH |
1341 | dav_headers = curl_slist_append(dav_headers, timeout_header); |
1342 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
1343 | ||
1344 | slot = get_active_slot(); | |
baa7b67d | 1345 | slot->results = &results; |
58e60dd2 NH |
1346 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer); |
1347 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.size); | |
1348 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
26349b2e | 1349 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
29508e1e | 1350 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
58e60dd2 NH |
1351 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); |
1352 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
1353 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_LOCK); | |
1354 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
1355 | ||
aa1dbc98 | 1356 | lock = xcalloc(1, sizeof(*lock)); |
aa1dbc98 | 1357 | lock->timeout = -1; |
acf59575 | 1358 | |
58e60dd2 NH |
1359 | if (start_active_slot(slot)) { |
1360 | run_active_slot(slot); | |
baa7b67d | 1361 | if (results.curl_result == CURLE_OK) { |
acf59575 NH |
1362 | ctx.name = xcalloc(10, 1); |
1363 | ctx.len = 0; | |
1364 | ctx.cdata = NULL; | |
1365 | ctx.userFunc = handle_new_lock_ctx; | |
aa1dbc98 | 1366 | ctx.userData = lock; |
acf59575 NH |
1367 | XML_SetUserData(parser, &ctx); |
1368 | XML_SetElementHandler(parser, xml_start_tag, | |
1369 | xml_end_tag); | |
1370 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
1371 | result = XML_Parse(parser, in_buffer.buffer, | |
1372 | in_buffer.posn, 1); | |
1373 | free(ctx.name); | |
1374 | if (result != XML_STATUS_OK) { | |
1375 | fprintf(stderr, "XML error: %s\n", | |
1376 | XML_ErrorString( | |
1377 | XML_GetErrorCode(parser))); | |
aa1dbc98 | 1378 | lock->timeout = -1; |
acf59575 | 1379 | } |
58e60dd2 NH |
1380 | } |
1381 | } else { | |
1a703cba | 1382 | fprintf(stderr, "Unable to start LOCK request\n"); |
58e60dd2 NH |
1383 | } |
1384 | ||
acf59575 | 1385 | curl_slist_free_all(dav_headers); |
0772b9a6 | 1386 | free(out_data); |
26349b2e | 1387 | free(in_data); |
26349b2e | 1388 | |
aa1dbc98 NH |
1389 | if (lock->token == NULL || lock->timeout <= 0) { |
1390 | if (lock->token != NULL) | |
1391 | free(lock->token); | |
1392 | if (lock->owner != NULL) | |
1393 | free(lock->owner); | |
75187c9d | 1394 | free(url); |
aa1dbc98 NH |
1395 | free(lock); |
1396 | lock = NULL; | |
acf59575 | 1397 | } else { |
aa1dbc98 | 1398 | lock->url = url; |
aa1dbc98 | 1399 | lock->start_time = time(NULL); |
512d632c NH |
1400 | lock->next = remote->locks; |
1401 | remote->locks = lock; | |
26349b2e NH |
1402 | } |
1403 | ||
aa1dbc98 | 1404 | return lock; |
58e60dd2 NH |
1405 | } |
1406 | ||
aa1dbc98 | 1407 | static int unlock_remote(struct remote_lock *lock) |
58e60dd2 NH |
1408 | { |
1409 | struct active_request_slot *slot; | |
baa7b67d | 1410 | struct slot_results results; |
512d632c | 1411 | struct remote_lock *prev = remote->locks; |
58e60dd2 NH |
1412 | char *lock_token_header; |
1413 | struct curl_slist *dav_headers = NULL; | |
1414 | int rc = 0; | |
1415 | ||
26349b2e | 1416 | lock_token_header = xmalloc(strlen(lock->token) + 31); |
58e60dd2 | 1417 | sprintf(lock_token_header, "Lock-Token: <opaquelocktoken:%s>", |
26349b2e | 1418 | lock->token); |
58e60dd2 NH |
1419 | dav_headers = curl_slist_append(dav_headers, lock_token_header); |
1420 | ||
1421 | slot = get_active_slot(); | |
baa7b67d | 1422 | slot->results = &results; |
58e60dd2 | 1423 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); |
75187c9d | 1424 | curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url); |
58e60dd2 NH |
1425 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_UNLOCK); |
1426 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
1427 | ||
1428 | if (start_active_slot(slot)) { | |
1429 | run_active_slot(slot); | |
baa7b67d | 1430 | if (results.curl_result == CURLE_OK) |
58e60dd2 NH |
1431 | rc = 1; |
1432 | else | |
512d632c | 1433 | fprintf(stderr, "UNLOCK HTTP error %ld\n", |
baa7b67d | 1434 | results.http_code); |
58e60dd2 | 1435 | } else { |
512d632c | 1436 | fprintf(stderr, "Unable to start UNLOCK request\n"); |
58e60dd2 NH |
1437 | } |
1438 | ||
1439 | curl_slist_free_all(dav_headers); | |
1440 | free(lock_token_header); | |
75187c9d | 1441 | |
512d632c NH |
1442 | if (remote->locks == lock) { |
1443 | remote->locks = lock->next; | |
1444 | } else { | |
1445 | while (prev && prev->next != lock) | |
1446 | prev = prev->next; | |
1447 | if (prev) | |
1448 | prev->next = prev->next->next; | |
1449 | } | |
1450 | ||
1451 | if (lock->owner != NULL) | |
1452 | free(lock->owner); | |
1453 | free(lock->url); | |
1454 | free(lock->token); | |
1455 | free(lock); | |
58e60dd2 NH |
1456 | |
1457 | return rc; | |
1458 | } | |
1459 | ||
3030baa7 NH |
1460 | static void remote_ls(const char *path, int flags, |
1461 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1462 | void *userData); | |
aa1dbc98 | 1463 | |
3030baa7 NH |
1464 | static void process_ls_object(struct remote_ls_ctx *ls) |
1465 | { | |
1466 | unsigned int *parent = (unsigned int *)ls->userData; | |
1467 | char *path = ls->dentry_name; | |
1468 | char *obj_hex; | |
aa1dbc98 | 1469 | |
3030baa7 NH |
1470 | if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) { |
1471 | remote_dir_exists[*parent] = 1; | |
1472 | return; | |
1473 | } | |
aa1dbc98 | 1474 | |
3030baa7 NH |
1475 | if (strlen(path) != 49) |
1476 | return; | |
1477 | path += 8; | |
1478 | obj_hex = xmalloc(strlen(path)); | |
eecc8367 ER |
1479 | /* NB: path is not null-terminated, can not use strlcpy here */ |
1480 | memcpy(obj_hex, path, 2); | |
3030baa7 NH |
1481 | strcpy(obj_hex + 2, path + 3); |
1482 | one_remote_object(obj_hex); | |
1483 | free(obj_hex); | |
1484 | } | |
aa1dbc98 | 1485 | |
3030baa7 NH |
1486 | static void process_ls_ref(struct remote_ls_ctx *ls) |
1487 | { | |
1488 | if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) { | |
1489 | fprintf(stderr, " %s\n", ls->dentry_name); | |
1490 | return; | |
1491 | } | |
aa1dbc98 | 1492 | |
3030baa7 NH |
1493 | if (!(ls->dentry_flags & IS_DIR)) |
1494 | one_remote_ref(ls->dentry_name); | |
1495 | } | |
aa1dbc98 | 1496 | |
3030baa7 NH |
1497 | static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) |
1498 | { | |
1499 | struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData; | |
aa1dbc98 | 1500 | |
3030baa7 NH |
1501 | if (tag_closed) { |
1502 | if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) { | |
1503 | if (ls->dentry_flags & IS_DIR) { | |
1504 | if (ls->flags & PROCESS_DIRS) { | |
1505 | ls->userFunc(ls); | |
1506 | } | |
1507 | if (strcmp(ls->dentry_name, ls->path) && | |
1508 | ls->flags & RECURSIVE) { | |
1509 | remote_ls(ls->dentry_name, | |
1510 | ls->flags, | |
1511 | ls->userFunc, | |
1512 | ls->userData); | |
1513 | } | |
1514 | } else if (ls->flags & PROCESS_FILES) { | |
1515 | ls->userFunc(ls); | |
aa1dbc98 | 1516 | } |
3030baa7 NH |
1517 | } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { |
1518 | ls->dentry_name = xmalloc(strlen(ctx->cdata) - | |
1519 | remote->path_len + 1); | |
1520 | strcpy(ls->dentry_name, ctx->cdata + remote->path_len); | |
1521 | } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { | |
1522 | ls->dentry_flags |= IS_DIR; | |
aa1dbc98 | 1523 | } |
3030baa7 | 1524 | } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) { |
4cac42b1 | 1525 | free(ls->dentry_name); |
3030baa7 NH |
1526 | ls->dentry_name = NULL; |
1527 | ls->dentry_flags = 0; | |
aa1dbc98 | 1528 | } |
aa1dbc98 NH |
1529 | } |
1530 | ||
3030baa7 NH |
1531 | static void remote_ls(const char *path, int flags, |
1532 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1533 | void *userData) | |
aa1dbc98 | 1534 | { |
3030baa7 | 1535 | char *url = xmalloc(strlen(remote->url) + strlen(path) + 1); |
aa1dbc98 | 1536 | struct active_request_slot *slot; |
baa7b67d | 1537 | struct slot_results results; |
aa1dbc98 NH |
1538 | struct buffer in_buffer; |
1539 | struct buffer out_buffer; | |
1540 | char *in_data; | |
1541 | char *out_data; | |
1542 | XML_Parser parser = XML_ParserCreate(NULL); | |
1543 | enum XML_Status result; | |
1544 | struct curl_slist *dav_headers = NULL; | |
1545 | struct xml_ctx ctx; | |
3030baa7 NH |
1546 | struct remote_ls_ctx ls; |
1547 | ||
1548 | ls.flags = flags; | |
9befac47 | 1549 | ls.path = xstrdup(path); |
3030baa7 NH |
1550 | ls.dentry_name = NULL; |
1551 | ls.dentry_flags = 0; | |
1552 | ls.userData = userData; | |
1553 | ls.userFunc = userFunc; | |
aa1dbc98 | 1554 | |
aa1dbc98 NH |
1555 | sprintf(url, "%s%s", remote->url, path); |
1556 | ||
1557 | out_buffer.size = strlen(PROPFIND_ALL_REQUEST); | |
1558 | out_data = xmalloc(out_buffer.size + 1); | |
1559 | snprintf(out_data, out_buffer.size + 1, PROPFIND_ALL_REQUEST); | |
1560 | out_buffer.posn = 0; | |
1561 | out_buffer.buffer = out_data; | |
1562 | ||
1563 | in_buffer.size = 4096; | |
1564 | in_data = xmalloc(in_buffer.size); | |
1565 | in_buffer.posn = 0; | |
1566 | in_buffer.buffer = in_data; | |
1567 | ||
1568 | dav_headers = curl_slist_append(dav_headers, "Depth: 1"); | |
1569 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
1570 | ||
1571 | slot = get_active_slot(); | |
baa7b67d | 1572 | slot->results = &results; |
aa1dbc98 NH |
1573 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer); |
1574 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.size); | |
1575 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
1576 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); | |
1577 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); | |
1578 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
1579 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
1580 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PROPFIND); | |
1581 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
1582 | ||
1583 | if (start_active_slot(slot)) { | |
1584 | run_active_slot(slot); | |
baa7b67d | 1585 | if (results.curl_result == CURLE_OK) { |
aa1dbc98 NH |
1586 | ctx.name = xcalloc(10, 1); |
1587 | ctx.len = 0; | |
1588 | ctx.cdata = NULL; | |
3030baa7 NH |
1589 | ctx.userFunc = handle_remote_ls_ctx; |
1590 | ctx.userData = &ls; | |
aa1dbc98 NH |
1591 | XML_SetUserData(parser, &ctx); |
1592 | XML_SetElementHandler(parser, xml_start_tag, | |
1593 | xml_end_tag); | |
1594 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
1595 | result = XML_Parse(parser, in_buffer.buffer, | |
1596 | in_buffer.posn, 1); | |
1597 | free(ctx.name); | |
1598 | ||
1599 | if (result != XML_STATUS_OK) { | |
1600 | fprintf(stderr, "XML error: %s\n", | |
1601 | XML_ErrorString( | |
1602 | XML_GetErrorCode(parser))); | |
1603 | } | |
aa1dbc98 NH |
1604 | } |
1605 | } else { | |
3030baa7 | 1606 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
aa1dbc98 NH |
1607 | } |
1608 | ||
3030baa7 | 1609 | free(ls.path); |
aa1dbc98 NH |
1610 | free(url); |
1611 | free(out_data); | |
1612 | free(in_buffer.buffer); | |
1613 | curl_slist_free_all(dav_headers); | |
1614 | } | |
1615 | ||
3030baa7 NH |
1616 | static void get_remote_object_list(unsigned char parent) |
1617 | { | |
1618 | char path[] = "objects/XX/"; | |
1619 | static const char hex[] = "0123456789abcdef"; | |
1620 | unsigned int val = parent; | |
1621 | ||
1622 | path[8] = hex[val >> 4]; | |
1623 | path[9] = hex[val & 0xf]; | |
1624 | remote_dir_exists[val] = 0; | |
1625 | remote_ls(path, (PROCESS_FILES | PROCESS_DIRS), | |
1626 | process_ls_object, &val); | |
1627 | } | |
1628 | ||
acf59575 | 1629 | static int locking_available(void) |
58e60dd2 NH |
1630 | { |
1631 | struct active_request_slot *slot; | |
baa7b67d | 1632 | struct slot_results results; |
58e60dd2 NH |
1633 | struct buffer in_buffer; |
1634 | struct buffer out_buffer; | |
1635 | char *in_data; | |
1636 | char *out_data; | |
1637 | XML_Parser parser = XML_ParserCreate(NULL); | |
1638 | enum XML_Status result; | |
58e60dd2 | 1639 | struct curl_slist *dav_headers = NULL; |
acf59575 NH |
1640 | struct xml_ctx ctx; |
1641 | int lock_flags = 0; | |
58e60dd2 | 1642 | |
aa1dbc98 NH |
1643 | out_buffer.size = |
1644 | strlen(PROPFIND_SUPPORTEDLOCK_REQUEST) + | |
1645 | strlen(remote->url) - 2; | |
58e60dd2 | 1646 | out_data = xmalloc(out_buffer.size + 1); |
aa1dbc98 NH |
1647 | snprintf(out_data, out_buffer.size + 1, |
1648 | PROPFIND_SUPPORTEDLOCK_REQUEST, remote->url); | |
58e60dd2 NH |
1649 | out_buffer.posn = 0; |
1650 | out_buffer.buffer = out_data; | |
1651 | ||
1652 | in_buffer.size = 4096; | |
1653 | in_data = xmalloc(in_buffer.size); | |
1654 | in_buffer.posn = 0; | |
1655 | in_buffer.buffer = in_data; | |
1656 | ||
1657 | dav_headers = curl_slist_append(dav_headers, "Depth: 0"); | |
1658 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
baa7b67d | 1659 | |
58e60dd2 | 1660 | slot = get_active_slot(); |
baa7b67d | 1661 | slot->results = &results; |
58e60dd2 NH |
1662 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer); |
1663 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.size); | |
1664 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
1665 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); | |
29508e1e | 1666 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); |
58e60dd2 NH |
1667 | curl_easy_setopt(slot->curl, CURLOPT_URL, remote->url); |
1668 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
1669 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PROPFIND); | |
1670 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
1671 | ||
1672 | if (start_active_slot(slot)) { | |
1673 | run_active_slot(slot); | |
baa7b67d | 1674 | if (results.curl_result == CURLE_OK) { |
acf59575 NH |
1675 | ctx.name = xcalloc(10, 1); |
1676 | ctx.len = 0; | |
1677 | ctx.cdata = NULL; | |
1678 | ctx.userFunc = handle_lockprop_ctx; | |
1679 | ctx.userData = &lock_flags; | |
1680 | XML_SetUserData(parser, &ctx); | |
1681 | XML_SetElementHandler(parser, xml_start_tag, | |
1682 | xml_end_tag); | |
1683 | result = XML_Parse(parser, in_buffer.buffer, | |
1684 | in_buffer.posn, 1); | |
1685 | free(ctx.name); | |
1686 | ||
1687 | if (result != XML_STATUS_OK) { | |
1688 | fprintf(stderr, "XML error: %s\n", | |
1689 | XML_ErrorString( | |
1690 | XML_GetErrorCode(parser))); | |
1691 | lock_flags = 0; | |
1692 | } | |
58e60dd2 | 1693 | } |
58e60dd2 | 1694 | } else { |
1a703cba | 1695 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
58e60dd2 NH |
1696 | } |
1697 | ||
acf59575 NH |
1698 | free(out_data); |
1699 | free(in_buffer.buffer); | |
1700 | curl_slist_free_all(dav_headers); | |
1701 | ||
1702 | return lock_flags; | |
58e60dd2 NH |
1703 | } |
1704 | ||
b5bf7cd6 | 1705 | static struct object_list **add_one_object(struct object *obj, struct object_list **p) |
1f1e895f LT |
1706 | { |
1707 | struct object_list *entry = xmalloc(sizeof(struct object_list)); | |
1708 | entry->item = obj; | |
1709 | entry->next = *p; | |
1710 | *p = entry; | |
1711 | return &entry->next; | |
1712 | } | |
1713 | ||
aa1dbc98 NH |
1714 | static struct object_list **process_blob(struct blob *blob, |
1715 | struct object_list **p, | |
1716 | struct name_path *path, | |
1717 | const char *name) | |
58e60dd2 | 1718 | { |
aa1dbc98 | 1719 | struct object *obj = &blob->object; |
58e60dd2 | 1720 | |
aa1dbc98 NH |
1721 | obj->flags |= LOCAL; |
1722 | ||
1723 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1724 | return p; | |
1725 | ||
1726 | obj->flags |= SEEN; | |
1f1e895f | 1727 | return add_one_object(obj, p); |
aa1dbc98 NH |
1728 | } |
1729 | ||
1730 | static struct object_list **process_tree(struct tree *tree, | |
1731 | struct object_list **p, | |
1732 | struct name_path *path, | |
1733 | const char *name) | |
1734 | { | |
1735 | struct object *obj = &tree->object; | |
2d9c58c6 | 1736 | struct tree_desc desc; |
4c068a98 | 1737 | struct name_entry entry; |
aa1dbc98 NH |
1738 | struct name_path me; |
1739 | ||
1740 | obj->flags |= LOCAL; | |
1741 | ||
1742 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1743 | return p; | |
1744 | if (parse_tree(tree) < 0) | |
1745 | die("bad tree object %s", sha1_to_hex(obj->sha1)); | |
1746 | ||
1747 | obj->flags |= SEEN; | |
9befac47 | 1748 | name = xstrdup(name); |
1f1e895f | 1749 | p = add_one_object(obj, p); |
aa1dbc98 NH |
1750 | me.up = path; |
1751 | me.elem = name; | |
1752 | me.elem_len = strlen(name); | |
2d9c58c6 | 1753 | |
6fda5e51 | 1754 | init_tree_desc(&desc, tree->buffer, tree->size); |
2d9c58c6 | 1755 | |
4c068a98 LT |
1756 | while (tree_entry(&desc, &entry)) { |
1757 | if (S_ISDIR(entry.mode)) | |
1758 | p = process_tree(lookup_tree(entry.sha1), p, &me, name); | |
aa1dbc98 | 1759 | else |
4c068a98 | 1760 | p = process_blob(lookup_blob(entry.sha1), p, &me, name); |
58e60dd2 | 1761 | } |
2d9c58c6 LT |
1762 | free(tree->buffer); |
1763 | tree->buffer = NULL; | |
aa1dbc98 | 1764 | return p; |
58e60dd2 NH |
1765 | } |
1766 | ||
1a703cba | 1767 | static int get_delta(struct rev_info *revs, struct remote_lock *lock) |
58e60dd2 | 1768 | { |
1f1e895f | 1769 | int i; |
58e60dd2 | 1770 | struct commit *commit; |
1f1e895f | 1771 | struct object_list **p = &objects; |
1a703cba | 1772 | int count = 0; |
58e60dd2 | 1773 | |
aa1dbc98 NH |
1774 | while ((commit = get_revision(revs)) != NULL) { |
1775 | p = process_tree(commit->tree, p, NULL, ""); | |
1776 | commit->object.flags |= LOCAL; | |
1777 | if (!(commit->object.flags & UNINTERESTING)) | |
1a703cba | 1778 | count += add_send_request(&commit->object, lock); |
aa1dbc98 | 1779 | } |
58e60dd2 | 1780 | |
1f1e895f LT |
1781 | for (i = 0; i < revs->pending.nr; i++) { |
1782 | struct object_array_entry *entry = revs->pending.objects + i; | |
1783 | struct object *obj = entry->item; | |
1784 | const char *name = entry->name; | |
58e60dd2 | 1785 | |
aa1dbc98 NH |
1786 | if (obj->flags & (UNINTERESTING | SEEN)) |
1787 | continue; | |
1974632c | 1788 | if (obj->type == OBJ_TAG) { |
aa1dbc98 | 1789 | obj->flags |= SEEN; |
1f1e895f | 1790 | p = add_one_object(obj, p); |
aa1dbc98 | 1791 | continue; |
58e60dd2 | 1792 | } |
1974632c | 1793 | if (obj->type == OBJ_TREE) { |
aa1dbc98 NH |
1794 | p = process_tree((struct tree *)obj, p, NULL, name); |
1795 | continue; | |
58e60dd2 | 1796 | } |
1974632c | 1797 | if (obj->type == OBJ_BLOB) { |
aa1dbc98 NH |
1798 | p = process_blob((struct blob *)obj, p, NULL, name); |
1799 | continue; | |
58e60dd2 | 1800 | } |
aa1dbc98 NH |
1801 | die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); |
1802 | } | |
1803 | ||
1804 | while (objects) { | |
1805 | if (!(objects->item->flags & UNINTERESTING)) | |
1a703cba | 1806 | count += add_send_request(objects->item, lock); |
aa1dbc98 | 1807 | objects = objects->next; |
58e60dd2 | 1808 | } |
1a703cba NH |
1809 | |
1810 | return count; | |
58e60dd2 NH |
1811 | } |
1812 | ||
aa1dbc98 | 1813 | static int update_remote(unsigned char *sha1, struct remote_lock *lock) |
58e60dd2 NH |
1814 | { |
1815 | struct active_request_slot *slot; | |
baa7b67d | 1816 | struct slot_results results; |
58e60dd2 NH |
1817 | char *out_data; |
1818 | char *if_header; | |
1819 | struct buffer out_buffer; | |
1820 | struct curl_slist *dav_headers = NULL; | |
1821 | int i; | |
1822 | ||
26349b2e NH |
1823 | if_header = xmalloc(strlen(lock->token) + 25); |
1824 | sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token); | |
58e60dd2 NH |
1825 | dav_headers = curl_slist_append(dav_headers, if_header); |
1826 | ||
1827 | out_buffer.size = 41; | |
1828 | out_data = xmalloc(out_buffer.size + 1); | |
1829 | i = snprintf(out_data, out_buffer.size + 1, "%s\n", sha1_to_hex(sha1)); | |
1830 | if (i != out_buffer.size) { | |
1831 | fprintf(stderr, "Unable to initialize PUT request body\n"); | |
1832 | return 0; | |
1833 | } | |
1834 | out_buffer.posn = 0; | |
1835 | out_buffer.buffer = out_data; | |
1836 | ||
1837 | slot = get_active_slot(); | |
baa7b67d | 1838 | slot->results = &results; |
58e60dd2 NH |
1839 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &out_buffer); |
1840 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, out_buffer.size); | |
1841 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
1842 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
1843 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT); | |
1844 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
1845 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
1846 | curl_easy_setopt(slot->curl, CURLOPT_PUT, 1); | |
75187c9d | 1847 | curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url); |
58e60dd2 NH |
1848 | |
1849 | if (start_active_slot(slot)) { | |
1850 | run_active_slot(slot); | |
1851 | free(out_data); | |
1852 | free(if_header); | |
baa7b67d | 1853 | if (results.curl_result != CURLE_OK) { |
58e60dd2 NH |
1854 | fprintf(stderr, |
1855 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
baa7b67d | 1856 | results.curl_result, results.http_code); |
58e60dd2 NH |
1857 | /* We should attempt recovery? */ |
1858 | return 0; | |
1859 | } | |
1860 | } else { | |
1861 | free(out_data); | |
1862 | free(if_header); | |
58e60dd2 NH |
1863 | fprintf(stderr, "Unable to start PUT request\n"); |
1864 | return 0; | |
1865 | } | |
1866 | ||
1867 | return 1; | |
1868 | } | |
1869 | ||
aa1dbc98 NH |
1870 | static struct ref *local_refs, **local_tail; |
1871 | static struct ref *remote_refs, **remote_tail; | |
1872 | ||
8da19775 | 1873 | static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
aa1dbc98 NH |
1874 | { |
1875 | struct ref *ref; | |
1876 | int len = strlen(refname) + 1; | |
1877 | ref = xcalloc(1, sizeof(*ref) + len); | |
e702496e | 1878 | hashcpy(ref->new_sha1, sha1); |
aa1dbc98 NH |
1879 | memcpy(ref->name, refname, len); |
1880 | *local_tail = ref; | |
1881 | local_tail = &ref->next; | |
1882 | return 0; | |
1883 | } | |
1884 | ||
1885 | static void one_remote_ref(char *refname) | |
1886 | { | |
1887 | struct ref *ref; | |
1888 | unsigned char remote_sha1[20]; | |
197e8951 | 1889 | struct object *obj; |
8c9e7947 | 1890 | int len = strlen(refname) + 1; |
aa1dbc98 NH |
1891 | |
1892 | if (fetch_ref(refname, remote_sha1) != 0) { | |
1893 | fprintf(stderr, | |
1894 | "Unable to fetch ref %s from %s\n", | |
1895 | refname, remote->url); | |
1896 | return; | |
1897 | } | |
1898 | ||
197e8951 NH |
1899 | /* |
1900 | * Fetch a copy of the object if it doesn't exist locally - it | |
1901 | * may be required for updating server info later. | |
1902 | */ | |
1903 | if (remote->can_update_info_refs && !has_sha1_file(remote_sha1)) { | |
1904 | obj = lookup_unknown_object(remote_sha1); | |
1905 | if (obj) { | |
1906 | fprintf(stderr, " fetch %s for %s\n", | |
1907 | sha1_to_hex(remote_sha1), refname); | |
1908 | add_fetch_request(obj); | |
1909 | } | |
1910 | } | |
1911 | ||
aa1dbc98 | 1912 | ref = xcalloc(1, sizeof(*ref) + len); |
e702496e | 1913 | hashcpy(ref->old_sha1, remote_sha1); |
aa1dbc98 NH |
1914 | memcpy(ref->name, refname, len); |
1915 | *remote_tail = ref; | |
1916 | remote_tail = &ref->next; | |
1917 | } | |
1918 | ||
1919 | static void get_local_heads(void) | |
1920 | { | |
1921 | local_tail = &local_refs; | |
cb5d709f | 1922 | for_each_ref(one_local_ref, NULL); |
aa1dbc98 NH |
1923 | } |
1924 | ||
1925 | static void get_dav_remote_heads(void) | |
1926 | { | |
1927 | remote_tail = &remote_refs; | |
3030baa7 | 1928 | remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL); |
aa1dbc98 NH |
1929 | } |
1930 | ||
1931 | static int is_zero_sha1(const unsigned char *sha1) | |
1932 | { | |
1933 | int i; | |
1934 | ||
1935 | for (i = 0; i < 20; i++) { | |
1936 | if (*sha1++) | |
1937 | return 0; | |
1938 | } | |
1939 | return 1; | |
1940 | } | |
1941 | ||
1942 | static void unmark_and_free(struct commit_list *list, unsigned int mark) | |
1943 | { | |
1944 | while (list) { | |
1945 | struct commit_list *temp = list; | |
1946 | temp->item->object.flags &= ~mark; | |
1947 | list = temp->next; | |
1948 | free(temp); | |
1949 | } | |
1950 | } | |
1951 | ||
1952 | static int ref_newer(const unsigned char *new_sha1, | |
1953 | const unsigned char *old_sha1) | |
1954 | { | |
1955 | struct object *o; | |
1956 | struct commit *old, *new; | |
1957 | struct commit_list *list, *used; | |
1958 | int found = 0; | |
1959 | ||
1960 | /* Both new and old must be commit-ish and new is descendant of | |
1961 | * old. Otherwise we require --force. | |
1962 | */ | |
1963 | o = deref_tag(parse_object(old_sha1), NULL, 0); | |
1974632c | 1964 | if (!o || o->type != OBJ_COMMIT) |
aa1dbc98 NH |
1965 | return 0; |
1966 | old = (struct commit *) o; | |
1967 | ||
1968 | o = deref_tag(parse_object(new_sha1), NULL, 0); | |
1974632c | 1969 | if (!o || o->type != OBJ_COMMIT) |
aa1dbc98 NH |
1970 | return 0; |
1971 | new = (struct commit *) o; | |
1972 | ||
1973 | if (parse_commit(new) < 0) | |
1974 | return 0; | |
1975 | ||
1976 | used = list = NULL; | |
1977 | commit_list_insert(new, &list); | |
1978 | while (list) { | |
1979 | new = pop_most_recent_commit(&list, TMP_MARK); | |
1980 | commit_list_insert(new, &used); | |
1981 | if (new == old) { | |
1982 | found = 1; | |
1983 | break; | |
1984 | } | |
1985 | } | |
1986 | unmark_and_free(list, TMP_MARK); | |
1987 | unmark_and_free(used, TMP_MARK); | |
1988 | return found; | |
1989 | } | |
1990 | ||
1991 | static void mark_edge_parents_uninteresting(struct commit *commit) | |
1992 | { | |
1993 | struct commit_list *parents; | |
1994 | ||
1995 | for (parents = commit->parents; parents; parents = parents->next) { | |
1996 | struct commit *parent = parents->item; | |
1997 | if (!(parent->object.flags & UNINTERESTING)) | |
1998 | continue; | |
1999 | mark_tree_uninteresting(parent->tree); | |
2000 | } | |
2001 | } | |
2002 | ||
2003 | static void mark_edges_uninteresting(struct commit_list *list) | |
2004 | { | |
2005 | for ( ; list; list = list->next) { | |
2006 | struct commit *commit = list->item; | |
2007 | ||
2008 | if (commit->object.flags & UNINTERESTING) { | |
2009 | mark_tree_uninteresting(commit->tree); | |
2010 | continue; | |
2011 | } | |
2012 | mark_edge_parents_uninteresting(commit); | |
2013 | } | |
2014 | } | |
2015 | ||
197e8951 NH |
2016 | static void add_remote_info_ref(struct remote_ls_ctx *ls) |
2017 | { | |
2018 | struct buffer *buf = (struct buffer *)ls->userData; | |
2019 | unsigned char remote_sha1[20]; | |
2020 | struct object *o; | |
2021 | int len; | |
2022 | char *ref_info; | |
2023 | ||
2024 | if (fetch_ref(ls->dentry_name, remote_sha1) != 0) { | |
2025 | fprintf(stderr, | |
2026 | "Unable to fetch ref %s from %s\n", | |
2027 | ls->dentry_name, remote->url); | |
2028 | aborted = 1; | |
2029 | return; | |
2030 | } | |
2031 | ||
2032 | o = parse_object(remote_sha1); | |
2033 | if (!o) { | |
2034 | fprintf(stderr, | |
2035 | "Unable to parse object %s for remote ref %s\n", | |
2036 | sha1_to_hex(remote_sha1), ls->dentry_name); | |
2037 | aborted = 1; | |
2038 | return; | |
2039 | } | |
2040 | ||
2041 | len = strlen(ls->dentry_name) + 42; | |
2042 | ref_info = xcalloc(len + 1, 1); | |
2043 | sprintf(ref_info, "%s %s\n", | |
2044 | sha1_to_hex(remote_sha1), ls->dentry_name); | |
2045 | fwrite_buffer(ref_info, 1, len, buf); | |
2046 | free(ref_info); | |
2047 | ||
1974632c | 2048 | if (o->type == OBJ_TAG) { |
197e8951 NH |
2049 | o = deref_tag(o, ls->dentry_name, 0); |
2050 | if (o) { | |
2051 | len = strlen(ls->dentry_name) + 45; | |
2052 | ref_info = xcalloc(len + 1, 1); | |
2053 | sprintf(ref_info, "%s %s^{}\n", | |
2054 | sha1_to_hex(o->sha1), ls->dentry_name); | |
2055 | fwrite_buffer(ref_info, 1, len, buf); | |
2056 | free(ref_info); | |
2057 | } | |
2058 | } | |
2059 | } | |
2060 | ||
2061 | static void update_remote_info_refs(struct remote_lock *lock) | |
2062 | { | |
2063 | struct buffer buffer; | |
2064 | struct active_request_slot *slot; | |
2065 | struct slot_results results; | |
2066 | char *if_header; | |
2067 | struct curl_slist *dav_headers = NULL; | |
2068 | ||
90321c10 | 2069 | buffer.buffer = xcalloc(1, 4096); |
197e8951 NH |
2070 | buffer.size = 4096; |
2071 | buffer.posn = 0; | |
2072 | remote_ls("refs/", (PROCESS_FILES | RECURSIVE), | |
2073 | add_remote_info_ref, &buffer); | |
2074 | if (!aborted) { | |
2075 | if_header = xmalloc(strlen(lock->token) + 25); | |
2076 | sprintf(if_header, "If: (<opaquelocktoken:%s>)", lock->token); | |
2077 | dav_headers = curl_slist_append(dav_headers, if_header); | |
2078 | ||
2079 | slot = get_active_slot(); | |
2080 | slot->results = &results; | |
2081 | curl_easy_setopt(slot->curl, CURLOPT_INFILE, &buffer); | |
2082 | curl_easy_setopt(slot->curl, CURLOPT_INFILESIZE, buffer.posn); | |
2083 | curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, fread_buffer); | |
2084 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
2085 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_PUT); | |
2086 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
2087 | curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 1); | |
2088 | curl_easy_setopt(slot->curl, CURLOPT_PUT, 1); | |
2089 | curl_easy_setopt(slot->curl, CURLOPT_URL, lock->url); | |
2090 | ||
2091 | buffer.posn = 0; | |
2092 | ||
2093 | if (start_active_slot(slot)) { | |
2094 | run_active_slot(slot); | |
2095 | if (results.curl_result != CURLE_OK) { | |
2096 | fprintf(stderr, | |
2097 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
2098 | results.curl_result, results.http_code); | |
2099 | } | |
2100 | } | |
2101 | free(if_header); | |
2102 | } | |
2103 | free(buffer.buffer); | |
2104 | } | |
2105 | ||
2106 | static int remote_exists(const char *path) | |
2107 | { | |
2108 | char *url = xmalloc(strlen(remote->url) + strlen(path) + 1); | |
2109 | struct active_request_slot *slot; | |
2110 | struct slot_results results; | |
2111 | ||
2112 | sprintf(url, "%s%s", remote->url, path); | |
2113 | ||
2114 | slot = get_active_slot(); | |
2115 | slot->results = &results; | |
2116 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
2117 | curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1); | |
2118 | ||
2119 | if (start_active_slot(slot)) { | |
2120 | run_active_slot(slot); | |
2121 | if (results.http_code == 404) | |
2122 | return 0; | |
2123 | else if (results.curl_result == CURLE_OK) | |
2124 | return 1; | |
2125 | else | |
2126 | fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code); | |
2127 | } else { | |
2128 | fprintf(stderr, "Unable to start HEAD request\n"); | |
2129 | } | |
2130 | ||
2131 | return -1; | |
2132 | } | |
2133 | ||
554fe20d | 2134 | static void fetch_symref(const char *path, char **symref, unsigned char *sha1) |
3dfaf7bc NH |
2135 | { |
2136 | char *url; | |
2137 | struct buffer buffer; | |
2138 | struct active_request_slot *slot; | |
2139 | struct slot_results results; | |
2140 | ||
2141 | url = xmalloc(strlen(remote->url) + strlen(path) + 1); | |
2142 | sprintf(url, "%s%s", remote->url, path); | |
2143 | ||
2144 | buffer.size = 4096; | |
2145 | buffer.posn = 0; | |
2146 | buffer.buffer = xmalloc(buffer.size); | |
2147 | ||
2148 | slot = get_active_slot(); | |
2149 | slot->results = &results; | |
2150 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer); | |
2151 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer); | |
2152 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL); | |
2153 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
2154 | if (start_active_slot(slot)) { | |
2155 | run_active_slot(slot); | |
2156 | if (results.curl_result != CURLE_OK) { | |
2157 | die("Couldn't get %s for remote symref\n%s", | |
2158 | url, curl_errorstr); | |
2159 | } | |
2160 | } else { | |
2161 | die("Unable to start remote symref request"); | |
2162 | } | |
2163 | free(url); | |
2164 | ||
2165 | if (*symref != NULL) | |
2166 | free(*symref); | |
2167 | *symref = NULL; | |
a8e0d16d | 2168 | hashclr(sha1); |
3dfaf7bc NH |
2169 | |
2170 | if (buffer.posn == 0) | |
2171 | return; | |
2172 | ||
2173 | /* If it's a symref, set the refname; otherwise try for a sha1 */ | |
cc44c765 | 2174 | if (!prefixcmp((char *)buffer.buffer, "ref: ")) { |
bfbd0bb6 | 2175 | *symref = xmalloc(buffer.posn - 5); |
eecc8367 ER |
2176 | memcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 6); |
2177 | (*symref)[buffer.posn - 6] = '\0'; | |
3dfaf7bc NH |
2178 | } else { |
2179 | get_sha1_hex(buffer.buffer, sha1); | |
2180 | } | |
2181 | ||
2182 | free(buffer.buffer); | |
2183 | } | |
2184 | ||
2185 | static int verify_merge_base(unsigned char *head_sha1, unsigned char *branch_sha1) | |
2186 | { | |
61ffbcb9 JS |
2187 | struct commit *head = lookup_commit(head_sha1); |
2188 | struct commit *branch = lookup_commit(branch_sha1); | |
2189 | struct commit_list *merge_bases = get_merge_bases(head, branch, 1); | |
3dfaf7bc | 2190 | |
0bc87ffb | 2191 | return (merge_bases && !merge_bases->next && merge_bases->item == branch); |
3dfaf7bc NH |
2192 | } |
2193 | ||
2194 | static int delete_remote_branch(char *pattern, int force) | |
2195 | { | |
2196 | struct ref *refs = remote_refs; | |
2197 | struct ref *remote_ref = NULL; | |
2198 | unsigned char head_sha1[20]; | |
2199 | char *symref = NULL; | |
2200 | int match; | |
2201 | int patlen = strlen(pattern); | |
2202 | int i; | |
2203 | struct active_request_slot *slot; | |
2204 | struct slot_results results; | |
2205 | char *url; | |
2206 | ||
2207 | /* Find the remote branch(es) matching the specified branch name */ | |
2208 | for (match = 0; refs; refs = refs->next) { | |
2209 | char *name = refs->name; | |
2210 | int namelen = strlen(name); | |
2211 | if (namelen < patlen || | |
2212 | memcmp(name + namelen - patlen, pattern, patlen)) | |
2213 | continue; | |
2214 | if (namelen != patlen && name[namelen - patlen - 1] != '/') | |
2215 | continue; | |
2216 | match++; | |
2217 | remote_ref = refs; | |
2218 | } | |
2219 | if (match == 0) | |
2220 | return error("No remote branch matches %s", pattern); | |
2221 | if (match != 1) | |
2222 | return error("More than one remote branch matches %s", | |
2223 | pattern); | |
2224 | ||
2225 | /* | |
2226 | * Remote HEAD must be a symref (not exactly foolproof; a remote | |
2227 | * symlink to a symref will look like a symref) | |
2228 | */ | |
2229 | fetch_symref("HEAD", &symref, head_sha1); | |
2230 | if (!symref) | |
2231 | return error("Remote HEAD is not a symref"); | |
2232 | ||
2233 | /* Remote branch must not be the remote HEAD */ | |
2234 | for (i=0; symref && i<MAXDEPTH; i++) { | |
2235 | if (!strcmp(remote_ref->name, symref)) | |
2236 | return error("Remote branch %s is the current HEAD", | |
2237 | remote_ref->name); | |
2238 | fetch_symref(symref, &symref, head_sha1); | |
2239 | } | |
2240 | ||
2241 | /* Run extra sanity checks if delete is not forced */ | |
2242 | if (!force) { | |
2243 | /* Remote HEAD must resolve to a known object */ | |
2244 | if (symref) | |
2245 | return error("Remote HEAD symrefs too deep"); | |
2246 | if (is_zero_sha1(head_sha1)) | |
2247 | return error("Unable to resolve remote HEAD"); | |
2248 | if (!has_sha1_file(head_sha1)) | |
2249 | return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1)); | |
2250 | ||
2251 | /* Remote branch must resolve to a known object */ | |
2252 | if (is_zero_sha1(remote_ref->old_sha1)) | |
2253 | return error("Unable to resolve remote branch %s", | |
2254 | remote_ref->name); | |
2255 | if (!has_sha1_file(remote_ref->old_sha1)) | |
2256 | return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, sha1_to_hex(remote_ref->old_sha1)); | |
2257 | ||
2258 | /* Remote branch must be an ancestor of remote HEAD */ | |
2259 | if (!verify_merge_base(head_sha1, remote_ref->old_sha1)) { | |
2260 | return error("The branch '%s' is not a strict subset of your current HEAD.\nIf you are sure you want to delete it, run:\n\t'git http-push -D %s %s'", remote_ref->name, remote->url, pattern); | |
2261 | } | |
2262 | } | |
2263 | ||
2264 | /* Send delete request */ | |
2265 | fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name); | |
2266 | url = xmalloc(strlen(remote->url) + strlen(remote_ref->name) + 1); | |
2267 | sprintf(url, "%s%s", remote->url, remote_ref->name); | |
2268 | slot = get_active_slot(); | |
2269 | slot->results = &results; | |
2270 | curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1); | |
2271 | curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
2272 | curl_easy_setopt(slot->curl, CURLOPT_URL, url); | |
2273 | curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, DAV_DELETE); | |
2274 | if (start_active_slot(slot)) { | |
2275 | run_active_slot(slot); | |
2276 | free(url); | |
2277 | if (results.curl_result != CURLE_OK) | |
2278 | return error("DELETE request failed (%d/%ld)\n", | |
2279 | results.curl_result, results.http_code); | |
2280 | } else { | |
2281 | free(url); | |
2282 | return error("Unable to start DELETE request"); | |
2283 | } | |
2284 | ||
2285 | return 0; | |
2286 | } | |
2287 | ||
58e60dd2 NH |
2288 | int main(int argc, char **argv) |
2289 | { | |
58e60dd2 NH |
2290 | struct transfer_request *request; |
2291 | struct transfer_request *next_request; | |
2292 | int nr_refspec = 0; | |
2293 | char **refspec = NULL; | |
512d632c | 2294 | struct remote_lock *ref_lock = NULL; |
197e8951 | 2295 | struct remote_lock *info_ref_lock = NULL; |
aa1dbc98 | 2296 | struct rev_info revs; |
3dfaf7bc NH |
2297 | int delete_branch = 0; |
2298 | int force_delete = 0; | |
1a703cba | 2299 | int objects_to_send; |
58e60dd2 NH |
2300 | int rc = 0; |
2301 | int i; | |
8c9e7947 JH |
2302 | int new_refs; |
2303 | struct ref *ref; | |
58e60dd2 | 2304 | |
5a327713 | 2305 | setup_git_directory(); |
58e60dd2 | 2306 | |
512d632c | 2307 | remote = xcalloc(sizeof(*remote), 1); |
58e60dd2 NH |
2308 | |
2309 | argv++; | |
2310 | for (i = 1; i < argc; i++, argv++) { | |
2311 | char *arg = *argv; | |
2312 | ||
2313 | if (*arg == '-') { | |
aa1dbc98 | 2314 | if (!strcmp(arg, "--all")) { |
58e60dd2 NH |
2315 | push_all = 1; |
2316 | continue; | |
2317 | } | |
2318 | if (!strcmp(arg, "--force")) { | |
2319 | force_all = 1; | |
2320 | continue; | |
2321 | } | |
2322 | if (!strcmp(arg, "--verbose")) { | |
2323 | push_verbosely = 1; | |
2324 | continue; | |
2325 | } | |
3dfaf7bc NH |
2326 | if (!strcmp(arg, "-d")) { |
2327 | delete_branch = 1; | |
2328 | continue; | |
2329 | } | |
2330 | if (!strcmp(arg, "-D")) { | |
2331 | delete_branch = 1; | |
2332 | force_delete = 1; | |
2333 | continue; | |
2334 | } | |
58e60dd2 NH |
2335 | } |
2336 | if (!remote->url) { | |
aa1dbc98 | 2337 | char *path = strstr(arg, "//"); |
8c9e7947 | 2338 | remote->url = arg; |
aa1dbc98 | 2339 | if (path) { |
ef9e58c8 | 2340 | path = strchr(path+2, '/'); |
aa1dbc98 NH |
2341 | if (path) |
2342 | remote->path_len = strlen(path); | |
2343 | } | |
58e60dd2 NH |
2344 | continue; |
2345 | } | |
2346 | refspec = argv; | |
2347 | nr_refspec = argc - i; | |
2348 | break; | |
2349 | } | |
2350 | ||
3e9fabc8 NH |
2351 | if (!remote->url) |
2352 | usage(http_push_usage); | |
2353 | ||
3dfaf7bc NH |
2354 | if (delete_branch && nr_refspec != 1) |
2355 | die("You must specify only one branch name when deleting a remote branch"); | |
2356 | ||
aa1dbc98 | 2357 | memset(remote_dir_exists, -1, 256); |
0dd276b8 | 2358 | |
29508e1e | 2359 | http_init(); |
58e60dd2 NH |
2360 | |
2361 | no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:"); | |
2362 | default_headers = curl_slist_append(default_headers, "Range:"); | |
2363 | default_headers = curl_slist_append(default_headers, "Destination:"); | |
2364 | default_headers = curl_slist_append(default_headers, "If:"); | |
2365 | default_headers = curl_slist_append(default_headers, | |
2366 | "Pragma: no-cache"); | |
2367 | ||
58e60dd2 | 2368 | /* Verify DAV compliance/lock support */ |
acf59575 | 2369 | if (!locking_available()) { |
58e60dd2 NH |
2370 | fprintf(stderr, "Error: no DAV locking support on remote repo %s\n", remote->url); |
2371 | rc = 1; | |
2372 | goto cleanup; | |
2373 | } | |
2374 | ||
197e8951 NH |
2375 | /* Check whether the remote has server info files */ |
2376 | remote->can_update_info_refs = 0; | |
2377 | remote->has_info_refs = remote_exists("info/refs"); | |
2378 | remote->has_info_packs = remote_exists("objects/info/packs"); | |
2379 | if (remote->has_info_refs) { | |
2380 | info_ref_lock = lock_remote("info/refs", LOCK_TIME); | |
2381 | if (info_ref_lock) | |
2382 | remote->can_update_info_refs = 1; | |
2383 | } | |
2384 | if (remote->has_info_packs) | |
2385 | fetch_indices(); | |
2386 | ||
aa1dbc98 NH |
2387 | /* Get a list of all local and remote heads to validate refspecs */ |
2388 | get_local_heads(); | |
2389 | fprintf(stderr, "Fetching remote heads...\n"); | |
2390 | get_dav_remote_heads(); | |
2391 | ||
3dfaf7bc NH |
2392 | /* Remove a remote branch if -d or -D was specified */ |
2393 | if (delete_branch) { | |
2394 | if (delete_remote_branch(refspec[0], force_delete) == -1) | |
2395 | fprintf(stderr, "Unable to delete remote branch %s\n", | |
2396 | refspec[0]); | |
2397 | goto cleanup; | |
2398 | } | |
2399 | ||
aa1dbc98 NH |
2400 | /* match them up */ |
2401 | if (!remote_tail) | |
2402 | remote_tail = &remote_refs; | |
2403 | if (match_refs(local_refs, remote_refs, &remote_tail, | |
2404 | nr_refspec, refspec, push_all)) | |
2405 | return -1; | |
2406 | if (!remote_refs) { | |
2407 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); | |
2408 | return 0; | |
2409 | } | |
2410 | ||
8c9e7947 | 2411 | new_refs = 0; |
aa1dbc98 NH |
2412 | for (ref = remote_refs; ref; ref = ref->next) { |
2413 | char old_hex[60], *new_hex; | |
8c9e7947 JH |
2414 | const char *commit_argv[4]; |
2415 | int commit_argc; | |
2416 | char *new_sha1_hex, *old_sha1_hex; | |
2417 | ||
aa1dbc98 NH |
2418 | if (!ref->peer_ref) |
2419 | continue; | |
a89fccd2 | 2420 | if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
aa1dbc98 NH |
2421 | if (push_verbosely || 1) |
2422 | fprintf(stderr, "'%s': up-to-date\n", ref->name); | |
2423 | continue; | |
2424 | } | |
2425 | ||
2426 | if (!force_all && | |
2427 | !is_zero_sha1(ref->old_sha1) && | |
2428 | !ref->force) { | |
2429 | if (!has_sha1_file(ref->old_sha1) || | |
2430 | !ref_newer(ref->peer_ref->new_sha1, | |
2431 | ref->old_sha1)) { | |
2432 | /* We do not have the remote ref, or | |
2433 | * we know that the remote ref is not | |
2434 | * an ancestor of what we are trying to | |
2435 | * push. Either way this can be losing | |
2436 | * commits at the remote end and likely | |
2437 | * we were not up to date to begin with. | |
2438 | */ | |
2439 | error("remote '%s' is not a strict " | |
2440 | "subset of local ref '%s'. " | |
2441 | "maybe you are not up-to-date and " | |
2442 | "need to pull first?", | |
2443 | ref->name, | |
2444 | ref->peer_ref->name); | |
1a703cba | 2445 | rc = -2; |
aa1dbc98 NH |
2446 | continue; |
2447 | } | |
58e60dd2 | 2448 | } |
e702496e | 2449 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
aa1dbc98 NH |
2450 | if (is_zero_sha1(ref->new_sha1)) { |
2451 | error("cannot happen anymore"); | |
1a703cba | 2452 | rc = -3; |
aa1dbc98 | 2453 | continue; |
58e60dd2 | 2454 | } |
aa1dbc98 NH |
2455 | new_refs++; |
2456 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); | |
2457 | new_hex = sha1_to_hex(ref->new_sha1); | |
2458 | ||
2459 | fprintf(stderr, "updating '%s'", ref->name); | |
2460 | if (strcmp(ref->name, ref->peer_ref->name)) | |
2461 | fprintf(stderr, " using '%s'", ref->peer_ref->name); | |
2462 | fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex); | |
2463 | ||
58e60dd2 NH |
2464 | |
2465 | /* Lock remote branch ref */ | |
aa1dbc98 NH |
2466 | ref_lock = lock_remote(ref->name, LOCK_TIME); |
2467 | if (ref_lock == NULL) { | |
58e60dd2 | 2468 | fprintf(stderr, "Unable to lock remote branch %s\n", |
aa1dbc98 | 2469 | ref->name); |
58e60dd2 NH |
2470 | rc = 1; |
2471 | continue; | |
2472 | } | |
2473 | ||
aa1dbc98 | 2474 | /* Set up revision info for this refspec */ |
8c9e7947 | 2475 | commit_argc = 3; |
9befac47 | 2476 | new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1)); |
8c9e7947 | 2477 | old_sha1_hex = NULL; |
5241bfe6 NH |
2478 | commit_argv[1] = "--objects"; |
2479 | commit_argv[2] = new_sha1_hex; | |
aa1dbc98 NH |
2480 | if (!push_all && !is_zero_sha1(ref->old_sha1)) { |
2481 | old_sha1_hex = xmalloc(42); | |
2482 | sprintf(old_sha1_hex, "^%s", | |
2483 | sha1_to_hex(ref->old_sha1)); | |
5241bfe6 | 2484 | commit_argv[3] = old_sha1_hex; |
aa1dbc98 | 2485 | commit_argc++; |
58e60dd2 | 2486 | } |
db6296a5 | 2487 | init_revisions(&revs, setup_git_directory()); |
aa1dbc98 | 2488 | setup_revisions(commit_argc, commit_argv, &revs, NULL); |
aa1dbc98 NH |
2489 | free(new_sha1_hex); |
2490 | if (old_sha1_hex) { | |
2491 | free(old_sha1_hex); | |
2492 | commit_argv[1] = NULL; | |
58e60dd2 NH |
2493 | } |
2494 | ||
aa1dbc98 | 2495 | /* Generate a list of objects that need to be pushed */ |
58e60dd2 | 2496 | pushing = 0; |
aa1dbc98 NH |
2497 | prepare_revision_walk(&revs); |
2498 | mark_edges_uninteresting(revs.commits); | |
1a703cba | 2499 | objects_to_send = get_delta(&revs, ref_lock); |
29508e1e | 2500 | finish_all_active_slots(); |
58e60dd2 NH |
2501 | |
2502 | /* Push missing objects to remote, this would be a | |
2503 | convenient time to pack them first if appropriate. */ | |
2504 | pushing = 1; | |
1a703cba NH |
2505 | if (objects_to_send) |
2506 | fprintf(stderr, " sending %d objects\n", | |
2507 | objects_to_send); | |
b3ca4e4e | 2508 | #ifdef USE_CURL_MULTI |
29508e1e | 2509 | fill_active_slots(); |
b3ca4e4e | 2510 | #endif |
29508e1e | 2511 | finish_all_active_slots(); |
58e60dd2 NH |
2512 | |
2513 | /* Update the remote branch if all went well */ | |
aa1dbc98 NH |
2514 | if (aborted || !update_remote(ref->new_sha1, ref_lock)) { |
2515 | rc = 1; | |
2516 | goto unlock; | |
58e60dd2 NH |
2517 | } |
2518 | ||
2519 | unlock: | |
aa1dbc98 NH |
2520 | if (!rc) |
2521 | fprintf(stderr, " done\n"); | |
2522 | unlock_remote(ref_lock); | |
512d632c | 2523 | check_locks(); |
58e60dd2 NH |
2524 | } |
2525 | ||
197e8951 NH |
2526 | /* Update remote server info if appropriate */ |
2527 | if (remote->has_info_refs && new_refs) { | |
2528 | if (info_ref_lock && remote->can_update_info_refs) { | |
2529 | fprintf(stderr, "Updating remote server info\n"); | |
2530 | update_remote_info_refs(info_ref_lock); | |
2531 | } else { | |
2532 | fprintf(stderr, "Unable to update server info\n"); | |
2533 | } | |
2534 | } | |
2535 | if (info_ref_lock) | |
2536 | unlock_remote(info_ref_lock); | |
2537 | ||
58e60dd2 NH |
2538 | cleanup: |
2539 | free(remote); | |
2540 | ||
2541 | curl_slist_free_all(no_pragma_header); | |
2542 | curl_slist_free_all(default_headers); | |
2543 | ||
29508e1e | 2544 | http_cleanup(); |
58e60dd2 NH |
2545 | |
2546 | request = request_queue_head; | |
2547 | while (request != NULL) { | |
2548 | next_request = request->next; | |
2549 | release_request(request); | |
58e60dd2 NH |
2550 | request = next_request; |
2551 | } | |
2552 | ||
58e60dd2 NH |
2553 | return rc; |
2554 | } |