12 #include "list-objects.h"
17 static const char http_push_usage
[] =
18 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
25 #define XML_STATUS_OK 1
26 #define XML_STATUS_ERROR 0
29 #define PREV_BUF_SIZE 4096
30 #define RANGE_HEADER_SIZE 30
33 #define DAV_LOCK "LOCK"
34 #define DAV_MKCOL "MKCOL"
35 #define DAV_MOVE "MOVE"
36 #define DAV_PROPFIND "PROPFIND"
38 #define DAV_UNLOCK "UNLOCK"
39 #define DAV_DELETE "DELETE"
42 #define DAV_PROP_LOCKWR (1u << 0)
43 #define DAV_PROP_LOCKEX (1u << 1)
44 #define DAV_LOCK_OK (1u << 2)
46 /* DAV XML properties */
47 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
48 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
49 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
50 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
51 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
52 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
53 #define DAV_PROPFIND_RESP ".multistatus.response"
54 #define DAV_PROPFIND_NAME ".multistatus.response.href"
55 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
57 /* DAV request body templates */
58 #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>"
59 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
60 #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>"
63 #define LOCK_REFRESH 30
65 /* bits #0-15 in revision.h */
67 #define LOCAL (1u<<16)
68 #define REMOTE (1u<<17)
69 #define FETCHING (1u<<18)
70 #define PUSHING (1u<<19)
72 /* We allow "recursive" symbolic refs. Only within reason, though */
77 static signed char remote_dir_exists
[256];
79 static struct curl_slist
*no_pragma_header
;
81 static int push_verbosely
;
82 static int push_all
= MATCH_REFS_NONE
;
86 static struct object_list
*objects
;
94 int can_update_info_refs
;
96 struct packed_git
*packs
;
97 struct remote_lock
*locks
;
100 static struct repo
*remote
;
102 enum transfer_state
{
114 struct transfer_request
119 struct remote_lock
*lock
;
120 struct curl_slist
*headers
;
121 struct buffer buffer
;
122 char filename
[PATH_MAX
];
123 char tmpfile
[PATH_MAX
];
126 enum transfer_state state
;
127 CURLcode curl_result
;
128 char errorstr
[CURL_ERROR_SIZE
];
130 unsigned char real_sha1
[20];
136 struct active_request_slot
*slot
;
137 struct transfer_request
*next
;
140 static struct transfer_request
*request_queue_head
;
147 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
156 char tmpfile_suffix
[41];
160 struct remote_lock
*next
;
163 /* Flags that control remote_ls processing */
164 #define PROCESS_FILES (1u << 0)
165 #define PROCESS_DIRS (1u << 1)
166 #define RECURSIVE (1u << 2)
168 /* Flags that remote_ls passes to callback functions */
169 #define IS_DIR (1u << 0)
174 void (*userFunc
)(struct remote_ls_ctx
*ls
);
179 struct remote_ls_ctx
*parent
;
182 /* get_dav_token_headers options */
183 enum dav_header_flag
{
184 DAV_HEADER_IF
= (1u << 0),
185 DAV_HEADER_LOCK
= (1u << 1),
186 DAV_HEADER_TIMEOUT
= (1u << 2)
189 static struct curl_slist
*get_dav_token_headers(struct remote_lock
*lock
, enum dav_header_flag options
)
191 struct strbuf buf
= STRBUF_INIT
;
192 struct curl_slist
*dav_headers
= NULL
;
194 if (options
& DAV_HEADER_IF
) {
195 strbuf_addf(&buf
, "If: (<%s>)", lock
->token
);
196 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
199 if (options
& DAV_HEADER_LOCK
) {
200 strbuf_addf(&buf
, "Lock-Token: <%s>", lock
->token
);
201 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
204 if (options
& DAV_HEADER_TIMEOUT
) {
205 strbuf_addf(&buf
, "Timeout: Second-%ld", lock
->timeout
);
206 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
209 strbuf_release(&buf
);
214 static void append_remote_object_url(struct strbuf
*buf
, const char *url
,
216 int only_two_digit_prefix
)
218 strbuf_addf(buf
, "%sobjects/%.*s/", url
, 2, hex
);
219 if (!only_two_digit_prefix
)
220 strbuf_addf(buf
, "%s", hex
+2);
223 static void finish_request(struct transfer_request
*request
);
224 static void release_request(struct transfer_request
*request
);
226 static void process_response(void *callback_data
)
228 struct transfer_request
*request
=
229 (struct transfer_request
*)callback_data
;
231 finish_request(request
);
234 #ifdef USE_CURL_MULTI
236 static char *get_remote_object_url(const char *url
, const char *hex
,
237 int only_two_digit_prefix
)
239 struct strbuf buf
= STRBUF_INIT
;
240 append_remote_object_url(&buf
, url
, hex
, only_two_digit_prefix
);
241 return strbuf_detach(&buf
, NULL
);
244 static size_t fwrite_sha1_file(void *ptr
, size_t eltsize
, size_t nmemb
,
247 unsigned char expn
[4096];
248 size_t size
= eltsize
* nmemb
;
250 struct transfer_request
*request
= (struct transfer_request
*)data
;
252 ssize_t retval
= xwrite(request
->local_fileno
,
253 (char *) ptr
+ posn
, size
- posn
);
257 } while (posn
< size
);
259 request
->stream
.avail_in
= size
;
260 request
->stream
.next_in
= ptr
;
262 request
->stream
.next_out
= expn
;
263 request
->stream
.avail_out
= sizeof(expn
);
264 request
->zret
= git_inflate(&request
->stream
, Z_SYNC_FLUSH
);
265 git_SHA1_Update(&request
->c
, expn
,
266 sizeof(expn
) - request
->stream
.avail_out
);
267 } while (request
->stream
.avail_in
&& request
->zret
== Z_OK
);
272 static void start_fetch_loose(struct transfer_request
*request
)
274 char *hex
= sha1_to_hex(request
->obj
->sha1
);
276 char prevfile
[PATH_MAX
];
279 unsigned char prev_buf
[PREV_BUF_SIZE
];
280 ssize_t prev_read
= 0;
282 char range
[RANGE_HEADER_SIZE
];
283 struct curl_slist
*range_header
= NULL
;
284 struct active_request_slot
*slot
;
286 filename
= sha1_file_name(request
->obj
->sha1
);
287 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
288 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
289 "%s.temp", filename
);
291 snprintf(prevfile
, sizeof(prevfile
), "%s.prev", request
->filename
);
293 rename(request
->tmpfile
, prevfile
);
294 unlink(request
->tmpfile
);
296 if (request
->local_fileno
!= -1)
297 error("fd leakage in start: %d", request
->local_fileno
);
298 request
->local_fileno
= open(request
->tmpfile
,
299 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
300 /* This could have failed due to the "lazy directory creation";
301 * try to mkdir the last path component.
303 if (request
->local_fileno
< 0 && errno
== ENOENT
) {
304 char *dir
= strrchr(request
->tmpfile
, '/');
307 mkdir(request
->tmpfile
, 0777);
310 request
->local_fileno
= open(request
->tmpfile
,
311 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
314 if (request
->local_fileno
< 0) {
315 request
->state
= ABORTED
;
316 error("Couldn't create temporary file %s for %s: %s",
317 request
->tmpfile
, request
->filename
, strerror(errno
));
321 memset(&request
->stream
, 0, sizeof(request
->stream
));
323 git_inflate_init(&request
->stream
);
325 git_SHA1_Init(&request
->c
);
327 url
= get_remote_object_url(remote
->url
, hex
, 0);
328 request
->url
= xstrdup(url
);
330 /* If a previous temp file is present, process what was already
332 prevlocal
= open(prevfile
, O_RDONLY
);
333 if (prevlocal
!= -1) {
335 prev_read
= xread(prevlocal
, prev_buf
, PREV_BUF_SIZE
);
337 if (fwrite_sha1_file(prev_buf
,
340 request
) == prev_read
) {
341 prev_posn
+= prev_read
;
346 } while (prev_read
> 0);
351 /* Reset inflate/SHA1 if there was an error reading the previous temp
352 file; also rewind to the beginning of the local file. */
353 if (prev_read
== -1) {
354 memset(&request
->stream
, 0, sizeof(request
->stream
));
355 git_inflate_init(&request
->stream
);
356 git_SHA1_Init(&request
->c
);
359 lseek(request
->local_fileno
, 0, SEEK_SET
);
360 ftruncate(request
->local_fileno
, 0);
364 slot
= get_active_slot();
365 slot
->callback_func
= process_response
;
366 slot
->callback_data
= request
;
367 request
->slot
= slot
;
369 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, request
);
370 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_sha1_file
);
371 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
372 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
373 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
375 /* If we have successfully processed data from a previous fetch
376 attempt, only fetch the data we don't already have. */
380 "Resuming fetch of object %s at byte %ld\n",
382 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
383 range_header
= curl_slist_append(range_header
, range
);
384 curl_easy_setopt(slot
->curl
,
385 CURLOPT_HTTPHEADER
, range_header
);
388 /* Try to get the request started, abort the request on error */
389 request
->state
= RUN_FETCH_LOOSE
;
390 if (!start_active_slot(slot
)) {
391 fprintf(stderr
, "Unable to start GET request\n");
392 remote
->can_update_info_refs
= 0;
393 release_request(request
);
397 static void start_mkcol(struct transfer_request
*request
)
399 char *hex
= sha1_to_hex(request
->obj
->sha1
);
400 struct active_request_slot
*slot
;
402 request
->url
= get_remote_object_url(remote
->url
, hex
, 1);
404 slot
= get_active_slot();
405 slot
->callback_func
= process_response
;
406 slot
->callback_data
= request
;
407 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
408 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
409 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
410 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
411 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
413 if (start_active_slot(slot
)) {
414 request
->slot
= slot
;
415 request
->state
= RUN_MKCOL
;
417 request
->state
= ABORTED
;
424 static void start_fetch_packed(struct transfer_request
*request
)
427 struct packed_git
*target
;
431 char range
[RANGE_HEADER_SIZE
];
432 struct curl_slist
*range_header
= NULL
;
434 struct transfer_request
*check_request
= request_queue_head
;
435 struct active_request_slot
*slot
;
437 target
= find_sha1_pack(request
->obj
->sha1
, remote
->packs
);
439 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request
->obj
->sha1
));
440 remote
->can_update_info_refs
= 0;
441 release_request(request
);
445 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
446 fprintf(stderr
, " which contains %s\n", sha1_to_hex(request
->obj
->sha1
));
448 filename
= sha1_pack_name(target
->sha1
);
449 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
450 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
451 "%s.temp", filename
);
453 url
= xmalloc(strlen(remote
->url
) + 64);
454 sprintf(url
, "%sobjects/pack/pack-%s.pack",
455 remote
->url
, sha1_to_hex(target
->sha1
));
457 /* Make sure there isn't another open request for this pack */
458 while (check_request
) {
459 if (check_request
->state
== RUN_FETCH_PACKED
&&
460 !strcmp(check_request
->url
, url
)) {
462 release_request(request
);
465 check_request
= check_request
->next
;
468 packfile
= fopen(request
->tmpfile
, "a");
470 fprintf(stderr
, "Unable to open local file %s for pack",
472 remote
->can_update_info_refs
= 0;
477 slot
= get_active_slot();
478 slot
->callback_func
= process_response
;
479 slot
->callback_data
= request
;
480 request
->slot
= slot
;
481 request
->local_stream
= packfile
;
482 request
->userData
= target
;
485 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, packfile
);
486 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
487 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
488 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
489 slot
->local
= packfile
;
491 /* If there is data present from a previous transfer attempt,
492 resume where it left off */
493 prev_posn
= ftell(packfile
);
497 "Resuming fetch of pack %s at byte %ld\n",
498 sha1_to_hex(target
->sha1
), prev_posn
);
499 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
500 range_header
= curl_slist_append(range_header
, range
);
501 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
504 /* Try to get the request started, abort the request on error */
505 request
->state
= RUN_FETCH_PACKED
;
506 if (!start_active_slot(slot
)) {
507 fprintf(stderr
, "Unable to start GET request\n");
508 remote
->can_update_info_refs
= 0;
509 release_request(request
);
513 static void start_put(struct transfer_request
*request
)
515 char *hex
= sha1_to_hex(request
->obj
->sha1
);
516 struct active_request_slot
*slot
;
517 struct strbuf buf
= STRBUF_INIT
;
518 enum object_type type
;
526 unpacked
= read_sha1_file(request
->obj
->sha1
, &type
, &len
);
527 hdrlen
= sprintf(hdr
, "%s %lu", typename(type
), len
) + 1;
530 memset(&stream
, 0, sizeof(stream
));
531 deflateInit(&stream
, zlib_compression_level
);
532 size
= deflateBound(&stream
, len
+ hdrlen
);
533 strbuf_init(&request
->buffer
.buf
, size
);
534 request
->buffer
.posn
= 0;
537 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
538 stream
.avail_out
= size
;
541 stream
.next_in
= (void *)hdr
;
542 stream
.avail_in
= hdrlen
;
543 while (deflate(&stream
, 0) == Z_OK
)
546 /* Then the data itself.. */
547 stream
.next_in
= unpacked
;
548 stream
.avail_in
= len
;
549 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
554 request
->buffer
.buf
.len
= stream
.total_out
;
556 strbuf_addstr(&buf
, "Destination: ");
557 append_remote_object_url(&buf
, remote
->url
, hex
, 0);
558 request
->dest
= strbuf_detach(&buf
, NULL
);
560 append_remote_object_url(&buf
, remote
->url
, hex
, 0);
561 strbuf_add(&buf
, request
->lock
->tmpfile_suffix
, 41);
562 request
->url
= strbuf_detach(&buf
, NULL
);
564 slot
= get_active_slot();
565 slot
->callback_func
= process_response
;
566 slot
->callback_data
= request
;
567 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &request
->buffer
);
568 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, request
->buffer
.buf
.len
);
569 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
570 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
571 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
572 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
573 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
574 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
575 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
577 if (start_active_slot(slot
)) {
578 request
->slot
= slot
;
579 request
->state
= RUN_PUT
;
581 request
->state
= ABORTED
;
587 static void start_move(struct transfer_request
*request
)
589 struct active_request_slot
*slot
;
590 struct curl_slist
*dav_headers
= NULL
;
592 slot
= get_active_slot();
593 slot
->callback_func
= process_response
;
594 slot
->callback_data
= request
;
595 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
596 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MOVE
);
597 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
598 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
599 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
600 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
601 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
603 if (start_active_slot(slot
)) {
604 request
->slot
= slot
;
605 request
->state
= RUN_MOVE
;
607 request
->state
= ABORTED
;
613 static int refresh_lock(struct remote_lock
*lock
)
615 struct active_request_slot
*slot
;
616 struct slot_results results
;
617 struct curl_slist
*dav_headers
;
620 lock
->refreshing
= 1;
622 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
| DAV_HEADER_TIMEOUT
);
624 slot
= get_active_slot();
625 slot
->results
= &results
;
626 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
627 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
628 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
629 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
630 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
632 if (start_active_slot(slot
)) {
633 run_active_slot(slot
);
634 if (results
.curl_result
!= CURLE_OK
) {
635 fprintf(stderr
, "LOCK HTTP error %ld\n",
638 lock
->start_time
= time(NULL
);
643 lock
->refreshing
= 0;
644 curl_slist_free_all(dav_headers
);
649 static void check_locks(void)
651 struct remote_lock
*lock
= remote
->locks
;
652 time_t current_time
= time(NULL
);
656 time_remaining
= lock
->start_time
+ lock
->timeout
-
658 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
659 if (!refresh_lock(lock
)) {
661 "Unable to refresh lock for %s\n",
671 static void release_request(struct transfer_request
*request
)
673 struct transfer_request
*entry
= request_queue_head
;
675 if (request
== request_queue_head
) {
676 request_queue_head
= request
->next
;
678 while (entry
->next
!= NULL
&& entry
->next
!= request
)
680 if (entry
->next
== request
)
681 entry
->next
= entry
->next
->next
;
684 if (request
->local_fileno
!= -1)
685 close(request
->local_fileno
);
686 if (request
->local_stream
)
687 fclose(request
->local_stream
);
692 static void finish_request(struct transfer_request
*request
)
695 struct packed_git
*target
;
696 struct packed_git
**lst
;
698 request
->curl_result
= request
->slot
->curl_result
;
699 request
->http_code
= request
->slot
->http_code
;
700 request
->slot
= NULL
;
702 /* Keep locks active */
705 if (request
->headers
!= NULL
)
706 curl_slist_free_all(request
->headers
);
708 /* URL is reused for MOVE after PUT */
709 if (request
->state
!= RUN_PUT
) {
714 if (request
->state
== RUN_MKCOL
) {
715 if (request
->curl_result
== CURLE_OK
||
716 request
->http_code
== 405) {
717 remote_dir_exists
[request
->obj
->sha1
[0]] = 1;
720 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
721 sha1_to_hex(request
->obj
->sha1
),
722 request
->curl_result
, request
->http_code
);
723 request
->state
= ABORTED
;
726 } else if (request
->state
== RUN_PUT
) {
727 if (request
->curl_result
== CURLE_OK
) {
730 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
731 sha1_to_hex(request
->obj
->sha1
),
732 request
->curl_result
, request
->http_code
);
733 request
->state
= ABORTED
;
736 } else if (request
->state
== RUN_MOVE
) {
737 if (request
->curl_result
== CURLE_OK
) {
739 fprintf(stderr
, " sent %s\n",
740 sha1_to_hex(request
->obj
->sha1
));
741 request
->obj
->flags
|= REMOTE
;
742 release_request(request
);
744 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
745 sha1_to_hex(request
->obj
->sha1
),
746 request
->curl_result
, request
->http_code
);
747 request
->state
= ABORTED
;
750 } else if (request
->state
== RUN_FETCH_LOOSE
) {
751 close(request
->local_fileno
); request
->local_fileno
= -1;
753 if (request
->curl_result
!= CURLE_OK
&&
754 request
->http_code
!= 416) {
755 if (stat(request
->tmpfile
, &st
) == 0) {
757 unlink(request
->tmpfile
);
760 if (request
->http_code
== 416)
761 fprintf(stderr
, "Warning: requested range invalid; we may already have all the data.\n");
763 git_inflate_end(&request
->stream
);
764 git_SHA1_Final(request
->real_sha1
, &request
->c
);
765 if (request
->zret
!= Z_STREAM_END
) {
766 unlink(request
->tmpfile
);
767 } else if (hashcmp(request
->obj
->sha1
, request
->real_sha1
)) {
768 unlink(request
->tmpfile
);
774 if (request
->rename
== 0) {
775 request
->obj
->flags
|= (LOCAL
| REMOTE
);
780 /* Try fetching packed if necessary */
781 if (request
->obj
->flags
& LOCAL
)
782 release_request(request
);
784 start_fetch_packed(request
);
786 } else if (request
->state
== RUN_FETCH_PACKED
) {
787 if (request
->curl_result
!= CURLE_OK
) {
788 fprintf(stderr
, "Unable to get pack file %s\n%s",
789 request
->url
, curl_errorstr
);
790 remote
->can_update_info_refs
= 0;
792 off_t pack_size
= ftell(request
->local_stream
);
794 fclose(request
->local_stream
);
795 request
->local_stream
= NULL
;
796 if (!move_temp_to_file(request
->tmpfile
,
797 request
->filename
)) {
798 target
= (struct packed_git
*)request
->userData
;
799 target
->pack_size
= pack_size
;
800 lst
= &remote
->packs
;
801 while (*lst
!= target
)
802 lst
= &((*lst
)->next
);
805 if (!verify_pack(target
))
806 install_packed_git(target
);
808 remote
->can_update_info_refs
= 0;
811 release_request(request
);
815 #ifdef USE_CURL_MULTI
816 static int fill_active_slot(void *unused
)
818 struct transfer_request
*request
= request_queue_head
;
823 for (request
= request_queue_head
; request
; request
= request
->next
) {
824 if (request
->state
== NEED_FETCH
) {
825 start_fetch_loose(request
);
827 } else if (pushing
&& request
->state
== NEED_PUSH
) {
828 if (remote_dir_exists
[request
->obj
->sha1
[0]] == 1) {
831 start_mkcol(request
);
840 static void get_remote_object_list(unsigned char parent
);
842 static void add_fetch_request(struct object
*obj
)
844 struct transfer_request
*request
;
849 * Don't fetch the object if it's known to exist locally
850 * or is already in the request queue
852 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
853 get_remote_object_list(obj
->sha1
[0]);
854 if (obj
->flags
& (LOCAL
| FETCHING
))
857 obj
->flags
|= FETCHING
;
858 request
= xmalloc(sizeof(*request
));
861 request
->lock
= NULL
;
862 request
->headers
= NULL
;
863 request
->local_fileno
= -1;
864 request
->local_stream
= NULL
;
865 request
->state
= NEED_FETCH
;
866 request
->next
= request_queue_head
;
867 request_queue_head
= request
;
869 #ifdef USE_CURL_MULTI
875 static int add_send_request(struct object
*obj
, struct remote_lock
*lock
)
877 struct transfer_request
*request
= request_queue_head
;
878 struct packed_git
*target
;
880 /* Keep locks active */
884 * Don't push the object if it's known to exist on the remote
885 * or is already in the request queue
887 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
888 get_remote_object_list(obj
->sha1
[0]);
889 if (obj
->flags
& (REMOTE
| PUSHING
))
891 target
= find_sha1_pack(obj
->sha1
, remote
->packs
);
893 obj
->flags
|= REMOTE
;
897 obj
->flags
|= PUSHING
;
898 request
= xmalloc(sizeof(*request
));
901 request
->lock
= lock
;
902 request
->headers
= NULL
;
903 request
->local_fileno
= -1;
904 request
->local_stream
= NULL
;
905 request
->state
= NEED_PUSH
;
906 request
->next
= request_queue_head
;
907 request_queue_head
= request
;
909 #ifdef USE_CURL_MULTI
917 static int fetch_index(unsigned char *sha1
)
919 char *hex
= sha1_to_hex(sha1
);
922 char tmpfile
[PATH_MAX
];
924 char range
[RANGE_HEADER_SIZE
];
925 struct curl_slist
*range_header
= NULL
;
928 struct active_request_slot
*slot
;
929 struct slot_results results
;
931 /* Don't use the index if the pack isn't there */
932 url
= xmalloc(strlen(remote
->url
) + 64);
933 sprintf(url
, "%sobjects/pack/pack-%s.pack", remote
->url
, hex
);
934 slot
= get_active_slot();
935 slot
->results
= &results
;
936 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
937 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
938 if (start_active_slot(slot
)) {
939 run_active_slot(slot
);
940 if (results
.curl_result
!= CURLE_OK
) {
942 return error("Unable to verify pack %s is available",
947 return error("Unable to start request");
950 if (has_pack_index(sha1
)) {
956 fprintf(stderr
, "Getting index for pack %s\n", hex
);
958 sprintf(url
, "%sobjects/pack/pack-%s.idx", remote
->url
, hex
);
960 filename
= sha1_pack_index_name(sha1
);
961 snprintf(tmpfile
, sizeof(tmpfile
), "%s.temp", filename
);
962 indexfile
= fopen(tmpfile
, "a");
965 return error("Unable to open local file %s for pack index",
969 slot
= get_active_slot();
970 slot
->results
= &results
;
971 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
972 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
973 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, indexfile
);
974 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
975 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
976 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
977 slot
->local
= indexfile
;
979 /* If there is data present from a previous transfer attempt,
980 resume where it left off */
981 prev_posn
= ftell(indexfile
);
985 "Resuming fetch of index for pack %s at byte %ld\n",
987 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
988 range_header
= curl_slist_append(range_header
, range
);
989 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
992 if (start_active_slot(slot
)) {
993 run_active_slot(slot
);
994 if (results
.curl_result
!= CURLE_OK
) {
997 return error("Unable to get pack index %s\n%s", url
,
1003 return error("Unable to start request");
1009 return move_temp_to_file(tmpfile
, filename
);
1012 static int setup_index(unsigned char *sha1
)
1014 struct packed_git
*new_pack
;
1016 if (fetch_index(sha1
))
1019 new_pack
= parse_pack_index(sha1
);
1020 new_pack
->next
= remote
->packs
;
1021 remote
->packs
= new_pack
;
1025 static int fetch_indices(void)
1027 unsigned char sha1
[20];
1029 struct strbuf buffer
= STRBUF_INIT
;
1033 struct active_request_slot
*slot
;
1034 struct slot_results results
;
1037 fprintf(stderr
, "Getting pack list\n");
1039 url
= xmalloc(strlen(remote
->url
) + 20);
1040 sprintf(url
, "%sobjects/info/packs", remote
->url
);
1042 slot
= get_active_slot();
1043 slot
->results
= &results
;
1044 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
1045 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1046 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1047 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
1048 if (start_active_slot(slot
)) {
1049 run_active_slot(slot
);
1050 if (results
.curl_result
!= CURLE_OK
) {
1051 strbuf_release(&buffer
);
1053 if (results
.http_code
== 404)
1056 return error("%s", curl_errorstr
);
1059 strbuf_release(&buffer
);
1061 return error("Unable to start request");
1066 while (i
< buffer
.len
) {
1070 if (i
+ 52 < buffer
.len
&&
1071 !prefixcmp(data
+ i
, " pack-") &&
1072 !prefixcmp(data
+ i
+ 46, ".pack\n")) {
1073 get_sha1_hex(data
+ i
+ 6, sha1
);
1079 while (data
[i
] != '\n')
1085 strbuf_release(&buffer
);
1089 static void one_remote_object(const char *hex
)
1091 unsigned char sha1
[20];
1094 if (get_sha1_hex(hex
, sha1
) != 0)
1097 obj
= lookup_object(sha1
);
1099 obj
= parse_object(sha1
);
1101 /* Ignore remote objects that don't exist locally */
1105 obj
->flags
|= REMOTE
;
1106 if (!object_list_contains(objects
, obj
))
1107 object_list_insert(obj
, &objects
);
1110 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1112 int *lock_flags
= (int *)ctx
->userData
;
1115 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
1116 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
1117 (*lock_flags
& DAV_PROP_LOCKWR
)) {
1118 *lock_flags
|= DAV_LOCK_OK
;
1120 *lock_flags
&= DAV_LOCK_OK
;
1121 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
1122 *lock_flags
|= DAV_PROP_LOCKWR
;
1123 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
1124 *lock_flags
|= DAV_PROP_LOCKEX
;
1129 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1131 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
1132 git_SHA_CTX sha_ctx
;
1133 unsigned char lock_token_sha1
[20];
1135 if (tag_closed
&& ctx
->cdata
) {
1136 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
1137 lock
->owner
= xmalloc(strlen(ctx
->cdata
) + 1);
1138 strcpy(lock
->owner
, ctx
->cdata
);
1139 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
1140 if (!prefixcmp(ctx
->cdata
, "Second-"))
1142 strtol(ctx
->cdata
+ 7, NULL
, 10);
1143 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
1144 lock
->token
= xmalloc(strlen(ctx
->cdata
) + 1);
1145 strcpy(lock
->token
, ctx
->cdata
);
1147 git_SHA1_Init(&sha_ctx
);
1148 git_SHA1_Update(&sha_ctx
, lock
->token
, strlen(lock
->token
));
1149 git_SHA1_Final(lock_token_sha1
, &sha_ctx
);
1151 lock
->tmpfile_suffix
[0] = '_';
1152 memcpy(lock
->tmpfile_suffix
+ 1, sha1_to_hex(lock_token_sha1
), 40);
1157 static void one_remote_ref(char *refname
);
1160 xml_start_tag(void *userData
, const char *name
, const char **atts
)
1162 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1163 const char *c
= strchr(name
, ':');
1171 new_len
= strlen(ctx
->name
) + strlen(c
) + 2;
1173 if (new_len
> ctx
->len
) {
1174 ctx
->name
= xrealloc(ctx
->name
, new_len
);
1177 strcat(ctx
->name
, ".");
1178 strcat(ctx
->name
, c
);
1183 ctx
->userFunc(ctx
, 0);
1187 xml_end_tag(void *userData
, const char *name
)
1189 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1190 const char *c
= strchr(name
, ':');
1193 ctx
->userFunc(ctx
, 1);
1200 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
1205 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
1207 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1209 ctx
->cdata
= xmemdupz(s
, len
);
1212 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
1214 struct active_request_slot
*slot
;
1215 struct slot_results results
;
1216 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1217 struct strbuf in_buffer
= STRBUF_INIT
;
1220 char timeout_header
[25];
1221 struct remote_lock
*lock
= NULL
;
1222 struct curl_slist
*dav_headers
= NULL
;
1225 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1226 sprintf(url
, "%s%s", remote
->url
, path
);
1228 /* Make sure leading directories exist for the remote ref */
1229 ep
= strchr(url
+ strlen(remote
->url
) + 1, '/');
1231 char saved_character
= ep
[1];
1233 slot
= get_active_slot();
1234 slot
->results
= &results
;
1235 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
1236 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1237 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
1238 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1239 if (start_active_slot(slot
)) {
1240 run_active_slot(slot
);
1241 if (results
.curl_result
!= CURLE_OK
&&
1242 results
.http_code
!= 405) {
1244 "Unable to create branch path %s\n",
1250 fprintf(stderr
, "Unable to start MKCOL request\n");
1254 ep
[1] = saved_character
;
1255 ep
= strchr(ep
+ 1, '/');
1258 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, git_default_email
);
1260 sprintf(timeout_header
, "Timeout: Second-%ld", timeout
);
1261 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
1262 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1264 slot
= get_active_slot();
1265 slot
->results
= &results
;
1266 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1267 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1268 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1269 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1270 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1271 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1272 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1273 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
1274 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1276 lock
= xcalloc(1, sizeof(*lock
));
1279 if (start_active_slot(slot
)) {
1280 run_active_slot(slot
);
1281 if (results
.curl_result
== CURLE_OK
) {
1282 XML_Parser parser
= XML_ParserCreate(NULL
);
1283 enum XML_Status result
;
1284 ctx
.name
= xcalloc(10, 1);
1287 ctx
.userFunc
= handle_new_lock_ctx
;
1288 ctx
.userData
= lock
;
1289 XML_SetUserData(parser
, &ctx
);
1290 XML_SetElementHandler(parser
, xml_start_tag
,
1292 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1293 result
= XML_Parse(parser
, in_buffer
.buf
,
1296 if (result
!= XML_STATUS_OK
) {
1297 fprintf(stderr
, "XML error: %s\n",
1299 XML_GetErrorCode(parser
)));
1302 XML_ParserFree(parser
);
1305 fprintf(stderr
, "Unable to start LOCK request\n");
1308 curl_slist_free_all(dav_headers
);
1309 strbuf_release(&out_buffer
.buf
);
1310 strbuf_release(&in_buffer
);
1312 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
1320 lock
->start_time
= time(NULL
);
1321 lock
->next
= remote
->locks
;
1322 remote
->locks
= lock
;
1328 static int unlock_remote(struct remote_lock
*lock
)
1330 struct active_request_slot
*slot
;
1331 struct slot_results results
;
1332 struct remote_lock
*prev
= remote
->locks
;
1333 struct curl_slist
*dav_headers
;
1336 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_LOCK
);
1338 slot
= get_active_slot();
1339 slot
->results
= &results
;
1340 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1341 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1342 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_UNLOCK
);
1343 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1345 if (start_active_slot(slot
)) {
1346 run_active_slot(slot
);
1347 if (results
.curl_result
== CURLE_OK
)
1350 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
1353 fprintf(stderr
, "Unable to start UNLOCK request\n");
1356 curl_slist_free_all(dav_headers
);
1358 if (remote
->locks
== lock
) {
1359 remote
->locks
= lock
->next
;
1361 while (prev
&& prev
->next
!= lock
)
1364 prev
->next
= prev
->next
->next
;
1375 static void remove_locks(void)
1377 struct remote_lock
*lock
= remote
->locks
;
1379 fprintf(stderr
, "Removing remote locks...\n");
1381 unlock_remote(lock
);
1386 static void remove_locks_on_signal(int signo
)
1389 sigchain_pop(signo
);
1393 static void remote_ls(const char *path
, int flags
,
1394 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1397 static void process_ls_object(struct remote_ls_ctx
*ls
)
1399 unsigned int *parent
= (unsigned int *)ls
->userData
;
1400 char *path
= ls
->dentry_name
;
1403 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1404 remote_dir_exists
[*parent
] = 1;
1408 if (strlen(path
) != 49)
1411 obj_hex
= xmalloc(strlen(path
));
1412 /* NB: path is not null-terminated, can not use strlcpy here */
1413 memcpy(obj_hex
, path
, 2);
1414 strcpy(obj_hex
+ 2, path
+ 3);
1415 one_remote_object(obj_hex
);
1419 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1421 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1422 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1426 if (!(ls
->dentry_flags
& IS_DIR
))
1427 one_remote_ref(ls
->dentry_name
);
1430 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1432 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1435 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1436 if (ls
->dentry_flags
& IS_DIR
) {
1437 if (ls
->flags
& PROCESS_DIRS
) {
1440 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1441 ls
->flags
& RECURSIVE
) {
1442 remote_ls(ls
->dentry_name
,
1447 } else if (ls
->flags
& PROCESS_FILES
) {
1450 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1451 char *path
= ctx
->cdata
;
1452 if (*ctx
->cdata
== 'h') {
1453 path
= strstr(path
, "//");
1455 path
= strchr(path
+2, '/');
1459 path
+= remote
->path_len
;
1460 ls
->dentry_name
= xstrdup(path
);
1462 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1463 ls
->dentry_flags
|= IS_DIR
;
1465 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1466 free(ls
->dentry_name
);
1467 ls
->dentry_name
= NULL
;
1468 ls
->dentry_flags
= 0;
1473 * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it
1474 * should _only_ heed the information from that file, instead of trying to
1475 * determine the refs from the remote file system (badly: it does not even
1476 * know about packed-refs).
1478 static void remote_ls(const char *path
, int flags
,
1479 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1482 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1483 struct active_request_slot
*slot
;
1484 struct slot_results results
;
1485 struct strbuf in_buffer
= STRBUF_INIT
;
1486 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1487 struct curl_slist
*dav_headers
= NULL
;
1489 struct remote_ls_ctx ls
;
1492 ls
.path
= xstrdup(path
);
1493 ls
.dentry_name
= NULL
;
1494 ls
.dentry_flags
= 0;
1495 ls
.userData
= userData
;
1496 ls
.userFunc
= userFunc
;
1498 sprintf(url
, "%s%s", remote
->url
, path
);
1500 strbuf_addf(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1502 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1503 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1505 slot
= get_active_slot();
1506 slot
->results
= &results
;
1507 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1508 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1509 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1510 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1511 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1512 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1513 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1514 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1515 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1517 if (start_active_slot(slot
)) {
1518 run_active_slot(slot
);
1519 if (results
.curl_result
== CURLE_OK
) {
1520 XML_Parser parser
= XML_ParserCreate(NULL
);
1521 enum XML_Status result
;
1522 ctx
.name
= xcalloc(10, 1);
1525 ctx
.userFunc
= handle_remote_ls_ctx
;
1527 XML_SetUserData(parser
, &ctx
);
1528 XML_SetElementHandler(parser
, xml_start_tag
,
1530 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1531 result
= XML_Parse(parser
, in_buffer
.buf
,
1535 if (result
!= XML_STATUS_OK
) {
1536 fprintf(stderr
, "XML error: %s\n",
1538 XML_GetErrorCode(parser
)));
1540 XML_ParserFree(parser
);
1543 fprintf(stderr
, "Unable to start PROPFIND request\n");
1548 strbuf_release(&out_buffer
.buf
);
1549 strbuf_release(&in_buffer
);
1550 curl_slist_free_all(dav_headers
);
1553 static void get_remote_object_list(unsigned char parent
)
1555 char path
[] = "objects/XX/";
1556 static const char hex
[] = "0123456789abcdef";
1557 unsigned int val
= parent
;
1559 path
[8] = hex
[val
>> 4];
1560 path
[9] = hex
[val
& 0xf];
1561 remote_dir_exists
[val
] = 0;
1562 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1563 process_ls_object
, &val
);
1566 static int locking_available(void)
1568 struct active_request_slot
*slot
;
1569 struct slot_results results
;
1570 struct strbuf in_buffer
= STRBUF_INIT
;
1571 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1572 struct curl_slist
*dav_headers
= NULL
;
1576 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, remote
->url
);
1578 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1579 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1581 slot
= get_active_slot();
1582 slot
->results
= &results
;
1583 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1584 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1585 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1586 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1587 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1588 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, remote
->url
);
1589 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1590 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1591 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1593 if (start_active_slot(slot
)) {
1594 run_active_slot(slot
);
1595 if (results
.curl_result
== CURLE_OK
) {
1596 XML_Parser parser
= XML_ParserCreate(NULL
);
1597 enum XML_Status result
;
1598 ctx
.name
= xcalloc(10, 1);
1601 ctx
.userFunc
= handle_lockprop_ctx
;
1602 ctx
.userData
= &lock_flags
;
1603 XML_SetUserData(parser
, &ctx
);
1604 XML_SetElementHandler(parser
, xml_start_tag
,
1606 result
= XML_Parse(parser
, in_buffer
.buf
,
1610 if (result
!= XML_STATUS_OK
) {
1611 fprintf(stderr
, "XML error: %s\n",
1613 XML_GetErrorCode(parser
)));
1616 XML_ParserFree(parser
);
1618 error("Error: no DAV locking support on %s",
1622 error("Cannot access URL %s, return code %d",
1623 remote
->url
, results
.curl_result
);
1627 error("Unable to start PROPFIND request on %s", remote
->url
);
1630 strbuf_release(&out_buffer
.buf
);
1631 strbuf_release(&in_buffer
);
1632 curl_slist_free_all(dav_headers
);
1637 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1639 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1643 return &entry
->next
;
1646 static struct object_list
**process_blob(struct blob
*blob
,
1647 struct object_list
**p
,
1648 struct name_path
*path
,
1651 struct object
*obj
= &blob
->object
;
1653 obj
->flags
|= LOCAL
;
1655 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1659 return add_one_object(obj
, p
);
1662 static struct object_list
**process_tree(struct tree
*tree
,
1663 struct object_list
**p
,
1664 struct name_path
*path
,
1667 struct object
*obj
= &tree
->object
;
1668 struct tree_desc desc
;
1669 struct name_entry entry
;
1670 struct name_path me
;
1672 obj
->flags
|= LOCAL
;
1674 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1676 if (parse_tree(tree
) < 0)
1677 die("bad tree object %s", sha1_to_hex(obj
->sha1
));
1680 name
= xstrdup(name
);
1681 p
= add_one_object(obj
, p
);
1684 me
.elem_len
= strlen(name
);
1686 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1688 while (tree_entry(&desc
, &entry
))
1689 switch (object_type(entry
.mode
)) {
1691 p
= process_tree(lookup_tree(entry
.sha1
), p
, &me
, name
);
1694 p
= process_blob(lookup_blob(entry
.sha1
), p
, &me
, name
);
1697 /* Subproject commit - not in this repository */
1702 tree
->buffer
= NULL
;
1706 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1709 struct commit
*commit
;
1710 struct object_list
**p
= &objects
;
1713 while ((commit
= get_revision(revs
)) != NULL
) {
1714 p
= process_tree(commit
->tree
, p
, NULL
, "");
1715 commit
->object
.flags
|= LOCAL
;
1716 if (!(commit
->object
.flags
& UNINTERESTING
))
1717 count
+= add_send_request(&commit
->object
, lock
);
1720 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1721 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1722 struct object
*obj
= entry
->item
;
1723 const char *name
= entry
->name
;
1725 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1727 if (obj
->type
== OBJ_TAG
) {
1729 p
= add_one_object(obj
, p
);
1732 if (obj
->type
== OBJ_TREE
) {
1733 p
= process_tree((struct tree
*)obj
, p
, NULL
, name
);
1736 if (obj
->type
== OBJ_BLOB
) {
1737 p
= process_blob((struct blob
*)obj
, p
, NULL
, name
);
1740 die("unknown pending object %s (%s)", sha1_to_hex(obj
->sha1
), name
);
1744 if (!(objects
->item
->flags
& UNINTERESTING
))
1745 count
+= add_send_request(objects
->item
, lock
);
1746 objects
= objects
->next
;
1752 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1754 struct active_request_slot
*slot
;
1755 struct slot_results results
;
1756 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1757 struct curl_slist
*dav_headers
;
1759 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1761 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1763 slot
= get_active_slot();
1764 slot
->results
= &results
;
1765 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1766 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1767 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1768 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1769 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1770 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1771 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1772 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1773 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1775 if (start_active_slot(slot
)) {
1776 run_active_slot(slot
);
1777 strbuf_release(&out_buffer
.buf
);
1778 if (results
.curl_result
!= CURLE_OK
) {
1780 "PUT error: curl result=%d, HTTP code=%ld\n",
1781 results
.curl_result
, results
.http_code
);
1782 /* We should attempt recovery? */
1786 strbuf_release(&out_buffer
.buf
);
1787 fprintf(stderr
, "Unable to start PUT request\n");
1794 static struct ref
*local_refs
, **local_tail
;
1795 static struct ref
*remote_refs
, **remote_tail
;
1797 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1800 int len
= strlen(refname
) + 1;
1801 ref
= xcalloc(1, sizeof(*ref
) + len
);
1802 hashcpy(ref
->new_sha1
, sha1
);
1803 memcpy(ref
->name
, refname
, len
);
1805 local_tail
= &ref
->next
;
1809 static void one_remote_ref(char *refname
)
1814 ref
= alloc_ref(refname
);
1816 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1818 "Unable to fetch ref %s from %s\n",
1819 refname
, remote
->url
);
1825 * Fetch a copy of the object if it doesn't exist locally - it
1826 * may be required for updating server info later.
1828 if (remote
->can_update_info_refs
&& !has_sha1_file(ref
->old_sha1
)) {
1829 obj
= lookup_unknown_object(ref
->old_sha1
);
1831 fprintf(stderr
, " fetch %s for %s\n",
1832 sha1_to_hex(ref
->old_sha1
), refname
);
1833 add_fetch_request(obj
);
1838 remote_tail
= &ref
->next
;
1841 static void get_local_heads(void)
1843 local_tail
= &local_refs
;
1844 for_each_ref(one_local_ref
, NULL
);
1847 static void get_dav_remote_heads(void)
1849 remote_tail
= &remote_refs
;
1850 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1853 static int is_zero_sha1(const unsigned char *sha1
)
1857 for (i
= 0; i
< 20; i
++) {
1864 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1867 struct commit_list
*temp
= list
;
1868 temp
->item
->object
.flags
&= ~mark
;
1874 static int ref_newer(const unsigned char *new_sha1
,
1875 const unsigned char *old_sha1
)
1878 struct commit
*old
, *new;
1879 struct commit_list
*list
, *used
;
1882 /* Both new and old must be commit-ish and new is descendant of
1883 * old. Otherwise we require --force.
1885 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1886 if (!o
|| o
->type
!= OBJ_COMMIT
)
1888 old
= (struct commit
*) o
;
1890 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1891 if (!o
|| o
->type
!= OBJ_COMMIT
)
1893 new = (struct commit
*) o
;
1895 if (parse_commit(new) < 0)
1899 commit_list_insert(new, &list
);
1901 new = pop_most_recent_commit(&list
, TMP_MARK
);
1902 commit_list_insert(new, &used
);
1908 unmark_and_free(list
, TMP_MARK
);
1909 unmark_and_free(used
, TMP_MARK
);
1913 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1915 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1921 ref
= alloc_ref(ls
->dentry_name
);
1923 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1925 "Unable to fetch ref %s from %s\n",
1926 ls
->dentry_name
, remote
->url
);
1932 o
= parse_object(ref
->old_sha1
);
1935 "Unable to parse object %s for remote ref %s\n",
1936 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1942 len
= strlen(ls
->dentry_name
) + 42;
1943 ref_info
= xcalloc(len
+ 1, 1);
1944 sprintf(ref_info
, "%s %s\n",
1945 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1946 fwrite_buffer(ref_info
, 1, len
, buf
);
1949 if (o
->type
== OBJ_TAG
) {
1950 o
= deref_tag(o
, ls
->dentry_name
, 0);
1952 len
= strlen(ls
->dentry_name
) + 45;
1953 ref_info
= xcalloc(len
+ 1, 1);
1954 sprintf(ref_info
, "%s %s^{}\n",
1955 sha1_to_hex(o
->sha1
), ls
->dentry_name
);
1956 fwrite_buffer(ref_info
, 1, len
, buf
);
1963 static void update_remote_info_refs(struct remote_lock
*lock
)
1965 struct buffer buffer
= { STRBUF_INIT
, 0 };
1966 struct active_request_slot
*slot
;
1967 struct slot_results results
;
1968 struct curl_slist
*dav_headers
;
1970 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1971 add_remote_info_ref
, &buffer
.buf
);
1973 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1975 slot
= get_active_slot();
1976 slot
->results
= &results
;
1977 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &buffer
);
1978 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, buffer
.buf
.len
);
1979 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1980 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1981 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1982 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1983 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1984 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1985 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1987 if (start_active_slot(slot
)) {
1988 run_active_slot(slot
);
1989 if (results
.curl_result
!= CURLE_OK
) {
1991 "PUT error: curl result=%d, HTTP code=%ld\n",
1992 results
.curl_result
, results
.http_code
);
1996 strbuf_release(&buffer
.buf
);
1999 static int remote_exists(const char *path
)
2001 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
2002 struct active_request_slot
*slot
;
2003 struct slot_results results
;
2006 sprintf(url
, "%s%s", remote
->url
, path
);
2008 slot
= get_active_slot();
2009 slot
->results
= &results
;
2010 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2011 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
2013 if (start_active_slot(slot
)) {
2014 run_active_slot(slot
);
2015 if (results
.http_code
== 404)
2017 else if (results
.curl_result
== CURLE_OK
)
2020 fprintf(stderr
, "HEAD HTTP error %ld\n", results
.http_code
);
2022 fprintf(stderr
, "Unable to start HEAD request\n");
2029 static void fetch_symref(const char *path
, char **symref
, unsigned char *sha1
)
2032 struct strbuf buffer
= STRBUF_INIT
;
2033 struct active_request_slot
*slot
;
2034 struct slot_results results
;
2036 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
2037 sprintf(url
, "%s%s", remote
->url
, path
);
2039 slot
= get_active_slot();
2040 slot
->results
= &results
;
2041 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
2042 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
2043 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
2044 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2045 if (start_active_slot(slot
)) {
2046 run_active_slot(slot
);
2047 if (results
.curl_result
!= CURLE_OK
) {
2048 die("Couldn't get %s for remote symref\n%s",
2049 url
, curl_errorstr
);
2052 die("Unable to start remote symref request");
2060 if (buffer
.len
== 0)
2063 /* If it's a symref, set the refname; otherwise try for a sha1 */
2064 if (!prefixcmp((char *)buffer
.buf
, "ref: ")) {
2065 *symref
= xmemdupz((char *)buffer
.buf
+ 5, buffer
.len
- 6);
2067 get_sha1_hex(buffer
.buf
, sha1
);
2070 strbuf_release(&buffer
);
2073 static int verify_merge_base(unsigned char *head_sha1
, unsigned char *branch_sha1
)
2075 struct commit
*head
= lookup_commit(head_sha1
);
2076 struct commit
*branch
= lookup_commit(branch_sha1
);
2077 struct commit_list
*merge_bases
= get_merge_bases(head
, branch
, 1);
2079 return (merge_bases
&& !merge_bases
->next
&& merge_bases
->item
== branch
);
2082 static int delete_remote_branch(char *pattern
, int force
)
2084 struct ref
*refs
= remote_refs
;
2085 struct ref
*remote_ref
= NULL
;
2086 unsigned char head_sha1
[20];
2087 char *symref
= NULL
;
2089 int patlen
= strlen(pattern
);
2091 struct active_request_slot
*slot
;
2092 struct slot_results results
;
2095 /* Find the remote branch(es) matching the specified branch name */
2096 for (match
= 0; refs
; refs
= refs
->next
) {
2097 char *name
= refs
->name
;
2098 int namelen
= strlen(name
);
2099 if (namelen
< patlen
||
2100 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
2102 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
2108 return error("No remote branch matches %s", pattern
);
2110 return error("More than one remote branch matches %s",
2114 * Remote HEAD must be a symref (not exactly foolproof; a remote
2115 * symlink to a symref will look like a symref)
2117 fetch_symref("HEAD", &symref
, head_sha1
);
2119 return error("Remote HEAD is not a symref");
2121 /* Remote branch must not be the remote HEAD */
2122 for (i
=0; symref
&& i
<MAXDEPTH
; i
++) {
2123 if (!strcmp(remote_ref
->name
, symref
))
2124 return error("Remote branch %s is the current HEAD",
2126 fetch_symref(symref
, &symref
, head_sha1
);
2129 /* Run extra sanity checks if delete is not forced */
2131 /* Remote HEAD must resolve to a known object */
2133 return error("Remote HEAD symrefs too deep");
2134 if (is_zero_sha1(head_sha1
))
2135 return error("Unable to resolve remote HEAD");
2136 if (!has_sha1_file(head_sha1
))
2137 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1
));
2139 /* Remote branch must resolve to a known object */
2140 if (is_zero_sha1(remote_ref
->old_sha1
))
2141 return error("Unable to resolve remote branch %s",
2143 if (!has_sha1_file(remote_ref
->old_sha1
))
2144 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
));
2146 /* Remote branch must be an ancestor of remote HEAD */
2147 if (!verify_merge_base(head_sha1
, remote_ref
->old_sha1
)) {
2148 return error("The branch '%s' is not an ancestor "
2149 "of your current HEAD.\n"
2150 "If you are sure you want to delete it,"
2151 " run:\n\t'git http-push -D %s %s'",
2152 remote_ref
->name
, remote
->url
, pattern
);
2156 /* Send delete request */
2157 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
2160 url
= xmalloc(strlen(remote
->url
) + strlen(remote_ref
->name
) + 1);
2161 sprintf(url
, "%s%s", remote
->url
, remote_ref
->name
);
2162 slot
= get_active_slot();
2163 slot
->results
= &results
;
2164 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
2165 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
2166 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2167 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_DELETE
);
2168 if (start_active_slot(slot
)) {
2169 run_active_slot(slot
);
2171 if (results
.curl_result
!= CURLE_OK
)
2172 return error("DELETE request failed (%d/%ld)\n",
2173 results
.curl_result
, results
.http_code
);
2176 return error("Unable to start DELETE request");
2182 int main(int argc
, char **argv
)
2184 struct transfer_request
*request
;
2185 struct transfer_request
*next_request
;
2187 char **refspec
= NULL
;
2188 struct remote_lock
*ref_lock
= NULL
;
2189 struct remote_lock
*info_ref_lock
= NULL
;
2190 struct rev_info revs
;
2191 int delete_branch
= 0;
2192 int force_delete
= 0;
2193 int objects_to_send
;
2198 char *rewritten_url
= NULL
;
2200 git_extract_argv0_path(argv
[0]);
2202 setup_git_directory();
2204 remote
= xcalloc(sizeof(*remote
), 1);
2207 for (i
= 1; i
< argc
; i
++, argv
++) {
2211 if (!strcmp(arg
, "--all")) {
2212 push_all
= MATCH_REFS_ALL
;
2215 if (!strcmp(arg
, "--force")) {
2219 if (!strcmp(arg
, "--dry-run")) {
2223 if (!strcmp(arg
, "--verbose")) {
2227 if (!strcmp(arg
, "-d")) {
2231 if (!strcmp(arg
, "-D")) {
2238 char *path
= strstr(arg
, "//");
2240 remote
->path_len
= strlen(arg
);
2242 remote
->path
= strchr(path
+2, '/');
2244 remote
->path_len
= strlen(remote
->path
);
2249 nr_refspec
= argc
- i
;
2253 #ifndef USE_CURL_MULTI
2254 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
2258 usage(http_push_usage
);
2260 if (delete_branch
&& nr_refspec
!= 1)
2261 die("You must specify only one branch name when deleting a remote branch");
2263 memset(remote_dir_exists
, -1, 256);
2267 no_pragma_header
= curl_slist_append(no_pragma_header
, "Pragma:");
2269 if (remote
->url
&& remote
->url
[strlen(remote
->url
)-1] != '/') {
2270 rewritten_url
= xmalloc(strlen(remote
->url
)+2);
2271 strcpy(rewritten_url
, remote
->url
);
2272 strcat(rewritten_url
, "/");
2273 remote
->path
= rewritten_url
+ (remote
->path
- remote
->url
);
2275 remote
->url
= rewritten_url
;
2278 /* Verify DAV compliance/lock support */
2279 if (!locking_available()) {
2284 sigchain_push_common(remove_locks_on_signal
);
2286 /* Check whether the remote has server info files */
2287 remote
->can_update_info_refs
= 0;
2288 remote
->has_info_refs
= remote_exists("info/refs");
2289 remote
->has_info_packs
= remote_exists("objects/info/packs");
2290 if (remote
->has_info_refs
) {
2291 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
2293 remote
->can_update_info_refs
= 1;
2295 fprintf(stderr
, "Error: cannot lock existing info/refs\n");
2300 if (remote
->has_info_packs
)
2303 /* Get a list of all local and remote heads to validate refspecs */
2305 fprintf(stderr
, "Fetching remote heads...\n");
2306 get_dav_remote_heads();
2308 /* Remove a remote branch if -d or -D was specified */
2309 if (delete_branch
) {
2310 if (delete_remote_branch(refspec
[0], force_delete
) == -1)
2311 fprintf(stderr
, "Unable to delete remote branch %s\n",
2318 remote_tail
= &remote_refs
;
2319 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
2320 nr_refspec
, (const char **) refspec
, push_all
)) {
2325 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
2331 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2332 char old_hex
[60], *new_hex
;
2333 const char *commit_argv
[4];
2335 char *new_sha1_hex
, *old_sha1_hex
;
2340 if (is_zero_sha1(ref
->peer_ref
->new_sha1
)) {
2341 if (delete_remote_branch(ref
->name
, 1) == -1) {
2342 error("Could not remove %s", ref
->name
);
2349 if (!hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
2350 if (push_verbosely
|| 1)
2351 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
2356 !is_zero_sha1(ref
->old_sha1
) &&
2358 if (!has_sha1_file(ref
->old_sha1
) ||
2359 !ref_newer(ref
->peer_ref
->new_sha1
,
2362 * We do not have the remote ref, or
2363 * we know that the remote ref is not
2364 * an ancestor of what we are trying to
2365 * push. Either way this can be losing
2366 * commits at the remote end and likely
2367 * we were not up to date to begin with.
2369 error("remote '%s' is not an ancestor of\n"
2371 "Maybe you are not up-to-date and "
2372 "need to pull first?",
2374 ref
->peer_ref
->name
);
2379 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
2381 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
2382 new_hex
= sha1_to_hex(ref
->new_sha1
);
2384 fprintf(stderr
, "updating '%s'", ref
->name
);
2385 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
2386 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
2387 fprintf(stderr
, "\n from %s\n to %s\n", old_hex
, new_hex
);
2391 /* Lock remote branch ref */
2392 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
2393 if (ref_lock
== NULL
) {
2394 fprintf(stderr
, "Unable to lock remote branch %s\n",
2400 /* Set up revision info for this refspec */
2402 new_sha1_hex
= xstrdup(sha1_to_hex(ref
->new_sha1
));
2403 old_sha1_hex
= NULL
;
2404 commit_argv
[1] = "--objects";
2405 commit_argv
[2] = new_sha1_hex
;
2406 if (!push_all
&& !is_zero_sha1(ref
->old_sha1
)) {
2407 old_sha1_hex
= xmalloc(42);
2408 sprintf(old_sha1_hex
, "^%s",
2409 sha1_to_hex(ref
->old_sha1
));
2410 commit_argv
[3] = old_sha1_hex
;
2413 init_revisions(&revs
, setup_git_directory());
2414 setup_revisions(commit_argc
, commit_argv
, &revs
, NULL
);
2415 revs
.edge_hint
= 0; /* just in case */
2419 commit_argv
[1] = NULL
;
2422 /* Generate a list of objects that need to be pushed */
2424 if (prepare_revision_walk(&revs
))
2425 die("revision walk setup failed");
2426 mark_edges_uninteresting(revs
.commits
, &revs
, NULL
);
2427 objects_to_send
= get_delta(&revs
, ref_lock
);
2428 finish_all_active_slots();
2430 /* Push missing objects to remote, this would be a
2431 convenient time to pack them first if appropriate. */
2433 if (objects_to_send
)
2434 fprintf(stderr
, " sending %d objects\n",
2436 #ifdef USE_CURL_MULTI
2437 fill_active_slots();
2438 add_fill_function(NULL
, fill_active_slot
);
2441 finish_all_active_slots();
2442 #ifdef USE_CURL_MULTI
2443 fill_active_slots();
2445 } while (request_queue_head
&& !aborted
);
2447 /* Update the remote branch if all went well */
2448 if (aborted
|| !update_remote(ref
->new_sha1
, ref_lock
))
2452 fprintf(stderr
, " done\n");
2453 unlock_remote(ref_lock
);
2457 /* Update remote server info if appropriate */
2458 if (remote
->has_info_refs
&& new_refs
) {
2459 if (info_ref_lock
&& remote
->can_update_info_refs
) {
2460 fprintf(stderr
, "Updating remote server info\n");
2462 update_remote_info_refs(info_ref_lock
);
2464 fprintf(stderr
, "Unable to update server info\n");
2469 free(rewritten_url
);
2471 unlock_remote(info_ref_lock
);
2474 curl_slist_free_all(no_pragma_header
);
2478 request
= request_queue_head
;
2479 while (request
!= NULL
) {
2480 next_request
= request
->next
;
2481 release_request(request
);
2482 request
= next_request
;