11 #include "list-objects.h"
14 #ifdef EXPAT_NEEDS_XMLPARSE_H
20 static const char http_push_usage[] =
21 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
28 #define XML_STATUS_OK 1
29 #define XML_STATUS_ERROR 0
32 #define PREV_BUF_SIZE 4096
35 #define DAV_LOCK "LOCK"
36 #define DAV_MKCOL "MKCOL"
37 #define DAV_MOVE "MOVE"
38 #define DAV_PROPFIND "PROPFIND"
40 #define DAV_UNLOCK "UNLOCK"
41 #define DAV_DELETE "DELETE"
44 #define DAV_PROP_LOCKWR (1u << 0)
45 #define DAV_PROP_LOCKEX (1u << 1)
46 #define DAV_LOCK_OK (1u << 2)
48 /* DAV XML properties */
49 #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry"
50 #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write"
51 #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive"
52 #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href"
53 #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout"
54 #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href"
55 #define DAV_PROPFIND_RESP ".multistatus.response"
56 #define DAV_PROPFIND_NAME ".multistatus.response.href"
57 #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection"
59 /* DAV request body templates */
60 #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>"
61 #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>"
62 #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>"
65 #define LOCK_REFRESH 30
67 /* Remember to update object flag allocation in object.h */
68 #define LOCAL (1u<<16)
69 #define REMOTE (1u<<17)
70 #define FETCHING (1u<<18)
71 #define PUSHING (1u<<19)
73 /* We allow "recursive" symbolic refs. Only within reason, though */
78 static signed char remote_dir_exists[256];
80 static int push_verbosely;
81 static int push_all = MATCH_REFS_NONE;
84 static int helper_status;
86 static struct object_list *objects;
93 int can_update_info_refs;
95 struct packed_git *packs;
96 struct remote_lock *locks;
99 static struct repo *repo;
101 enum transfer_state {
113 struct transfer_request {
117 struct remote_lock *lock;
118 struct curl_slist *headers;
119 struct buffer buffer;
120 enum transfer_state state;
121 CURLcode curl_result;
122 char errorstr[CURL_ERROR_SIZE];
125 struct active_request_slot *slot;
126 struct transfer_request *next;
129 static struct transfer_request *request_queue_head;
135 void (*userFunc)(struct xml_ctx *ctx, int tag_closed);
143 char tmpfile_suffix[41];
147 struct remote_lock *next;
150 /* Flags that control remote_ls processing */
151 #define PROCESS_FILES (1u << 0)
152 #define PROCESS_DIRS (1u << 1)
153 #define RECURSIVE (1u << 2)
155 /* Flags that remote_ls passes to callback functions */
156 #define IS_DIR (1u << 0)
158 struct remote_ls_ctx {
160 void (*userFunc)(struct remote_ls_ctx *ls);
165 struct remote_ls_ctx *parent;
168 /* get_dav_token_headers options */
169 enum dav_header_flag {
170 DAV_HEADER_IF = (1u << 0),
171 DAV_HEADER_LOCK = (1u << 1),
172 DAV_HEADER_TIMEOUT = (1u << 2)
175 static char *xml_entities(const char *s)
177 struct strbuf buf = STRBUF_INIT;
178 strbuf_addstr_xml_quoted(&buf, s);
179 return strbuf_detach(&buf, NULL);
182 static void curl_setup_http_get(CURL *curl, const char *url,
183 const char *custom_req)
185 curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
186 curl_easy_setopt(curl, CURLOPT_URL, url);
187 curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
188 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_null);
191 static void curl_setup_http(CURL *curl, const char *url,
192 const char *custom_req, struct buffer *buffer,
193 curl_write_callback write_fn)
195 curl_easy_setopt(curl, CURLOPT_PUT, 1);
196 curl_easy_setopt(curl, CURLOPT_URL, url);
197 curl_easy_setopt(curl, CURLOPT_INFILE, buffer);
198 curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len);
199 curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
200 #ifndef NO_CURL_IOCTL
201 curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
202 curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
204 curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
205 curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
206 curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req);
207 curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
210 static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options)
212 struct strbuf buf = STRBUF_INIT;
213 struct curl_slist *dav_headers = NULL;
215 if (options & DAV_HEADER_IF) {
216 strbuf_addf(&buf, "If: (<%s>)", lock->token);
217 dav_headers = curl_slist_append(dav_headers, buf.buf);
220 if (options & DAV_HEADER_LOCK) {
221 strbuf_addf(&buf, "Lock-Token: <%s>", lock->token);
222 dav_headers = curl_slist_append(dav_headers, buf.buf);
225 if (options & DAV_HEADER_TIMEOUT) {
226 strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout);
227 dav_headers = curl_slist_append(dav_headers, buf.buf);
230 strbuf_release(&buf);
235 static void finish_request(struct transfer_request *request);
236 static void release_request(struct transfer_request *request);
238 static void process_response(void *callback_data)
240 struct transfer_request *request =
241 (struct transfer_request *)callback_data;
243 finish_request(request);
246 #ifdef USE_CURL_MULTI
248 static void start_fetch_loose(struct transfer_request *request)
250 struct active_request_slot *slot;
251 struct http_object_request *obj_req;
253 obj_req = new_http_object_request(repo->url, request->obj->sha1);
254 if (obj_req == NULL) {
255 request->state = ABORTED;
259 slot = obj_req->slot;
260 slot->callback_func = process_response;
261 slot->callback_data = request;
262 request->slot = slot;
263 request->userData = obj_req;
265 /* Try to get the request started, abort the request on error */
266 request->state = RUN_FETCH_LOOSE;
267 if (!start_active_slot(slot)) {
268 fprintf(stderr, "Unable to start GET request\n");
269 repo->can_update_info_refs = 0;
270 release_http_object_request(obj_req);
271 release_request(request);
275 static void start_mkcol(struct transfer_request *request)
277 char *hex = sha1_to_hex(request->obj->sha1);
278 struct active_request_slot *slot;
280 request->url = get_remote_object_url(repo->url, hex, 1);
282 slot = get_active_slot();
283 slot->callback_func = process_response;
284 slot->callback_data = request;
285 curl_setup_http_get(slot->curl, request->url, DAV_MKCOL);
286 curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr);
288 if (start_active_slot(slot)) {
289 request->slot = slot;
290 request->state = RUN_MKCOL;
292 request->state = ABORTED;
299 static void start_fetch_packed(struct transfer_request *request)
301 struct packed_git *target;
303 struct transfer_request *check_request = request_queue_head;
304 struct http_pack_request *preq;
306 target = find_sha1_pack(request->obj->sha1, repo->packs);
308 fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1));
309 repo->can_update_info_refs = 0;
310 release_request(request);
314 fprintf(stderr, "Fetching pack %s\n", sha1_to_hex(target->sha1));
315 fprintf(stderr, " which contains %s\n", sha1_to_hex(request->obj->sha1));
317 preq = new_http_pack_request(target, repo->url);
319 repo->can_update_info_refs = 0;
322 preq->lst = &repo->packs;
324 /* Make sure there isn't another open request for this pack */
325 while (check_request) {
326 if (check_request->state == RUN_FETCH_PACKED &&
327 !strcmp(check_request->url, preq->url)) {
328 release_http_pack_request(preq);
329 release_request(request);
332 check_request = check_request->next;
335 preq->slot->callback_func = process_response;
336 preq->slot->callback_data = request;
337 request->slot = preq->slot;
338 request->userData = preq;
340 /* Try to get the request started, abort the request on error */
341 request->state = RUN_FETCH_PACKED;
342 if (!start_active_slot(preq->slot)) {
343 fprintf(stderr, "Unable to start GET request\n");
344 release_http_pack_request(preq);
345 repo->can_update_info_refs = 0;
346 release_request(request);
350 static void start_put(struct transfer_request *request)
352 char *hex = sha1_to_hex(request->obj->sha1);
353 struct active_request_slot *slot;
354 struct strbuf buf = STRBUF_INIT;
355 enum object_type type;
363 unpacked = read_sha1_file(request->obj->sha1, &type, &len);
364 hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
367 git_deflate_init(&stream, zlib_compression_level);
368 size = git_deflate_bound(&stream, len + hdrlen);
369 strbuf_init(&request->buffer.buf, size);
370 request->buffer.posn = 0;
373 stream.next_out = (unsigned char *)request->buffer.buf.buf;
374 stream.avail_out = size;
377 stream.next_in = (void *)hdr;
378 stream.avail_in = hdrlen;
379 while (git_deflate(&stream, 0) == Z_OK)
382 /* Then the data itself.. */
383 stream.next_in = unpacked;
384 stream.avail_in = len;
385 while (git_deflate(&stream, Z_FINISH) == Z_OK)
387 git_deflate_end(&stream);
390 request->buffer.buf.len = stream.total_out;
392 strbuf_addstr(&buf, "Destination: ");
393 append_remote_object_url(&buf, repo->url, hex, 0);
394 request->dest = strbuf_detach(&buf, NULL);
396 append_remote_object_url(&buf, repo->url, hex, 0);
397 strbuf_add(&buf, request->lock->tmpfile_suffix, 41);
398 request->url = strbuf_detach(&buf, NULL);
400 slot = get_active_slot();
401 slot->callback_func = process_response;
402 slot->callback_data = request;
403 curl_setup_http(slot->curl, request->url, DAV_PUT,
404 &request->buffer, fwrite_null);
406 if (start_active_slot(slot)) {
407 request->slot = slot;
408 request->state = RUN_PUT;
410 request->state = ABORTED;
416 static void start_move(struct transfer_request *request)
418 struct active_request_slot *slot;
419 struct curl_slist *dav_headers = NULL;
421 slot = get_active_slot();
422 slot->callback_func = process_response;
423 slot->callback_data = request;
424 curl_setup_http_get(slot->curl, request->url, DAV_MOVE);
425 dav_headers = curl_slist_append(dav_headers, request->dest);
426 dav_headers = curl_slist_append(dav_headers, "Overwrite: T");
427 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
429 if (start_active_slot(slot)) {
430 request->slot = slot;
431 request->state = RUN_MOVE;
433 request->state = ABORTED;
439 static int refresh_lock(struct remote_lock *lock)
441 struct active_request_slot *slot;
442 struct slot_results results;
443 struct curl_slist *dav_headers;
446 lock->refreshing = 1;
448 dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT);
450 slot = get_active_slot();
451 slot->results = &results;
452 curl_setup_http_get(slot->curl, lock->url, DAV_LOCK);
453 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
455 if (start_active_slot(slot)) {
456 run_active_slot(slot);
457 if (results.curl_result != CURLE_OK) {
458 fprintf(stderr, "LOCK HTTP error %ld\n",
461 lock->start_time = time(NULL);
466 lock->refreshing = 0;
467 curl_slist_free_all(dav_headers);
472 static void check_locks(void)
474 struct remote_lock *lock = repo->locks;
475 time_t current_time = time(NULL);
479 time_remaining = lock->start_time + lock->timeout -
481 if (!lock->refreshing && time_remaining < LOCK_REFRESH) {
482 if (!refresh_lock(lock)) {
484 "Unable to refresh lock for %s\n",
494 static void release_request(struct transfer_request *request)
496 struct transfer_request *entry = request_queue_head;
498 if (request == request_queue_head) {
499 request_queue_head = request->next;
501 while (entry->next != NULL && entry->next != request)
503 if (entry->next == request)
504 entry->next = entry->next->next;
511 static void finish_request(struct transfer_request *request)
513 struct http_pack_request *preq;
514 struct http_object_request *obj_req;
516 request->curl_result = request->slot->curl_result;
517 request->http_code = request->slot->http_code;
518 request->slot = NULL;
520 /* Keep locks active */
523 if (request->headers != NULL)
524 curl_slist_free_all(request->headers);
526 /* URL is reused for MOVE after PUT */
527 if (request->state != RUN_PUT) {
532 if (request->state == RUN_MKCOL) {
533 if (request->curl_result == CURLE_OK ||
534 request->http_code == 405) {
535 remote_dir_exists[request->obj->sha1[0]] = 1;
538 fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n",
539 sha1_to_hex(request->obj->sha1),
540 request->curl_result, request->http_code);
541 request->state = ABORTED;
544 } else if (request->state == RUN_PUT) {
545 if (request->curl_result == CURLE_OK) {
548 fprintf(stderr, "PUT %s failed, aborting (%d/%ld)\n",
549 sha1_to_hex(request->obj->sha1),
550 request->curl_result, request->http_code);
551 request->state = ABORTED;
554 } else if (request->state == RUN_MOVE) {
555 if (request->curl_result == CURLE_OK) {
557 fprintf(stderr, " sent %s\n",
558 sha1_to_hex(request->obj->sha1));
559 request->obj->flags |= REMOTE;
560 release_request(request);
562 fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n",
563 sha1_to_hex(request->obj->sha1),
564 request->curl_result, request->http_code);
565 request->state = ABORTED;
568 } else if (request->state == RUN_FETCH_LOOSE) {
569 obj_req = (struct http_object_request *)request->userData;
571 if (finish_http_object_request(obj_req) == 0)
572 if (obj_req->rename == 0)
573 request->obj->flags |= (LOCAL | REMOTE);
575 /* Try fetching packed if necessary */
576 if (request->obj->flags & LOCAL) {
577 release_http_object_request(obj_req);
578 release_request(request);
580 start_fetch_packed(request);
582 } else if (request->state == RUN_FETCH_PACKED) {
584 if (request->curl_result != CURLE_OK) {
585 fprintf(stderr, "Unable to get pack file %s\n%s",
586 request->url, curl_errorstr);
588 preq = (struct http_pack_request *)request->userData;
591 if (finish_http_pack_request(preq) == 0)
593 release_http_pack_request(preq);
597 repo->can_update_info_refs = 0;
598 release_request(request);
602 #ifdef USE_CURL_MULTI
603 static int is_running_queue;
604 static int fill_active_slot(void *unused)
606 struct transfer_request *request;
608 if (aborted || !is_running_queue)
611 for (request = request_queue_head; request; request = request->next) {
612 if (request->state == NEED_FETCH) {
613 start_fetch_loose(request);
615 } else if (pushing && request->state == NEED_PUSH) {
616 if (remote_dir_exists[request->obj->sha1[0]] == 1) {
619 start_mkcol(request);
628 static void get_remote_object_list(unsigned char parent);
630 static void add_fetch_request(struct object *obj)
632 struct transfer_request *request;
637 * Don't fetch the object if it's known to exist locally
638 * or is already in the request queue
640 if (remote_dir_exists[obj->sha1[0]] == -1)
641 get_remote_object_list(obj->sha1[0]);
642 if (obj->flags & (LOCAL | FETCHING))
645 obj->flags |= FETCHING;
646 request = xmalloc(sizeof(*request));
649 request->lock = NULL;
650 request->headers = NULL;
651 request->state = NEED_FETCH;
652 request->next = request_queue_head;
653 request_queue_head = request;
655 #ifdef USE_CURL_MULTI
661 static int add_send_request(struct object *obj, struct remote_lock *lock)
663 struct transfer_request *request;
664 struct packed_git *target;
666 /* Keep locks active */
670 * Don't push the object if it's known to exist on the remote
671 * or is already in the request queue
673 if (remote_dir_exists[obj->sha1[0]] == -1)
674 get_remote_object_list(obj->sha1[0]);
675 if (obj->flags & (REMOTE | PUSHING))
677 target = find_sha1_pack(obj->sha1, repo->packs);
679 obj->flags |= REMOTE;
683 obj->flags |= PUSHING;
684 request = xmalloc(sizeof(*request));
687 request->lock = lock;
688 request->headers = NULL;
689 request->state = NEED_PUSH;
690 request->next = request_queue_head;
691 request_queue_head = request;
693 #ifdef USE_CURL_MULTI
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 unsigned char *sha1)
724 obj = lookup_object(sha1);
726 obj = parse_object(sha1);
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;
760 unsigned char lock_token_sha1[20];
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 git_SHA1_Init(&sha_ctx);
773 git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token));
774 git_SHA1_Final(lock_token_sha1, &sha_ctx);
776 lock->tmpfile_suffix[0] = '_';
777 memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40);
782 static void one_remote_ref(const char *refname);
785 xml_start_tag(void *userData, const char *name, const char **atts)
787 struct xml_ctx *ctx = (struct xml_ctx *)userData;
788 const char *c = strchr(name, ':');
796 new_len = strlen(ctx->name) + strlen(c) + 2;
798 if (new_len > ctx->len) {
799 ctx->name = xrealloc(ctx->name, new_len);
802 strcat(ctx->name, ".");
803 strcat(ctx->name, c);
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 = NULL;
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 sprintf(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 fprintf(stderr, "Unable to start LOCK request\n");
926 curl_slist_free_all(dav_headers);
927 strbuf_release(&out_buffer.buf);
928 strbuf_release(&in_buffer);
930 if (lock->token == NULL || lock->timeout <= 0) {
938 lock->start_time = time(NULL);
939 lock->next = repo->locks;
946 static int unlock_remote(struct remote_lock *lock)
948 struct active_request_slot *slot;
949 struct slot_results results;
950 struct remote_lock *prev = repo->locks;
951 struct curl_slist *dav_headers;
954 dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK);
956 slot = get_active_slot();
957 slot->results = &results;
958 curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK);
959 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
961 if (start_active_slot(slot)) {
962 run_active_slot(slot);
963 if (results.curl_result == CURLE_OK)
966 fprintf(stderr, "UNLOCK HTTP error %ld\n",
969 fprintf(stderr, "Unable to start UNLOCK request\n");
972 curl_slist_free_all(dav_headers);
974 if (repo->locks == lock) {
975 repo->locks = lock->next;
977 while (prev && prev->next != lock)
980 prev->next = prev->next->next;
991 static void remove_locks(void)
993 struct remote_lock *lock = repo->locks;
995 fprintf(stderr, "Removing remote locks...\n");
997 struct remote_lock *next = lock->next;
1003 static void remove_locks_on_signal(int signo)
1006 sigchain_pop(signo);
1010 static void remote_ls(const char *path, int flags,
1011 void (*userFunc)(struct remote_ls_ctx *ls),
1014 /* extract hex from sharded "xx/x{40}" filename */
1015 static int get_sha1_hex_from_objpath(const char *path, unsigned char *sha1)
1019 if (strlen(path) != 41)
1022 memcpy(hex, path, 2);
1024 path++; /* skip '/' */
1025 memcpy(hex, path, 38);
1027 return get_sha1_hex(hex, sha1);
1030 static void process_ls_object(struct remote_ls_ctx *ls)
1032 unsigned int *parent = (unsigned int *)ls->userData;
1033 const char *path = ls->dentry_name;
1034 unsigned char sha1[20];
1036 if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) {
1037 remote_dir_exists[*parent] = 1;
1041 if (!skip_prefix(path, "objects/", &path) ||
1042 get_sha1_hex_from_objpath(path, sha1))
1045 one_remote_object(sha1);
1048 static void process_ls_ref(struct remote_ls_ctx *ls)
1050 if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) {
1051 fprintf(stderr, " %s\n", ls->dentry_name);
1055 if (!(ls->dentry_flags & IS_DIR))
1056 one_remote_ref(ls->dentry_name);
1059 static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
1061 struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData;
1064 if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) {
1065 if (ls->dentry_flags & IS_DIR) {
1067 /* ensure collection names end with slash */
1068 str_end_url_with_slash(ls->dentry_name, &ls->dentry_name);
1070 if (ls->flags & PROCESS_DIRS) {
1073 if (strcmp(ls->dentry_name, ls->path) &&
1074 ls->flags & RECURSIVE) {
1075 remote_ls(ls->dentry_name,
1080 } else if (ls->flags & PROCESS_FILES) {
1083 } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) {
1084 char *path = ctx->cdata;
1085 if (*ctx->cdata == 'h') {
1086 path = strstr(path, "//");
1088 path = strchr(path+2, '/');
1092 const char *url = repo->url;
1095 if (strncmp(path, url, repo->path_len))
1096 error("Parsed path '%s' does not match url: '%s'",
1099 path += repo->path_len;
1100 ls->dentry_name = xstrdup(path);
1103 } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
1104 ls->dentry_flags |= IS_DIR;
1106 } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) {
1107 free(ls->dentry_name);
1108 ls->dentry_name = NULL;
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 = NULL;
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_addf(&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 = NULL;
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", sha1_to_hex(obj->sha1));
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(entry.sha1), p);
1317 p = process_blob(lookup_blob(entry.sha1), p);
1320 /* Subproject commit - not in this repository */
1324 free_tree_buffer(tree);
1328 static int get_delta(struct rev_info *revs, struct remote_lock *lock)
1331 struct commit *commit;
1332 struct object_list **p = &objects;
1335 while ((commit = get_revision(revs)) != NULL) {
1336 p = process_tree(commit->tree, p);
1337 commit->object.flags |= LOCAL;
1338 if (!(commit->object.flags & UNINTERESTING))
1339 count += add_send_request(&commit->object, lock);
1342 for (i = 0; i < revs->pending.nr; i++) {
1343 struct object_array_entry *entry = revs->pending.objects + i;
1344 struct object *obj = entry->item;
1345 const char *name = entry->name;
1347 if (obj->flags & (UNINTERESTING | SEEN))
1349 if (obj->type == OBJ_TAG) {
1351 p = add_one_object(obj, p);
1354 if (obj->type == OBJ_TREE) {
1355 p = process_tree((struct tree *)obj, p);
1358 if (obj->type == OBJ_BLOB) {
1359 p = process_blob((struct blob *)obj, p);
1362 die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
1366 if (!(objects->item->flags & UNINTERESTING))
1367 count += add_send_request(objects->item, lock);
1368 objects = objects->next;
1374 static int update_remote(unsigned char *sha1, struct remote_lock *lock)
1376 struct active_request_slot *slot;
1377 struct slot_results results;
1378 struct buffer out_buffer = { STRBUF_INIT, 0 };
1379 struct curl_slist *dav_headers;
1381 dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1383 strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1));
1385 slot = get_active_slot();
1386 slot->results = &results;
1387 curl_setup_http(slot->curl, lock->url, DAV_PUT,
1388 &out_buffer, fwrite_null);
1389 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
1391 if (start_active_slot(slot)) {
1392 run_active_slot(slot);
1393 strbuf_release(&out_buffer.buf);
1394 if (results.curl_result != CURLE_OK) {
1396 "PUT error: curl result=%d, HTTP code=%ld\n",
1397 results.curl_result, results.http_code);
1398 /* We should attempt recovery? */
1402 strbuf_release(&out_buffer.buf);
1403 fprintf(stderr, "Unable to start PUT request\n");
1410 static struct ref *remote_refs;
1412 static void one_remote_ref(const char *refname)
1417 ref = alloc_ref(refname);
1419 if (http_fetch_ref(repo->url, ref) != 0) {
1421 "Unable to fetch ref %s from %s\n",
1422 refname, repo->url);
1428 * Fetch a copy of the object if it doesn't exist locally - it
1429 * may be required for updating server info later.
1431 if (repo->can_update_info_refs && !has_sha1_file(ref->old_sha1)) {
1432 obj = lookup_unknown_object(ref->old_sha1);
1434 fprintf(stderr, " fetch %s for %s\n",
1435 sha1_to_hex(ref->old_sha1), refname);
1436 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;
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(ref->old_sha1);
1471 "Unable to parse object %s for remote ref %s\n",
1472 sha1_to_hex(ref->old_sha1), ls->dentry_name);
1478 len = strlen(ls->dentry_name) + 42;
1479 ref_info = xcalloc(len + 1, 1);
1480 sprintf(ref_info, "%s %s\n",
1481 sha1_to_hex(ref->old_sha1), ls->dentry_name);
1482 fwrite_buffer(ref_info, 1, len, buf);
1485 if (o->type == OBJ_TAG) {
1486 o = deref_tag(o, ls->dentry_name, 0);
1488 len = strlen(ls->dentry_name) + 45;
1489 ref_info = xcalloc(len + 1, 1);
1490 sprintf(ref_info, "%s %s^{}\n",
1491 sha1_to_hex(o->sha1), ls->dentry_name);
1492 fwrite_buffer(ref_info, 1, len, buf);
1499 static void update_remote_info_refs(struct remote_lock *lock)
1501 struct buffer buffer = { STRBUF_INIT, 0 };
1502 struct active_request_slot *slot;
1503 struct slot_results results;
1504 struct curl_slist *dav_headers;
1506 remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
1507 add_remote_info_ref, &buffer.buf);
1509 dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF);
1511 slot = get_active_slot();
1512 slot->results = &results;
1513 curl_setup_http(slot->curl, lock->url, DAV_PUT,
1514 &buffer, fwrite_null);
1515 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
1517 if (start_active_slot(slot)) {
1518 run_active_slot(slot);
1519 if (results.curl_result != CURLE_OK) {
1521 "PUT error: curl result=%d, HTTP code=%ld\n",
1522 results.curl_result, results.http_code);
1526 strbuf_release(&buffer.buf);
1529 static int remote_exists(const char *path)
1531 char *url = xstrfmt("%s%s", repo->url, path);
1535 switch (http_get_strbuf(url, NULL, NULL)) {
1539 case HTTP_MISSING_TARGET:
1543 error("unable to access '%s': %s", url, curl_errorstr);
1551 static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
1553 char *url = xstrfmt("%s%s", repo->url, path);
1554 struct strbuf buffer = STRBUF_INIT;
1557 if (http_get_strbuf(url, &buffer, NULL) != HTTP_OK)
1558 die("Couldn't get %s for remote symref\n%s", url,
1566 if (buffer.len == 0)
1569 /* Cut off trailing newline. */
1570 strbuf_rtrim(&buffer);
1572 /* If it's a symref, set the refname; otherwise try for a sha1 */
1573 if (skip_prefix(buffer.buf, "ref: ", &name)) {
1574 *symref = xmemdupz(name, buffer.len - (name - buffer.buf));
1576 get_sha1_hex(buffer.buf, sha1);
1579 strbuf_release(&buffer);
1582 static int verify_merge_base(unsigned char *head_sha1, struct ref *remote)
1584 struct commit *head = lookup_commit_or_die(head_sha1, "HEAD");
1585 struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name);
1587 return in_merge_bases(branch, head);
1590 static int delete_remote_branch(const char *pattern, int force)
1592 struct ref *refs = remote_refs;
1593 struct ref *remote_ref = NULL;
1594 unsigned char head_sha1[20];
1595 char *symref = NULL;
1597 int patlen = strlen(pattern);
1599 struct active_request_slot *slot;
1600 struct slot_results results;
1603 /* Find the remote branch(es) matching the specified branch name */
1604 for (match = 0; refs; refs = refs->next) {
1605 char *name = refs->name;
1606 int namelen = strlen(name);
1607 if (namelen < patlen ||
1608 memcmp(name + namelen - patlen, pattern, patlen))
1610 if (namelen != patlen && name[namelen - patlen - 1] != '/')
1616 return error("No remote branch matches %s", pattern);
1618 return error("More than one remote branch matches %s",
1622 * Remote HEAD must be a symref (not exactly foolproof; a remote
1623 * symlink to a symref will look like a symref)
1625 fetch_symref("HEAD", &symref, head_sha1);
1627 return error("Remote HEAD is not a symref");
1629 /* Remote branch must not be the remote HEAD */
1630 for (i = 0; symref && i < MAXDEPTH; i++) {
1631 if (!strcmp(remote_ref->name, symref))
1632 return error("Remote branch %s is the current HEAD",
1634 fetch_symref(symref, &symref, head_sha1);
1637 /* Run extra sanity checks if delete is not forced */
1639 /* Remote HEAD must resolve to a known object */
1641 return error("Remote HEAD symrefs too deep");
1642 if (is_null_sha1(head_sha1))
1643 return error("Unable to resolve remote HEAD");
1644 if (!has_sha1_file(head_sha1))
1645 return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1));
1647 /* Remote branch must resolve to a known object */
1648 if (is_null_sha1(remote_ref->old_sha1))
1649 return error("Unable to resolve remote branch %s",
1651 if (!has_sha1_file(remote_ref->old_sha1))
1652 return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, sha1_to_hex(remote_ref->old_sha1));
1654 /* Remote branch must be an ancestor of remote HEAD */
1655 if (!verify_merge_base(head_sha1, remote_ref)) {
1656 return error("The branch '%s' is not an ancestor "
1657 "of your current HEAD.\n"
1658 "If you are sure you want to delete it,"
1659 " run:\n\t'git http-push -D %s %s'",
1660 remote_ref->name, repo->url, pattern);
1664 /* Send delete request */
1665 fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name);
1668 url = xstrfmt("%s%s", repo->url, remote_ref->name);
1669 slot = get_active_slot();
1670 slot->results = &results;
1671 curl_setup_http_get(slot->curl, url, DAV_DELETE);
1672 if (start_active_slot(slot)) {
1673 run_active_slot(slot);
1675 if (results.curl_result != CURLE_OK)
1676 return error("DELETE request failed (%d/%ld)",
1677 results.curl_result, results.http_code);
1680 return error("Unable to start DELETE request");
1686 static void run_request_queue(void)
1688 #ifdef USE_CURL_MULTI
1689 is_running_queue = 1;
1690 fill_active_slots();
1691 add_fill_function(NULL, fill_active_slot);
1694 finish_all_active_slots();
1695 #ifdef USE_CURL_MULTI
1696 fill_active_slots();
1698 } while (request_queue_head && !aborted);
1700 #ifdef USE_CURL_MULTI
1701 is_running_queue = 0;
1705 int main(int argc, char **argv)
1707 struct transfer_request *request;
1708 struct transfer_request *next_request;
1710 char **refspec = NULL;
1711 struct remote_lock *ref_lock = NULL;
1712 struct remote_lock *info_ref_lock = NULL;
1713 struct rev_info revs;
1714 int delete_branch = 0;
1715 int force_delete = 0;
1716 int objects_to_send;
1720 struct ref *ref, *local_refs;
1722 git_setup_gettext();
1724 git_extract_argv0_path(argv[0]);
1726 repo = xcalloc(1, sizeof(*repo));
1729 for (i = 1; i < argc; i++, argv++) {
1733 if (!strcmp(arg, "--all")) {
1734 push_all = MATCH_REFS_ALL;
1737 if (!strcmp(arg, "--force")) {
1741 if (!strcmp(arg, "--dry-run")) {
1745 if (!strcmp(arg, "--helper-status")) {
1749 if (!strcmp(arg, "--verbose")) {
1751 http_is_verbose = 1;
1754 if (!strcmp(arg, "-d")) {
1758 if (!strcmp(arg, "-D")) {
1763 if (!strcmp(arg, "-h"))
1764 usage(http_push_usage);
1767 char *path = strstr(arg, "//");
1768 str_end_url_with_slash(arg, &repo->url);
1769 repo->path_len = strlen(repo->url);
1771 repo->path = strchr(path+2, '/');
1773 repo->path_len = strlen(repo->path);
1778 nr_refspec = argc - i;
1782 #ifndef USE_CURL_MULTI
1783 die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI");
1787 usage(http_push_usage);
1789 if (delete_branch && nr_refspec != 1)
1790 die("You must specify only one branch name when deleting a remote branch");
1792 setup_git_directory();
1794 memset(remote_dir_exists, -1, 256);
1796 http_init(NULL, repo->url, 1);
1798 #ifdef USE_CURL_MULTI
1799 is_running_queue = 0;
1802 /* Verify DAV compliance/lock support */
1803 if (!locking_available()) {
1808 sigchain_push_common(remove_locks_on_signal);
1810 /* Check whether the remote has server info files */
1811 repo->can_update_info_refs = 0;
1812 repo->has_info_refs = remote_exists("info/refs");
1813 repo->has_info_packs = remote_exists("objects/info/packs");
1814 if (repo->has_info_refs) {
1815 info_ref_lock = lock_remote("info/refs", LOCK_TIME);
1817 repo->can_update_info_refs = 1;
1819 error("cannot lock existing info/refs");
1824 if (repo->has_info_packs)
1827 /* Get a list of all local and remote heads to validate refspecs */
1828 local_refs = get_local_heads();
1829 fprintf(stderr, "Fetching remote heads...\n");
1830 get_dav_remote_heads();
1831 run_request_queue();
1833 /* Remove a remote branch if -d or -D was specified */
1834 if (delete_branch) {
1835 if (delete_remote_branch(refspec[0], force_delete) == -1) {
1836 fprintf(stderr, "Unable to delete remote branch %s\n",
1839 printf("error %s cannot remove\n", refspec[0]);
1845 if (match_push_refs(local_refs, &remote_refs,
1846 nr_refspec, (const char **) refspec, push_all)) {
1851 fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
1853 printf("error null no match\n");
1859 for (ref = remote_refs; ref; ref = ref->next) {
1860 char old_hex[60], *new_hex;
1861 const char *commit_argv[5];
1863 char *new_sha1_hex, *old_sha1_hex;
1868 if (is_null_sha1(ref->peer_ref->new_sha1)) {
1869 if (delete_remote_branch(ref->name, 1) == -1) {
1870 error("Could not remove %s", ref->name);
1872 printf("error %s cannot remove\n", ref->name);
1875 else if (helper_status)
1876 printf("ok %s\n", ref->name);
1881 if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
1883 fprintf(stderr, "'%s': up-to-date\n", ref->name);
1885 printf("ok %s up to date\n", ref->name);
1890 !is_null_sha1(ref->old_sha1) &&
1892 if (!has_sha1_file(ref->old_sha1) ||
1893 !ref_newer(ref->peer_ref->new_sha1,
1896 * We do not have the remote ref, or
1897 * we know that the remote ref is not
1898 * an ancestor of what we are trying to
1899 * push. Either way this can be losing
1900 * commits at the remote end and likely
1901 * we were not up to date to begin with.
1903 error("remote '%s' is not an ancestor of\n"
1905 "Maybe you are not up-to-date and "
1906 "need to pull first?",
1908 ref->peer_ref->name);
1910 printf("error %s non-fast forward\n", ref->name);
1915 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
1917 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
1918 new_hex = sha1_to_hex(ref->new_sha1);
1920 fprintf(stderr, "updating '%s'", ref->name);
1921 if (strcmp(ref->name, ref->peer_ref->name))
1922 fprintf(stderr, " using '%s'", ref->peer_ref->name);
1923 fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex);
1926 printf("ok %s\n", ref->name);
1930 /* Lock remote branch ref */
1931 ref_lock = lock_remote(ref->name, LOCK_TIME);
1932 if (ref_lock == NULL) {
1933 fprintf(stderr, "Unable to lock remote branch %s\n",
1936 printf("error %s lock error\n", ref->name);
1941 /* Set up revision info for this refspec */
1943 new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1));
1944 old_sha1_hex = NULL;
1945 commit_argv[1] = "--objects";
1946 commit_argv[2] = new_sha1_hex;
1947 if (!push_all && !is_null_sha1(ref->old_sha1)) {
1948 old_sha1_hex = xmalloc(42);
1949 sprintf(old_sha1_hex, "^%s",
1950 sha1_to_hex(ref->old_sha1));
1951 commit_argv[3] = old_sha1_hex;
1954 commit_argv[commit_argc] = NULL;
1955 init_revisions(&revs, setup_git_directory());
1956 setup_revisions(commit_argc, commit_argv, &revs, NULL);
1957 revs.edge_hint = 0; /* just in case */
1961 commit_argv[1] = NULL;
1964 /* Generate a list of objects that need to be pushed */
1966 if (prepare_revision_walk(&revs))
1967 die("revision walk setup failed");
1968 mark_edges_uninteresting(&revs, NULL);
1969 objects_to_send = get_delta(&revs, ref_lock);
1970 finish_all_active_slots();
1972 /* Push missing objects to remote, this would be a
1973 convenient time to pack them first if appropriate. */
1975 if (objects_to_send)
1976 fprintf(stderr, " sending %d objects\n",
1979 run_request_queue();
1981 /* Update the remote branch if all went well */
1982 if (aborted || !update_remote(ref->new_sha1, ref_lock))
1986 fprintf(stderr, " done\n");
1988 printf("%s %s\n", !rc ? "ok" : "error", ref->name);
1989 unlock_remote(ref_lock);
1993 /* Update remote server info if appropriate */
1994 if (repo->has_info_refs && new_refs) {
1995 if (info_ref_lock && repo->can_update_info_refs) {
1996 fprintf(stderr, "Updating remote server info\n");
1998 update_remote_info_refs(info_ref_lock);
2000 fprintf(stderr, "Unable to update server info\n");
2006 unlock_remote(info_ref_lock);
2011 request = request_queue_head;
2012 while (request != NULL) {
2013 next_request = request->next;
2014 release_request(request);
2015 request = next_request;