2 #include "repository.h"
12 #include "list-objects.h"
14 #include "argv-array.h"
16 #include "object-store.h"
17 #include "commit-reach.h"
19 #ifdef EXPAT_NEEDS_XMLPARSE_H
25 static const char http_push_usage
[] =
26 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
33 #define XML_STATUS_OK 1
34 #define XML_STATUS_ERROR 0
37 #define PREV_BUF_SIZE 4096
40 #define DAV_LOCK "LOCK"
41 #define DAV_MKCOL "MKCOL"
42 #define DAV_MOVE "MOVE"
43 #define DAV_PROPFIND "PROPFIND"
45 #define DAV_UNLOCK "UNLOCK"
46 #define DAV_DELETE "DELETE"
49 #define DAV_PROP_LOCKWR (1u << 0)
50 #define DAV_PROP_LOCKEX (1u << 1)
51 #define DAV_LOCK_OK (1u << 2)
53 /* DAV XML properties */
54 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
55 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
56 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
57 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
58 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
59 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
60 #define DAV_PROPFIND_RESP ".multistatus.response"
61 #define DAV_PROPFIND_NAME ".multistatus.response.href"
62 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
64 /* DAV request body templates */
65 #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>"
66 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
67 #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>"
70 #define LOCK_REFRESH 30
72 /* Remember to update object flag allocation in object.h */
73 #define LOCAL (1u<<16)
74 #define REMOTE (1u<<17)
75 #define FETCHING (1u<<18)
76 #define PUSHING (1u<<19)
78 /* We allow "recursive" symbolic refs. Only within reason, though */
83 static signed char remote_dir_exists
[256];
85 static int push_verbosely
;
86 static int push_all
= MATCH_REFS_NONE
;
89 static int helper_status
;
91 static struct object_list
*objects
;
98 int can_update_info_refs
;
100 struct packed_git
*packs
;
101 struct remote_lock
*locks
;
104 static struct repo
*repo
;
106 enum transfer_state
{
118 struct transfer_request
{
122 struct remote_lock
*lock
;
123 struct curl_slist
*headers
;
124 struct buffer buffer
;
125 enum transfer_state state
;
126 CURLcode curl_result
;
127 char errorstr
[CURL_ERROR_SIZE
];
130 struct active_request_slot
*slot
;
131 struct transfer_request
*next
;
134 static struct transfer_request
*request_queue_head
;
140 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
148 char tmpfile_suffix
[41];
152 struct remote_lock
*next
;
155 /* Flags that control remote_ls processing */
156 #define PROCESS_FILES (1u << 0)
157 #define PROCESS_DIRS (1u << 1)
158 #define RECURSIVE (1u << 2)
160 /* Flags that remote_ls passes to callback functions */
161 #define IS_DIR (1u << 0)
163 struct remote_ls_ctx
{
165 void (*userFunc
)(struct remote_ls_ctx
*ls
);
170 struct remote_ls_ctx
*parent
;
173 /* get_dav_token_headers options */
174 enum dav_header_flag
{
175 DAV_HEADER_IF
= (1u << 0),
176 DAV_HEADER_LOCK
= (1u << 1),
177 DAV_HEADER_TIMEOUT
= (1u << 2)
180 static char *xml_entities(const char *s
)
182 struct strbuf buf
= STRBUF_INIT
;
183 strbuf_addstr_xml_quoted(&buf
, s
);
184 return strbuf_detach(&buf
, NULL
);
187 static void curl_setup_http_get(CURL
*curl
, const char *url
,
188 const char *custom_req
)
190 curl_easy_setopt(curl
, CURLOPT_HTTPGET
, 1);
191 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
192 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
193 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
196 static void curl_setup_http(CURL
*curl
, const char *url
,
197 const char *custom_req
, struct buffer
*buffer
,
198 curl_write_callback write_fn
)
200 curl_easy_setopt(curl
, CURLOPT_PUT
, 1);
201 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
202 curl_easy_setopt(curl
, CURLOPT_INFILE
, buffer
);
203 curl_easy_setopt(curl
, CURLOPT_INFILESIZE
, buffer
->buf
.len
);
204 curl_easy_setopt(curl
, CURLOPT_READFUNCTION
, fread_buffer
);
205 #ifndef NO_CURL_IOCTL
206 curl_easy_setopt(curl
, CURLOPT_IOCTLFUNCTION
, ioctl_buffer
);
207 curl_easy_setopt(curl
, CURLOPT_IOCTLDATA
, buffer
);
209 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, write_fn
);
210 curl_easy_setopt(curl
, CURLOPT_NOBODY
, 0);
211 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
212 curl_easy_setopt(curl
, CURLOPT_UPLOAD
, 1);
215 static struct curl_slist
*get_dav_token_headers(struct remote_lock
*lock
, enum dav_header_flag options
)
217 struct strbuf buf
= STRBUF_INIT
;
218 struct curl_slist
*dav_headers
= http_copy_default_headers();
220 if (options
& DAV_HEADER_IF
) {
221 strbuf_addf(&buf
, "If: (<%s>)", lock
->token
);
222 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
225 if (options
& DAV_HEADER_LOCK
) {
226 strbuf_addf(&buf
, "Lock-Token: <%s>", lock
->token
);
227 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
230 if (options
& DAV_HEADER_TIMEOUT
) {
231 strbuf_addf(&buf
, "Timeout: Second-%ld", lock
->timeout
);
232 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
235 strbuf_release(&buf
);
240 static void finish_request(struct transfer_request
*request
);
241 static void release_request(struct transfer_request
*request
);
243 static void process_response(void *callback_data
)
245 struct transfer_request
*request
=
246 (struct transfer_request
*)callback_data
;
248 finish_request(request
);
251 #ifdef USE_CURL_MULTI
253 static void start_fetch_loose(struct transfer_request
*request
)
255 struct active_request_slot
*slot
;
256 struct http_object_request
*obj_req
;
258 obj_req
= new_http_object_request(repo
->url
, request
->obj
->oid
.hash
);
259 if (obj_req
== NULL
) {
260 request
->state
= ABORTED
;
264 slot
= obj_req
->slot
;
265 slot
->callback_func
= process_response
;
266 slot
->callback_data
= request
;
267 request
->slot
= slot
;
268 request
->userData
= obj_req
;
270 /* Try to get the request started, abort the request on error */
271 request
->state
= RUN_FETCH_LOOSE
;
272 if (!start_active_slot(slot
)) {
273 fprintf(stderr
, "Unable to start GET request\n");
274 repo
->can_update_info_refs
= 0;
275 release_http_object_request(obj_req
);
276 release_request(request
);
280 static void start_mkcol(struct transfer_request
*request
)
282 char *hex
= oid_to_hex(&request
->obj
->oid
);
283 struct active_request_slot
*slot
;
285 request
->url
= get_remote_object_url(repo
->url
, hex
, 1);
287 slot
= get_active_slot();
288 slot
->callback_func
= process_response
;
289 slot
->callback_data
= request
;
290 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MKCOL
);
291 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
293 if (start_active_slot(slot
)) {
294 request
->slot
= slot
;
295 request
->state
= RUN_MKCOL
;
297 request
->state
= ABORTED
;
298 FREE_AND_NULL(request
->url
);
303 static void start_fetch_packed(struct transfer_request
*request
)
305 struct packed_git
*target
;
307 struct transfer_request
*check_request
= request_queue_head
;
308 struct http_pack_request
*preq
;
310 target
= find_sha1_pack(request
->obj
->oid
.hash
, repo
->packs
);
312 fprintf(stderr
, "Unable to fetch %s, will not be able to update server info refs\n", oid_to_hex(&request
->obj
->oid
));
313 repo
->can_update_info_refs
= 0;
314 release_request(request
);
318 fprintf(stderr
, "Fetching pack %s\n", sha1_to_hex(target
->sha1
));
319 fprintf(stderr
, " which contains %s\n", oid_to_hex(&request
->obj
->oid
));
321 preq
= new_http_pack_request(target
, repo
->url
);
323 repo
->can_update_info_refs
= 0;
326 preq
->lst
= &repo
->packs
;
328 /* Make sure there isn't another open request for this pack */
329 while (check_request
) {
330 if (check_request
->state
== RUN_FETCH_PACKED
&&
331 !strcmp(check_request
->url
, preq
->url
)) {
332 release_http_pack_request(preq
);
333 release_request(request
);
336 check_request
= check_request
->next
;
339 preq
->slot
->callback_func
= process_response
;
340 preq
->slot
->callback_data
= request
;
341 request
->slot
= preq
->slot
;
342 request
->userData
= preq
;
344 /* Try to get the request started, abort the request on error */
345 request
->state
= RUN_FETCH_PACKED
;
346 if (!start_active_slot(preq
->slot
)) {
347 fprintf(stderr
, "Unable to start GET request\n");
348 release_http_pack_request(preq
);
349 repo
->can_update_info_refs
= 0;
350 release_request(request
);
354 static void start_put(struct transfer_request
*request
)
356 char *hex
= oid_to_hex(&request
->obj
->oid
);
357 struct active_request_slot
*slot
;
358 struct strbuf buf
= STRBUF_INIT
;
359 enum object_type type
;
367 unpacked
= read_object_file(&request
->obj
->oid
, &type
, &len
);
368 hdrlen
= xsnprintf(hdr
, sizeof(hdr
), "%s %"PRIuMAX
, type_name(type
), (uintmax_t)len
) + 1;
371 git_deflate_init(&stream
, zlib_compression_level
);
372 size
= git_deflate_bound(&stream
, len
+ hdrlen
);
373 strbuf_init(&request
->buffer
.buf
, size
);
374 request
->buffer
.posn
= 0;
377 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
378 stream
.avail_out
= size
;
381 stream
.next_in
= (void *)hdr
;
382 stream
.avail_in
= hdrlen
;
383 while (git_deflate(&stream
, 0) == Z_OK
)
386 /* Then the data itself.. */
387 stream
.next_in
= unpacked
;
388 stream
.avail_in
= len
;
389 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
391 git_deflate_end(&stream
);
394 request
->buffer
.buf
.len
= stream
.total_out
;
396 strbuf_addstr(&buf
, "Destination: ");
397 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
398 request
->dest
= strbuf_detach(&buf
, NULL
);
400 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
401 strbuf_add(&buf
, request
->lock
->tmpfile_suffix
, 41);
402 request
->url
= strbuf_detach(&buf
, NULL
);
404 slot
= get_active_slot();
405 slot
->callback_func
= process_response
;
406 slot
->callback_data
= request
;
407 curl_setup_http(slot
->curl
, request
->url
, DAV_PUT
,
408 &request
->buffer
, fwrite_null
);
410 if (start_active_slot(slot
)) {
411 request
->slot
= slot
;
412 request
->state
= RUN_PUT
;
414 request
->state
= ABORTED
;
415 FREE_AND_NULL(request
->url
);
419 static void start_move(struct transfer_request
*request
)
421 struct active_request_slot
*slot
;
422 struct curl_slist
*dav_headers
= http_copy_default_headers();
424 slot
= get_active_slot();
425 slot
->callback_func
= process_response
;
426 slot
->callback_data
= request
;
427 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MOVE
);
428 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
429 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
430 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
432 if (start_active_slot(slot
)) {
433 request
->slot
= slot
;
434 request
->state
= RUN_MOVE
;
436 request
->state
= ABORTED
;
437 FREE_AND_NULL(request
->url
);
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
) {
530 FREE_AND_NULL(request
->url
);
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(the_repository
, oid
->hash
);
727 obj
= parse_object(the_repository
, 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
);
806 FREE_AND_NULL(ctx
->cdata
);
808 ctx
->userFunc(ctx
, 0);
812 xml_end_tag(void *userData
, const char *name
)
814 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
815 const char *c
= strchr(name
, ':');
818 ctx
->userFunc(ctx
, 1);
825 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
830 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
832 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
834 ctx
->cdata
= xmemdupz(s
, len
);
837 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
839 struct active_request_slot
*slot
;
840 struct slot_results results
;
841 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
842 struct strbuf in_buffer
= STRBUF_INIT
;
845 char timeout_header
[25];
846 struct remote_lock
*lock
= NULL
;
847 struct curl_slist
*dav_headers
= http_copy_default_headers();
851 url
= xstrfmt("%s%s", repo
->url
, path
);
853 /* Make sure leading directories exist for the remote ref */
854 ep
= strchr(url
+ strlen(repo
->url
) + 1, '/');
856 char saved_character
= ep
[1];
858 slot
= get_active_slot();
859 slot
->results
= &results
;
860 curl_setup_http_get(slot
->curl
, url
, DAV_MKCOL
);
861 if (start_active_slot(slot
)) {
862 run_active_slot(slot
);
863 if (results
.curl_result
!= CURLE_OK
&&
864 results
.http_code
!= 405) {
866 "Unable to create branch path %s\n",
872 fprintf(stderr
, "Unable to start MKCOL request\n");
876 ep
[1] = saved_character
;
877 ep
= strchr(ep
+ 1, '/');
880 escaped
= xml_entities(ident_default_email());
881 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, escaped
);
884 xsnprintf(timeout_header
, sizeof(timeout_header
), "Timeout: Second-%ld", timeout
);
885 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
886 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
888 slot
= get_active_slot();
889 slot
->results
= &results
;
890 curl_setup_http(slot
->curl
, url
, DAV_LOCK
, &out_buffer
, fwrite_buffer
);
891 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
892 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
894 lock
= xcalloc(1, sizeof(*lock
));
897 if (start_active_slot(slot
)) {
898 run_active_slot(slot
);
899 if (results
.curl_result
== CURLE_OK
) {
900 XML_Parser parser
= XML_ParserCreate(NULL
);
901 enum XML_Status result
;
902 ctx
.name
= xcalloc(10, 1);
905 ctx
.userFunc
= handle_new_lock_ctx
;
907 XML_SetUserData(parser
, &ctx
);
908 XML_SetElementHandler(parser
, xml_start_tag
,
910 XML_SetCharacterDataHandler(parser
, xml_cdata
);
911 result
= XML_Parse(parser
, in_buffer
.buf
,
914 if (result
!= XML_STATUS_OK
) {
915 fprintf(stderr
, "XML error: %s\n",
917 XML_GetErrorCode(parser
)));
920 XML_ParserFree(parser
);
923 "error: curl result=%d, HTTP code=%ld\n",
924 results
.curl_result
, results
.http_code
);
927 fprintf(stderr
, "Unable to start LOCK request\n");
930 curl_slist_free_all(dav_headers
);
931 strbuf_release(&out_buffer
.buf
);
932 strbuf_release(&in_buffer
);
934 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
941 lock
->start_time
= time(NULL
);
942 lock
->next
= repo
->locks
;
949 static int unlock_remote(struct remote_lock
*lock
)
951 struct active_request_slot
*slot
;
952 struct slot_results results
;
953 struct remote_lock
*prev
= repo
->locks
;
954 struct curl_slist
*dav_headers
;
957 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_LOCK
);
959 slot
= get_active_slot();
960 slot
->results
= &results
;
961 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_UNLOCK
);
962 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
964 if (start_active_slot(slot
)) {
965 run_active_slot(slot
);
966 if (results
.curl_result
== CURLE_OK
)
969 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
972 fprintf(stderr
, "Unable to start UNLOCK request\n");
975 curl_slist_free_all(dav_headers
);
977 if (repo
->locks
== lock
) {
978 repo
->locks
= lock
->next
;
980 while (prev
&& prev
->next
!= lock
)
983 prev
->next
= prev
->next
->next
;
994 static void remove_locks(void)
996 struct remote_lock
*lock
= repo
->locks
;
998 fprintf(stderr
, "Removing remote locks...\n");
1000 struct remote_lock
*next
= lock
->next
;
1001 unlock_remote(lock
);
1006 static void remove_locks_on_signal(int signo
)
1009 sigchain_pop(signo
);
1013 static void remote_ls(const char *path
, int flags
,
1014 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1017 /* extract hex from sharded "xx/x{38}" filename */
1018 static int get_oid_hex_from_objpath(const char *path
, struct object_id
*oid
)
1020 if (strlen(path
) != GIT_SHA1_HEXSZ
+ 1)
1023 if (hex_to_bytes(oid
->hash
, path
, 1))
1026 path
++; /* skip '/' */
1028 return hex_to_bytes(oid
->hash
+ 1, path
, GIT_SHA1_RAWSZ
- 1);
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_AND_NULL(ls
->dentry_name
);
1109 ls
->dentry_flags
= 0;
1114 * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it
1115 * should _only_ heed the information from that file, instead of trying to
1116 * determine the refs from the remote file system (badly: it does not even
1117 * know about packed-refs).
1119 static void remote_ls(const char *path
, int flags
,
1120 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1123 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1124 struct active_request_slot
*slot
;
1125 struct slot_results results
;
1126 struct strbuf in_buffer
= STRBUF_INIT
;
1127 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1128 struct curl_slist
*dav_headers
= http_copy_default_headers();
1130 struct remote_ls_ctx ls
;
1133 ls
.path
= xstrdup(path
);
1134 ls
.dentry_name
= NULL
;
1135 ls
.dentry_flags
= 0;
1136 ls
.userData
= userData
;
1137 ls
.userFunc
= userFunc
;
1139 strbuf_addstr(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1141 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1142 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1144 slot
= get_active_slot();
1145 slot
->results
= &results
;
1146 curl_setup_http(slot
->curl
, url
, DAV_PROPFIND
,
1147 &out_buffer
, fwrite_buffer
);
1148 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1149 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1151 if (start_active_slot(slot
)) {
1152 run_active_slot(slot
);
1153 if (results
.curl_result
== CURLE_OK
) {
1154 XML_Parser parser
= XML_ParserCreate(NULL
);
1155 enum XML_Status result
;
1156 ctx
.name
= xcalloc(10, 1);
1159 ctx
.userFunc
= handle_remote_ls_ctx
;
1161 XML_SetUserData(parser
, &ctx
);
1162 XML_SetElementHandler(parser
, xml_start_tag
,
1164 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1165 result
= XML_Parse(parser
, in_buffer
.buf
,
1169 if (result
!= XML_STATUS_OK
) {
1170 fprintf(stderr
, "XML error: %s\n",
1172 XML_GetErrorCode(parser
)));
1174 XML_ParserFree(parser
);
1177 fprintf(stderr
, "Unable to start PROPFIND request\n");
1182 strbuf_release(&out_buffer
.buf
);
1183 strbuf_release(&in_buffer
);
1184 curl_slist_free_all(dav_headers
);
1187 static void get_remote_object_list(unsigned char parent
)
1189 char path
[] = "objects/XX/";
1190 static const char hex
[] = "0123456789abcdef";
1191 unsigned int val
= parent
;
1193 path
[8] = hex
[val
>> 4];
1194 path
[9] = hex
[val
& 0xf];
1195 remote_dir_exists
[val
] = 0;
1196 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1197 process_ls_object
, &val
);
1200 static int locking_available(void)
1202 struct active_request_slot
*slot
;
1203 struct slot_results results
;
1204 struct strbuf in_buffer
= STRBUF_INIT
;
1205 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1206 struct curl_slist
*dav_headers
= http_copy_default_headers();
1211 escaped
= xml_entities(repo
->url
);
1212 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, escaped
);
1215 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1216 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1218 slot
= get_active_slot();
1219 slot
->results
= &results
;
1220 curl_setup_http(slot
->curl
, repo
->url
, DAV_PROPFIND
,
1221 &out_buffer
, fwrite_buffer
);
1222 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1223 curl_easy_setopt(slot
->curl
, CURLOPT_FILE
, &in_buffer
);
1225 if (start_active_slot(slot
)) {
1226 run_active_slot(slot
);
1227 if (results
.curl_result
== CURLE_OK
) {
1228 XML_Parser parser
= XML_ParserCreate(NULL
);
1229 enum XML_Status result
;
1230 ctx
.name
= xcalloc(10, 1);
1233 ctx
.userFunc
= handle_lockprop_ctx
;
1234 ctx
.userData
= &lock_flags
;
1235 XML_SetUserData(parser
, &ctx
);
1236 XML_SetElementHandler(parser
, xml_start_tag
,
1238 result
= XML_Parse(parser
, in_buffer
.buf
,
1242 if (result
!= XML_STATUS_OK
) {
1243 fprintf(stderr
, "XML error: %s\n",
1245 XML_GetErrorCode(parser
)));
1248 XML_ParserFree(parser
);
1250 error("no DAV locking support on %s",
1254 error("Cannot access URL %s, return code %d",
1255 repo
->url
, results
.curl_result
);
1259 error("Unable to start PROPFIND request on %s", repo
->url
);
1262 strbuf_release(&out_buffer
.buf
);
1263 strbuf_release(&in_buffer
);
1264 curl_slist_free_all(dav_headers
);
1269 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1271 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1275 return &entry
->next
;
1278 static struct object_list
**process_blob(struct blob
*blob
,
1279 struct object_list
**p
)
1281 struct object
*obj
= &blob
->object
;
1283 obj
->flags
|= LOCAL
;
1285 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1289 return add_one_object(obj
, p
);
1292 static struct object_list
**process_tree(struct tree
*tree
,
1293 struct object_list
**p
)
1295 struct object
*obj
= &tree
->object
;
1296 struct tree_desc desc
;
1297 struct name_entry entry
;
1299 obj
->flags
|= LOCAL
;
1301 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1303 if (parse_tree(tree
) < 0)
1304 die("bad tree object %s", oid_to_hex(&obj
->oid
));
1307 p
= add_one_object(obj
, p
);
1309 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1311 while (tree_entry(&desc
, &entry
))
1312 switch (object_type(entry
.mode
)) {
1314 p
= process_tree(lookup_tree(the_repository
, entry
.oid
),
1318 p
= process_blob(lookup_blob(the_repository
, entry
.oid
),
1322 /* Subproject commit - not in this repository */
1326 free_tree_buffer(tree
);
1330 static int get_delta(struct rev_info
*revs
, struct remote_lock
*lock
)
1333 struct commit
*commit
;
1334 struct object_list
**p
= &objects
;
1337 while ((commit
= get_revision(revs
)) != NULL
) {
1338 p
= process_tree(get_commit_tree(commit
), p
);
1339 commit
->object
.flags
|= LOCAL
;
1340 if (!(commit
->object
.flags
& UNINTERESTING
))
1341 count
+= add_send_request(&commit
->object
, lock
);
1344 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1345 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1346 struct object
*obj
= entry
->item
;
1347 const char *name
= entry
->name
;
1349 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1351 if (obj
->type
== OBJ_TAG
) {
1353 p
= add_one_object(obj
, p
);
1356 if (obj
->type
== OBJ_TREE
) {
1357 p
= process_tree((struct tree
*)obj
, p
);
1360 if (obj
->type
== OBJ_BLOB
) {
1361 p
= process_blob((struct blob
*)obj
, p
);
1364 die("unknown pending object %s (%s)", oid_to_hex(&obj
->oid
), name
);
1368 if (!(objects
->item
->flags
& UNINTERESTING
))
1369 count
+= add_send_request(objects
->item
, lock
);
1370 objects
= objects
->next
;
1376 static int update_remote(unsigned char *sha1
, struct remote_lock
*lock
)
1378 struct active_request_slot
*slot
;
1379 struct slot_results results
;
1380 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1381 struct curl_slist
*dav_headers
;
1383 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1385 strbuf_addf(&out_buffer
.buf
, "%s\n", sha1_to_hex(sha1
));
1387 slot
= get_active_slot();
1388 slot
->results
= &results
;
1389 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1390 &out_buffer
, fwrite_null
);
1391 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1393 if (start_active_slot(slot
)) {
1394 run_active_slot(slot
);
1395 strbuf_release(&out_buffer
.buf
);
1396 if (results
.curl_result
!= CURLE_OK
) {
1398 "PUT error: curl result=%d, HTTP code=%ld\n",
1399 results
.curl_result
, results
.http_code
);
1400 /* We should attempt recovery? */
1404 strbuf_release(&out_buffer
.buf
);
1405 fprintf(stderr
, "Unable to start PUT request\n");
1412 static struct ref
*remote_refs
;
1414 static void one_remote_ref(const char *refname
)
1419 ref
= alloc_ref(refname
);
1421 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1423 "Unable to fetch ref %s from %s\n",
1424 refname
, repo
->url
);
1430 * Fetch a copy of the object if it doesn't exist locally - it
1431 * may be required for updating server info later.
1433 if (repo
->can_update_info_refs
&& !has_object_file(&ref
->old_oid
)) {
1434 obj
= lookup_unknown_object(ref
->old_oid
.hash
);
1435 fprintf(stderr
, " fetch %s for %s\n",
1436 oid_to_hex(&ref
->old_oid
), refname
);
1437 add_fetch_request(obj
);
1440 ref
->next
= remote_refs
;
1444 static void get_dav_remote_heads(void)
1446 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1449 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1451 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1455 ref
= alloc_ref(ls
->dentry_name
);
1457 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1459 "Unable to fetch ref %s from %s\n",
1460 ls
->dentry_name
, repo
->url
);
1466 o
= parse_object(the_repository
, &ref
->old_oid
);
1469 "Unable to parse object %s for remote ref %s\n",
1470 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1476 strbuf_addf(buf
, "%s\t%s\n",
1477 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1479 if (o
->type
== OBJ_TAG
) {
1480 o
= deref_tag(the_repository
, o
, ls
->dentry_name
, 0);
1482 strbuf_addf(buf
, "%s\t%s^{}\n",
1483 oid_to_hex(&o
->oid
), ls
->dentry_name
);
1488 static void update_remote_info_refs(struct remote_lock
*lock
)
1490 struct buffer buffer
= { STRBUF_INIT
, 0 };
1491 struct active_request_slot
*slot
;
1492 struct slot_results results
;
1493 struct curl_slist
*dav_headers
;
1495 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1496 add_remote_info_ref
, &buffer
.buf
);
1498 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1500 slot
= get_active_slot();
1501 slot
->results
= &results
;
1502 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1503 &buffer
, fwrite_null
);
1504 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1506 if (start_active_slot(slot
)) {
1507 run_active_slot(slot
);
1508 if (results
.curl_result
!= CURLE_OK
) {
1510 "PUT error: curl result=%d, HTTP code=%ld\n",
1511 results
.curl_result
, results
.http_code
);
1515 strbuf_release(&buffer
.buf
);
1518 static int remote_exists(const char *path
)
1520 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1524 switch (http_get_strbuf(url
, NULL
, NULL
)) {
1528 case HTTP_MISSING_TARGET
:
1532 error("unable to access '%s': %s", url
, curl_errorstr
);
1541 static void fetch_symref(const char *path
, char **symref
, struct object_id
*oid
)
1543 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1544 struct strbuf buffer
= STRBUF_INIT
;
1547 if (http_get_strbuf(url
, &buffer
, NULL
) != HTTP_OK
)
1548 die("Couldn't get %s for remote symref\n%s", url
,
1552 FREE_AND_NULL(*symref
);
1555 if (buffer
.len
== 0)
1558 /* Cut off trailing newline. */
1559 strbuf_rtrim(&buffer
);
1561 /* If it's a symref, set the refname; otherwise try for a sha1 */
1562 if (skip_prefix(buffer
.buf
, "ref: ", &name
)) {
1563 *symref
= xmemdupz(name
, buffer
.len
- (name
- buffer
.buf
));
1565 get_oid_hex(buffer
.buf
, oid
);
1568 strbuf_release(&buffer
);
1571 static int verify_merge_base(struct object_id
*head_oid
, struct ref
*remote
)
1573 struct commit
*head
= lookup_commit_or_die(head_oid
, "HEAD");
1574 struct commit
*branch
= lookup_commit_or_die(&remote
->old_oid
,
1577 return in_merge_bases(branch
, head
);
1580 static int delete_remote_branch(const char *pattern
, int force
)
1582 struct ref
*refs
= remote_refs
;
1583 struct ref
*remote_ref
= NULL
;
1584 struct object_id head_oid
;
1585 char *symref
= NULL
;
1587 int patlen
= strlen(pattern
);
1589 struct active_request_slot
*slot
;
1590 struct slot_results results
;
1593 /* Find the remote branch(es) matching the specified branch name */
1594 for (match
= 0; refs
; refs
= refs
->next
) {
1595 char *name
= refs
->name
;
1596 int namelen
= strlen(name
);
1597 if (namelen
< patlen
||
1598 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
1600 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
1606 return error("No remote branch matches %s", pattern
);
1608 return error("More than one remote branch matches %s",
1612 * Remote HEAD must be a symref (not exactly foolproof; a remote
1613 * symlink to a symref will look like a symref)
1615 fetch_symref("HEAD", &symref
, &head_oid
);
1617 return error("Remote HEAD is not a symref");
1619 /* Remote branch must not be the remote HEAD */
1620 for (i
= 0; symref
&& i
< MAXDEPTH
; i
++) {
1621 if (!strcmp(remote_ref
->name
, symref
))
1622 return error("Remote branch %s is the current HEAD",
1624 fetch_symref(symref
, &symref
, &head_oid
);
1627 /* Run extra sanity checks if delete is not forced */
1629 /* Remote HEAD must resolve to a known object */
1631 return error("Remote HEAD symrefs too deep");
1632 if (is_null_oid(&head_oid
))
1633 return error("Unable to resolve remote HEAD");
1634 if (!has_object_file(&head_oid
))
1635 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid
));
1637 /* Remote branch must resolve to a known object */
1638 if (is_null_oid(&remote_ref
->old_oid
))
1639 return error("Unable to resolve remote branch %s",
1641 if (!has_object_file(&remote_ref
->old_oid
))
1642 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
));
1644 /* Remote branch must be an ancestor of remote HEAD */
1645 if (!verify_merge_base(&head_oid
, remote_ref
)) {
1646 return error("The branch '%s' is not an ancestor "
1647 "of your current HEAD.\n"
1648 "If you are sure you want to delete it,"
1649 " run:\n\t'git http-push -D %s %s'",
1650 remote_ref
->name
, repo
->url
, pattern
);
1654 /* Send delete request */
1655 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
1658 url
= xstrfmt("%s%s", repo
->url
, remote_ref
->name
);
1659 slot
= get_active_slot();
1660 slot
->results
= &results
;
1661 curl_setup_http_get(slot
->curl
, url
, DAV_DELETE
);
1662 if (start_active_slot(slot
)) {
1663 run_active_slot(slot
);
1665 if (results
.curl_result
!= CURLE_OK
)
1666 return error("DELETE request failed (%d/%ld)",
1667 results
.curl_result
, results
.http_code
);
1670 return error("Unable to start DELETE request");
1676 static void run_request_queue(void)
1678 #ifdef USE_CURL_MULTI
1679 is_running_queue
= 1;
1680 fill_active_slots();
1681 add_fill_function(NULL
, fill_active_slot
);
1684 finish_all_active_slots();
1685 #ifdef USE_CURL_MULTI
1686 fill_active_slots();
1688 } while (request_queue_head
&& !aborted
);
1690 #ifdef USE_CURL_MULTI
1691 is_running_queue
= 0;
1695 int cmd_main(int argc
, const char **argv
)
1697 struct transfer_request
*request
;
1698 struct transfer_request
*next_request
;
1699 struct refspec rs
= REFSPEC_INIT_PUSH
;
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
);
1762 refspec_appendn(&rs
, argv
, argc
- i
);
1766 #ifndef USE_CURL_MULTI
1767 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
1771 usage(http_push_usage
);
1773 if (delete_branch
&& rs
.nr
!= 1)
1774 die("You must specify only one branch name when deleting a remote branch");
1776 setup_git_directory();
1778 memset(remote_dir_exists
, -1, 256);
1780 http_init(NULL
, repo
->url
, 1);
1782 #ifdef USE_CURL_MULTI
1783 is_running_queue
= 0;
1786 /* Verify DAV compliance/lock support */
1787 if (!locking_available()) {
1792 sigchain_push_common(remove_locks_on_signal
);
1794 /* Check whether the remote has server info files */
1795 repo
->can_update_info_refs
= 0;
1796 repo
->has_info_refs
= remote_exists("info/refs");
1797 repo
->has_info_packs
= remote_exists("objects/info/packs");
1798 if (repo
->has_info_refs
) {
1799 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
1801 repo
->can_update_info_refs
= 1;
1803 error("cannot lock existing info/refs");
1808 if (repo
->has_info_packs
)
1811 /* Get a list of all local and remote heads to validate refspecs */
1812 local_refs
= get_local_heads();
1813 fprintf(stderr
, "Fetching remote heads...\n");
1814 get_dav_remote_heads();
1815 run_request_queue();
1817 /* Remove a remote branch if -d or -D was specified */
1818 if (delete_branch
) {
1819 const char *branch
= rs
.items
[i
].src
;
1820 if (delete_remote_branch(branch
, force_delete
) == -1) {
1821 fprintf(stderr
, "Unable to delete remote branch %s\n",
1824 printf("error %s cannot remove\n", branch
);
1830 if (match_push_refs(local_refs
, &remote_refs
, &rs
, push_all
)) {
1835 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
1837 printf("error null no match\n");
1843 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1844 struct argv_array commit_argv
= ARGV_ARRAY_INIT
;
1849 if (is_null_oid(&ref
->peer_ref
->new_oid
)) {
1850 if (delete_remote_branch(ref
->name
, 1) == -1) {
1851 error("Could not remove %s", ref
->name
);
1853 printf("error %s cannot remove\n", ref
->name
);
1856 else if (helper_status
)
1857 printf("ok %s\n", ref
->name
);
1862 if (oideq(&ref
->old_oid
, &ref
->peer_ref
->new_oid
)) {
1864 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
1866 printf("ok %s up to date\n", ref
->name
);
1871 !is_null_oid(&ref
->old_oid
) &&
1873 if (!has_object_file(&ref
->old_oid
) ||
1874 !ref_newer(&ref
->peer_ref
->new_oid
,
1877 * We do not have the remote ref, or
1878 * we know that the remote ref is not
1879 * an ancestor of what we are trying to
1880 * push. Either way this can be losing
1881 * commits at the remote end and likely
1882 * we were not up to date to begin with.
1884 error("remote '%s' is not an ancestor of\n"
1886 "Maybe you are not up-to-date and "
1887 "need to pull first?",
1889 ref
->peer_ref
->name
);
1891 printf("error %s non-fast forward\n", ref
->name
);
1896 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1899 fprintf(stderr
, "updating '%s'", ref
->name
);
1900 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
1901 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
1902 fprintf(stderr
, "\n from %s\n to %s\n",
1903 oid_to_hex(&ref
->old_oid
), oid_to_hex(&ref
->new_oid
));
1906 printf("ok %s\n", ref
->name
);
1910 /* Lock remote branch ref */
1911 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
1912 if (ref_lock
== NULL
) {
1913 fprintf(stderr
, "Unable to lock remote branch %s\n",
1916 printf("error %s lock error\n", ref
->name
);
1921 /* Set up revision info for this refspec */
1922 argv_array_push(&commit_argv
, ""); /* ignored */
1923 argv_array_push(&commit_argv
, "--objects");
1924 argv_array_push(&commit_argv
, oid_to_hex(&ref
->new_oid
));
1925 if (!push_all
&& !is_null_oid(&ref
->old_oid
))
1926 argv_array_pushf(&commit_argv
, "^%s",
1927 oid_to_hex(&ref
->old_oid
));
1928 repo_init_revisions(the_repository
, &revs
, setup_git_directory());
1929 setup_revisions(commit_argv
.argc
, commit_argv
.argv
, &revs
, NULL
);
1930 revs
.edge_hint
= 0; /* just in case */
1932 /* Generate a list of objects that need to be pushed */
1934 if (prepare_revision_walk(&revs
))
1935 die("revision walk setup failed");
1936 mark_edges_uninteresting(&revs
, NULL
);
1937 objects_to_send
= get_delta(&revs
, ref_lock
);
1938 finish_all_active_slots();
1940 /* Push missing objects to remote, this would be a
1941 convenient time to pack them first if appropriate. */
1943 if (objects_to_send
)
1944 fprintf(stderr
, " sending %d objects\n",
1947 run_request_queue();
1949 /* Update the remote branch if all went well */
1950 if (aborted
|| !update_remote(ref
->new_oid
.hash
, ref_lock
))
1954 fprintf(stderr
, " done\n");
1956 printf("%s %s\n", !rc
? "ok" : "error", ref
->name
);
1957 unlock_remote(ref_lock
);
1959 argv_array_clear(&commit_argv
);
1962 /* Update remote server info if appropriate */
1963 if (repo
->has_info_refs
&& new_refs
) {
1964 if (info_ref_lock
&& repo
->can_update_info_refs
) {
1965 fprintf(stderr
, "Updating remote server info\n");
1967 update_remote_info_refs(info_ref_lock
);
1969 fprintf(stderr
, "Unable to update server info\n");
1975 unlock_remote(info_ref_lock
);
1980 request
= request_queue_head
;
1981 while (request
!= NULL
) {
1982 next_request
= request
->next
;
1983 release_request(request
);
1984 request
= next_request
;