1 #include "git-compat-util.h"
2 #include "environment.h"
4 #include "repository.h"
12 #include "list-objects.h"
17 #include "tree-walk.h"
20 #include "object-store-ll.h"
21 #include "commit-reach.h"
23 #ifdef EXPAT_NEEDS_XMLPARSE_H
29 static const char http_push_usage
[] =
30 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
37 #define XML_STATUS_OK 1
38 #define XML_STATUS_ERROR 0
41 #define PREV_BUF_SIZE 4096
44 #define DAV_LOCK "LOCK"
45 #define DAV_MKCOL "MKCOL"
46 #define DAV_MOVE "MOVE"
47 #define DAV_PROPFIND "PROPFIND"
49 #define DAV_UNLOCK "UNLOCK"
50 #define DAV_DELETE "DELETE"
53 #define DAV_PROP_LOCKWR (1u << 0)
54 #define DAV_PROP_LOCKEX (1u << 1)
55 #define DAV_LOCK_OK (1u << 2)
57 /* DAV XML properties */
58 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
59 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
60 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
61 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
62 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
63 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
64 #define DAV_PROPFIND_RESP ".multistatus.response"
65 #define DAV_PROPFIND_NAME ".multistatus.response.href"
66 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
68 /* DAV request body templates */
69 #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>"
70 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
71 #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>"
74 #define LOCK_REFRESH 30
76 /* Remember to update object flag allocation in object.h */
77 #define LOCAL (1u<<11)
78 #define REMOTE (1u<<12)
79 #define FETCHING (1u<<13)
80 #define PUSHING (1u<<14)
82 /* We allow "recursive" symbolic refs. Only within reason, though */
87 static signed char remote_dir_exists
[256];
89 static int push_verbosely
;
90 static int push_all
= MATCH_REFS_NONE
;
93 static int helper_status
;
95 static struct object_list
*objects
;
102 int can_update_info_refs
;
104 struct packed_git
*packs
;
105 struct remote_lock
*locks
;
108 static struct repo
*repo
;
110 enum transfer_state
{
122 struct transfer_request
{
124 struct packed_git
*target
;
127 struct remote_lock
*lock
;
128 struct curl_slist
*headers
;
129 struct buffer buffer
;
130 enum transfer_state state
;
131 CURLcode curl_result
;
132 char errorstr
[CURL_ERROR_SIZE
];
135 struct active_request_slot
*slot
;
136 struct transfer_request
*next
;
139 static struct transfer_request
*request_queue_head
;
145 void (*userFunc
)(struct xml_ctx
*ctx
, int tag_closed
);
153 char tmpfile_suffix
[GIT_MAX_HEXSZ
+ 1];
157 struct remote_lock
*next
;
160 /* Flags that control remote_ls processing */
161 #define PROCESS_FILES (1u << 0)
162 #define PROCESS_DIRS (1u << 1)
163 #define RECURSIVE (1u << 2)
165 /* Flags that remote_ls passes to callback functions */
166 #define IS_DIR (1u << 0)
168 struct remote_ls_ctx
{
170 void (*userFunc
)(struct remote_ls_ctx
*ls
);
175 struct remote_ls_ctx
*parent
;
178 /* get_dav_token_headers options */
179 enum dav_header_flag
{
180 DAV_HEADER_IF
= (1u << 0),
181 DAV_HEADER_LOCK
= (1u << 1),
182 DAV_HEADER_TIMEOUT
= (1u << 2)
185 static char *xml_entities(const char *s
)
187 struct strbuf buf
= STRBUF_INIT
;
188 strbuf_addstr_xml_quoted(&buf
, s
);
189 return strbuf_detach(&buf
, NULL
);
192 static void curl_setup_http_get(CURL
*curl
, const char *url
,
193 const char *custom_req
)
195 curl_easy_setopt(curl
, CURLOPT_HTTPGET
, 1);
196 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
197 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
198 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, fwrite_null
);
201 static void curl_setup_http(CURL
*curl
, const char *url
,
202 const char *custom_req
, struct buffer
*buffer
,
203 curl_write_callback write_fn
)
205 curl_easy_setopt(curl
, CURLOPT_UPLOAD
, 1);
206 curl_easy_setopt(curl
, CURLOPT_URL
, url
);
207 curl_easy_setopt(curl
, CURLOPT_INFILE
, buffer
);
208 curl_easy_setopt(curl
, CURLOPT_INFILESIZE
, buffer
->buf
.len
);
209 curl_easy_setopt(curl
, CURLOPT_READFUNCTION
, fread_buffer
);
210 curl_easy_setopt(curl
, CURLOPT_SEEKFUNCTION
, seek_buffer
);
211 curl_easy_setopt(curl
, CURLOPT_SEEKDATA
, buffer
);
212 curl_easy_setopt(curl
, CURLOPT_WRITEFUNCTION
, write_fn
);
213 curl_easy_setopt(curl
, CURLOPT_NOBODY
, 0);
214 curl_easy_setopt(curl
, CURLOPT_CUSTOMREQUEST
, custom_req
);
215 curl_easy_setopt(curl
, CURLOPT_UPLOAD
, 1);
218 static struct curl_slist
*get_dav_token_headers(struct remote_lock
*lock
, enum dav_header_flag options
)
220 struct strbuf buf
= STRBUF_INIT
;
221 struct curl_slist
*dav_headers
= http_copy_default_headers();
223 if (options
& DAV_HEADER_IF
) {
224 strbuf_addf(&buf
, "If: (<%s>)", lock
->token
);
225 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
228 if (options
& DAV_HEADER_LOCK
) {
229 strbuf_addf(&buf
, "Lock-Token: <%s>", lock
->token
);
230 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
233 if (options
& DAV_HEADER_TIMEOUT
) {
234 strbuf_addf(&buf
, "Timeout: Second-%ld", lock
->timeout
);
235 dav_headers
= curl_slist_append(dav_headers
, buf
.buf
);
238 strbuf_release(&buf
);
243 static void finish_request(struct transfer_request
*request
);
244 static void release_request(struct transfer_request
*request
);
246 static void process_response(void *callback_data
)
248 struct transfer_request
*request
=
249 (struct transfer_request
*)callback_data
;
251 finish_request(request
);
254 static void start_fetch_loose(struct transfer_request
*request
)
256 struct active_request_slot
*slot
;
257 struct http_object_request
*obj_req
;
259 obj_req
= new_http_object_request(repo
->url
, &request
->obj
->oid
);
261 request
->state
= ABORTED
;
265 slot
= obj_req
->slot
;
266 slot
->callback_func
= process_response
;
267 slot
->callback_data
= request
;
268 request
->slot
= slot
;
269 request
->userData
= obj_req
;
271 /* Try to get the request started, abort the request on error */
272 request
->state
= RUN_FETCH_LOOSE
;
273 if (!start_active_slot(slot
)) {
274 fprintf(stderr
, "Unable to start GET request\n");
275 repo
->can_update_info_refs
= 0;
276 release_http_object_request(obj_req
);
277 release_request(request
);
281 static void start_mkcol(struct transfer_request
*request
)
283 char *hex
= oid_to_hex(&request
->obj
->oid
);
284 struct active_request_slot
*slot
;
286 request
->url
= get_remote_object_url(repo
->url
, hex
, 1);
288 slot
= get_active_slot();
289 slot
->callback_func
= process_response
;
290 slot
->callback_data
= request
;
291 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MKCOL
);
292 curl_easy_setopt(slot
->curl
, CURLOPT_ERRORBUFFER
, request
->errorstr
);
294 if (start_active_slot(slot
)) {
295 request
->slot
= slot
;
296 request
->state
= RUN_MKCOL
;
298 request
->state
= ABORTED
;
299 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
);
317 close_pack_index(target
);
318 request
->target
= target
;
320 fprintf(stderr
, "Fetching pack %s\n",
321 hash_to_hex(target
->hash
));
322 fprintf(stderr
, " which contains %s\n", oid_to_hex(&request
->obj
->oid
));
324 preq
= new_http_pack_request(target
->hash
, repo
->url
);
326 repo
->can_update_info_refs
= 0;
330 /* Make sure there isn't another open request for this pack */
331 while (check_request
) {
332 if (check_request
->state
== RUN_FETCH_PACKED
&&
333 !strcmp(check_request
->url
, preq
->url
)) {
334 release_http_pack_request(preq
);
335 release_request(request
);
338 check_request
= check_request
->next
;
341 preq
->slot
->callback_func
= process_response
;
342 preq
->slot
->callback_data
= request
;
343 request
->slot
= preq
->slot
;
344 request
->userData
= preq
;
346 /* Try to get the request started, abort the request on error */
347 request
->state
= RUN_FETCH_PACKED
;
348 if (!start_active_slot(preq
->slot
)) {
349 fprintf(stderr
, "Unable to start GET request\n");
350 release_http_pack_request(preq
);
351 repo
->can_update_info_refs
= 0;
352 release_request(request
);
356 static void start_put(struct transfer_request
*request
)
358 char *hex
= oid_to_hex(&request
->obj
->oid
);
359 struct active_request_slot
*slot
;
360 struct strbuf buf
= STRBUF_INIT
;
361 enum object_type type
;
369 unpacked
= repo_read_object_file(the_repository
, &request
->obj
->oid
,
371 hdrlen
= format_object_header(hdr
, sizeof(hdr
), type
, len
);
374 git_deflate_init(&stream
, zlib_compression_level
);
375 size
= git_deflate_bound(&stream
, len
+ hdrlen
);
376 strbuf_init(&request
->buffer
.buf
, size
);
377 request
->buffer
.posn
= 0;
380 stream
.next_out
= (unsigned char *)request
->buffer
.buf
.buf
;
381 stream
.avail_out
= size
;
384 stream
.next_in
= (void *)hdr
;
385 stream
.avail_in
= hdrlen
;
386 while (git_deflate(&stream
, 0) == Z_OK
)
389 /* Then the data itself.. */
390 stream
.next_in
= unpacked
;
391 stream
.avail_in
= len
;
392 while (git_deflate(&stream
, Z_FINISH
) == Z_OK
)
394 git_deflate_end(&stream
);
397 request
->buffer
.buf
.len
= stream
.total_out
;
399 strbuf_addstr(&buf
, "Destination: ");
400 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
401 request
->dest
= strbuf_detach(&buf
, NULL
);
403 append_remote_object_url(&buf
, repo
->url
, hex
, 0);
404 strbuf_add(&buf
, request
->lock
->tmpfile_suffix
, the_hash_algo
->hexsz
+ 1);
405 request
->url
= strbuf_detach(&buf
, NULL
);
407 slot
= get_active_slot();
408 slot
->callback_func
= process_response
;
409 slot
->callback_data
= request
;
410 curl_setup_http(slot
->curl
, request
->url
, DAV_PUT
,
411 &request
->buffer
, fwrite_null
);
413 if (start_active_slot(slot
)) {
414 request
->slot
= slot
;
415 request
->state
= RUN_PUT
;
417 request
->state
= ABORTED
;
418 FREE_AND_NULL(request
->url
);
422 static void start_move(struct transfer_request
*request
)
424 struct active_request_slot
*slot
;
425 struct curl_slist
*dav_headers
= http_copy_default_headers();
427 slot
= get_active_slot();
428 slot
->callback_func
= process_response
;
429 slot
->callback_data
= request
;
430 curl_setup_http_get(slot
->curl
, request
->url
, DAV_MOVE
);
431 dav_headers
= curl_slist_append(dav_headers
, request
->dest
);
432 dav_headers
= curl_slist_append(dav_headers
, "Overwrite: T");
433 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
435 if (start_active_slot(slot
)) {
436 request
->slot
= slot
;
437 request
->state
= RUN_MOVE
;
439 request
->state
= ABORTED
;
440 FREE_AND_NULL(request
->url
);
444 static int refresh_lock(struct remote_lock
*lock
)
446 struct active_request_slot
*slot
;
447 struct slot_results results
;
448 struct curl_slist
*dav_headers
;
451 lock
->refreshing
= 1;
453 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
| DAV_HEADER_TIMEOUT
);
455 slot
= get_active_slot();
456 slot
->results
= &results
;
457 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_LOCK
);
458 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
460 if (start_active_slot(slot
)) {
461 run_active_slot(slot
);
462 if (results
.curl_result
!= CURLE_OK
) {
463 fprintf(stderr
, "LOCK HTTP error %ld\n",
466 lock
->start_time
= time(NULL
);
471 lock
->refreshing
= 0;
472 curl_slist_free_all(dav_headers
);
477 static void check_locks(void)
479 struct remote_lock
*lock
= repo
->locks
;
480 time_t current_time
= time(NULL
);
484 time_remaining
= lock
->start_time
+ lock
->timeout
-
486 if (!lock
->refreshing
&& time_remaining
< LOCK_REFRESH
) {
487 if (!refresh_lock(lock
)) {
489 "Unable to refresh lock for %s\n",
499 static void release_request(struct transfer_request
*request
)
501 struct transfer_request
*entry
= request_queue_head
;
503 if (request
== request_queue_head
) {
504 request_queue_head
= request
->next
;
506 while (entry
&& entry
->next
!= request
)
509 entry
->next
= request
->next
;
516 static void finish_request(struct transfer_request
*request
)
518 struct http_pack_request
*preq
;
519 struct http_object_request
*obj_req
;
521 request
->curl_result
= request
->slot
->curl_result
;
522 request
->http_code
= request
->slot
->http_code
;
523 request
->slot
= NULL
;
525 /* Keep locks active */
528 if (request
->headers
)
529 curl_slist_free_all(request
->headers
);
531 /* URL is reused for MOVE after PUT and used during FETCH */
532 if (request
->state
!= RUN_PUT
&& request
->state
!= RUN_FETCH_PACKED
) {
533 FREE_AND_NULL(request
->url
);
536 if (request
->state
== RUN_MKCOL
) {
537 if (request
->curl_result
== CURLE_OK
||
538 request
->http_code
== 405) {
539 remote_dir_exists
[request
->obj
->oid
.hash
[0]] = 1;
542 fprintf(stderr
, "MKCOL %s failed, aborting (%d/%ld)\n",
543 oid_to_hex(&request
->obj
->oid
),
544 request
->curl_result
, request
->http_code
);
545 request
->state
= ABORTED
;
548 } else if (request
->state
== RUN_PUT
) {
549 if (request
->curl_result
== CURLE_OK
) {
552 fprintf(stderr
, "PUT %s failed, aborting (%d/%ld)\n",
553 oid_to_hex(&request
->obj
->oid
),
554 request
->curl_result
, request
->http_code
);
555 request
->state
= ABORTED
;
558 } else if (request
->state
== RUN_MOVE
) {
559 if (request
->curl_result
== CURLE_OK
) {
561 fprintf(stderr
, " sent %s\n",
562 oid_to_hex(&request
->obj
->oid
));
563 request
->obj
->flags
|= REMOTE
;
564 release_request(request
);
566 fprintf(stderr
, "MOVE %s failed, aborting (%d/%ld)\n",
567 oid_to_hex(&request
->obj
->oid
),
568 request
->curl_result
, request
->http_code
);
569 request
->state
= ABORTED
;
572 } else if (request
->state
== RUN_FETCH_LOOSE
) {
573 obj_req
= (struct http_object_request
*)request
->userData
;
575 if (finish_http_object_request(obj_req
) == 0)
576 if (obj_req
->rename
== 0)
577 request
->obj
->flags
|= (LOCAL
| REMOTE
);
579 /* Try fetching packed if necessary */
580 if (request
->obj
->flags
& LOCAL
) {
581 release_http_object_request(obj_req
);
582 release_request(request
);
584 start_fetch_packed(request
);
586 } else if (request
->state
== RUN_FETCH_PACKED
) {
588 if (request
->curl_result
!= CURLE_OK
) {
589 fprintf(stderr
, "Unable to get pack file %s\n%s",
590 request
->url
, curl_errorstr
);
592 preq
= (struct http_pack_request
*)request
->userData
;
595 if (finish_http_pack_request(preq
) == 0)
597 release_http_pack_request(preq
);
601 repo
->can_update_info_refs
= 0;
603 http_install_packfile(request
->target
, &repo
->packs
);
604 release_request(request
);
608 static int is_running_queue
;
609 static int fill_active_slot(void *data UNUSED
)
611 struct transfer_request
*request
;
613 if (aborted
|| !is_running_queue
)
616 for (request
= request_queue_head
; request
; request
= request
->next
) {
617 if (request
->state
== NEED_FETCH
) {
618 start_fetch_loose(request
);
620 } else if (pushing
&& request
->state
== NEED_PUSH
) {
621 if (remote_dir_exists
[request
->obj
->oid
.hash
[0]] == 1) {
624 start_mkcol(request
);
632 static void get_remote_object_list(unsigned char parent
);
634 static void add_fetch_request(struct object
*obj
)
636 struct transfer_request
*request
;
641 * Don't fetch the object if it's known to exist locally
642 * or is already in the request queue
644 if (remote_dir_exists
[obj
->oid
.hash
[0]] == -1)
645 get_remote_object_list(obj
->oid
.hash
[0]);
646 if (obj
->flags
& (LOCAL
| FETCHING
))
649 obj
->flags
|= FETCHING
;
650 request
= xmalloc(sizeof(*request
));
653 request
->lock
= NULL
;
654 request
->headers
= NULL
;
655 request
->state
= NEED_FETCH
;
656 request
->next
= request_queue_head
;
657 request_queue_head
= request
;
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
->oid
.hash
[0]] == -1)
676 get_remote_object_list(obj
->oid
.hash
[0]);
677 if (obj
->flags
& (REMOTE
| PUSHING
))
679 target
= find_sha1_pack(obj
->oid
.hash
, 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
;
701 static int fetch_indices(void)
706 fprintf(stderr
, "Getting pack list\n");
708 switch (http_get_info_packs(repo
->url
, &repo
->packs
)) {
710 case HTTP_MISSING_TARGET
:
720 static void one_remote_object(const struct object_id
*oid
)
724 obj
= lookup_object(the_repository
, oid
);
726 obj
= parse_object(the_repository
, oid
);
728 /* Ignore remote objects that don't exist locally */
732 obj
->flags
|= REMOTE
;
733 if (!object_list_contains(objects
, obj
))
734 object_list_insert(obj
, &objects
);
737 static void handle_lockprop_ctx(struct xml_ctx
*ctx
, int tag_closed
)
739 int *lock_flags
= (int *)ctx
->userData
;
742 if (!strcmp(ctx
->name
, DAV_CTX_LOCKENTRY
)) {
743 if ((*lock_flags
& DAV_PROP_LOCKEX
) &&
744 (*lock_flags
& DAV_PROP_LOCKWR
)) {
745 *lock_flags
|= DAV_LOCK_OK
;
747 *lock_flags
&= DAV_LOCK_OK
;
748 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_WRITE
)) {
749 *lock_flags
|= DAV_PROP_LOCKWR
;
750 } else if (!strcmp(ctx
->name
, DAV_CTX_LOCKTYPE_EXCLUSIVE
)) {
751 *lock_flags
|= DAV_PROP_LOCKEX
;
756 static void handle_new_lock_ctx(struct xml_ctx
*ctx
, int tag_closed
)
758 struct remote_lock
*lock
= (struct remote_lock
*)ctx
->userData
;
759 git_hash_ctx hash_ctx
;
760 unsigned char lock_token_hash
[GIT_MAX_RAWSZ
];
762 if (tag_closed
&& ctx
->cdata
) {
763 if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_OWNER
)) {
764 lock
->owner
= xstrdup(ctx
->cdata
);
765 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TIMEOUT
)) {
767 if (skip_prefix(ctx
->cdata
, "Second-", &arg
))
768 lock
->timeout
= strtol(arg
, NULL
, 10);
769 } else if (!strcmp(ctx
->name
, DAV_ACTIVELOCK_TOKEN
)) {
770 lock
->token
= xstrdup(ctx
->cdata
);
772 the_hash_algo
->init_fn(&hash_ctx
);
773 the_hash_algo
->update_fn(&hash_ctx
, lock
->token
, strlen(lock
->token
));
774 the_hash_algo
->final_fn(lock_token_hash
, &hash_ctx
);
776 lock
->tmpfile_suffix
[0] = '_';
777 memcpy(lock
->tmpfile_suffix
+ 1, hash_to_hex(lock_token_hash
), the_hash_algo
->hexsz
);
782 static void one_remote_ref(const char *refname
);
785 xml_start_tag(void *userData
, const char *name
, const char **atts UNUSED
)
787 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
788 const char *c
= strchr(name
, ':');
789 int old_namelen
, new_len
;
796 old_namelen
= strlen(ctx
->name
);
797 new_len
= old_namelen
+ strlen(c
) + 2;
799 if (new_len
> ctx
->len
) {
800 ctx
->name
= xrealloc(ctx
->name
, new_len
);
803 xsnprintf(ctx
->name
+ old_namelen
, ctx
->len
- old_namelen
, ".%s", c
);
805 FREE_AND_NULL(ctx
->cdata
);
807 ctx
->userFunc(ctx
, 0);
811 xml_end_tag(void *userData
, const char *name
)
813 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
814 const char *c
= strchr(name
, ':');
817 ctx
->userFunc(ctx
, 1);
824 ep
= ctx
->name
+ strlen(ctx
->name
) - strlen(c
) - 1;
829 xml_cdata(void *userData
, const XML_Char
*s
, int len
)
831 struct xml_ctx
*ctx
= (struct xml_ctx
*)userData
;
833 ctx
->cdata
= xmemdupz(s
, len
);
836 static struct remote_lock
*lock_remote(const char *path
, long timeout
)
838 struct active_request_slot
*slot
;
839 struct slot_results results
;
840 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
841 struct strbuf in_buffer
= STRBUF_INIT
;
844 char timeout_header
[25];
845 struct remote_lock
*lock
= NULL
;
846 struct curl_slist
*dav_headers
= http_copy_default_headers();
850 url
= xstrfmt("%s%s", repo
->url
, path
);
852 /* Make sure leading directories exist for the remote ref */
853 ep
= strchr(url
+ strlen(repo
->url
) + 1, '/');
855 char saved_character
= ep
[1];
857 slot
= get_active_slot();
858 slot
->results
= &results
;
859 curl_setup_http_get(slot
->curl
, url
, DAV_MKCOL
);
860 if (start_active_slot(slot
)) {
861 run_active_slot(slot
);
862 if (results
.curl_result
!= CURLE_OK
&&
863 results
.http_code
!= 405) {
865 "Unable to create branch path %s\n",
871 fprintf(stderr
, "Unable to start MKCOL request\n");
875 ep
[1] = saved_character
;
876 ep
= strchr(ep
+ 1, '/');
879 escaped
= xml_entities(ident_default_email());
880 strbuf_addf(&out_buffer
.buf
, LOCK_REQUEST
, escaped
);
883 xsnprintf(timeout_header
, sizeof(timeout_header
), "Timeout: Second-%ld", timeout
);
884 dav_headers
= curl_slist_append(dav_headers
, timeout_header
);
885 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
887 slot
= get_active_slot();
888 slot
->results
= &results
;
889 curl_setup_http(slot
->curl
, url
, DAV_LOCK
, &out_buffer
, fwrite_buffer
);
890 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
891 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEDATA
, &in_buffer
);
893 CALLOC_ARRAY(lock
, 1);
896 if (start_active_slot(slot
)) {
897 run_active_slot(slot
);
898 if (results
.curl_result
== CURLE_OK
) {
899 XML_Parser parser
= XML_ParserCreate(NULL
);
900 enum XML_Status result
;
901 ctx
.name
= xcalloc(10, 1);
904 ctx
.userFunc
= handle_new_lock_ctx
;
906 XML_SetUserData(parser
, &ctx
);
907 XML_SetElementHandler(parser
, xml_start_tag
,
909 XML_SetCharacterDataHandler(parser
, xml_cdata
);
910 result
= XML_Parse(parser
, in_buffer
.buf
,
913 if (result
!= XML_STATUS_OK
) {
914 fprintf(stderr
, "XML error: %s\n",
916 XML_GetErrorCode(parser
)));
919 XML_ParserFree(parser
);
922 "error: curl result=%d, HTTP code=%ld\n",
923 results
.curl_result
, results
.http_code
);
926 fprintf(stderr
, "Unable to start LOCK request\n");
929 curl_slist_free_all(dav_headers
);
930 strbuf_release(&out_buffer
.buf
);
931 strbuf_release(&in_buffer
);
933 if (lock
->token
== NULL
|| lock
->timeout
<= 0) {
940 lock
->start_time
= time(NULL
);
941 lock
->next
= repo
->locks
;
948 static int unlock_remote(struct remote_lock
*lock
)
950 struct active_request_slot
*slot
;
951 struct slot_results results
;
952 struct remote_lock
*prev
= repo
->locks
;
953 struct curl_slist
*dav_headers
;
956 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_LOCK
);
958 slot
= get_active_slot();
959 slot
->results
= &results
;
960 curl_setup_http_get(slot
->curl
, lock
->url
, DAV_UNLOCK
);
961 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
963 if (start_active_slot(slot
)) {
964 run_active_slot(slot
);
965 if (results
.curl_result
== CURLE_OK
)
968 fprintf(stderr
, "UNLOCK HTTP error %ld\n",
971 fprintf(stderr
, "Unable to start UNLOCK request\n");
974 curl_slist_free_all(dav_headers
);
976 if (repo
->locks
== lock
) {
977 repo
->locks
= lock
->next
;
979 while (prev
&& prev
->next
!= lock
)
982 prev
->next
= lock
->next
;
993 static void remove_locks(void)
995 struct remote_lock
*lock
= repo
->locks
;
997 fprintf(stderr
, "Removing remote locks...\n");
999 struct remote_lock
*next
= lock
->next
;
1000 unlock_remote(lock
);
1005 static void remove_locks_on_signal(int signo
)
1008 sigchain_pop(signo
);
1012 static void remote_ls(const char *path
, int flags
,
1013 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1016 /* extract hex from sharded "xx/x{38}" filename */
1017 static int get_oid_hex_from_objpath(const char *path
, struct object_id
*oid
)
1019 oid
->algo
= hash_algo_by_ptr(the_hash_algo
);
1021 if (strlen(path
) != the_hash_algo
->hexsz
+ 1)
1024 if (hex_to_bytes(oid
->hash
, path
, 1))
1027 path
++; /* skip '/' */
1029 return hex_to_bytes(oid
->hash
+ 1, path
, the_hash_algo
->rawsz
- 1);
1032 static void process_ls_object(struct remote_ls_ctx
*ls
)
1034 unsigned int *parent
= (unsigned int *)ls
->userData
;
1035 const char *path
= ls
->dentry_name
;
1036 struct object_id oid
;
1038 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->flags
& IS_DIR
)) {
1039 remote_dir_exists
[*parent
] = 1;
1043 if (!skip_prefix(path
, "objects/", &path
) ||
1044 get_oid_hex_from_objpath(path
, &oid
))
1047 one_remote_object(&oid
);
1050 static void process_ls_ref(struct remote_ls_ctx
*ls
)
1052 if (!strcmp(ls
->path
, ls
->dentry_name
) && (ls
->dentry_flags
& IS_DIR
)) {
1053 fprintf(stderr
, " %s\n", ls
->dentry_name
);
1057 if (!(ls
->dentry_flags
& IS_DIR
))
1058 one_remote_ref(ls
->dentry_name
);
1061 static void handle_remote_ls_ctx(struct xml_ctx
*ctx
, int tag_closed
)
1063 struct remote_ls_ctx
*ls
= (struct remote_ls_ctx
*)ctx
->userData
;
1066 if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
) && ls
->dentry_name
) {
1067 if (ls
->dentry_flags
& IS_DIR
) {
1069 /* ensure collection names end with slash */
1070 str_end_url_with_slash(ls
->dentry_name
, &ls
->dentry_name
);
1072 if (ls
->flags
& PROCESS_DIRS
) {
1075 if (strcmp(ls
->dentry_name
, ls
->path
) &&
1076 ls
->flags
& RECURSIVE
) {
1077 remote_ls(ls
->dentry_name
,
1082 } else if (ls
->flags
& PROCESS_FILES
) {
1085 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_NAME
) && ctx
->cdata
) {
1086 char *path
= ctx
->cdata
;
1087 if (*ctx
->cdata
== 'h') {
1088 path
= strstr(path
, "//");
1090 path
= strchr(path
+2, '/');
1094 const char *url
= repo
->url
;
1097 if (strncmp(path
, url
, repo
->path_len
))
1098 error("Parsed path '%s' does not match url: '%s'",
1101 path
+= repo
->path_len
;
1102 ls
->dentry_name
= xstrdup(path
);
1105 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_COLLECTION
)) {
1106 ls
->dentry_flags
|= IS_DIR
;
1108 } else if (!strcmp(ctx
->name
, DAV_PROPFIND_RESP
)) {
1109 FREE_AND_NULL(ls
->dentry_name
);
1110 ls
->dentry_flags
= 0;
1115 * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it
1116 * should _only_ heed the information from that file, instead of trying to
1117 * determine the refs from the remote file system (badly: it does not even
1118 * know about packed-refs).
1120 static void remote_ls(const char *path
, int flags
,
1121 void (*userFunc
)(struct remote_ls_ctx
*ls
),
1124 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1125 struct active_request_slot
*slot
;
1126 struct slot_results results
;
1127 struct strbuf in_buffer
= STRBUF_INIT
;
1128 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1129 struct curl_slist
*dav_headers
= http_copy_default_headers();
1131 struct remote_ls_ctx ls
;
1134 ls
.path
= xstrdup(path
);
1135 ls
.dentry_name
= NULL
;
1136 ls
.dentry_flags
= 0;
1137 ls
.userData
= userData
;
1138 ls
.userFunc
= userFunc
;
1140 strbuf_addstr(&out_buffer
.buf
, PROPFIND_ALL_REQUEST
);
1142 dav_headers
= curl_slist_append(dav_headers
, "Depth: 1");
1143 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1145 slot
= get_active_slot();
1146 slot
->results
= &results
;
1147 curl_setup_http(slot
->curl
, url
, DAV_PROPFIND
,
1148 &out_buffer
, fwrite_buffer
);
1149 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1150 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEDATA
, &in_buffer
);
1152 if (start_active_slot(slot
)) {
1153 run_active_slot(slot
);
1154 if (results
.curl_result
== CURLE_OK
) {
1155 XML_Parser parser
= XML_ParserCreate(NULL
);
1156 enum XML_Status result
;
1157 ctx
.name
= xcalloc(10, 1);
1160 ctx
.userFunc
= handle_remote_ls_ctx
;
1162 XML_SetUserData(parser
, &ctx
);
1163 XML_SetElementHandler(parser
, xml_start_tag
,
1165 XML_SetCharacterDataHandler(parser
, xml_cdata
);
1166 result
= XML_Parse(parser
, in_buffer
.buf
,
1170 if (result
!= XML_STATUS_OK
) {
1171 fprintf(stderr
, "XML error: %s\n",
1173 XML_GetErrorCode(parser
)));
1175 XML_ParserFree(parser
);
1178 fprintf(stderr
, "Unable to start PROPFIND request\n");
1183 strbuf_release(&out_buffer
.buf
);
1184 strbuf_release(&in_buffer
);
1185 curl_slist_free_all(dav_headers
);
1188 static void get_remote_object_list(unsigned char parent
)
1190 char path
[] = "objects/XX/";
1191 static const char hex
[] = "0123456789abcdef";
1192 unsigned int val
= parent
;
1194 path
[8] = hex
[val
>> 4];
1195 path
[9] = hex
[val
& 0xf];
1196 remote_dir_exists
[val
] = 0;
1197 remote_ls(path
, (PROCESS_FILES
| PROCESS_DIRS
),
1198 process_ls_object
, &val
);
1201 static int locking_available(void)
1203 struct active_request_slot
*slot
;
1204 struct slot_results results
;
1205 struct strbuf in_buffer
= STRBUF_INIT
;
1206 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1207 struct curl_slist
*dav_headers
= http_copy_default_headers();
1212 escaped
= xml_entities(repo
->url
);
1213 strbuf_addf(&out_buffer
.buf
, PROPFIND_SUPPORTEDLOCK_REQUEST
, escaped
);
1216 dav_headers
= curl_slist_append(dav_headers
, "Depth: 0");
1217 dav_headers
= curl_slist_append(dav_headers
, "Content-Type: text/xml");
1219 slot
= get_active_slot();
1220 slot
->results
= &results
;
1221 curl_setup_http(slot
->curl
, repo
->url
, DAV_PROPFIND
,
1222 &out_buffer
, fwrite_buffer
);
1223 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1224 curl_easy_setopt(slot
->curl
, CURLOPT_WRITEDATA
, &in_buffer
);
1226 if (start_active_slot(slot
)) {
1227 run_active_slot(slot
);
1228 if (results
.curl_result
== CURLE_OK
) {
1229 XML_Parser parser
= XML_ParserCreate(NULL
);
1230 enum XML_Status result
;
1231 ctx
.name
= xcalloc(10, 1);
1234 ctx
.userFunc
= handle_lockprop_ctx
;
1235 ctx
.userData
= &lock_flags
;
1236 XML_SetUserData(parser
, &ctx
);
1237 XML_SetElementHandler(parser
, xml_start_tag
,
1239 result
= XML_Parse(parser
, in_buffer
.buf
,
1243 if (result
!= XML_STATUS_OK
) {
1244 fprintf(stderr
, "XML error: %s\n",
1246 XML_GetErrorCode(parser
)));
1249 XML_ParserFree(parser
);
1251 error("no DAV locking support on %s",
1255 error("Cannot access URL %s, return code %d",
1256 repo
->url
, results
.curl_result
);
1260 error("Unable to start PROPFIND request on %s", repo
->url
);
1263 strbuf_release(&out_buffer
.buf
);
1264 strbuf_release(&in_buffer
);
1265 curl_slist_free_all(dav_headers
);
1270 static struct object_list
**add_one_object(struct object
*obj
, struct object_list
**p
)
1272 struct object_list
*entry
= xmalloc(sizeof(struct object_list
));
1276 return &entry
->next
;
1279 static struct object_list
**process_blob(struct blob
*blob
,
1280 struct object_list
**p
)
1282 struct object
*obj
= &blob
->object
;
1284 obj
->flags
|= LOCAL
;
1286 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1290 return add_one_object(obj
, p
);
1293 static struct object_list
**process_tree(struct tree
*tree
,
1294 struct object_list
**p
)
1296 struct object
*obj
= &tree
->object
;
1297 struct tree_desc desc
;
1298 struct name_entry entry
;
1300 obj
->flags
|= LOCAL
;
1302 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1304 if (parse_tree(tree
) < 0)
1305 die("bad tree object %s", oid_to_hex(&obj
->oid
));
1308 p
= add_one_object(obj
, p
);
1310 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
1312 while (tree_entry(&desc
, &entry
))
1313 switch (object_type(entry
.mode
)) {
1315 p
= process_tree(lookup_tree(the_repository
, &entry
.oid
),
1319 p
= process_blob(lookup_blob(the_repository
, &entry
.oid
),
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(repo_get_commit_tree(the_repository
, commit
),
1341 commit
->object
.flags
|= LOCAL
;
1342 if (!(commit
->object
.flags
& UNINTERESTING
))
1343 count
+= add_send_request(&commit
->object
, lock
);
1346 for (i
= 0; i
< revs
->pending
.nr
; i
++) {
1347 struct object_array_entry
*entry
= revs
->pending
.objects
+ i
;
1348 struct object
*obj
= entry
->item
;
1349 const char *name
= entry
->name
;
1351 if (obj
->flags
& (UNINTERESTING
| SEEN
))
1353 if (obj
->type
== OBJ_TAG
) {
1355 p
= add_one_object(obj
, p
);
1358 if (obj
->type
== OBJ_TREE
) {
1359 p
= process_tree((struct tree
*)obj
, p
);
1362 if (obj
->type
== OBJ_BLOB
) {
1363 p
= process_blob((struct blob
*)obj
, p
);
1366 die("unknown pending object %s (%s)", oid_to_hex(&obj
->oid
), name
);
1370 if (!(objects
->item
->flags
& UNINTERESTING
))
1371 count
+= add_send_request(objects
->item
, lock
);
1372 objects
= objects
->next
;
1378 static int update_remote(const struct object_id
*oid
, struct remote_lock
*lock
)
1380 struct active_request_slot
*slot
;
1381 struct slot_results results
;
1382 struct buffer out_buffer
= { STRBUF_INIT
, 0 };
1383 struct curl_slist
*dav_headers
;
1385 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1387 strbuf_addf(&out_buffer
.buf
, "%s\n", oid_to_hex(oid
));
1389 slot
= get_active_slot();
1390 slot
->results
= &results
;
1391 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1392 &out_buffer
, fwrite_null
);
1393 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1395 if (start_active_slot(slot
)) {
1396 run_active_slot(slot
);
1397 strbuf_release(&out_buffer
.buf
);
1398 if (results
.curl_result
!= CURLE_OK
) {
1400 "PUT error: curl result=%d, HTTP code=%ld\n",
1401 results
.curl_result
, results
.http_code
);
1402 /* We should attempt recovery? */
1406 strbuf_release(&out_buffer
.buf
);
1407 fprintf(stderr
, "Unable to start PUT request\n");
1414 static struct ref
*remote_refs
;
1416 static void one_remote_ref(const char *refname
)
1421 ref
= alloc_ref(refname
);
1423 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1425 "Unable to fetch ref %s from %s\n",
1426 refname
, repo
->url
);
1432 * Fetch a copy of the object if it doesn't exist locally - it
1433 * may be required for updating server info later.
1435 if (repo
->can_update_info_refs
&& !repo_has_object_file(the_repository
, &ref
->old_oid
)) {
1436 obj
= lookup_unknown_object(the_repository
, &ref
->old_oid
);
1437 fprintf(stderr
, " fetch %s for %s\n",
1438 oid_to_hex(&ref
->old_oid
), refname
);
1439 add_fetch_request(obj
);
1442 ref
->next
= remote_refs
;
1446 static void get_dav_remote_heads(void)
1448 remote_ls("refs/", (PROCESS_FILES
| PROCESS_DIRS
| RECURSIVE
), process_ls_ref
, NULL
);
1451 static void add_remote_info_ref(struct remote_ls_ctx
*ls
)
1453 struct strbuf
*buf
= (struct strbuf
*)ls
->userData
;
1457 ref
= alloc_ref(ls
->dentry_name
);
1459 if (http_fetch_ref(repo
->url
, ref
) != 0) {
1461 "Unable to fetch ref %s from %s\n",
1462 ls
->dentry_name
, repo
->url
);
1468 o
= parse_object(the_repository
, &ref
->old_oid
);
1471 "Unable to parse object %s for remote ref %s\n",
1472 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1478 strbuf_addf(buf
, "%s\t%s\n",
1479 oid_to_hex(&ref
->old_oid
), ls
->dentry_name
);
1481 if (o
->type
== OBJ_TAG
) {
1482 o
= deref_tag(the_repository
, o
, ls
->dentry_name
, 0);
1484 strbuf_addf(buf
, "%s\t%s^{}\n",
1485 oid_to_hex(&o
->oid
), ls
->dentry_name
);
1490 static void update_remote_info_refs(struct remote_lock
*lock
)
1492 struct buffer buffer
= { STRBUF_INIT
, 0 };
1493 struct active_request_slot
*slot
;
1494 struct slot_results results
;
1495 struct curl_slist
*dav_headers
;
1497 remote_ls("refs/", (PROCESS_FILES
| RECURSIVE
),
1498 add_remote_info_ref
, &buffer
.buf
);
1500 dav_headers
= get_dav_token_headers(lock
, DAV_HEADER_IF
);
1502 slot
= get_active_slot();
1503 slot
->results
= &results
;
1504 curl_setup_http(slot
->curl
, lock
->url
, DAV_PUT
,
1505 &buffer
, fwrite_null
);
1506 curl_easy_setopt(slot
->curl
, CURLOPT_HTTPHEADER
, dav_headers
);
1508 if (start_active_slot(slot
)) {
1509 run_active_slot(slot
);
1510 if (results
.curl_result
!= CURLE_OK
) {
1512 "PUT error: curl result=%d, HTTP code=%ld\n",
1513 results
.curl_result
, results
.http_code
);
1517 strbuf_release(&buffer
.buf
);
1520 static int remote_exists(const char *path
)
1522 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1526 switch (http_get_strbuf(url
, NULL
, NULL
)) {
1530 case HTTP_MISSING_TARGET
:
1534 error("unable to access '%s': %s", url
, curl_errorstr
);
1543 static void fetch_symref(const char *path
, char **symref
, struct object_id
*oid
)
1545 char *url
= xstrfmt("%s%s", repo
->url
, path
);
1546 struct strbuf buffer
= STRBUF_INIT
;
1549 if (http_get_strbuf(url
, &buffer
, NULL
) != HTTP_OK
)
1550 die("Couldn't get %s for remote symref\n%s", url
,
1554 FREE_AND_NULL(*symref
);
1557 if (buffer
.len
== 0)
1560 /* Cut off trailing newline. */
1561 strbuf_rtrim(&buffer
);
1563 /* If it's a symref, set the refname; otherwise try for a sha1 */
1564 if (skip_prefix(buffer
.buf
, "ref: ", &name
)) {
1565 *symref
= xmemdupz(name
, buffer
.len
- (name
- buffer
.buf
));
1567 get_oid_hex(buffer
.buf
, oid
);
1570 strbuf_release(&buffer
);
1573 static int verify_merge_base(struct object_id
*head_oid
, struct ref
*remote
)
1575 struct commit
*head
= lookup_commit_or_die(head_oid
, "HEAD");
1576 struct commit
*branch
= lookup_commit_or_die(&remote
->old_oid
,
1579 return repo_in_merge_bases(the_repository
, branch
, head
);
1582 static int delete_remote_branch(const char *pattern
, int force
)
1584 struct ref
*refs
= remote_refs
;
1585 struct ref
*remote_ref
= NULL
;
1586 struct object_id head_oid
;
1587 char *symref
= NULL
;
1589 int patlen
= strlen(pattern
);
1591 struct active_request_slot
*slot
;
1592 struct slot_results results
;
1595 /* Find the remote branch(es) matching the specified branch name */
1596 for (match
= 0; refs
; refs
= refs
->next
) {
1597 char *name
= refs
->name
;
1598 int namelen
= strlen(name
);
1599 if (namelen
< patlen
||
1600 memcmp(name
+ namelen
- patlen
, pattern
, patlen
))
1602 if (namelen
!= patlen
&& name
[namelen
- patlen
- 1] != '/')
1608 return error("No remote branch matches %s", pattern
);
1610 return error("More than one remote branch matches %s",
1614 * Remote HEAD must be a symref (not exactly foolproof; a remote
1615 * symlink to a symref will look like a symref)
1617 fetch_symref("HEAD", &symref
, &head_oid
);
1619 return error("Remote HEAD is not a symref");
1621 /* Remote branch must not be the remote HEAD */
1622 for (i
= 0; symref
&& i
< MAXDEPTH
; i
++) {
1623 if (!strcmp(remote_ref
->name
, symref
))
1624 return error("Remote branch %s is the current HEAD",
1626 fetch_symref(symref
, &symref
, &head_oid
);
1629 /* Run extra sanity checks if delete is not forced */
1631 /* Remote HEAD must resolve to a known object */
1633 return error("Remote HEAD symrefs too deep");
1634 if (is_null_oid(&head_oid
))
1635 return error("Unable to resolve remote HEAD");
1636 if (!repo_has_object_file(the_repository
, &head_oid
))
1637 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid
));
1639 /* Remote branch must resolve to a known object */
1640 if (is_null_oid(&remote_ref
->old_oid
))
1641 return error("Unable to resolve remote branch %s",
1643 if (!repo_has_object_file(the_repository
, &remote_ref
->old_oid
))
1644 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
));
1646 /* Remote branch must be an ancestor of remote HEAD */
1647 if (!verify_merge_base(&head_oid
, remote_ref
)) {
1648 return error("The branch '%s' is not an ancestor "
1649 "of your current HEAD.\n"
1650 "If you are sure you want to delete it,"
1651 " run:\n\t'git http-push -D %s %s'",
1652 remote_ref
->name
, repo
->url
, pattern
);
1656 /* Send delete request */
1657 fprintf(stderr
, "Removing remote branch '%s'\n", remote_ref
->name
);
1660 url
= xstrfmt("%s%s", repo
->url
, remote_ref
->name
);
1661 slot
= get_active_slot();
1662 slot
->results
= &results
;
1663 curl_setup_http_get(slot
->curl
, url
, DAV_DELETE
);
1664 if (start_active_slot(slot
)) {
1665 run_active_slot(slot
);
1667 if (results
.curl_result
!= CURLE_OK
)
1668 return error("DELETE request failed (%d/%ld)",
1669 results
.curl_result
, results
.http_code
);
1672 return error("Unable to start DELETE request");
1678 static void run_request_queue(void)
1680 is_running_queue
= 1;
1681 fill_active_slots();
1682 add_fill_function(NULL
, fill_active_slot
);
1684 finish_all_active_slots();
1685 fill_active_slots();
1686 } while (request_queue_head
&& !aborted
);
1688 is_running_queue
= 0;
1691 int cmd_main(int argc
, const char **argv
)
1693 struct transfer_request
*request
;
1694 struct transfer_request
*next_request
;
1695 struct refspec rs
= REFSPEC_INIT_PUSH
;
1696 struct remote_lock
*ref_lock
= NULL
;
1697 struct remote_lock
*info_ref_lock
= NULL
;
1698 int delete_branch
= 0;
1699 int force_delete
= 0;
1700 int objects_to_send
;
1704 struct ref
*ref
, *local_refs
;
1706 CALLOC_ARRAY(repo
, 1);
1709 for (i
= 1; i
< argc
; i
++, argv
++) {
1710 const char *arg
= *argv
;
1713 if (!strcmp(arg
, "--all")) {
1714 push_all
= MATCH_REFS_ALL
;
1717 if (!strcmp(arg
, "--force")) {
1721 if (!strcmp(arg
, "--dry-run")) {
1725 if (!strcmp(arg
, "--helper-status")) {
1729 if (!strcmp(arg
, "--verbose")) {
1731 http_is_verbose
= 1;
1734 if (!strcmp(arg
, "-d")) {
1738 if (!strcmp(arg
, "-D")) {
1743 if (!strcmp(arg
, "-h"))
1744 usage(http_push_usage
);
1747 char *path
= strstr(arg
, "//");
1748 str_end_url_with_slash(arg
, &repo
->url
);
1749 repo
->path_len
= strlen(repo
->url
);
1751 repo
->path
= strchr(path
+2, '/');
1753 repo
->path_len
= strlen(repo
->path
);
1757 refspec_appendn(&rs
, argv
, argc
- i
);
1762 usage(http_push_usage
);
1764 if (delete_branch
&& rs
.nr
!= 1)
1765 die("You must specify only one branch name when deleting a remote branch");
1767 setup_git_directory();
1769 memset(remote_dir_exists
, -1, 256);
1771 http_init(NULL
, repo
->url
, 1);
1773 is_running_queue
= 0;
1775 /* Verify DAV compliance/lock support */
1776 if (!locking_available()) {
1781 sigchain_push_common(remove_locks_on_signal
);
1783 /* Check whether the remote has server info files */
1784 repo
->can_update_info_refs
= 0;
1785 repo
->has_info_refs
= remote_exists("info/refs");
1786 repo
->has_info_packs
= remote_exists("objects/info/packs");
1787 if (repo
->has_info_refs
) {
1788 info_ref_lock
= lock_remote("info/refs", LOCK_TIME
);
1790 repo
->can_update_info_refs
= 1;
1792 error("cannot lock existing info/refs");
1797 if (repo
->has_info_packs
)
1800 /* Get a list of all local and remote heads to validate refspecs */
1801 local_refs
= get_local_heads();
1802 fprintf(stderr
, "Fetching remote heads...\n");
1803 get_dav_remote_heads();
1804 run_request_queue();
1806 /* Remove a remote branch if -d or -D was specified */
1807 if (delete_branch
) {
1808 const char *branch
= rs
.items
[i
].src
;
1809 if (delete_remote_branch(branch
, force_delete
) == -1) {
1810 fprintf(stderr
, "Unable to delete remote branch %s\n",
1813 printf("error %s cannot remove\n", branch
);
1819 if (match_push_refs(local_refs
, &remote_refs
, &rs
, push_all
)) {
1824 fprintf(stderr
, "No refs in common and none specified; doing nothing.\n");
1826 printf("error null no match\n");
1832 for (ref
= remote_refs
; ref
; ref
= ref
->next
) {
1833 struct rev_info revs
;
1834 struct strvec commit_argv
= STRVEC_INIT
;
1839 if (is_null_oid(&ref
->peer_ref
->new_oid
)) {
1840 if (delete_remote_branch(ref
->name
, 1) == -1) {
1841 error("Could not remove %s", ref
->name
);
1843 printf("error %s cannot remove\n", ref
->name
);
1846 else if (helper_status
)
1847 printf("ok %s\n", ref
->name
);
1852 if (oideq(&ref
->old_oid
, &ref
->peer_ref
->new_oid
)) {
1854 /* stable plumbing output; do not modify or localize */
1855 fprintf(stderr
, "'%s': up-to-date\n", ref
->name
);
1857 printf("ok %s up to date\n", ref
->name
);
1862 !is_null_oid(&ref
->old_oid
) &&
1864 if (!repo_has_object_file(the_repository
, &ref
->old_oid
) ||
1865 !ref_newer(&ref
->peer_ref
->new_oid
,
1868 * We do not have the remote ref, or
1869 * we know that the remote ref is not
1870 * an ancestor of what we are trying to
1871 * push. Either way this can be losing
1872 * commits at the remote end and likely
1873 * we were not up to date to begin with.
1875 /* stable plumbing output; do not modify or localize */
1876 error("remote '%s' is not an ancestor of\n"
1878 "Maybe you are not up-to-date and "
1879 "need to pull first?",
1881 ref
->peer_ref
->name
);
1883 printf("error %s non-fast forward\n", ref
->name
);
1888 oidcpy(&ref
->new_oid
, &ref
->peer_ref
->new_oid
);
1891 fprintf(stderr
, "updating '%s'", ref
->name
);
1892 if (strcmp(ref
->name
, ref
->peer_ref
->name
))
1893 fprintf(stderr
, " using '%s'", ref
->peer_ref
->name
);
1894 fprintf(stderr
, "\n from %s\n to %s\n",
1895 oid_to_hex(&ref
->old_oid
), oid_to_hex(&ref
->new_oid
));
1898 printf("ok %s\n", ref
->name
);
1902 /* Lock remote branch ref */
1903 ref_lock
= lock_remote(ref
->name
, LOCK_TIME
);
1905 fprintf(stderr
, "Unable to lock remote branch %s\n",
1908 printf("error %s lock error\n", ref
->name
);
1913 /* Set up revision info for this refspec */
1914 strvec_push(&commit_argv
, ""); /* ignored */
1915 strvec_push(&commit_argv
, "--objects");
1916 strvec_push(&commit_argv
, oid_to_hex(&ref
->new_oid
));
1917 if (!push_all
&& !is_null_oid(&ref
->old_oid
))
1918 strvec_pushf(&commit_argv
, "^%s",
1919 oid_to_hex(&ref
->old_oid
));
1920 repo_init_revisions(the_repository
, &revs
, setup_git_directory());
1921 setup_revisions(commit_argv
.nr
, commit_argv
.v
, &revs
, NULL
);
1922 revs
.edge_hint
= 0; /* just in case */
1924 /* Generate a list of objects that need to be pushed */
1926 if (prepare_revision_walk(&revs
))
1927 die("revision walk setup failed");
1928 mark_edges_uninteresting(&revs
, NULL
, 0);
1929 objects_to_send
= get_delta(&revs
, ref_lock
);
1930 finish_all_active_slots();
1932 /* Push missing objects to remote, this would be a
1933 convenient time to pack them first if appropriate. */
1935 if (objects_to_send
)
1936 fprintf(stderr
, " sending %d objects\n",
1939 run_request_queue();
1941 /* Update the remote branch if all went well */
1942 if (aborted
|| !update_remote(&ref
->new_oid
, ref_lock
))
1946 fprintf(stderr
, " done\n");
1948 printf("%s %s\n", !rc
? "ok" : "error", ref
->name
);
1949 unlock_remote(ref_lock
);
1951 strvec_clear(&commit_argv
);
1952 release_revisions(&revs
);
1955 /* Update remote server info if appropriate */
1956 if (repo
->has_info_refs
&& new_refs
) {
1957 if (info_ref_lock
&& repo
->can_update_info_refs
) {
1958 fprintf(stderr
, "Updating remote server info\n");
1960 update_remote_info_refs(info_ref_lock
);
1962 fprintf(stderr
, "Unable to update server info\n");
1968 unlock_remote(info_ref_lock
);
1973 request
= request_queue_head
;
1974 while (request
!= NULL
) {
1975 next_request
= request
->next
;
1976 release_request(request
);
1977 request
= next_request
;