11 #include "list-objects.h"
14 #ifdef EXPAT_NEEDS_XMLPARSE_H
20 static const char http_push_usage
[] =
21 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
28 #define XML_STATUS_OK 1
29 #define XML_STATUS_ERROR 0
32 #define PREV_BUF_SIZE 4096
35 #define DAV_LOCK "LOCK"
36 #define DAV_MKCOL "MKCOL"
37 #define DAV_MOVE "MOVE"
38 #define DAV_PROPFIND "PROPFIND"
40 #define DAV_UNLOCK "UNLOCK"
41 #define DAV_DELETE "DELETE"
44 #define DAV_PROP_LOCKWR (1u << 0)
45 #define DAV_PROP_LOCKEX (1u << 1)
46 #define DAV_LOCK_OK (1u << 2)
48 /* DAV XML properties */
49 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
50 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
51 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
52 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
53 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
54 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
55 #define DAV_PROPFIND_RESP ".multistatus.response"
56 #define DAV_PROPFIND_NAME ".multistatus.response.href"
57 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
59 /* DAV request body templates */
60 #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>"
61 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
62 #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>"
65 #define LOCK_REFRESH 30
67 /* Remember to update object flag allocation in object.h */
68 #define LOCAL (1u<<16)
69 #define REMOTE (1u<<17)
70 #define FETCHING (1u<<18)
71 #define PUSHING (1u<<19)
73 /* We allow "recursive" symbolic refs. Only within reason, though */
78 static signed char remote_dir_exists
[256];
80 static int push_verbosely
;
81 static int push_all
= MATCH_REFS_NONE
;
84 static int helper_status
;
86 static struct object_list
*objects
;
93 int can_update_info_refs
;
95 struct packed_git
*packs
;
96 struct remote_lock
*locks
;
99 static struct repo
*repo
;
101 enum transfer_state
{
113 struct transfer_request
{
117 struct remote_lock
*lock
;
118 struct curl_slist
*headers
;
119 struct buffer buffer
;
120 enum transfer_state state
;
121 CURLcode curl_result
;
122 char errorstr
[CURL_ERROR_SIZE
];
125 struct active_request_slot
*slot
;
126 struct transfer_request
*next
;
129 static struct transfer_request
*request_queue_head
;
135 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
143 char tmpfile_suffix
[41];
147 struct remote_lock
*next
;
150 /* Flags that control remote_ls processing */
151 #define PROCESS_FILES (1u << 0)
152 #define PROCESS_DIRS (1u << 1)
153 #define RECURSIVE (1u << 2)
155 /* Flags that remote_ls passes to callback functions */
156 #define IS_DIR (1u << 0)
158 struct remote_ls_ctx
{
160 void (*userFunc
)(struct remote_ls_ctx
*ls
);
165 struct remote_ls_ctx
*parent
;
168 /* get_dav_token_headers options */
169 enum dav_header_flag
{
170 DAV_HEADER_IF
= (1u << 0),
171 DAV_HEADER_LOCK
= (1u << 1),
172 DAV_HEADER_TIMEOUT
= (1u << 2)
175 static char *xml_entities(const char *s
)
177 struct strbuf buf
= STRBUF_INIT
;
178 strbuf_addstr_xml_quoted(&buf
, s
);
179 return strbuf_detach(&buf
, NULL
);
182 static void curl_setup_http_get(CURL
*curl
, const char *url
,
183 const char *custom_req
)
185 curl_easy_setopt(curl
, CURLOPT_HTTPGET
, 1);
186 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
187 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
188 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
191 static void curl_setup_http(CURL
*curl
, const char *url
,
192 const char *custom_req
, struct buffer
*buffer
,
193 curl_write_callback write_fn
)
195 curl_easy_setopt(curl
, CURLOPT_PUT
, 1);
196 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
197 curl_easy_setopt(curl
, CURLOPT_INFILE
, buffer
);
198 curl_easy_setopt(curl
, CURLOPT_INFILESIZE
, buffer
->buf
.len
);
199 curl_easy_setopt(curl
, CURLOPT_READFUNCTION
, fread_buffer
);
200 #ifndef NO_CURL_IOCTL
201 curl_easy_setopt(curl
, CURLOPT_IOCTLFUNCTION
, ioctl_buffer
);
202 curl_easy_setopt(curl
, CURLOPT_IOCTLDATA
, &buffer
);
204 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, write_fn
);
205 curl_easy_setopt(curl
, CURLOPT_NOBODY
, 0);
206 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
207 curl_easy_setopt(curl
, CURLOPT_UPLOAD
, 1);
210 static struct curl_slist
*get_dav_token_headers(struct remote_lock
*lock
, enum dav_header_flag options
)
212 struct strbuf buf
= STRBUF_INIT
;
213 struct curl_slist
*dav_headers
= NULL
;
215 if (options
& DAV_HEADER_IF
) {
216 strbuf_addf(&buf
, "If: (<%s>)", lock
->token
);
217 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
220 if (options
& DAV_HEADER_LOCK
) {
221 strbuf_addf(&buf
, "Lock-Token: <%s>", lock
->token
);
222 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
225 if (options
& DAV_HEADER_TIMEOUT
) {
226 strbuf_addf(&buf
, "Timeout: Second-%ld", lock
->timeout
);
227 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
230 strbuf_release(&buf
);
235 static void finish_request(struct transfer_request
*request
);
236 static void release_request(struct transfer_request
*request
);
238 static void process_response(void *callback_data
)
240 struct transfer_request
*request
=
241 (struct transfer_request
*)callback_data
;
243 finish_request(request
);
246 #ifdef USE_CURL_MULTI
248 static void start_fetch_loose(struct transfer_request
*request
)
250 struct active_request_slot
*slot
;
251 struct http_object_request
*obj_req
;
253 obj_req
= new_http_object_request(repo
->url
, request
->obj
->sha1
);
254 if (obj_req
== NULL
) {
255 request
->state
= ABORTED
;
259 slot
= obj_req
->slot
;
260 slot
->callback_func
= process_response
;
261 slot
->callback_data
= request
;
262 request
->slot
= slot
;
263 request
->userData
= obj_req
;
265 /* Try to get the request started, abort the request on error */
266 request
->state
= RUN_FETCH_LOOSE
;
267 if (!start_active_slot(slot
)) {
268 fprintf(stderr
, "Unable to start GET request\n");
269 repo
->can_update_info_refs
= 0;
270 release_http_object_request(obj_req
);
271 release_request(request
);
275 static void start_mkcol(struct transfer_request
*request
)
277 char *hex
= sha1_to_hex(request
->obj
->sha1
);
278 struct active_request_slot
*slot
;
280 request
->url
= get_remote_object_url(repo
->url
, hex
, 1);
282 slot
= get_active_slot();
283 slot
->callback_func
= process_response
;
284 slot
->callback_data
= request
;
285 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MKCOL
);
286 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
288 if (start_active_slot(slot
)) {
289 request
->slot
= slot
;
290 request
->state
= RUN_MKCOL
;
292 request
->state
= ABORTED
;
299 static void start_fetch_packed(struct transfer_request
*request
)
301 struct packed_git
*target
;
303 struct transfer_request
*check_request
= request_queue_head
;
304 struct http_pack_request
*preq
;
306 target
= find_sha1_pack(request
->obj
->sha1
, repo
->packs
);
308 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request
->obj
->sha1
));
309 repo
->can_update_info_refs
= 0;
310 release_request(request
);
314 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
315 fprintf(stderr
, " which contains %s\n", sha1_to_hex(request
->obj
->sha1
));
317 preq
= new_http_pack_request(target
, repo
->url
);
319 release_http_pack_request(preq
);
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
= sha1_to_hex(request
->obj
->sha1
);
354 struct active_request_slot
*slot
;
355 struct strbuf buf
= STRBUF_INIT
;
356 enum object_type type
;
364 unpacked
= read_sha1_file(request
->obj
->sha1
, &type
, &len
);
365 hdrlen
= sprintf(hdr
, "%s %lu", typename(type
), len
) + 1;
368 memset(&stream
, 0, sizeof(stream
));
369 git_deflate_init(&stream
, zlib_compression_level
);
370 size
= git_deflate_bound(&stream
, len
+ hdrlen
);
371 strbuf_init(&request
->buffer
.buf
, size
);
372 request
->buffer
.posn
= 0;
375 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
376 stream
.avail_out
= size
;
379 stream
.next_in
= (void *)hdr
;
380 stream
.avail_in
= hdrlen
;
381 while (git_deflate(&stream
, 0) == Z_OK
)
384 /* Then the data itself.. */
385 stream
.next_in
= unpacked
;
386 stream
.avail_in
= len
;
387 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
389 git_deflate_end(&stream
);
392 request
->buffer
.buf
.len
= stream
.total_out
;
394 strbuf_addstr(&buf
, "Destination: ");
395 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
396 request
->dest
= strbuf_detach(&buf
, NULL
);
398 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
399 strbuf_add(&buf
, request
->lock
->tmpfile_suffix
, 41);
400 request
->url
= strbuf_detach(&buf
, NULL
);
402 slot
= get_active_slot();
403 slot
->callback_func
= process_response
;
404 slot
->callback_data
= request
;
405 curl_setup_http(slot
->curl
, request
->url
, DAV_PUT
,
406 &request
->buffer
, fwrite_null
);
408 if (start_active_slot(slot
)) {
409 request
->slot
= slot
;
410 request
->state
= RUN_PUT
;
412 request
->state
= ABORTED
;
418 static void start_move(struct transfer_request
*request
)
420 struct active_request_slot
*slot
;
421 struct curl_slist
*dav_headers
= NULL
;
423 slot
= get_active_slot();
424 slot
->callback_func
= process_response
;
425 slot
->callback_data
= request
;
426 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MOVE
);
427 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
428 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
429 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
431 if (start_active_slot(slot
)) {
432 request
->slot
= slot
;
433 request
->state
= RUN_MOVE
;
435 request
->state
= ABORTED
;
441 static int refresh_lock(struct remote_lock
*lock
)
443 struct active_request_slot
*slot
;
444 struct slot_results results
;
445 struct curl_slist
*dav_headers
;
448 lock
->refreshing
= 1;
450 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
| DAV_HEADER_TIMEOUT
);
452 slot
= get_active_slot();
453 slot
->results
= &results
;
454 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_LOCK
);
455 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
457 if (start_active_slot(slot
)) {
458 run_active_slot(slot
);
459 if (results
.curl_result
!= CURLE_OK
) {
460 fprintf(stderr
, "LOCK HTTP error %ld\n",
463 lock
->start_time
= time(NULL
);
468 lock
->refreshing
= 0;
469 curl_slist_free_all(dav_headers
);
474 static void check_locks(void)
476 struct remote_lock
*lock
= repo
->locks
;
477 time_t current_time
= time(NULL
);
481 time_remaining
= lock
->start_time
+ lock
->timeout
-
483 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
484 if (!refresh_lock(lock
)) {
486 "Unable to refresh lock for %s\n",
496 static void release_request(struct transfer_request
*request
)
498 struct transfer_request
*entry
= request_queue_head
;
500 if (request
== request_queue_head
) {
501 request_queue_head
= request
->next
;
503 while (entry
->next
!= NULL
&& entry
->next
!= request
)
505 if (entry
->next
== request
)
506 entry
->next
= entry
->next
->next
;
513 static void finish_request(struct transfer_request
*request
)
515 struct http_pack_request
*preq
;
516 struct http_object_request
*obj_req
;
518 request
->curl_result
= request
->slot
->curl_result
;
519 request
->http_code
= request
->slot
->http_code
;
520 request
->slot
= NULL
;
522 /* Keep locks active */
525 if (request
->headers
!= NULL
)
526 curl_slist_free_all(request
->headers
);
528 /* URL is reused for MOVE after PUT */
529 if (request
->state
!= RUN_PUT
) {
534 if (request
->state
== RUN_MKCOL
) {
535 if (request
->curl_result
== CURLE_OK
||
536 request
->http_code
== 405) {
537 remote_dir_exists
[request
->obj
->sha1
[0]] = 1;
540 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
541 sha1_to_hex(request
->obj
->sha1
),
542 request
->curl_result
, request
->http_code
);
543 request
->state
= ABORTED
;
546 } else if (request
->state
== RUN_PUT
) {
547 if (request
->curl_result
== CURLE_OK
) {
550 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
551 sha1_to_hex(request
->obj
->sha1
),
552 request
->curl_result
, request
->http_code
);
553 request
->state
= ABORTED
;
556 } else if (request
->state
== RUN_MOVE
) {
557 if (request
->curl_result
== CURLE_OK
) {
559 fprintf(stderr
, " sent %s\n",
560 sha1_to_hex(request
->obj
->sha1
));
561 request
->obj
->flags
|= REMOTE
;
562 release_request(request
);
564 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
565 sha1_to_hex(request
->obj
->sha1
),
566 request
->curl_result
, request
->http_code
);
567 request
->state
= ABORTED
;
570 } else if (request
->state
== RUN_FETCH_LOOSE
) {
571 obj_req
= (struct http_object_request
*)request
->userData
;
573 if (finish_http_object_request(obj_req
) == 0)
574 if (obj_req
->rename
== 0)
575 request
->obj
->flags
|= (LOCAL
| REMOTE
);
577 /* Try fetching packed if necessary */
578 if (request
->obj
->flags
& LOCAL
) {
579 release_http_object_request(obj_req
);
580 release_request(request
);
582 start_fetch_packed(request
);
584 } else if (request
->state
== RUN_FETCH_PACKED
) {
586 if (request
->curl_result
!= CURLE_OK
) {
587 fprintf(stderr
, "Unable to get pack file %s\n%s",
588 request
->url
, curl_errorstr
);
590 preq
= (struct http_pack_request
*)request
->userData
;
593 if (finish_http_pack_request(preq
) == 0)
595 release_http_pack_request(preq
);
599 repo
->can_update_info_refs
= 0;
600 release_request(request
);
604 #ifdef USE_CURL_MULTI
605 static int is_running_queue
;
606 static int fill_active_slot(void *unused
)
608 struct transfer_request
*request
;
610 if (aborted
|| !is_running_queue
)
613 for (request
= request_queue_head
; request
; request
= request
->next
) {
614 if (request
->state
== NEED_FETCH
) {
615 start_fetch_loose(request
);
617 } else if (pushing
&& request
->state
== NEED_PUSH
) {
618 if (remote_dir_exists
[request
->obj
->sha1
[0]] == 1) {
621 start_mkcol(request
);
630 static void get_remote_object_list(unsigned char parent
);
632 static void add_fetch_request(struct object
*obj
)
634 struct transfer_request
*request
;
639 * Don't fetch the object if it's known to exist locally
640 * or is already in the request queue
642 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
643 get_remote_object_list(obj
->sha1
[0]);
644 if (obj
->flags
& (LOCAL
| FETCHING
))
647 obj
->flags
|= FETCHING
;
648 request
= xmalloc(sizeof(*request
));
651 request
->lock
= NULL
;
652 request
->headers
= NULL
;
653 request
->state
= NEED_FETCH
;
654 request
->next
= request_queue_head
;
655 request_queue_head
= request
;
657 #ifdef USE_CURL_MULTI
663 static int add_send_request(struct object
*obj
, struct remote_lock
*lock
)
665 struct transfer_request
*request
;
666 struct packed_git
*target
;
668 /* Keep locks active */
672 * Don't push the object if it's known to exist on the remote
673 * or is already in the request queue
675 if (remote_dir_exists
[obj
->sha1
[0]] == -1)
676 get_remote_object_list(obj
->sha1
[0]);
677 if (obj
->flags
& (REMOTE
| PUSHING
))
679 target
= find_sha1_pack(obj
->sha1
, repo
->packs
);
681 obj
->flags
|= REMOTE
;
685 obj
->flags
|= PUSHING
;
686 request
= xmalloc(sizeof(*request
));
689 request
->lock
= lock
;
690 request
->headers
= NULL
;
691 request
->state
= NEED_PUSH
;
692 request
->next
= request_queue_head
;
693 request_queue_head
= request
;
695 #ifdef USE_CURL_MULTI
703 static int fetch_indices(void)
708 fprintf(stderr
, "Getting pack list\n");
710 switch (http_get_info_packs(repo
->url
, &repo
->packs
)) {
712 case HTTP_MISSING_TARGET
:
722 static void one_remote_object(const char *hex
)
724 unsigned char sha1
[20];
727 if (get_sha1_hex(hex
, sha1
) != 0)
730 obj
= lookup_object(sha1
);
732 obj
= parse_object(sha1
);
734 /* Ignore remote objects that don't exist locally */
738 obj
->flags
|= REMOTE
;
739 if (!object_list_contains(objects
, obj
))
740 object_list_insert(obj
, &objects
);
743 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
745 int *lock_flags
= (int *)ctx
->userData
;
748 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
749 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
750 (*lock_flags
& DAV_PROP_LOCKWR
)) {
751 *lock_flags
|= DAV_LOCK_OK
;
753 *lock_flags
&= DAV_LOCK_OK
;
754 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
755 *lock_flags
|= DAV_PROP_LOCKWR
;
756 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
757 *lock_flags
|= DAV_PROP_LOCKEX
;
762 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
764 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
766 unsigned char lock_token_sha1
[20];
768 if (tag_closed
&& ctx
->cdata
) {
769 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
770 lock
->owner
= xstrdup(ctx
->cdata
);
771 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
772 if (starts_with(ctx
->cdata
, "Second-"))
774 strtol(ctx
->cdata
+ 7, NULL
, 10);
775 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
776 lock
->token
= xstrdup(ctx
->cdata
);
778 git_SHA1_Init(&sha_ctx
);
779 git_SHA1_Update(&sha_ctx
, lock
->token
, strlen(lock
->token
));
780 git_SHA1_Final(lock_token_sha1
, &sha_ctx
);
782 lock
->tmpfile_suffix
[0] = '_';
783 memcpy(lock
->tmpfile_suffix
+ 1, sha1_to_hex(lock_token_sha1
), 40);
788 static void one_remote_ref(const char *refname
);
791 xml_start_tag(void *userData
, const char *name
, const char **atts
)
793 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
794 const char *c
= strchr(name
, ':');
802 new_len
= strlen(ctx
->name
) + strlen(c
) + 2;
804 if (new_len
> ctx
->len
) {
805 ctx
->name
= xrealloc(ctx
->name
, new_len
);
808 strcat(ctx
->name
, ".");
809 strcat(ctx
->name
, c
);
814 ctx
->userFunc(ctx
, 0);
818 xml_end_tag(void *userData
, const char *name
)
820 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
821 const char *c
= strchr(name
, ':');
824 ctx
->userFunc(ctx
, 1);
831 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
836 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
838 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
840 ctx
->cdata
= xmemdupz(s
, len
);
843 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
845 struct active_request_slot
*slot
;
846 struct slot_results results
;
847 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
848 struct strbuf in_buffer
= STRBUF_INIT
;
851 char timeout_header
[25];
852 struct remote_lock
*lock
= NULL
;
853 struct curl_slist
*dav_headers
= NULL
;
857 url
= xstrfmt("%s%s", repo
->url
, path
);
859 /* Make sure leading directories exist for the remote ref */
860 ep
= strchr(url
+ strlen(repo
->url
) + 1, '/');
862 char saved_character
= ep
[1];
864 slot
= get_active_slot();
865 slot
->results
= &results
;
866 curl_setup_http_get(slot
->curl
, url
, DAV_MKCOL
);
867 if (start_active_slot(slot
)) {
868 run_active_slot(slot
);
869 if (results
.curl_result
!= CURLE_OK
&&
870 results
.http_code
!= 405) {
872 "Unable to create branch path %s\n",
878 fprintf(stderr
, "Unable to start MKCOL request\n");
882 ep
[1] = saved_character
;
883 ep
= strchr(ep
+ 1, '/');
886 escaped
= xml_entities(ident_default_email());
887 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, escaped
);
890 sprintf(timeout_header
, "Timeout: Second-%ld", timeout
);
891 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
892 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
894 slot
= get_active_slot();
895 slot
->results
= &results
;
896 curl_setup_http(slot
->curl
, url
, DAV_LOCK
, &out_buffer
, fwrite_buffer
);
897 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
898 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
900 lock
= xcalloc(1, sizeof(*lock
));
903 if (start_active_slot(slot
)) {
904 run_active_slot(slot
);
905 if (results
.curl_result
== CURLE_OK
) {
906 XML_Parser parser
= XML_ParserCreate(NULL
);
907 enum XML_Status result
;
908 ctx
.name
= xcalloc(10, 1);
911 ctx
.userFunc
= handle_new_lock_ctx
;
913 XML_SetUserData(parser
, &ctx
);
914 XML_SetElementHandler(parser
, xml_start_tag
,
916 XML_SetCharacterDataHandler(parser
, xml_cdata
);
917 result
= XML_Parse(parser
, in_buffer
.buf
,
920 if (result
!= XML_STATUS_OK
) {
921 fprintf(stderr
, "XML error: %s\n",
923 XML_GetErrorCode(parser
)));
926 XML_ParserFree(parser
);
929 fprintf(stderr
, "Unable to start LOCK request\n");
932 curl_slist_free_all(dav_headers
);
933 strbuf_release(&out_buffer
.buf
);
934 strbuf_release(&in_buffer
);
936 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
944 lock
->start_time
= time(NULL
);
945 lock
->next
= repo
->locks
;
952 static int unlock_remote(struct remote_lock
*lock
)
954 struct active_request_slot
*slot
;
955 struct slot_results results
;
956 struct remote_lock
*prev
= repo
->locks
;
957 struct curl_slist
*dav_headers
;
960 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_LOCK
);
962 slot
= get_active_slot();
963 slot
->results
= &results
;
964 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_UNLOCK
);
965 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
967 if (start_active_slot(slot
)) {
968 run_active_slot(slot
);
969 if (results
.curl_result
== CURLE_OK
)
972 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
975 fprintf(stderr
, "Unable to start UNLOCK request\n");
978 curl_slist_free_all(dav_headers
);
980 if (repo
->locks
== lock
) {
981 repo
->locks
= lock
->next
;
983 while (prev
&& prev
->next
!= lock
)
986 prev
->next
= prev
->next
->next
;
997 static void remove_locks(void)
999 struct remote_lock
*lock
= repo
->locks
;
1001 fprintf(stderr
, "Removing remote locks...\n");
1003 struct remote_lock
*next
= lock
->next
;
1004 unlock_remote(lock
);
1009 static void remove_locks_on_signal(int signo
)
1012 sigchain_pop(signo
);
1016 static void remote_ls(const char *path
, int flags
,
1017 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1020 static void process_ls_object(struct remote_ls_ctx
*ls
)
1022 unsigned int *parent
= (unsigned int *)ls
->userData
;
1023 char *path
= ls
->dentry_name
;
1026 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1027 remote_dir_exists
[*parent
] = 1;
1031 if (strlen(path
) != 49)
1034 obj_hex
= xmalloc(strlen(path
));
1035 /* NB: path is not null-terminated, can not use strlcpy here */
1036 memcpy(obj_hex
, path
, 2);
1037 strcpy(obj_hex
+ 2, path
+ 3);
1038 one_remote_object(obj_hex
);
1042 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1044 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1045 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1049 if (!(ls
->dentry_flags
& IS_DIR
))
1050 one_remote_ref(ls
->dentry_name
);
1053 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1055 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1058 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1059 if (ls
->dentry_flags
& IS_DIR
) {
1061 /* ensure collection names end with slash */
1062 str_end_url_with_slash(ls
->dentry_name
, &ls
->dentry_name
);
1064 if (ls
->flags
& PROCESS_DIRS
) {
1067 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1068 ls
->flags
& RECURSIVE
) {
1069 remote_ls(ls
->dentry_name
,
1074 } else if (ls
->flags
& PROCESS_FILES
) {
1077 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1078 char *path
= ctx
->cdata
;
1079 if (*ctx
->cdata
== 'h') {
1080 path
= strstr(path
, "//");
1082 path
= strchr(path
+2, '/');
1086 const char *url
= repo
->url
;
1089 if (strncmp(path
, url
, repo
->path_len
))
1090 error("Parsed path '%s' does not match url: '%s'",
1093 path
+= repo
->path_len
;
1094 ls
->dentry_name
= xstrdup(path
);
1097 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1098 ls
->dentry_flags
|= IS_DIR
;
1100 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1101 free(ls
->dentry_name
);
1102 ls
->dentry_name
= NULL
;
1103 ls
->dentry_flags
= 0;
1108 * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it
1109 * should _only_ heed the information from that file, instead of trying to
1110 * determine the refs from the remote file system (badly: it does not even
1111 * know about packed-refs).
1113 static void remote_ls(const char *path
, int flags
,
1114 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1117 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1118 struct active_request_slot
*slot
;
1119 struct slot_results results
;
1120 struct strbuf in_buffer
= STRBUF_INIT
;
1121 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1122 struct curl_slist
*dav_headers
= NULL
;
1124 struct remote_ls_ctx ls
;
1127 ls
.path
= xstrdup(path
);
1128 ls
.dentry_name
= NULL
;
1129 ls
.dentry_flags
= 0;
1130 ls
.userData
= userData
;
1131 ls
.userFunc
= userFunc
;
1133 strbuf_addf(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1135 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1136 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1138 slot
= get_active_slot();
1139 slot
->results
= &results
;
1140 curl_setup_http(slot
->curl
, url
, DAV_PROPFIND
,
1141 &out_buffer
, fwrite_buffer
);
1142 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1143 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1145 if (start_active_slot(slot
)) {
1146 run_active_slot(slot
);
1147 if (results
.curl_result
== CURLE_OK
) {
1148 XML_Parser parser
= XML_ParserCreate(NULL
);
1149 enum XML_Status result
;
1150 ctx
.name
= xcalloc(10, 1);
1153 ctx
.userFunc
= handle_remote_ls_ctx
;
1155 XML_SetUserData(parser
, &ctx
);
1156 XML_SetElementHandler(parser
, xml_start_tag
,
1158 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1159 result
= XML_Parse(parser
, in_buffer
.buf
,
1163 if (result
!= XML_STATUS_OK
) {
1164 fprintf(stderr
, "XML error: %s\n",
1166 XML_GetErrorCode(parser
)));
1168 XML_ParserFree(parser
);
1171 fprintf(stderr
, "Unable to start PROPFIND request\n");
1176 strbuf_release(&out_buffer
.buf
);
1177 strbuf_release(&in_buffer
);
1178 curl_slist_free_all(dav_headers
);
1181 static void get_remote_object_list(unsigned char parent
)
1183 char path
[] = "objects/XX/";
1184 static const char hex
[] = "0123456789abcdef";
1185 unsigned int val
= parent
;
1187 path
[8] = hex
[val
>> 4];
1188 path
[9] = hex
[val
& 0xf];
1189 remote_dir_exists
[val
] = 0;
1190 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1191 process_ls_object
, &val
);
1194 static int locking_available(void)
1196 struct active_request_slot
*slot
;
1197 struct slot_results results
;
1198 struct strbuf in_buffer
= STRBUF_INIT
;
1199 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1200 struct curl_slist
*dav_headers
= NULL
;
1205 escaped
= xml_entities(repo
->url
);
1206 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, escaped
);
1209 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1210 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1212 slot
= get_active_slot();
1213 slot
->results
= &results
;
1214 curl_setup_http(slot
->curl
, repo
->url
, DAV_PROPFIND
,
1215 &out_buffer
, fwrite_buffer
);
1216 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1217 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1219 if (start_active_slot(slot
)) {
1220 run_active_slot(slot
);
1221 if (results
.curl_result
== CURLE_OK
) {
1222 XML_Parser parser
= XML_ParserCreate(NULL
);
1223 enum XML_Status result
;
1224 ctx
.name
= xcalloc(10, 1);
1227 ctx
.userFunc
= handle_lockprop_ctx
;
1228 ctx
.userData
= &lock_flags
;
1229 XML_SetUserData(parser
, &ctx
);
1230 XML_SetElementHandler(parser
, xml_start_tag
,
1232 result
= XML_Parse(parser
, in_buffer
.buf
,
1236 if (result
!= XML_STATUS_OK
) {
1237 fprintf(stderr
, "XML error: %s\n",
1239 XML_GetErrorCode(parser
)));
1242 XML_ParserFree(parser
);
1244 error("no DAV locking support on %s",
1248 error("Cannot access URL %s, return code %d",
1249 repo
->url
, results
.curl_result
);
1253 error("Unable to start PROPFIND request on %s", repo
->url
);
1256 strbuf_release(&out_buffer
.buf
);
1257 strbuf_release(&in_buffer
);
1258 curl_slist_free_all(dav_headers
);
1263 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1265 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1269 return &entry
->next
;
1272 static struct object_list
**process_blob(struct blob
*blob
,
1273 struct object_list
**p
,
1274 struct name_path
*path
,
1277 struct object
*obj
= &blob
->object
;
1279 obj
->flags
|= LOCAL
;
1281 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1285 return add_one_object(obj
, p
);
1288 static struct object_list
**process_tree(struct tree
*tree
,
1289 struct object_list
**p
,
1290 struct name_path
*path
,
1293 struct object
*obj
= &tree
->object
;
1294 struct tree_desc desc
;
1295 struct name_entry entry
;
1296 struct name_path me
;
1298 obj
->flags
|= LOCAL
;
1300 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1302 if (parse_tree(tree
) < 0)
1303 die("bad tree object %s", sha1_to_hex(obj
->sha1
));
1306 name
= xstrdup(name
);
1307 p
= add_one_object(obj
, p
);
1310 me
.elem_len
= strlen(name
);
1312 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1314 while (tree_entry(&desc
, &entry
))
1315 switch (object_type(entry
.mode
)) {
1317 p
= process_tree(lookup_tree(entry
.sha1
), p
, &me
, name
);
1320 p
= process_blob(lookup_blob(entry
.sha1
), p
, &me
, name
);
1323 /* Subproject commit - not in this repository */
1327 free_tree_buffer(tree
);
1331 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1334 struct commit
*commit
;
1335 struct object_list
**p
= &objects
;
1338 while ((commit
= get_revision(revs
)) != NULL
) {
1339 p
= process_tree(commit
->tree
, p
, NULL
, "");
1340 commit
->object
.flags
|= LOCAL
;
1341 if (!(commit
->object
.flags
& UNINTERESTING
))
1342 count
+= add_send_request(&commit
->object
, lock
);
1345 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1346 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1347 struct object
*obj
= entry
->item
;
1348 const char *name
= entry
->name
;
1350 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1352 if (obj
->type
== OBJ_TAG
) {
1354 p
= add_one_object(obj
, p
);
1357 if (obj
->type
== OBJ_TREE
) {
1358 p
= process_tree((struct tree
*)obj
, p
, NULL
, name
);
1361 if (obj
->type
== OBJ_BLOB
) {
1362 p
= process_blob((struct blob
*)obj
, p
, NULL
, name
);
1365 die("unknown pending object %s (%s)", sha1_to_hex(obj
->sha1
), name
);
1369 if (!(objects
->item
->flags
& UNINTERESTING
))
1370 count
+= add_send_request(objects
->item
, lock
);
1371 objects
= objects
->next
;
1377 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1379 struct active_request_slot
*slot
;
1380 struct slot_results results
;
1381 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1382 struct curl_slist
*dav_headers
;
1384 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1386 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1388 slot
= get_active_slot();
1389 slot
->results
= &results
;
1390 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1391 &out_buffer
, fwrite_null
);
1392 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1394 if (start_active_slot(slot
)) {
1395 run_active_slot(slot
);
1396 strbuf_release(&out_buffer
.buf
);
1397 if (results
.curl_result
!= CURLE_OK
) {
1399 "PUT error: curl result=%d, HTTP code=%ld\n",
1400 results
.curl_result
, results
.http_code
);
1401 /* We should attempt recovery? */
1405 strbuf_release(&out_buffer
.buf
);
1406 fprintf(stderr
, "Unable to start PUT request\n");
1413 static struct ref
*remote_refs
;
1415 static void one_remote_ref(const char *refname
)
1420 ref
= alloc_ref(refname
);
1422 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1424 "Unable to fetch ref %s from %s\n",
1425 refname
, repo
->url
);
1431 * Fetch a copy of the object if it doesn't exist locally - it
1432 * may be required for updating server info later.
1434 if (repo
->can_update_info_refs
&& !has_sha1_file(ref
->old_sha1
)) {
1435 obj
= lookup_unknown_object(ref
->old_sha1
);
1437 fprintf(stderr
, " fetch %s for %s\n",
1438 sha1_to_hex(ref
->old_sha1
), refname
);
1439 add_fetch_request(obj
);
1443 ref
->next
= remote_refs
;
1447 static void get_dav_remote_heads(void)
1449 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1452 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1454 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1460 ref
= alloc_ref(ls
->dentry_name
);
1462 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1464 "Unable to fetch ref %s from %s\n",
1465 ls
->dentry_name
, repo
->url
);
1471 o
= parse_object(ref
->old_sha1
);
1474 "Unable to parse object %s for remote ref %s\n",
1475 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1481 len
= strlen(ls
->dentry_name
) + 42;
1482 ref_info
= xcalloc(len
+ 1, 1);
1483 sprintf(ref_info
, "%s %s\n",
1484 sha1_to_hex(ref
->old_sha1
), ls
->dentry_name
);
1485 fwrite_buffer(ref_info
, 1, len
, buf
);
1488 if (o
->type
== OBJ_TAG
) {
1489 o
= deref_tag(o
, ls
->dentry_name
, 0);
1491 len
= strlen(ls
->dentry_name
) + 45;
1492 ref_info
= xcalloc(len
+ 1, 1);
1493 sprintf(ref_info
, "%s %s^{}\n",
1494 sha1_to_hex(o
->sha1
), ls
->dentry_name
);
1495 fwrite_buffer(ref_info
, 1, len
, buf
);
1502 static void update_remote_info_refs(struct remote_lock
*lock
)
1504 struct buffer buffer
= { STRBUF_INIT
, 0 };
1505 struct active_request_slot
*slot
;
1506 struct slot_results results
;
1507 struct curl_slist
*dav_headers
;
1509 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1510 add_remote_info_ref
, &buffer
.buf
);
1512 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1514 slot
= get_active_slot();
1515 slot
->results
= &results
;
1516 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1517 &buffer
, fwrite_null
);
1518 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1520 if (start_active_slot(slot
)) {
1521 run_active_slot(slot
);
1522 if (results
.curl_result
!= CURLE_OK
) {
1524 "PUT error: curl result=%d, HTTP code=%ld\n",
1525 results
.curl_result
, results
.http_code
);
1529 strbuf_release(&buffer
.buf
);
1532 static int remote_exists(const char *path
)
1534 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1538 switch (http_get_strbuf(url
, NULL
, NULL
)) {
1542 case HTTP_MISSING_TARGET
:
1546 error("unable to access '%s': %s", url
, curl_errorstr
);
1554 static void fetch_symref(const char *path
, char **symref
, unsigned char *sha1
)
1556 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1557 struct strbuf buffer
= STRBUF_INIT
;
1559 if (http_get_strbuf(url
, &buffer
, NULL
) != HTTP_OK
)
1560 die("Couldn't get %s for remote symref\n%s", url
,
1568 if (buffer
.len
== 0)
1571 /* If it's a symref, set the refname; otherwise try for a sha1 */
1572 if (starts_with((char *)buffer
.buf
, "ref: ")) {
1573 *symref
= xmemdupz((char *)buffer
.buf
+ 5, buffer
.len
- 6);
1575 get_sha1_hex(buffer
.buf
, sha1
);
1578 strbuf_release(&buffer
);
1581 static int verify_merge_base(unsigned char *head_sha1
, struct ref
*remote
)
1583 struct commit
*head
= lookup_commit_or_die(head_sha1
, "HEAD");
1584 struct commit
*branch
= lookup_commit_or_die(remote
->old_sha1
, remote
->name
);
1586 return in_merge_bases(branch
, head
);
1589 static int delete_remote_branch(const char *pattern
, int force
)
1591 struct ref
*refs
= remote_refs
;
1592 struct ref
*remote_ref
= NULL
;
1593 unsigned char head_sha1
[20];
1594 char *symref
= NULL
;
1596 int patlen
= strlen(pattern
);
1598 struct active_request_slot
*slot
;
1599 struct slot_results results
;
1602 /* Find the remote branch(es) matching the specified branch name */
1603 for (match
= 0; refs
; refs
= refs
->next
) {
1604 char *name
= refs
->name
;
1605 int namelen
= strlen(name
);
1606 if (namelen
< patlen
||
1607 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
1609 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
1615 return error("No remote branch matches %s", pattern
);
1617 return error("More than one remote branch matches %s",
1621 * Remote HEAD must be a symref (not exactly foolproof; a remote
1622 * symlink to a symref will look like a symref)
1624 fetch_symref("HEAD", &symref
, head_sha1
);
1626 return error("Remote HEAD is not a symref");
1628 /* Remote branch must not be the remote HEAD */
1629 for (i
= 0; symref
&& i
< MAXDEPTH
; i
++) {
1630 if (!strcmp(remote_ref
->name
, symref
))
1631 return error("Remote branch %s is the current HEAD",
1633 fetch_symref(symref
, &symref
, head_sha1
);
1636 /* Run extra sanity checks if delete is not forced */
1638 /* Remote HEAD must resolve to a known object */
1640 return error("Remote HEAD symrefs too deep");
1641 if (is_null_sha1(head_sha1
))
1642 return error("Unable to resolve remote HEAD");
1643 if (!has_sha1_file(head_sha1
))
1644 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1
));
1646 /* Remote branch must resolve to a known object */
1647 if (is_null_sha1(remote_ref
->old_sha1
))
1648 return error("Unable to resolve remote branch %s",
1650 if (!has_sha1_file(remote_ref
->old_sha1
))
1651 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
));
1653 /* Remote branch must be an ancestor of remote HEAD */
1654 if (!verify_merge_base(head_sha1
, remote_ref
)) {
1655 return error("The branch '%s' is not an ancestor "
1656 "of your current HEAD.\n"
1657 "If you are sure you want to delete it,"
1658 " run:\n\t'git http-push -D %s %s'",
1659 remote_ref
->name
, repo
->url
, pattern
);
1663 /* Send delete request */
1664 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
1667 url
= xstrfmt("%s%s", repo
->url
, remote_ref
->name
);
1668 slot
= get_active_slot();
1669 slot
->results
= &results
;
1670 curl_setup_http_get(slot
->curl
, url
, DAV_DELETE
);
1671 if (start_active_slot(slot
)) {
1672 run_active_slot(slot
);
1674 if (results
.curl_result
!= CURLE_OK
)
1675 return error("DELETE request failed (%d/%ld)",
1676 results
.curl_result
, results
.http_code
);
1679 return error("Unable to start DELETE request");
1685 static void run_request_queue(void)
1687 #ifdef USE_CURL_MULTI
1688 is_running_queue
= 1;
1689 fill_active_slots();
1690 add_fill_function(NULL
, fill_active_slot
);
1693 finish_all_active_slots();
1694 #ifdef USE_CURL_MULTI
1695 fill_active_slots();
1697 } while (request_queue_head
&& !aborted
);
1699 #ifdef USE_CURL_MULTI
1700 is_running_queue
= 0;
1704 int main(int argc
, char **argv
)
1706 struct transfer_request
*request
;
1707 struct transfer_request
*next_request
;
1709 char **refspec
= NULL
;
1710 struct remote_lock
*ref_lock
= NULL
;
1711 struct remote_lock
*info_ref_lock
= NULL
;
1712 struct rev_info revs
;
1713 int delete_branch
= 0;
1714 int force_delete
= 0;
1715 int objects_to_send
;
1719 struct ref
*ref
, *local_refs
;
1721 git_setup_gettext();
1723 git_extract_argv0_path(argv
[0]);
1725 repo
= xcalloc(1, sizeof(*repo
));
1728 for (i
= 1; i
< argc
; i
++, argv
++) {
1732 if (!strcmp(arg
, "--all")) {
1733 push_all
= MATCH_REFS_ALL
;
1736 if (!strcmp(arg
, "--force")) {
1740 if (!strcmp(arg
, "--dry-run")) {
1744 if (!strcmp(arg
, "--helper-status")) {
1748 if (!strcmp(arg
, "--verbose")) {
1750 http_is_verbose
= 1;
1753 if (!strcmp(arg
, "-d")) {
1757 if (!strcmp(arg
, "-D")) {
1762 if (!strcmp(arg
, "-h"))
1763 usage(http_push_usage
);
1766 char *path
= strstr(arg
, "//");
1767 str_end_url_with_slash(arg
, &repo
->url
);
1768 repo
->path_len
= strlen(repo
->url
);
1770 repo
->path
= strchr(path
+2, '/');
1772 repo
->path_len
= strlen(repo
->path
);
1777 nr_refspec
= argc
- i
;
1781 #ifndef USE_CURL_MULTI
1782 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
1786 usage(http_push_usage
);
1788 if (delete_branch
&& nr_refspec
!= 1)
1789 die("You must specify only one branch name when deleting a remote branch");
1791 setup_git_directory();
1793 memset(remote_dir_exists
, -1, 256);
1795 http_init(NULL
, repo
->url
, 1);
1797 #ifdef USE_CURL_MULTI
1798 is_running_queue
= 0;
1801 /* Verify DAV compliance/lock support */
1802 if (!locking_available()) {
1807 sigchain_push_common(remove_locks_on_signal
);
1809 /* Check whether the remote has server info files */
1810 repo
->can_update_info_refs
= 0;
1811 repo
->has_info_refs
= remote_exists("info/refs");
1812 repo
->has_info_packs
= remote_exists("objects/info/packs");
1813 if (repo
->has_info_refs
) {
1814 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
1816 repo
->can_update_info_refs
= 1;
1818 error("cannot lock existing info/refs");
1823 if (repo
->has_info_packs
)
1826 /* Get a list of all local and remote heads to validate refspecs */
1827 local_refs
= get_local_heads();
1828 fprintf(stderr
, "Fetching remote heads...\n");
1829 get_dav_remote_heads();
1830 run_request_queue();
1832 /* Remove a remote branch if -d or -D was specified */
1833 if (delete_branch
) {
1834 if (delete_remote_branch(refspec
[0], force_delete
) == -1) {
1835 fprintf(stderr
, "Unable to delete remote branch %s\n",
1838 printf("error %s cannot remove\n", refspec
[0]);
1844 if (match_push_refs(local_refs
, &remote_refs
,
1845 nr_refspec
, (const char **) refspec
, push_all
)) {
1850 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
1852 printf("error null no match\n");
1858 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1859 char old_hex
[60], *new_hex
;
1860 const char *commit_argv
[5];
1862 char *new_sha1_hex
, *old_sha1_hex
;
1867 if (is_null_sha1(ref
->peer_ref
->new_sha1
)) {
1868 if (delete_remote_branch(ref
->name
, 1) == -1) {
1869 error("Could not remove %s", ref
->name
);
1871 printf("error %s cannot remove\n", ref
->name
);
1874 else if (helper_status
)
1875 printf("ok %s\n", ref
->name
);
1880 if (!hashcmp(ref
->old_sha1
, ref
->peer_ref
->new_sha1
)) {
1882 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
1884 printf("ok %s up to date\n", ref
->name
);
1889 !is_null_sha1(ref
->old_sha1
) &&
1891 if (!has_sha1_file(ref
->old_sha1
) ||
1892 !ref_newer(ref
->peer_ref
->new_sha1
,
1895 * We do not have the remote ref, or
1896 * we know that the remote ref is not
1897 * an ancestor of what we are trying to
1898 * push. Either way this can be losing
1899 * commits at the remote end and likely
1900 * we were not up to date to begin with.
1902 error("remote '%s' is not an ancestor of\n"
1904 "Maybe you are not up-to-date and "
1905 "need to pull first?",
1907 ref
->peer_ref
->name
);
1909 printf("error %s non-fast forward\n", ref
->name
);
1914 hashcpy(ref
->new_sha1
, ref
->peer_ref
->new_sha1
);
1916 strcpy(old_hex
, sha1_to_hex(ref
->old_sha1
));
1917 new_hex
= sha1_to_hex(ref
->new_sha1
);
1919 fprintf(stderr
, "updating '%s'", ref
->name
);
1920 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
1921 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
1922 fprintf(stderr
, "\n from %s\n to %s\n", old_hex
, new_hex
);
1925 printf("ok %s\n", ref
->name
);
1929 /* Lock remote branch ref */
1930 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
1931 if (ref_lock
== NULL
) {
1932 fprintf(stderr
, "Unable to lock remote branch %s\n",
1935 printf("error %s lock error\n", ref
->name
);
1940 /* Set up revision info for this refspec */
1942 new_sha1_hex
= xstrdup(sha1_to_hex(ref
->new_sha1
));
1943 old_sha1_hex
= NULL
;
1944 commit_argv
[1] = "--objects";
1945 commit_argv
[2] = new_sha1_hex
;
1946 if (!push_all
&& !is_null_sha1(ref
->old_sha1
)) {
1947 old_sha1_hex
= xmalloc(42);
1948 sprintf(old_sha1_hex
, "^%s",
1949 sha1_to_hex(ref
->old_sha1
));
1950 commit_argv
[3] = old_sha1_hex
;
1953 commit_argv
[commit_argc
] = NULL
;
1954 init_revisions(&revs
, setup_git_directory());
1955 setup_revisions(commit_argc
, commit_argv
, &revs
, NULL
);
1956 revs
.edge_hint
= 0; /* just in case */
1960 commit_argv
[1] = NULL
;
1963 /* Generate a list of objects that need to be pushed */
1965 if (prepare_revision_walk(&revs
))
1966 die("revision walk setup failed");
1967 mark_edges_uninteresting(&revs
, NULL
);
1968 objects_to_send
= get_delta(&revs
, ref_lock
);
1969 finish_all_active_slots();
1971 /* Push missing objects to remote, this would be a
1972 convenient time to pack them first if appropriate. */
1974 if (objects_to_send
)
1975 fprintf(stderr
, " sending %d objects\n",
1978 run_request_queue();
1980 /* Update the remote branch if all went well */
1981 if (aborted
|| !update_remote(ref
->new_sha1
, ref_lock
))
1985 fprintf(stderr
, " done\n");
1987 printf("%s %s\n", !rc
? "ok" : "error", ref
->name
);
1988 unlock_remote(ref_lock
);
1992 /* Update remote server info if appropriate */
1993 if (repo
->has_info_refs
&& new_refs
) {
1994 if (info_ref_lock
&& repo
->can_update_info_refs
) {
1995 fprintf(stderr
, "Updating remote server info\n");
1997 update_remote_info_refs(info_ref_lock
);
1999 fprintf(stderr
, "Unable to update server info\n");
2005 unlock_remote(info_ref_lock
);
2010 request
= request_queue_head
;
2011 while (request
!= NULL
) {
2012 next_request
= request
->next
;
2013 release_request(request
);
2014 request
= next_request
;