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
);
671 static void finish_request(struct transfer_request
*request
)
674 struct packed_git
*target
;
675 struct packed_git
**lst
;
677 request
->curl_result
= request
->slot
->curl_result
;
678 request
->http_code
= request
->slot
->http_code
;
679 request
->slot
= NULL
;
681 /* Keep locks active */
684 if (request
->headers
!= NULL
)
685 curl_slist_free_all(request
->headers
);
687 /* URL is reused for MOVE after PUT */
688 if (request
->state
!= RUN_PUT
) {
693 if (request
->state
== RUN_MKCOL
) {
694 if (request
->curl_result
== CURLE_OK
||
695 request
->http_code
== 405) {
696 remote_dir_exists
[request
->obj
->sha1
[0]] = 1;
699 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
700 sha1_to_hex(request
->obj
->sha1
),
701 request
->curl_result
, request
->http_code
);
702 request
->state
= ABORTED
;
705 } else if (request
->state
== RUN_PUT
) {
706 if (request
->curl_result
== CURLE_OK
) {
709 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
710 sha1_to_hex(request
->obj
->sha1
),
711 request
->curl_result
, request
->http_code
);
712 request
->state
= ABORTED
;
715 } else if (request
->state
== RUN_MOVE
) {
716 if (request
->curl_result
== CURLE_OK
) {
718 fprintf(stderr
, " sent %s\n",
719 sha1_to_hex(request
->obj
->sha1
));
720 request
->obj
->flags
|= REMOTE
;
721 release_request(request
);
723 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
724 sha1_to_hex(request
->obj
->sha1
),
725 request
->curl_result
, request
->http_code
);
726 request
->state
= ABORTED
;
729 } else if (request
->state
== RUN_FETCH_LOOSE
) {
730 fchmod(request
->local_fileno
, 0444);
731 close(request
->local_fileno
); request
->local_fileno
= -1;
733 if (request
->curl_result
!= CURLE_OK
&&
734 request
->http_code
!= 416) {
735 if (stat(request
->tmpfile
, &st
) == 0) {
737 unlink(request
->tmpfile
);
740 if (request
->http_code
== 416)
741 fprintf(stderr
, "Warning: requested range invalid; we may already have all the data.\n");
743 inflateEnd(&request
->stream
);
744 SHA1_Final(request
->real_sha1
, &request
->c
);
745 if (request
->zret
!= Z_STREAM_END
) {
746 unlink(request
->tmpfile
);
747 } else if (hashcmp(request
->obj
->sha1
, request
->real_sha1
)) {
748 unlink(request
->tmpfile
);
754 if (request
->rename
== 0) {
755 request
->obj
->flags
|= (LOCAL
| REMOTE
);
760 /* Try fetching packed if necessary */
761 if (request
->obj
->flags
& LOCAL
)
762 release_request(request
);
764 start_fetch_packed(request
);
766 } else if (request
->state
== RUN_FETCH_PACKED
) {
767 if (request
->curl_result
!= CURLE_OK
) {
768 fprintf(stderr
, "Unable to get pack file %s\n%s",
769 request
->url
, curl_errorstr
);
770 remote
->can_update_info_refs
= 0;
772 off_t pack_size
= ftell(request
->local_stream
);
774 fclose(request
->local_stream
);
775 request
->local_stream
= NULL
;
776 if (!move_temp_to_file(request
->tmpfile
,
777 request
->filename
)) {
778 target
= (struct packed_git
*)request
->userData
;
779 target
->pack_size
= pack_size
;
780 lst
= &remote
->packs
;
781 while (*lst
!= target
)
782 lst
= &((*lst
)->next
);
785 if (!verify_pack(target
, 0))
786 install_packed_git(target
);
788 remote
->can_update_info_refs
= 0;
791 release_request(request
);
795 #ifdef USE_CURL_MULTI
796 static int fill_active_slot(void *unused
)
798 struct transfer_request
*request
= request_queue_head
;
803 for (request
= request_queue_head
; request
; request
= request
->next
) {
804 if (request
->state
== NEED_FETCH
) {
805 start_fetch_loose(request
);
807 } else if (pushing
&& request
->state
== NEED_PUSH
) {
808 if (remote_dir_exists
[request
->obj
->sha1
[0]] == 1) {
811 start_mkcol(request
);
820 static void get_remote_object_list(unsigned char parent
);
822 static void add_fetch_request(struct object
*obj
)
824 struct transfer_request
*request
;
829 * Don't fetch the object if it's known to exist locally
830 * or is already in the request queue
832 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
833 get_remote_object_list(obj
->sha1
[0]);
834 if (obj
->flags
& (LOCAL
| FETCHING
))
837 obj
->flags
|= FETCHING
;
838 request
= xmalloc(sizeof(*request
));
841 request
->lock
= NULL
;
842 request
->headers
= NULL
;
843 request
->local_fileno
= -1;
844 request
->local_stream
= NULL
;
845 request
->state
= NEED_FETCH
;
846 request
->next
= request_queue_head
;
847 request_queue_head
= request
;
849 #ifdef USE_CURL_MULTI
855 static int add_send_request(struct object
*obj
, struct remote_lock
*lock
)
857 struct transfer_request
*request
= request_queue_head
;
858 struct packed_git
*target
;
860 /* Keep locks active */
864 * Don't push the object if it's known to exist on the remote
865 * or is already in the request queue
867 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
868 get_remote_object_list(obj
->sha1
[0]);
869 if (obj
->flags
& (REMOTE
| PUSHING
))
871 target
= find_sha1_pack(obj
->sha1
, remote
->packs
);
873 obj
->flags
|= REMOTE
;
877 obj
->flags
|= PUSHING
;
878 request
= xmalloc(sizeof(*request
));
881 request
->lock
= lock
;
882 request
->headers
= NULL
;
883 request
->local_fileno
= -1;
884 request
->local_stream
= NULL
;
885 request
->state
= NEED_PUSH
;
886 request
->next
= request_queue_head
;
887 request_queue_head
= request
;
889 #ifdef USE_CURL_MULTI
897 static int fetch_index(unsigned char *sha1
)
899 char *hex
= sha1_to_hex(sha1
);
902 char tmpfile
[PATH_MAX
];
904 char range
[RANGE_HEADER_SIZE
];
905 struct curl_slist
*range_header
= NULL
;
908 struct active_request_slot
*slot
;
909 struct slot_results results
;
911 /* Don't use the index if the pack isn't there */
912 url
= xmalloc(strlen(remote
->url
) + 64);
913 sprintf(url
, "%sobjects/pack/pack-%s.pack", remote
->url
, hex
);
914 slot
= get_active_slot();
915 slot
->results
= &results
;
916 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
917 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
918 if (start_active_slot(slot
)) {
919 run_active_slot(slot
);
920 if (results
.curl_result
!= CURLE_OK
) {
922 return error("Unable to verify pack %s is available",
927 return error("Unable to start request");
930 if (has_pack_index(sha1
)) {
936 fprintf(stderr
, "Getting index for pack %s\n", hex
);
938 sprintf(url
, "%sobjects/pack/pack-%s.idx", remote
->url
, hex
);
940 filename
= sha1_pack_index_name(sha1
);
941 snprintf(tmpfile
, sizeof(tmpfile
), "%s.temp", filename
);
942 indexfile
= fopen(tmpfile
, "a");
945 return error("Unable to open local file %s for pack index",
949 slot
= get_active_slot();
950 slot
->results
= &results
;
951 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
952 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
953 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, indexfile
);
954 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
955 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
956 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
957 slot
->local
= indexfile
;
959 /* If there is data present from a previous transfer attempt,
960 resume where it left off */
961 prev_posn
= ftell(indexfile
);
965 "Resuming fetch of index for pack %s at byte %ld\n",
967 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
968 range_header
= curl_slist_append(range_header
, range
);
969 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
972 if (start_active_slot(slot
)) {
973 run_active_slot(slot
);
974 if (results
.curl_result
!= CURLE_OK
) {
977 return error("Unable to get pack index %s\n%s", url
,
983 return error("Unable to start request");
989 return move_temp_to_file(tmpfile
, filename
);
992 static int setup_index(unsigned char *sha1
)
994 struct packed_git
*new_pack
;
996 if (fetch_index(sha1
))
999 new_pack
= parse_pack_index(sha1
);
1000 new_pack
->next
= remote
->packs
;
1001 remote
->packs
= new_pack
;
1005 static int fetch_indices(void)
1007 unsigned char sha1
[20];
1009 struct strbuf buffer
= STRBUF_INIT
;
1013 struct active_request_slot
*slot
;
1014 struct slot_results results
;
1017 fprintf(stderr
, "Getting pack list\n");
1019 url
= xmalloc(strlen(remote
->url
) + 20);
1020 sprintf(url
, "%sobjects/info/packs", remote
->url
);
1022 slot
= get_active_slot();
1023 slot
->results
= &results
;
1024 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
1025 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1026 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1027 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
1028 if (start_active_slot(slot
)) {
1029 run_active_slot(slot
);
1030 if (results
.curl_result
!= CURLE_OK
) {
1031 strbuf_release(&buffer
);
1033 if (results
.http_code
== 404)
1036 return error("%s", curl_errorstr
);
1039 strbuf_release(&buffer
);
1041 return error("Unable to start request");
1046 while (i
< buffer
.len
) {
1050 if (i
+ 52 < buffer
.len
&&
1051 !prefixcmp(data
+ i
, " pack-") &&
1052 !prefixcmp(data
+ i
+ 46, ".pack\n")) {
1053 get_sha1_hex(data
+ i
+ 6, sha1
);
1059 while (data
[i
] != '\n')
1065 strbuf_release(&buffer
);
1069 static void one_remote_object(const char *hex
)
1071 unsigned char sha1
[20];
1074 if (get_sha1_hex(hex
, sha1
) != 0)
1077 obj
= lookup_object(sha1
);
1079 obj
= parse_object(sha1
);
1081 /* Ignore remote objects that don't exist locally */
1085 obj
->flags
|= REMOTE
;
1086 if (!object_list_contains(objects
, obj
))
1087 object_list_insert(obj
, &objects
);
1090 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1092 int *lock_flags
= (int *)ctx
->userData
;
1095 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
1096 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
1097 (*lock_flags
& DAV_PROP_LOCKWR
)) {
1098 *lock_flags
|= DAV_LOCK_OK
;
1100 *lock_flags
&= DAV_LOCK_OK
;
1101 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
1102 *lock_flags
|= DAV_PROP_LOCKWR
;
1103 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
1104 *lock_flags
|= DAV_PROP_LOCKEX
;
1109 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1111 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
1113 if (tag_closed
&& ctx
->cdata
) {
1114 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
1115 lock
->owner
= xmalloc(strlen(ctx
->cdata
) + 1);
1116 strcpy(lock
->owner
, ctx
->cdata
);
1117 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
1118 if (!prefixcmp(ctx
->cdata
, "Second-"))
1120 strtol(ctx
->cdata
+ 7, NULL
, 10);
1121 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
1122 if (!prefixcmp(ctx
->cdata
, "opaquelocktoken:")) {
1123 lock
->token
= xmalloc(strlen(ctx
->cdata
) - 15);
1124 strcpy(lock
->token
, ctx
->cdata
+ 16);
1130 static void one_remote_ref(char *refname
);
1133 xml_start_tag(void *userData
, const char *name
, const char **atts
)
1135 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1136 const char *c
= strchr(name
, ':');
1144 new_len
= strlen(ctx
->name
) + strlen(c
) + 2;
1146 if (new_len
> ctx
->len
) {
1147 ctx
->name
= xrealloc(ctx
->name
, new_len
);
1150 strcat(ctx
->name
, ".");
1151 strcat(ctx
->name
, c
);
1156 ctx
->userFunc(ctx
, 0);
1160 xml_end_tag(void *userData
, const char *name
)
1162 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1163 const char *c
= strchr(name
, ':');
1166 ctx
->userFunc(ctx
, 1);
1173 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
1178 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
1180 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1182 ctx
->cdata
= xmemdupz(s
, len
);
1185 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
1187 struct active_request_slot
*slot
;
1188 struct slot_results results
;
1189 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1190 struct strbuf in_buffer
= STRBUF_INIT
;
1193 char timeout_header
[25];
1194 struct remote_lock
*lock
= NULL
;
1195 struct curl_slist
*dav_headers
= NULL
;
1198 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1199 sprintf(url
, "%s%s", remote
->url
, path
);
1201 /* Make sure leading directories exist for the remote ref */
1202 ep
= strchr(url
+ strlen(remote
->url
) + 1, '/');
1205 slot
= get_active_slot();
1206 slot
->results
= &results
;
1207 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
1208 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1209 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
1210 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1211 if (start_active_slot(slot
)) {
1212 run_active_slot(slot
);
1213 if (results
.curl_result
!= CURLE_OK
&&
1214 results
.http_code
!= 405) {
1216 "Unable to create branch path %s\n",
1222 fprintf(stderr
, "Unable to start MKCOL request\n");
1227 ep
= strchr(ep
+ 1, '/');
1230 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, git_default_email
);
1232 sprintf(timeout_header
, "Timeout: Second-%ld", timeout
);
1233 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
1234 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1236 slot
= get_active_slot();
1237 slot
->results
= &results
;
1238 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1239 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1240 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1241 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1242 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1243 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1244 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1245 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
1246 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1248 lock
= xcalloc(1, sizeof(*lock
));
1251 if (start_active_slot(slot
)) {
1252 run_active_slot(slot
);
1253 if (results
.curl_result
== CURLE_OK
) {
1254 XML_Parser parser
= XML_ParserCreate(NULL
);
1255 enum XML_Status result
;
1256 ctx
.name
= xcalloc(10, 1);
1259 ctx
.userFunc
= handle_new_lock_ctx
;
1260 ctx
.userData
= lock
;
1261 XML_SetUserData(parser
, &ctx
);
1262 XML_SetElementHandler(parser
, xml_start_tag
,
1264 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1265 result
= XML_Parse(parser
, in_buffer
.buf
,
1268 if (result
!= XML_STATUS_OK
) {
1269 fprintf(stderr
, "XML error: %s\n",
1271 XML_GetErrorCode(parser
)));
1274 XML_ParserFree(parser
);
1277 fprintf(stderr
, "Unable to start LOCK request\n");
1280 curl_slist_free_all(dav_headers
);
1281 strbuf_release(&out_buffer
.buf
);
1282 strbuf_release(&in_buffer
);
1284 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
1292 lock
->start_time
= time(NULL
);
1293 lock
->next
= remote
->locks
;
1294 remote
->locks
= lock
;
1300 static int unlock_remote(struct remote_lock
*lock
)
1302 struct active_request_slot
*slot
;
1303 struct slot_results results
;
1304 struct remote_lock
*prev
= remote
->locks
;
1305 char *lock_token_header
;
1306 struct curl_slist
*dav_headers
= NULL
;
1309 lock_token_header
= xmalloc(strlen(lock
->token
) + 31);
1310 sprintf(lock_token_header
, "Lock-Token: <opaquelocktoken:%s>",
1312 dav_headers
= curl_slist_append(dav_headers
, lock_token_header
);
1314 slot
= get_active_slot();
1315 slot
->results
= &results
;
1316 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1317 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1318 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_UNLOCK
);
1319 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1321 if (start_active_slot(slot
)) {
1322 run_active_slot(slot
);
1323 if (results
.curl_result
== CURLE_OK
)
1326 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
1329 fprintf(stderr
, "Unable to start UNLOCK request\n");
1332 curl_slist_free_all(dav_headers
);
1333 free(lock_token_header
);
1335 if (remote
->locks
== lock
) {
1336 remote
->locks
= lock
->next
;
1338 while (prev
&& prev
->next
!= lock
)
1341 prev
->next
= prev
->next
->next
;
1352 static void remote_ls(const char *path
, int flags
,
1353 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1356 static void process_ls_object(struct remote_ls_ctx
*ls
)
1358 unsigned int *parent
= (unsigned int *)ls
->userData
;
1359 char *path
= ls
->dentry_name
;
1362 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1363 remote_dir_exists
[*parent
] = 1;
1367 if (strlen(path
) != 49)
1370 obj_hex
= xmalloc(strlen(path
));
1371 /* NB: path is not null-terminated, can not use strlcpy here */
1372 memcpy(obj_hex
, path
, 2);
1373 strcpy(obj_hex
+ 2, path
+ 3);
1374 one_remote_object(obj_hex
);
1378 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1380 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1381 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1385 if (!(ls
->dentry_flags
& IS_DIR
))
1386 one_remote_ref(ls
->dentry_name
);
1389 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1391 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1394 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1395 if (ls
->dentry_flags
& IS_DIR
) {
1396 if (ls
->flags
& PROCESS_DIRS
) {
1399 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1400 ls
->flags
& RECURSIVE
) {
1401 remote_ls(ls
->dentry_name
,
1406 } else if (ls
->flags
& PROCESS_FILES
) {
1409 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1410 ls
->dentry_name
= xmalloc(strlen(ctx
->cdata
) -
1411 remote
->path_len
+ 1);
1412 strcpy(ls
->dentry_name
, ctx
->cdata
+ remote
->path_len
);
1413 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1414 ls
->dentry_flags
|= IS_DIR
;
1416 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1417 free(ls
->dentry_name
);
1418 ls
->dentry_name
= NULL
;
1419 ls
->dentry_flags
= 0;
1423 static void remote_ls(const char *path
, int flags
,
1424 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1427 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1428 struct active_request_slot
*slot
;
1429 struct slot_results results
;
1430 struct strbuf in_buffer
= STRBUF_INIT
;
1431 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1432 struct curl_slist
*dav_headers
= NULL
;
1434 struct remote_ls_ctx ls
;
1437 ls
.path
= xstrdup(path
);
1438 ls
.dentry_name
= NULL
;
1439 ls
.dentry_flags
= 0;
1440 ls
.userData
= userData
;
1441 ls
.userFunc
= userFunc
;
1443 sprintf(url
, "%s%s", remote
->url
, path
);
1445 strbuf_addf(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1447 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1448 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1450 slot
= get_active_slot();
1451 slot
->results
= &results
;
1452 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1453 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1454 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1455 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1456 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1457 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1458 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1459 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1460 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1462 if (start_active_slot(slot
)) {
1463 run_active_slot(slot
);
1464 if (results
.curl_result
== CURLE_OK
) {
1465 XML_Parser parser
= XML_ParserCreate(NULL
);
1466 enum XML_Status result
;
1467 ctx
.name
= xcalloc(10, 1);
1470 ctx
.userFunc
= handle_remote_ls_ctx
;
1472 XML_SetUserData(parser
, &ctx
);
1473 XML_SetElementHandler(parser
, xml_start_tag
,
1475 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1476 result
= XML_Parse(parser
, in_buffer
.buf
,
1480 if (result
!= XML_STATUS_OK
) {
1481 fprintf(stderr
, "XML error: %s\n",
1483 XML_GetErrorCode(parser
)));
1485 XML_ParserFree(parser
);
1488 fprintf(stderr
, "Unable to start PROPFIND request\n");
1493 strbuf_release(&out_buffer
.buf
);
1494 strbuf_release(&in_buffer
);
1495 curl_slist_free_all(dav_headers
);
1498 static void get_remote_object_list(unsigned char parent
)
1500 char path
[] = "objects/XX/";
1501 static const char hex
[] = "0123456789abcdef";
1502 unsigned int val
= parent
;
1504 path
[8] = hex
[val
>> 4];
1505 path
[9] = hex
[val
& 0xf];
1506 remote_dir_exists
[val
] = 0;
1507 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1508 process_ls_object
, &val
);
1511 static int locking_available(void)
1513 struct active_request_slot
*slot
;
1514 struct slot_results results
;
1515 struct strbuf in_buffer
= STRBUF_INIT
;
1516 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1517 struct curl_slist
*dav_headers
= NULL
;
1521 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, remote
->url
);
1523 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1524 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1526 slot
= get_active_slot();
1527 slot
->results
= &results
;
1528 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1529 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1530 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1531 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1532 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1533 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, remote
->url
);
1534 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1535 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1536 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1538 if (start_active_slot(slot
)) {
1539 run_active_slot(slot
);
1540 if (results
.curl_result
== CURLE_OK
) {
1541 XML_Parser parser
= XML_ParserCreate(NULL
);
1542 enum XML_Status result
;
1543 ctx
.name
= xcalloc(10, 1);
1546 ctx
.userFunc
= handle_lockprop_ctx
;
1547 ctx
.userData
= &lock_flags
;
1548 XML_SetUserData(parser
, &ctx
);
1549 XML_SetElementHandler(parser
, xml_start_tag
,
1551 result
= XML_Parse(parser
, in_buffer
.buf
,
1555 if (result
!= XML_STATUS_OK
) {
1556 fprintf(stderr
, "XML error: %s\n",
1558 XML_GetErrorCode(parser
)));
1561 XML_ParserFree(parser
);
1563 error("Error: no DAV locking support on %s",
1567 error("Cannot access URL %s, return code %d",
1568 remote
->url
, results
.curl_result
);
1572 error("Unable to start PROPFIND request on %s", remote
->url
);
1575 strbuf_release(&out_buffer
.buf
);
1576 strbuf_release(&in_buffer
);
1577 curl_slist_free_all(dav_headers
);
1582 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1584 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1588 return &entry
->next
;
1591 static struct object_list
**process_blob(struct blob
*blob
,
1592 struct object_list
**p
,
1593 struct name_path
*path
,
1596 struct object
*obj
= &blob
->object
;
1598 obj
->flags
|= LOCAL
;
1600 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1604 return add_one_object(obj
, p
);
1607 static struct object_list
**process_tree(struct tree
*tree
,
1608 struct object_list
**p
,
1609 struct name_path
*path
,
1612 struct object
*obj
= &tree
->object
;
1613 struct tree_desc desc
;
1614 struct name_entry entry
;
1615 struct name_path me
;
1617 obj
->flags
|= LOCAL
;
1619 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1621 if (parse_tree(tree
) < 0)
1622 die("bad tree object %s", sha1_to_hex(obj
->sha1
));
1625 name
= xstrdup(name
);
1626 p
= add_one_object(obj
, p
);
1629 me
.elem_len
= strlen(name
);
1631 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1633 while (tree_entry(&desc
, &entry
))
1634 switch (object_type(entry
.mode
)) {
1636 p
= process_tree(lookup_tree(entry
.sha1
), p
, &me
, name
);
1639 p
= process_blob(lookup_blob(entry
.sha1
), p
, &me
, name
);
1642 /* Subproject commit - not in this repository */
1647 tree
->buffer
= NULL
;
1651 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1654 struct commit
*commit
;
1655 struct object_list
**p
= &objects
;
1658 while ((commit
= get_revision(revs
)) != NULL
) {
1659 p
= process_tree(commit
->tree
, p
, NULL
, "");
1660 commit
->object
.flags
|= LOCAL
;
1661 if (!(commit
->object
.flags
& UNINTERESTING
))
1662 count
+= add_send_request(&commit
->object
, lock
);
1665 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1666 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1667 struct object
*obj
= entry
->item
;
1668 const char *name
= entry
->name
;
1670 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1672 if (obj
->type
== OBJ_TAG
) {
1674 p
= add_one_object(obj
, p
);
1677 if (obj
->type
== OBJ_TREE
) {
1678 p
= process_tree((struct tree
*)obj
, p
, NULL
, name
);
1681 if (obj
->type
== OBJ_BLOB
) {
1682 p
= process_blob((struct blob
*)obj
, p
, NULL
, name
);
1685 die("unknown pending object %s (%s)", sha1_to_hex(obj
->sha1
), name
);
1689 if (!(objects
->item
->flags
& UNINTERESTING
))
1690 count
+= add_send_request(objects
->item
, lock
);
1691 objects
= objects
->next
;
1697 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1699 struct active_request_slot
*slot
;
1700 struct slot_results results
;
1702 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1703 struct curl_slist
*dav_headers
= NULL
;
1705 if_header
= xmalloc(strlen(lock
->token
) + 25);
1706 sprintf(if_header
, "If: (<opaquelocktoken:%s>)", lock
->token
);
1707 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1709 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1711 slot
= get_active_slot();
1712 slot
->results
= &results
;
1713 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1714 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1715 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1716 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1717 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1718 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1719 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1720 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1721 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1723 if (start_active_slot(slot
)) {
1724 run_active_slot(slot
);
1725 strbuf_release(&out_buffer
.buf
);
1727 if (results
.curl_result
!= CURLE_OK
) {
1729 "PUT error: curl result=%d, HTTP code=%ld\n",
1730 results
.curl_result
, results
.http_code
);
1731 /* We should attempt recovery? */
1735 strbuf_release(&out_buffer
.buf
);
1737 fprintf(stderr
, "Unable to start PUT request\n");
1744 static struct ref
*local_refs
, **local_tail
;
1745 static struct ref
*remote_refs
, **remote_tail
;
1747 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1750 int len
= strlen(refname
) + 1;
1751 ref
= xcalloc(1, sizeof(*ref
) + len
);
1752 hashcpy(ref
->new_sha1
, sha1
);
1753 memcpy(ref
->name
, refname
, len
);
1755 local_tail
= &ref
->next
;
1759 static void one_remote_ref(char *refname
)
1764 ref
= alloc_ref(strlen(refname
) + 1);
1765 strcpy(ref
->name
, refname
);
1767 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1769 "Unable to fetch ref %s from %s\n",
1770 refname
, remote
->url
);
1776 * Fetch a copy of the object if it doesn't exist locally - it
1777 * may be required for updating server info later.
1779 if (remote
->can_update_info_refs
&& !has_sha1_file(ref
->old_sha1
)) {
1780 obj
= lookup_unknown_object(ref
->old_sha1
);
1782 fprintf(stderr
, " fetch %s for %s\n",
1783 sha1_to_hex(ref
->old_sha1
), refname
);
1784 add_fetch_request(obj
);
1789 remote_tail
= &ref
->next
;
1792 static void get_local_heads(void)
1794 local_tail
= &local_refs
;
1795 for_each_ref(one_local_ref
, NULL
);
1798 static void get_dav_remote_heads(void)
1800 remote_tail
= &remote_refs
;
1801 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1804 static int is_zero_sha1(const unsigned char *sha1
)
1808 for (i
= 0; i
< 20; i
++) {
1815 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1818 struct commit_list
*temp
= list
;
1819 temp
->item
->object
.flags
&= ~mark
;
1825 static int ref_newer(const unsigned char *new_sha1
,
1826 const unsigned char *old_sha1
)
1829 struct commit
*old
, *new;
1830 struct commit_list
*list
, *used
;
1833 /* Both new and old must be commit-ish and new is descendant of
1834 * old. Otherwise we require --force.
1836 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1837 if (!o
|| o
->type
!= OBJ_COMMIT
)
1839 old
= (struct commit
*) o
;
1841 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1842 if (!o
|| o
->type
!= OBJ_COMMIT
)
1844 new = (struct commit
*) o
;
1846 if (parse_commit(new) < 0)
1850 commit_list_insert(new, &list
);
1852 new = pop_most_recent_commit(&list
, TMP_MARK
);
1853 commit_list_insert(new, &used
);
1859 unmark_and_free(list
, TMP_MARK
);
1860 unmark_and_free(used
, TMP_MARK
);
1864 static void mark_edge_parents_uninteresting(struct commit
*commit
)
1866 struct commit_list
*parents
;
1868 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1869 struct commit
*parent
= parents
->item
;
1870 if (!(parent
->object
.flags
& UNINTERESTING
))
1872 mark_tree_uninteresting(parent
->tree
);
1876 static void mark_edges_uninteresting(struct commit_list
*list
)
1878 for ( ; list
; list
= list
->next
) {
1879 struct commit
*commit
= list
->item
;
1881 if (commit
->object
.flags
& UNINTERESTING
) {
1882 mark_tree_uninteresting(commit
->tree
);
1885 mark_edge_parents_uninteresting(commit
);
1889 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1891 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1897 ref
= alloc_ref(strlen(ls
->dentry_name
) + 1);
1898 strcpy(ref
->name
, ls
->dentry_name
);
1900 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1902 "Unable to fetch ref %s from %s\n",
1903 ls
->dentry_name
, remote
->url
);
1909 o
= parse_object(ref
->old_sha1
);
1912 "Unable to parse object %s for remote ref %s\n",
1913 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1919 len
= strlen(ls
->dentry_name
) + 42;
1920 ref_info
= xcalloc(len
+ 1, 1);
1921 sprintf(ref_info
, "%s %s\n",
1922 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1923 fwrite_buffer(ref_info
, 1, len
, buf
);
1926 if (o
->type
== OBJ_TAG
) {
1927 o
= deref_tag(o
, ls
->dentry_name
, 0);
1929 len
= strlen(ls
->dentry_name
) + 45;
1930 ref_info
= xcalloc(len
+ 1, 1);
1931 sprintf(ref_info
, "%s %s^{}\n",
1932 sha1_to_hex(o
->sha1
), ls
->dentry_name
);
1933 fwrite_buffer(ref_info
, 1, len
, buf
);
1940 static void update_remote_info_refs(struct remote_lock
*lock
)
1942 struct buffer buffer
= { STRBUF_INIT
, 0 };
1943 struct active_request_slot
*slot
;
1944 struct slot_results results
;
1946 struct curl_slist
*dav_headers
= NULL
;
1948 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1949 add_remote_info_ref
, &buffer
.buf
);
1951 if_header
= xmalloc(strlen(lock
->token
) + 25);
1952 sprintf(if_header
, "If: (<opaquelocktoken:%s>)", lock
->token
);
1953 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1955 slot
= get_active_slot();
1956 slot
->results
= &results
;
1957 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &buffer
);
1958 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, buffer
.buf
.len
);
1959 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1960 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1961 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1962 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1963 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1964 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1965 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1967 if (start_active_slot(slot
)) {
1968 run_active_slot(slot
);
1969 if (results
.curl_result
!= CURLE_OK
) {
1971 "PUT error: curl result=%d, HTTP code=%ld\n",
1972 results
.curl_result
, results
.http_code
);
1977 strbuf_release(&buffer
.buf
);
1980 static int remote_exists(const char *path
)
1982 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1983 struct active_request_slot
*slot
;
1984 struct slot_results results
;
1987 sprintf(url
, "%s%s", remote
->url
, path
);
1989 slot
= get_active_slot();
1990 slot
->results
= &results
;
1991 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1992 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
1994 if (start_active_slot(slot
)) {
1995 run_active_slot(slot
);
1996 if (results
.http_code
== 404)
1998 else if (results
.curl_result
== CURLE_OK
)
2001 fprintf(stderr
, "HEAD HTTP error %ld\n", results
.http_code
);
2003 fprintf(stderr
, "Unable to start HEAD request\n");
2010 static void fetch_symref(const char *path
, char **symref
, unsigned char *sha1
)
2013 struct strbuf buffer
= STRBUF_INIT
;
2014 struct active_request_slot
*slot
;
2015 struct slot_results results
;
2017 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
2018 sprintf(url
, "%s%s", remote
->url
, path
);
2020 slot
= get_active_slot();
2021 slot
->results
= &results
;
2022 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
2023 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
2024 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
2025 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2026 if (start_active_slot(slot
)) {
2027 run_active_slot(slot
);
2028 if (results
.curl_result
!= CURLE_OK
) {
2029 die("Couldn't get %s for remote symref\n%s",
2030 url
, curl_errorstr
);
2033 die("Unable to start remote symref request");
2041 if (buffer
.len
== 0)
2044 /* If it's a symref, set the refname; otherwise try for a sha1 */
2045 if (!prefixcmp((char *)buffer
.buf
, "ref: ")) {
2046 *symref
= xmemdupz((char *)buffer
.buf
+ 5, buffer
.len
- 6);
2048 get_sha1_hex(buffer
.buf
, sha1
);
2051 strbuf_release(&buffer
);
2054 static int verify_merge_base(unsigned char *head_sha1
, unsigned char *branch_sha1
)
2056 struct commit
*head
= lookup_commit(head_sha1
);
2057 struct commit
*branch
= lookup_commit(branch_sha1
);
2058 struct commit_list
*merge_bases
= get_merge_bases(head
, branch
, 1);
2060 return (merge_bases
&& !merge_bases
->next
&& merge_bases
->item
== branch
);
2063 static int delete_remote_branch(char *pattern
, int force
)
2065 struct ref
*refs
= remote_refs
;
2066 struct ref
*remote_ref
= NULL
;
2067 unsigned char head_sha1
[20];
2068 char *symref
= NULL
;
2070 int patlen
= strlen(pattern
);
2072 struct active_request_slot
*slot
;
2073 struct slot_results results
;
2076 /* Find the remote branch(es) matching the specified branch name */
2077 for (match
= 0; refs
; refs
= refs
->next
) {
2078 char *name
= refs
->name
;
2079 int namelen
= strlen(name
);
2080 if (namelen
< patlen
||
2081 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
2083 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
2089 return error("No remote branch matches %s", pattern
);
2091 return error("More than one remote branch matches %s",
2095 * Remote HEAD must be a symref (not exactly foolproof; a remote
2096 * symlink to a symref will look like a symref)
2098 fetch_symref("HEAD", &symref
, head_sha1
);
2100 return error("Remote HEAD is not a symref");
2102 /* Remote branch must not be the remote HEAD */
2103 for (i
=0; symref
&& i
<MAXDEPTH
; i
++) {
2104 if (!strcmp(remote_ref
->name
, symref
))
2105 return error("Remote branch %s is the current HEAD",
2107 fetch_symref(symref
, &symref
, head_sha1
);
2110 /* Run extra sanity checks if delete is not forced */
2112 /* Remote HEAD must resolve to a known object */
2114 return error("Remote HEAD symrefs too deep");
2115 if (is_zero_sha1(head_sha1
))
2116 return error("Unable to resolve remote HEAD");
2117 if (!has_sha1_file(head_sha1
))
2118 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1
));
2120 /* Remote branch must resolve to a known object */
2121 if (is_zero_sha1(remote_ref
->old_sha1
))
2122 return error("Unable to resolve remote branch %s",
2124 if (!has_sha1_file(remote_ref
->old_sha1
))
2125 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
));
2127 /* Remote branch must be an ancestor of remote HEAD */
2128 if (!verify_merge_base(head_sha1
, remote_ref
->old_sha1
)) {
2129 return error("The branch '%s' is not an ancestor "
2130 "of your current HEAD.\n"
2131 "If you are sure you want to delete it,"
2132 " run:\n\t'git http-push -D %s %s'",
2133 remote_ref
->name
, remote
->url
, pattern
);
2137 /* Send delete request */
2138 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
2141 url
= xmalloc(strlen(remote
->url
) + strlen(remote_ref
->name
) + 1);
2142 sprintf(url
, "%s%s", remote
->url
, remote_ref
->name
);
2143 slot
= get_active_slot();
2144 slot
->results
= &results
;
2145 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
2146 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
2147 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2148 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_DELETE
);
2149 if (start_active_slot(slot
)) {
2150 run_active_slot(slot
);
2152 if (results
.curl_result
!= CURLE_OK
)
2153 return error("DELETE request failed (%d/%ld)\n",
2154 results
.curl_result
, results
.http_code
);
2157 return error("Unable to start DELETE request");
2163 int main(int argc
, char **argv
)
2165 struct transfer_request
*request
;
2166 struct transfer_request
*next_request
;
2168 char **refspec
= NULL
;
2169 struct remote_lock
*ref_lock
= NULL
;
2170 struct remote_lock
*info_ref_lock
= NULL
;
2171 struct rev_info revs
;
2172 int delete_branch
= 0;
2173 int force_delete
= 0;
2174 int objects_to_send
;
2179 char *rewritten_url
= NULL
;
2181 setup_git_directory();
2183 remote
= xcalloc(sizeof(*remote
), 1);
2186 for (i
= 1; i
< argc
; i
++, argv
++) {
2190 if (!strcmp(arg
, "--all")) {
2191 push_all
= MATCH_REFS_ALL
;
2194 if (!strcmp(arg
, "--force")) {
2198 if (!strcmp(arg
, "--dry-run")) {
2202 if (!strcmp(arg
, "--verbose")) {
2206 if (!strcmp(arg
, "-d")) {
2210 if (!strcmp(arg
, "-D")) {
2217 char *path
= strstr(arg
, "//");
2220 path
= strchr(path
+2, '/');
2222 remote
->path_len
= strlen(path
);
2227 nr_refspec
= argc
- i
;
2231 #ifndef USE_CURL_MULTI
2232 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
2236 usage(http_push_usage
);
2238 if (delete_branch
&& nr_refspec
!= 1)
2239 die("You must specify only one branch name when deleting a remote branch");
2241 memset(remote_dir_exists
, -1, 256);
2245 no_pragma_header
= curl_slist_append(no_pragma_header
, "Pragma:");
2247 if (remote
->url
&& remote
->url
[strlen(remote
->url
)-1] != '/') {
2248 rewritten_url
= malloc(strlen(remote
->url
)+2);
2249 strcpy(rewritten_url
, remote
->url
);
2250 strcat(rewritten_url
, "/");
2251 remote
->url
= rewritten_url
;
2255 /* Verify DAV compliance/lock support */
2256 if (!locking_available()) {
2261 /* Check whether the remote has server info files */
2262 remote
->can_update_info_refs
= 0;
2263 remote
->has_info_refs
= remote_exists("info/refs");
2264 remote
->has_info_packs
= remote_exists("objects/info/packs");
2265 if (remote
->has_info_refs
) {
2266 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
2268 remote
->can_update_info_refs
= 1;
2270 fprintf(stderr
, "Error: cannot lock existing info/refs\n");
2275 if (remote
->has_info_packs
)
2278 /* Get a list of all local and remote heads to validate refspecs */
2280 fprintf(stderr
, "Fetching remote heads...\n");
2281 get_dav_remote_heads();
2283 /* Remove a remote branch if -d or -D was specified */
2284 if (delete_branch
) {
2285 if (delete_remote_branch(refspec
[0], force_delete
) == -1)
2286 fprintf(stderr
, "Unable to delete remote branch %s\n",
2293 remote_tail
= &remote_refs
;
2294 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
2295 nr_refspec
, (const char **) refspec
, push_all
)) {
2300 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
2306 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2307 char old_hex
[60], *new_hex
;
2308 const char *commit_argv
[4];
2310 char *new_sha1_hex
, *old_sha1_hex
;
2315 if (is_zero_sha1(ref
->peer_ref
->new_sha1
)) {
2316 if (delete_remote_branch(ref
->name
, 1) == -1) {
2317 error("Could not remove %s", ref
->name
);
2324 if (!hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
2325 if (push_verbosely
|| 1)
2326 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
2331 !is_zero_sha1(ref
->old_sha1
) &&
2333 if (!has_sha1_file(ref
->old_sha1
) ||
2334 !ref_newer(ref
->peer_ref
->new_sha1
,
2337 * We do not have the remote ref, or
2338 * we know that the remote ref is not
2339 * an ancestor of what we are trying to
2340 * push. Either way this can be losing
2341 * commits at the remote end and likely
2342 * we were not up to date to begin with.
2344 error("remote '%s' is not an ancestor of\n"
2346 "Maybe you are not up-to-date and "
2347 "need to pull first?",
2349 ref
->peer_ref
->name
);
2354 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
2356 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
2357 new_hex
= sha1_to_hex(ref
->new_sha1
);
2359 fprintf(stderr
, "updating '%s'", ref
->name
);
2360 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
2361 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
2362 fprintf(stderr
, "\n from %s\n to %s\n", old_hex
, new_hex
);
2366 /* Lock remote branch ref */
2367 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
2368 if (ref_lock
== NULL
) {
2369 fprintf(stderr
, "Unable to lock remote branch %s\n",
2375 /* Set up revision info for this refspec */
2377 new_sha1_hex
= xstrdup(sha1_to_hex(ref
->new_sha1
));
2378 old_sha1_hex
= NULL
;
2379 commit_argv
[1] = "--objects";
2380 commit_argv
[2] = new_sha1_hex
;
2381 if (!push_all
&& !is_zero_sha1(ref
->old_sha1
)) {
2382 old_sha1_hex
= xmalloc(42);
2383 sprintf(old_sha1_hex
, "^%s",
2384 sha1_to_hex(ref
->old_sha1
));
2385 commit_argv
[3] = old_sha1_hex
;
2388 init_revisions(&revs
, setup_git_directory());
2389 setup_revisions(commit_argc
, commit_argv
, &revs
, NULL
);
2393 commit_argv
[1] = NULL
;
2396 /* Generate a list of objects that need to be pushed */
2398 if (prepare_revision_walk(&revs
))
2399 die("revision walk setup failed");
2400 mark_edges_uninteresting(revs
.commits
);
2401 objects_to_send
= get_delta(&revs
, ref_lock
);
2402 finish_all_active_slots();
2404 /* Push missing objects to remote, this would be a
2405 convenient time to pack them first if appropriate. */
2407 if (objects_to_send
)
2408 fprintf(stderr
, " sending %d objects\n",
2410 #ifdef USE_CURL_MULTI
2411 fill_active_slots();
2412 add_fill_function(NULL
, fill_active_slot
);
2415 finish_all_active_slots();
2416 #ifdef USE_CURL_MULTI
2417 fill_active_slots();
2419 } while (request_queue_head
&& !aborted
);
2421 /* Update the remote branch if all went well */
2422 if (aborted
|| !update_remote(ref
->new_sha1
, ref_lock
))
2426 fprintf(stderr
, " done\n");
2427 unlock_remote(ref_lock
);
2431 /* Update remote server info if appropriate */
2432 if (remote
->has_info_refs
&& new_refs
) {
2433 if (info_ref_lock
&& remote
->can_update_info_refs
) {
2434 fprintf(stderr
, "Updating remote server info\n");
2436 update_remote_info_refs(info_ref_lock
);
2438 fprintf(stderr
, "Unable to update server info\n");
2443 free(rewritten_url
);
2445 unlock_remote(info_ref_lock
);
2448 curl_slist_free_all(no_pragma_header
);
2452 request
= request_queue_head
;
2453 while (request
!= NULL
) {
2454 next_request
= request
->next
;
2455 release_request(request
);
2456 request
= next_request
;