12 #include "list-objects.h"
16 static const char http_push_usage
[] =
17 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
24 #define XML_STATUS_OK 1
25 #define XML_STATUS_ERROR 0
28 #define PREV_BUF_SIZE 4096
29 #define RANGE_HEADER_SIZE 30
32 #define DAV_LOCK "LOCK"
33 #define DAV_MKCOL "MKCOL"
34 #define DAV_MOVE "MOVE"
35 #define DAV_PROPFIND "PROPFIND"
37 #define DAV_UNLOCK "UNLOCK"
38 #define DAV_DELETE "DELETE"
41 #define DAV_PROP_LOCKWR (1u << 0)
42 #define DAV_PROP_LOCKEX (1u << 1)
43 #define DAV_LOCK_OK (1u << 2)
45 /* DAV XML properties */
46 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
47 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
48 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
49 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
50 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
51 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
52 #define DAV_PROPFIND_RESP ".multistatus.response"
53 #define DAV_PROPFIND_NAME ".multistatus.response.href"
54 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
56 /* DAV request body templates */
57 #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>"
58 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
59 #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>"
62 #define LOCK_REFRESH 30
64 /* bits #0-15 in revision.h */
66 #define LOCAL (1u<<16)
67 #define REMOTE (1u<<17)
68 #define FETCHING (1u<<18)
69 #define PUSHING (1u<<19)
71 /* We allow "recursive" symbolic refs. Only within reason, though */
76 static signed char remote_dir_exists
[256];
78 static struct curl_slist
*no_pragma_header
;
80 static int push_verbosely
;
81 static int push_all
= MATCH_REFS_NONE
;
85 static struct object_list
*objects
;
92 int can_update_info_refs
;
94 struct packed_git
*packs
;
95 struct remote_lock
*locks
;
98 static struct repo
*remote
;
100 enum transfer_state
{
112 struct transfer_request
117 struct remote_lock
*lock
;
118 struct curl_slist
*headers
;
119 struct buffer buffer
;
120 char filename
[PATH_MAX
];
121 char tmpfile
[PATH_MAX
];
124 enum transfer_state state
;
125 CURLcode curl_result
;
126 char errorstr
[CURL_ERROR_SIZE
];
128 unsigned char real_sha1
[20];
134 struct active_request_slot
*slot
;
135 struct transfer_request
*next
;
138 static struct transfer_request
*request_queue_head
;
145 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
157 struct remote_lock
*next
;
160 /* Flags that control remote_ls processing */
161 #define PROCESS_FILES (1u << 0)
162 #define PROCESS_DIRS (1u << 1)
163 #define RECURSIVE (1u << 2)
165 /* Flags that remote_ls passes to callback functions */
166 #define IS_DIR (1u << 0)
171 void (*userFunc
)(struct remote_ls_ctx
*ls
);
176 struct remote_ls_ctx
*parent
;
179 static void finish_request(struct transfer_request
*request
);
180 static void release_request(struct transfer_request
*request
);
182 static void process_response(void *callback_data
)
184 struct transfer_request
*request
=
185 (struct transfer_request
*)callback_data
;
187 finish_request(request
);
190 #ifdef USE_CURL_MULTI
191 static size_t fwrite_sha1_file(void *ptr
, size_t eltsize
, size_t nmemb
,
194 unsigned char expn
[4096];
195 size_t size
= eltsize
* nmemb
;
197 struct transfer_request
*request
= (struct transfer_request
*)data
;
199 ssize_t retval
= xwrite(request
->local_fileno
,
200 (char *) ptr
+ posn
, size
- posn
);
204 } while (posn
< size
);
206 request
->stream
.avail_in
= size
;
207 request
->stream
.next_in
= ptr
;
209 request
->stream
.next_out
= expn
;
210 request
->stream
.avail_out
= sizeof(expn
);
211 request
->zret
= inflate(&request
->stream
, Z_SYNC_FLUSH
);
212 git_SHA1_Update(&request
->c
, expn
,
213 sizeof(expn
) - request
->stream
.avail_out
);
214 } while (request
->stream
.avail_in
&& request
->zret
== Z_OK
);
219 static void start_fetch_loose(struct transfer_request
*request
)
221 char *hex
= sha1_to_hex(request
->obj
->sha1
);
223 char prevfile
[PATH_MAX
];
227 unsigned char prev_buf
[PREV_BUF_SIZE
];
228 ssize_t prev_read
= 0;
230 char range
[RANGE_HEADER_SIZE
];
231 struct curl_slist
*range_header
= NULL
;
232 struct active_request_slot
*slot
;
234 filename
= sha1_file_name(request
->obj
->sha1
);
235 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
236 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
237 "%s.temp", filename
);
239 snprintf(prevfile
, sizeof(prevfile
), "%s.prev", request
->filename
);
241 rename(request
->tmpfile
, prevfile
);
242 unlink(request
->tmpfile
);
244 if (request
->local_fileno
!= -1)
245 error("fd leakage in start: %d", request
->local_fileno
);
246 request
->local_fileno
= open(request
->tmpfile
,
247 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
248 /* This could have failed due to the "lazy directory creation";
249 * try to mkdir the last path component.
251 if (request
->local_fileno
< 0 && errno
== ENOENT
) {
252 char *dir
= strrchr(request
->tmpfile
, '/');
255 mkdir(request
->tmpfile
, 0777);
258 request
->local_fileno
= open(request
->tmpfile
,
259 O_WRONLY
| O_CREAT
| O_EXCL
, 0666);
262 if (request
->local_fileno
< 0) {
263 request
->state
= ABORTED
;
264 error("Couldn't create temporary file %s for %s: %s",
265 request
->tmpfile
, request
->filename
, strerror(errno
));
269 memset(&request
->stream
, 0, sizeof(request
->stream
));
271 inflateInit(&request
->stream
);
273 git_SHA1_Init(&request
->c
);
275 url
= xmalloc(strlen(remote
->url
) + 50);
276 request
->url
= xmalloc(strlen(remote
->url
) + 50);
277 strcpy(url
, remote
->url
);
278 posn
= url
+ strlen(remote
->url
);
279 strcpy(posn
, "objects/");
281 memcpy(posn
, hex
, 2);
284 strcpy(posn
, hex
+ 2);
285 strcpy(request
->url
, url
);
287 /* If a previous temp file is present, process what was already
289 prevlocal
= open(prevfile
, O_RDONLY
);
290 if (prevlocal
!= -1) {
292 prev_read
= xread(prevlocal
, prev_buf
, PREV_BUF_SIZE
);
294 if (fwrite_sha1_file(prev_buf
,
297 request
) == prev_read
) {
298 prev_posn
+= prev_read
;
303 } while (prev_read
> 0);
308 /* Reset inflate/SHA1 if there was an error reading the previous temp
309 file; also rewind to the beginning of the local file. */
310 if (prev_read
== -1) {
311 memset(&request
->stream
, 0, sizeof(request
->stream
));
312 inflateInit(&request
->stream
);
313 git_SHA1_Init(&request
->c
);
316 lseek(request
->local_fileno
, 0, SEEK_SET
);
317 ftruncate(request
->local_fileno
, 0);
321 slot
= get_active_slot();
322 slot
->callback_func
= process_response
;
323 slot
->callback_data
= request
;
324 request
->slot
= slot
;
326 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, request
);
327 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_sha1_file
);
328 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
329 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
330 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
332 /* If we have successfully processed data from a previous fetch
333 attempt, only fetch the data we don't already have. */
337 "Resuming fetch of object %s at byte %ld\n",
339 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
340 range_header
= curl_slist_append(range_header
, range
);
341 curl_easy_setopt(slot
->curl
,
342 CURLOPT_HTTPHEADER
, range_header
);
345 /* Try to get the request started, abort the request on error */
346 request
->state
= RUN_FETCH_LOOSE
;
347 if (!start_active_slot(slot
)) {
348 fprintf(stderr
, "Unable to start GET request\n");
349 remote
->can_update_info_refs
= 0;
350 release_request(request
);
354 static void start_mkcol(struct transfer_request
*request
)
356 char *hex
= sha1_to_hex(request
->obj
->sha1
);
357 struct active_request_slot
*slot
;
360 request
->url
= xmalloc(strlen(remote
->url
) + 13);
361 strcpy(request
->url
, remote
->url
);
362 posn
= request
->url
+ strlen(remote
->url
);
363 strcpy(posn
, "objects/");
365 memcpy(posn
, hex
, 2);
369 slot
= get_active_slot();
370 slot
->callback_func
= process_response
;
371 slot
->callback_data
= request
;
372 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
373 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
374 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
375 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
376 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
378 if (start_active_slot(slot
)) {
379 request
->slot
= slot
;
380 request
->state
= RUN_MKCOL
;
382 request
->state
= ABORTED
;
389 static void start_fetch_packed(struct transfer_request
*request
)
392 struct packed_git
*target
;
396 char range
[RANGE_HEADER_SIZE
];
397 struct curl_slist
*range_header
= NULL
;
399 struct transfer_request
*check_request
= request_queue_head
;
400 struct active_request_slot
*slot
;
402 target
= find_sha1_pack(request
->obj
->sha1
, remote
->packs
);
404 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request
->obj
->sha1
));
405 remote
->can_update_info_refs
= 0;
406 release_request(request
);
410 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
411 fprintf(stderr
, " which contains %s\n", sha1_to_hex(request
->obj
->sha1
));
413 filename
= sha1_pack_name(target
->sha1
);
414 snprintf(request
->filename
, sizeof(request
->filename
), "%s", filename
);
415 snprintf(request
->tmpfile
, sizeof(request
->tmpfile
),
416 "%s.temp", filename
);
418 url
= xmalloc(strlen(remote
->url
) + 64);
419 sprintf(url
, "%sobjects/pack/pack-%s.pack",
420 remote
->url
, sha1_to_hex(target
->sha1
));
422 /* Make sure there isn't another open request for this pack */
423 while (check_request
) {
424 if (check_request
->state
== RUN_FETCH_PACKED
&&
425 !strcmp(check_request
->url
, url
)) {
427 release_request(request
);
430 check_request
= check_request
->next
;
433 packfile
= fopen(request
->tmpfile
, "a");
435 fprintf(stderr
, "Unable to open local file %s for pack",
437 remote
->can_update_info_refs
= 0;
442 slot
= get_active_slot();
443 slot
->callback_func
= process_response
;
444 slot
->callback_data
= request
;
445 request
->slot
= slot
;
446 request
->local_stream
= packfile
;
447 request
->userData
= target
;
450 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, packfile
);
451 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite
);
452 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
453 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, no_pragma_header
);
454 slot
->local
= packfile
;
456 /* If there is data present from a previous transfer attempt,
457 resume where it left off */
458 prev_posn
= ftell(packfile
);
462 "Resuming fetch of pack %s at byte %ld\n",
463 sha1_to_hex(target
->sha1
), prev_posn
);
464 sprintf(range
, "Range: bytes=%ld-", prev_posn
);
465 range_header
= curl_slist_append(range_header
, range
);
466 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, range_header
);
469 /* Try to get the request started, abort the request on error */
470 request
->state
= RUN_FETCH_PACKED
;
471 if (!start_active_slot(slot
)) {
472 fprintf(stderr
, "Unable to start GET request\n");
473 remote
->can_update_info_refs
= 0;
474 release_request(request
);
478 static void start_put(struct transfer_request
*request
)
480 char *hex
= sha1_to_hex(request
->obj
->sha1
);
481 struct active_request_slot
*slot
;
483 enum object_type type
;
491 unpacked
= read_sha1_file(request
->obj
->sha1
, &type
, &len
);
492 hdrlen
= sprintf(hdr
, "%s %lu", typename(type
), len
) + 1;
495 memset(&stream
, 0, sizeof(stream
));
496 deflateInit(&stream
, zlib_compression_level
);
497 size
= deflateBound(&stream
, len
+ hdrlen
);
498 strbuf_init(&request
->buffer
.buf
, size
);
499 request
->buffer
.posn
= 0;
502 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
503 stream
.avail_out
= size
;
506 stream
.next_in
= (void *)hdr
;
507 stream
.avail_in
= hdrlen
;
508 while (deflate(&stream
, 0) == Z_OK
)
511 /* Then the data itself.. */
512 stream
.next_in
= unpacked
;
513 stream
.avail_in
= len
;
514 while (deflate(&stream
, Z_FINISH
) == Z_OK
)
519 request
->buffer
.buf
.len
= stream
.total_out
;
521 request
->url
= xmalloc(strlen(remote
->url
) +
522 strlen(request
->lock
->token
) + 51);
523 strcpy(request
->url
, remote
->url
);
524 posn
= request
->url
+ strlen(remote
->url
);
525 strcpy(posn
, "objects/");
527 memcpy(posn
, hex
, 2);
530 strcpy(posn
, hex
+ 2);
531 request
->dest
= xmalloc(strlen(request
->url
) + 14);
532 sprintf(request
->dest
, "Destination: %s", request
->url
);
535 strcpy(posn
, request
->lock
->token
);
537 slot
= get_active_slot();
538 slot
->callback_func
= process_response
;
539 slot
->callback_data
= request
;
540 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &request
->buffer
);
541 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, request
->buffer
.buf
.len
);
542 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
543 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
544 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
545 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
546 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
547 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 0);
548 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
550 if (start_active_slot(slot
)) {
551 request
->slot
= slot
;
552 request
->state
= RUN_PUT
;
554 request
->state
= ABORTED
;
560 static void start_move(struct transfer_request
*request
)
562 struct active_request_slot
*slot
;
563 struct curl_slist
*dav_headers
= NULL
;
565 slot
= get_active_slot();
566 slot
->callback_func
= process_response
;
567 slot
->callback_data
= request
;
568 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1); /* undo PUT setup */
569 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MOVE
);
570 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
571 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
572 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
573 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
574 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, request
->url
);
576 if (start_active_slot(slot
)) {
577 request
->slot
= slot
;
578 request
->state
= RUN_MOVE
;
580 request
->state
= ABORTED
;
586 static int refresh_lock(struct remote_lock
*lock
)
588 struct active_request_slot
*slot
;
589 struct slot_results results
;
591 char timeout_header
[25];
592 struct curl_slist
*dav_headers
= NULL
;
595 lock
->refreshing
= 1;
597 if_header
= xmalloc(strlen(lock
->token
) + 25);
598 sprintf(if_header
, "If: (<%s>)", lock
->token
);
599 sprintf(timeout_header
, "Timeout: Second-%ld", lock
->timeout
);
600 dav_headers
= curl_slist_append(dav_headers
, if_header
);
601 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
603 slot
= get_active_slot();
604 slot
->results
= &results
;
605 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
606 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
607 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
608 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
609 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
611 if (start_active_slot(slot
)) {
612 run_active_slot(slot
);
613 if (results
.curl_result
!= CURLE_OK
) {
614 fprintf(stderr
, "LOCK HTTP error %ld\n",
617 lock
->start_time
= time(NULL
);
622 lock
->refreshing
= 0;
623 curl_slist_free_all(dav_headers
);
629 static void check_locks(void)
631 struct remote_lock
*lock
= remote
->locks
;
632 time_t current_time
= time(NULL
);
636 time_remaining
= lock
->start_time
+ lock
->timeout
-
638 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
639 if (!refresh_lock(lock
)) {
641 "Unable to refresh lock for %s\n",
651 static void release_request(struct transfer_request
*request
)
653 struct transfer_request
*entry
= request_queue_head
;
655 if (request
== request_queue_head
) {
656 request_queue_head
= request
->next
;
658 while (entry
->next
!= NULL
&& entry
->next
!= request
)
660 if (entry
->next
== request
)
661 entry
->next
= entry
->next
->next
;
664 if (request
->local_fileno
!= -1)
665 close(request
->local_fileno
);
666 if (request
->local_stream
)
667 fclose(request
->local_stream
);
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 git_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
))
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 lock
->token
= xmalloc(strlen(ctx
->cdata
) + 1);
1124 strcpy(lock
->token
, ctx
->cdata
);
1129 static void one_remote_ref(char *refname
);
1132 xml_start_tag(void *userData
, const char *name
, const char **atts
)
1134 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1135 const char *c
= strchr(name
, ':');
1143 new_len
= strlen(ctx
->name
) + strlen(c
) + 2;
1145 if (new_len
> ctx
->len
) {
1146 ctx
->name
= xrealloc(ctx
->name
, new_len
);
1149 strcat(ctx
->name
, ".");
1150 strcat(ctx
->name
, c
);
1155 ctx
->userFunc(ctx
, 0);
1159 xml_end_tag(void *userData
, const char *name
)
1161 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1162 const char *c
= strchr(name
, ':');
1165 ctx
->userFunc(ctx
, 1);
1172 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
1177 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
1179 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
1181 ctx
->cdata
= xmemdupz(s
, len
);
1184 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
1186 struct active_request_slot
*slot
;
1187 struct slot_results results
;
1188 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1189 struct strbuf in_buffer
= STRBUF_INIT
;
1192 char timeout_header
[25];
1193 struct remote_lock
*lock
= NULL
;
1194 struct curl_slist
*dav_headers
= NULL
;
1197 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1198 sprintf(url
, "%s%s", remote
->url
, path
);
1200 /* Make sure leading directories exist for the remote ref */
1201 ep
= strchr(url
+ strlen(remote
->url
) + 1, '/');
1204 slot
= get_active_slot();
1205 slot
->results
= &results
;
1206 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
1207 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1208 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_MKCOL
);
1209 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1210 if (start_active_slot(slot
)) {
1211 run_active_slot(slot
);
1212 if (results
.curl_result
!= CURLE_OK
&&
1213 results
.http_code
!= 405) {
1215 "Unable to create branch path %s\n",
1221 fprintf(stderr
, "Unable to start MKCOL request\n");
1226 ep
= strchr(ep
+ 1, '/');
1229 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, git_default_email
);
1231 sprintf(timeout_header
, "Timeout: Second-%ld", timeout
);
1232 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
1233 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1235 slot
= get_active_slot();
1236 slot
->results
= &results
;
1237 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1238 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1239 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1240 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1241 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1242 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1243 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1244 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_LOCK
);
1245 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1247 lock
= xcalloc(1, sizeof(*lock
));
1250 if (start_active_slot(slot
)) {
1251 run_active_slot(slot
);
1252 if (results
.curl_result
== CURLE_OK
) {
1253 XML_Parser parser
= XML_ParserCreate(NULL
);
1254 enum XML_Status result
;
1255 ctx
.name
= xcalloc(10, 1);
1258 ctx
.userFunc
= handle_new_lock_ctx
;
1259 ctx
.userData
= lock
;
1260 XML_SetUserData(parser
, &ctx
);
1261 XML_SetElementHandler(parser
, xml_start_tag
,
1263 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1264 result
= XML_Parse(parser
, in_buffer
.buf
,
1267 if (result
!= XML_STATUS_OK
) {
1268 fprintf(stderr
, "XML error: %s\n",
1270 XML_GetErrorCode(parser
)));
1273 XML_ParserFree(parser
);
1276 fprintf(stderr
, "Unable to start LOCK request\n");
1279 curl_slist_free_all(dav_headers
);
1280 strbuf_release(&out_buffer
.buf
);
1281 strbuf_release(&in_buffer
);
1283 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
1291 lock
->start_time
= time(NULL
);
1292 lock
->next
= remote
->locks
;
1293 remote
->locks
= lock
;
1299 static int unlock_remote(struct remote_lock
*lock
)
1301 struct active_request_slot
*slot
;
1302 struct slot_results results
;
1303 struct remote_lock
*prev
= remote
->locks
;
1304 char *lock_token_header
;
1305 struct curl_slist
*dav_headers
= NULL
;
1308 lock_token_header
= xmalloc(strlen(lock
->token
) + 31);
1309 sprintf(lock_token_header
, "Lock-Token: <%s>",
1311 dav_headers
= curl_slist_append(dav_headers
, lock_token_header
);
1313 slot
= get_active_slot();
1314 slot
->results
= &results
;
1315 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1316 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1317 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_UNLOCK
);
1318 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1320 if (start_active_slot(slot
)) {
1321 run_active_slot(slot
);
1322 if (results
.curl_result
== CURLE_OK
)
1325 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
1328 fprintf(stderr
, "Unable to start UNLOCK request\n");
1331 curl_slist_free_all(dav_headers
);
1332 free(lock_token_header
);
1334 if (remote
->locks
== lock
) {
1335 remote
->locks
= lock
->next
;
1337 while (prev
&& prev
->next
!= lock
)
1340 prev
->next
= prev
->next
->next
;
1351 static void remove_locks(void)
1353 struct remote_lock
*lock
= remote
->locks
;
1355 fprintf(stderr
, "Removing remote locks...\n");
1357 unlock_remote(lock
);
1362 static void remove_locks_on_signal(int signo
)
1365 signal(signo
, SIG_DFL
);
1369 static void remote_ls(const char *path
, int flags
,
1370 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1373 static void process_ls_object(struct remote_ls_ctx
*ls
)
1375 unsigned int *parent
= (unsigned int *)ls
->userData
;
1376 char *path
= ls
->dentry_name
;
1379 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1380 remote_dir_exists
[*parent
] = 1;
1384 if (strlen(path
) != 49)
1387 obj_hex
= xmalloc(strlen(path
));
1388 /* NB: path is not null-terminated, can not use strlcpy here */
1389 memcpy(obj_hex
, path
, 2);
1390 strcpy(obj_hex
+ 2, path
+ 3);
1391 one_remote_object(obj_hex
);
1395 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1397 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1398 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1402 if (!(ls
->dentry_flags
& IS_DIR
))
1403 one_remote_ref(ls
->dentry_name
);
1406 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1408 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1411 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1412 if (ls
->dentry_flags
& IS_DIR
) {
1413 if (ls
->flags
& PROCESS_DIRS
) {
1416 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1417 ls
->flags
& RECURSIVE
) {
1418 remote_ls(ls
->dentry_name
,
1423 } else if (ls
->flags
& PROCESS_FILES
) {
1426 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1427 ls
->dentry_name
= xmalloc(strlen(ctx
->cdata
) -
1428 remote
->path_len
+ 1);
1429 strcpy(ls
->dentry_name
, ctx
->cdata
+ remote
->path_len
);
1430 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1431 ls
->dentry_flags
|= IS_DIR
;
1433 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1434 free(ls
->dentry_name
);
1435 ls
->dentry_name
= NULL
;
1436 ls
->dentry_flags
= 0;
1440 static void remote_ls(const char *path
, int flags
,
1441 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1444 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1445 struct active_request_slot
*slot
;
1446 struct slot_results results
;
1447 struct strbuf in_buffer
= STRBUF_INIT
;
1448 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1449 struct curl_slist
*dav_headers
= NULL
;
1451 struct remote_ls_ctx ls
;
1454 ls
.path
= xstrdup(path
);
1455 ls
.dentry_name
= NULL
;
1456 ls
.dentry_flags
= 0;
1457 ls
.userData
= userData
;
1458 ls
.userFunc
= userFunc
;
1460 sprintf(url
, "%s%s", remote
->url
, path
);
1462 strbuf_addf(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1464 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1465 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1467 slot
= get_active_slot();
1468 slot
->results
= &results
;
1469 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1470 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1471 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1472 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1473 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1474 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1475 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1476 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1477 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1479 if (start_active_slot(slot
)) {
1480 run_active_slot(slot
);
1481 if (results
.curl_result
== CURLE_OK
) {
1482 XML_Parser parser
= XML_ParserCreate(NULL
);
1483 enum XML_Status result
;
1484 ctx
.name
= xcalloc(10, 1);
1487 ctx
.userFunc
= handle_remote_ls_ctx
;
1489 XML_SetUserData(parser
, &ctx
);
1490 XML_SetElementHandler(parser
, xml_start_tag
,
1492 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1493 result
= XML_Parse(parser
, in_buffer
.buf
,
1497 if (result
!= XML_STATUS_OK
) {
1498 fprintf(stderr
, "XML error: %s\n",
1500 XML_GetErrorCode(parser
)));
1502 XML_ParserFree(parser
);
1505 fprintf(stderr
, "Unable to start PROPFIND request\n");
1510 strbuf_release(&out_buffer
.buf
);
1511 strbuf_release(&in_buffer
);
1512 curl_slist_free_all(dav_headers
);
1515 static void get_remote_object_list(unsigned char parent
)
1517 char path
[] = "objects/XX/";
1518 static const char hex
[] = "0123456789abcdef";
1519 unsigned int val
= parent
;
1521 path
[8] = hex
[val
>> 4];
1522 path
[9] = hex
[val
& 0xf];
1523 remote_dir_exists
[val
] = 0;
1524 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1525 process_ls_object
, &val
);
1528 static int locking_available(void)
1530 struct active_request_slot
*slot
;
1531 struct slot_results results
;
1532 struct strbuf in_buffer
= STRBUF_INIT
;
1533 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1534 struct curl_slist
*dav_headers
= NULL
;
1538 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, remote
->url
);
1540 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1541 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1543 slot
= get_active_slot();
1544 slot
->results
= &results
;
1545 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1546 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1547 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1548 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1549 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
1550 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, remote
->url
);
1551 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1552 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PROPFIND
);
1553 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1555 if (start_active_slot(slot
)) {
1556 run_active_slot(slot
);
1557 if (results
.curl_result
== CURLE_OK
) {
1558 XML_Parser parser
= XML_ParserCreate(NULL
);
1559 enum XML_Status result
;
1560 ctx
.name
= xcalloc(10, 1);
1563 ctx
.userFunc
= handle_lockprop_ctx
;
1564 ctx
.userData
= &lock_flags
;
1565 XML_SetUserData(parser
, &ctx
);
1566 XML_SetElementHandler(parser
, xml_start_tag
,
1568 result
= XML_Parse(parser
, in_buffer
.buf
,
1572 if (result
!= XML_STATUS_OK
) {
1573 fprintf(stderr
, "XML error: %s\n",
1575 XML_GetErrorCode(parser
)));
1578 XML_ParserFree(parser
);
1580 error("Error: no DAV locking support on %s",
1584 error("Cannot access URL %s, return code %d",
1585 remote
->url
, results
.curl_result
);
1589 error("Unable to start PROPFIND request on %s", remote
->url
);
1592 strbuf_release(&out_buffer
.buf
);
1593 strbuf_release(&in_buffer
);
1594 curl_slist_free_all(dav_headers
);
1599 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1601 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1605 return &entry
->next
;
1608 static struct object_list
**process_blob(struct blob
*blob
,
1609 struct object_list
**p
,
1610 struct name_path
*path
,
1613 struct object
*obj
= &blob
->object
;
1615 obj
->flags
|= LOCAL
;
1617 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1621 return add_one_object(obj
, p
);
1624 static struct object_list
**process_tree(struct tree
*tree
,
1625 struct object_list
**p
,
1626 struct name_path
*path
,
1629 struct object
*obj
= &tree
->object
;
1630 struct tree_desc desc
;
1631 struct name_entry entry
;
1632 struct name_path me
;
1634 obj
->flags
|= LOCAL
;
1636 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1638 if (parse_tree(tree
) < 0)
1639 die("bad tree object %s", sha1_to_hex(obj
->sha1
));
1642 name
= xstrdup(name
);
1643 p
= add_one_object(obj
, p
);
1646 me
.elem_len
= strlen(name
);
1648 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1650 while (tree_entry(&desc
, &entry
))
1651 switch (object_type(entry
.mode
)) {
1653 p
= process_tree(lookup_tree(entry
.sha1
), p
, &me
, name
);
1656 p
= process_blob(lookup_blob(entry
.sha1
), p
, &me
, name
);
1659 /* Subproject commit - not in this repository */
1664 tree
->buffer
= NULL
;
1668 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1671 struct commit
*commit
;
1672 struct object_list
**p
= &objects
;
1675 while ((commit
= get_revision(revs
)) != NULL
) {
1676 p
= process_tree(commit
->tree
, p
, NULL
, "");
1677 commit
->object
.flags
|= LOCAL
;
1678 if (!(commit
->object
.flags
& UNINTERESTING
))
1679 count
+= add_send_request(&commit
->object
, lock
);
1682 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1683 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1684 struct object
*obj
= entry
->item
;
1685 const char *name
= entry
->name
;
1687 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1689 if (obj
->type
== OBJ_TAG
) {
1691 p
= add_one_object(obj
, p
);
1694 if (obj
->type
== OBJ_TREE
) {
1695 p
= process_tree((struct tree
*)obj
, p
, NULL
, name
);
1698 if (obj
->type
== OBJ_BLOB
) {
1699 p
= process_blob((struct blob
*)obj
, p
, NULL
, name
);
1702 die("unknown pending object %s (%s)", sha1_to_hex(obj
->sha1
), name
);
1706 if (!(objects
->item
->flags
& UNINTERESTING
))
1707 count
+= add_send_request(objects
->item
, lock
);
1708 objects
= objects
->next
;
1714 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1716 struct active_request_slot
*slot
;
1717 struct slot_results results
;
1719 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1720 struct curl_slist
*dav_headers
= NULL
;
1722 if_header
= xmalloc(strlen(lock
->token
) + 25);
1723 sprintf(if_header
, "If: (<%s>)", lock
->token
);
1724 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1726 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1728 slot
= get_active_slot();
1729 slot
->results
= &results
;
1730 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &out_buffer
);
1731 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, out_buffer
.buf
.len
);
1732 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1733 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1734 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1735 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1736 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1737 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1738 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1740 if (start_active_slot(slot
)) {
1741 run_active_slot(slot
);
1742 strbuf_release(&out_buffer
.buf
);
1744 if (results
.curl_result
!= CURLE_OK
) {
1746 "PUT error: curl result=%d, HTTP code=%ld\n",
1747 results
.curl_result
, results
.http_code
);
1748 /* We should attempt recovery? */
1752 strbuf_release(&out_buffer
.buf
);
1754 fprintf(stderr
, "Unable to start PUT request\n");
1761 static struct ref
*local_refs
, **local_tail
;
1762 static struct ref
*remote_refs
, **remote_tail
;
1764 static int one_local_ref(const char *refname
, const unsigned char *sha1
, int flag
, void *cb_data
)
1767 int len
= strlen(refname
) + 1;
1768 ref
= xcalloc(1, sizeof(*ref
) + len
);
1769 hashcpy(ref
->new_sha1
, sha1
);
1770 memcpy(ref
->name
, refname
, len
);
1772 local_tail
= &ref
->next
;
1776 static void one_remote_ref(char *refname
)
1781 ref
= alloc_ref(refname
);
1783 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1785 "Unable to fetch ref %s from %s\n",
1786 refname
, remote
->url
);
1792 * Fetch a copy of the object if it doesn't exist locally - it
1793 * may be required for updating server info later.
1795 if (remote
->can_update_info_refs
&& !has_sha1_file(ref
->old_sha1
)) {
1796 obj
= lookup_unknown_object(ref
->old_sha1
);
1798 fprintf(stderr
, " fetch %s for %s\n",
1799 sha1_to_hex(ref
->old_sha1
), refname
);
1800 add_fetch_request(obj
);
1805 remote_tail
= &ref
->next
;
1808 static void get_local_heads(void)
1810 local_tail
= &local_refs
;
1811 for_each_ref(one_local_ref
, NULL
);
1814 static void get_dav_remote_heads(void)
1816 remote_tail
= &remote_refs
;
1817 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1820 static int is_zero_sha1(const unsigned char *sha1
)
1824 for (i
= 0; i
< 20; i
++) {
1831 static void unmark_and_free(struct commit_list
*list
, unsigned int mark
)
1834 struct commit_list
*temp
= list
;
1835 temp
->item
->object
.flags
&= ~mark
;
1841 static int ref_newer(const unsigned char *new_sha1
,
1842 const unsigned char *old_sha1
)
1845 struct commit
*old
, *new;
1846 struct commit_list
*list
, *used
;
1849 /* Both new and old must be commit-ish and new is descendant of
1850 * old. Otherwise we require --force.
1852 o
= deref_tag(parse_object(old_sha1
), NULL
, 0);
1853 if (!o
|| o
->type
!= OBJ_COMMIT
)
1855 old
= (struct commit
*) o
;
1857 o
= deref_tag(parse_object(new_sha1
), NULL
, 0);
1858 if (!o
|| o
->type
!= OBJ_COMMIT
)
1860 new = (struct commit
*) o
;
1862 if (parse_commit(new) < 0)
1866 commit_list_insert(new, &list
);
1868 new = pop_most_recent_commit(&list
, TMP_MARK
);
1869 commit_list_insert(new, &used
);
1875 unmark_and_free(list
, TMP_MARK
);
1876 unmark_and_free(used
, TMP_MARK
);
1880 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1882 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1888 ref
= alloc_ref(ls
->dentry_name
);
1890 if (http_fetch_ref(remote
->url
, ref
) != 0) {
1892 "Unable to fetch ref %s from %s\n",
1893 ls
->dentry_name
, remote
->url
);
1899 o
= parse_object(ref
->old_sha1
);
1902 "Unable to parse object %s for remote ref %s\n",
1903 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1909 len
= strlen(ls
->dentry_name
) + 42;
1910 ref_info
= xcalloc(len
+ 1, 1);
1911 sprintf(ref_info
, "%s %s\n",
1912 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1913 fwrite_buffer(ref_info
, 1, len
, buf
);
1916 if (o
->type
== OBJ_TAG
) {
1917 o
= deref_tag(o
, ls
->dentry_name
, 0);
1919 len
= strlen(ls
->dentry_name
) + 45;
1920 ref_info
= xcalloc(len
+ 1, 1);
1921 sprintf(ref_info
, "%s %s^{}\n",
1922 sha1_to_hex(o
->sha1
), ls
->dentry_name
);
1923 fwrite_buffer(ref_info
, 1, len
, buf
);
1930 static void update_remote_info_refs(struct remote_lock
*lock
)
1932 struct buffer buffer
= { STRBUF_INIT
, 0 };
1933 struct active_request_slot
*slot
;
1934 struct slot_results results
;
1936 struct curl_slist
*dav_headers
= NULL
;
1938 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1939 add_remote_info_ref
, &buffer
.buf
);
1941 if_header
= xmalloc(strlen(lock
->token
) + 25);
1942 sprintf(if_header
, "If: (<%s>)", lock
->token
);
1943 dav_headers
= curl_slist_append(dav_headers
, if_header
);
1945 slot
= get_active_slot();
1946 slot
->results
= &results
;
1947 curl_easy_setopt(slot
->curl
, CURLOPT_INFILE
, &buffer
);
1948 curl_easy_setopt(slot
->curl
, CURLOPT_INFILESIZE
, buffer
.buf
.len
);
1949 curl_easy_setopt(slot
->curl
, CURLOPT_READFUNCTION
, fread_buffer
);
1950 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
1951 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_PUT
);
1952 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1953 curl_easy_setopt(slot
->curl
, CURLOPT_UPLOAD
, 1);
1954 curl_easy_setopt(slot
->curl
, CURLOPT_PUT
, 1);
1955 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, lock
->url
);
1957 if (start_active_slot(slot
)) {
1958 run_active_slot(slot
);
1959 if (results
.curl_result
!= CURLE_OK
) {
1961 "PUT error: curl result=%d, HTTP code=%ld\n",
1962 results
.curl_result
, results
.http_code
);
1967 strbuf_release(&buffer
.buf
);
1970 static int remote_exists(const char *path
)
1972 char *url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
1973 struct active_request_slot
*slot
;
1974 struct slot_results results
;
1977 sprintf(url
, "%s%s", remote
->url
, path
);
1979 slot
= get_active_slot();
1980 slot
->results
= &results
;
1981 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
1982 curl_easy_setopt(slot
->curl
, CURLOPT_NOBODY
, 1);
1984 if (start_active_slot(slot
)) {
1985 run_active_slot(slot
);
1986 if (results
.http_code
== 404)
1988 else if (results
.curl_result
== CURLE_OK
)
1991 fprintf(stderr
, "HEAD HTTP error %ld\n", results
.http_code
);
1993 fprintf(stderr
, "Unable to start HEAD request\n");
2000 static void fetch_symref(const char *path
, char **symref
, unsigned char *sha1
)
2003 struct strbuf buffer
= STRBUF_INIT
;
2004 struct active_request_slot
*slot
;
2005 struct slot_results results
;
2007 url
= xmalloc(strlen(remote
->url
) + strlen(path
) + 1);
2008 sprintf(url
, "%s%s", remote
->url
, path
);
2010 slot
= get_active_slot();
2011 slot
->results
= &results
;
2012 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &buffer
);
2013 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_buffer
);
2014 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, NULL
);
2015 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2016 if (start_active_slot(slot
)) {
2017 run_active_slot(slot
);
2018 if (results
.curl_result
!= CURLE_OK
) {
2019 die("Couldn't get %s for remote symref\n%s",
2020 url
, curl_errorstr
);
2023 die("Unable to start remote symref request");
2031 if (buffer
.len
== 0)
2034 /* If it's a symref, set the refname; otherwise try for a sha1 */
2035 if (!prefixcmp((char *)buffer
.buf
, "ref: ")) {
2036 *symref
= xmemdupz((char *)buffer
.buf
+ 5, buffer
.len
- 6);
2038 get_sha1_hex(buffer
.buf
, sha1
);
2041 strbuf_release(&buffer
);
2044 static int verify_merge_base(unsigned char *head_sha1
, unsigned char *branch_sha1
)
2046 struct commit
*head
= lookup_commit(head_sha1
);
2047 struct commit
*branch
= lookup_commit(branch_sha1
);
2048 struct commit_list
*merge_bases
= get_merge_bases(head
, branch
, 1);
2050 return (merge_bases
&& !merge_bases
->next
&& merge_bases
->item
== branch
);
2053 static int delete_remote_branch(char *pattern
, int force
)
2055 struct ref
*refs
= remote_refs
;
2056 struct ref
*remote_ref
= NULL
;
2057 unsigned char head_sha1
[20];
2058 char *symref
= NULL
;
2060 int patlen
= strlen(pattern
);
2062 struct active_request_slot
*slot
;
2063 struct slot_results results
;
2066 /* Find the remote branch(es) matching the specified branch name */
2067 for (match
= 0; refs
; refs
= refs
->next
) {
2068 char *name
= refs
->name
;
2069 int namelen
= strlen(name
);
2070 if (namelen
< patlen
||
2071 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
2073 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
2079 return error("No remote branch matches %s", pattern
);
2081 return error("More than one remote branch matches %s",
2085 * Remote HEAD must be a symref (not exactly foolproof; a remote
2086 * symlink to a symref will look like a symref)
2088 fetch_symref("HEAD", &symref
, head_sha1
);
2090 return error("Remote HEAD is not a symref");
2092 /* Remote branch must not be the remote HEAD */
2093 for (i
=0; symref
&& i
<MAXDEPTH
; i
++) {
2094 if (!strcmp(remote_ref
->name
, symref
))
2095 return error("Remote branch %s is the current HEAD",
2097 fetch_symref(symref
, &symref
, head_sha1
);
2100 /* Run extra sanity checks if delete is not forced */
2102 /* Remote HEAD must resolve to a known object */
2104 return error("Remote HEAD symrefs too deep");
2105 if (is_zero_sha1(head_sha1
))
2106 return error("Unable to resolve remote HEAD");
2107 if (!has_sha1_file(head_sha1
))
2108 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1
));
2110 /* Remote branch must resolve to a known object */
2111 if (is_zero_sha1(remote_ref
->old_sha1
))
2112 return error("Unable to resolve remote branch %s",
2114 if (!has_sha1_file(remote_ref
->old_sha1
))
2115 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
));
2117 /* Remote branch must be an ancestor of remote HEAD */
2118 if (!verify_merge_base(head_sha1
, remote_ref
->old_sha1
)) {
2119 return error("The branch '%s' is not an ancestor "
2120 "of your current HEAD.\n"
2121 "If you are sure you want to delete it,"
2122 " run:\n\t'git http-push -D %s %s'",
2123 remote_ref
->name
, remote
->url
, pattern
);
2127 /* Send delete request */
2128 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
2131 url
= xmalloc(strlen(remote
->url
) + strlen(remote_ref
->name
) + 1);
2132 sprintf(url
, "%s%s", remote
->url
, remote_ref
->name
);
2133 slot
= get_active_slot();
2134 slot
->results
= &results
;
2135 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPGET
, 1);
2136 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
2137 curl_easy_setopt(slot
->curl
, CURLOPT_URL
, url
);
2138 curl_easy_setopt(slot
->curl
, CURLOPT_CUSTOMREQUEST
, DAV_DELETE
);
2139 if (start_active_slot(slot
)) {
2140 run_active_slot(slot
);
2142 if (results
.curl_result
!= CURLE_OK
)
2143 return error("DELETE request failed (%d/%ld)\n",
2144 results
.curl_result
, results
.http_code
);
2147 return error("Unable to start DELETE request");
2153 int main(int argc
, char **argv
)
2155 struct transfer_request
*request
;
2156 struct transfer_request
*next_request
;
2158 char **refspec
= NULL
;
2159 struct remote_lock
*ref_lock
= NULL
;
2160 struct remote_lock
*info_ref_lock
= NULL
;
2161 struct rev_info revs
;
2162 int delete_branch
= 0;
2163 int force_delete
= 0;
2164 int objects_to_send
;
2169 char *rewritten_url
= NULL
;
2171 setup_git_directory();
2173 remote
= xcalloc(sizeof(*remote
), 1);
2176 for (i
= 1; i
< argc
; i
++, argv
++) {
2180 if (!strcmp(arg
, "--all")) {
2181 push_all
= MATCH_REFS_ALL
;
2184 if (!strcmp(arg
, "--force")) {
2188 if (!strcmp(arg
, "--dry-run")) {
2192 if (!strcmp(arg
, "--verbose")) {
2196 if (!strcmp(arg
, "-d")) {
2200 if (!strcmp(arg
, "-D")) {
2207 char *path
= strstr(arg
, "//");
2210 path
= strchr(path
+2, '/');
2212 remote
->path_len
= strlen(path
);
2217 nr_refspec
= argc
- i
;
2221 #ifndef USE_CURL_MULTI
2222 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
2226 usage(http_push_usage
);
2228 if (delete_branch
&& nr_refspec
!= 1)
2229 die("You must specify only one branch name when deleting a remote branch");
2231 memset(remote_dir_exists
, -1, 256);
2235 no_pragma_header
= curl_slist_append(no_pragma_header
, "Pragma:");
2237 if (remote
->url
&& remote
->url
[strlen(remote
->url
)-1] != '/') {
2238 rewritten_url
= xmalloc(strlen(remote
->url
)+2);
2239 strcpy(rewritten_url
, remote
->url
);
2240 strcat(rewritten_url
, "/");
2241 remote
->url
= rewritten_url
;
2245 /* Verify DAV compliance/lock support */
2246 if (!locking_available()) {
2251 signal(SIGINT
, remove_locks_on_signal
);
2252 signal(SIGHUP
, remove_locks_on_signal
);
2253 signal(SIGQUIT
, remove_locks_on_signal
);
2254 signal(SIGTERM
, remove_locks_on_signal
);
2256 /* Check whether the remote has server info files */
2257 remote
->can_update_info_refs
= 0;
2258 remote
->has_info_refs
= remote_exists("info/refs");
2259 remote
->has_info_packs
= remote_exists("objects/info/packs");
2260 if (remote
->has_info_refs
) {
2261 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
2263 remote
->can_update_info_refs
= 1;
2265 fprintf(stderr
, "Error: cannot lock existing info/refs\n");
2270 if (remote
->has_info_packs
)
2273 /* Get a list of all local and remote heads to validate refspecs */
2275 fprintf(stderr
, "Fetching remote heads...\n");
2276 get_dav_remote_heads();
2278 /* Remove a remote branch if -d or -D was specified */
2279 if (delete_branch
) {
2280 if (delete_remote_branch(refspec
[0], force_delete
) == -1)
2281 fprintf(stderr
, "Unable to delete remote branch %s\n",
2288 remote_tail
= &remote_refs
;
2289 if (match_refs(local_refs
, remote_refs
, &remote_tail
,
2290 nr_refspec
, (const char **) refspec
, push_all
)) {
2295 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
2301 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
2302 char old_hex
[60], *new_hex
;
2303 const char *commit_argv
[4];
2305 char *new_sha1_hex
, *old_sha1_hex
;
2310 if (is_zero_sha1(ref
->peer_ref
->new_sha1
)) {
2311 if (delete_remote_branch(ref
->name
, 1) == -1) {
2312 error("Could not remove %s", ref
->name
);
2319 if (!hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
2320 if (push_verbosely
|| 1)
2321 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
2326 !is_zero_sha1(ref
->old_sha1
) &&
2328 if (!has_sha1_file(ref
->old_sha1
) ||
2329 !ref_newer(ref
->peer_ref
->new_sha1
,
2332 * We do not have the remote ref, or
2333 * we know that the remote ref is not
2334 * an ancestor of what we are trying to
2335 * push. Either way this can be losing
2336 * commits at the remote end and likely
2337 * we were not up to date to begin with.
2339 error("remote '%s' is not an ancestor of\n"
2341 "Maybe you are not up-to-date and "
2342 "need to pull first?",
2344 ref
->peer_ref
->name
);
2349 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
2351 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
2352 new_hex
= sha1_to_hex(ref
->new_sha1
);
2354 fprintf(stderr
, "updating '%s'", ref
->name
);
2355 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
2356 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
2357 fprintf(stderr
, "\n from %s\n to %s\n", old_hex
, new_hex
);
2361 /* Lock remote branch ref */
2362 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
2363 if (ref_lock
== NULL
) {
2364 fprintf(stderr
, "Unable to lock remote branch %s\n",
2370 /* Set up revision info for this refspec */
2372 new_sha1_hex
= xstrdup(sha1_to_hex(ref
->new_sha1
));
2373 old_sha1_hex
= NULL
;
2374 commit_argv
[1] = "--objects";
2375 commit_argv
[2] = new_sha1_hex
;
2376 if (!push_all
&& !is_zero_sha1(ref
->old_sha1
)) {
2377 old_sha1_hex
= xmalloc(42);
2378 sprintf(old_sha1_hex
, "^%s",
2379 sha1_to_hex(ref
->old_sha1
));
2380 commit_argv
[3] = old_sha1_hex
;
2383 init_revisions(&revs
, setup_git_directory());
2384 setup_revisions(commit_argc
, commit_argv
, &revs
, NULL
);
2385 revs
.edge_hint
= 0; /* just in case */
2389 commit_argv
[1] = NULL
;
2392 /* Generate a list of objects that need to be pushed */
2394 if (prepare_revision_walk(&revs
))
2395 die("revision walk setup failed");
2396 mark_edges_uninteresting(revs
.commits
, &revs
, NULL
);
2397 objects_to_send
= get_delta(&revs
, ref_lock
);
2398 finish_all_active_slots();
2400 /* Push missing objects to remote, this would be a
2401 convenient time to pack them first if appropriate. */
2403 if (objects_to_send
)
2404 fprintf(stderr
, " sending %d objects\n",
2406 #ifdef USE_CURL_MULTI
2407 fill_active_slots();
2408 add_fill_function(NULL
, fill_active_slot
);
2411 finish_all_active_slots();
2412 #ifdef USE_CURL_MULTI
2413 fill_active_slots();
2415 } while (request_queue_head
&& !aborted
);
2417 /* Update the remote branch if all went well */
2418 if (aborted
|| !update_remote(ref
->new_sha1
, ref_lock
))
2422 fprintf(stderr
, " done\n");
2423 unlock_remote(ref_lock
);
2427 /* Update remote server info if appropriate */
2428 if (remote
->has_info_refs
&& new_refs
) {
2429 if (info_ref_lock
&& remote
->can_update_info_refs
) {
2430 fprintf(stderr
, "Updating remote server info\n");
2432 update_remote_info_refs(info_ref_lock
);
2434 fprintf(stderr
, "Unable to update server info\n");
2439 free(rewritten_url
);
2441 unlock_remote(info_ref_lock
);
2444 curl_slist_free_all(no_pragma_header
);
2448 request
= request_queue_head
;
2449 while (request
!= NULL
) {
2450 next_request
= request
->next
;
2451 release_request(request
);
2452 request
= next_request
;