15 static const char http_push_usage
[] =
16 "git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
23 #define XML_STATUS_OK 1
24 #define XML_STATUS_ERROR 0
27 #define PREV_BUF_SIZE 4096
28 #define RANGE_HEADER_SIZE 30
31 #define DAV_LOCK "LOCK"
32 #define DAV_MKCOL "MKCOL"
33 #define DAV_MOVE "MOVE"
34 #define DAV_PROPFIND "PROPFIND"
36 #define DAV_UNLOCK "UNLOCK"
37 #define DAV_DELETE "DELETE"
40 #define DAV_PROP_LOCKWR (1u << 0)
41 #define DAV_PROP_LOCKEX (1u << 1)
42 #define DAV_LOCK_OK (1u << 2)
44 /* DAV XML properties */
45 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
46 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
47 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
48 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
49 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
50 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
51 #define DAV_PROPFIND_RESP ".multistatus.response"
52 #define DAV_PROPFIND_NAME ".multistatus.response.href"
53 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
55 /* DAV request body templates */
56 #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>"
57 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
58 #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>"
61 #define LOCK_REFRESH 30
63 /* bits #0-15 in revision.h */
65 #define LOCAL (1u<<16)
66 #define REMOTE (1u<<17)
67 #define FETCHING (1u<<18)
68 #define PUSHING (1u<<19)
70 /* We allow "recursive" symbolic refs. Only within reason, though */
75 static signed char remote_dir_exists
[256];
77 static struct curl_slist
*no_pragma_header
;
79 static int push_verbosely
;
80 static int push_all
= MATCH_REFS_NONE
;
84 static struct object_list
*objects
;
91 int can_update_info_refs
;
93 struct packed_git
*packs
;
94 struct remote_lock
*locks
;
97 static struct repo
*remote
;
111 struct transfer_request
116 struct remote_lock
*lock
;
117 struct curl_slist
*headers
;
118 struct buffer buffer
;
119 char filename
[PATH_MAX
];
120 char tmpfile
[PATH_MAX
];
123 enum transfer_state state
;
124 CURLcode curl_result
;
125 char errorstr
[CURL_ERROR_SIZE
];
127 unsigned char real_sha1
[20];
133 struct active_request_slot
*slot
;
134 struct transfer_request
*next
;
137 static struct transfer_request
*request_queue_head
;
144 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
156 struct remote_lock
*next
;
159 /* Flags that control remote_ls processing */
160 #define PROCESS_FILES (1u << 0)
161 #define PROCESS_DIRS (1u << 1)
162 #define RECURSIVE (1u << 2)
164 /* Flags that remote_ls passes to callback functions */
165 #define IS_DIR (1u << 0)
170 void (*userFunc
)(struct remote_ls_ctx
*ls
);
175 struct remote_ls_ctx
*parent
;
178 static void finish_request(struct transfer_request
*request
);
179 static void release_request(struct transfer_request
*request
);
181 static void process_response(void *callback_data
)
183 struct transfer_request
*request
=
184 (struct transfer_request
*)callback_data
;
186 finish_request(request
);
189 #ifdef USE_CURL_MULTI
190 static size_t fwrite_sha1_file(void *ptr
, size_t eltsize
, size_t nmemb
,
193 unsigned char expn
[4096];
194 size_t size
= eltsize
* nmemb
;
196 struct transfer_request
*request
= (struct transfer_request
*)data
;
198 ssize_t retval
= xwrite(request
->local_fileno
,
199 (char *) ptr
+ posn
, size
- posn
);
203 } while (posn
< size
);
205 request
->stream
.avail_in
= size
;
206 request
->stream
.next_in
= ptr
;
208 request
->stream
.next_out
= expn
;
209 request
->stream
.avail_out
= sizeof(expn
);
210 request
->zret
= inflate(&request
->stream
, Z_SYNC_FLUSH
);
211 SHA1_Update(&request
->c
, expn
,
212 sizeof(expn
) - request
->stream
.avail_out
);
213 } while (request
->stream
.avail_in
&& request
->zret
== Z_OK
);
218 static void start_fetch_loose(struct transfer_request
*request
)
220 char *hex
= sha1_to_hex(request
->obj
->sha1
);
222 char prevfile
[PATH_MAX
];
226 unsigned char prev_buf
[PREV_BUF_SIZE
];
227 ssize_t prev_read
= 0;
229 char range
[RANGE_HEADER_SIZE
];
230 struct curl_slist
*range_header
= NULL
;
231 struct active_request_slot
*slot
;
233 filename
= sha1_file_name(request
->obj
->sha1
);
234 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
235 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
236 "%s.temp", filename
);
238 snprintf(prevfile
, sizeof(prevfile
), "%s.prev", request
->filename
);
240 rename(request
->tmpfile
, prevfile
);
241 unlink(request
->tmpfile
);
243 if (request
->local_fileno
!= -1)
244 error("fd leakage in start: %d", request
->local_fileno
);
245 request
->local_fileno
= open(request
->tmpfile
,
246 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
247 /* This could have failed due to the "lazy directory creation";
248 * try to mkdir the last path component.
250 if (request
->local_fileno
< 0 && errno
== ENOENT
) {
251 char *dir
= strrchr(request
->tmpfile
, '/');
254 mkdir(request
->tmpfile
, 0777);
257 request
->local_fileno
= open(request
->tmpfile
,
258 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
261 if (request
->local_fileno
< 0) {
262 request
->state
= ABORTED
;
263 error("Couldn't create temporary file %s for %s: %s",
264 request
->tmpfile
, request
->filename
, strerror(errno
));
268 memset(&request
->stream
, 0, sizeof(request
->stream
));
270 inflateInit(&request
->stream
);
272 SHA1_Init(&request
->c
);
274 url
= xmalloc(strlen(remote
->url
) + 50);
275 request
->url
= xmalloc(strlen(remote
->url
) + 50);
276 strcpy(url
, remote
->url
);
277 posn
= url
+ strlen(remote
->url
);
278 strcpy(posn
, "objects/");
280 memcpy(posn
, hex
, 2);
283 strcpy(posn
, hex
+ 2);
284 strcpy(request
->url
, url
);
286 /* If a previous temp file is present, process what was already
288 prevlocal
= open(prevfile
, O_RDONLY
);
289 if (prevlocal
!= -1) {
291 prev_read
= xread(prevlocal
, prev_buf
, PREV_BUF_SIZE
);
293 if (fwrite_sha1_file(prev_buf
,
296 request
) == prev_read
) {
297 prev_posn
+= prev_read
;
302 } while (prev_read
> 0);
307 /* Reset inflate/SHA1 if there was an error reading the previous temp
308 file; also rewind to the beginning of the local file. */
309 if (prev_read
== -1) {
310 memset(&request
->stream
, 0, sizeof(request
->stream
));
311 inflateInit(&request
->stream
);
312 SHA1_Init(&request
->c
);
315 lseek(request
->local_fileno
, 0, SEEK_SET
);
316 ftruncate(request
->local_fileno
, 0);
320 slot
= get_active_slot();
321 slot
->callback_func
= process_response
;
322 slot
->callback_data
= request
;
323 request
->slot
= slot
;
325 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, request
);
326 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_sha1_file
);
327 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
328 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
329 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
331 /* If we have successfully processed data from a previous fetch
332 attempt, only fetch the data we don't already have. */
336 "Resuming fetch of object %s at byte %ld\n",
338 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
339 range_header
= curl_slist_append(range_header
, range
);
340 curl_easy_setopt(slot
->curl
,
341 CURLOPT_HTTPHEADER
, range_header
);
344 /* Try to get the request started, abort the request on error */
345 request
->state
= RUN_FETCH_LOOSE
;
346 if (!start_active_slot(slot
)) {
347 fprintf(stderr
, "Unable to start GET request\n");
348 remote
->can_update_info_refs
= 0;
349 release_request(request
);
353 static void start_mkcol(struct transfer_request
*request
)
355 char *hex
= sha1_to_hex(request
->obj
->sha1
);
356 struct active_request_slot
*slot
;
359 request
->url
= xmalloc(strlen(remote
->url
) + 13);
360 strcpy(request
->url
, remote
->url
);
361 posn
= request
->url
+ strlen(remote
->url
);
362 strcpy(posn
, "objects/");
364 memcpy(posn
, hex
, 2);
368 slot
= get_active_slot();
369 slot
->callback_func
= process_response
;
370 slot
->callback_data
= request
;
371 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
372 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
373 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
374 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
375 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
377 if (start_active_slot(slot
)) {
378 request
->slot
= slot
;
379 request
->state
= RUN_MKCOL
;
381 request
->state
= ABORTED
;
388 static void start_fetch_packed(struct transfer_request
*request
)
391 struct packed_git
*target
;
395 char range
[RANGE_HEADER_SIZE
];
396 struct curl_slist
*range_header
= NULL
;
398 struct transfer_request
*check_request
= request_queue_head
;
399 struct active_request_slot
*slot
;
401 target
= find_sha1_pack(request
->obj
->sha1
, remote
->packs
);
403 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request
->obj
->sha1
));
404 remote
->can_update_info_refs
= 0;
405 release_request(request
);
409 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
410 fprintf(stderr
, " which contains %s\n", sha1_to_hex(request
->obj
->sha1
));
412 filename
= sha1_pack_name(target
->sha1
);
413 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
414 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
415 "%s.temp", filename
);
417 url
= xmalloc(strlen(remote
->url
) + 64);
418 sprintf(url
, "%sobjects/pack/pack-%s.pack",
419 remote
->url
, sha1_to_hex(target
->sha1
));
421 /* Make sure there isn't another open request for this pack */
422 while (check_request
) {
423 if (check_request
->state
== RUN_FETCH_PACKED
&&
424 !strcmp(check_request
->url
, url
)) {
426 release_request(request
);
429 check_request
= check_request
->next
;
432 packfile
= fopen(request
->tmpfile
, "a");
434 fprintf(stderr
, "Unable to open local file %s for pack",
436 remote
->can_update_info_refs
= 0;
441 slot
= get_active_slot();
442 slot
->callback_func
= process_response
;
443 slot
->callback_data
= request
;
444 request
->slot
= slot
;
445 request
->local_stream
= packfile
;
446 request
->userData
= target
;
449 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, packfile
);
450 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
451 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
452 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
453 slot
->local
= packfile
;
455 /* If there is data present from a previous transfer attempt,
456 resume where it left off */
457 prev_posn
= ftell(packfile
);
461 "Resuming fetch of pack %s at byte %ld\n",
462 sha1_to_hex(target
->sha1
), prev_posn
);
463 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
464 range_header
= curl_slist_append(range_header
, range
);
465 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
468 /* Try to get the request started, abort the request on error */
469 request
->state
= RUN_FETCH_PACKED
;
470 if (!start_active_slot(slot
)) {
471 fprintf(stderr
, "Unable to start GET request\n");
472 remote
->can_update_info_refs
= 0;
473 release_request(request
);
477 static void start_put(struct transfer_request
*request
)
479 char *hex
= sha1_to_hex(request
->obj
->sha1
);
480 struct active_request_slot
*slot
;
482 enum object_type type
;
490 unpacked
= read_sha1_file(request
->obj
->sha1
, &type
, &len
);
491 hdrlen
= sprintf(hdr
, "%s %lu", typename(type
), len
) + 1;
494 memset(&stream
, 0, sizeof(stream
));
495 deflateInit(&stream
, zlib_compression_level
);
496 size
= deflateBound(&stream
, len
+ hdrlen
);
497 strbuf_init(&request
->buffer
.buf
, size
);
498 request
->buffer
.posn
= 0;
501 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
502 stream
.avail_out
= size
;
505 stream
.next_in
= (void *)hdr
;
506 stream
.avail_in
= hdrlen
;
507 while (deflate(&stream
, 0) == Z_OK
)
510 /* Then the data itself.. */
511 stream
.next_in
= unpacked
;
512 stream
.avail_in
= len
;
513 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
518 request
->buffer
.buf
.len
= stream
.total_out
;
520 request
->url
= xmalloc(strlen(remote
->url
) +
521 strlen(request
->lock
->token
) + 51);
522 strcpy(request
->url
, remote
->url
);
523 posn
= request
->url
+ strlen(remote
->url
);
524 strcpy(posn
, "objects/");
526 memcpy(posn
, hex
, 2);
529 strcpy(posn
, hex
+ 2);
530 request
->dest
= xmalloc(strlen(request
->url
) + 14);
531 sprintf(request
->dest
, "Destination: %s", request
->url
);
534 strcpy(posn
, request
->lock
->token
);
536 slot
= get_active_slot();
537 slot
->callback_func
= process_response
;
538 slot
->callback_data
= request
;
539 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &request
->buffer
);
540 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, request
->buffer
.buf
.len
);
541 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
542 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
543 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
544 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
545 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
546 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
547 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
549 if (start_active_slot(slot
)) {
550 request
->slot
= slot
;
551 request
->state
= RUN_PUT
;
553 request
->state
= ABORTED
;
559 static void start_move(struct transfer_request
*request
)
561 struct active_request_slot
*slot
;
562 struct curl_slist
*dav_headers
= NULL
;
564 slot
= get_active_slot();
565 slot
->callback_func
= process_response
;
566 slot
->callback_data
= request
;
567 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
568 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MOVE
);
569 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
570 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
571 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
572 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
573 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
575 if (start_active_slot(slot
)) {
576 request
->slot
= slot
;
577 request
->state
= RUN_MOVE
;
579 request
->state
= ABORTED
;
585 static int refresh_lock(struct remote_lock
*lock
)
587 struct active_request_slot
*slot
;
588 struct slot_results results
;
590 char timeout_header
[25];
591 struct curl_slist
*dav_headers
= NULL
;
594 lock
->refreshing
= 1;
596 if_header
= xmalloc(strlen(lock
->token
) + 25);
597 sprintf(if_header
, "If: (<opaquelocktoken:%s>)", lock
->token
);
598 sprintf(timeout_header
, "Timeout: Second-%ld", lock
->timeout
);
599 dav_headers
= curl_slist_append(dav_headers
, if_header
);
600 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
602 slot
= get_active_slot();
603 slot
->results
= &results
;
604 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
605 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
606 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
607 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
608 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
610 if (start_active_slot(slot
)) {
611 run_active_slot(slot
);
612 if (results
.curl_result
!= CURLE_OK
) {
613 fprintf(stderr
, "LOCK HTTP error %ld\n",
616 lock
->start_time
= time(NULL
);
621 lock
->refreshing
= 0;
622 curl_slist_free_all(dav_headers
);
628 static void check_locks(void)
630 struct remote_lock
*lock
= remote
->locks
;
631 time_t current_time
= time(NULL
);
635 time_remaining
= lock
->start_time
+ lock
->timeout
-
637 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
638 if (!refresh_lock(lock
)) {
640 "Unable to refresh lock for %s\n",
650 static void release_request(struct transfer_request
*request
)
652 struct transfer_request
*entry
= request_queue_head
;
654 if (request
== request_queue_head
) {
655 request_queue_head
= request
->next
;
657 while (entry
->next
!= NULL
&& entry
->next
!= request
)
659 if (entry
->next
== request
)
660 entry
->next
= entry
->next
->next
;
663 if (request
->local_fileno
!= -1)
664 close(request
->local_fileno
);
665 if (request
->local_stream
)
666 fclose(request
->local_stream
);
667 if (request
->url
!= NULL
)
672 static void finish_request(struct transfer_request
*request
)
675 struct packed_git
*target
;
676 struct packed_git
**lst
;
678 request
->curl_result
= request
->slot
->curl_result
;
679 request
->http_code
= request
->slot
->http_code
;
680 request
->slot
= NULL
;
682 /* Keep locks active */
685 if (request
->headers
!= NULL
)
686 curl_slist_free_all(request
->headers
);
688 /* URL is reused for MOVE after PUT */
689 if (request
->state
!= RUN_PUT
) {
694 if (request
->state
== RUN_MKCOL
) {
695 if (request
->curl_result
== CURLE_OK
||
696 request
->http_code
== 405) {
697 remote_dir_exists
[request
->obj
->sha1
[0]] = 1;
700 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
701 sha1_to_hex(request
->obj
->sha1
),
702 request
->curl_result
, request
->http_code
);
703 request
->state
= ABORTED
;
706 } else if (request
->state
== RUN_PUT
) {
707 if (request
->curl_result
== CURLE_OK
) {
710 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
711 sha1_to_hex(request
->obj
->sha1
),
712 request
->curl_result
, request
->http_code
);
713 request
->state
= ABORTED
;
716 } else if (request
->state
== RUN_MOVE
) {
717 if (request
->curl_result
== CURLE_OK
) {
719 fprintf(stderr
, " sent %s\n",
720 sha1_to_hex(request
->obj
->sha1
));
721 request
->obj
->flags
|= REMOTE
;
722 release_request(request
);
724 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
725 sha1_to_hex(request
->obj
->sha1
),
726 request
->curl_result
, request
->http_code
);
727 request
->state
= ABORTED
;
730 } else if (request
->state
== RUN_FETCH_LOOSE
) {
731 fchmod(request
->local_fileno
, 0444);
732 close(request
->local_fileno
); request
->local_fileno
= -1;
734 if (request
->curl_result
!= CURLE_OK
&&
735 request
->http_code
!= 416) {
736 if (stat(request
->tmpfile
, &st
) == 0) {
738 unlink(request
->tmpfile
);
741 if (request
->http_code
== 416)
742 fprintf(stderr
, "Warning: requested range invalid; we may already have all the data.\n");
744 inflateEnd(&request
->stream
);
745 SHA1_Final(request
->real_sha1
, &request
->c
);
746 if (request
->zret
!= Z_STREAM_END
) {
747 unlink(request
->tmpfile
);
748 } else if (hashcmp(request
->obj
->sha1
, request
->real_sha1
)) {
749 unlink(request
->tmpfile
);
755 if (request
->rename
== 0) {
756 request
->obj
->flags
|= (LOCAL
| REMOTE
);
761 /* Try fetching packed if necessary */
762 if (request
->obj
->flags
& LOCAL
)
763 release_request(request
);
765 start_fetch_packed(request
);
767 } else if (request
->state
== RUN_FETCH_PACKED
) {
768 if (request
->curl_result
!= CURLE_OK
) {
769 fprintf(stderr
, "Unable to get pack file %s\n%s",
770 request
->url
, curl_errorstr
);
771 remote
->can_update_info_refs
= 0;
773 off_t pack_size
= ftell(request
->local_stream
);
775 fclose(request
->local_stream
);
776 request
->local_stream
= NULL
;
777 if (!move_temp_to_file(request
->tmpfile
,
778 request
->filename
)) {
779 target
= (struct packed_git
*)request
->userData
;
780 target
->pack_size
= pack_size
;
781 lst
= &remote
->packs
;
782 while (*lst
!= target
)
783 lst
= &((*lst
)->next
);
786 if (!verify_pack(target
, 0))
787 install_packed_git(target
);
789 remote
->can_update_info_refs
= 0;
792 release_request(request
);
796 #ifdef USE_CURL_MULTI
797 static int fill_active_slot(void *unused
)
799 struct transfer_request
*request
= request_queue_head
;
804 for (request
= request_queue_head
; request
; request
= request
->next
) {
805 if (request
->state
== NEED_FETCH
) {
806 start_fetch_loose(request
);
808 } else if (pushing
&& request
->state
== NEED_PUSH
) {
809 if (remote_dir_exists
[request
->obj
->sha1
[0]] == 1) {
812 start_mkcol(request
);
821 static void get_remote_object_list(unsigned char parent
);
823 static void add_fetch_request(struct object
*obj
)
825 struct transfer_request
*request
;
830 * Don't fetch the object if it's known to exist locally
831 * or is already in the request queue
833 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
834 get_remote_object_list(obj
->sha1
[0]);
835 if (obj
->flags
& (LOCAL
| FETCHING
))
838 obj
->flags
|= FETCHING
;
839 request
= xmalloc(sizeof(*request
));
842 request
->lock
= NULL
;
843 request
->headers
= NULL
;
844 request
->local_fileno
= -1;
845 request
->local_stream
= NULL
;
846 request
->state
= NEED_FETCH
;
847 request
->next
= request_queue_head
;
848 request_queue_head
= request
;
850 #ifdef USE_CURL_MULTI
856 static int add_send_request(struct object
*obj
, struct remote_lock
*lock
)
858 struct transfer_request
*request
= request_queue_head
;
859 struct packed_git
*target
;
861 /* Keep locks active */
865 * Don't push the object if it's known to exist on the remote
866 * or is already in the request queue
868 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
869 get_remote_object_list(obj
->sha1
[0]);
870 if (obj
->flags
& (REMOTE
| PUSHING
))
872 target
= find_sha1_pack(obj
->sha1
, remote
->packs
);
874 obj
->flags
|= REMOTE
;
878 obj
->flags
|= PUSHING
;
879 request
= xmalloc(sizeof(*request
));
882 request
->lock
= lock
;
883 request
->headers
= NULL
;
884 request
->local_fileno
= -1;
885 request
->local_stream
= NULL
;
886 request
->state
= NEED_PUSH
;
887 request
->next
= request_queue_head
;
888 request_queue_head
= request
;
890 #ifdef USE_CURL_MULTI
898 static int fetch_index(unsigned char *sha1
)
900 char *hex
= sha1_to_hex(sha1
);
903 char tmpfile
[PATH_MAX
];
905 char range
[RANGE_HEADER_SIZE
];
906 struct curl_slist
*range_header
= NULL
;
909 struct active_request_slot
*slot
;
910 struct slot_results results
;
912 /* Don't use the index if the pack isn't there */
913 url
= xmalloc(strlen(remote
->url
) + 64);
914 sprintf(url
, "%sobjects/pack/pack-%s.pack", remote
->url
, hex
);
915 slot
= get_active_slot();
916 slot
->results
= &results
;
917 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
918 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
919 if (start_active_slot(slot
)) {
920 run_active_slot(slot
);
921 if (results
.curl_result
!= CURLE_OK
) {
923 return error("Unable to verify pack %s is available",
928 return error("Unable to start request");
931 if (has_pack_index(sha1
)) {
937 fprintf(stderr
, "Getting index for pack %s\n", hex
);
939 sprintf(url
, "%sobjects/pack/pack-%s.idx", remote
->url
, hex
);
941 filename
= sha1_pack_index_name(sha1
);
942 snprintf(tmpfile
, sizeof(tmpfile
), "%s.temp", filename
);
943 indexfile
= fopen(tmpfile
, "a");
946 return error("Unable to open local file %s for pack index",
950 slot
= get_active_slot();
951 slot
->results
= &results
;
952 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
953 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
954 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, indexfile
);
955 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
956 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
957 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
958 slot
->local
= indexfile
;
960 /* If there is data present from a previous transfer attempt,
961 resume where it left off */
962 prev_posn
= ftell(indexfile
);
966 "Resuming fetch of index for pack %s at byte %ld\n",
968 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
969 range_header
= curl_slist_append(range_header
, range
);
970 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
973 if (start_active_slot(slot
)) {
974 run_active_slot(slot
);
975 if (results
.curl_result
!= CURLE_OK
) {
978 return error("Unable to get pack index %s\n%s", url
,
984 return error("Unable to start request");
990 return move_temp_to_file(tmpfile
, filename
);
993 static int setup_index(unsigned char *sha1
)
995 struct packed_git
*new_pack
;
997 if (fetch_index(sha1
))
1000 new_pack
= parse_pack_index(sha1
);
1001 new_pack
->next
= remote
->packs
;
1002 remote
->packs
= new_pack
;
1006 static int fetch_indices(void)
1008 unsigned char sha1
[20];
1010 struct strbuf buffer
= STRBUF_INIT
;
1014 struct active_request_slot
*slot
;
1015 struct slot_results results
;
1018 fprintf(stderr
, "Getting pack list\n");
1020 url
= xmalloc(strlen(remote
->url
) + 20);
1021 sprintf(url
, "%sobjects/info/packs", remote
->url
);
1023 slot
= get_active_slot();
1024 slot
->results
= &results
;
1025 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
1026 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1027 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1028 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
1029 if (start_active_slot(slot
)) {
1030 run_active_slot(slot
);
1031 if (results
.curl_result
!= CURLE_OK
) {
1032 strbuf_release(&buffer
);
1034 if (results
.http_code
== 404)
1037 return error("%s", curl_errorstr
);
1040 strbuf_release(&buffer
);
1042 return error("Unable to start request");
1047 while (i
< buffer
.len
) {
1051 if (i
+ 52 < buffer
.len
&&
1052 !prefixcmp(data
+ i
, " pack-") &&
1053 !prefixcmp(data
+ i
+ 46, ".pack\n")) {
1054 get_sha1_hex(data
+ i
+ 6, sha1
);
1060 while (data
[i
] != '\n')
1066 strbuf_release(&buffer
);
1070 static void one_remote_object(const char *hex
)
1072 unsigned char sha1
[20];
1075 if (get_sha1_hex(hex
, sha1
) != 0)
1078 obj
= lookup_object(sha1
);
1080 obj
= parse_object(sha1
);
1082 /* Ignore remote objects that don't exist locally */
1086 obj
->flags
|= REMOTE
;
1087 if (!object_list_contains(objects
, obj
))
1088 object_list_insert(obj
, &objects
);
1091 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1093 int *lock_flags
= (int *)ctx
->userData
;
1096 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
1097 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
1098 (*lock_flags
& DAV_PROP_LOCKWR
)) {
1099 *lock_flags
|= DAV_LOCK_OK
;
1101 *lock_flags
&= DAV_LOCK_OK
;
1102 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
1103 *lock_flags
|= DAV_PROP_LOCKWR
;
1104 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
1105 *lock_flags
|= DAV_PROP_LOCKEX
;
1110 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1112 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
1114 if (tag_closed
&& ctx
->cdata
) {
1115 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
1116 lock
->owner
= xmalloc(strlen(ctx
->cdata
) + 1);
1117 strcpy(lock
->owner
, ctx
->cdata
);
1118 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
1119 if (!prefixcmp(ctx
->cdata
, "Second-"))
1121 strtol(ctx
->cdata
+ 7, NULL
, 10);
1122 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
1123 if (!prefixcmp(ctx
->cdata
, "opaquelocktoken:")) {
1124 lock
->token
= xmalloc(strlen(ctx
->cdata
) - 15);
1125 strcpy(lock
->token
, ctx
->cdata
+ 16);
1131 static void one_remote_ref(char *refname
);
1134 xml_start_tag(void *userData
, const char *name
, const char **atts
)
1136 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1137 const char *c
= strchr(name
, ':');
1145 new_len
= strlen(ctx
->name
) + strlen(c
) + 2;
1147 if (new_len
> ctx
->len
) {
1148 ctx
->name
= xrealloc(ctx
->name
, new_len
);
1151 strcat(ctx
->name
, ".");
1152 strcat(ctx
->name
, c
);
1157 ctx
->userFunc(ctx
, 0);
1161 xml_end_tag(void *userData
, const char *name
)
1163 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1164 const char *c
= strchr(name
, ':');
1167 ctx
->userFunc(ctx
, 1);
1174 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
1179 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
1181 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1183 ctx
->cdata
= xmemdupz(s
, len
);
1186 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
1188 struct active_request_slot
*slot
;
1189 struct slot_results results
;
1190 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1191 struct strbuf in_buffer
= STRBUF_INIT
;
1194 char timeout_header
[25];
1195 struct remote_lock
*lock
= NULL
;
1196 struct curl_slist
*dav_headers
= NULL
;
1199 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1200 sprintf(url
, "%s%s", remote
->url
, path
);
1202 /* Make sure leading directories exist for the remote ref */
1203 ep
= strchr(url
+ strlen(remote
->url
) + 1, '/');
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) {
1217 "Unable to create branch path %s\n",
1223 fprintf(stderr
, "Unable to start MKCOL request\n");
1228 ep
= strchr(ep
+ 1, '/');
1231 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, git_default_email
);
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");
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
);
1249 lock
= xcalloc(1, sizeof(*lock
));
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);
1260 ctx
.userFunc
= handle_new_lock_ctx
;
1261 ctx
.userData
= lock
;
1262 XML_SetUserData(parser
, &ctx
);
1263 XML_SetElementHandler(parser
, xml_start_tag
,
1265 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1266 result
= XML_Parse(parser
, in_buffer
.buf
,
1269 if (result
!= XML_STATUS_OK
) {
1270 fprintf(stderr
, "XML error: %s\n",
1272 XML_GetErrorCode(parser
)));
1275 XML_ParserFree(parser
);
1278 fprintf(stderr
, "Unable to start LOCK request\n");
1281 curl_slist_free_all(dav_headers
);
1282 strbuf_release(&out_buffer
.buf
);
1283 strbuf_release(&in_buffer
);
1285 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
1286 if (lock
->token
!= NULL
)
1288 if (lock
->owner
!= NULL
)
1295 lock
->start_time
= time(NULL
);
1296 lock
->next
= remote
->locks
;
1297 remote
->locks
= lock
;
1303 static int unlock_remote(struct remote_lock
*lock
)
1305 struct active_request_slot
*slot
;
1306 struct slot_results results
;
1307 struct remote_lock
*prev
= remote
->locks
;
1308 char *lock_token_header
;
1309 struct curl_slist
*dav_headers
= NULL
;
1312 lock_token_header
= xmalloc(strlen(lock
->token
) + 31);
1313 sprintf(lock_token_header
, "Lock-Token: <opaquelocktoken:%s>",
1315 dav_headers
= curl_slist_append(dav_headers
, lock_token_header
);
1317 slot
= get_active_slot();
1318 slot
->results
= &results
;
1319 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1320 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1321 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_UNLOCK
);
1322 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1324 if (start_active_slot(slot
)) {
1325 run_active_slot(slot
);
1326 if (results
.curl_result
== CURLE_OK
)
1329 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
1332 fprintf(stderr
, "Unable to start UNLOCK request\n");
1335 curl_slist_free_all(dav_headers
);
1336 free(lock_token_header
);
1338 if (remote
->locks
== lock
) {
1339 remote
->locks
= lock
->next
;
1341 while (prev
&& prev
->next
!= lock
)
1344 prev
->next
= prev
->next
->next
;
1347 if (lock
->owner
!= NULL
)
1356 static void remote_ls(const char *path
, int flags
,
1357 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1360 static void process_ls_object(struct remote_ls_ctx
*ls
)
1362 unsigned int *parent
= (unsigned int *)ls
->userData
;
1363 char *path
= ls
->dentry_name
;
1366 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1367 remote_dir_exists
[*parent
] = 1;
1371 if (strlen(path
) != 49)
1374 obj_hex
= xmalloc(strlen(path
));
1375 /* NB: path is not null-terminated, can not use strlcpy here */
1376 memcpy(obj_hex
, path
, 2);
1377 strcpy(obj_hex
+ 2, path
+ 3);
1378 one_remote_object(obj_hex
);
1382 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1384 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1385 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1389 if (!(ls
->dentry_flags
& IS_DIR
))
1390 one_remote_ref(ls
->dentry_name
);
1393 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1395 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1398 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1399 if (ls
->dentry_flags
& IS_DIR
) {
1400 if (ls
->flags
& PROCESS_DIRS
) {
1403 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1404 ls
->flags
& RECURSIVE
) {
1405 remote_ls(ls
->dentry_name
,
1410 } else if (ls
->flags
& PROCESS_FILES
) {
1413 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1414 ls
->dentry_name
= xmalloc(strlen(ctx
->cdata
) -
1415 remote
->path_len
+ 1);
1416 strcpy(ls
->dentry_name
, ctx
->cdata
+ remote
->path_len
);
1417 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1418 ls
->dentry_flags
|= IS_DIR
;
1420 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1421 free(ls
->dentry_name
);
1422 ls
->dentry_name
= NULL
;
1423 ls
->dentry_flags
= 0;
1427 static void remote_ls(const char *path
, int flags
,
1428 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1431 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1432 struct active_request_slot
*slot
;
1433 struct slot_results results
;
1434 struct strbuf in_buffer
= STRBUF_INIT
;
1435 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1436 struct curl_slist
*dav_headers
= NULL
;
1438 struct remote_ls_ctx ls
;
1441 ls
.path
= xstrdup(path
);
1442 ls
.dentry_name
= NULL
;
1443 ls
.dentry_flags
= 0;
1444 ls
.userData
= userData
;
1445 ls
.userFunc
= userFunc
;
1447 sprintf(url
, "%s%s", remote
->url
, path
);
1449 strbuf_addf(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1451 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1452 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1454 slot
= get_active_slot();
1455 slot
->results
= &results
;
1456 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1457 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1458 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1459 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1460 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1461 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1462 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1463 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1464 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1466 if (start_active_slot(slot
)) {
1467 run_active_slot(slot
);
1468 if (results
.curl_result
== CURLE_OK
) {
1469 XML_Parser parser
= XML_ParserCreate(NULL
);
1470 enum XML_Status result
;
1471 ctx
.name
= xcalloc(10, 1);
1474 ctx
.userFunc
= handle_remote_ls_ctx
;
1476 XML_SetUserData(parser
, &ctx
);
1477 XML_SetElementHandler(parser
, xml_start_tag
,
1479 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1480 result
= XML_Parse(parser
, in_buffer
.buf
,
1484 if (result
!= XML_STATUS_OK
) {
1485 fprintf(stderr
, "XML error: %s\n",
1487 XML_GetErrorCode(parser
)));
1489 XML_ParserFree(parser
);
1492 fprintf(stderr
, "Unable to start PROPFIND request\n");
1497 strbuf_release(&out_buffer
.buf
);
1498 strbuf_release(&in_buffer
);
1499 curl_slist_free_all(dav_headers
);
1502 static void get_remote_object_list(unsigned char parent
)
1504 char path
[] = "objects/XX/";
1505 static const char hex
[] = "0123456789abcdef";
1506 unsigned int val
= parent
;
1508 path
[8] = hex
[val
>> 4];
1509 path
[9] = hex
[val
& 0xf];
1510 remote_dir_exists
[val
] = 0;
1511 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1512 process_ls_object
, &val
);
1515 static int locking_available(void)
1517 struct active_request_slot
*slot
;
1518 struct slot_results results
;
1519 struct strbuf in_buffer
= STRBUF_INIT
;
1520 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1521 struct curl_slist
*dav_headers
= NULL
;
1525 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, remote
->url
);
1527 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1528 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1530 slot
= get_active_slot();
1531 slot
->results
= &results
;
1532 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1533 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1534 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1535 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1536 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1537 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, remote
->url
);
1538 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1539 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1540 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1542 if (start_active_slot(slot
)) {
1543 run_active_slot(slot
);
1544 if (results
.curl_result
== CURLE_OK
) {
1545 XML_Parser parser
= XML_ParserCreate(NULL
);
1546 enum XML_Status result
;
1547 ctx
.name
= xcalloc(10, 1);
1550 ctx
.userFunc
= handle_lockprop_ctx
;
1551 ctx
.userData
= &lock_flags
;
1552 XML_SetUserData(parser
, &ctx
);
1553 XML_SetElementHandler(parser
, xml_start_tag
,
1555 result
= XML_Parse(parser
, in_buffer
.buf
,
1559 if (result
!= XML_STATUS_OK
) {
1560 fprintf(stderr
, "XML error: %s\n",
1562 XML_GetErrorCode(parser
)));
1565 XML_ParserFree(parser
);
1568 fprintf(stderr
, "Unable to start PROPFIND request\n");
1571 strbuf_release(&out_buffer
.buf
);
1572 strbuf_release(&in_buffer
);
1573 curl_slist_free_all(dav_headers
);
1578 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1580 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1584 return &entry
->next
;
1587 static struct object_list
**process_blob(struct blob
*blob
,
1588 struct object_list
**p
,
1589 struct name_path
*path
,
1592 struct object
*obj
= &blob
->object
;
1594 obj
->flags
|= LOCAL
;
1596 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1600 return add_one_object(obj
, p
);
1603 static struct object_list
**process_tree(struct tree
*tree
,
1604 struct object_list
**p
,
1605 struct name_path
*path
,
1608 struct object
*obj
= &tree
->object
;
1609 struct tree_desc desc
;
1610 struct name_entry entry
;
1611 struct name_path me
;
1613 obj
->flags
|= LOCAL
;
1615 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1617 if (parse_tree(tree
) < 0)
1618 die("bad tree object %s", sha1_to_hex(obj
->sha1
));
1621 name
= xstrdup(name
);
1622 p
= add_one_object(obj
, p
);
1625 me
.elem_len
= strlen(name
);
1627 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1629 while (tree_entry(&desc
, &entry
)) {
1630 if (S_ISDIR(entry
.mode
))
1631 p
= process_tree(lookup_tree(entry
.sha1
), p
, &me
, name
);
1633 p
= process_blob(lookup_blob(entry
.sha1
), p
, &me
, name
);
1636 tree
->buffer
= NULL
;
1640 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1643 struct commit
*commit
;
1644 struct object_list
**p
= &objects
;
1647 while ((commit
= get_revision(revs
)) != NULL
) {
1648 p
= process_tree(commit
->tree
, p
, NULL
, "");
1649 commit
->object
.flags
|= LOCAL
;
1650 if (!(commit
->object
.flags
& UNINTERESTING
))
1651 count
+= add_send_request(&commit
->object
, lock
);
1654 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1655 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1656 struct object
*obj
= entry
->item
;
1657 const char *name
= entry
->name
;
1659 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1661 if (obj
->type
== OBJ_TAG
) {
1663 p
= add_one_object(obj
, p
);
1666 if (obj
->type
== OBJ_TREE
) {
1667 p
= process_tree((struct tree
*)obj
, p
, NULL
, name
);
1670 if (obj
->type
== OBJ_BLOB
) {
1671 p
= process_blob((struct blob
*)obj
, p
, NULL
, name
);
1674 die("unknown pending object %s (%s)", sha1_to_hex(obj
->sha1
), name
);
1678 if (!(objects
->item
->flags
& UNINTERESTING
))
1679 count
+= add_send_request(objects
->item
, lock
);
1680 objects
= objects
->next
;
1686 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1688 struct active_request_slot
*slot
;
1689 struct slot_results results
;
1691 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1692 struct curl_slist
*dav_headers
= NULL
;
1694 if_header
= xmalloc(strlen(lock
->token
) + 25);
1695 sprintf(if_header
, "If: (<opaquelocktoken:%s>)", lock
->token
);
1696 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1698 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1700 slot
= get_active_slot();
1701 slot
->results
= &results
;
1702 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1703 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1704 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1705 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1706 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1707 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1708 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1709 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1710 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1712 if (start_active_slot(slot
)) {
1713 run_active_slot(slot
);
1714 strbuf_release(&out_buffer
.buf
);
1716 if (results
.curl_result
!= CURLE_OK
) {
1718 "PUT error: curl result=%d, HTTP code=%ld\n",
1719 results
.curl_result
, results
.http_code
);
1720 /* We should attempt recovery? */
1724 strbuf_release(&out_buffer
.buf
);
1726 fprintf(stderr
, "Unable to start PUT request\n");
1733 static struct ref
*local_refs
, **local_tail
;
1734 static struct ref
*remote_refs
, **remote_tail
;
1736 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1739 int len
= strlen(refname
) + 1;
1740 ref
= xcalloc(1, sizeof(*ref
) + len
);
1741 hashcpy(ref
->new_sha1
, sha1
);
1742 memcpy(ref
->name
, refname
, len
);
1744 local_tail
= &ref
->next
;
1748 static void one_remote_ref(char *refname
)
1751 unsigned char remote_sha1
[20];
1753 int len
= strlen(refname
) + 1;
1755 if (http_fetch_ref(remote
->url
, refname
+ 5 /* "refs/" */,
1756 remote_sha1
) != 0) {
1758 "Unable to fetch ref %s from %s\n",
1759 refname
, remote
->url
);
1764 * Fetch a copy of the object if it doesn't exist locally - it
1765 * may be required for updating server info later.
1767 if (remote
->can_update_info_refs
&& !has_sha1_file(remote_sha1
)) {
1768 obj
= lookup_unknown_object(remote_sha1
);
1770 fprintf(stderr
, " fetch %s for %s\n",
1771 sha1_to_hex(remote_sha1
), refname
);
1772 add_fetch_request(obj
);
1776 ref
= xcalloc(1, sizeof(*ref
) + len
);
1777 hashcpy(ref
->old_sha1
, remote_sha1
);
1778 memcpy(ref
->name
, refname
, len
);
1780 remote_tail
= &ref
->next
;
1783 static void get_local_heads(void)
1785 local_tail
= &local_refs
;
1786 for_each_ref(one_local_ref
, NULL
);
1789 static void get_dav_remote_heads(void)
1791 remote_tail
= &remote_refs
;
1792 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1795 static int is_zero_sha1(const unsigned char *sha1
)
1799 for (i
= 0; i
< 20; i
++) {
1806 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1809 struct commit_list
*temp
= list
;
1810 temp
->item
->object
.flags
&= ~mark
;
1816 static int ref_newer(const unsigned char *new_sha1
,
1817 const unsigned char *old_sha1
)
1820 struct commit
*old
, *new;
1821 struct commit_list
*list
, *used
;
1824 /* Both new and old must be commit-ish and new is descendant of
1825 * old. Otherwise we require --force.
1827 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1828 if (!o
|| o
->type
!= OBJ_COMMIT
)
1830 old
= (struct commit
*) o
;
1832 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1833 if (!o
|| o
->type
!= OBJ_COMMIT
)
1835 new = (struct commit
*) o
;
1837 if (parse_commit(new) < 0)
1841 commit_list_insert(new, &list
);
1843 new = pop_most_recent_commit(&list
, TMP_MARK
);
1844 commit_list_insert(new, &used
);
1850 unmark_and_free(list
, TMP_MARK
);
1851 unmark_and_free(used
, TMP_MARK
);
1855 static void mark_edge_parents_uninteresting(struct commit
*commit
)
1857 struct commit_list
*parents
;
1859 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1860 struct commit
*parent
= parents
->item
;
1861 if (!(parent
->object
.flags
& UNINTERESTING
))
1863 mark_tree_uninteresting(parent
->tree
);
1867 static void mark_edges_uninteresting(struct commit_list
*list
)
1869 for ( ; list
; list
= list
->next
) {
1870 struct commit
*commit
= list
->item
;
1872 if (commit
->object
.flags
& UNINTERESTING
) {
1873 mark_tree_uninteresting(commit
->tree
);
1876 mark_edge_parents_uninteresting(commit
);
1880 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1882 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1883 unsigned char remote_sha1
[20];
1888 if (http_fetch_ref(remote
->url
, ls
->dentry_name
+ 5 /* "refs/" */,
1889 remote_sha1
) != 0) {
1891 "Unable to fetch ref %s from %s\n",
1892 ls
->dentry_name
, remote
->url
);
1897 o
= parse_object(remote_sha1
);
1900 "Unable to parse object %s for remote ref %s\n",
1901 sha1_to_hex(remote_sha1
), ls
->dentry_name
);
1906 len
= strlen(ls
->dentry_name
) + 42;
1907 ref_info
= xcalloc(len
+ 1, 1);
1908 sprintf(ref_info
, "%s %s\n",
1909 sha1_to_hex(remote_sha1
), ls
->dentry_name
);
1910 fwrite_buffer(ref_info
, 1, len
, buf
);
1913 if (o
->type
== OBJ_TAG
) {
1914 o
= deref_tag(o
, ls
->dentry_name
, 0);
1916 len
= strlen(ls
->dentry_name
) + 45;
1917 ref_info
= xcalloc(len
+ 1, 1);
1918 sprintf(ref_info
, "%s %s^{}\n",
1919 sha1_to_hex(o
->sha1
), ls
->dentry_name
);
1920 fwrite_buffer(ref_info
, 1, len
, buf
);
1926 static void update_remote_info_refs(struct remote_lock
*lock
)
1928 struct buffer buffer
= { STRBUF_INIT
, 0 };
1929 struct active_request_slot
*slot
;
1930 struct slot_results results
;
1932 struct curl_slist
*dav_headers
= NULL
;
1934 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1935 add_remote_info_ref
, &buffer
.buf
);
1937 if_header
= xmalloc(strlen(lock
->token
) + 25);
1938 sprintf(if_header
, "If: (<opaquelocktoken:%s>)", lock
->token
);
1939 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1941 slot
= get_active_slot();
1942 slot
->results
= &results
;
1943 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &buffer
);
1944 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, buffer
.buf
.len
);
1945 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1946 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1947 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1948 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1949 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1950 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1951 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1953 if (start_active_slot(slot
)) {
1954 run_active_slot(slot
);
1955 if (results
.curl_result
!= CURLE_OK
) {
1957 "PUT error: curl result=%d, HTTP code=%ld\n",
1958 results
.curl_result
, results
.http_code
);
1963 strbuf_release(&buffer
.buf
);
1966 static int remote_exists(const char *path
)
1968 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1969 struct active_request_slot
*slot
;
1970 struct slot_results results
;
1973 sprintf(url
, "%s%s", remote
->url
, path
);
1975 slot
= get_active_slot();
1976 slot
->results
= &results
;
1977 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1978 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
1980 if (start_active_slot(slot
)) {
1981 run_active_slot(slot
);
1983 if (results
.http_code
== 404)
1985 else if (results
.curl_result
== CURLE_OK
)
1988 fprintf(stderr
, "HEAD HTTP error %ld\n", results
.http_code
);
1991 fprintf(stderr
, "Unable to start HEAD request\n");
1998 static void fetch_symref(const char *path
, char **symref
, unsigned char *sha1
)
2001 struct strbuf buffer
= STRBUF_INIT
;
2002 struct active_request_slot
*slot
;
2003 struct slot_results results
;
2005 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
2006 sprintf(url
, "%s%s", remote
->url
, path
);
2008 slot
= get_active_slot();
2009 slot
->results
= &results
;
2010 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
2011 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
2012 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
2013 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2014 if (start_active_slot(slot
)) {
2015 run_active_slot(slot
);
2016 if (results
.curl_result
!= CURLE_OK
) {
2017 die("Couldn't get %s for remote symref\n%s",
2018 url
, curl_errorstr
);
2021 die("Unable to start remote symref request");
2025 if (*symref
!= NULL
)
2030 if (buffer
.len
== 0)
2033 /* If it's a symref, set the refname; otherwise try for a sha1 */
2034 if (!prefixcmp((char *)buffer
.buf
, "ref: ")) {
2035 *symref
= xmemdupz((char *)buffer
.buf
+ 5, buffer
.len
- 6);
2037 get_sha1_hex(buffer
.buf
, sha1
);
2040 strbuf_release(&buffer
);
2043 static int verify_merge_base(unsigned char *head_sha1
, unsigned char *branch_sha1
)
2045 struct commit
*head
= lookup_commit(head_sha1
);
2046 struct commit
*branch
= lookup_commit(branch_sha1
);
2047 struct commit_list
*merge_bases
= get_merge_bases(head
, branch
, 1);
2049 return (merge_bases
&& !merge_bases
->next
&& merge_bases
->item
== branch
);
2052 static int delete_remote_branch(char *pattern
, int force
)
2054 struct ref
*refs
= remote_refs
;
2055 struct ref
*remote_ref
= NULL
;
2056 unsigned char head_sha1
[20];
2057 char *symref
= NULL
;
2059 int patlen
= strlen(pattern
);
2061 struct active_request_slot
*slot
;
2062 struct slot_results results
;
2065 /* Find the remote branch(es) matching the specified branch name */
2066 for (match
= 0; refs
; refs
= refs
->next
) {
2067 char *name
= refs
->name
;
2068 int namelen
= strlen(name
);
2069 if (namelen
< patlen
||
2070 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
2072 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
2078 return error("No remote branch matches %s", pattern
);
2080 return error("More than one remote branch matches %s",
2084 * Remote HEAD must be a symref (not exactly foolproof; a remote
2085 * symlink to a symref will look like a symref)
2087 fetch_symref("HEAD", &symref
, head_sha1
);
2089 return error("Remote HEAD is not a symref");
2091 /* Remote branch must not be the remote HEAD */
2092 for (i
=0; symref
&& i
<MAXDEPTH
; i
++) {
2093 if (!strcmp(remote_ref
->name
, symref
))
2094 return error("Remote branch %s is the current HEAD",
2096 fetch_symref(symref
, &symref
, head_sha1
);
2099 /* Run extra sanity checks if delete is not forced */
2101 /* Remote HEAD must resolve to a known object */
2103 return error("Remote HEAD symrefs too deep");
2104 if (is_zero_sha1(head_sha1
))
2105 return error("Unable to resolve remote HEAD");
2106 if (!has_sha1_file(head_sha1
))
2107 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1
));
2109 /* Remote branch must resolve to a known object */
2110 if (is_zero_sha1(remote_ref
->old_sha1
))
2111 return error("Unable to resolve remote branch %s",
2113 if (!has_sha1_file(remote_ref
->old_sha1
))
2114 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
));
2116 /* Remote branch must be an ancestor of remote HEAD */
2117 if (!verify_merge_base(head_sha1
, remote_ref
->old_sha1
)) {
2118 return error("The branch '%s' is not an ancestor "
2119 "of your current HEAD.\n"
2120 "If you are sure you want to delete it,"
2121 " run:\n\t'git http-push -D %s %s'",
2122 remote_ref
->name
, remote
->url
, pattern
);
2126 /* Send delete request */
2127 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
2128 url
= xmalloc(strlen(remote
->url
) + strlen(remote_ref
->name
) + 1);
2129 sprintf(url
, "%s%s", remote
->url
, remote_ref
->name
);
2130 slot
= get_active_slot();
2131 slot
->results
= &results
;
2132 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
2133 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
2134 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2135 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_DELETE
);
2136 if (start_active_slot(slot
)) {
2137 run_active_slot(slot
);
2139 if (results
.curl_result
!= CURLE_OK
)
2140 return error("DELETE request failed (%d/%ld)\n",
2141 results
.curl_result
, results
.http_code
);
2144 return error("Unable to start DELETE request");
2150 int main(int argc
, char **argv
)
2152 struct transfer_request
*request
;
2153 struct transfer_request
*next_request
;
2155 char **refspec
= NULL
;
2156 struct remote_lock
*ref_lock
= NULL
;
2157 struct remote_lock
*info_ref_lock
= NULL
;
2158 struct rev_info revs
;
2159 int delete_branch
= 0;
2160 int force_delete
= 0;
2161 int objects_to_send
;
2167 setup_git_directory();
2169 remote
= xcalloc(sizeof(*remote
), 1);
2172 for (i
= 1; i
< argc
; i
++, argv
++) {
2176 if (!strcmp(arg
, "--all")) {
2177 push_all
= MATCH_REFS_ALL
;
2180 if (!strcmp(arg
, "--force")) {
2184 if (!strcmp(arg
, "--dry-run")) {
2188 if (!strcmp(arg
, "--verbose")) {
2192 if (!strcmp(arg
, "-d")) {
2196 if (!strcmp(arg
, "-D")) {
2203 char *path
= strstr(arg
, "//");
2206 path
= strchr(path
+2, '/');
2208 remote
->path_len
= strlen(path
);
2213 nr_refspec
= argc
- i
;
2218 usage(http_push_usage
);
2220 if (delete_branch
&& nr_refspec
!= 1)
2221 die("You must specify only one branch name when deleting a remote branch");
2223 memset(remote_dir_exists
, -1, 256);
2227 no_pragma_header
= curl_slist_append(no_pragma_header
, "Pragma:");
2229 /* Verify DAV compliance/lock support */
2230 if (!locking_available()) {
2231 fprintf(stderr
, "Error: no DAV locking support on remote repo %s\n", remote
->url
);
2236 /* Check whether the remote has server info files */
2237 remote
->can_update_info_refs
= 0;
2238 remote
->has_info_refs
= remote_exists("info/refs");
2239 remote
->has_info_packs
= remote_exists("objects/info/packs");
2240 if (remote
->has_info_refs
) {
2241 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
2243 remote
->can_update_info_refs
= 1;
2245 if (remote
->has_info_packs
)
2248 /* Get a list of all local and remote heads to validate refspecs */
2250 fprintf(stderr
, "Fetching remote heads...\n");
2251 get_dav_remote_heads();
2253 /* Remove a remote branch if -d or -D was specified */
2254 if (delete_branch
) {
2255 if (delete_remote_branch(refspec
[0], force_delete
) == -1)
2256 fprintf(stderr
, "Unable to delete remote branch %s\n",
2263 remote_tail
= &remote_refs
;
2264 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
2265 nr_refspec
, (const char **) refspec
, push_all
))
2268 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
2273 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2274 char old_hex
[60], *new_hex
;
2275 const char *commit_argv
[4];
2277 char *new_sha1_hex
, *old_sha1_hex
;
2281 if (!hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
2282 if (push_verbosely
|| 1)
2283 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
2288 !is_zero_sha1(ref
->old_sha1
) &&
2290 if (!has_sha1_file(ref
->old_sha1
) ||
2291 !ref_newer(ref
->peer_ref
->new_sha1
,
2294 * We do not have the remote ref, or
2295 * we know that the remote ref is not
2296 * an ancestor of what we are trying to
2297 * push. Either way this can be losing
2298 * commits at the remote end and likely
2299 * we were not up to date to begin with.
2301 error("remote '%s' is not an ancestor of\n"
2303 "Maybe you are not up-to-date and "
2304 "need to pull first?",
2306 ref
->peer_ref
->name
);
2311 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
2312 if (is_zero_sha1(ref
->new_sha1
)) {
2313 error("cannot happen anymore");
2318 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
2319 new_hex
= sha1_to_hex(ref
->new_sha1
);
2321 fprintf(stderr
, "updating '%s'", ref
->name
);
2322 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
2323 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
2324 fprintf(stderr
, "\n from %s\n to %s\n", old_hex
, new_hex
);
2328 /* Lock remote branch ref */
2329 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
2330 if (ref_lock
== NULL
) {
2331 fprintf(stderr
, "Unable to lock remote branch %s\n",
2337 /* Set up revision info for this refspec */
2339 new_sha1_hex
= xstrdup(sha1_to_hex(ref
->new_sha1
));
2340 old_sha1_hex
= NULL
;
2341 commit_argv
[1] = "--objects";
2342 commit_argv
[2] = new_sha1_hex
;
2343 if (!push_all
&& !is_zero_sha1(ref
->old_sha1
)) {
2344 old_sha1_hex
= xmalloc(42);
2345 sprintf(old_sha1_hex
, "^%s",
2346 sha1_to_hex(ref
->old_sha1
));
2347 commit_argv
[3] = old_sha1_hex
;
2350 init_revisions(&revs
, setup_git_directory());
2351 setup_revisions(commit_argc
, commit_argv
, &revs
, NULL
);
2355 commit_argv
[1] = NULL
;
2358 /* Generate a list of objects that need to be pushed */
2360 prepare_revision_walk(&revs
);
2361 mark_edges_uninteresting(revs
.commits
);
2362 objects_to_send
= get_delta(&revs
, ref_lock
);
2363 finish_all_active_slots();
2365 /* Push missing objects to remote, this would be a
2366 convenient time to pack them first if appropriate. */
2368 if (objects_to_send
)
2369 fprintf(stderr
, " sending %d objects\n",
2371 #ifdef USE_CURL_MULTI
2372 fill_active_slots();
2373 add_fill_function(NULL
, fill_active_slot
);
2375 finish_all_active_slots();
2377 /* Update the remote branch if all went well */
2378 if (aborted
|| !update_remote(ref
->new_sha1
, ref_lock
)) {
2385 fprintf(stderr
, " done\n");
2386 unlock_remote(ref_lock
);
2390 /* Update remote server info if appropriate */
2391 if (remote
->has_info_refs
&& new_refs
) {
2392 if (info_ref_lock
&& remote
->can_update_info_refs
) {
2393 fprintf(stderr
, "Updating remote server info\n");
2395 update_remote_info_refs(info_ref_lock
);
2397 fprintf(stderr
, "Unable to update server info\n");
2401 unlock_remote(info_ref_lock
);
2406 curl_slist_free_all(no_pragma_header
);
2410 request
= request_queue_head
;
2411 while (request
!= NULL
) {
2412 next_request
= request
->next
;
2413 release_request(request
);
2414 request
= next_request
;