]>
Commit | Line | Data |
---|---|---|
58e60dd2 NH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
58e60dd2 NH |
3 | #include "tag.h" |
4 | #include "blob.h" | |
29508e1e | 5 | #include "http.h" |
aa1dbc98 | 6 | #include "refs.h" |
c4e05b1a | 7 | #include "diff.h" |
aa1dbc98 | 8 | #include "revision.h" |
3dfaf7bc | 9 | #include "exec_cmd.h" |
6b62816c | 10 | #include "remote.h" |
d633c882 | 11 | #include "list-objects.h" |
4a16d072 | 12 | #include "sigchain.h" |
29508e1e | 13 | |
081fd8d0 MK |
14 | #ifdef EXPAT_NEEDS_XMLPARSE_H |
15 | #include <xmlparse.h> | |
16 | #else | |
bee8e79d | 17 | #include <expat.h> |
081fd8d0 | 18 | #endif |
58e60dd2 NH |
19 | |
20 | static const char http_push_usage[] = | |
1b1dd23f | 21 | "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n"; |
58e60dd2 | 22 | |
92e2eb9c JS |
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 | ||
197e8951 | 32 | #define PREV_BUF_SIZE 4096 |
58e60dd2 | 33 | |
acf59575 | 34 | /* DAV methods */ |
58e60dd2 NH |
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" | |
3dfaf7bc | 41 | #define DAV_DELETE "DELETE" |
acf59575 NH |
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" | |
aa1dbc98 NH |
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" | |
acf59575 NH |
58 | |
59 | /* DAV request body templates */ | |
aa1dbc98 NH |
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>" | |
58e60dd2 NH |
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 | ||
75187c9d NH |
64 | #define LOCK_TIME 600 |
65 | #define LOCK_REFRESH 30 | |
66 | ||
208acbfb | 67 | /* Remember to update object flag allocation in object.h */ |
1b65a5aa JH |
68 | #define LOCAL (1u<<16) |
69 | #define REMOTE (1u<<17) | |
70 | #define FETCHING (1u<<18) | |
71 | #define PUSHING (1u<<19) | |
aa1dbc98 | 72 | |
3dfaf7bc NH |
73 | /* We allow "recursive" symbolic refs. Only within reason, though */ |
74 | #define MAXDEPTH 5 | |
75 | ||
96f1e58f DR |
76 | static int pushing; |
77 | static int aborted; | |
a3c57c9a | 78 | static signed char remote_dir_exists[256]; |
58e60dd2 | 79 | |
96f1e58f | 80 | static int push_verbosely; |
28b9d6e5 | 81 | static int push_all = MATCH_REFS_NONE; |
96f1e58f | 82 | static int force_all; |
fe5d1d3e | 83 | static int dry_run; |
ae4efe19 | 84 | static int helper_status; |
58e60dd2 | 85 | |
96f1e58f | 86 | static struct object_list *objects; |
aa1dbc98 | 87 | |
9cba13ca | 88 | struct repo { |
58e60dd2 | 89 | char *url; |
e1f33efe | 90 | char *path; |
aa1dbc98 | 91 | int path_len; |
197e8951 NH |
92 | int has_info_refs; |
93 | int can_update_info_refs; | |
94 | int has_info_packs; | |
58e60dd2 | 95 | struct packed_git *packs; |
512d632c | 96 | struct remote_lock *locks; |
58e60dd2 NH |
97 | }; |
98 | ||
7b5201a6 | 99 | static struct repo *repo; |
58e60dd2 NH |
100 | |
101 | enum transfer_state { | |
197e8951 NH |
102 | NEED_FETCH, |
103 | RUN_FETCH_LOOSE, | |
104 | RUN_FETCH_PACKED, | |
58e60dd2 NH |
105 | NEED_PUSH, |
106 | RUN_MKCOL, | |
107 | RUN_PUT, | |
108 | RUN_MOVE, | |
109 | ABORTED, | |
4b05548f | 110 | COMPLETE |
58e60dd2 NH |
111 | }; |
112 | ||
9cba13ca | 113 | struct transfer_request { |
aa1dbc98 | 114 | struct object *obj; |
58e60dd2 NH |
115 | char *url; |
116 | char *dest; | |
aa1dbc98 | 117 | struct remote_lock *lock; |
58e60dd2 NH |
118 | struct curl_slist *headers; |
119 | struct buffer buffer; | |
58e60dd2 NH |
120 | enum transfer_state state; |
121 | CURLcode curl_result; | |
122 | char errorstr[CURL_ERROR_SIZE]; | |
123 | long http_code; | |
197e8951 | 124 | void *userData; |
58e60dd2 NH |
125 | struct active_request_slot *slot; |
126 | struct transfer_request *next; | |
127 | }; | |
128 | ||
96f1e58f | 129 | static struct transfer_request *request_queue_head; |
58e60dd2 | 130 | |
9cba13ca | 131 | struct xml_ctx { |
acf59575 NH |
132 | char *name; |
133 | int len; | |
134 | char *cdata; | |
135 | void (*userFunc)(struct xml_ctx *ctx, int tag_closed); | |
136 | void *userData; | |
137 | }; | |
138 | ||
9cba13ca | 139 | struct remote_lock { |
75187c9d | 140 | char *url; |
26349b2e | 141 | char *owner; |
75187c9d | 142 | char *token; |
dfab7c14 | 143 | char tmpfile_suffix[41]; |
26349b2e NH |
144 | time_t start_time; |
145 | long timeout; | |
75187c9d | 146 | int refreshing; |
aa1dbc98 NH |
147 | struct remote_lock *next; |
148 | }; | |
149 | ||
3030baa7 NH |
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 | ||
9cba13ca | 158 | struct remote_ls_ctx { |
3030baa7 NH |
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; | |
26349b2e NH |
166 | }; |
167 | ||
b1c7d4aa TRC |
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 | ||
2aab167a | 175 | static char *xml_entities(const char *s) |
519d05be MH |
176 | { |
177 | struct strbuf buf = STRBUF_INIT; | |
37141f27 | 178 | strbuf_addstr_xml_quoted(&buf, s); |
519d05be MH |
179 | return strbuf_detach(&buf, NULL); |
180 | } | |
181 | ||
ebaaf316 DM |
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); | |
202 | curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer); | |
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 | ||
d456c9fd JH |
210 | static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) |
211 | { | |
b1c7d4aa TRC |
212 | struct strbuf buf = STRBUF_INIT; |
213 | struct curl_slist *dav_headers = NULL; | |
214 | ||
d456c9fd | 215 | if (options & DAV_HEADER_IF) { |
b1c7d4aa TRC |
216 | strbuf_addf(&buf, "If: (<%s>)", lock->token); |
217 | dav_headers = curl_slist_append(dav_headers, buf.buf); | |
218 | strbuf_reset(&buf); | |
219 | } | |
d456c9fd | 220 | if (options & DAV_HEADER_LOCK) { |
b1c7d4aa TRC |
221 | strbuf_addf(&buf, "Lock-Token: <%s>", lock->token); |
222 | dav_headers = curl_slist_append(dav_headers, buf.buf); | |
223 | strbuf_reset(&buf); | |
224 | } | |
d456c9fd | 225 | if (options & DAV_HEADER_TIMEOUT) { |
b1c7d4aa TRC |
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 | ||
29508e1e | 235 | static void finish_request(struct transfer_request *request); |
197e8951 | 236 | static void release_request(struct transfer_request *request); |
58e60dd2 | 237 | |
29508e1e | 238 | static void process_response(void *callback_data) |
58e60dd2 | 239 | { |
29508e1e NH |
240 | struct transfer_request *request = |
241 | (struct transfer_request *)callback_data; | |
58e60dd2 | 242 | |
29508e1e | 243 | finish_request(request); |
58e60dd2 NH |
244 | } |
245 | ||
dd8239f9 | 246 | #ifdef USE_CURL_MULTI |
dcdb3335 | 247 | |
197e8951 NH |
248 | static void start_fetch_loose(struct transfer_request *request) |
249 | { | |
197e8951 | 250 | struct active_request_slot *slot; |
5424bc55 | 251 | struct http_object_request *obj_req; |
197e8951 | 252 | |
5424bc55 TRC |
253 | obj_req = new_http_object_request(repo->url, request->obj->sha1); |
254 | if (obj_req == NULL) { | |
197e8951 | 255 | request->state = ABORTED; |
197e8951 NH |
256 | return; |
257 | } | |
258 | ||
5424bc55 | 259 | slot = obj_req->slot; |
197e8951 NH |
260 | slot->callback_func = process_response; |
261 | slot->callback_data = request; | |
262 | request->slot = slot; | |
5424bc55 | 263 | request->userData = obj_req; |
197e8951 NH |
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"); | |
7b5201a6 | 269 | repo->can_update_info_refs = 0; |
5424bc55 | 270 | release_http_object_request(obj_req); |
197e8951 NH |
271 | release_request(request); |
272 | } | |
273 | } | |
274 | ||
dd8239f9 JH |
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; | |
dd8239f9 | 279 | |
7b5201a6 | 280 | request->url = get_remote_object_url(repo->url, hex, 1); |
dd8239f9 JH |
281 | |
282 | slot = get_active_slot(); | |
283 | slot->callback_func = process_response; | |
284 | slot->callback_data = request; | |
ebaaf316 | 285 | curl_setup_http_get(slot->curl, request->url, DAV_MKCOL); |
dd8239f9 | 286 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); |
dd8239f9 JH |
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 | ||
197e8951 NH |
299 | static void start_fetch_packed(struct transfer_request *request) |
300 | { | |
197e8951 | 301 | struct packed_git *target; |
197e8951 NH |
302 | |
303 | struct transfer_request *check_request = request_queue_head; | |
2264dfa5 | 304 | struct http_pack_request *preq; |
197e8951 | 305 | |
7b5201a6 | 306 | target = find_sha1_pack(request->obj->sha1, repo->packs); |
197e8951 NH |
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)); | |
7b5201a6 | 309 | repo->can_update_info_refs = 0; |
197e8951 NH |
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 | ||
2264dfa5 TRC |
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; | |
197e8951 NH |
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 && | |
2264dfa5 TRC |
328 | !strcmp(check_request->url, preq->url)) { |
329 | release_http_pack_request(preq); | |
197e8951 NH |
330 | release_request(request); |
331 | return; | |
332 | } | |
333 | check_request = check_request->next; | |
334 | } | |
335 | ||
2264dfa5 TRC |
336 | preq->slot->callback_func = process_response; |
337 | preq->slot->callback_data = request; | |
338 | request->slot = preq->slot; | |
339 | request->userData = preq; | |
197e8951 NH |
340 | |
341 | /* Try to get the request started, abort the request on error */ | |
342 | request->state = RUN_FETCH_PACKED; | |
2264dfa5 | 343 | if (!start_active_slot(preq->slot)) { |
197e8951 | 344 | fprintf(stderr, "Unable to start GET request\n"); |
2264dfa5 | 345 | release_http_pack_request(preq); |
7b5201a6 | 346 | repo->can_update_info_refs = 0; |
197e8951 NH |
347 | release_request(request); |
348 | } | |
349 | } | |
350 | ||
58e60dd2 NH |
351 | static void start_put(struct transfer_request *request) |
352 | { | |
aa1dbc98 | 353 | char *hex = sha1_to_hex(request->obj->sha1); |
58e60dd2 | 354 | struct active_request_slot *slot; |
817d14a8 | 355 | struct strbuf buf = STRBUF_INIT; |
21666f1a | 356 | enum object_type type; |
58e60dd2 NH |
357 | char hdr[50]; |
358 | void *unpacked; | |
359 | unsigned long len; | |
360 | int hdrlen; | |
361 | ssize_t size; | |
ef49a7a0 | 362 | git_zstream stream; |
58e60dd2 | 363 | |
21666f1a NP |
364 | unpacked = read_sha1_file(request->obj->sha1, &type, &len); |
365 | hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1; | |
58e60dd2 NH |
366 | |
367 | /* Set it up */ | |
368 | memset(&stream, 0, sizeof(stream)); | |
55bb5c91 | 369 | git_deflate_init(&stream, zlib_compression_level); |
225a6f10 | 370 | size = git_deflate_bound(&stream, len + hdrlen); |
028c2976 MH |
371 | strbuf_init(&request->buffer.buf, size); |
372 | request->buffer.posn = 0; | |
58e60dd2 NH |
373 | |
374 | /* Compress it */ | |
028c2976 | 375 | stream.next_out = (unsigned char *)request->buffer.buf.buf; |
58e60dd2 NH |
376 | stream.avail_out = size; |
377 | ||
378 | /* First header.. */ | |
379 | stream.next_in = (void *)hdr; | |
380 | stream.avail_in = hdrlen; | |
55bb5c91 JH |
381 | while (git_deflate(&stream, 0) == Z_OK) |
382 | ; /* nothing */ | |
58e60dd2 NH |
383 | |
384 | /* Then the data itself.. */ | |
385 | stream.next_in = unpacked; | |
386 | stream.avail_in = len; | |
55bb5c91 JH |
387 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
388 | ; /* nothing */ | |
389 | git_deflate_end(&stream); | |
58e60dd2 NH |
390 | free(unpacked); |
391 | ||
028c2976 | 392 | request->buffer.buf.len = stream.total_out; |
58e60dd2 | 393 | |
817d14a8 | 394 | strbuf_addstr(&buf, "Destination: "); |
7b5201a6 | 395 | append_remote_object_url(&buf, repo->url, hex, 0); |
817d14a8 TRC |
396 | request->dest = strbuf_detach(&buf, NULL); |
397 | ||
7b5201a6 | 398 | append_remote_object_url(&buf, repo->url, hex, 0); |
dfab7c14 | 399 | strbuf_add(&buf, request->lock->tmpfile_suffix, 41); |
817d14a8 | 400 | request->url = strbuf_detach(&buf, NULL); |
58e60dd2 NH |
401 | |
402 | slot = get_active_slot(); | |
29508e1e NH |
403 | slot->callback_func = process_response; |
404 | slot->callback_data = request; | |
ebaaf316 DM |
405 | curl_setup_http(slot->curl, request->url, DAV_PUT, |
406 | &request->buffer, fwrite_null); | |
58e60dd2 NH |
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); | |
7b899967 | 414 | request->url = NULL; |
58e60dd2 NH |
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(); | |
29508e1e NH |
424 | slot->callback_func = process_response; |
425 | slot->callback_data = request; | |
ebaaf316 | 426 | curl_setup_http_get(slot->curl, request->url, DAV_MOVE); |
58e60dd2 NH |
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); | |
58e60dd2 NH |
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); | |
7b899967 | 437 | request->url = NULL; |
58e60dd2 NH |
438 | } |
439 | } | |
440 | ||
512d632c | 441 | static int refresh_lock(struct remote_lock *lock) |
75187c9d NH |
442 | { |
443 | struct active_request_slot *slot; | |
baa7b67d | 444 | struct slot_results results; |
b1c7d4aa | 445 | struct curl_slist *dav_headers; |
512d632c | 446 | int rc = 0; |
75187c9d | 447 | |
512d632c | 448 | lock->refreshing = 1; |
75187c9d | 449 | |
b1c7d4aa | 450 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT); |
75187c9d | 451 | |
512d632c NH |
452 | slot = get_active_slot(); |
453 | slot->results = &results; | |
ebaaf316 | 454 | curl_setup_http_get(slot->curl, lock->url, DAV_LOCK); |
512d632c | 455 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
75187c9d | 456 | |
512d632c NH |
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; | |
465 | } | |
466 | } | |
aa1dbc98 | 467 | |
512d632c NH |
468 | lock->refreshing = 0; |
469 | curl_slist_free_all(dav_headers); | |
aa1dbc98 | 470 | |
512d632c NH |
471 | return rc; |
472 | } | |
473 | ||
ec26b4d6 | 474 | static void check_locks(void) |
512d632c | 475 | { |
7b5201a6 | 476 | struct remote_lock *lock = repo->locks; |
512d632c NH |
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; | |
aa1dbc98 | 490 | } |
75187c9d | 491 | } |
512d632c | 492 | lock = lock->next; |
75187c9d | 493 | } |
aa1dbc98 | 494 | } |
75187c9d | 495 | |
aa1dbc98 NH |
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 | ||
8e0f7003 | 509 | free(request->url); |
aa1dbc98 | 510 | free(request); |
75187c9d NH |
511 | } |
512 | ||
58e60dd2 NH |
513 | static void finish_request(struct transfer_request *request) |
514 | { | |
2264dfa5 | 515 | struct http_pack_request *preq; |
5424bc55 | 516 | struct http_object_request *obj_req; |
197e8951 NH |
517 | |
518 | request->curl_result = request->slot->curl_result; | |
58e60dd2 NH |
519 | request->http_code = request->slot->http_code; |
520 | request->slot = NULL; | |
75187c9d | 521 | |
aa1dbc98 | 522 | /* Keep locks active */ |
512d632c | 523 | check_locks(); |
75187c9d | 524 | |
58e60dd2 NH |
525 | if (request->headers != NULL) |
526 | curl_slist_free_all(request->headers); | |
7b899967 NH |
527 | |
528 | /* URL is reused for MOVE after PUT */ | |
529 | if (request->state != RUN_PUT) { | |
530 | free(request->url); | |
531 | request->url = NULL; | |
aa1dbc98 | 532 | } |
7b899967 | 533 | |
aa1dbc98 | 534 | if (request->state == RUN_MKCOL) { |
58e60dd2 NH |
535 | if (request->curl_result == CURLE_OK || |
536 | request->http_code == 405) { | |
aa1dbc98 | 537 | remote_dir_exists[request->obj->sha1[0]] = 1; |
58e60dd2 NH |
538 | start_put(request); |
539 | } else { | |
540 | fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n", | |
aa1dbc98 | 541 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
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", | |
aa1dbc98 | 551 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
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) { | |
1a703cba NH |
558 | if (push_verbosely) |
559 | fprintf(stderr, " sent %s\n", | |
560 | sha1_to_hex(request->obj->sha1)); | |
aa1dbc98 NH |
561 | request->obj->flags |= REMOTE; |
562 | release_request(request); | |
58e60dd2 NH |
563 | } else { |
564 | fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n", | |
aa1dbc98 | 565 | sha1_to_hex(request->obj->sha1), |
58e60dd2 NH |
566 | request->curl_result, request->http_code); |
567 | request->state = ABORTED; | |
568 | aborted = 1; | |
569 | } | |
197e8951 | 570 | } else if (request->state == RUN_FETCH_LOOSE) { |
5424bc55 | 571 | obj_req = (struct http_object_request *)request->userData; |
197e8951 | 572 | |
5424bc55 TRC |
573 | if (finish_http_object_request(obj_req) == 0) |
574 | if (obj_req->rename == 0) | |
575 | request->obj->flags |= (LOCAL | REMOTE); | |
197e8951 NH |
576 | |
577 | /* Try fetching packed if necessary */ | |
5424bc55 TRC |
578 | if (request->obj->flags & LOCAL) { |
579 | release_http_object_request(obj_req); | |
197e8951 | 580 | release_request(request); |
5424bc55 | 581 | } else |
197e8951 NH |
582 | start_fetch_packed(request); |
583 | ||
584 | } else if (request->state == RUN_FETCH_PACKED) { | |
2264dfa5 | 585 | int fail = 1; |
197e8951 NH |
586 | if (request->curl_result != CURLE_OK) { |
587 | fprintf(stderr, "Unable to get pack file %s\n%s", | |
588 | request->url, curl_errorstr); | |
197e8951 | 589 | } else { |
2264dfa5 TRC |
590 | preq = (struct http_pack_request *)request->userData; |
591 | ||
592 | if (preq) { | |
609621a4 | 593 | if (finish_http_pack_request(preq) == 0) |
2264dfa5 TRC |
594 | fail = 0; |
595 | release_http_pack_request(preq); | |
197e8951 NH |
596 | } |
597 | } | |
2264dfa5 TRC |
598 | if (fail) |
599 | repo->can_update_info_refs = 0; | |
197e8951 | 600 | release_request(request); |
58e60dd2 NH |
601 | } |
602 | } | |
603 | ||
b3ca4e4e | 604 | #ifdef USE_CURL_MULTI |
4f66250d | 605 | static int is_running_queue; |
fc57b6aa | 606 | static int fill_active_slot(void *unused) |
58e60dd2 | 607 | { |
8e24cbae | 608 | struct transfer_request *request; |
58e60dd2 | 609 | |
4f66250d | 610 | if (aborted || !is_running_queue) |
45c17412 | 611 | return 0; |
58e60dd2 | 612 | |
45c17412 | 613 | for (request = request_queue_head; request; request = request->next) { |
197e8951 NH |
614 | if (request->state == NEED_FETCH) { |
615 | start_fetch_loose(request); | |
45c17412 | 616 | return 1; |
197e8951 | 617 | } else if (pushing && request->state == NEED_PUSH) { |
aa1dbc98 | 618 | if (remote_dir_exists[request->obj->sha1[0]] == 1) { |
0dd276b8 | 619 | start_put(request); |
aa1dbc98 | 620 | } else { |
0dd276b8 | 621 | start_mkcol(request); |
aa1dbc98 | 622 | } |
45c17412 | 623 | return 1; |
58e60dd2 | 624 | } |
aa1dbc98 | 625 | } |
45c17412 | 626 | return 0; |
58e60dd2 | 627 | } |
b3ca4e4e | 628 | #endif |
58e60dd2 | 629 | |
aa1dbc98 NH |
630 | static void get_remote_object_list(unsigned char parent); |
631 | ||
197e8951 NH |
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; | |
197e8951 NH |
653 | request->state = NEED_FETCH; |
654 | request->next = request_queue_head; | |
655 | request_queue_head = request; | |
656 | ||
b3ca4e4e | 657 | #ifdef USE_CURL_MULTI |
197e8951 NH |
658 | fill_active_slots(); |
659 | step_active_slots(); | |
b3ca4e4e | 660 | #endif |
197e8951 NH |
661 | } |
662 | ||
1a703cba | 663 | static int add_send_request(struct object *obj, struct remote_lock *lock) |
58e60dd2 | 664 | { |
3def06e6 | 665 | struct transfer_request *request; |
58e60dd2 | 666 | struct packed_git *target; |
58e60dd2 | 667 | |
512d632c NH |
668 | /* Keep locks active */ |
669 | check_locks(); | |
670 | ||
aa1dbc98 NH |
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)) | |
1a703cba | 678 | return 0; |
7b5201a6 | 679 | target = find_sha1_pack(obj->sha1, repo->packs); |
aa1dbc98 NH |
680 | if (target) { |
681 | obj->flags |= REMOTE; | |
1a703cba | 682 | return 0; |
aa1dbc98 | 683 | } |
58e60dd2 | 684 | |
aa1dbc98 | 685 | obj->flags |= PUSHING; |
58e60dd2 | 686 | request = xmalloc(sizeof(*request)); |
aa1dbc98 | 687 | request->obj = obj; |
58e60dd2 | 688 | request->url = NULL; |
26349b2e | 689 | request->lock = lock; |
58e60dd2 | 690 | request->headers = NULL; |
aa1dbc98 | 691 | request->state = NEED_PUSH; |
c17fb6ee NH |
692 | request->next = request_queue_head; |
693 | request_queue_head = request; | |
29508e1e | 694 | |
b3ca4e4e | 695 | #ifdef USE_CURL_MULTI |
29508e1e NH |
696 | fill_active_slots(); |
697 | step_active_slots(); | |
b3ca4e4e | 698 | #endif |
1a703cba NH |
699 | |
700 | return 1; | |
58e60dd2 NH |
701 | } |
702 | ||
f4f440a0 | 703 | static int fetch_indices(void) |
58e60dd2 | 704 | { |
b8caac2b | 705 | int ret; |
58e60dd2 | 706 | |
58e60dd2 NH |
707 | if (push_verbosely) |
708 | fprintf(stderr, "Getting pack list\n"); | |
1a703cba | 709 | |
b8caac2b TRC |
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; | |
58e60dd2 NH |
717 | } |
718 | ||
b8caac2b | 719 | return ret; |
58e60dd2 NH |
720 | } |
721 | ||
aa1dbc98 NH |
722 | static void one_remote_object(const char *hex) |
723 | { | |
724 | unsigned char sha1[20]; | |
725 | struct object *obj; | |
726 | ||
727 | if (get_sha1_hex(hex, sha1) != 0) | |
728 | return; | |
729 | ||
730 | obj = lookup_object(sha1); | |
731 | if (!obj) | |
732 | obj = parse_object(sha1); | |
733 | ||
734 | /* Ignore remote objects that don't exist locally */ | |
735 | if (!obj) | |
736 | return; | |
737 | ||
738 | obj->flags |= REMOTE; | |
739 | if (!object_list_contains(objects, obj)) | |
1f1e895f | 740 | object_list_insert(obj, &objects); |
aa1dbc98 NH |
741 | } |
742 | ||
acf59575 | 743 | static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed) |
26349b2e | 744 | { |
acf59575 NH |
745 | int *lock_flags = (int *)ctx->userData; |
746 | ||
747 | if (tag_closed) { | |
748 | if (!strcmp(ctx->name, DAV_CTX_LOCKENTRY)) { | |
749 | if ((*lock_flags & DAV_PROP_LOCKEX) && | |
750 | (*lock_flags & DAV_PROP_LOCKWR)) { | |
751 | *lock_flags |= DAV_LOCK_OK; | |
752 | } | |
753 | *lock_flags &= DAV_LOCK_OK; | |
754 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_WRITE)) { | |
755 | *lock_flags |= DAV_PROP_LOCKWR; | |
756 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_EXCLUSIVE)) { | |
757 | *lock_flags |= DAV_PROP_LOCKEX; | |
758 | } | |
759 | } | |
26349b2e NH |
760 | } |
761 | ||
acf59575 | 762 | static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed) |
26349b2e | 763 | { |
aa1dbc98 | 764 | struct remote_lock *lock = (struct remote_lock *)ctx->userData; |
dfab7c14 TRC |
765 | git_SHA_CTX sha_ctx; |
766 | unsigned char lock_token_sha1[20]; | |
acf59575 NH |
767 | |
768 | if (tag_closed && ctx->cdata) { | |
769 | if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) { | |
770 | lock->owner = xmalloc(strlen(ctx->cdata) + 1); | |
771 | strcpy(lock->owner, ctx->cdata); | |
772 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) { | |
59556548 | 773 | if (starts_with(ctx->cdata, "Second-")) |
acf59575 NH |
774 | lock->timeout = |
775 | strtol(ctx->cdata + 7, NULL, 10); | |
776 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) { | |
753bc911 KK |
777 | lock->token = xmalloc(strlen(ctx->cdata) + 1); |
778 | strcpy(lock->token, ctx->cdata); | |
dfab7c14 TRC |
779 | |
780 | git_SHA1_Init(&sha_ctx); | |
781 | git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token)); | |
782 | git_SHA1_Final(lock_token_sha1, &sha_ctx); | |
783 | ||
784 | lock->tmpfile_suffix[0] = '_'; | |
785 | memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40); | |
acf59575 | 786 | } |
26349b2e NH |
787 | } |
788 | } | |
789 | ||
2aab167a | 790 | static void one_remote_ref(const char *refname); |
aa1dbc98 | 791 | |
26349b2e | 792 | static void |
acf59575 | 793 | xml_start_tag(void *userData, const char *name, const char **atts) |
26349b2e | 794 | { |
acf59575 | 795 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 796 | const char *c = strchr(name, ':'); |
acf59575 NH |
797 | int new_len; |
798 | ||
799 | if (c == NULL) | |
800 | c = name; | |
801 | else | |
802 | c++; | |
803 | ||
804 | new_len = strlen(ctx->name) + strlen(c) + 2; | |
805 | ||
806 | if (new_len > ctx->len) { | |
807 | ctx->name = xrealloc(ctx->name, new_len); | |
808 | ctx->len = new_len; | |
26349b2e | 809 | } |
acf59575 NH |
810 | strcat(ctx->name, "."); |
811 | strcat(ctx->name, c); | |
26349b2e | 812 | |
4cac42b1 JH |
813 | free(ctx->cdata); |
814 | ctx->cdata = NULL; | |
acf59575 NH |
815 | |
816 | ctx->userFunc(ctx, 0); | |
26349b2e NH |
817 | } |
818 | ||
58e60dd2 | 819 | static void |
acf59575 | 820 | xml_end_tag(void *userData, const char *name) |
58e60dd2 | 821 | { |
acf59575 | 822 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 823 | const char *c = strchr(name, ':'); |
acf59575 | 824 | char *ep; |
58e60dd2 | 825 | |
acf59575 NH |
826 | ctx->userFunc(ctx, 1); |
827 | ||
828 | if (c == NULL) | |
829 | c = name; | |
830 | else | |
831 | c++; | |
832 | ||
833 | ep = ctx->name + strlen(ctx->name) - strlen(c) - 1; | |
834 | *ep = 0; | |
58e60dd2 NH |
835 | } |
836 | ||
837 | static void | |
acf59575 | 838 | xml_cdata(void *userData, const XML_Char *s, int len) |
58e60dd2 | 839 | { |
acf59575 | 840 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
4cac42b1 | 841 | free(ctx->cdata); |
182af834 | 842 | ctx->cdata = xmemdupz(s, len); |
58e60dd2 NH |
843 | } |
844 | ||
554fe20d | 845 | static struct remote_lock *lock_remote(const char *path, long timeout) |
58e60dd2 NH |
846 | { |
847 | struct active_request_slot *slot; | |
baa7b67d | 848 | struct slot_results results; |
028c2976 MH |
849 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
850 | struct strbuf in_buffer = STRBUF_INIT; | |
58e60dd2 | 851 | char *url; |
0772b9a6 | 852 | char *ep; |
58e60dd2 | 853 | char timeout_header[25]; |
512d632c | 854 | struct remote_lock *lock = NULL; |
58e60dd2 | 855 | struct curl_slist *dav_headers = NULL; |
acf59575 | 856 | struct xml_ctx ctx; |
519d05be | 857 | char *escaped; |
58e60dd2 | 858 | |
7b5201a6 AK |
859 | url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
860 | sprintf(url, "%s%s", repo->url, path); | |
aa1dbc98 | 861 | |
0772b9a6 | 862 | /* Make sure leading directories exist for the remote ref */ |
7b5201a6 | 863 | ep = strchr(url + strlen(repo->url) + 1, '/'); |
0772b9a6 | 864 | while (ep) { |
466ddf90 JS |
865 | char saved_character = ep[1]; |
866 | ep[1] = '\0'; | |
0772b9a6 | 867 | slot = get_active_slot(); |
baa7b67d | 868 | slot->results = &results; |
ebaaf316 | 869 | curl_setup_http_get(slot->curl, url, DAV_MKCOL); |
0772b9a6 NH |
870 | if (start_active_slot(slot)) { |
871 | run_active_slot(slot); | |
baa7b67d NH |
872 | if (results.curl_result != CURLE_OK && |
873 | results.http_code != 405) { | |
0772b9a6 NH |
874 | fprintf(stderr, |
875 | "Unable to create branch path %s\n", | |
876 | url); | |
877 | free(url); | |
878 | return NULL; | |
879 | } | |
880 | } else { | |
1a703cba | 881 | fprintf(stderr, "Unable to start MKCOL request\n"); |
0772b9a6 NH |
882 | free(url); |
883 | return NULL; | |
884 | } | |
466ddf90 | 885 | ep[1] = saved_character; |
0772b9a6 NH |
886 | ep = strchr(ep + 1, '/'); |
887 | } | |
888 | ||
5cb2194a | 889 | escaped = xml_entities(ident_default_email()); |
519d05be MH |
890 | strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped); |
891 | free(escaped); | |
26349b2e | 892 | |
75187c9d | 893 | sprintf(timeout_header, "Timeout: Second-%ld", timeout); |
58e60dd2 NH |
894 | dav_headers = curl_slist_append(dav_headers, timeout_header); |
895 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
896 | ||
897 | slot = get_active_slot(); | |
baa7b67d | 898 | slot->results = &results; |
ebaaf316 | 899 | curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer); |
58e60dd2 | 900 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 901 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
58e60dd2 | 902 | |
aa1dbc98 | 903 | lock = xcalloc(1, sizeof(*lock)); |
aa1dbc98 | 904 | lock->timeout = -1; |
acf59575 | 905 | |
58e60dd2 NH |
906 | if (start_active_slot(slot)) { |
907 | run_active_slot(slot); | |
baa7b67d | 908 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
909 | XML_Parser parser = XML_ParserCreate(NULL); |
910 | enum XML_Status result; | |
acf59575 NH |
911 | ctx.name = xcalloc(10, 1); |
912 | ctx.len = 0; | |
913 | ctx.cdata = NULL; | |
914 | ctx.userFunc = handle_new_lock_ctx; | |
aa1dbc98 | 915 | ctx.userData = lock; |
acf59575 NH |
916 | XML_SetUserData(parser, &ctx); |
917 | XML_SetElementHandler(parser, xml_start_tag, | |
918 | xml_end_tag); | |
919 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
028c2976 MH |
920 | result = XML_Parse(parser, in_buffer.buf, |
921 | in_buffer.len, 1); | |
acf59575 NH |
922 | free(ctx.name); |
923 | if (result != XML_STATUS_OK) { | |
924 | fprintf(stderr, "XML error: %s\n", | |
925 | XML_ErrorString( | |
926 | XML_GetErrorCode(parser))); | |
aa1dbc98 | 927 | lock->timeout = -1; |
acf59575 | 928 | } |
472b2570 | 929 | XML_ParserFree(parser); |
58e60dd2 NH |
930 | } |
931 | } else { | |
1a703cba | 932 | fprintf(stderr, "Unable to start LOCK request\n"); |
58e60dd2 NH |
933 | } |
934 | ||
acf59575 | 935 | curl_slist_free_all(dav_headers); |
028c2976 MH |
936 | strbuf_release(&out_buffer.buf); |
937 | strbuf_release(&in_buffer); | |
26349b2e | 938 | |
aa1dbc98 | 939 | if (lock->token == NULL || lock->timeout <= 0) { |
8e0f7003 JM |
940 | free(lock->token); |
941 | free(lock->owner); | |
75187c9d | 942 | free(url); |
aa1dbc98 NH |
943 | free(lock); |
944 | lock = NULL; | |
acf59575 | 945 | } else { |
aa1dbc98 | 946 | lock->url = url; |
aa1dbc98 | 947 | lock->start_time = time(NULL); |
7b5201a6 AK |
948 | lock->next = repo->locks; |
949 | repo->locks = lock; | |
26349b2e NH |
950 | } |
951 | ||
aa1dbc98 | 952 | return lock; |
58e60dd2 NH |
953 | } |
954 | ||
aa1dbc98 | 955 | static int unlock_remote(struct remote_lock *lock) |
58e60dd2 NH |
956 | { |
957 | struct active_request_slot *slot; | |
baa7b67d | 958 | struct slot_results results; |
7b5201a6 | 959 | struct remote_lock *prev = repo->locks; |
b1c7d4aa | 960 | struct curl_slist *dav_headers; |
58e60dd2 NH |
961 | int rc = 0; |
962 | ||
b1c7d4aa | 963 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK); |
58e60dd2 NH |
964 | |
965 | slot = get_active_slot(); | |
baa7b67d | 966 | slot->results = &results; |
ebaaf316 | 967 | curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK); |
58e60dd2 NH |
968 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
969 | ||
970 | if (start_active_slot(slot)) { | |
971 | run_active_slot(slot); | |
baa7b67d | 972 | if (results.curl_result == CURLE_OK) |
58e60dd2 NH |
973 | rc = 1; |
974 | else | |
512d632c | 975 | fprintf(stderr, "UNLOCK HTTP error %ld\n", |
baa7b67d | 976 | results.http_code); |
58e60dd2 | 977 | } else { |
512d632c | 978 | fprintf(stderr, "Unable to start UNLOCK request\n"); |
58e60dd2 NH |
979 | } |
980 | ||
981 | curl_slist_free_all(dav_headers); | |
75187c9d | 982 | |
7b5201a6 AK |
983 | if (repo->locks == lock) { |
984 | repo->locks = lock->next; | |
512d632c NH |
985 | } else { |
986 | while (prev && prev->next != lock) | |
987 | prev = prev->next; | |
988 | if (prev) | |
989 | prev->next = prev->next->next; | |
990 | } | |
991 | ||
8e0f7003 | 992 | free(lock->owner); |
512d632c NH |
993 | free(lock->url); |
994 | free(lock->token); | |
995 | free(lock); | |
58e60dd2 NH |
996 | |
997 | return rc; | |
998 | } | |
999 | ||
6a491a17 CB |
1000 | static void remove_locks(void) |
1001 | { | |
7b5201a6 | 1002 | struct remote_lock *lock = repo->locks; |
6a491a17 CB |
1003 | |
1004 | fprintf(stderr, "Removing remote locks...\n"); | |
1005 | while (lock) { | |
6589ebf1 | 1006 | struct remote_lock *next = lock->next; |
6a491a17 | 1007 | unlock_remote(lock); |
6589ebf1 | 1008 | lock = next; |
6a491a17 CB |
1009 | } |
1010 | } | |
1011 | ||
1012 | static void remove_locks_on_signal(int signo) | |
1013 | { | |
1014 | remove_locks(); | |
4a16d072 | 1015 | sigchain_pop(signo); |
6a491a17 CB |
1016 | raise(signo); |
1017 | } | |
1018 | ||
3030baa7 NH |
1019 | static void remote_ls(const char *path, int flags, |
1020 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1021 | void *userData); | |
aa1dbc98 | 1022 | |
3030baa7 NH |
1023 | static void process_ls_object(struct remote_ls_ctx *ls) |
1024 | { | |
1025 | unsigned int *parent = (unsigned int *)ls->userData; | |
1026 | char *path = ls->dentry_name; | |
1027 | char *obj_hex; | |
aa1dbc98 | 1028 | |
3030baa7 NH |
1029 | if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) { |
1030 | remote_dir_exists[*parent] = 1; | |
1031 | return; | |
1032 | } | |
aa1dbc98 | 1033 | |
3030baa7 NH |
1034 | if (strlen(path) != 49) |
1035 | return; | |
1036 | path += 8; | |
1037 | obj_hex = xmalloc(strlen(path)); | |
eecc8367 ER |
1038 | /* NB: path is not null-terminated, can not use strlcpy here */ |
1039 | memcpy(obj_hex, path, 2); | |
3030baa7 NH |
1040 | strcpy(obj_hex + 2, path + 3); |
1041 | one_remote_object(obj_hex); | |
1042 | free(obj_hex); | |
1043 | } | |
aa1dbc98 | 1044 | |
3030baa7 NH |
1045 | static void process_ls_ref(struct remote_ls_ctx *ls) |
1046 | { | |
1047 | if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) { | |
1048 | fprintf(stderr, " %s\n", ls->dentry_name); | |
1049 | return; | |
1050 | } | |
aa1dbc98 | 1051 | |
3030baa7 NH |
1052 | if (!(ls->dentry_flags & IS_DIR)) |
1053 | one_remote_ref(ls->dentry_name); | |
1054 | } | |
aa1dbc98 | 1055 | |
3030baa7 NH |
1056 | static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) |
1057 | { | |
1058 | struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData; | |
aa1dbc98 | 1059 | |
3030baa7 NH |
1060 | if (tag_closed) { |
1061 | if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) { | |
1062 | if (ls->dentry_flags & IS_DIR) { | |
0fdadc50 TRC |
1063 | |
1064 | /* ensure collection names end with slash */ | |
1065 | str_end_url_with_slash(ls->dentry_name, &ls->dentry_name); | |
1066 | ||
3030baa7 NH |
1067 | if (ls->flags & PROCESS_DIRS) { |
1068 | ls->userFunc(ls); | |
1069 | } | |
1070 | if (strcmp(ls->dentry_name, ls->path) && | |
1071 | ls->flags & RECURSIVE) { | |
1072 | remote_ls(ls->dentry_name, | |
1073 | ls->flags, | |
1074 | ls->userFunc, | |
1075 | ls->userData); | |
1076 | } | |
1077 | } else if (ls->flags & PROCESS_FILES) { | |
1078 | ls->userFunc(ls); | |
aa1dbc98 | 1079 | } |
3030baa7 | 1080 | } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { |
e1f33efe KK |
1081 | char *path = ctx->cdata; |
1082 | if (*ctx->cdata == 'h') { | |
1083 | path = strstr(path, "//"); | |
1084 | if (path) { | |
1085 | path = strchr(path+2, '/'); | |
1086 | } | |
1087 | } | |
1088 | if (path) { | |
dfc2dcd9 TRC |
1089 | const char *url = repo->url; |
1090 | if (repo->path) | |
1091 | url = repo->path; | |
1092 | if (strncmp(path, url, repo->path_len)) | |
82247e9b | 1093 | error("Parsed path '%s' does not match url: '%s'", |
dfc2dcd9 TRC |
1094 | path, url); |
1095 | else { | |
1096 | path += repo->path_len; | |
1097 | ls->dentry_name = xstrdup(path); | |
1098 | } | |
e1f33efe | 1099 | } |
3030baa7 NH |
1100 | } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { |
1101 | ls->dentry_flags |= IS_DIR; | |
aa1dbc98 | 1102 | } |
3030baa7 | 1103 | } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) { |
4cac42b1 | 1104 | free(ls->dentry_name); |
3030baa7 NH |
1105 | ls->dentry_name = NULL; |
1106 | ls->dentry_flags = 0; | |
aa1dbc98 | 1107 | } |
aa1dbc98 NH |
1108 | } |
1109 | ||
20642801 JS |
1110 | /* |
1111 | * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it | |
1112 | * should _only_ heed the information from that file, instead of trying to | |
1113 | * determine the refs from the remote file system (badly: it does not even | |
1114 | * know about packed-refs). | |
1115 | */ | |
3030baa7 NH |
1116 | static void remote_ls(const char *path, int flags, |
1117 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1118 | void *userData) | |
aa1dbc98 | 1119 | { |
7b5201a6 | 1120 | char *url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
aa1dbc98 | 1121 | struct active_request_slot *slot; |
baa7b67d | 1122 | struct slot_results results; |
028c2976 MH |
1123 | struct strbuf in_buffer = STRBUF_INIT; |
1124 | struct buffer out_buffer = { STRBUF_INIT, 0 }; | |
aa1dbc98 NH |
1125 | struct curl_slist *dav_headers = NULL; |
1126 | struct xml_ctx ctx; | |
3030baa7 NH |
1127 | struct remote_ls_ctx ls; |
1128 | ||
1129 | ls.flags = flags; | |
9befac47 | 1130 | ls.path = xstrdup(path); |
3030baa7 NH |
1131 | ls.dentry_name = NULL; |
1132 | ls.dentry_flags = 0; | |
1133 | ls.userData = userData; | |
1134 | ls.userFunc = userFunc; | |
aa1dbc98 | 1135 | |
7b5201a6 | 1136 | sprintf(url, "%s%s", repo->url, path); |
aa1dbc98 | 1137 | |
028c2976 | 1138 | strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST); |
aa1dbc98 NH |
1139 | |
1140 | dav_headers = curl_slist_append(dav_headers, "Depth: 1"); | |
1141 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
1142 | ||
1143 | slot = get_active_slot(); | |
baa7b67d | 1144 | slot->results = &results; |
ebaaf316 DM |
1145 | curl_setup_http(slot->curl, url, DAV_PROPFIND, |
1146 | &out_buffer, fwrite_buffer); | |
aa1dbc98 | 1147 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 1148 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
aa1dbc98 NH |
1149 | |
1150 | if (start_active_slot(slot)) { | |
1151 | run_active_slot(slot); | |
baa7b67d | 1152 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
1153 | XML_Parser parser = XML_ParserCreate(NULL); |
1154 | enum XML_Status result; | |
aa1dbc98 NH |
1155 | ctx.name = xcalloc(10, 1); |
1156 | ctx.len = 0; | |
1157 | ctx.cdata = NULL; | |
3030baa7 NH |
1158 | ctx.userFunc = handle_remote_ls_ctx; |
1159 | ctx.userData = &ls; | |
aa1dbc98 NH |
1160 | XML_SetUserData(parser, &ctx); |
1161 | XML_SetElementHandler(parser, xml_start_tag, | |
1162 | xml_end_tag); | |
1163 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
028c2976 MH |
1164 | result = XML_Parse(parser, in_buffer.buf, |
1165 | in_buffer.len, 1); | |
aa1dbc98 NH |
1166 | free(ctx.name); |
1167 | ||
1168 | if (result != XML_STATUS_OK) { | |
1169 | fprintf(stderr, "XML error: %s\n", | |
1170 | XML_ErrorString( | |
1171 | XML_GetErrorCode(parser))); | |
1172 | } | |
472b2570 | 1173 | XML_ParserFree(parser); |
aa1dbc98 NH |
1174 | } |
1175 | } else { | |
3030baa7 | 1176 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
aa1dbc98 NH |
1177 | } |
1178 | ||
3030baa7 | 1179 | free(ls.path); |
aa1dbc98 | 1180 | free(url); |
028c2976 MH |
1181 | strbuf_release(&out_buffer.buf); |
1182 | strbuf_release(&in_buffer); | |
aa1dbc98 NH |
1183 | curl_slist_free_all(dav_headers); |
1184 | } | |
1185 | ||
3030baa7 NH |
1186 | static void get_remote_object_list(unsigned char parent) |
1187 | { | |
1188 | char path[] = "objects/XX/"; | |
1189 | static const char hex[] = "0123456789abcdef"; | |
1190 | unsigned int val = parent; | |
1191 | ||
1192 | path[8] = hex[val >> 4]; | |
1193 | path[9] = hex[val & 0xf]; | |
1194 | remote_dir_exists[val] = 0; | |
1195 | remote_ls(path, (PROCESS_FILES | PROCESS_DIRS), | |
1196 | process_ls_object, &val); | |
1197 | } | |
1198 | ||
acf59575 | 1199 | static int locking_available(void) |
58e60dd2 NH |
1200 | { |
1201 | struct active_request_slot *slot; | |
baa7b67d | 1202 | struct slot_results results; |
028c2976 MH |
1203 | struct strbuf in_buffer = STRBUF_INIT; |
1204 | struct buffer out_buffer = { STRBUF_INIT, 0 }; | |
58e60dd2 | 1205 | struct curl_slist *dav_headers = NULL; |
acf59575 NH |
1206 | struct xml_ctx ctx; |
1207 | int lock_flags = 0; | |
519d05be | 1208 | char *escaped; |
58e60dd2 | 1209 | |
519d05be MH |
1210 | escaped = xml_entities(repo->url); |
1211 | strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, escaped); | |
1212 | free(escaped); | |
58e60dd2 NH |
1213 | |
1214 | dav_headers = curl_slist_append(dav_headers, "Depth: 0"); | |
1215 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
baa7b67d | 1216 | |
58e60dd2 | 1217 | slot = get_active_slot(); |
baa7b67d | 1218 | slot->results = &results; |
ebaaf316 DM |
1219 | curl_setup_http(slot->curl, repo->url, DAV_PROPFIND, |
1220 | &out_buffer, fwrite_buffer); | |
58e60dd2 | 1221 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 1222 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
58e60dd2 NH |
1223 | |
1224 | if (start_active_slot(slot)) { | |
1225 | run_active_slot(slot); | |
baa7b67d | 1226 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
1227 | XML_Parser parser = XML_ParserCreate(NULL); |
1228 | enum XML_Status result; | |
acf59575 NH |
1229 | ctx.name = xcalloc(10, 1); |
1230 | ctx.len = 0; | |
1231 | ctx.cdata = NULL; | |
1232 | ctx.userFunc = handle_lockprop_ctx; | |
1233 | ctx.userData = &lock_flags; | |
1234 | XML_SetUserData(parser, &ctx); | |
1235 | XML_SetElementHandler(parser, xml_start_tag, | |
1236 | xml_end_tag); | |
028c2976 MH |
1237 | result = XML_Parse(parser, in_buffer.buf, |
1238 | in_buffer.len, 1); | |
acf59575 NH |
1239 | free(ctx.name); |
1240 | ||
1241 | if (result != XML_STATUS_OK) { | |
1242 | fprintf(stderr, "XML error: %s\n", | |
1243 | XML_ErrorString( | |
1244 | XML_GetErrorCode(parser))); | |
1245 | lock_flags = 0; | |
1246 | } | |
472b2570 | 1247 | XML_ParserFree(parser); |
325ce395 | 1248 | if (!lock_flags) |
d5c87cb4 | 1249 | error("no DAV locking support on %s", |
7b5201a6 | 1250 | repo->url); |
325ce395 JH |
1251 | |
1252 | } else { | |
1253 | error("Cannot access URL %s, return code %d", | |
7b5201a6 | 1254 | repo->url, results.curl_result); |
325ce395 | 1255 | lock_flags = 0; |
58e60dd2 | 1256 | } |
58e60dd2 | 1257 | } else { |
7b5201a6 | 1258 | error("Unable to start PROPFIND request on %s", repo->url); |
58e60dd2 NH |
1259 | } |
1260 | ||
028c2976 MH |
1261 | strbuf_release(&out_buffer.buf); |
1262 | strbuf_release(&in_buffer); | |
acf59575 NH |
1263 | curl_slist_free_all(dav_headers); |
1264 | ||
1265 | return lock_flags; | |
58e60dd2 NH |
1266 | } |
1267 | ||
b5bf7cd6 | 1268 | static struct object_list **add_one_object(struct object *obj, struct object_list **p) |
1f1e895f LT |
1269 | { |
1270 | struct object_list *entry = xmalloc(sizeof(struct object_list)); | |
1271 | entry->item = obj; | |
1272 | entry->next = *p; | |
1273 | *p = entry; | |
1274 | return &entry->next; | |
1275 | } | |
1276 | ||
aa1dbc98 NH |
1277 | static struct object_list **process_blob(struct blob *blob, |
1278 | struct object_list **p, | |
1279 | struct name_path *path, | |
1280 | const char *name) | |
58e60dd2 | 1281 | { |
aa1dbc98 | 1282 | struct object *obj = &blob->object; |
58e60dd2 | 1283 | |
aa1dbc98 NH |
1284 | obj->flags |= LOCAL; |
1285 | ||
1286 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1287 | return p; | |
1288 | ||
1289 | obj->flags |= SEEN; | |
1f1e895f | 1290 | return add_one_object(obj, p); |
aa1dbc98 NH |
1291 | } |
1292 | ||
1293 | static struct object_list **process_tree(struct tree *tree, | |
1294 | struct object_list **p, | |
1295 | struct name_path *path, | |
1296 | const char *name) | |
1297 | { | |
1298 | struct object *obj = &tree->object; | |
2d9c58c6 | 1299 | struct tree_desc desc; |
4c068a98 | 1300 | struct name_entry entry; |
aa1dbc98 NH |
1301 | struct name_path me; |
1302 | ||
1303 | obj->flags |= LOCAL; | |
1304 | ||
1305 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1306 | return p; | |
1307 | if (parse_tree(tree) < 0) | |
1308 | die("bad tree object %s", sha1_to_hex(obj->sha1)); | |
1309 | ||
1310 | obj->flags |= SEEN; | |
9befac47 | 1311 | name = xstrdup(name); |
1f1e895f | 1312 | p = add_one_object(obj, p); |
aa1dbc98 NH |
1313 | me.up = path; |
1314 | me.elem = name; | |
1315 | me.elem_len = strlen(name); | |
2d9c58c6 | 1316 | |
6fda5e51 | 1317 | init_tree_desc(&desc, tree->buffer, tree->size); |
2d9c58c6 | 1318 | |
1bbeb4c6 JS |
1319 | while (tree_entry(&desc, &entry)) |
1320 | switch (object_type(entry.mode)) { | |
1321 | case OBJ_TREE: | |
4c068a98 | 1322 | p = process_tree(lookup_tree(entry.sha1), p, &me, name); |
1bbeb4c6 JS |
1323 | break; |
1324 | case OBJ_BLOB: | |
4c068a98 | 1325 | p = process_blob(lookup_blob(entry.sha1), p, &me, name); |
1bbeb4c6 JS |
1326 | break; |
1327 | default: | |
1328 | /* Subproject commit - not in this repository */ | |
1329 | break; | |
1330 | } | |
1331 | ||
6e454b9a | 1332 | free_tree_buffer(tree); |
aa1dbc98 | 1333 | return p; |
58e60dd2 NH |
1334 | } |
1335 | ||
1a703cba | 1336 | static int get_delta(struct rev_info *revs, struct remote_lock *lock) |
58e60dd2 | 1337 | { |
1f1e895f | 1338 | int i; |
58e60dd2 | 1339 | struct commit *commit; |
1f1e895f | 1340 | struct object_list **p = &objects; |
1a703cba | 1341 | int count = 0; |
58e60dd2 | 1342 | |
aa1dbc98 NH |
1343 | while ((commit = get_revision(revs)) != NULL) { |
1344 | p = process_tree(commit->tree, p, NULL, ""); | |
1345 | commit->object.flags |= LOCAL; | |
1346 | if (!(commit->object.flags & UNINTERESTING)) | |
1a703cba | 1347 | count += add_send_request(&commit->object, lock); |
aa1dbc98 | 1348 | } |
58e60dd2 | 1349 | |
1f1e895f LT |
1350 | for (i = 0; i < revs->pending.nr; i++) { |
1351 | struct object_array_entry *entry = revs->pending.objects + i; | |
1352 | struct object *obj = entry->item; | |
1353 | const char *name = entry->name; | |
58e60dd2 | 1354 | |
aa1dbc98 NH |
1355 | if (obj->flags & (UNINTERESTING | SEEN)) |
1356 | continue; | |
1974632c | 1357 | if (obj->type == OBJ_TAG) { |
aa1dbc98 | 1358 | obj->flags |= SEEN; |
1f1e895f | 1359 | p = add_one_object(obj, p); |
aa1dbc98 | 1360 | continue; |
58e60dd2 | 1361 | } |
1974632c | 1362 | if (obj->type == OBJ_TREE) { |
aa1dbc98 NH |
1363 | p = process_tree((struct tree *)obj, p, NULL, name); |
1364 | continue; | |
58e60dd2 | 1365 | } |
1974632c | 1366 | if (obj->type == OBJ_BLOB) { |
aa1dbc98 NH |
1367 | p = process_blob((struct blob *)obj, p, NULL, name); |
1368 | continue; | |
58e60dd2 | 1369 | } |
aa1dbc98 NH |
1370 | die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); |
1371 | } | |
1372 | ||
1373 | while (objects) { | |
1374 | if (!(objects->item->flags & UNINTERESTING)) | |
1a703cba | 1375 | count += add_send_request(objects->item, lock); |
aa1dbc98 | 1376 | objects = objects->next; |
58e60dd2 | 1377 | } |
1a703cba NH |
1378 | |
1379 | return count; | |
58e60dd2 NH |
1380 | } |
1381 | ||
aa1dbc98 | 1382 | static int update_remote(unsigned char *sha1, struct remote_lock *lock) |
58e60dd2 NH |
1383 | { |
1384 | struct active_request_slot *slot; | |
baa7b67d | 1385 | struct slot_results results; |
028c2976 | 1386 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
b1c7d4aa | 1387 | struct curl_slist *dav_headers; |
58e60dd2 | 1388 | |
b1c7d4aa | 1389 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
58e60dd2 | 1390 | |
028c2976 | 1391 | strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1)); |
58e60dd2 NH |
1392 | |
1393 | slot = get_active_slot(); | |
baa7b67d | 1394 | slot->results = &results; |
ebaaf316 DM |
1395 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
1396 | &out_buffer, fwrite_null); | |
58e60dd2 | 1397 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
58e60dd2 NH |
1398 | |
1399 | if (start_active_slot(slot)) { | |
1400 | run_active_slot(slot); | |
028c2976 | 1401 | strbuf_release(&out_buffer.buf); |
baa7b67d | 1402 | if (results.curl_result != CURLE_OK) { |
58e60dd2 NH |
1403 | fprintf(stderr, |
1404 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
baa7b67d | 1405 | results.curl_result, results.http_code); |
58e60dd2 NH |
1406 | /* We should attempt recovery? */ |
1407 | return 0; | |
1408 | } | |
1409 | } else { | |
028c2976 | 1410 | strbuf_release(&out_buffer.buf); |
58e60dd2 NH |
1411 | fprintf(stderr, "Unable to start PUT request\n"); |
1412 | return 0; | |
1413 | } | |
1414 | ||
1415 | return 1; | |
1416 | } | |
1417 | ||
6d2bf96e | 1418 | static struct ref *remote_refs; |
aa1dbc98 | 1419 | |
2aab167a | 1420 | static void one_remote_ref(const char *refname) |
aa1dbc98 NH |
1421 | { |
1422 | struct ref *ref; | |
197e8951 | 1423 | struct object *obj; |
aa1dbc98 | 1424 | |
59c69c0c | 1425 | ref = alloc_ref(refname); |
c13b2633 | 1426 | |
7b5201a6 | 1427 | if (http_fetch_ref(repo->url, ref) != 0) { |
aa1dbc98 NH |
1428 | fprintf(stderr, |
1429 | "Unable to fetch ref %s from %s\n", | |
7b5201a6 | 1430 | refname, repo->url); |
c13b2633 | 1431 | free(ref); |
aa1dbc98 NH |
1432 | return; |
1433 | } | |
1434 | ||
197e8951 NH |
1435 | /* |
1436 | * Fetch a copy of the object if it doesn't exist locally - it | |
1437 | * may be required for updating server info later. | |
1438 | */ | |
7b5201a6 | 1439 | if (repo->can_update_info_refs && !has_sha1_file(ref->old_sha1)) { |
c13b2633 | 1440 | obj = lookup_unknown_object(ref->old_sha1); |
197e8951 NH |
1441 | if (obj) { |
1442 | fprintf(stderr, " fetch %s for %s\n", | |
c13b2633 | 1443 | sha1_to_hex(ref->old_sha1), refname); |
197e8951 NH |
1444 | add_fetch_request(obj); |
1445 | } | |
1446 | } | |
1447 | ||
6d2bf96e CB |
1448 | ref->next = remote_refs; |
1449 | remote_refs = ref; | |
aa1dbc98 NH |
1450 | } |
1451 | ||
aa1dbc98 NH |
1452 | static void get_dav_remote_heads(void) |
1453 | { | |
3030baa7 | 1454 | remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL); |
aa1dbc98 NH |
1455 | } |
1456 | ||
197e8951 NH |
1457 | static void add_remote_info_ref(struct remote_ls_ctx *ls) |
1458 | { | |
028c2976 | 1459 | struct strbuf *buf = (struct strbuf *)ls->userData; |
197e8951 NH |
1460 | struct object *o; |
1461 | int len; | |
1462 | char *ref_info; | |
c13b2633 DB |
1463 | struct ref *ref; |
1464 | ||
59c69c0c | 1465 | ref = alloc_ref(ls->dentry_name); |
197e8951 | 1466 | |
7b5201a6 | 1467 | if (http_fetch_ref(repo->url, ref) != 0) { |
197e8951 NH |
1468 | fprintf(stderr, |
1469 | "Unable to fetch ref %s from %s\n", | |
7b5201a6 | 1470 | ls->dentry_name, repo->url); |
197e8951 | 1471 | aborted = 1; |
c13b2633 | 1472 | free(ref); |
197e8951 NH |
1473 | return; |
1474 | } | |
1475 | ||
c13b2633 | 1476 | o = parse_object(ref->old_sha1); |
197e8951 NH |
1477 | if (!o) { |
1478 | fprintf(stderr, | |
1479 | "Unable to parse object %s for remote ref %s\n", | |
c13b2633 | 1480 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
197e8951 | 1481 | aborted = 1; |
c13b2633 | 1482 | free(ref); |
197e8951 NH |
1483 | return; |
1484 | } | |
1485 | ||
1486 | len = strlen(ls->dentry_name) + 42; | |
1487 | ref_info = xcalloc(len + 1, 1); | |
1488 | sprintf(ref_info, "%s %s\n", | |
c13b2633 | 1489 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
197e8951 NH |
1490 | fwrite_buffer(ref_info, 1, len, buf); |
1491 | free(ref_info); | |
1492 | ||
1974632c | 1493 | if (o->type == OBJ_TAG) { |
197e8951 NH |
1494 | o = deref_tag(o, ls->dentry_name, 0); |
1495 | if (o) { | |
1496 | len = strlen(ls->dentry_name) + 45; | |
1497 | ref_info = xcalloc(len + 1, 1); | |
1498 | sprintf(ref_info, "%s %s^{}\n", | |
1499 | sha1_to_hex(o->sha1), ls->dentry_name); | |
1500 | fwrite_buffer(ref_info, 1, len, buf); | |
1501 | free(ref_info); | |
1502 | } | |
1503 | } | |
c13b2633 | 1504 | free(ref); |
197e8951 NH |
1505 | } |
1506 | ||
1507 | static void update_remote_info_refs(struct remote_lock *lock) | |
1508 | { | |
028c2976 | 1509 | struct buffer buffer = { STRBUF_INIT, 0 }; |
197e8951 NH |
1510 | struct active_request_slot *slot; |
1511 | struct slot_results results; | |
b1c7d4aa | 1512 | struct curl_slist *dav_headers; |
197e8951 | 1513 | |
197e8951 | 1514 | remote_ls("refs/", (PROCESS_FILES | RECURSIVE), |
028c2976 | 1515 | add_remote_info_ref, &buffer.buf); |
197e8951 | 1516 | if (!aborted) { |
b1c7d4aa | 1517 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
197e8951 NH |
1518 | |
1519 | slot = get_active_slot(); | |
1520 | slot->results = &results; | |
ebaaf316 DM |
1521 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
1522 | &buffer, fwrite_null); | |
197e8951 | 1523 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
197e8951 | 1524 | |
197e8951 NH |
1525 | if (start_active_slot(slot)) { |
1526 | run_active_slot(slot); | |
1527 | if (results.curl_result != CURLE_OK) { | |
1528 | fprintf(stderr, | |
1529 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
1530 | results.curl_result, results.http_code); | |
1531 | } | |
1532 | } | |
197e8951 | 1533 | } |
028c2976 | 1534 | strbuf_release(&buffer.buf); |
197e8951 NH |
1535 | } |
1536 | ||
1537 | static int remote_exists(const char *path) | |
1538 | { | |
7b5201a6 | 1539 | char *url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
446b941a | 1540 | int ret; |
197e8951 | 1541 | |
7b5201a6 | 1542 | sprintf(url, "%s%s", repo->url, path); |
197e8951 | 1543 | |
1bbcc224 | 1544 | switch (http_get_strbuf(url, NULL, NULL)) { |
446b941a MH |
1545 | case HTTP_OK: |
1546 | ret = 1; | |
1547 | break; | |
1548 | case HTTP_MISSING_TARGET: | |
1549 | ret = 0; | |
1550 | break; | |
1551 | case HTTP_ERROR: | |
4df13f69 | 1552 | error("unable to access '%s': %s", url, curl_errorstr); |
446b941a MH |
1553 | default: |
1554 | ret = -1; | |
197e8951 | 1555 | } |
3a462bc9 MH |
1556 | free(url); |
1557 | return ret; | |
197e8951 NH |
1558 | } |
1559 | ||
554fe20d | 1560 | static void fetch_symref(const char *path, char **symref, unsigned char *sha1) |
3dfaf7bc NH |
1561 | { |
1562 | char *url; | |
028c2976 | 1563 | struct strbuf buffer = STRBUF_INIT; |
3dfaf7bc | 1564 | |
7b5201a6 AK |
1565 | url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
1566 | sprintf(url, "%s%s", repo->url, path); | |
3dfaf7bc | 1567 | |
1bbcc224 | 1568 | if (http_get_strbuf(url, &buffer, NULL) != HTTP_OK) |
9af5abd9 MH |
1569 | die("Couldn't get %s for remote symref\n%s", url, |
1570 | curl_errorstr); | |
3dfaf7bc NH |
1571 | free(url); |
1572 | ||
8e0f7003 | 1573 | free(*symref); |
3dfaf7bc | 1574 | *symref = NULL; |
a8e0d16d | 1575 | hashclr(sha1); |
3dfaf7bc | 1576 | |
028c2976 | 1577 | if (buffer.len == 0) |
3dfaf7bc NH |
1578 | return; |
1579 | ||
1580 | /* If it's a symref, set the refname; otherwise try for a sha1 */ | |
59556548 | 1581 | if (starts_with((char *)buffer.buf, "ref: ")) { |
028c2976 | 1582 | *symref = xmemdupz((char *)buffer.buf + 5, buffer.len - 6); |
3dfaf7bc | 1583 | } else { |
028c2976 | 1584 | get_sha1_hex(buffer.buf, sha1); |
3dfaf7bc NH |
1585 | } |
1586 | ||
028c2976 | 1587 | strbuf_release(&buffer); |
3dfaf7bc NH |
1588 | } |
1589 | ||
baf18fc2 | 1590 | static int verify_merge_base(unsigned char *head_sha1, struct ref *remote) |
3dfaf7bc | 1591 | { |
baf18fc2 NTND |
1592 | struct commit *head = lookup_commit_or_die(head_sha1, "HEAD"); |
1593 | struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name); | |
3dfaf7bc | 1594 | |
65712251 | 1595 | return in_merge_bases(branch, head); |
3dfaf7bc NH |
1596 | } |
1597 | ||
2aab167a | 1598 | static int delete_remote_branch(const char *pattern, int force) |
3dfaf7bc NH |
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 */ | |
cd2b8ae9 | 1638 | for (i = 0; symref && i < MAXDEPTH; i++) { |
3dfaf7bc NH |
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"); | |
0bf8c1f9 | 1650 | if (is_null_sha1(head_sha1)) |
3dfaf7bc NH |
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 */ | |
0bf8c1f9 | 1656 | if (is_null_sha1(remote_ref->old_sha1)) |
3dfaf7bc NH |
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 */ | |
baf18fc2 | 1663 | if (!verify_merge_base(head_sha1, remote_ref)) { |
00ae8289 BF |
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'", | |
7b5201a6 | 1668 | remote_ref->name, repo->url, pattern); |
3dfaf7bc NH |
1669 | } |
1670 | } | |
1671 | ||
1672 | /* Send delete request */ | |
1673 | fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name); | |
6eaf4060 CB |
1674 | if (dry_run) |
1675 | return 0; | |
7b5201a6 AK |
1676 | url = xmalloc(strlen(repo->url) + strlen(remote_ref->name) + 1); |
1677 | sprintf(url, "%s%s", repo->url, remote_ref->name); | |
3dfaf7bc NH |
1678 | slot = get_active_slot(); |
1679 | slot->results = &results; | |
ebaaf316 | 1680 | curl_setup_http_get(slot->curl, url, DAV_DELETE); |
3dfaf7bc NH |
1681 | if (start_active_slot(slot)) { |
1682 | run_active_slot(slot); | |
1683 | free(url); | |
1684 | if (results.curl_result != CURLE_OK) | |
82247e9b | 1685 | return error("DELETE request failed (%d/%ld)", |
3dfaf7bc NH |
1686 | results.curl_result, results.http_code); |
1687 | } else { | |
1688 | free(url); | |
1689 | return error("Unable to start DELETE request"); | |
1690 | } | |
1691 | ||
1692 | return 0; | |
1693 | } | |
1694 | ||
2af202be | 1695 | static void run_request_queue(void) |
4f66250d TRC |
1696 | { |
1697 | #ifdef USE_CURL_MULTI | |
1698 | is_running_queue = 1; | |
1699 | fill_active_slots(); | |
1700 | add_fill_function(NULL, fill_active_slot); | |
1701 | #endif | |
1702 | do { | |
1703 | finish_all_active_slots(); | |
1704 | #ifdef USE_CURL_MULTI | |
1705 | fill_active_slots(); | |
1706 | #endif | |
1707 | } while (request_queue_head && !aborted); | |
1708 | ||
1709 | #ifdef USE_CURL_MULTI | |
1710 | is_running_queue = 0; | |
1711 | #endif | |
1712 | } | |
1713 | ||
58e60dd2 NH |
1714 | int main(int argc, char **argv) |
1715 | { | |
58e60dd2 NH |
1716 | struct transfer_request *request; |
1717 | struct transfer_request *next_request; | |
1718 | int nr_refspec = 0; | |
1719 | char **refspec = NULL; | |
512d632c | 1720 | struct remote_lock *ref_lock = NULL; |
197e8951 | 1721 | struct remote_lock *info_ref_lock = NULL; |
aa1dbc98 | 1722 | struct rev_info revs; |
3dfaf7bc NH |
1723 | int delete_branch = 0; |
1724 | int force_delete = 0; | |
1a703cba | 1725 | int objects_to_send; |
58e60dd2 NH |
1726 | int rc = 0; |
1727 | int i; | |
8c9e7947 | 1728 | int new_refs; |
454e2025 | 1729 | struct ref *ref, *local_refs; |
58e60dd2 | 1730 | |
5e9637c6 ÆAB |
1731 | git_setup_gettext(); |
1732 | ||
2fb3f6db SP |
1733 | git_extract_argv0_path(argv[0]); |
1734 | ||
7b5201a6 | 1735 | repo = xcalloc(sizeof(*repo), 1); |
58e60dd2 NH |
1736 | |
1737 | argv++; | |
1738 | for (i = 1; i < argc; i++, argv++) { | |
1739 | char *arg = *argv; | |
1740 | ||
1741 | if (*arg == '-') { | |
aa1dbc98 | 1742 | if (!strcmp(arg, "--all")) { |
28b9d6e5 | 1743 | push_all = MATCH_REFS_ALL; |
58e60dd2 NH |
1744 | continue; |
1745 | } | |
1746 | if (!strcmp(arg, "--force")) { | |
1747 | force_all = 1; | |
1748 | continue; | |
1749 | } | |
fe5d1d3e SP |
1750 | if (!strcmp(arg, "--dry-run")) { |
1751 | dry_run = 1; | |
1752 | continue; | |
1753 | } | |
ae4efe19 SP |
1754 | if (!strcmp(arg, "--helper-status")) { |
1755 | helper_status = 1; | |
1756 | continue; | |
1757 | } | |
58e60dd2 NH |
1758 | if (!strcmp(arg, "--verbose")) { |
1759 | push_verbosely = 1; | |
e9176745 | 1760 | http_is_verbose = 1; |
58e60dd2 NH |
1761 | continue; |
1762 | } | |
3dfaf7bc NH |
1763 | if (!strcmp(arg, "-d")) { |
1764 | delete_branch = 1; | |
1765 | continue; | |
1766 | } | |
1767 | if (!strcmp(arg, "-D")) { | |
1768 | delete_branch = 1; | |
1769 | force_delete = 1; | |
1770 | continue; | |
1771 | } | |
548d3464 JN |
1772 | if (!strcmp(arg, "-h")) |
1773 | usage(http_push_usage); | |
58e60dd2 | 1774 | } |
7b5201a6 | 1775 | if (!repo->url) { |
aa1dbc98 | 1776 | char *path = strstr(arg, "//"); |
1462d1af TRC |
1777 | str_end_url_with_slash(arg, &repo->url); |
1778 | repo->path_len = strlen(repo->url); | |
aa1dbc98 | 1779 | if (path) { |
7b5201a6 AK |
1780 | repo->path = strchr(path+2, '/'); |
1781 | if (repo->path) | |
1782 | repo->path_len = strlen(repo->path); | |
aa1dbc98 | 1783 | } |
58e60dd2 NH |
1784 | continue; |
1785 | } | |
1786 | refspec = argv; | |
1787 | nr_refspec = argc - i; | |
1788 | break; | |
1789 | } | |
1790 | ||
f854824b GB |
1791 | #ifndef USE_CURL_MULTI |
1792 | die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI"); | |
1793 | #endif | |
1794 | ||
7b5201a6 | 1795 | if (!repo->url) |
3e9fabc8 NH |
1796 | usage(http_push_usage); |
1797 | ||
3dfaf7bc NH |
1798 | if (delete_branch && nr_refspec != 1) |
1799 | die("You must specify only one branch name when deleting a remote branch"); | |
1800 | ||
548d3464 JN |
1801 | setup_git_directory(); |
1802 | ||
aa1dbc98 | 1803 | memset(remote_dir_exists, -1, 256); |
0dd276b8 | 1804 | |
a4ddbc33 | 1805 | http_init(NULL, repo->url, 1); |
58e60dd2 | 1806 | |
68862a31 | 1807 | #ifdef USE_CURL_MULTI |
4f66250d | 1808 | is_running_queue = 0; |
68862a31 | 1809 | #endif |
4f66250d | 1810 | |
58e60dd2 | 1811 | /* Verify DAV compliance/lock support */ |
acf59575 | 1812 | if (!locking_available()) { |
58e60dd2 NH |
1813 | rc = 1; |
1814 | goto cleanup; | |
1815 | } | |
1816 | ||
57b235a4 | 1817 | sigchain_push_common(remove_locks_on_signal); |
6a491a17 | 1818 | |
197e8951 | 1819 | /* Check whether the remote has server info files */ |
7b5201a6 AK |
1820 | repo->can_update_info_refs = 0; |
1821 | repo->has_info_refs = remote_exists("info/refs"); | |
1822 | repo->has_info_packs = remote_exists("objects/info/packs"); | |
1823 | if (repo->has_info_refs) { | |
197e8951 NH |
1824 | info_ref_lock = lock_remote("info/refs", LOCK_TIME); |
1825 | if (info_ref_lock) | |
7b5201a6 | 1826 | repo->can_update_info_refs = 1; |
9bdbabad | 1827 | else { |
d5c87cb4 | 1828 | error("cannot lock existing info/refs"); |
9bdbabad GB |
1829 | rc = 1; |
1830 | goto cleanup; | |
1831 | } | |
197e8951 | 1832 | } |
7b5201a6 | 1833 | if (repo->has_info_packs) |
197e8951 NH |
1834 | fetch_indices(); |
1835 | ||
aa1dbc98 | 1836 | /* Get a list of all local and remote heads to validate refspecs */ |
454e2025 | 1837 | local_refs = get_local_heads(); |
aa1dbc98 NH |
1838 | fprintf(stderr, "Fetching remote heads...\n"); |
1839 | get_dav_remote_heads(); | |
4f66250d | 1840 | run_request_queue(); |
aa1dbc98 | 1841 | |
3dfaf7bc NH |
1842 | /* Remove a remote branch if -d or -D was specified */ |
1843 | if (delete_branch) { | |
ae4efe19 | 1844 | if (delete_remote_branch(refspec[0], force_delete) == -1) { |
3dfaf7bc NH |
1845 | fprintf(stderr, "Unable to delete remote branch %s\n", |
1846 | refspec[0]); | |
ae4efe19 SP |
1847 | if (helper_status) |
1848 | printf("error %s cannot remove\n", refspec[0]); | |
1849 | } | |
3dfaf7bc NH |
1850 | goto cleanup; |
1851 | } | |
1852 | ||
aa1dbc98 | 1853 | /* match them up */ |
29753cdd JH |
1854 | if (match_push_refs(local_refs, &remote_refs, |
1855 | nr_refspec, (const char **) refspec, push_all)) { | |
9116de59 GB |
1856 | rc = -1; |
1857 | goto cleanup; | |
1858 | } | |
aa1dbc98 NH |
1859 | if (!remote_refs) { |
1860 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); | |
ae4efe19 SP |
1861 | if (helper_status) |
1862 | printf("error null no match\n"); | |
9116de59 GB |
1863 | rc = 0; |
1864 | goto cleanup; | |
aa1dbc98 NH |
1865 | } |
1866 | ||
8c9e7947 | 1867 | new_refs = 0; |
aa1dbc98 NH |
1868 | for (ref = remote_refs; ref; ref = ref->next) { |
1869 | char old_hex[60], *new_hex; | |
a80aad7b | 1870 | const char *commit_argv[5]; |
8c9e7947 JH |
1871 | int commit_argc; |
1872 | char *new_sha1_hex, *old_sha1_hex; | |
1873 | ||
aa1dbc98 NH |
1874 | if (!ref->peer_ref) |
1875 | continue; | |
6eaf4060 | 1876 | |
0bf8c1f9 | 1877 | if (is_null_sha1(ref->peer_ref->new_sha1)) { |
6eaf4060 CB |
1878 | if (delete_remote_branch(ref->name, 1) == -1) { |
1879 | error("Could not remove %s", ref->name); | |
ae4efe19 SP |
1880 | if (helper_status) |
1881 | printf("error %s cannot remove\n", ref->name); | |
6eaf4060 CB |
1882 | rc = -4; |
1883 | } | |
ae4efe19 SP |
1884 | else if (helper_status) |
1885 | printf("ok %s\n", ref->name); | |
6eaf4060 CB |
1886 | new_refs++; |
1887 | continue; | |
1888 | } | |
1889 | ||
a89fccd2 | 1890 | if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
b5e59989 | 1891 | if (push_verbosely) |
aa1dbc98 | 1892 | fprintf(stderr, "'%s': up-to-date\n", ref->name); |
ae4efe19 SP |
1893 | if (helper_status) |
1894 | printf("ok %s up to date\n", ref->name); | |
aa1dbc98 NH |
1895 | continue; |
1896 | } | |
1897 | ||
1898 | if (!force_all && | |
0bf8c1f9 | 1899 | !is_null_sha1(ref->old_sha1) && |
aa1dbc98 NH |
1900 | !ref->force) { |
1901 | if (!has_sha1_file(ref->old_sha1) || | |
1902 | !ref_newer(ref->peer_ref->new_sha1, | |
1903 | ref->old_sha1)) { | |
00ae8289 BF |
1904 | /* |
1905 | * We do not have the remote ref, or | |
aa1dbc98 NH |
1906 | * we know that the remote ref is not |
1907 | * an ancestor of what we are trying to | |
1908 | * push. Either way this can be losing | |
1909 | * commits at the remote end and likely | |
1910 | * we were not up to date to begin with. | |
1911 | */ | |
00ae8289 BF |
1912 | error("remote '%s' is not an ancestor of\n" |
1913 | "local '%s'.\n" | |
1914 | "Maybe you are not up-to-date and " | |
aa1dbc98 NH |
1915 | "need to pull first?", |
1916 | ref->name, | |
1917 | ref->peer_ref->name); | |
ae4efe19 SP |
1918 | if (helper_status) |
1919 | printf("error %s non-fast forward\n", ref->name); | |
1a703cba | 1920 | rc = -2; |
aa1dbc98 NH |
1921 | continue; |
1922 | } | |
58e60dd2 | 1923 | } |
e702496e | 1924 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
aa1dbc98 NH |
1925 | new_refs++; |
1926 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); | |
1927 | new_hex = sha1_to_hex(ref->new_sha1); | |
1928 | ||
1929 | fprintf(stderr, "updating '%s'", ref->name); | |
1930 | if (strcmp(ref->name, ref->peer_ref->name)) | |
1931 | fprintf(stderr, " using '%s'", ref->peer_ref->name); | |
1932 | fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex); | |
ae4efe19 SP |
1933 | if (dry_run) { |
1934 | if (helper_status) | |
1935 | printf("ok %s\n", ref->name); | |
fe5d1d3e | 1936 | continue; |
ae4efe19 | 1937 | } |
58e60dd2 NH |
1938 | |
1939 | /* Lock remote branch ref */ | |
aa1dbc98 NH |
1940 | ref_lock = lock_remote(ref->name, LOCK_TIME); |
1941 | if (ref_lock == NULL) { | |
58e60dd2 | 1942 | fprintf(stderr, "Unable to lock remote branch %s\n", |
aa1dbc98 | 1943 | ref->name); |
ae4efe19 SP |
1944 | if (helper_status) |
1945 | printf("error %s lock error\n", ref->name); | |
58e60dd2 NH |
1946 | rc = 1; |
1947 | continue; | |
1948 | } | |
1949 | ||
aa1dbc98 | 1950 | /* Set up revision info for this refspec */ |
8c9e7947 | 1951 | commit_argc = 3; |
9befac47 | 1952 | new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1)); |
8c9e7947 | 1953 | old_sha1_hex = NULL; |
5241bfe6 NH |
1954 | commit_argv[1] = "--objects"; |
1955 | commit_argv[2] = new_sha1_hex; | |
0bf8c1f9 | 1956 | if (!push_all && !is_null_sha1(ref->old_sha1)) { |
aa1dbc98 NH |
1957 | old_sha1_hex = xmalloc(42); |
1958 | sprintf(old_sha1_hex, "^%s", | |
1959 | sha1_to_hex(ref->old_sha1)); | |
5241bfe6 | 1960 | commit_argv[3] = old_sha1_hex; |
aa1dbc98 | 1961 | commit_argc++; |
58e60dd2 | 1962 | } |
a80aad7b | 1963 | commit_argv[commit_argc] = NULL; |
db6296a5 | 1964 | init_revisions(&revs, setup_git_directory()); |
aa1dbc98 | 1965 | setup_revisions(commit_argc, commit_argv, &revs, NULL); |
d633c882 | 1966 | revs.edge_hint = 0; /* just in case */ |
aa1dbc98 NH |
1967 | free(new_sha1_hex); |
1968 | if (old_sha1_hex) { | |
1969 | free(old_sha1_hex); | |
1970 | commit_argv[1] = NULL; | |
58e60dd2 NH |
1971 | } |
1972 | ||
aa1dbc98 | 1973 | /* Generate a list of objects that need to be pushed */ |
58e60dd2 | 1974 | pushing = 0; |
3d51e1b5 MK |
1975 | if (prepare_revision_walk(&revs)) |
1976 | die("revision walk setup failed"); | |
e76a5fb4 | 1977 | mark_edges_uninteresting(&revs, NULL); |
1a703cba | 1978 | objects_to_send = get_delta(&revs, ref_lock); |
29508e1e | 1979 | finish_all_active_slots(); |
58e60dd2 NH |
1980 | |
1981 | /* Push missing objects to remote, this would be a | |
1982 | convenient time to pack them first if appropriate. */ | |
1983 | pushing = 1; | |
1a703cba NH |
1984 | if (objects_to_send) |
1985 | fprintf(stderr, " sending %d objects\n", | |
1986 | objects_to_send); | |
4f66250d TRC |
1987 | |
1988 | run_request_queue(); | |
58e60dd2 NH |
1989 | |
1990 | /* Update the remote branch if all went well */ | |
7fea9c55 | 1991 | if (aborted || !update_remote(ref->new_sha1, ref_lock)) |
aa1dbc98 | 1992 | rc = 1; |
58e60dd2 | 1993 | |
aa1dbc98 NH |
1994 | if (!rc) |
1995 | fprintf(stderr, " done\n"); | |
ae4efe19 SP |
1996 | if (helper_status) |
1997 | printf("%s %s\n", !rc ? "ok" : "error", ref->name); | |
aa1dbc98 | 1998 | unlock_remote(ref_lock); |
512d632c | 1999 | check_locks(); |
58e60dd2 NH |
2000 | } |
2001 | ||
197e8951 | 2002 | /* Update remote server info if appropriate */ |
7b5201a6 AK |
2003 | if (repo->has_info_refs && new_refs) { |
2004 | if (info_ref_lock && repo->can_update_info_refs) { | |
197e8951 | 2005 | fprintf(stderr, "Updating remote server info\n"); |
fe5d1d3e SP |
2006 | if (!dry_run) |
2007 | update_remote_info_refs(info_ref_lock); | |
197e8951 NH |
2008 | } else { |
2009 | fprintf(stderr, "Unable to update server info\n"); | |
2010 | } | |
2011 | } | |
197e8951 | 2012 | |
58e60dd2 | 2013 | cleanup: |
9116de59 GB |
2014 | if (info_ref_lock) |
2015 | unlock_remote(info_ref_lock); | |
7b5201a6 | 2016 | free(repo); |
58e60dd2 | 2017 | |
29508e1e | 2018 | http_cleanup(); |
58e60dd2 NH |
2019 | |
2020 | request = request_queue_head; | |
2021 | while (request != NULL) { | |
2022 | next_request = request->next; | |
2023 | release_request(request); | |
58e60dd2 NH |
2024 | request = next_request; |
2025 | } | |
2026 | ||
58e60dd2 NH |
2027 | return rc; |
2028 | } |