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