Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 3 | #include "tag.h" |
| 4 | #include "blob.h" |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 5 | #include "http.h" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 6 | #include "refs.h" |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 7 | #include "diff.h" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 8 | #include "revision.h" |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 9 | #include "exec_cmd.h" |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 10 | #include "remote.h" |
Junio C Hamano | d633c88 | 2008-06-07 11:39:20 -0700 | [diff] [blame] | 11 | #include "list-objects.h" |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 12 | #include "sigchain.h" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 13 | |
Matt Kraai | 081fd8d | 2013-02-11 14:03:45 -0800 | [diff] [blame] | 14 | #ifdef EXPAT_NEEDS_XMLPARSE_H |
| 15 | #include <xmlparse.h> |
| 16 | #else |
Paul Collins | bee8e79 | 2005-11-06 21:07:45 +0000 | [diff] [blame] | 17 | #include <expat.h> |
Matt Kraai | 081fd8d | 2013-02-11 14:03:45 -0800 | [diff] [blame] | 18 | #endif |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 19 | |
| 20 | static const char http_push_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 21 | "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n"; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 22 | |
Johannes Schindelin | 92e2eb9 | 2005-11-07 19:23:11 +0100 | [diff] [blame] | 23 | #ifndef XML_STATUS_OK |
| 24 | enum XML_Status { |
| 25 | XML_STATUS_OK = 1, |
| 26 | XML_STATUS_ERROR = 0 |
| 27 | }; |
| 28 | #define XML_STATUS_OK 1 |
| 29 | #define XML_STATUS_ERROR 0 |
| 30 | #endif |
| 31 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 32 | #define PREV_BUF_SIZE 4096 |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 33 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 34 | /* DAV methods */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 35 | #define DAV_LOCK "LOCK" |
| 36 | #define DAV_MKCOL "MKCOL" |
| 37 | #define DAV_MOVE "MOVE" |
| 38 | #define DAV_PROPFIND "PROPFIND" |
| 39 | #define DAV_PUT "PUT" |
| 40 | #define DAV_UNLOCK "UNLOCK" |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 41 | #define DAV_DELETE "DELETE" |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 42 | |
| 43 | /* DAV lock flags */ |
| 44 | #define DAV_PROP_LOCKWR (1u << 0) |
| 45 | #define DAV_PROP_LOCKEX (1u << 1) |
| 46 | #define DAV_LOCK_OK (1u << 2) |
| 47 | |
| 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" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 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" |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 58 | |
| 59 | /* DAV request body templates */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 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>" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 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>" |
| 63 | |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 64 | #define LOCK_TIME 600 |
| 65 | #define LOCK_REFRESH 30 |
| 66 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 67 | /* Remember to update object flag allocation in object.h */ |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 68 | #define LOCAL (1u<<16) |
| 69 | #define REMOTE (1u<<17) |
| 70 | #define FETCHING (1u<<18) |
| 71 | #define PUSHING (1u<<19) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 72 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 73 | /* We allow "recursive" symbolic refs. Only within reason, though */ |
| 74 | #define MAXDEPTH 5 |
| 75 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 76 | static int pushing; |
| 77 | static int aborted; |
Nick Hengeveld | a3c57c9 | 2006-03-20 11:50:51 -0800 | [diff] [blame] | 78 | static signed char remote_dir_exists[256]; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 79 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 80 | static int push_verbosely; |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 81 | static int push_all = MATCH_REFS_NONE; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 82 | static int force_all; |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 83 | static int dry_run; |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 84 | static int helper_status; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 85 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 86 | static struct object_list *objects; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 87 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 88 | struct repo { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 89 | char *url; |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 90 | char *path; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 91 | int path_len; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 92 | int has_info_refs; |
| 93 | int can_update_info_refs; |
| 94 | int has_info_packs; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 95 | struct packed_git *packs; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 96 | struct remote_lock *locks; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 97 | }; |
| 98 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 99 | static struct repo *repo; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 100 | |
| 101 | enum transfer_state { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 102 | NEED_FETCH, |
| 103 | RUN_FETCH_LOOSE, |
| 104 | RUN_FETCH_PACKED, |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 105 | NEED_PUSH, |
| 106 | RUN_MKCOL, |
| 107 | RUN_PUT, |
| 108 | RUN_MOVE, |
| 109 | ABORTED, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 110 | COMPLETE |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 111 | }; |
| 112 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 113 | struct transfer_request { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 114 | struct object *obj; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 115 | char *url; |
| 116 | char *dest; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 117 | struct remote_lock *lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 118 | struct curl_slist *headers; |
| 119 | struct buffer buffer; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 120 | enum transfer_state state; |
| 121 | CURLcode curl_result; |
| 122 | char errorstr[CURL_ERROR_SIZE]; |
| 123 | long http_code; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 124 | void *userData; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 125 | struct active_request_slot *slot; |
| 126 | struct transfer_request *next; |
| 127 | }; |
| 128 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 129 | static struct transfer_request *request_queue_head; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 130 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 131 | struct xml_ctx { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 132 | char *name; |
| 133 | int len; |
| 134 | char *cdata; |
| 135 | void (*userFunc)(struct xml_ctx *ctx, int tag_closed); |
| 136 | void *userData; |
| 137 | }; |
| 138 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 139 | struct remote_lock { |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 140 | char *url; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 141 | char *owner; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 142 | char *token; |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 143 | char tmpfile_suffix[41]; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 144 | time_t start_time; |
| 145 | long timeout; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 146 | int refreshing; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 147 | struct remote_lock *next; |
| 148 | }; |
| 149 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 150 | /* Flags that control remote_ls processing */ |
| 151 | #define PROCESS_FILES (1u << 0) |
| 152 | #define PROCESS_DIRS (1u << 1) |
| 153 | #define RECURSIVE (1u << 2) |
| 154 | |
| 155 | /* Flags that remote_ls passes to callback functions */ |
| 156 | #define IS_DIR (1u << 0) |
| 157 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 158 | struct remote_ls_ctx { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 159 | char *path; |
| 160 | void (*userFunc)(struct remote_ls_ctx *ls); |
| 161 | void *userData; |
| 162 | int flags; |
| 163 | char *dentry_name; |
| 164 | int dentry_flags; |
| 165 | struct remote_ls_ctx *parent; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 166 | }; |
| 167 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 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) |
| 173 | }; |
| 174 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 175 | static char *xml_entities(const char *s) |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 176 | { |
| 177 | struct strbuf buf = STRBUF_INIT; |
Michael Haggerty | 37141f2 | 2012-11-25 12:08:35 +0100 | [diff] [blame] | 178 | strbuf_addstr_xml_quoted(&buf, s); |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 179 | return strbuf_detach(&buf, NULL); |
| 180 | } |
| 181 | |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 182 | static void curl_setup_http_get(CURL *curl, const char *url, |
| 183 | const char *custom_req) |
| 184 | { |
| 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); |
| 189 | } |
| 190 | |
| 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) |
| 194 | { |
| 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); |
Abbaad Haider | 479eaa8 | 2014-07-05 20:43:48 -0400 | [diff] [blame] | 202 | curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 203 | #endif |
| 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); |
| 208 | } |
| 209 | |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 210 | static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) |
| 211 | { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 212 | struct strbuf buf = STRBUF_INIT; |
| 213 | struct curl_slist *dav_headers = NULL; |
| 214 | |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 215 | if (options & DAV_HEADER_IF) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 216 | strbuf_addf(&buf, "If: (<%s>)", lock->token); |
| 217 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 218 | strbuf_reset(&buf); |
| 219 | } |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 220 | if (options & DAV_HEADER_LOCK) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 221 | strbuf_addf(&buf, "Lock-Token: <%s>", lock->token); |
| 222 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 223 | strbuf_reset(&buf); |
| 224 | } |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 225 | if (options & DAV_HEADER_TIMEOUT) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 226 | strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout); |
| 227 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 228 | strbuf_reset(&buf); |
| 229 | } |
| 230 | strbuf_release(&buf); |
| 231 | |
| 232 | return dav_headers; |
| 233 | } |
| 234 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 235 | static void finish_request(struct transfer_request *request); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 236 | static void release_request(struct transfer_request *request); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 237 | |
| 238 | static void process_response(void *callback_data) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 239 | { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 240 | struct transfer_request *request = |
| 241 | (struct transfer_request *)callback_data; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 242 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 243 | finish_request(request); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 244 | } |
| 245 | |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 246 | #ifdef USE_CURL_MULTI |
Junio C Hamano | dcdb333 | 2009-02-02 22:24:40 -0800 | [diff] [blame] | 247 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 248 | static void start_fetch_loose(struct transfer_request *request) |
| 249 | { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 250 | struct active_request_slot *slot; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 251 | struct http_object_request *obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 252 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 253 | obj_req = new_http_object_request(repo->url, request->obj->sha1); |
| 254 | if (obj_req == NULL) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 255 | request->state = ABORTED; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 256 | return; |
| 257 | } |
| 258 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 259 | slot = obj_req->slot; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 260 | slot->callback_func = process_response; |
| 261 | slot->callback_data = request; |
| 262 | request->slot = slot; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 263 | request->userData = obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 264 | |
| 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"); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 269 | repo->can_update_info_refs = 0; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 270 | release_http_object_request(obj_req); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 271 | release_request(request); |
| 272 | } |
| 273 | } |
| 274 | |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 275 | static void start_mkcol(struct transfer_request *request) |
| 276 | { |
| 277 | char *hex = sha1_to_hex(request->obj->sha1); |
| 278 | struct active_request_slot *slot; |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 279 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 280 | request->url = get_remote_object_url(repo->url, hex, 1); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 281 | |
| 282 | slot = get_active_slot(); |
| 283 | slot->callback_func = process_response; |
| 284 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 285 | curl_setup_http_get(slot->curl, request->url, DAV_MKCOL); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 286 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 287 | |
| 288 | if (start_active_slot(slot)) { |
| 289 | request->slot = slot; |
| 290 | request->state = RUN_MKCOL; |
| 291 | } else { |
| 292 | request->state = ABORTED; |
| 293 | free(request->url); |
| 294 | request->url = NULL; |
| 295 | } |
| 296 | } |
| 297 | #endif |
| 298 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 299 | static void start_fetch_packed(struct transfer_request *request) |
| 300 | { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 301 | struct packed_git *target; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 302 | |
| 303 | struct transfer_request *check_request = request_queue_head; |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 304 | struct http_pack_request *preq; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 305 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 306 | target = find_sha1_pack(request->obj->sha1, repo->packs); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 307 | if (!target) { |
| 308 | fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1)); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 309 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 310 | release_request(request); |
| 311 | return; |
| 312 | } |
| 313 | |
| 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)); |
| 316 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 317 | preq = new_http_pack_request(target, repo->url); |
| 318 | if (preq == NULL) { |
| 319 | release_http_pack_request(preq); |
| 320 | repo->can_update_info_refs = 0; |
| 321 | return; |
| 322 | } |
| 323 | preq->lst = &repo->packs; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 324 | |
| 325 | /* Make sure there isn't another open request for this pack */ |
| 326 | while (check_request) { |
| 327 | if (check_request->state == RUN_FETCH_PACKED && |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 328 | !strcmp(check_request->url, preq->url)) { |
| 329 | release_http_pack_request(preq); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 330 | release_request(request); |
| 331 | return; |
| 332 | } |
| 333 | check_request = check_request->next; |
| 334 | } |
| 335 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 336 | preq->slot->callback_func = process_response; |
| 337 | preq->slot->callback_data = request; |
| 338 | request->slot = preq->slot; |
| 339 | request->userData = preq; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 340 | |
| 341 | /* Try to get the request started, abort the request on error */ |
| 342 | request->state = RUN_FETCH_PACKED; |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 343 | if (!start_active_slot(preq->slot)) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 344 | fprintf(stderr, "Unable to start GET request\n"); |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 345 | release_http_pack_request(preq); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 346 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 347 | release_request(request); |
| 348 | } |
| 349 | } |
| 350 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 351 | static void start_put(struct transfer_request *request) |
| 352 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 353 | char *hex = sha1_to_hex(request->obj->sha1); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 354 | struct active_request_slot *slot; |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 355 | struct strbuf buf = STRBUF_INIT; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 356 | enum object_type type; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 357 | char hdr[50]; |
| 358 | void *unpacked; |
| 359 | unsigned long len; |
| 360 | int hdrlen; |
| 361 | ssize_t size; |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 362 | git_zstream stream; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 363 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 364 | unpacked = read_sha1_file(request->obj->sha1, &type, &len); |
| 365 | hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 366 | |
| 367 | /* Set it up */ |
| 368 | memset(&stream, 0, sizeof(stream)); |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 369 | git_deflate_init(&stream, zlib_compression_level); |
Junio C Hamano | 225a6f1 | 2011-06-10 11:18:17 -0700 | [diff] [blame] | 370 | size = git_deflate_bound(&stream, len + hdrlen); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 371 | strbuf_init(&request->buffer.buf, size); |
| 372 | request->buffer.posn = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 373 | |
| 374 | /* Compress it */ |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 375 | stream.next_out = (unsigned char *)request->buffer.buf.buf; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 376 | stream.avail_out = size; |
| 377 | |
| 378 | /* First header.. */ |
| 379 | stream.next_in = (void *)hdr; |
| 380 | stream.avail_in = hdrlen; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 381 | while (git_deflate(&stream, 0) == Z_OK) |
| 382 | ; /* nothing */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 383 | |
| 384 | /* Then the data itself.. */ |
| 385 | stream.next_in = unpacked; |
| 386 | stream.avail_in = len; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 387 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
| 388 | ; /* nothing */ |
| 389 | git_deflate_end(&stream); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 390 | free(unpacked); |
| 391 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 392 | request->buffer.buf.len = stream.total_out; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 393 | |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 394 | strbuf_addstr(&buf, "Destination: "); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 395 | append_remote_object_url(&buf, repo->url, hex, 0); |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 396 | request->dest = strbuf_detach(&buf, NULL); |
| 397 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 398 | append_remote_object_url(&buf, repo->url, hex, 0); |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 399 | strbuf_add(&buf, request->lock->tmpfile_suffix, 41); |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 400 | request->url = strbuf_detach(&buf, NULL); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 401 | |
| 402 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 403 | slot->callback_func = process_response; |
| 404 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 405 | curl_setup_http(slot->curl, request->url, DAV_PUT, |
| 406 | &request->buffer, fwrite_null); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 407 | |
| 408 | if (start_active_slot(slot)) { |
| 409 | request->slot = slot; |
| 410 | request->state = RUN_PUT; |
| 411 | } else { |
| 412 | request->state = ABORTED; |
| 413 | free(request->url); |
Nick Hengeveld | 7b89996 | 2005-11-18 11:03:25 -0800 | [diff] [blame] | 414 | request->url = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 415 | } |
| 416 | } |
| 417 | |
| 418 | static void start_move(struct transfer_request *request) |
| 419 | { |
| 420 | struct active_request_slot *slot; |
| 421 | struct curl_slist *dav_headers = NULL; |
| 422 | |
| 423 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 424 | slot->callback_func = process_response; |
| 425 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 426 | curl_setup_http_get(slot->curl, request->url, DAV_MOVE); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 427 | dav_headers = curl_slist_append(dav_headers, request->dest); |
| 428 | dav_headers = curl_slist_append(dav_headers, "Overwrite: T"); |
| 429 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 430 | |
| 431 | if (start_active_slot(slot)) { |
| 432 | request->slot = slot; |
| 433 | request->state = RUN_MOVE; |
| 434 | } else { |
| 435 | request->state = ABORTED; |
| 436 | free(request->url); |
Nick Hengeveld | 7b89996 | 2005-11-18 11:03:25 -0800 | [diff] [blame] | 437 | request->url = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 438 | } |
| 439 | } |
| 440 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 441 | static int refresh_lock(struct remote_lock *lock) |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 442 | { |
| 443 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 444 | struct slot_results results; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 445 | struct curl_slist *dav_headers; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 446 | int rc = 0; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 447 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 448 | lock->refreshing = 1; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 449 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 450 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 451 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 452 | slot = get_active_slot(); |
| 453 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 454 | curl_setup_http_get(slot->curl, lock->url, DAV_LOCK); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 455 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 456 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 457 | if (start_active_slot(slot)) { |
| 458 | run_active_slot(slot); |
| 459 | if (results.curl_result != CURLE_OK) { |
| 460 | fprintf(stderr, "LOCK HTTP error %ld\n", |
| 461 | results.http_code); |
| 462 | } else { |
| 463 | lock->start_time = time(NULL); |
| 464 | rc = 1; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 465 | } |
| 466 | } |
| 467 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 468 | lock->refreshing = 0; |
| 469 | curl_slist_free_all(dav_headers); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 470 | |
| 471 | return rc; |
| 472 | } |
| 473 | |
Rene Scharfe | ec26b4d | 2006-04-02 13:13:10 +0200 | [diff] [blame] | 474 | static void check_locks(void) |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 475 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 476 | struct remote_lock *lock = repo->locks; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 477 | time_t current_time = time(NULL); |
| 478 | int time_remaining; |
| 479 | |
| 480 | while (lock) { |
| 481 | time_remaining = lock->start_time + lock->timeout - |
| 482 | current_time; |
| 483 | if (!lock->refreshing && time_remaining < LOCK_REFRESH) { |
| 484 | if (!refresh_lock(lock)) { |
| 485 | fprintf(stderr, |
| 486 | "Unable to refresh lock for %s\n", |
| 487 | lock->url); |
| 488 | aborted = 1; |
| 489 | return; |
| 490 | } |
| 491 | } |
| 492 | lock = lock->next; |
| 493 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 494 | } |
| 495 | |
| 496 | static void release_request(struct transfer_request *request) |
| 497 | { |
| 498 | struct transfer_request *entry = request_queue_head; |
| 499 | |
| 500 | if (request == request_queue_head) { |
| 501 | request_queue_head = request->next; |
| 502 | } else { |
| 503 | while (entry->next != NULL && entry->next != request) |
| 504 | entry = entry->next; |
| 505 | if (entry->next == request) |
| 506 | entry->next = entry->next->next; |
| 507 | } |
| 508 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 509 | free(request->url); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 510 | free(request); |
| 511 | } |
| 512 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 513 | static void finish_request(struct transfer_request *request) |
| 514 | { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 515 | struct http_pack_request *preq; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 516 | struct http_object_request *obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 517 | |
| 518 | request->curl_result = request->slot->curl_result; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 519 | request->http_code = request->slot->http_code; |
| 520 | request->slot = NULL; |
| 521 | |
| 522 | /* Keep locks active */ |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 523 | check_locks(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 524 | |
| 525 | if (request->headers != NULL) |
| 526 | curl_slist_free_all(request->headers); |
| 527 | |
| 528 | /* URL is reused for MOVE after PUT */ |
| 529 | if (request->state != RUN_PUT) { |
| 530 | free(request->url); |
| 531 | request->url = NULL; |
| 532 | } |
| 533 | |
| 534 | if (request->state == RUN_MKCOL) { |
| 535 | if (request->curl_result == CURLE_OK || |
| 536 | request->http_code == 405) { |
| 537 | remote_dir_exists[request->obj->sha1[0]] = 1; |
| 538 | start_put(request); |
| 539 | } else { |
| 540 | fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n", |
| 541 | sha1_to_hex(request->obj->sha1), |
| 542 | request->curl_result, request->http_code); |
| 543 | request->state = ABORTED; |
| 544 | aborted = 1; |
| 545 | } |
| 546 | } else if (request->state == RUN_PUT) { |
| 547 | if (request->curl_result == CURLE_OK) { |
| 548 | start_move(request); |
| 549 | } else { |
| 550 | fprintf(stderr, "PUT %s failed, aborting (%d/%ld)\n", |
| 551 | sha1_to_hex(request->obj->sha1), |
| 552 | request->curl_result, request->http_code); |
| 553 | request->state = ABORTED; |
| 554 | aborted = 1; |
| 555 | } |
| 556 | } else if (request->state == RUN_MOVE) { |
| 557 | if (request->curl_result == CURLE_OK) { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 558 | if (push_verbosely) |
| 559 | fprintf(stderr, " sent %s\n", |
| 560 | sha1_to_hex(request->obj->sha1)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 561 | request->obj->flags |= REMOTE; |
| 562 | release_request(request); |
| 563 | } else { |
| 564 | fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n", |
| 565 | sha1_to_hex(request->obj->sha1), |
| 566 | request->curl_result, request->http_code); |
| 567 | request->state = ABORTED; |
| 568 | aborted = 1; |
| 569 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 570 | } else if (request->state == RUN_FETCH_LOOSE) { |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 571 | obj_req = (struct http_object_request *)request->userData; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 572 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 573 | if (finish_http_object_request(obj_req) == 0) |
| 574 | if (obj_req->rename == 0) |
| 575 | request->obj->flags |= (LOCAL | REMOTE); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 576 | |
| 577 | /* Try fetching packed if necessary */ |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 578 | if (request->obj->flags & LOCAL) { |
| 579 | release_http_object_request(obj_req); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 580 | release_request(request); |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 581 | } else |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 582 | start_fetch_packed(request); |
| 583 | |
| 584 | } else if (request->state == RUN_FETCH_PACKED) { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 585 | int fail = 1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 586 | if (request->curl_result != CURLE_OK) { |
| 587 | fprintf(stderr, "Unable to get pack file %s\n%s", |
| 588 | request->url, curl_errorstr); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 589 | } else { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 590 | preq = (struct http_pack_request *)request->userData; |
Shawn O. Pearce | 1c23d79 | 2007-01-09 20:04:52 -0500 | [diff] [blame] | 591 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 592 | if (preq) { |
Tay Ray Chuan | 609621a | 2009-10-30 17:47:20 -0700 | [diff] [blame] | 593 | if (finish_http_pack_request(preq) == 0) |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 594 | fail = 0; |
| 595 | release_http_pack_request(preq); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 596 | } |
| 597 | } |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 598 | if (fail) |
| 599 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 600 | release_request(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 601 | } |
| 602 | } |
| 603 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 604 | #ifdef USE_CURL_MULTI |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 605 | static int is_running_queue; |
Daniel Barkalow | fc57b6a | 2007-09-10 23:02:34 -0400 | [diff] [blame] | 606 | static int fill_active_slot(void *unused) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 607 | { |
Benjamin Kramer | 8e24cba | 2009-03-15 22:01:20 +0100 | [diff] [blame] | 608 | struct transfer_request *request; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 609 | |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 610 | if (aborted || !is_running_queue) |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 611 | return 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 612 | |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 613 | for (request = request_queue_head; request; request = request->next) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 614 | if (request->state == NEED_FETCH) { |
| 615 | start_fetch_loose(request); |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 616 | return 1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 617 | } else if (pushing && request->state == NEED_PUSH) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 618 | if (remote_dir_exists[request->obj->sha1[0]] == 1) { |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 619 | start_put(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 620 | } else { |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 621 | start_mkcol(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 622 | } |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 623 | return 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 624 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 625 | } |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 626 | return 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 627 | } |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 628 | #endif |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 629 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 630 | static void get_remote_object_list(unsigned char parent); |
| 631 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 632 | static void add_fetch_request(struct object *obj) |
| 633 | { |
| 634 | struct transfer_request *request; |
| 635 | |
| 636 | check_locks(); |
| 637 | |
| 638 | /* |
| 639 | * Don't fetch the object if it's known to exist locally |
| 640 | * or is already in the request queue |
| 641 | */ |
| 642 | if (remote_dir_exists[obj->sha1[0]] == -1) |
| 643 | get_remote_object_list(obj->sha1[0]); |
| 644 | if (obj->flags & (LOCAL | FETCHING)) |
| 645 | return; |
| 646 | |
| 647 | obj->flags |= FETCHING; |
| 648 | request = xmalloc(sizeof(*request)); |
| 649 | request->obj = obj; |
| 650 | request->url = NULL; |
| 651 | request->lock = NULL; |
| 652 | request->headers = NULL; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 653 | request->state = NEED_FETCH; |
| 654 | request->next = request_queue_head; |
| 655 | request_queue_head = request; |
| 656 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 657 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 658 | fill_active_slots(); |
| 659 | step_active_slots(); |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 660 | #endif |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 661 | } |
| 662 | |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 663 | static int add_send_request(struct object *obj, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 664 | { |
Stefan Beller | 3def06e | 2013-07-18 23:35:26 +0200 | [diff] [blame] | 665 | struct transfer_request *request; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 666 | struct packed_git *target; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 667 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 668 | /* Keep locks active */ |
| 669 | check_locks(); |
| 670 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 671 | /* |
| 672 | * Don't push the object if it's known to exist on the remote |
| 673 | * or is already in the request queue |
| 674 | */ |
| 675 | if (remote_dir_exists[obj->sha1[0]] == -1) |
| 676 | get_remote_object_list(obj->sha1[0]); |
| 677 | if (obj->flags & (REMOTE | PUSHING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 678 | return 0; |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 679 | target = find_sha1_pack(obj->sha1, repo->packs); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 680 | if (target) { |
| 681 | obj->flags |= REMOTE; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 682 | return 0; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 683 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 684 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 685 | obj->flags |= PUSHING; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 686 | request = xmalloc(sizeof(*request)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 687 | request->obj = obj; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 688 | request->url = NULL; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 689 | request->lock = lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 690 | request->headers = NULL; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 691 | request->state = NEED_PUSH; |
Nick Hengeveld | c17fb6e | 2005-11-04 14:22:18 -0800 | [diff] [blame] | 692 | request->next = request_queue_head; |
| 693 | request_queue_head = request; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 694 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 695 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 696 | fill_active_slots(); |
| 697 | step_active_slots(); |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 698 | #endif |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 699 | |
| 700 | return 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 701 | } |
| 702 | |
Peter Hagervall | f4f440a | 2005-11-08 23:18:31 +0100 | [diff] [blame] | 703 | static int fetch_indices(void) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 704 | { |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 705 | int ret; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 706 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 707 | if (push_verbosely) |
| 708 | fprintf(stderr, "Getting pack list\n"); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 709 | |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 710 | switch (http_get_info_packs(repo->url, &repo->packs)) { |
| 711 | case HTTP_OK: |
| 712 | case HTTP_MISSING_TARGET: |
| 713 | ret = 0; |
| 714 | break; |
| 715 | default: |
| 716 | ret = -1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 717 | } |
| 718 | |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 719 | return ret; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 720 | } |
| 721 | |
Jeff King | 67a31f6 | 2014-06-19 17:58:10 -0400 | [diff] [blame] | 722 | static void one_remote_object(const unsigned char *sha1) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 723 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 724 | struct object *obj; |
| 725 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 726 | obj = lookup_object(sha1); |
| 727 | if (!obj) |
| 728 | obj = parse_object(sha1); |
| 729 | |
| 730 | /* Ignore remote objects that don't exist locally */ |
| 731 | if (!obj) |
| 732 | return; |
| 733 | |
| 734 | obj->flags |= REMOTE; |
| 735 | if (!object_list_contains(objects, obj)) |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 736 | object_list_insert(obj, &objects); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 737 | } |
| 738 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 739 | static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 740 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 741 | int *lock_flags = (int *)ctx->userData; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 742 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 743 | if (tag_closed) { |
| 744 | if (!strcmp(ctx->name, DAV_CTX_LOCKENTRY)) { |
| 745 | if ((*lock_flags & DAV_PROP_LOCKEX) && |
| 746 | (*lock_flags & DAV_PROP_LOCKWR)) { |
| 747 | *lock_flags |= DAV_LOCK_OK; |
| 748 | } |
| 749 | *lock_flags &= DAV_LOCK_OK; |
| 750 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_WRITE)) { |
| 751 | *lock_flags |= DAV_PROP_LOCKWR; |
| 752 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_EXCLUSIVE)) { |
| 753 | *lock_flags |= DAV_PROP_LOCKEX; |
| 754 | } |
| 755 | } |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 756 | } |
| 757 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 758 | static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 759 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 760 | struct remote_lock *lock = (struct remote_lock *)ctx->userData; |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 761 | git_SHA_CTX sha_ctx; |
| 762 | unsigned char lock_token_sha1[20]; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 763 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 764 | if (tag_closed && ctx->cdata) { |
| 765 | if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) { |
Jeff King | 95244ae | 2014-06-19 17:19:43 -0400 | [diff] [blame] | 766 | lock->owner = xstrdup(ctx->cdata); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 767 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) { |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 768 | const char *arg; |
| 769 | if (skip_prefix(ctx->cdata, "Second-", &arg)) |
| 770 | lock->timeout = strtol(arg, NULL, 10); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 771 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) { |
Jeff King | 95244ae | 2014-06-19 17:19:43 -0400 | [diff] [blame] | 772 | lock->token = xstrdup(ctx->cdata); |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 773 | |
| 774 | git_SHA1_Init(&sha_ctx); |
| 775 | git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token)); |
| 776 | git_SHA1_Final(lock_token_sha1, &sha_ctx); |
| 777 | |
| 778 | lock->tmpfile_suffix[0] = '_'; |
| 779 | memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 780 | } |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 781 | } |
| 782 | } |
| 783 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 784 | static void one_remote_ref(const char *refname); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 785 | |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 786 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 787 | xml_start_tag(void *userData, const char *name, const char **atts) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 788 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 789 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Dennis Stosberg | ef9e58c | 2006-04-11 18:37:58 +0200 | [diff] [blame] | 790 | const char *c = strchr(name, ':'); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 791 | int new_len; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 792 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 793 | if (c == NULL) |
| 794 | c = name; |
| 795 | else |
| 796 | c++; |
| 797 | |
| 798 | new_len = strlen(ctx->name) + strlen(c) + 2; |
| 799 | |
| 800 | if (new_len > ctx->len) { |
| 801 | ctx->name = xrealloc(ctx->name, new_len); |
| 802 | ctx->len = new_len; |
| 803 | } |
| 804 | strcat(ctx->name, "."); |
| 805 | strcat(ctx->name, c); |
| 806 | |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 807 | free(ctx->cdata); |
| 808 | ctx->cdata = NULL; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 809 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 810 | ctx->userFunc(ctx, 0); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 811 | } |
| 812 | |
| 813 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 814 | xml_end_tag(void *userData, const char *name) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 815 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 816 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Dennis Stosberg | ef9e58c | 2006-04-11 18:37:58 +0200 | [diff] [blame] | 817 | const char *c = strchr(name, ':'); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 818 | char *ep; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 819 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 820 | ctx->userFunc(ctx, 1); |
| 821 | |
| 822 | if (c == NULL) |
| 823 | c = name; |
| 824 | else |
| 825 | c++; |
| 826 | |
| 827 | ep = ctx->name + strlen(ctx->name) - strlen(c) - 1; |
| 828 | *ep = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 829 | } |
| 830 | |
| 831 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 832 | xml_cdata(void *userData, const XML_Char *s, int len) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 833 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 834 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 835 | free(ctx->cdata); |
Pierre Habouzit | 182af83 | 2007-09-16 00:32:36 +0200 | [diff] [blame] | 836 | ctx->cdata = xmemdupz(s, len); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 837 | } |
| 838 | |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 839 | static struct remote_lock *lock_remote(const char *path, long timeout) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 840 | { |
| 841 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 842 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 843 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
| 844 | struct strbuf in_buffer = STRBUF_INIT; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 845 | char *url; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 846 | char *ep; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 847 | char timeout_header[25]; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 848 | struct remote_lock *lock = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 849 | struct curl_slist *dav_headers = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 850 | struct xml_ctx ctx; |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 851 | char *escaped; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 852 | |
Jeff King | 2831018 | 2014-06-19 17:24:33 -0400 | [diff] [blame] | 853 | url = xstrfmt("%s%s", repo->url, path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 854 | |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 855 | /* Make sure leading directories exist for the remote ref */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 856 | ep = strchr(url + strlen(repo->url) + 1, '/'); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 857 | while (ep) { |
Johannes Schindelin | 466ddf9 | 2009-01-17 16:11:51 +0100 | [diff] [blame] | 858 | char saved_character = ep[1]; |
| 859 | ep[1] = '\0'; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 860 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 861 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 862 | curl_setup_http_get(slot->curl, url, DAV_MKCOL); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 863 | if (start_active_slot(slot)) { |
| 864 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 865 | if (results.curl_result != CURLE_OK && |
| 866 | results.http_code != 405) { |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 867 | fprintf(stderr, |
| 868 | "Unable to create branch path %s\n", |
| 869 | url); |
| 870 | free(url); |
| 871 | return NULL; |
| 872 | } |
| 873 | } else { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 874 | fprintf(stderr, "Unable to start MKCOL request\n"); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 875 | free(url); |
| 876 | return NULL; |
| 877 | } |
Johannes Schindelin | 466ddf9 | 2009-01-17 16:11:51 +0100 | [diff] [blame] | 878 | ep[1] = saved_character; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 879 | ep = strchr(ep + 1, '/'); |
| 880 | } |
| 881 | |
Jeff King | 5cb2194 | 2012-05-21 19:09:47 -0400 | [diff] [blame] | 882 | escaped = xml_entities(ident_default_email()); |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 883 | strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped); |
| 884 | free(escaped); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 885 | |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 886 | sprintf(timeout_header, "Timeout: Second-%ld", timeout); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 887 | dav_headers = curl_slist_append(dav_headers, timeout_header); |
| 888 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
| 889 | |
| 890 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 891 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 892 | curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 893 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 894 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 895 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 896 | lock = xcalloc(1, sizeof(*lock)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 897 | lock->timeout = -1; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 898 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 899 | if (start_active_slot(slot)) { |
| 900 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 901 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 902 | XML_Parser parser = XML_ParserCreate(NULL); |
| 903 | enum XML_Status result; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 904 | ctx.name = xcalloc(10, 1); |
| 905 | ctx.len = 0; |
| 906 | ctx.cdata = NULL; |
| 907 | ctx.userFunc = handle_new_lock_ctx; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 908 | ctx.userData = lock; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 909 | XML_SetUserData(parser, &ctx); |
| 910 | XML_SetElementHandler(parser, xml_start_tag, |
| 911 | xml_end_tag); |
| 912 | XML_SetCharacterDataHandler(parser, xml_cdata); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 913 | result = XML_Parse(parser, in_buffer.buf, |
| 914 | in_buffer.len, 1); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 915 | free(ctx.name); |
| 916 | if (result != XML_STATUS_OK) { |
| 917 | fprintf(stderr, "XML error: %s\n", |
| 918 | XML_ErrorString( |
| 919 | XML_GetErrorCode(parser))); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 920 | lock->timeout = -1; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 921 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 922 | XML_ParserFree(parser); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 923 | } |
| 924 | } else { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 925 | fprintf(stderr, "Unable to start LOCK request\n"); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 926 | } |
| 927 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 928 | curl_slist_free_all(dav_headers); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 929 | strbuf_release(&out_buffer.buf); |
| 930 | strbuf_release(&in_buffer); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 931 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 932 | if (lock->token == NULL || lock->timeout <= 0) { |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 933 | free(lock->token); |
| 934 | free(lock->owner); |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 935 | free(url); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 936 | free(lock); |
| 937 | lock = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 938 | } else { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 939 | lock->url = url; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 940 | lock->start_time = time(NULL); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 941 | lock->next = repo->locks; |
| 942 | repo->locks = lock; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 943 | } |
| 944 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 945 | return lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 946 | } |
| 947 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 948 | static int unlock_remote(struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 949 | { |
| 950 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 951 | struct slot_results results; |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 952 | struct remote_lock *prev = repo->locks; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 953 | struct curl_slist *dav_headers; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 954 | int rc = 0; |
| 955 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 956 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 957 | |
| 958 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 959 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 960 | curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 961 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
| 962 | |
| 963 | if (start_active_slot(slot)) { |
| 964 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 965 | if (results.curl_result == CURLE_OK) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 966 | rc = 1; |
| 967 | else |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 968 | fprintf(stderr, "UNLOCK HTTP error %ld\n", |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 969 | results.http_code); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 970 | } else { |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 971 | fprintf(stderr, "Unable to start UNLOCK request\n"); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 972 | } |
| 973 | |
| 974 | curl_slist_free_all(dav_headers); |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 975 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 976 | if (repo->locks == lock) { |
| 977 | repo->locks = lock->next; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 978 | } else { |
| 979 | while (prev && prev->next != lock) |
| 980 | prev = prev->next; |
| 981 | if (prev) |
| 982 | prev->next = prev->next->next; |
| 983 | } |
| 984 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 985 | free(lock->owner); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 986 | free(lock->url); |
| 987 | free(lock->token); |
| 988 | free(lock); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 989 | |
| 990 | return rc; |
| 991 | } |
| 992 | |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 993 | static void remove_locks(void) |
| 994 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 995 | struct remote_lock *lock = repo->locks; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 996 | |
| 997 | fprintf(stderr, "Removing remote locks...\n"); |
| 998 | while (lock) { |
Alex Riesen | 6589ebf | 2009-05-24 15:16:49 +0200 | [diff] [blame] | 999 | struct remote_lock *next = lock->next; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1000 | unlock_remote(lock); |
Alex Riesen | 6589ebf | 2009-05-24 15:16:49 +0200 | [diff] [blame] | 1001 | lock = next; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1002 | } |
| 1003 | } |
| 1004 | |
| 1005 | static void remove_locks_on_signal(int signo) |
| 1006 | { |
| 1007 | remove_locks(); |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 1008 | sigchain_pop(signo); |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1009 | raise(signo); |
| 1010 | } |
| 1011 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1012 | static void remote_ls(const char *path, int flags, |
| 1013 | void (*userFunc)(struct remote_ls_ctx *ls), |
| 1014 | void *userData); |
| 1015 | |
Jeff King | 67a31f6 | 2014-06-19 17:58:10 -0400 | [diff] [blame] | 1016 | /* extract hex from sharded "xx/x{40}" filename */ |
| 1017 | static int get_sha1_hex_from_objpath(const char *path, unsigned char *sha1) |
| 1018 | { |
| 1019 | char hex[40]; |
| 1020 | |
| 1021 | if (strlen(path) != 41) |
| 1022 | return -1; |
| 1023 | |
| 1024 | memcpy(hex, path, 2); |
| 1025 | path += 2; |
| 1026 | path++; /* skip '/' */ |
| 1027 | memcpy(hex, path, 38); |
| 1028 | |
| 1029 | return get_sha1_hex(hex, sha1); |
| 1030 | } |
| 1031 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1032 | static void process_ls_object(struct remote_ls_ctx *ls) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1033 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1034 | unsigned int *parent = (unsigned int *)ls->userData; |
Jeff King | 67a31f6 | 2014-06-19 17:58:10 -0400 | [diff] [blame] | 1035 | const char *path = ls->dentry_name; |
| 1036 | unsigned char sha1[20]; |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1037 | |
| 1038 | if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) { |
| 1039 | remote_dir_exists[*parent] = 1; |
| 1040 | return; |
| 1041 | } |
| 1042 | |
Jeff King | 67a31f6 | 2014-06-19 17:58:10 -0400 | [diff] [blame] | 1043 | if (!skip_prefix(path, "objects/", &path) || |
| 1044 | get_sha1_hex_from_objpath(path, sha1)) |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1045 | return; |
Jeff King | 67a31f6 | 2014-06-19 17:58:10 -0400 | [diff] [blame] | 1046 | |
| 1047 | one_remote_object(sha1); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1048 | } |
| 1049 | |
| 1050 | static void process_ls_ref(struct remote_ls_ctx *ls) |
| 1051 | { |
| 1052 | if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) { |
| 1053 | fprintf(stderr, " %s\n", ls->dentry_name); |
| 1054 | return; |
| 1055 | } |
| 1056 | |
| 1057 | if (!(ls->dentry_flags & IS_DIR)) |
| 1058 | one_remote_ref(ls->dentry_name); |
| 1059 | } |
| 1060 | |
| 1061 | static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) |
| 1062 | { |
| 1063 | struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData; |
| 1064 | |
| 1065 | if (tag_closed) { |
| 1066 | if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) { |
| 1067 | if (ls->dentry_flags & IS_DIR) { |
Tay Ray Chuan | 0fdadc5 | 2010-11-25 16:21:07 +0800 | [diff] [blame] | 1068 | |
| 1069 | /* ensure collection names end with slash */ |
| 1070 | str_end_url_with_slash(ls->dentry_name, &ls->dentry_name); |
| 1071 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1072 | if (ls->flags & PROCESS_DIRS) { |
| 1073 | ls->userFunc(ls); |
| 1074 | } |
| 1075 | if (strcmp(ls->dentry_name, ls->path) && |
| 1076 | ls->flags & RECURSIVE) { |
| 1077 | remote_ls(ls->dentry_name, |
| 1078 | ls->flags, |
| 1079 | ls->userFunc, |
| 1080 | ls->userData); |
| 1081 | } |
| 1082 | } else if (ls->flags & PROCESS_FILES) { |
| 1083 | ls->userFunc(ls); |
| 1084 | } |
| 1085 | } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 1086 | char *path = ctx->cdata; |
| 1087 | if (*ctx->cdata == 'h') { |
| 1088 | path = strstr(path, "//"); |
| 1089 | if (path) { |
| 1090 | path = strchr(path+2, '/'); |
| 1091 | } |
| 1092 | } |
| 1093 | if (path) { |
Tay Ray Chuan | dfc2dcd | 2010-11-25 16:21:08 +0800 | [diff] [blame] | 1094 | const char *url = repo->url; |
| 1095 | if (repo->path) |
| 1096 | url = repo->path; |
| 1097 | if (strncmp(path, url, repo->path_len)) |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 1098 | error("Parsed path '%s' does not match url: '%s'", |
Tay Ray Chuan | dfc2dcd | 2010-11-25 16:21:08 +0800 | [diff] [blame] | 1099 | path, url); |
| 1100 | else { |
| 1101 | path += repo->path_len; |
| 1102 | ls->dentry_name = xstrdup(path); |
| 1103 | } |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 1104 | } |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1105 | } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { |
| 1106 | ls->dentry_flags |= IS_DIR; |
| 1107 | } |
| 1108 | } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) { |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 1109 | free(ls->dentry_name); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1110 | ls->dentry_name = NULL; |
| 1111 | ls->dentry_flags = 0; |
| 1112 | } |
| 1113 | } |
| 1114 | |
Johannes Schindelin | 2064280 | 2009-01-17 16:36:26 +0100 | [diff] [blame] | 1115 | /* |
| 1116 | * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it |
| 1117 | * should _only_ heed the information from that file, instead of trying to |
| 1118 | * determine the refs from the remote file system (badly: it does not even |
| 1119 | * know about packed-refs). |
| 1120 | */ |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1121 | static void remote_ls(const char *path, int flags, |
| 1122 | void (*userFunc)(struct remote_ls_ctx *ls), |
| 1123 | void *userData) |
| 1124 | { |
Jeff King | 2831018 | 2014-06-19 17:24:33 -0400 | [diff] [blame] | 1125 | char *url = xstrfmt("%s%s", repo->url, path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1126 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1127 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1128 | struct strbuf in_buffer = STRBUF_INIT; |
| 1129 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1130 | struct curl_slist *dav_headers = NULL; |
| 1131 | struct xml_ctx ctx; |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1132 | struct remote_ls_ctx ls; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1133 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1134 | ls.flags = flags; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1135 | ls.path = xstrdup(path); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1136 | ls.dentry_name = NULL; |
| 1137 | ls.dentry_flags = 0; |
| 1138 | ls.userData = userData; |
| 1139 | ls.userFunc = userFunc; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1140 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1141 | strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1142 | |
| 1143 | dav_headers = curl_slist_append(dav_headers, "Depth: 1"); |
| 1144 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
| 1145 | |
| 1146 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1147 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1148 | curl_setup_http(slot->curl, url, DAV_PROPFIND, |
| 1149 | &out_buffer, fwrite_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1150 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1151 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1152 | |
| 1153 | if (start_active_slot(slot)) { |
| 1154 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1155 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1156 | XML_Parser parser = XML_ParserCreate(NULL); |
| 1157 | enum XML_Status result; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1158 | ctx.name = xcalloc(10, 1); |
| 1159 | ctx.len = 0; |
| 1160 | ctx.cdata = NULL; |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1161 | ctx.userFunc = handle_remote_ls_ctx; |
| 1162 | ctx.userData = &ls; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1163 | XML_SetUserData(parser, &ctx); |
| 1164 | XML_SetElementHandler(parser, xml_start_tag, |
| 1165 | xml_end_tag); |
| 1166 | XML_SetCharacterDataHandler(parser, xml_cdata); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1167 | result = XML_Parse(parser, in_buffer.buf, |
| 1168 | in_buffer.len, 1); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1169 | free(ctx.name); |
| 1170 | |
| 1171 | if (result != XML_STATUS_OK) { |
| 1172 | fprintf(stderr, "XML error: %s\n", |
| 1173 | XML_ErrorString( |
| 1174 | XML_GetErrorCode(parser))); |
| 1175 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1176 | XML_ParserFree(parser); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1177 | } |
| 1178 | } else { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1179 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1180 | } |
| 1181 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1182 | free(ls.path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1183 | free(url); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1184 | strbuf_release(&out_buffer.buf); |
| 1185 | strbuf_release(&in_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1186 | curl_slist_free_all(dav_headers); |
| 1187 | } |
| 1188 | |
| 1189 | static void get_remote_object_list(unsigned char parent) |
| 1190 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1191 | char path[] = "objects/XX/"; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1192 | static const char hex[] = "0123456789abcdef"; |
| 1193 | unsigned int val = parent; |
| 1194 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1195 | path[8] = hex[val >> 4]; |
| 1196 | path[9] = hex[val & 0xf]; |
| 1197 | remote_dir_exists[val] = 0; |
| 1198 | remote_ls(path, (PROCESS_FILES | PROCESS_DIRS), |
| 1199 | process_ls_object, &val); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1200 | } |
| 1201 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1202 | static int locking_available(void) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1203 | { |
| 1204 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1205 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1206 | struct strbuf in_buffer = STRBUF_INIT; |
| 1207 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1208 | struct curl_slist *dav_headers = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1209 | struct xml_ctx ctx; |
| 1210 | int lock_flags = 0; |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 1211 | char *escaped; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1212 | |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 1213 | escaped = xml_entities(repo->url); |
| 1214 | strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, escaped); |
| 1215 | free(escaped); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1216 | |
| 1217 | dav_headers = curl_slist_append(dav_headers, "Depth: 0"); |
| 1218 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1219 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1220 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1221 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1222 | curl_setup_http(slot->curl, repo->url, DAV_PROPFIND, |
| 1223 | &out_buffer, fwrite_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1224 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1225 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1226 | |
| 1227 | if (start_active_slot(slot)) { |
| 1228 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1229 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1230 | XML_Parser parser = XML_ParserCreate(NULL); |
| 1231 | enum XML_Status result; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1232 | ctx.name = xcalloc(10, 1); |
| 1233 | ctx.len = 0; |
| 1234 | ctx.cdata = NULL; |
| 1235 | ctx.userFunc = handle_lockprop_ctx; |
| 1236 | ctx.userData = &lock_flags; |
| 1237 | XML_SetUserData(parser, &ctx); |
| 1238 | XML_SetElementHandler(parser, xml_start_tag, |
| 1239 | xml_end_tag); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1240 | result = XML_Parse(parser, in_buffer.buf, |
| 1241 | in_buffer.len, 1); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1242 | free(ctx.name); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1243 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1244 | if (result != XML_STATUS_OK) { |
| 1245 | fprintf(stderr, "XML error: %s\n", |
| 1246 | XML_ErrorString( |
| 1247 | XML_GetErrorCode(parser))); |
| 1248 | lock_flags = 0; |
| 1249 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1250 | XML_ParserFree(parser); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1251 | if (!lock_flags) |
Miklos Vajna | d5c87cb | 2009-03-24 02:09:09 +0100 | [diff] [blame] | 1252 | error("no DAV locking support on %s", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1253 | repo->url); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1254 | |
| 1255 | } else { |
| 1256 | error("Cannot access URL %s, return code %d", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1257 | repo->url, results.curl_result); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1258 | lock_flags = 0; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1259 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1260 | } else { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1261 | error("Unable to start PROPFIND request on %s", repo->url); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1262 | } |
| 1263 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1264 | strbuf_release(&out_buffer.buf); |
| 1265 | strbuf_release(&in_buffer); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1266 | curl_slist_free_all(dav_headers); |
| 1267 | |
| 1268 | return lock_flags; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1269 | } |
| 1270 | |
Pierre Habouzit | b5bf7cd | 2006-08-23 12:39:12 +0200 | [diff] [blame] | 1271 | static struct object_list **add_one_object(struct object *obj, struct object_list **p) |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1272 | { |
| 1273 | struct object_list *entry = xmalloc(sizeof(struct object_list)); |
| 1274 | entry->item = obj; |
| 1275 | entry->next = *p; |
| 1276 | *p = entry; |
| 1277 | return &entry->next; |
| 1278 | } |
| 1279 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1280 | static struct object_list **process_blob(struct blob *blob, |
| 1281 | struct object_list **p, |
| 1282 | struct name_path *path, |
| 1283 | const char *name) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1284 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1285 | struct object *obj = &blob->object; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1286 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1287 | obj->flags |= LOCAL; |
| 1288 | |
| 1289 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1290 | return p; |
| 1291 | |
| 1292 | obj->flags |= SEEN; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1293 | return add_one_object(obj, p); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1294 | } |
| 1295 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1296 | static struct object_list **process_tree(struct tree *tree, |
| 1297 | struct object_list **p, |
| 1298 | struct name_path *path, |
| 1299 | const char *name) |
| 1300 | { |
| 1301 | struct object *obj = &tree->object; |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1302 | struct tree_desc desc; |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1303 | struct name_entry entry; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1304 | struct name_path me; |
| 1305 | |
| 1306 | obj->flags |= LOCAL; |
| 1307 | |
| 1308 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1309 | return p; |
| 1310 | if (parse_tree(tree) < 0) |
| 1311 | die("bad tree object %s", sha1_to_hex(obj->sha1)); |
| 1312 | |
| 1313 | obj->flags |= SEEN; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1314 | name = xstrdup(name); |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1315 | p = add_one_object(obj, p); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1316 | me.up = path; |
| 1317 | me.elem = name; |
| 1318 | me.elem_len = strlen(name); |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1319 | |
Linus Torvalds | 6fda5e5 | 2007-03-21 10:08:25 -0700 | [diff] [blame] | 1320 | init_tree_desc(&desc, tree->buffer, tree->size); |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1321 | |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1322 | while (tree_entry(&desc, &entry)) |
| 1323 | switch (object_type(entry.mode)) { |
| 1324 | case OBJ_TREE: |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1325 | p = process_tree(lookup_tree(entry.sha1), p, &me, name); |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1326 | break; |
| 1327 | case OBJ_BLOB: |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1328 | p = process_blob(lookup_blob(entry.sha1), p, &me, name); |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1329 | break; |
| 1330 | default: |
| 1331 | /* Subproject commit - not in this repository */ |
| 1332 | break; |
| 1333 | } |
| 1334 | |
Jeff King | 6e454b9 | 2013-06-05 18:37:39 -0400 | [diff] [blame] | 1335 | free_tree_buffer(tree); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1336 | return p; |
| 1337 | } |
| 1338 | |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1339 | static int get_delta(struct rev_info *revs, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1340 | { |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1341 | int i; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1342 | struct commit *commit; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1343 | struct object_list **p = &objects; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1344 | int count = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1345 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1346 | while ((commit = get_revision(revs)) != NULL) { |
| 1347 | p = process_tree(commit->tree, p, NULL, ""); |
| 1348 | commit->object.flags |= LOCAL; |
| 1349 | if (!(commit->object.flags & UNINTERESTING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1350 | count += add_send_request(&commit->object, lock); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1351 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1352 | |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1353 | for (i = 0; i < revs->pending.nr; i++) { |
| 1354 | struct object_array_entry *entry = revs->pending.objects + i; |
| 1355 | struct object *obj = entry->item; |
| 1356 | const char *name = entry->name; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1357 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1358 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1359 | continue; |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1360 | if (obj->type == OBJ_TAG) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1361 | obj->flags |= SEEN; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1362 | p = add_one_object(obj, p); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1363 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1364 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1365 | if (obj->type == OBJ_TREE) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1366 | p = process_tree((struct tree *)obj, p, NULL, name); |
| 1367 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1368 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1369 | if (obj->type == OBJ_BLOB) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1370 | p = process_blob((struct blob *)obj, p, NULL, name); |
| 1371 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1372 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1373 | die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); |
| 1374 | } |
| 1375 | |
| 1376 | while (objects) { |
| 1377 | if (!(objects->item->flags & UNINTERESTING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1378 | count += add_send_request(objects->item, lock); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1379 | objects = objects->next; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1380 | } |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1381 | |
| 1382 | return count; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1383 | } |
| 1384 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1385 | static int update_remote(unsigned char *sha1, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1386 | { |
| 1387 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1388 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1389 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1390 | struct curl_slist *dav_headers; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1391 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1392 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1393 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1394 | strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1)); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1395 | |
| 1396 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1397 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1398 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
| 1399 | &out_buffer, fwrite_null); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1400 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1401 | |
| 1402 | if (start_active_slot(slot)) { |
| 1403 | run_active_slot(slot); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1404 | strbuf_release(&out_buffer.buf); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1405 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1406 | fprintf(stderr, |
| 1407 | "PUT error: curl result=%d, HTTP code=%ld\n", |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1408 | results.curl_result, results.http_code); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1409 | /* We should attempt recovery? */ |
| 1410 | return 0; |
| 1411 | } |
| 1412 | } else { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1413 | strbuf_release(&out_buffer.buf); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1414 | fprintf(stderr, "Unable to start PUT request\n"); |
| 1415 | return 0; |
| 1416 | } |
| 1417 | |
| 1418 | return 1; |
| 1419 | } |
| 1420 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1421 | static struct ref *remote_refs; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1422 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 1423 | static void one_remote_ref(const char *refname) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1424 | { |
| 1425 | struct ref *ref; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1426 | struct object *obj; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1427 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 1428 | ref = alloc_ref(refname); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1429 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1430 | if (http_fetch_ref(repo->url, ref) != 0) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1431 | fprintf(stderr, |
| 1432 | "Unable to fetch ref %s from %s\n", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1433 | refname, repo->url); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1434 | free(ref); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1435 | return; |
| 1436 | } |
| 1437 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1438 | /* |
| 1439 | * Fetch a copy of the object if it doesn't exist locally - it |
| 1440 | * may be required for updating server info later. |
| 1441 | */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1442 | if (repo->can_update_info_refs && !has_sha1_file(ref->old_sha1)) { |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1443 | obj = lookup_unknown_object(ref->old_sha1); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1444 | if (obj) { |
| 1445 | fprintf(stderr, " fetch %s for %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1446 | sha1_to_hex(ref->old_sha1), refname); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1447 | add_fetch_request(obj); |
| 1448 | } |
| 1449 | } |
| 1450 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1451 | ref->next = remote_refs; |
| 1452 | remote_refs = ref; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1453 | } |
| 1454 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1455 | static void get_dav_remote_heads(void) |
| 1456 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1457 | remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1458 | } |
| 1459 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1460 | static void add_remote_info_ref(struct remote_ls_ctx *ls) |
| 1461 | { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1462 | struct strbuf *buf = (struct strbuf *)ls->userData; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1463 | struct object *o; |
| 1464 | int len; |
| 1465 | char *ref_info; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1466 | struct ref *ref; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1467 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 1468 | ref = alloc_ref(ls->dentry_name); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1469 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1470 | if (http_fetch_ref(repo->url, ref) != 0) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1471 | fprintf(stderr, |
| 1472 | "Unable to fetch ref %s from %s\n", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1473 | ls->dentry_name, repo->url); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1474 | aborted = 1; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1475 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1476 | return; |
| 1477 | } |
| 1478 | |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1479 | o = parse_object(ref->old_sha1); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1480 | if (!o) { |
| 1481 | fprintf(stderr, |
| 1482 | "Unable to parse object %s for remote ref %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1483 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1484 | aborted = 1; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1485 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1486 | return; |
| 1487 | } |
| 1488 | |
| 1489 | len = strlen(ls->dentry_name) + 42; |
| 1490 | ref_info = xcalloc(len + 1, 1); |
| 1491 | sprintf(ref_info, "%s %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1492 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1493 | fwrite_buffer(ref_info, 1, len, buf); |
| 1494 | free(ref_info); |
| 1495 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1496 | if (o->type == OBJ_TAG) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1497 | o = deref_tag(o, ls->dentry_name, 0); |
| 1498 | if (o) { |
| 1499 | len = strlen(ls->dentry_name) + 45; |
| 1500 | ref_info = xcalloc(len + 1, 1); |
| 1501 | sprintf(ref_info, "%s %s^{}\n", |
| 1502 | sha1_to_hex(o->sha1), ls->dentry_name); |
| 1503 | fwrite_buffer(ref_info, 1, len, buf); |
| 1504 | free(ref_info); |
| 1505 | } |
| 1506 | } |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1507 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1508 | } |
| 1509 | |
| 1510 | static void update_remote_info_refs(struct remote_lock *lock) |
| 1511 | { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1512 | struct buffer buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1513 | struct active_request_slot *slot; |
| 1514 | struct slot_results results; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1515 | struct curl_slist *dav_headers; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1516 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1517 | remote_ls("refs/", (PROCESS_FILES | RECURSIVE), |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1518 | add_remote_info_ref, &buffer.buf); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1519 | if (!aborted) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1520 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1521 | |
| 1522 | slot = get_active_slot(); |
| 1523 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1524 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
| 1525 | &buffer, fwrite_null); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1526 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1527 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1528 | if (start_active_slot(slot)) { |
| 1529 | run_active_slot(slot); |
| 1530 | if (results.curl_result != CURLE_OK) { |
| 1531 | fprintf(stderr, |
| 1532 | "PUT error: curl result=%d, HTTP code=%ld\n", |
| 1533 | results.curl_result, results.http_code); |
| 1534 | } |
| 1535 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1536 | } |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1537 | strbuf_release(&buffer.buf); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1538 | } |
| 1539 | |
| 1540 | static int remote_exists(const char *path) |
| 1541 | { |
Jeff King | 2831018 | 2014-06-19 17:24:33 -0400 | [diff] [blame] | 1542 | char *url = xstrfmt("%s%s", repo->url, path); |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1543 | int ret; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1544 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1545 | |
Jeff King | 1bbcc22 | 2013-09-28 04:31:23 -0400 | [diff] [blame] | 1546 | switch (http_get_strbuf(url, NULL, NULL)) { |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1547 | case HTTP_OK: |
| 1548 | ret = 1; |
| 1549 | break; |
| 1550 | case HTTP_MISSING_TARGET: |
| 1551 | ret = 0; |
| 1552 | break; |
| 1553 | case HTTP_ERROR: |
Jeff King | 4df13f6 | 2013-04-05 18:22:31 -0400 | [diff] [blame] | 1554 | error("unable to access '%s': %s", url, curl_errorstr); |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1555 | default: |
| 1556 | ret = -1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1557 | } |
Mike Hommey | 3a462bc | 2007-12-10 22:36:11 +0100 | [diff] [blame] | 1558 | free(url); |
| 1559 | return ret; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1560 | } |
| 1561 | |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 1562 | static void fetch_symref(const char *path, char **symref, unsigned char *sha1) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1563 | { |
Jeff King | 2831018 | 2014-06-19 17:24:33 -0400 | [diff] [blame] | 1564 | char *url = xstrfmt("%s%s", repo->url, path); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1565 | struct strbuf buffer = STRBUF_INIT; |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 1566 | const char *name; |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1567 | |
Jeff King | 1bbcc22 | 2013-09-28 04:31:23 -0400 | [diff] [blame] | 1568 | if (http_get_strbuf(url, &buffer, NULL) != HTTP_OK) |
Mike Hommey | 9af5abd | 2009-06-06 16:43:58 +0800 | [diff] [blame] | 1569 | die("Couldn't get %s for remote symref\n%s", url, |
| 1570 | curl_errorstr); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1571 | free(url); |
| 1572 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 1573 | free(*symref); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1574 | *symref = NULL; |
Junio C Hamano | a8e0d16 | 2006-08-23 13:57:23 -0700 | [diff] [blame] | 1575 | hashclr(sha1); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1576 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1577 | if (buffer.len == 0) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1578 | return; |
| 1579 | |
| 1580 | /* If it's a symref, set the refname; otherwise try for a sha1 */ |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 1581 | if (skip_prefix(buffer.buf, "ref: ", &name)) { |
| 1582 | *symref = xmemdupz(name, buffer.len - (name - buffer.buf)); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1583 | } else { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1584 | get_sha1_hex(buffer.buf, sha1); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1585 | } |
| 1586 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1587 | strbuf_release(&buffer); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1588 | } |
| 1589 | |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1590 | static int verify_merge_base(unsigned char *head_sha1, struct ref *remote) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1591 | { |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1592 | struct commit *head = lookup_commit_or_die(head_sha1, "HEAD"); |
| 1593 | struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1594 | |
Junio C Hamano | 6571225 | 2012-08-27 15:21:37 -0700 | [diff] [blame] | 1595 | return in_merge_bases(branch, head); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1596 | } |
| 1597 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 1598 | static int delete_remote_branch(const char *pattern, int force) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1599 | { |
| 1600 | struct ref *refs = remote_refs; |
| 1601 | struct ref *remote_ref = NULL; |
| 1602 | unsigned char head_sha1[20]; |
| 1603 | char *symref = NULL; |
| 1604 | int match; |
| 1605 | int patlen = strlen(pattern); |
| 1606 | int i; |
| 1607 | struct active_request_slot *slot; |
| 1608 | struct slot_results results; |
| 1609 | char *url; |
| 1610 | |
| 1611 | /* Find the remote branch(es) matching the specified branch name */ |
| 1612 | for (match = 0; refs; refs = refs->next) { |
| 1613 | char *name = refs->name; |
| 1614 | int namelen = strlen(name); |
| 1615 | if (namelen < patlen || |
| 1616 | memcmp(name + namelen - patlen, pattern, patlen)) |
| 1617 | continue; |
| 1618 | if (namelen != patlen && name[namelen - patlen - 1] != '/') |
| 1619 | continue; |
| 1620 | match++; |
| 1621 | remote_ref = refs; |
| 1622 | } |
| 1623 | if (match == 0) |
| 1624 | return error("No remote branch matches %s", pattern); |
| 1625 | if (match != 1) |
| 1626 | return error("More than one remote branch matches %s", |
| 1627 | pattern); |
| 1628 | |
| 1629 | /* |
| 1630 | * Remote HEAD must be a symref (not exactly foolproof; a remote |
| 1631 | * symlink to a symref will look like a symref) |
| 1632 | */ |
| 1633 | fetch_symref("HEAD", &symref, head_sha1); |
| 1634 | if (!symref) |
| 1635 | return error("Remote HEAD is not a symref"); |
| 1636 | |
| 1637 | /* Remote branch must not be the remote HEAD */ |
Junio C Hamano | cd2b8ae | 2011-08-25 14:46:52 -0700 | [diff] [blame] | 1638 | for (i = 0; symref && i < MAXDEPTH; i++) { |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1639 | if (!strcmp(remote_ref->name, symref)) |
| 1640 | return error("Remote branch %s is the current HEAD", |
| 1641 | remote_ref->name); |
| 1642 | fetch_symref(symref, &symref, head_sha1); |
| 1643 | } |
| 1644 | |
| 1645 | /* Run extra sanity checks if delete is not forced */ |
| 1646 | if (!force) { |
| 1647 | /* Remote HEAD must resolve to a known object */ |
| 1648 | if (symref) |
| 1649 | return error("Remote HEAD symrefs too deep"); |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1650 | if (is_null_sha1(head_sha1)) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1651 | return error("Unable to resolve remote HEAD"); |
| 1652 | if (!has_sha1_file(head_sha1)) |
| 1653 | return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1)); |
| 1654 | |
| 1655 | /* Remote branch must resolve to a known object */ |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1656 | if (is_null_sha1(remote_ref->old_sha1)) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1657 | return error("Unable to resolve remote branch %s", |
| 1658 | remote_ref->name); |
| 1659 | if (!has_sha1_file(remote_ref->old_sha1)) |
| 1660 | 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)); |
| 1661 | |
| 1662 | /* Remote branch must be an ancestor of remote HEAD */ |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1663 | if (!verify_merge_base(head_sha1, remote_ref)) { |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1664 | return error("The branch '%s' is not an ancestor " |
| 1665 | "of your current HEAD.\n" |
| 1666 | "If you are sure you want to delete it," |
| 1667 | " run:\n\t'git http-push -D %s %s'", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1668 | remote_ref->name, repo->url, pattern); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1669 | } |
| 1670 | } |
| 1671 | |
| 1672 | /* Send delete request */ |
| 1673 | fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1674 | if (dry_run) |
| 1675 | return 0; |
Jeff King | 2831018 | 2014-06-19 17:24:33 -0400 | [diff] [blame] | 1676 | url = xstrfmt("%s%s", repo->url, remote_ref->name); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1677 | slot = get_active_slot(); |
| 1678 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1679 | curl_setup_http_get(slot->curl, url, DAV_DELETE); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1680 | if (start_active_slot(slot)) { |
| 1681 | run_active_slot(slot); |
| 1682 | free(url); |
| 1683 | if (results.curl_result != CURLE_OK) |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 1684 | return error("DELETE request failed (%d/%ld)", |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1685 | results.curl_result, results.http_code); |
| 1686 | } else { |
| 1687 | free(url); |
| 1688 | return error("Unable to start DELETE request"); |
| 1689 | } |
| 1690 | |
| 1691 | return 0; |
| 1692 | } |
| 1693 | |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 1694 | static void run_request_queue(void) |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1695 | { |
| 1696 | #ifdef USE_CURL_MULTI |
| 1697 | is_running_queue = 1; |
| 1698 | fill_active_slots(); |
| 1699 | add_fill_function(NULL, fill_active_slot); |
| 1700 | #endif |
| 1701 | do { |
| 1702 | finish_all_active_slots(); |
| 1703 | #ifdef USE_CURL_MULTI |
| 1704 | fill_active_slots(); |
| 1705 | #endif |
| 1706 | } while (request_queue_head && !aborted); |
| 1707 | |
| 1708 | #ifdef USE_CURL_MULTI |
| 1709 | is_running_queue = 0; |
| 1710 | #endif |
| 1711 | } |
| 1712 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1713 | int main(int argc, char **argv) |
| 1714 | { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1715 | struct transfer_request *request; |
| 1716 | struct transfer_request *next_request; |
| 1717 | int nr_refspec = 0; |
| 1718 | char **refspec = NULL; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 1719 | struct remote_lock *ref_lock = NULL; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1720 | struct remote_lock *info_ref_lock = NULL; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1721 | struct rev_info revs; |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1722 | int delete_branch = 0; |
| 1723 | int force_delete = 0; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1724 | int objects_to_send; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1725 | int rc = 0; |
| 1726 | int i; |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1727 | int new_refs; |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 1728 | struct ref *ref, *local_refs; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1729 | |
Ævar Arnfjörð Bjarmason | 5e9637c | 2011-11-18 00:14:42 +0100 | [diff] [blame] | 1730 | git_setup_gettext(); |
| 1731 | |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 1732 | git_extract_argv0_path(argv[0]); |
| 1733 | |
Brian Gesiak | f3d51ff | 2014-05-27 00:33:50 +0900 | [diff] [blame] | 1734 | repo = xcalloc(1, sizeof(*repo)); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1735 | |
| 1736 | argv++; |
| 1737 | for (i = 1; i < argc; i++, argv++) { |
| 1738 | char *arg = *argv; |
| 1739 | |
| 1740 | if (*arg == '-') { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1741 | if (!strcmp(arg, "--all")) { |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 1742 | push_all = MATCH_REFS_ALL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1743 | continue; |
| 1744 | } |
| 1745 | if (!strcmp(arg, "--force")) { |
| 1746 | force_all = 1; |
| 1747 | continue; |
| 1748 | } |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 1749 | if (!strcmp(arg, "--dry-run")) { |
| 1750 | dry_run = 1; |
| 1751 | continue; |
| 1752 | } |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1753 | if (!strcmp(arg, "--helper-status")) { |
| 1754 | helper_status = 1; |
| 1755 | continue; |
| 1756 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1757 | if (!strcmp(arg, "--verbose")) { |
| 1758 | push_verbosely = 1; |
Tay Ray Chuan | e917674 | 2009-06-06 16:43:41 +0800 | [diff] [blame] | 1759 | http_is_verbose = 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1760 | continue; |
| 1761 | } |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1762 | if (!strcmp(arg, "-d")) { |
| 1763 | delete_branch = 1; |
| 1764 | continue; |
| 1765 | } |
| 1766 | if (!strcmp(arg, "-D")) { |
| 1767 | delete_branch = 1; |
| 1768 | force_delete = 1; |
| 1769 | continue; |
| 1770 | } |
Jonathan Nieder | 548d346 | 2009-11-09 04:47:34 -0600 | [diff] [blame] | 1771 | if (!strcmp(arg, "-h")) |
| 1772 | usage(http_push_usage); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1773 | } |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1774 | if (!repo->url) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1775 | char *path = strstr(arg, "//"); |
Tay Ray Chuan | 1462d1a | 2010-11-25 16:21:09 +0800 | [diff] [blame] | 1776 | str_end_url_with_slash(arg, &repo->url); |
| 1777 | repo->path_len = strlen(repo->url); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1778 | if (path) { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1779 | repo->path = strchr(path+2, '/'); |
| 1780 | if (repo->path) |
| 1781 | repo->path_len = strlen(repo->path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1782 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1783 | continue; |
| 1784 | } |
| 1785 | refspec = argv; |
| 1786 | nr_refspec = argc - i; |
| 1787 | break; |
| 1788 | } |
| 1789 | |
Grégoire Barbier | f854824 | 2008-01-13 20:02:59 +0100 | [diff] [blame] | 1790 | #ifndef USE_CURL_MULTI |
| 1791 | die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI"); |
| 1792 | #endif |
| 1793 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1794 | if (!repo->url) |
Nick Hengeveld | 3e9fabc | 2005-11-29 09:33:36 -0800 | [diff] [blame] | 1795 | usage(http_push_usage); |
| 1796 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1797 | if (delete_branch && nr_refspec != 1) |
| 1798 | die("You must specify only one branch name when deleting a remote branch"); |
| 1799 | |
Jonathan Nieder | 548d346 | 2009-11-09 04:47:34 -0600 | [diff] [blame] | 1800 | setup_git_directory(); |
| 1801 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1802 | memset(remote_dir_exists, -1, 256); |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 1803 | |
Jeff King | a4ddbc3 | 2011-12-13 19:11:56 -0500 | [diff] [blame] | 1804 | http_init(NULL, repo->url, 1); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1805 | |
Tay Ray Chuan | 68862a3 | 2009-06-06 16:43:31 +0800 | [diff] [blame] | 1806 | #ifdef USE_CURL_MULTI |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1807 | is_running_queue = 0; |
Tay Ray Chuan | 68862a3 | 2009-06-06 16:43:31 +0800 | [diff] [blame] | 1808 | #endif |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1809 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1810 | /* Verify DAV compliance/lock support */ |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1811 | if (!locking_available()) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1812 | rc = 1; |
| 1813 | goto cleanup; |
| 1814 | } |
| 1815 | |
Jeff King | 57b235a | 2009-01-22 01:03:08 -0500 | [diff] [blame] | 1816 | sigchain_push_common(remove_locks_on_signal); |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1817 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1818 | /* Check whether the remote has server info files */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1819 | repo->can_update_info_refs = 0; |
| 1820 | repo->has_info_refs = remote_exists("info/refs"); |
| 1821 | repo->has_info_packs = remote_exists("objects/info/packs"); |
| 1822 | if (repo->has_info_refs) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1823 | info_ref_lock = lock_remote("info/refs", LOCK_TIME); |
| 1824 | if (info_ref_lock) |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1825 | repo->can_update_info_refs = 1; |
Grégoire Barbier | 9bdbaba | 2008-01-19 16:22:48 +0100 | [diff] [blame] | 1826 | else { |
Miklos Vajna | d5c87cb | 2009-03-24 02:09:09 +0100 | [diff] [blame] | 1827 | error("cannot lock existing info/refs"); |
Grégoire Barbier | 9bdbaba | 2008-01-19 16:22:48 +0100 | [diff] [blame] | 1828 | rc = 1; |
| 1829 | goto cleanup; |
| 1830 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1831 | } |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1832 | if (repo->has_info_packs) |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1833 | fetch_indices(); |
| 1834 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1835 | /* Get a list of all local and remote heads to validate refspecs */ |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 1836 | local_refs = get_local_heads(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1837 | fprintf(stderr, "Fetching remote heads...\n"); |
| 1838 | get_dav_remote_heads(); |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1839 | run_request_queue(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1840 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1841 | /* Remove a remote branch if -d or -D was specified */ |
| 1842 | if (delete_branch) { |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1843 | if (delete_remote_branch(refspec[0], force_delete) == -1) { |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1844 | fprintf(stderr, "Unable to delete remote branch %s\n", |
| 1845 | refspec[0]); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1846 | if (helper_status) |
| 1847 | printf("error %s cannot remove\n", refspec[0]); |
| 1848 | } |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1849 | goto cleanup; |
| 1850 | } |
| 1851 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1852 | /* match them up */ |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 1853 | if (match_push_refs(local_refs, &remote_refs, |
| 1854 | nr_refspec, (const char **) refspec, push_all)) { |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 1855 | rc = -1; |
| 1856 | goto cleanup; |
| 1857 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1858 | if (!remote_refs) { |
| 1859 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1860 | if (helper_status) |
| 1861 | printf("error null no match\n"); |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 1862 | rc = 0; |
| 1863 | goto cleanup; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1864 | } |
| 1865 | |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1866 | new_refs = 0; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1867 | for (ref = remote_refs; ref; ref = ref->next) { |
| 1868 | char old_hex[60], *new_hex; |
Nguyễn Thái Ngọc Duy | a80aad7 | 2009-05-21 19:32:44 +1000 | [diff] [blame] | 1869 | const char *commit_argv[5]; |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1870 | int commit_argc; |
| 1871 | char *new_sha1_hex, *old_sha1_hex; |
| 1872 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1873 | if (!ref->peer_ref) |
| 1874 | continue; |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1875 | |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1876 | if (is_null_sha1(ref->peer_ref->new_sha1)) { |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1877 | if (delete_remote_branch(ref->name, 1) == -1) { |
| 1878 | error("Could not remove %s", ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1879 | if (helper_status) |
| 1880 | printf("error %s cannot remove\n", ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1881 | rc = -4; |
| 1882 | } |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1883 | else if (helper_status) |
| 1884 | printf("ok %s\n", ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1885 | new_refs++; |
| 1886 | continue; |
| 1887 | } |
| 1888 | |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 1889 | if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
Tay Ray Chuan | b5e5998 | 2010-03-02 18:49:27 +0800 | [diff] [blame] | 1890 | if (push_verbosely) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1891 | fprintf(stderr, "'%s': up-to-date\n", ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1892 | if (helper_status) |
| 1893 | printf("ok %s up to date\n", ref->name); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1894 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1895 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1896 | |
| 1897 | if (!force_all && |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1898 | !is_null_sha1(ref->old_sha1) && |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1899 | !ref->force) { |
| 1900 | if (!has_sha1_file(ref->old_sha1) || |
| 1901 | !ref_newer(ref->peer_ref->new_sha1, |
| 1902 | ref->old_sha1)) { |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1903 | /* |
| 1904 | * We do not have the remote ref, or |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1905 | * we know that the remote ref is not |
| 1906 | * an ancestor of what we are trying to |
| 1907 | * push. Either way this can be losing |
| 1908 | * commits at the remote end and likely |
| 1909 | * we were not up to date to begin with. |
| 1910 | */ |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1911 | error("remote '%s' is not an ancestor of\n" |
| 1912 | "local '%s'.\n" |
| 1913 | "Maybe you are not up-to-date and " |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1914 | "need to pull first?", |
| 1915 | ref->name, |
| 1916 | ref->peer_ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1917 | if (helper_status) |
| 1918 | printf("error %s non-fast forward\n", ref->name); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1919 | rc = -2; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1920 | continue; |
| 1921 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1922 | } |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 1923 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1924 | new_refs++; |
| 1925 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); |
| 1926 | new_hex = sha1_to_hex(ref->new_sha1); |
| 1927 | |
| 1928 | fprintf(stderr, "updating '%s'", ref->name); |
| 1929 | if (strcmp(ref->name, ref->peer_ref->name)) |
| 1930 | fprintf(stderr, " using '%s'", ref->peer_ref->name); |
| 1931 | fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1932 | if (dry_run) { |
| 1933 | if (helper_status) |
| 1934 | printf("ok %s\n", ref->name); |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 1935 | continue; |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1936 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1937 | |
| 1938 | /* Lock remote branch ref */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1939 | ref_lock = lock_remote(ref->name, LOCK_TIME); |
| 1940 | if (ref_lock == NULL) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1941 | fprintf(stderr, "Unable to lock remote branch %s\n", |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1942 | ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1943 | if (helper_status) |
| 1944 | printf("error %s lock error\n", ref->name); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1945 | rc = 1; |
| 1946 | continue; |
| 1947 | } |
| 1948 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1949 | /* Set up revision info for this refspec */ |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1950 | commit_argc = 3; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1951 | new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1)); |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1952 | old_sha1_hex = NULL; |
Nick Hengeveld | 5241bfe | 2006-03-10 20:17:55 -0800 | [diff] [blame] | 1953 | commit_argv[1] = "--objects"; |
| 1954 | commit_argv[2] = new_sha1_hex; |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1955 | if (!push_all && !is_null_sha1(ref->old_sha1)) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1956 | old_sha1_hex = xmalloc(42); |
| 1957 | sprintf(old_sha1_hex, "^%s", |
| 1958 | sha1_to_hex(ref->old_sha1)); |
Nick Hengeveld | 5241bfe | 2006-03-10 20:17:55 -0800 | [diff] [blame] | 1959 | commit_argv[3] = old_sha1_hex; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1960 | commit_argc++; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1961 | } |
Nguyễn Thái Ngọc Duy | a80aad7 | 2009-05-21 19:32:44 +1000 | [diff] [blame] | 1962 | commit_argv[commit_argc] = NULL; |
Linus Torvalds | db6296a | 2006-07-28 21:21:48 -0700 | [diff] [blame] | 1963 | init_revisions(&revs, setup_git_directory()); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1964 | setup_revisions(commit_argc, commit_argv, &revs, NULL); |
Junio C Hamano | d633c88 | 2008-06-07 11:39:20 -0700 | [diff] [blame] | 1965 | revs.edge_hint = 0; /* just in case */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1966 | free(new_sha1_hex); |
| 1967 | if (old_sha1_hex) { |
| 1968 | free(old_sha1_hex); |
| 1969 | commit_argv[1] = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1970 | } |
| 1971 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1972 | /* Generate a list of objects that need to be pushed */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1973 | pushing = 0; |
Martin Koegler | 3d51e1b | 2008-02-18 08:31:56 +0100 | [diff] [blame] | 1974 | if (prepare_revision_walk(&revs)) |
| 1975 | die("revision walk setup failed"); |
Nguyễn Thái Ngọc Duy | e76a5fb | 2013-08-16 16:52:06 +0700 | [diff] [blame] | 1976 | mark_edges_uninteresting(&revs, NULL); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1977 | objects_to_send = get_delta(&revs, ref_lock); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 1978 | finish_all_active_slots(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1979 | |
| 1980 | /* Push missing objects to remote, this would be a |
| 1981 | convenient time to pack them first if appropriate. */ |
| 1982 | pushing = 1; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1983 | if (objects_to_send) |
| 1984 | fprintf(stderr, " sending %d objects\n", |
| 1985 | objects_to_send); |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1986 | |
| 1987 | run_request_queue(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1988 | |
| 1989 | /* Update the remote branch if all went well */ |
Johannes Schindelin | 7fea9c5 | 2008-02-14 23:26:12 +0000 | [diff] [blame] | 1990 | if (aborted || !update_remote(ref->new_sha1, ref_lock)) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1991 | rc = 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1992 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1993 | if (!rc) |
| 1994 | fprintf(stderr, " done\n"); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1995 | if (helper_status) |
| 1996 | printf("%s %s\n", !rc ? "ok" : "error", ref->name); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1997 | unlock_remote(ref_lock); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 1998 | check_locks(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1999 | } |
| 2000 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2001 | /* Update remote server info if appropriate */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 2002 | if (repo->has_info_refs && new_refs) { |
| 2003 | if (info_ref_lock && repo->can_update_info_refs) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2004 | fprintf(stderr, "Updating remote server info\n"); |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 2005 | if (!dry_run) |
| 2006 | update_remote_info_refs(info_ref_lock); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2007 | } else { |
| 2008 | fprintf(stderr, "Unable to update server info\n"); |
| 2009 | } |
| 2010 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2011 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2012 | cleanup: |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 2013 | if (info_ref_lock) |
| 2014 | unlock_remote(info_ref_lock); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 2015 | free(repo); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2016 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 2017 | http_cleanup(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2018 | |
| 2019 | request = request_queue_head; |
| 2020 | while (request != NULL) { |
| 2021 | next_request = request->next; |
| 2022 | release_request(request); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2023 | request = next_request; |
| 2024 | } |
| 2025 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2026 | return rc; |
| 2027 | } |