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