11 #include "list-objects.h"
13 #include "argv-array.h"
15 #ifdef EXPAT_NEEDS_XMLPARSE_H
21 static const char http_push_usage
[] =
22 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
29 #define XML_STATUS_OK 1
30 #define XML_STATUS_ERROR 0
33 #define PREV_BUF_SIZE 4096
36 #define DAV_LOCK "LOCK"
37 #define DAV_MKCOL "MKCOL"
38 #define DAV_MOVE "MOVE"
39 #define DAV_PROPFIND "PROPFIND"
41 #define DAV_UNLOCK "UNLOCK"
42 #define DAV_DELETE "DELETE"
45 #define DAV_PROP_LOCKWR (1u << 0)
46 #define DAV_PROP_LOCKEX (1u << 1)
47 #define DAV_LOCK_OK (1u << 2)
49 /* DAV XML properties */
50 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
51 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
52 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
53 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
54 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
55 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
56 #define DAV_PROPFIND_RESP ".multistatus.response"
57 #define DAV_PROPFIND_NAME ".multistatus.response.href"
58 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
60 /* DAV request body templates */
61 #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>"
62 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
63 #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>"
66 #define LOCK_REFRESH 30
68 /* Remember to update object flag allocation in object.h */
69 #define LOCAL (1u<<16)
70 #define REMOTE (1u<<17)
71 #define FETCHING (1u<<18)
72 #define PUSHING (1u<<19)
74 /* We allow "recursive" symbolic refs. Only within reason, though */
79 static signed char remote_dir_exists
[256];
81 static int push_verbosely
;
82 static int push_all
= MATCH_REFS_NONE
;
85 static int helper_status
;
87 static struct object_list
*objects
;
94 int can_update_info_refs
;
96 struct packed_git
*packs
;
97 struct remote_lock
*locks
;
100 static struct repo
*repo
;
102 enum transfer_state
{
114 struct transfer_request
{
118 struct remote_lock
*lock
;
119 struct curl_slist
*headers
;
120 struct buffer buffer
;
121 enum transfer_state state
;
122 CURLcode curl_result
;
123 char errorstr
[CURL_ERROR_SIZE
];
126 struct active_request_slot
*slot
;
127 struct transfer_request
*next
;
130 static struct transfer_request
*request_queue_head
;
136 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
144 char tmpfile_suffix
[41];
148 struct remote_lock
*next
;
151 /* Flags that control remote_ls processing */
152 #define PROCESS_FILES (1u << 0)
153 #define PROCESS_DIRS (1u << 1)
154 #define RECURSIVE (1u << 2)
156 /* Flags that remote_ls passes to callback functions */
157 #define IS_DIR (1u << 0)
159 struct remote_ls_ctx
{
161 void (*userFunc
)(struct remote_ls_ctx
*ls
);
166 struct remote_ls_ctx
*parent
;
169 /* get_dav_token_headers options */
170 enum dav_header_flag
{
171 DAV_HEADER_IF
= (1u << 0),
172 DAV_HEADER_LOCK
= (1u << 1),
173 DAV_HEADER_TIMEOUT
= (1u << 2)
176 static char *xml_entities(const char *s
)
178 struct strbuf buf
= STRBUF_INIT
;
179 strbuf_addstr_xml_quoted(&buf
, s
);
180 return strbuf_detach(&buf
, NULL
);
183 static void curl_setup_http_get(CURL
*curl
, const char *url
,
184 const char *custom_req
)
186 curl_easy_setopt(curl
, CURLOPT_HTTPGET
, 1);
187 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
188 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
189 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
192 static void curl_setup_http(CURL
*curl
, const char *url
,
193 const char *custom_req
, struct buffer
*buffer
,
194 curl_write_callback write_fn
)
196 curl_easy_setopt(curl
, CURLOPT_PUT
, 1);
197 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
198 curl_easy_setopt(curl
, CURLOPT_INFILE
, buffer
);
199 curl_easy_setopt(curl
, CURLOPT_INFILESIZE
, buffer
->buf
.len
);
200 curl_easy_setopt(curl
, CURLOPT_READFUNCTION
, fread_buffer
);
201 #ifndef NO_CURL_IOCTL
202 curl_easy_setopt(curl
, CURLOPT_IOCTLFUNCTION
, ioctl_buffer
);
203 curl_easy_setopt(curl
, CURLOPT_IOCTLDATA
, buffer
);
205 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, write_fn
);
206 curl_easy_setopt(curl
, CURLOPT_NOBODY
, 0);
207 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
208 curl_easy_setopt(curl
, CURLOPT_UPLOAD
, 1);
211 static struct curl_slist
*get_dav_token_headers(struct remote_lock
*lock
, enum dav_header_flag options
)
213 struct strbuf buf
= STRBUF_INIT
;
214 struct curl_slist
*dav_headers
= http_copy_default_headers();
216 if (options
& DAV_HEADER_IF
) {
217 strbuf_addf(&buf
, "If: (<%s>)", lock
->token
);
218 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
221 if (options
& DAV_HEADER_LOCK
) {
222 strbuf_addf(&buf
, "Lock-Token: <%s>", lock
->token
);
223 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
226 if (options
& DAV_HEADER_TIMEOUT
) {
227 strbuf_addf(&buf
, "Timeout: Second-%ld", lock
->timeout
);
228 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
231 strbuf_release(&buf
);
236 static void finish_request(struct transfer_request
*request
);
237 static void release_request(struct transfer_request
*request
);
239 static void process_response(void *callback_data
)
241 struct transfer_request
*request
=
242 (struct transfer_request
*)callback_data
;
244 finish_request(request
);
247 #ifdef USE_CURL_MULTI
249 static void start_fetch_loose(struct transfer_request
*request
)
251 struct active_request_slot
*slot
;
252 struct http_object_request
*obj_req
;
254 obj_req
= new_http_object_request(repo
->url
, request
->obj
->oid
.hash
);
255 if (obj_req
== NULL
) {
256 request
->state
= ABORTED
;
260 slot
= obj_req
->slot
;
261 slot
->callback_func
= process_response
;
262 slot
->callback_data
= request
;
263 request
->slot
= slot
;
264 request
->userData
= obj_req
;
266 /* Try to get the request started, abort the request on error */
267 request
->state
= RUN_FETCH_LOOSE
;
268 if (!start_active_slot(slot
)) {
269 fprintf(stderr
, "Unable to start GET request\n");
270 repo
->can_update_info_refs
= 0;
271 release_http_object_request(obj_req
);
272 release_request(request
);
276 static void start_mkcol(struct transfer_request
*request
)
278 char *hex
= oid_to_hex(&request
->obj
->oid
);
279 struct active_request_slot
*slot
;
281 request
->url
= get_remote_object_url(repo
->url
, hex
, 1);
283 slot
= get_active_slot();
284 slot
->callback_func
= process_response
;
285 slot
->callback_data
= request
;
286 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MKCOL
);
287 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
289 if (start_active_slot(slot
)) {
290 request
->slot
= slot
;
291 request
->state
= RUN_MKCOL
;
293 request
->state
= ABORTED
;
300 static void start_fetch_packed(struct transfer_request
*request
)
302 struct packed_git
*target
;
304 struct transfer_request
*check_request
= request_queue_head
;
305 struct http_pack_request
*preq
;
307 target
= find_sha1_pack(request
->obj
->oid
.hash
, repo
->packs
);
309 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", oid_to_hex(&request
->obj
->oid
));
310 repo
->can_update_info_refs
= 0;
311 release_request(request
);
315 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
316 fprintf(stderr
, " which contains %s\n", oid_to_hex(&request
->obj
->oid
));
318 preq
= new_http_pack_request(target
, repo
->url
);
320 repo
->can_update_info_refs
= 0;
323 preq
->lst
= &repo
->packs
;
325 /* Make sure there isn't another open request for this pack */
326 while (check_request
) {
327 if (check_request
->state
== RUN_FETCH_PACKED
&&
328 !strcmp(check_request
->url
, preq
->url
)) {
329 release_http_pack_request(preq
);
330 release_request(request
);
333 check_request
= check_request
->next
;
336 preq
->slot
->callback_func
= process_response
;
337 preq
->slot
->callback_data
= request
;
338 request
->slot
= preq
->slot
;
339 request
->userData
= preq
;
341 /* Try to get the request started, abort the request on error */
342 request
->state
= RUN_FETCH_PACKED
;
343 if (!start_active_slot(preq
->slot
)) {
344 fprintf(stderr
, "Unable to start GET request\n");
345 release_http_pack_request(preq
);
346 repo
->can_update_info_refs
= 0;
347 release_request(request
);
351 static void start_put(struct transfer_request
*request
)
353 char *hex
= oid_to_hex(&request
->obj
->oid
);
354 struct active_request_slot
*slot
;
355 struct strbuf buf
= STRBUF_INIT
;
356 enum object_type type
;
364 unpacked
= read_sha1_file(request
->obj
->oid
.hash
, &type
, &len
);
365 hdrlen
= xsnprintf(hdr
, sizeof(hdr
), "%s %lu", typename(type
), len
) + 1;
368 git_deflate_init(&stream
, zlib_compression_level
);
369 size
= git_deflate_bound(&stream
, len
+ hdrlen
);
370 strbuf_init(&request
->buffer
.buf
, size
);
371 request
->buffer
.posn
= 0;
374 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
375 stream
.avail_out
= size
;
378 stream
.next_in
= (void *)hdr
;
379 stream
.avail_in
= hdrlen
;
380 while (git_deflate(&stream
, 0) == Z_OK
)
383 /* Then the data itself.. */
384 stream
.next_in
= unpacked
;
385 stream
.avail_in
= len
;
386 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
388 git_deflate_end(&stream
);
391 request
->buffer
.buf
.len
= stream
.total_out
;
393 strbuf_addstr(&buf
, "Destination: ");
394 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
395 request
->dest
= strbuf_detach(&buf
, NULL
);
397 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
398 strbuf_add(&buf
, request
->lock
->tmpfile_suffix
, 41);
399 request
->url
= strbuf_detach(&buf
, NULL
);
401 slot
= get_active_slot();
402 slot
->callback_func
= process_response
;
403 slot
->callback_data
= request
;
404 curl_setup_http(slot
->curl
, request
->url
, DAV_PUT
,
405 &request
->buffer
, fwrite_null
);
407 if (start_active_slot(slot
)) {
408 request
->slot
= slot
;
409 request
->state
= RUN_PUT
;
411 request
->state
= ABORTED
;
417 static void start_move(struct transfer_request
*request
)
419 struct active_request_slot
*slot
;
420 struct curl_slist
*dav_headers
= http_copy_default_headers();
422 slot
= get_active_slot();
423 slot
->callback_func
= process_response
;
424 slot
->callback_data
= request
;
425 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MOVE
);
426 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
427 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
428 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
430 if (start_active_slot(slot
)) {
431 request
->slot
= slot
;
432 request
->state
= RUN_MOVE
;
434 request
->state
= ABORTED
;
440 static int refresh_lock(struct remote_lock
*lock
)
442 struct active_request_slot
*slot
;
443 struct slot_results results
;
444 struct curl_slist
*dav_headers
;
447 lock
->refreshing
= 1;
449 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
| DAV_HEADER_TIMEOUT
);
451 slot
= get_active_slot();
452 slot
->results
= &results
;
453 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_LOCK
);
454 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
456 if (start_active_slot(slot
)) {
457 run_active_slot(slot
);
458 if (results
.curl_result
!= CURLE_OK
) {
459 fprintf(stderr
, "LOCK HTTP error %ld\n",
462 lock
->start_time
= time(NULL
);
467 lock
->refreshing
= 0;
468 curl_slist_free_all(dav_headers
);
473 static void check_locks(void)
475 struct remote_lock
*lock
= repo
->locks
;
476 time_t current_time
= time(NULL
);
480 time_remaining
= lock
->start_time
+ lock
->timeout
-
482 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
483 if (!refresh_lock(lock
)) {
485 "Unable to refresh lock for %s\n",
495 static void release_request(struct transfer_request
*request
)
497 struct transfer_request
*entry
= request_queue_head
;
499 if (request
== request_queue_head
) {
500 request_queue_head
= request
->next
;
502 while (entry
->next
!= NULL
&& entry
->next
!= request
)
504 if (entry
->next
== request
)
505 entry
->next
= entry
->next
->next
;
512 static void finish_request(struct transfer_request
*request
)
514 struct http_pack_request
*preq
;
515 struct http_object_request
*obj_req
;
517 request
->curl_result
= request
->slot
->curl_result
;
518 request
->http_code
= request
->slot
->http_code
;
519 request
->slot
= NULL
;
521 /* Keep locks active */
524 if (request
->headers
!= NULL
)
525 curl_slist_free_all(request
->headers
);
527 /* URL is reused for MOVE after PUT */
528 if (request
->state
!= RUN_PUT
) {
533 if (request
->state
== RUN_MKCOL
) {
534 if (request
->curl_result
== CURLE_OK
||
535 request
->http_code
== 405) {
536 remote_dir_exists
[request
->obj
->oid
.hash
[0]] = 1;
539 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
540 oid_to_hex(&request
->obj
->oid
),
541 request
->curl_result
, request
->http_code
);
542 request
->state
= ABORTED
;
545 } else if (request
->state
== RUN_PUT
) {
546 if (request
->curl_result
== CURLE_OK
) {
549 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
550 oid_to_hex(&request
->obj
->oid
),
551 request
->curl_result
, request
->http_code
);
552 request
->state
= ABORTED
;
555 } else if (request
->state
== RUN_MOVE
) {
556 if (request
->curl_result
== CURLE_OK
) {
558 fprintf(stderr
, " sent %s\n",
559 oid_to_hex(&request
->obj
->oid
));
560 request
->obj
->flags
|= REMOTE
;
561 release_request(request
);
563 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
564 oid_to_hex(&request
->obj
->oid
),
565 request
->curl_result
, request
->http_code
);
566 request
->state
= ABORTED
;
569 } else if (request
->state
== RUN_FETCH_LOOSE
) {
570 obj_req
= (struct http_object_request
*)request
->userData
;
572 if (finish_http_object_request(obj_req
) == 0)
573 if (obj_req
->rename
== 0)
574 request
->obj
->flags
|= (LOCAL
| REMOTE
);
576 /* Try fetching packed if necessary */
577 if (request
->obj
->flags
& LOCAL
) {
578 release_http_object_request(obj_req
);
579 release_request(request
);
581 start_fetch_packed(request
);
583 } else if (request
->state
== RUN_FETCH_PACKED
) {
585 if (request
->curl_result
!= CURLE_OK
) {
586 fprintf(stderr
, "Unable to get pack file %s\n%s",
587 request
->url
, curl_errorstr
);
589 preq
= (struct http_pack_request
*)request
->userData
;
592 if (finish_http_pack_request(preq
) == 0)
594 release_http_pack_request(preq
);
598 repo
->can_update_info_refs
= 0;
599 release_request(request
);
603 #ifdef USE_CURL_MULTI
604 static int is_running_queue
;
605 static int fill_active_slot(void *unused
)
607 struct transfer_request
*request
;
609 if (aborted
|| !is_running_queue
)
612 for (request
= request_queue_head
; request
; request
= request
->next
) {
613 if (request
->state
== NEED_FETCH
) {
614 start_fetch_loose(request
);
616 } else if (pushing
&& request
->state
== NEED_PUSH
) {
617 if (remote_dir_exists
[request
->obj
->oid
.hash
[0]] == 1) {
620 start_mkcol(request
);
629 static void get_remote_object_list(unsigned char parent
);
631 static void add_fetch_request(struct object
*obj
)
633 struct transfer_request
*request
;
638 * Don't fetch the object if it's known to exist locally
639 * or is already in the request queue
641 if (remote_dir_exists
[obj
->oid
.hash
[0]] == -1)
642 get_remote_object_list(obj
->oid
.hash
[0]);
643 if (obj
->flags
& (LOCAL
| FETCHING
))
646 obj
->flags
|= FETCHING
;
647 request
= xmalloc(sizeof(*request
));
650 request
->lock
= NULL
;
651 request
->headers
= NULL
;
652 request
->state
= NEED_FETCH
;
653 request
->next
= request_queue_head
;
654 request_queue_head
= request
;
656 #ifdef USE_CURL_MULTI
662 static int add_send_request(struct object
*obj
, struct remote_lock
*lock
)
664 struct transfer_request
*request
;
665 struct packed_git
*target
;
667 /* Keep locks active */
671 * Don't push the object if it's known to exist on the remote
672 * or is already in the request queue
674 if (remote_dir_exists
[obj
->oid
.hash
[0]] == -1)
675 get_remote_object_list(obj
->oid
.hash
[0]);
676 if (obj
->flags
& (REMOTE
| PUSHING
))
678 target
= find_sha1_pack(obj
->oid
.hash
, repo
->packs
);
680 obj
->flags
|= REMOTE
;
684 obj
->flags
|= PUSHING
;
685 request
= xmalloc(sizeof(*request
));
688 request
->lock
= lock
;
689 request
->headers
= NULL
;
690 request
->state
= NEED_PUSH
;
691 request
->next
= request_queue_head
;
692 request_queue_head
= request
;
694 #ifdef USE_CURL_MULTI
702 static int fetch_indices(void)
707 fprintf(stderr
, "Getting pack list\n");
709 switch (http_get_info_packs(repo
->url
, &repo
->packs
)) {
711 case HTTP_MISSING_TARGET
:
721 static void one_remote_object(const struct object_id
*oid
)
725 obj
= lookup_object(oid
->hash
);
727 obj
= parse_object(oid
);
729 /* Ignore remote objects that don't exist locally */
733 obj
->flags
|= REMOTE
;
734 if (!object_list_contains(objects
, obj
))
735 object_list_insert(obj
, &objects
);
738 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
740 int *lock_flags
= (int *)ctx
->userData
;
743 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
744 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
745 (*lock_flags
& DAV_PROP_LOCKWR
)) {
746 *lock_flags
|= DAV_LOCK_OK
;
748 *lock_flags
&= DAV_LOCK_OK
;
749 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
750 *lock_flags
|= DAV_PROP_LOCKWR
;
751 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
752 *lock_flags
|= DAV_PROP_LOCKEX
;
757 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
759 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
761 unsigned char lock_token_sha1
[20];
763 if (tag_closed
&& ctx
->cdata
) {
764 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
765 lock
->owner
= xstrdup(ctx
->cdata
);
766 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
768 if (skip_prefix(ctx
->cdata
, "Second-", &arg
))
769 lock
->timeout
= strtol(arg
, NULL
, 10);
770 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
771 lock
->token
= xstrdup(ctx
->cdata
);
773 git_SHA1_Init(&sha_ctx
);
774 git_SHA1_Update(&sha_ctx
, lock
->token
, strlen(lock
->token
));
775 git_SHA1_Final(lock_token_sha1
, &sha_ctx
);
777 lock
->tmpfile_suffix
[0] = '_';
778 memcpy(lock
->tmpfile_suffix
+ 1, sha1_to_hex(lock_token_sha1
), 40);
783 static void one_remote_ref(const char *refname
);
786 xml_start_tag(void *userData
, const char *name
, const char **atts
)
788 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
789 const char *c
= strchr(name
, ':');
790 int old_namelen
, new_len
;
797 old_namelen
= strlen(ctx
->name
);
798 new_len
= old_namelen
+ strlen(c
) + 2;
800 if (new_len
> ctx
->len
) {
801 ctx
->name
= xrealloc(ctx
->name
, new_len
);
804 xsnprintf(ctx
->name
+ old_namelen
, ctx
->len
- old_namelen
, ".%s", c
);
809 ctx
->userFunc(ctx
, 0);
813 xml_end_tag(void *userData
, const char *name
)
815 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
816 const char *c
= strchr(name
, ':');
819 ctx
->userFunc(ctx
, 1);
826 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
831 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
833 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
835 ctx
->cdata
= xmemdupz(s
, len
);
838 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
840 struct active_request_slot
*slot
;
841 struct slot_results results
;
842 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
843 struct strbuf in_buffer
= STRBUF_INIT
;
846 char timeout_header
[25];
847 struct remote_lock
*lock
= NULL
;
848 struct curl_slist
*dav_headers
= http_copy_default_headers();
852 url
= xstrfmt("%s%s", repo
->url
, path
);
854 /* Make sure leading directories exist for the remote ref */
855 ep
= strchr(url
+ strlen(repo
->url
) + 1, '/');
857 char saved_character
= ep
[1];
859 slot
= get_active_slot();
860 slot
->results
= &results
;
861 curl_setup_http_get(slot
->curl
, url
, DAV_MKCOL
);
862 if (start_active_slot(slot
)) {
863 run_active_slot(slot
);
864 if (results
.curl_result
!= CURLE_OK
&&
865 results
.http_code
!= 405) {
867 "Unable to create branch path %s\n",
873 fprintf(stderr
, "Unable to start MKCOL request\n");
877 ep
[1] = saved_character
;
878 ep
= strchr(ep
+ 1, '/');
881 escaped
= xml_entities(ident_default_email());
882 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, escaped
);
885 xsnprintf(timeout_header
, sizeof(timeout_header
), "Timeout: Second-%ld", timeout
);
886 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
887 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
889 slot
= get_active_slot();
890 slot
->results
= &results
;
891 curl_setup_http(slot
->curl
, url
, DAV_LOCK
, &out_buffer
, fwrite_buffer
);
892 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
893 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
895 lock
= xcalloc(1, sizeof(*lock
));
898 if (start_active_slot(slot
)) {
899 run_active_slot(slot
);
900 if (results
.curl_result
== CURLE_OK
) {
901 XML_Parser parser
= XML_ParserCreate(NULL
);
902 enum XML_Status result
;
903 ctx
.name
= xcalloc(10, 1);
906 ctx
.userFunc
= handle_new_lock_ctx
;
908 XML_SetUserData(parser
, &ctx
);
909 XML_SetElementHandler(parser
, xml_start_tag
,
911 XML_SetCharacterDataHandler(parser
, xml_cdata
);
912 result
= XML_Parse(parser
, in_buffer
.buf
,
915 if (result
!= XML_STATUS_OK
) {
916 fprintf(stderr
, "XML error: %s\n",
918 XML_GetErrorCode(parser
)));
921 XML_ParserFree(parser
);
924 fprintf(stderr
, "Unable to start LOCK request\n");
927 curl_slist_free_all(dav_headers
);
928 strbuf_release(&out_buffer
.buf
);
929 strbuf_release(&in_buffer
);
931 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
939 lock
->start_time
= time(NULL
);
940 lock
->next
= repo
->locks
;
947 static int unlock_remote(struct remote_lock
*lock
)
949 struct active_request_slot
*slot
;
950 struct slot_results results
;
951 struct remote_lock
*prev
= repo
->locks
;
952 struct curl_slist
*dav_headers
;
955 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_LOCK
);
957 slot
= get_active_slot();
958 slot
->results
= &results
;
959 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_UNLOCK
);
960 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
962 if (start_active_slot(slot
)) {
963 run_active_slot(slot
);
964 if (results
.curl_result
== CURLE_OK
)
967 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
970 fprintf(stderr
, "Unable to start UNLOCK request\n");
973 curl_slist_free_all(dav_headers
);
975 if (repo
->locks
== lock
) {
976 repo
->locks
= lock
->next
;
978 while (prev
&& prev
->next
!= lock
)
981 prev
->next
= prev
->next
->next
;
992 static void remove_locks(void)
994 struct remote_lock
*lock
= repo
->locks
;
996 fprintf(stderr
, "Removing remote locks...\n");
998 struct remote_lock
*next
= lock
->next
;
1004 static void remove_locks_on_signal(int signo
)
1007 sigchain_pop(signo
);
1011 static void remote_ls(const char *path
, int flags
,
1012 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1015 /* extract hex from sharded "xx/x{40}" filename */
1016 static int get_oid_hex_from_objpath(const char *path
, struct object_id
*oid
)
1018 char hex
[GIT_MAX_HEXSZ
];
1020 if (strlen(path
) != GIT_SHA1_HEXSZ
+ 1)
1023 memcpy(hex
, path
, 2);
1025 path
++; /* skip '/' */
1026 memcpy(hex
, path
, GIT_SHA1_HEXSZ
- 2);
1028 return get_oid_hex(hex
, oid
);
1031 static void process_ls_object(struct remote_ls_ctx
*ls
)
1033 unsigned int *parent
= (unsigned int *)ls
->userData
;
1034 const char *path
= ls
->dentry_name
;
1035 struct object_id oid
;
1037 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1038 remote_dir_exists
[*parent
] = 1;
1042 if (!skip_prefix(path
, "objects/", &path
) ||
1043 get_oid_hex_from_objpath(path
, &oid
))
1046 one_remote_object(&oid
);
1049 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1051 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1052 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1056 if (!(ls
->dentry_flags
& IS_DIR
))
1057 one_remote_ref(ls
->dentry_name
);
1060 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1062 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1065 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1066 if (ls
->dentry_flags
& IS_DIR
) {
1068 /* ensure collection names end with slash */
1069 str_end_url_with_slash(ls
->dentry_name
, &ls
->dentry_name
);
1071 if (ls
->flags
& PROCESS_DIRS
) {
1074 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1075 ls
->flags
& RECURSIVE
) {
1076 remote_ls(ls
->dentry_name
,
1081 } else if (ls
->flags
& PROCESS_FILES
) {
1084 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1085 char *path
= ctx
->cdata
;
1086 if (*ctx
->cdata
== 'h') {
1087 path
= strstr(path
, "//");
1089 path
= strchr(path
+2, '/');
1093 const char *url
= repo
->url
;
1096 if (strncmp(path
, url
, repo
->path_len
))
1097 error("Parsed path '%s' does not match url: '%s'",
1100 path
+= repo
->path_len
;
1101 ls
->dentry_name
= xstrdup(path
);
1104 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1105 ls
->dentry_flags
|= IS_DIR
;
1107 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1108 free(ls
->dentry_name
);
1109 ls
->dentry_name
= NULL
;
1110 ls
->dentry_flags
= 0;
1115 * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it
1116 * should _only_ heed the information from that file, instead of trying to
1117 * determine the refs from the remote file system (badly: it does not even
1118 * know about packed-refs).
1120 static void remote_ls(const char *path
, int flags
,
1121 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1124 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1125 struct active_request_slot
*slot
;
1126 struct slot_results results
;
1127 struct strbuf in_buffer
= STRBUF_INIT
;
1128 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1129 struct curl_slist
*dav_headers
= http_copy_default_headers();
1131 struct remote_ls_ctx ls
;
1134 ls
.path
= xstrdup(path
);
1135 ls
.dentry_name
= NULL
;
1136 ls
.dentry_flags
= 0;
1137 ls
.userData
= userData
;
1138 ls
.userFunc
= userFunc
;
1140 strbuf_addstr(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1142 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1143 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1145 slot
= get_active_slot();
1146 slot
->results
= &results
;
1147 curl_setup_http(slot
->curl
, url
, DAV_PROPFIND
,
1148 &out_buffer
, fwrite_buffer
);
1149 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1150 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1152 if (start_active_slot(slot
)) {
1153 run_active_slot(slot
);
1154 if (results
.curl_result
== CURLE_OK
) {
1155 XML_Parser parser
= XML_ParserCreate(NULL
);
1156 enum XML_Status result
;
1157 ctx
.name
= xcalloc(10, 1);
1160 ctx
.userFunc
= handle_remote_ls_ctx
;
1162 XML_SetUserData(parser
, &ctx
);
1163 XML_SetElementHandler(parser
, xml_start_tag
,
1165 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1166 result
= XML_Parse(parser
, in_buffer
.buf
,
1170 if (result
!= XML_STATUS_OK
) {
1171 fprintf(stderr
, "XML error: %s\n",
1173 XML_GetErrorCode(parser
)));
1175 XML_ParserFree(parser
);
1178 fprintf(stderr
, "Unable to start PROPFIND request\n");
1183 strbuf_release(&out_buffer
.buf
);
1184 strbuf_release(&in_buffer
);
1185 curl_slist_free_all(dav_headers
);
1188 static void get_remote_object_list(unsigned char parent
)
1190 char path
[] = "objects/XX/";
1191 static const char hex
[] = "0123456789abcdef";
1192 unsigned int val
= parent
;
1194 path
[8] = hex
[val
>> 4];
1195 path
[9] = hex
[val
& 0xf];
1196 remote_dir_exists
[val
] = 0;
1197 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1198 process_ls_object
, &val
);
1201 static int locking_available(void)
1203 struct active_request_slot
*slot
;
1204 struct slot_results results
;
1205 struct strbuf in_buffer
= STRBUF_INIT
;
1206 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1207 struct curl_slist
*dav_headers
= http_copy_default_headers();
1212 escaped
= xml_entities(repo
->url
);
1213 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, escaped
);
1216 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1217 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1219 slot
= get_active_slot();
1220 slot
->results
= &results
;
1221 curl_setup_http(slot
->curl
, repo
->url
, DAV_PROPFIND
,
1222 &out_buffer
, fwrite_buffer
);
1223 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1224 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1226 if (start_active_slot(slot
)) {
1227 run_active_slot(slot
);
1228 if (results
.curl_result
== CURLE_OK
) {
1229 XML_Parser parser
= XML_ParserCreate(NULL
);
1230 enum XML_Status result
;
1231 ctx
.name
= xcalloc(10, 1);
1234 ctx
.userFunc
= handle_lockprop_ctx
;
1235 ctx
.userData
= &lock_flags
;
1236 XML_SetUserData(parser
, &ctx
);
1237 XML_SetElementHandler(parser
, xml_start_tag
,
1239 result
= XML_Parse(parser
, in_buffer
.buf
,
1243 if (result
!= XML_STATUS_OK
) {
1244 fprintf(stderr
, "XML error: %s\n",
1246 XML_GetErrorCode(parser
)));
1249 XML_ParserFree(parser
);
1251 error("no DAV locking support on %s",
1255 error("Cannot access URL %s, return code %d",
1256 repo
->url
, results
.curl_result
);
1260 error("Unable to start PROPFIND request on %s", repo
->url
);
1263 strbuf_release(&out_buffer
.buf
);
1264 strbuf_release(&in_buffer
);
1265 curl_slist_free_all(dav_headers
);
1270 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1272 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1276 return &entry
->next
;
1279 static struct object_list
**process_blob(struct blob
*blob
,
1280 struct object_list
**p
)
1282 struct object
*obj
= &blob
->object
;
1284 obj
->flags
|= LOCAL
;
1286 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1290 return add_one_object(obj
, p
);
1293 static struct object_list
**process_tree(struct tree
*tree
,
1294 struct object_list
**p
)
1296 struct object
*obj
= &tree
->object
;
1297 struct tree_desc desc
;
1298 struct name_entry entry
;
1300 obj
->flags
|= LOCAL
;
1302 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1304 if (parse_tree(tree
) < 0)
1305 die("bad tree object %s", oid_to_hex(&obj
->oid
));
1308 p
= add_one_object(obj
, p
);
1310 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1312 while (tree_entry(&desc
, &entry
))
1313 switch (object_type(entry
.mode
)) {
1315 p
= process_tree(lookup_tree(entry
.oid
), p
);
1318 p
= process_blob(lookup_blob(entry
.oid
), p
);
1321 /* Subproject commit - not in this repository */
1325 free_tree_buffer(tree
);
1329 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1332 struct commit
*commit
;
1333 struct object_list
**p
= &objects
;
1336 while ((commit
= get_revision(revs
)) != NULL
) {
1337 p
= process_tree(commit
->tree
, p
);
1338 commit
->object
.flags
|= LOCAL
;
1339 if (!(commit
->object
.flags
& UNINTERESTING
))
1340 count
+= add_send_request(&commit
->object
, lock
);
1343 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1344 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1345 struct object
*obj
= entry
->item
;
1346 const char *name
= entry
->name
;
1348 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1350 if (obj
->type
== OBJ_TAG
) {
1352 p
= add_one_object(obj
, p
);
1355 if (obj
->type
== OBJ_TREE
) {
1356 p
= process_tree((struct tree
*)obj
, p
);
1359 if (obj
->type
== OBJ_BLOB
) {
1360 p
= process_blob((struct blob
*)obj
, p
);
1363 die("unknown pending object %s (%s)", oid_to_hex(&obj
->oid
), name
);
1367 if (!(objects
->item
->flags
& UNINTERESTING
))
1368 count
+= add_send_request(objects
->item
, lock
);
1369 objects
= objects
->next
;
1375 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1377 struct active_request_slot
*slot
;
1378 struct slot_results results
;
1379 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1380 struct curl_slist
*dav_headers
;
1382 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1384 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1386 slot
= get_active_slot();
1387 slot
->results
= &results
;
1388 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1389 &out_buffer
, fwrite_null
);
1390 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1392 if (start_active_slot(slot
)) {
1393 run_active_slot(slot
);
1394 strbuf_release(&out_buffer
.buf
);
1395 if (results
.curl_result
!= CURLE_OK
) {
1397 "PUT error: curl result=%d, HTTP code=%ld\n",
1398 results
.curl_result
, results
.http_code
);
1399 /* We should attempt recovery? */
1403 strbuf_release(&out_buffer
.buf
);
1404 fprintf(stderr
, "Unable to start PUT request\n");
1411 static struct ref
*remote_refs
;
1413 static void one_remote_ref(const char *refname
)
1418 ref
= alloc_ref(refname
);
1420 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1422 "Unable to fetch ref %s from %s\n",
1423 refname
, repo
->url
);
1429 * Fetch a copy of the object if it doesn't exist locally - it
1430 * may be required for updating server info later.
1432 if (repo
->can_update_info_refs
&& !has_object_file(&ref
->old_oid
)) {
1433 obj
= lookup_unknown_object(ref
->old_oid
.hash
);
1434 fprintf(stderr
, " fetch %s for %s\n",
1435 oid_to_hex(&ref
->old_oid
), refname
);
1436 add_fetch_request(obj
);
1439 ref
->next
= remote_refs
;
1443 static void get_dav_remote_heads(void)
1445 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1448 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1450 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1454 ref
= alloc_ref(ls
->dentry_name
);
1456 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1458 "Unable to fetch ref %s from %s\n",
1459 ls
->dentry_name
, repo
->url
);
1465 o
= parse_object(&ref
->old_oid
);
1468 "Unable to parse object %s for remote ref %s\n",
1469 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1475 strbuf_addf(buf
, "%s\t%s\n",
1476 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1478 if (o
->type
== OBJ_TAG
) {
1479 o
= deref_tag(o
, ls
->dentry_name
, 0);
1481 strbuf_addf(buf
, "%s\t%s^{}\n",
1482 oid_to_hex(&o
->oid
), ls
->dentry_name
);
1487 static void update_remote_info_refs(struct remote_lock
*lock
)
1489 struct buffer buffer
= { STRBUF_INIT
, 0 };
1490 struct active_request_slot
*slot
;
1491 struct slot_results results
;
1492 struct curl_slist
*dav_headers
;
1494 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1495 add_remote_info_ref
, &buffer
.buf
);
1497 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1499 slot
= get_active_slot();
1500 slot
->results
= &results
;
1501 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1502 &buffer
, fwrite_null
);
1503 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1505 if (start_active_slot(slot
)) {
1506 run_active_slot(slot
);
1507 if (results
.curl_result
!= CURLE_OK
) {
1509 "PUT error: curl result=%d, HTTP code=%ld\n",
1510 results
.curl_result
, results
.http_code
);
1514 strbuf_release(&buffer
.buf
);
1517 static int remote_exists(const char *path
)
1519 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1523 switch (http_get_strbuf(url
, NULL
, NULL
)) {
1527 case HTTP_MISSING_TARGET
:
1531 error("unable to access '%s': %s", url
, curl_errorstr
);
1539 static void fetch_symref(const char *path
, char **symref
, struct object_id
*oid
)
1541 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1542 struct strbuf buffer
= STRBUF_INIT
;
1545 if (http_get_strbuf(url
, &buffer
, NULL
) != HTTP_OK
)
1546 die("Couldn't get %s for remote symref\n%s", url
,
1554 if (buffer
.len
== 0)
1557 /* Cut off trailing newline. */
1558 strbuf_rtrim(&buffer
);
1560 /* If it's a symref, set the refname; otherwise try for a sha1 */
1561 if (skip_prefix(buffer
.buf
, "ref: ", &name
)) {
1562 *symref
= xmemdupz(name
, buffer
.len
- (name
- buffer
.buf
));
1564 get_oid_hex(buffer
.buf
, oid
);
1567 strbuf_release(&buffer
);
1570 static int verify_merge_base(struct object_id
*head_oid
, struct ref
*remote
)
1572 struct commit
*head
= lookup_commit_or_die(head_oid
, "HEAD");
1573 struct commit
*branch
= lookup_commit_or_die(&remote
->old_oid
,
1576 return in_merge_bases(branch
, head
);
1579 static int delete_remote_branch(const char *pattern
, int force
)
1581 struct ref
*refs
= remote_refs
;
1582 struct ref
*remote_ref
= NULL
;
1583 struct object_id head_oid
;
1584 char *symref
= NULL
;
1586 int patlen
= strlen(pattern
);
1588 struct active_request_slot
*slot
;
1589 struct slot_results results
;
1592 /* Find the remote branch(es) matching the specified branch name */
1593 for (match
= 0; refs
; refs
= refs
->next
) {
1594 char *name
= refs
->name
;
1595 int namelen
= strlen(name
);
1596 if (namelen
< patlen
||
1597 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
1599 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
1605 return error("No remote branch matches %s", pattern
);
1607 return error("More than one remote branch matches %s",
1611 * Remote HEAD must be a symref (not exactly foolproof; a remote
1612 * symlink to a symref will look like a symref)
1614 fetch_symref("HEAD", &symref
, &head_oid
);
1616 return error("Remote HEAD is not a symref");
1618 /* Remote branch must not be the remote HEAD */
1619 for (i
= 0; symref
&& i
< MAXDEPTH
; i
++) {
1620 if (!strcmp(remote_ref
->name
, symref
))
1621 return error("Remote branch %s is the current HEAD",
1623 fetch_symref(symref
, &symref
, &head_oid
);
1626 /* Run extra sanity checks if delete is not forced */
1628 /* Remote HEAD must resolve to a known object */
1630 return error("Remote HEAD symrefs too deep");
1631 if (is_null_oid(&head_oid
))
1632 return error("Unable to resolve remote HEAD");
1633 if (!has_object_file(&head_oid
))
1634 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid
));
1636 /* Remote branch must resolve to a known object */
1637 if (is_null_oid(&remote_ref
->old_oid
))
1638 return error("Unable to resolve remote branch %s",
1640 if (!has_object_file(&remote_ref
->old_oid
))
1641 return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref
->name
, oid_to_hex(&remote_ref
->old_oid
));
1643 /* Remote branch must be an ancestor of remote HEAD */
1644 if (!verify_merge_base(&head_oid
, remote_ref
)) {
1645 return error("The branch '%s' is not an ancestor "
1646 "of your current HEAD.\n"
1647 "If you are sure you want to delete it,"
1648 " run:\n\t'git http-push -D %s %s'",
1649 remote_ref
->name
, repo
->url
, pattern
);
1653 /* Send delete request */
1654 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
1657 url
= xstrfmt("%s%s", repo
->url
, remote_ref
->name
);
1658 slot
= get_active_slot();
1659 slot
->results
= &results
;
1660 curl_setup_http_get(slot
->curl
, url
, DAV_DELETE
);
1661 if (start_active_slot(slot
)) {
1662 run_active_slot(slot
);
1664 if (results
.curl_result
!= CURLE_OK
)
1665 return error("DELETE request failed (%d/%ld)",
1666 results
.curl_result
, results
.http_code
);
1669 return error("Unable to start DELETE request");
1675 static void run_request_queue(void)
1677 #ifdef USE_CURL_MULTI
1678 is_running_queue
= 1;
1679 fill_active_slots();
1680 add_fill_function(NULL
, fill_active_slot
);
1683 finish_all_active_slots();
1684 #ifdef USE_CURL_MULTI
1685 fill_active_slots();
1687 } while (request_queue_head
&& !aborted
);
1689 #ifdef USE_CURL_MULTI
1690 is_running_queue
= 0;
1694 int cmd_main(int argc
, const char **argv
)
1696 struct transfer_request
*request
;
1697 struct transfer_request
*next_request
;
1699 const char **refspec
= NULL
;
1700 struct remote_lock
*ref_lock
= NULL
;
1701 struct remote_lock
*info_ref_lock
= NULL
;
1702 struct rev_info revs
;
1703 int delete_branch
= 0;
1704 int force_delete
= 0;
1705 int objects_to_send
;
1709 struct ref
*ref
, *local_refs
;
1711 repo
= xcalloc(1, sizeof(*repo
));
1714 for (i
= 1; i
< argc
; i
++, argv
++) {
1715 const char *arg
= *argv
;
1718 if (!strcmp(arg
, "--all")) {
1719 push_all
= MATCH_REFS_ALL
;
1722 if (!strcmp(arg
, "--force")) {
1726 if (!strcmp(arg
, "--dry-run")) {
1730 if (!strcmp(arg
, "--helper-status")) {
1734 if (!strcmp(arg
, "--verbose")) {
1736 http_is_verbose
= 1;
1739 if (!strcmp(arg
, "-d")) {
1743 if (!strcmp(arg
, "-D")) {
1748 if (!strcmp(arg
, "-h"))
1749 usage(http_push_usage
);
1752 char *path
= strstr(arg
, "//");
1753 str_end_url_with_slash(arg
, &repo
->url
);
1754 repo
->path_len
= strlen(repo
->url
);
1756 repo
->path
= strchr(path
+2, '/');
1758 repo
->path_len
= strlen(repo
->path
);
1763 nr_refspec
= argc
- i
;
1767 #ifndef USE_CURL_MULTI
1768 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
1772 usage(http_push_usage
);
1774 if (delete_branch
&& nr_refspec
!= 1)
1775 die("You must specify only one branch name when deleting a remote branch");
1777 setup_git_directory();
1779 memset(remote_dir_exists
, -1, 256);
1781 http_init(NULL
, repo
->url
, 1);
1783 #ifdef USE_CURL_MULTI
1784 is_running_queue
= 0;
1787 /* Verify DAV compliance/lock support */
1788 if (!locking_available()) {
1793 sigchain_push_common(remove_locks_on_signal
);
1795 /* Check whether the remote has server info files */
1796 repo
->can_update_info_refs
= 0;
1797 repo
->has_info_refs
= remote_exists("info/refs");
1798 repo
->has_info_packs
= remote_exists("objects/info/packs");
1799 if (repo
->has_info_refs
) {
1800 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
1802 repo
->can_update_info_refs
= 1;
1804 error("cannot lock existing info/refs");
1809 if (repo
->has_info_packs
)
1812 /* Get a list of all local and remote heads to validate refspecs */
1813 local_refs
= get_local_heads();
1814 fprintf(stderr
, "Fetching remote heads...\n");
1815 get_dav_remote_heads();
1816 run_request_queue();
1818 /* Remove a remote branch if -d or -D was specified */
1819 if (delete_branch
) {
1820 if (delete_remote_branch(refspec
[0], force_delete
) == -1) {
1821 fprintf(stderr
, "Unable to delete remote branch %s\n",
1824 printf("error %s cannot remove\n", refspec
[0]);
1830 if (match_push_refs(local_refs
, &remote_refs
,
1831 nr_refspec
, (const char **) refspec
, push_all
)) {
1836 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
1838 printf("error null no match\n");
1844 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1845 struct argv_array commit_argv
= ARGV_ARRAY_INIT
;
1850 if (is_null_oid(&ref
->peer_ref
->new_oid
)) {
1851 if (delete_remote_branch(ref
->name
, 1) == -1) {
1852 error("Could not remove %s", ref
->name
);
1854 printf("error %s cannot remove\n", ref
->name
);
1857 else if (helper_status
)
1858 printf("ok %s\n", ref
->name
);
1863 if (!oidcmp(&ref
->old_oid
, &ref
->peer_ref
->new_oid
)) {
1865 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
1867 printf("ok %s up to date\n", ref
->name
);
1872 !is_null_oid(&ref
->old_oid
) &&
1874 if (!has_object_file(&ref
->old_oid
) ||
1875 !ref_newer(&ref
->peer_ref
->new_oid
,
1878 * We do not have the remote ref, or
1879 * we know that the remote ref is not
1880 * an ancestor of what we are trying to
1881 * push. Either way this can be losing
1882 * commits at the remote end and likely
1883 * we were not up to date to begin with.
1885 error("remote '%s' is not an ancestor of\n"
1887 "Maybe you are not up-to-date and "
1888 "need to pull first?",
1890 ref
->peer_ref
->name
);
1892 printf("error %s non-fast forward\n", ref
->name
);
1897 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1900 fprintf(stderr
, "updating '%s'", ref
->name
);
1901 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
1902 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
1903 fprintf(stderr
, "\n from %s\n to %s\n",
1904 oid_to_hex(&ref
->old_oid
), oid_to_hex(&ref
->new_oid
));
1907 printf("ok %s\n", ref
->name
);
1911 /* Lock remote branch ref */
1912 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
1913 if (ref_lock
== NULL
) {
1914 fprintf(stderr
, "Unable to lock remote branch %s\n",
1917 printf("error %s lock error\n", ref
->name
);
1922 /* Set up revision info for this refspec */
1923 argv_array_push(&commit_argv
, ""); /* ignored */
1924 argv_array_push(&commit_argv
, "--objects");
1925 argv_array_push(&commit_argv
, oid_to_hex(&ref
->new_oid
));
1926 if (!push_all
&& !is_null_oid(&ref
->old_oid
))
1927 argv_array_pushf(&commit_argv
, "^%s",
1928 oid_to_hex(&ref
->old_oid
));
1929 init_revisions(&revs
, setup_git_directory());
1930 setup_revisions(commit_argv
.argc
, commit_argv
.argv
, &revs
, NULL
);
1931 revs
.edge_hint
= 0; /* just in case */
1933 /* Generate a list of objects that need to be pushed */
1935 if (prepare_revision_walk(&revs
))
1936 die("revision walk setup failed");
1937 mark_edges_uninteresting(&revs
, NULL
);
1938 objects_to_send
= get_delta(&revs
, ref_lock
);
1939 finish_all_active_slots();
1941 /* Push missing objects to remote, this would be a
1942 convenient time to pack them first if appropriate. */
1944 if (objects_to_send
)
1945 fprintf(stderr
, " sending %d objects\n",
1948 run_request_queue();
1950 /* Update the remote branch if all went well */
1951 if (aborted
|| !update_remote(ref
->new_oid
.hash
, ref_lock
))
1955 fprintf(stderr
, " done\n");
1957 printf("%s %s\n", !rc
? "ok" : "error", ref
->name
);
1958 unlock_remote(ref_lock
);
1960 argv_array_clear(&commit_argv
);
1963 /* Update remote server info if appropriate */
1964 if (repo
->has_info_refs
&& new_refs
) {
1965 if (info_ref_lock
&& repo
->can_update_info_refs
) {
1966 fprintf(stderr
, "Updating remote server info\n");
1968 update_remote_info_refs(info_ref_lock
);
1970 fprintf(stderr
, "Unable to update server info\n");
1976 unlock_remote(info_ref_lock
);
1981 request
= request_queue_head
;
1982 while (request
!= NULL
) {
1983 next_request
= request
->next
;
1984 release_request(request
);
1985 request
= next_request
;