]>
Commit | Line | Data |
---|---|---|
58e60dd2 | 1 | #include "cache.h" |
109cd76d | 2 | #include "repository.h" |
58e60dd2 | 3 | #include "commit.h" |
58e60dd2 NH |
4 | #include "tag.h" |
5 | #include "blob.h" | |
29508e1e | 6 | #include "http.h" |
aa1dbc98 | 7 | #include "refs.h" |
c4e05b1a | 8 | #include "diff.h" |
aa1dbc98 | 9 | #include "revision.h" |
d807c4a0 | 10 | #include "exec-cmd.h" |
6b62816c | 11 | #include "remote.h" |
d633c882 | 12 | #include "list-objects.h" |
4a16d072 | 13 | #include "sigchain.h" |
dbbcd44f | 14 | #include "strvec.h" |
d6fe0036 | 15 | #include "packfile.h" |
a80d72db | 16 | #include "object-store.h" |
64043556 | 17 | #include "commit-reach.h" |
109cd76d | 18 | |
081fd8d0 MK |
19 | #ifdef EXPAT_NEEDS_XMLPARSE_H |
20 | #include <xmlparse.h> | |
21 | #else | |
bee8e79d | 22 | #include <expat.h> |
081fd8d0 | 23 | #endif |
58e60dd2 NH |
24 | |
25 | static const char http_push_usage[] = | |
1b1dd23f | 26 | "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n"; |
58e60dd2 | 27 | |
92e2eb9c JS |
28 | #ifndef XML_STATUS_OK |
29 | enum XML_Status { | |
30 | XML_STATUS_OK = 1, | |
31 | XML_STATUS_ERROR = 0 | |
32 | }; | |
33 | #define XML_STATUS_OK 1 | |
34 | #define XML_STATUS_ERROR 0 | |
35 | #endif | |
36 | ||
197e8951 | 37 | #define PREV_BUF_SIZE 4096 |
58e60dd2 | 38 | |
acf59575 | 39 | /* DAV methods */ |
58e60dd2 NH |
40 | #define DAV_LOCK "LOCK" |
41 | #define DAV_MKCOL "MKCOL" | |
42 | #define DAV_MOVE "MOVE" | |
43 | #define DAV_PROPFIND "PROPFIND" | |
44 | #define DAV_PUT "PUT" | |
45 | #define DAV_UNLOCK "UNLOCK" | |
3dfaf7bc | 46 | #define DAV_DELETE "DELETE" |
acf59575 NH |
47 | |
48 | /* DAV lock flags */ | |
49 | #define DAV_PROP_LOCKWR (1u << 0) | |
50 | #define DAV_PROP_LOCKEX (1u << 1) | |
51 | #define DAV_LOCK_OK (1u << 2) | |
52 | ||
53 | /* DAV XML properties */ | |
54 | #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry" | |
55 | #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write" | |
56 | #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive" | |
57 | #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href" | |
58 | #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout" | |
59 | #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href" | |
aa1dbc98 NH |
60 | #define DAV_PROPFIND_RESP ".multistatus.response" |
61 | #define DAV_PROPFIND_NAME ".multistatus.response.href" | |
62 | #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection" | |
acf59575 NH |
63 | |
64 | /* DAV request body templates */ | |
aa1dbc98 NH |
65 | #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>" |
66 | #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>" | |
58e60dd2 NH |
67 | #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>" |
68 | ||
75187c9d NH |
69 | #define LOCK_TIME 600 |
70 | #define LOCK_REFRESH 30 | |
71 | ||
208acbfb | 72 | /* Remember to update object flag allocation in object.h */ |
64472d15 | 73 | #define LOCAL (1u<<11) |
74 | #define REMOTE (1u<<12) | |
75 | #define FETCHING (1u<<13) | |
76 | #define PUSHING (1u<<14) | |
aa1dbc98 | 77 | |
3dfaf7bc NH |
78 | /* We allow "recursive" symbolic refs. Only within reason, though */ |
79 | #define MAXDEPTH 5 | |
80 | ||
96f1e58f DR |
81 | static int pushing; |
82 | static int aborted; | |
a3c57c9a | 83 | static signed char remote_dir_exists[256]; |
58e60dd2 | 84 | |
96f1e58f | 85 | static int push_verbosely; |
28b9d6e5 | 86 | static int push_all = MATCH_REFS_NONE; |
96f1e58f | 87 | static int force_all; |
fe5d1d3e | 88 | static int dry_run; |
ae4efe19 | 89 | static int helper_status; |
58e60dd2 | 90 | |
96f1e58f | 91 | static struct object_list *objects; |
aa1dbc98 | 92 | |
9cba13ca | 93 | struct repo { |
58e60dd2 | 94 | char *url; |
e1f33efe | 95 | char *path; |
aa1dbc98 | 96 | int path_len; |
197e8951 NH |
97 | int has_info_refs; |
98 | int can_update_info_refs; | |
99 | int has_info_packs; | |
58e60dd2 | 100 | struct packed_git *packs; |
512d632c | 101 | struct remote_lock *locks; |
58e60dd2 NH |
102 | }; |
103 | ||
7b5201a6 | 104 | static struct repo *repo; |
58e60dd2 NH |
105 | |
106 | enum transfer_state { | |
197e8951 NH |
107 | NEED_FETCH, |
108 | RUN_FETCH_LOOSE, | |
109 | RUN_FETCH_PACKED, | |
58e60dd2 NH |
110 | NEED_PUSH, |
111 | RUN_MKCOL, | |
112 | RUN_PUT, | |
113 | RUN_MOVE, | |
114 | ABORTED, | |
4b05548f | 115 | COMPLETE |
58e60dd2 NH |
116 | }; |
117 | ||
9cba13ca | 118 | struct transfer_request { |
aa1dbc98 | 119 | struct object *obj; |
eb053492 | 120 | struct packed_git *target; |
58e60dd2 NH |
121 | char *url; |
122 | char *dest; | |
aa1dbc98 | 123 | struct remote_lock *lock; |
58e60dd2 NH |
124 | struct curl_slist *headers; |
125 | struct buffer buffer; | |
58e60dd2 NH |
126 | enum transfer_state state; |
127 | CURLcode curl_result; | |
128 | char errorstr[CURL_ERROR_SIZE]; | |
129 | long http_code; | |
197e8951 | 130 | void *userData; |
58e60dd2 NH |
131 | struct active_request_slot *slot; |
132 | struct transfer_request *next; | |
133 | }; | |
134 | ||
96f1e58f | 135 | static struct transfer_request *request_queue_head; |
58e60dd2 | 136 | |
9cba13ca | 137 | struct xml_ctx { |
acf59575 NH |
138 | char *name; |
139 | int len; | |
140 | char *cdata; | |
141 | void (*userFunc)(struct xml_ctx *ctx, int tag_closed); | |
142 | void *userData; | |
143 | }; | |
144 | ||
9cba13ca | 145 | struct remote_lock { |
75187c9d | 146 | char *url; |
26349b2e | 147 | char *owner; |
75187c9d | 148 | char *token; |
f024b87a | 149 | char tmpfile_suffix[GIT_MAX_HEXSZ + 1]; |
26349b2e NH |
150 | time_t start_time; |
151 | long timeout; | |
75187c9d | 152 | int refreshing; |
aa1dbc98 NH |
153 | struct remote_lock *next; |
154 | }; | |
155 | ||
3030baa7 NH |
156 | /* Flags that control remote_ls processing */ |
157 | #define PROCESS_FILES (1u << 0) | |
158 | #define PROCESS_DIRS (1u << 1) | |
159 | #define RECURSIVE (1u << 2) | |
160 | ||
161 | /* Flags that remote_ls passes to callback functions */ | |
162 | #define IS_DIR (1u << 0) | |
163 | ||
9cba13ca | 164 | struct remote_ls_ctx { |
3030baa7 NH |
165 | char *path; |
166 | void (*userFunc)(struct remote_ls_ctx *ls); | |
167 | void *userData; | |
168 | int flags; | |
169 | char *dentry_name; | |
170 | int dentry_flags; | |
171 | struct remote_ls_ctx *parent; | |
26349b2e NH |
172 | }; |
173 | ||
b1c7d4aa TRC |
174 | /* get_dav_token_headers options */ |
175 | enum dav_header_flag { | |
176 | DAV_HEADER_IF = (1u << 0), | |
177 | DAV_HEADER_LOCK = (1u << 1), | |
178 | DAV_HEADER_TIMEOUT = (1u << 2) | |
179 | }; | |
180 | ||
2aab167a | 181 | static char *xml_entities(const char *s) |
519d05be MH |
182 | { |
183 | struct strbuf buf = STRBUF_INIT; | |
37141f27 | 184 | strbuf_addstr_xml_quoted(&buf, s); |
519d05be MH |
185 | return strbuf_detach(&buf, NULL); |
186 | } | |
187 | ||
ebaaf316 DM |
188 | static void curl_setup_http_get(CURL *curl, const char *url, |
189 | const char *custom_req) | |
190 | { | |
191 | curl_easy_setopt(curl, CURLOPT_HTTPGET, 1); | |
192 | curl_easy_setopt(curl, CURLOPT_URL, url); | |
193 | curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); | |
194 | curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_null); | |
195 | } | |
196 | ||
197 | static void curl_setup_http(CURL *curl, const char *url, | |
198 | const char *custom_req, struct buffer *buffer, | |
199 | curl_write_callback write_fn) | |
200 | { | |
201 | curl_easy_setopt(curl, CURLOPT_PUT, 1); | |
202 | curl_easy_setopt(curl, CURLOPT_URL, url); | |
203 | curl_easy_setopt(curl, CURLOPT_INFILE, buffer); | |
204 | curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len); | |
205 | curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer); | |
206 | #ifndef NO_CURL_IOCTL | |
207 | curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer); | |
479eaa8e | 208 | curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer); |
ebaaf316 DM |
209 | #endif |
210 | curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn); | |
211 | curl_easy_setopt(curl, CURLOPT_NOBODY, 0); | |
212 | curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); | |
213 | curl_easy_setopt(curl, CURLOPT_UPLOAD, 1); | |
214 | } | |
215 | ||
d456c9fd JH |
216 | static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) |
217 | { | |
b1c7d4aa | 218 | struct strbuf buf = STRBUF_INIT; |
8cb01e2f | 219 | struct curl_slist *dav_headers = http_copy_default_headers(); |
b1c7d4aa | 220 | |
d456c9fd | 221 | if (options & DAV_HEADER_IF) { |
b1c7d4aa TRC |
222 | strbuf_addf(&buf, "If: (<%s>)", lock->token); |
223 | dav_headers = curl_slist_append(dav_headers, buf.buf); | |
224 | strbuf_reset(&buf); | |
225 | } | |
d456c9fd | 226 | if (options & DAV_HEADER_LOCK) { |
b1c7d4aa TRC |
227 | strbuf_addf(&buf, "Lock-Token: <%s>", lock->token); |
228 | dav_headers = curl_slist_append(dav_headers, buf.buf); | |
229 | strbuf_reset(&buf); | |
230 | } | |
d456c9fd | 231 | if (options & DAV_HEADER_TIMEOUT) { |
b1c7d4aa TRC |
232 | strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout); |
233 | dav_headers = curl_slist_append(dav_headers, buf.buf); | |
234 | strbuf_reset(&buf); | |
235 | } | |
236 | strbuf_release(&buf); | |
237 | ||
238 | return dav_headers; | |
239 | } | |
240 | ||
29508e1e | 241 | static void finish_request(struct transfer_request *request); |
197e8951 | 242 | static void release_request(struct transfer_request *request); |
58e60dd2 | 243 | |
29508e1e | 244 | static void process_response(void *callback_data) |
58e60dd2 | 245 | { |
29508e1e NH |
246 | struct transfer_request *request = |
247 | (struct transfer_request *)callback_data; | |
58e60dd2 | 248 | |
29508e1e | 249 | finish_request(request); |
58e60dd2 NH |
250 | } |
251 | ||
dd8239f9 | 252 | #ifdef USE_CURL_MULTI |
dcdb3335 | 253 | |
197e8951 NH |
254 | static void start_fetch_loose(struct transfer_request *request) |
255 | { | |
197e8951 | 256 | struct active_request_slot *slot; |
5424bc55 | 257 | struct http_object_request *obj_req; |
197e8951 | 258 | |
f0be0db1 | 259 | obj_req = new_http_object_request(repo->url, &request->obj->oid); |
5424bc55 | 260 | if (obj_req == NULL) { |
197e8951 | 261 | request->state = ABORTED; |
197e8951 NH |
262 | return; |
263 | } | |
264 | ||
5424bc55 | 265 | slot = obj_req->slot; |
197e8951 NH |
266 | slot->callback_func = process_response; |
267 | slot->callback_data = request; | |
268 | request->slot = slot; | |
5424bc55 | 269 | request->userData = obj_req; |
197e8951 NH |
270 | |
271 | /* Try to get the request started, abort the request on error */ | |
272 | request->state = RUN_FETCH_LOOSE; | |
273 | if (!start_active_slot(slot)) { | |
274 | fprintf(stderr, "Unable to start GET request\n"); | |
7b5201a6 | 275 | repo->can_update_info_refs = 0; |
5424bc55 | 276 | release_http_object_request(obj_req); |
197e8951 NH |
277 | release_request(request); |
278 | } | |
279 | } | |
280 | ||
dd8239f9 JH |
281 | static void start_mkcol(struct transfer_request *request) |
282 | { | |
f2fd0760 | 283 | char *hex = oid_to_hex(&request->obj->oid); |
dd8239f9 | 284 | struct active_request_slot *slot; |
dd8239f9 | 285 | |
7b5201a6 | 286 | request->url = get_remote_object_url(repo->url, hex, 1); |
dd8239f9 JH |
287 | |
288 | slot = get_active_slot(); | |
289 | slot->callback_func = process_response; | |
290 | slot->callback_data = request; | |
ebaaf316 | 291 | curl_setup_http_get(slot->curl, request->url, DAV_MKCOL); |
dd8239f9 | 292 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); |
dd8239f9 JH |
293 | |
294 | if (start_active_slot(slot)) { | |
295 | request->slot = slot; | |
296 | request->state = RUN_MKCOL; | |
297 | } else { | |
298 | request->state = ABORTED; | |
6a83d902 | 299 | FREE_AND_NULL(request->url); |
dd8239f9 JH |
300 | } |
301 | } | |
302 | #endif | |
303 | ||
197e8951 NH |
304 | static void start_fetch_packed(struct transfer_request *request) |
305 | { | |
197e8951 | 306 | struct packed_git *target; |
197e8951 NH |
307 | |
308 | struct transfer_request *check_request = request_queue_head; | |
2264dfa5 | 309 | struct http_pack_request *preq; |
197e8951 | 310 | |
ed1c9977 | 311 | target = find_sha1_pack(request->obj->oid.hash, repo->packs); |
197e8951 | 312 | if (!target) { |
f2fd0760 | 313 | fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", oid_to_hex(&request->obj->oid)); |
7b5201a6 | 314 | repo->can_update_info_refs = 0; |
197e8951 NH |
315 | release_request(request); |
316 | return; | |
317 | } | |
eb053492 JT |
318 | close_pack_index(target); |
319 | request->target = target; | |
197e8951 | 320 | |
538b1523 | 321 | fprintf(stderr, "Fetching pack %s\n", |
1cb158b6 | 322 | hash_to_hex(target->hash)); |
f2fd0760 | 323 | fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid)); |
197e8951 | 324 | |
eb053492 | 325 | preq = new_http_pack_request(target->hash, repo->url); |
2264dfa5 | 326 | if (preq == NULL) { |
2264dfa5 TRC |
327 | repo->can_update_info_refs = 0; |
328 | return; | |
329 | } | |
197e8951 NH |
330 | |
331 | /* Make sure there isn't another open request for this pack */ | |
332 | while (check_request) { | |
333 | if (check_request->state == RUN_FETCH_PACKED && | |
2264dfa5 TRC |
334 | !strcmp(check_request->url, preq->url)) { |
335 | release_http_pack_request(preq); | |
197e8951 NH |
336 | release_request(request); |
337 | return; | |
338 | } | |
339 | check_request = check_request->next; | |
340 | } | |
341 | ||
2264dfa5 TRC |
342 | preq->slot->callback_func = process_response; |
343 | preq->slot->callback_data = request; | |
344 | request->slot = preq->slot; | |
345 | request->userData = preq; | |
197e8951 NH |
346 | |
347 | /* Try to get the request started, abort the request on error */ | |
348 | request->state = RUN_FETCH_PACKED; | |
2264dfa5 | 349 | if (!start_active_slot(preq->slot)) { |
197e8951 | 350 | fprintf(stderr, "Unable to start GET request\n"); |
2264dfa5 | 351 | release_http_pack_request(preq); |
7b5201a6 | 352 | repo->can_update_info_refs = 0; |
197e8951 NH |
353 | release_request(request); |
354 | } | |
355 | } | |
356 | ||
58e60dd2 NH |
357 | static void start_put(struct transfer_request *request) |
358 | { | |
f2fd0760 | 359 | char *hex = oid_to_hex(&request->obj->oid); |
58e60dd2 | 360 | struct active_request_slot *slot; |
817d14a8 | 361 | struct strbuf buf = STRBUF_INIT; |
21666f1a | 362 | enum object_type type; |
58e60dd2 NH |
363 | char hdr[50]; |
364 | void *unpacked; | |
365 | unsigned long len; | |
366 | int hdrlen; | |
367 | ssize_t size; | |
ef49a7a0 | 368 | git_zstream stream; |
58e60dd2 | 369 | |
b4f5aca4 | 370 | unpacked = read_object_file(&request->obj->oid, &type, &len); |
ca473cef | 371 | hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1; |
58e60dd2 NH |
372 | |
373 | /* Set it up */ | |
55bb5c91 | 374 | git_deflate_init(&stream, zlib_compression_level); |
225a6f10 | 375 | size = git_deflate_bound(&stream, len + hdrlen); |
028c2976 MH |
376 | strbuf_init(&request->buffer.buf, size); |
377 | request->buffer.posn = 0; | |
58e60dd2 NH |
378 | |
379 | /* Compress it */ | |
028c2976 | 380 | stream.next_out = (unsigned char *)request->buffer.buf.buf; |
58e60dd2 NH |
381 | stream.avail_out = size; |
382 | ||
383 | /* First header.. */ | |
384 | stream.next_in = (void *)hdr; | |
385 | stream.avail_in = hdrlen; | |
55bb5c91 JH |
386 | while (git_deflate(&stream, 0) == Z_OK) |
387 | ; /* nothing */ | |
58e60dd2 NH |
388 | |
389 | /* Then the data itself.. */ | |
390 | stream.next_in = unpacked; | |
391 | stream.avail_in = len; | |
55bb5c91 JH |
392 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
393 | ; /* nothing */ | |
394 | git_deflate_end(&stream); | |
58e60dd2 NH |
395 | free(unpacked); |
396 | ||
028c2976 | 397 | request->buffer.buf.len = stream.total_out; |
58e60dd2 | 398 | |
817d14a8 | 399 | strbuf_addstr(&buf, "Destination: "); |
7b5201a6 | 400 | append_remote_object_url(&buf, repo->url, hex, 0); |
817d14a8 TRC |
401 | request->dest = strbuf_detach(&buf, NULL); |
402 | ||
7b5201a6 | 403 | append_remote_object_url(&buf, repo->url, hex, 0); |
f024b87a | 404 | strbuf_add(&buf, request->lock->tmpfile_suffix, the_hash_algo->hexsz + 1); |
817d14a8 | 405 | request->url = strbuf_detach(&buf, NULL); |
58e60dd2 NH |
406 | |
407 | slot = get_active_slot(); | |
29508e1e NH |
408 | slot->callback_func = process_response; |
409 | slot->callback_data = request; | |
ebaaf316 DM |
410 | curl_setup_http(slot->curl, request->url, DAV_PUT, |
411 | &request->buffer, fwrite_null); | |
58e60dd2 NH |
412 | |
413 | if (start_active_slot(slot)) { | |
414 | request->slot = slot; | |
415 | request->state = RUN_PUT; | |
416 | } else { | |
417 | request->state = ABORTED; | |
6a83d902 | 418 | FREE_AND_NULL(request->url); |
58e60dd2 NH |
419 | } |
420 | } | |
421 | ||
422 | static void start_move(struct transfer_request *request) | |
423 | { | |
424 | struct active_request_slot *slot; | |
8cb01e2f | 425 | struct curl_slist *dav_headers = http_copy_default_headers(); |
58e60dd2 NH |
426 | |
427 | slot = get_active_slot(); | |
29508e1e NH |
428 | slot->callback_func = process_response; |
429 | slot->callback_data = request; | |
ebaaf316 | 430 | curl_setup_http_get(slot->curl, request->url, DAV_MOVE); |
58e60dd2 NH |
431 | dav_headers = curl_slist_append(dav_headers, request->dest); |
432 | dav_headers = curl_slist_append(dav_headers, "Overwrite: T"); | |
433 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); | |
58e60dd2 NH |
434 | |
435 | if (start_active_slot(slot)) { | |
436 | request->slot = slot; | |
437 | request->state = RUN_MOVE; | |
438 | } else { | |
439 | request->state = ABORTED; | |
6a83d902 | 440 | FREE_AND_NULL(request->url); |
58e60dd2 NH |
441 | } |
442 | } | |
443 | ||
512d632c | 444 | static int refresh_lock(struct remote_lock *lock) |
75187c9d NH |
445 | { |
446 | struct active_request_slot *slot; | |
baa7b67d | 447 | struct slot_results results; |
b1c7d4aa | 448 | struct curl_slist *dav_headers; |
512d632c | 449 | int rc = 0; |
75187c9d | 450 | |
512d632c | 451 | lock->refreshing = 1; |
75187c9d | 452 | |
b1c7d4aa | 453 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT); |
75187c9d | 454 | |
512d632c NH |
455 | slot = get_active_slot(); |
456 | slot->results = &results; | |
ebaaf316 | 457 | curl_setup_http_get(slot->curl, lock->url, DAV_LOCK); |
512d632c | 458 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
75187c9d | 459 | |
512d632c NH |
460 | if (start_active_slot(slot)) { |
461 | run_active_slot(slot); | |
462 | if (results.curl_result != CURLE_OK) { | |
463 | fprintf(stderr, "LOCK HTTP error %ld\n", | |
464 | results.http_code); | |
465 | } else { | |
466 | lock->start_time = time(NULL); | |
467 | rc = 1; | |
468 | } | |
469 | } | |
aa1dbc98 | 470 | |
512d632c NH |
471 | lock->refreshing = 0; |
472 | curl_slist_free_all(dav_headers); | |
aa1dbc98 | 473 | |
512d632c NH |
474 | return rc; |
475 | } | |
476 | ||
ec26b4d6 | 477 | static void check_locks(void) |
512d632c | 478 | { |
7b5201a6 | 479 | struct remote_lock *lock = repo->locks; |
512d632c NH |
480 | time_t current_time = time(NULL); |
481 | int time_remaining; | |
482 | ||
483 | while (lock) { | |
484 | time_remaining = lock->start_time + lock->timeout - | |
485 | current_time; | |
486 | if (!lock->refreshing && time_remaining < LOCK_REFRESH) { | |
487 | if (!refresh_lock(lock)) { | |
488 | fprintf(stderr, | |
489 | "Unable to refresh lock for %s\n", | |
490 | lock->url); | |
491 | aborted = 1; | |
492 | return; | |
aa1dbc98 | 493 | } |
75187c9d | 494 | } |
512d632c | 495 | lock = lock->next; |
75187c9d | 496 | } |
aa1dbc98 | 497 | } |
75187c9d | 498 | |
aa1dbc98 NH |
499 | static void release_request(struct transfer_request *request) |
500 | { | |
501 | struct transfer_request *entry = request_queue_head; | |
502 | ||
503 | if (request == request_queue_head) { | |
504 | request_queue_head = request->next; | |
505 | } else { | |
5cc6a4be | 506 | while (entry && entry->next != request) |
aa1dbc98 | 507 | entry = entry->next; |
5cc6a4be RS |
508 | if (entry) |
509 | entry->next = request->next; | |
aa1dbc98 NH |
510 | } |
511 | ||
8e0f7003 | 512 | free(request->url); |
aa1dbc98 | 513 | free(request); |
75187c9d NH |
514 | } |
515 | ||
58e60dd2 NH |
516 | static void finish_request(struct transfer_request *request) |
517 | { | |
2264dfa5 | 518 | struct http_pack_request *preq; |
5424bc55 | 519 | struct http_object_request *obj_req; |
197e8951 NH |
520 | |
521 | request->curl_result = request->slot->curl_result; | |
58e60dd2 NH |
522 | request->http_code = request->slot->http_code; |
523 | request->slot = NULL; | |
75187c9d | 524 | |
aa1dbc98 | 525 | /* Keep locks active */ |
512d632c | 526 | check_locks(); |
75187c9d | 527 | |
58e60dd2 NH |
528 | if (request->headers != NULL) |
529 | curl_slist_free_all(request->headers); | |
7b899967 | 530 | |
9dde06de CMAB |
531 | /* URL is reused for MOVE after PUT and used during FETCH */ |
532 | if (request->state != RUN_PUT && request->state != RUN_FETCH_PACKED) { | |
6a83d902 | 533 | FREE_AND_NULL(request->url); |
aa1dbc98 | 534 | } |
7b899967 | 535 | |
aa1dbc98 | 536 | if (request->state == RUN_MKCOL) { |
58e60dd2 NH |
537 | if (request->curl_result == CURLE_OK || |
538 | request->http_code == 405) { | |
ed1c9977 | 539 | remote_dir_exists[request->obj->oid.hash[0]] = 1; |
58e60dd2 NH |
540 | start_put(request); |
541 | } else { | |
542 | fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n", | |
f2fd0760 | 543 | oid_to_hex(&request->obj->oid), |
58e60dd2 NH |
544 | request->curl_result, request->http_code); |
545 | request->state = ABORTED; | |
546 | aborted = 1; | |
547 | } | |
548 | } else if (request->state == RUN_PUT) { | |
549 | if (request->curl_result == CURLE_OK) { | |
550 | start_move(request); | |
551 | } else { | |
552 | fprintf(stderr, "PUT %s failed, aborting (%d/%ld)\n", | |
f2fd0760 | 553 | oid_to_hex(&request->obj->oid), |
58e60dd2 NH |
554 | request->curl_result, request->http_code); |
555 | request->state = ABORTED; | |
556 | aborted = 1; | |
557 | } | |
558 | } else if (request->state == RUN_MOVE) { | |
559 | if (request->curl_result == CURLE_OK) { | |
1a703cba NH |
560 | if (push_verbosely) |
561 | fprintf(stderr, " sent %s\n", | |
f2fd0760 | 562 | oid_to_hex(&request->obj->oid)); |
aa1dbc98 NH |
563 | request->obj->flags |= REMOTE; |
564 | release_request(request); | |
58e60dd2 NH |
565 | } else { |
566 | fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n", | |
f2fd0760 | 567 | oid_to_hex(&request->obj->oid), |
58e60dd2 NH |
568 | request->curl_result, request->http_code); |
569 | request->state = ABORTED; | |
570 | aborted = 1; | |
571 | } | |
197e8951 | 572 | } else if (request->state == RUN_FETCH_LOOSE) { |
5424bc55 | 573 | obj_req = (struct http_object_request *)request->userData; |
197e8951 | 574 | |
5424bc55 TRC |
575 | if (finish_http_object_request(obj_req) == 0) |
576 | if (obj_req->rename == 0) | |
577 | request->obj->flags |= (LOCAL | REMOTE); | |
197e8951 NH |
578 | |
579 | /* Try fetching packed if necessary */ | |
5424bc55 TRC |
580 | if (request->obj->flags & LOCAL) { |
581 | release_http_object_request(obj_req); | |
197e8951 | 582 | release_request(request); |
5424bc55 | 583 | } else |
197e8951 NH |
584 | start_fetch_packed(request); |
585 | ||
586 | } else if (request->state == RUN_FETCH_PACKED) { | |
2264dfa5 | 587 | int fail = 1; |
197e8951 NH |
588 | if (request->curl_result != CURLE_OK) { |
589 | fprintf(stderr, "Unable to get pack file %s\n%s", | |
590 | request->url, curl_errorstr); | |
197e8951 | 591 | } else { |
2264dfa5 TRC |
592 | preq = (struct http_pack_request *)request->userData; |
593 | ||
594 | if (preq) { | |
609621a4 | 595 | if (finish_http_pack_request(preq) == 0) |
2264dfa5 TRC |
596 | fail = 0; |
597 | release_http_pack_request(preq); | |
197e8951 NH |
598 | } |
599 | } | |
2264dfa5 TRC |
600 | if (fail) |
601 | repo->can_update_info_refs = 0; | |
eb053492 JT |
602 | else |
603 | http_install_packfile(request->target, &repo->packs); | |
197e8951 | 604 | release_request(request); |
58e60dd2 NH |
605 | } |
606 | } | |
607 | ||
b3ca4e4e | 608 | #ifdef USE_CURL_MULTI |
4f66250d | 609 | static int is_running_queue; |
fc57b6aa | 610 | static int fill_active_slot(void *unused) |
58e60dd2 | 611 | { |
8e24cbae | 612 | struct transfer_request *request; |
58e60dd2 | 613 | |
4f66250d | 614 | if (aborted || !is_running_queue) |
45c17412 | 615 | return 0; |
58e60dd2 | 616 | |
45c17412 | 617 | for (request = request_queue_head; request; request = request->next) { |
197e8951 NH |
618 | if (request->state == NEED_FETCH) { |
619 | start_fetch_loose(request); | |
45c17412 | 620 | return 1; |
197e8951 | 621 | } else if (pushing && request->state == NEED_PUSH) { |
ed1c9977 | 622 | if (remote_dir_exists[request->obj->oid.hash[0]] == 1) { |
0dd276b8 | 623 | start_put(request); |
aa1dbc98 | 624 | } else { |
0dd276b8 | 625 | start_mkcol(request); |
aa1dbc98 | 626 | } |
45c17412 | 627 | return 1; |
58e60dd2 | 628 | } |
aa1dbc98 | 629 | } |
45c17412 | 630 | return 0; |
58e60dd2 | 631 | } |
b3ca4e4e | 632 | #endif |
58e60dd2 | 633 | |
aa1dbc98 NH |
634 | static void get_remote_object_list(unsigned char parent); |
635 | ||
197e8951 NH |
636 | static void add_fetch_request(struct object *obj) |
637 | { | |
638 | struct transfer_request *request; | |
639 | ||
640 | check_locks(); | |
641 | ||
642 | /* | |
643 | * Don't fetch the object if it's known to exist locally | |
644 | * or is already in the request queue | |
645 | */ | |
ed1c9977 | 646 | if (remote_dir_exists[obj->oid.hash[0]] == -1) |
647 | get_remote_object_list(obj->oid.hash[0]); | |
197e8951 NH |
648 | if (obj->flags & (LOCAL | FETCHING)) |
649 | return; | |
650 | ||
651 | obj->flags |= FETCHING; | |
652 | request = xmalloc(sizeof(*request)); | |
653 | request->obj = obj; | |
654 | request->url = NULL; | |
655 | request->lock = NULL; | |
656 | request->headers = NULL; | |
197e8951 NH |
657 | request->state = NEED_FETCH; |
658 | request->next = request_queue_head; | |
659 | request_queue_head = request; | |
660 | ||
b3ca4e4e | 661 | #ifdef USE_CURL_MULTI |
197e8951 NH |
662 | fill_active_slots(); |
663 | step_active_slots(); | |
b3ca4e4e | 664 | #endif |
197e8951 NH |
665 | } |
666 | ||
1a703cba | 667 | static int add_send_request(struct object *obj, struct remote_lock *lock) |
58e60dd2 | 668 | { |
3def06e6 | 669 | struct transfer_request *request; |
58e60dd2 | 670 | struct packed_git *target; |
58e60dd2 | 671 | |
512d632c NH |
672 | /* Keep locks active */ |
673 | check_locks(); | |
674 | ||
aa1dbc98 NH |
675 | /* |
676 | * Don't push the object if it's known to exist on the remote | |
677 | * or is already in the request queue | |
678 | */ | |
ed1c9977 | 679 | if (remote_dir_exists[obj->oid.hash[0]] == -1) |
680 | get_remote_object_list(obj->oid.hash[0]); | |
aa1dbc98 | 681 | if (obj->flags & (REMOTE | PUSHING)) |
1a703cba | 682 | return 0; |
ed1c9977 | 683 | target = find_sha1_pack(obj->oid.hash, repo->packs); |
aa1dbc98 NH |
684 | if (target) { |
685 | obj->flags |= REMOTE; | |
1a703cba | 686 | return 0; |
aa1dbc98 | 687 | } |
58e60dd2 | 688 | |
aa1dbc98 | 689 | obj->flags |= PUSHING; |
58e60dd2 | 690 | request = xmalloc(sizeof(*request)); |
aa1dbc98 | 691 | request->obj = obj; |
58e60dd2 | 692 | request->url = NULL; |
26349b2e | 693 | request->lock = lock; |
58e60dd2 | 694 | request->headers = NULL; |
aa1dbc98 | 695 | request->state = NEED_PUSH; |
c17fb6ee NH |
696 | request->next = request_queue_head; |
697 | request_queue_head = request; | |
29508e1e | 698 | |
b3ca4e4e | 699 | #ifdef USE_CURL_MULTI |
29508e1e NH |
700 | fill_active_slots(); |
701 | step_active_slots(); | |
b3ca4e4e | 702 | #endif |
1a703cba NH |
703 | |
704 | return 1; | |
58e60dd2 NH |
705 | } |
706 | ||
f4f440a0 | 707 | static int fetch_indices(void) |
58e60dd2 | 708 | { |
b8caac2b | 709 | int ret; |
58e60dd2 | 710 | |
58e60dd2 NH |
711 | if (push_verbosely) |
712 | fprintf(stderr, "Getting pack list\n"); | |
1a703cba | 713 | |
b8caac2b TRC |
714 | switch (http_get_info_packs(repo->url, &repo->packs)) { |
715 | case HTTP_OK: | |
716 | case HTTP_MISSING_TARGET: | |
717 | ret = 0; | |
718 | break; | |
719 | default: | |
720 | ret = -1; | |
58e60dd2 NH |
721 | } |
722 | ||
b8caac2b | 723 | return ret; |
58e60dd2 NH |
724 | } |
725 | ||
1aa40df6 | 726 | static void one_remote_object(const struct object_id *oid) |
aa1dbc98 | 727 | { |
aa1dbc98 NH |
728 | struct object *obj; |
729 | ||
d0229abd | 730 | obj = lookup_object(the_repository, oid); |
aa1dbc98 | 731 | if (!obj) |
109cd76d | 732 | obj = parse_object(the_repository, oid); |
aa1dbc98 NH |
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; |
f024b87a | 765 | git_hash_ctx hash_ctx; |
766 | unsigned char lock_token_hash[GIT_MAX_RAWSZ]; | |
acf59575 NH |
767 | |
768 | if (tag_closed && ctx->cdata) { | |
769 | if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) { | |
95244ae3 | 770 | lock->owner = xstrdup(ctx->cdata); |
acf59575 | 771 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) { |
ae021d87 JK |
772 | const char *arg; |
773 | if (skip_prefix(ctx->cdata, "Second-", &arg)) | |
774 | lock->timeout = strtol(arg, NULL, 10); | |
acf59575 | 775 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) { |
95244ae3 | 776 | lock->token = xstrdup(ctx->cdata); |
dfab7c14 | 777 | |
f024b87a | 778 | the_hash_algo->init_fn(&hash_ctx); |
779 | the_hash_algo->update_fn(&hash_ctx, lock->token, strlen(lock->token)); | |
780 | the_hash_algo->final_fn(lock_token_hash, &hash_ctx); | |
dfab7c14 TRC |
781 | |
782 | lock->tmpfile_suffix[0] = '_'; | |
f024b87a | 783 | memcpy(lock->tmpfile_suffix + 1, hash_to_hex(lock_token_hash), the_hash_algo->hexsz); |
acf59575 | 784 | } |
26349b2e NH |
785 | } |
786 | } | |
787 | ||
2aab167a | 788 | static void one_remote_ref(const char *refname); |
aa1dbc98 | 789 | |
26349b2e | 790 | static void |
acf59575 | 791 | xml_start_tag(void *userData, const char *name, const char **atts) |
26349b2e | 792 | { |
acf59575 | 793 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 794 | const char *c = strchr(name, ':'); |
0cc41428 | 795 | int old_namelen, new_len; |
acf59575 NH |
796 | |
797 | if (c == NULL) | |
798 | c = name; | |
799 | else | |
800 | c++; | |
801 | ||
0cc41428 JK |
802 | old_namelen = strlen(ctx->name); |
803 | new_len = old_namelen + strlen(c) + 2; | |
acf59575 NH |
804 | |
805 | if (new_len > ctx->len) { | |
806 | ctx->name = xrealloc(ctx->name, new_len); | |
807 | ctx->len = new_len; | |
26349b2e | 808 | } |
0cc41428 | 809 | xsnprintf(ctx->name + old_namelen, ctx->len - old_namelen, ".%s", c); |
26349b2e | 810 | |
6a83d902 | 811 | FREE_AND_NULL(ctx->cdata); |
acf59575 NH |
812 | |
813 | ctx->userFunc(ctx, 0); | |
26349b2e NH |
814 | } |
815 | ||
58e60dd2 | 816 | static void |
acf59575 | 817 | xml_end_tag(void *userData, const char *name) |
58e60dd2 | 818 | { |
acf59575 | 819 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
ef9e58c8 | 820 | const char *c = strchr(name, ':'); |
acf59575 | 821 | char *ep; |
58e60dd2 | 822 | |
acf59575 NH |
823 | ctx->userFunc(ctx, 1); |
824 | ||
825 | if (c == NULL) | |
826 | c = name; | |
827 | else | |
828 | c++; | |
829 | ||
830 | ep = ctx->name + strlen(ctx->name) - strlen(c) - 1; | |
831 | *ep = 0; | |
58e60dd2 NH |
832 | } |
833 | ||
834 | static void | |
acf59575 | 835 | xml_cdata(void *userData, const XML_Char *s, int len) |
58e60dd2 | 836 | { |
acf59575 | 837 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
4cac42b1 | 838 | free(ctx->cdata); |
182af834 | 839 | ctx->cdata = xmemdupz(s, len); |
58e60dd2 NH |
840 | } |
841 | ||
554fe20d | 842 | static struct remote_lock *lock_remote(const char *path, long timeout) |
58e60dd2 NH |
843 | { |
844 | struct active_request_slot *slot; | |
baa7b67d | 845 | struct slot_results results; |
028c2976 MH |
846 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
847 | struct strbuf in_buffer = STRBUF_INIT; | |
58e60dd2 | 848 | char *url; |
0772b9a6 | 849 | char *ep; |
58e60dd2 | 850 | char timeout_header[25]; |
512d632c | 851 | struct remote_lock *lock = NULL; |
8cb01e2f | 852 | struct curl_slist *dav_headers = http_copy_default_headers(); |
acf59575 | 853 | struct xml_ctx ctx; |
519d05be | 854 | char *escaped; |
58e60dd2 | 855 | |
28310186 | 856 | url = xstrfmt("%s%s", repo->url, path); |
aa1dbc98 | 857 | |
0772b9a6 | 858 | /* Make sure leading directories exist for the remote ref */ |
7b5201a6 | 859 | ep = strchr(url + strlen(repo->url) + 1, '/'); |
0772b9a6 | 860 | while (ep) { |
466ddf90 JS |
861 | char saved_character = ep[1]; |
862 | ep[1] = '\0'; | |
0772b9a6 | 863 | slot = get_active_slot(); |
baa7b67d | 864 | slot->results = &results; |
ebaaf316 | 865 | curl_setup_http_get(slot->curl, url, DAV_MKCOL); |
0772b9a6 NH |
866 | if (start_active_slot(slot)) { |
867 | run_active_slot(slot); | |
baa7b67d NH |
868 | if (results.curl_result != CURLE_OK && |
869 | results.http_code != 405) { | |
0772b9a6 NH |
870 | fprintf(stderr, |
871 | "Unable to create branch path %s\n", | |
872 | url); | |
873 | free(url); | |
874 | return NULL; | |
875 | } | |
876 | } else { | |
1a703cba | 877 | fprintf(stderr, "Unable to start MKCOL request\n"); |
0772b9a6 NH |
878 | free(url); |
879 | return NULL; | |
880 | } | |
466ddf90 | 881 | ep[1] = saved_character; |
0772b9a6 NH |
882 | ep = strchr(ep + 1, '/'); |
883 | } | |
884 | ||
5cb2194a | 885 | escaped = xml_entities(ident_default_email()); |
519d05be MH |
886 | strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped); |
887 | free(escaped); | |
26349b2e | 888 | |
5096d490 | 889 | xsnprintf(timeout_header, sizeof(timeout_header), "Timeout: Second-%ld", timeout); |
58e60dd2 NH |
890 | dav_headers = curl_slist_append(dav_headers, timeout_header); |
891 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
892 | ||
893 | slot = get_active_slot(); | |
baa7b67d | 894 | slot->results = &results; |
ebaaf316 | 895 | curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer); |
58e60dd2 | 896 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 897 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
58e60dd2 | 898 | |
aa1dbc98 | 899 | lock = xcalloc(1, sizeof(*lock)); |
aa1dbc98 | 900 | lock->timeout = -1; |
acf59575 | 901 | |
58e60dd2 NH |
902 | if (start_active_slot(slot)) { |
903 | run_active_slot(slot); | |
baa7b67d | 904 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
905 | XML_Parser parser = XML_ParserCreate(NULL); |
906 | enum XML_Status result; | |
acf59575 NH |
907 | ctx.name = xcalloc(10, 1); |
908 | ctx.len = 0; | |
909 | ctx.cdata = NULL; | |
910 | ctx.userFunc = handle_new_lock_ctx; | |
aa1dbc98 | 911 | ctx.userData = lock; |
acf59575 NH |
912 | XML_SetUserData(parser, &ctx); |
913 | XML_SetElementHandler(parser, xml_start_tag, | |
914 | xml_end_tag); | |
915 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
028c2976 MH |
916 | result = XML_Parse(parser, in_buffer.buf, |
917 | in_buffer.len, 1); | |
acf59575 NH |
918 | free(ctx.name); |
919 | if (result != XML_STATUS_OK) { | |
920 | fprintf(stderr, "XML error: %s\n", | |
921 | XML_ErrorString( | |
922 | XML_GetErrorCode(parser))); | |
aa1dbc98 | 923 | lock->timeout = -1; |
acf59575 | 924 | } |
472b2570 | 925 | XML_ParserFree(parser); |
a2b9820c PO |
926 | } else { |
927 | fprintf(stderr, | |
928 | "error: curl result=%d, HTTP code=%ld\n", | |
929 | results.curl_result, results.http_code); | |
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); |
6a83d902 | 943 | FREE_AND_NULL(lock); |
acf59575 | 944 | } else { |
aa1dbc98 | 945 | lock->url = url; |
aa1dbc98 | 946 | lock->start_time = time(NULL); |
7b5201a6 AK |
947 | lock->next = repo->locks; |
948 | repo->locks = lock; | |
26349b2e NH |
949 | } |
950 | ||
aa1dbc98 | 951 | return lock; |
58e60dd2 NH |
952 | } |
953 | ||
aa1dbc98 | 954 | static int unlock_remote(struct remote_lock *lock) |
58e60dd2 NH |
955 | { |
956 | struct active_request_slot *slot; | |
baa7b67d | 957 | struct slot_results results; |
7b5201a6 | 958 | struct remote_lock *prev = repo->locks; |
b1c7d4aa | 959 | struct curl_slist *dav_headers; |
58e60dd2 NH |
960 | int rc = 0; |
961 | ||
b1c7d4aa | 962 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK); |
58e60dd2 NH |
963 | |
964 | slot = get_active_slot(); | |
baa7b67d | 965 | slot->results = &results; |
ebaaf316 | 966 | curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK); |
58e60dd2 NH |
967 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
968 | ||
969 | if (start_active_slot(slot)) { | |
970 | run_active_slot(slot); | |
baa7b67d | 971 | if (results.curl_result == CURLE_OK) |
58e60dd2 NH |
972 | rc = 1; |
973 | else | |
512d632c | 974 | fprintf(stderr, "UNLOCK HTTP error %ld\n", |
baa7b67d | 975 | results.http_code); |
58e60dd2 | 976 | } else { |
512d632c | 977 | fprintf(stderr, "Unable to start UNLOCK request\n"); |
58e60dd2 NH |
978 | } |
979 | ||
980 | curl_slist_free_all(dav_headers); | |
75187c9d | 981 | |
7b5201a6 AK |
982 | if (repo->locks == lock) { |
983 | repo->locks = lock->next; | |
512d632c NH |
984 | } else { |
985 | while (prev && prev->next != lock) | |
986 | prev = prev->next; | |
987 | if (prev) | |
5cc6a4be | 988 | prev->next = lock->next; |
512d632c NH |
989 | } |
990 | ||
8e0f7003 | 991 | free(lock->owner); |
512d632c NH |
992 | free(lock->url); |
993 | free(lock->token); | |
994 | free(lock); | |
58e60dd2 NH |
995 | |
996 | return rc; | |
997 | } | |
998 | ||
6a491a17 CB |
999 | static void remove_locks(void) |
1000 | { | |
7b5201a6 | 1001 | struct remote_lock *lock = repo->locks; |
6a491a17 CB |
1002 | |
1003 | fprintf(stderr, "Removing remote locks...\n"); | |
1004 | while (lock) { | |
6589ebf1 | 1005 | struct remote_lock *next = lock->next; |
6a491a17 | 1006 | unlock_remote(lock); |
6589ebf1 | 1007 | lock = next; |
6a491a17 CB |
1008 | } |
1009 | } | |
1010 | ||
1011 | static void remove_locks_on_signal(int signo) | |
1012 | { | |
1013 | remove_locks(); | |
4a16d072 | 1014 | sigchain_pop(signo); |
6a491a17 CB |
1015 | raise(signo); |
1016 | } | |
1017 | ||
3030baa7 NH |
1018 | static void remote_ls(const char *path, int flags, |
1019 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1020 | void *userData); | |
aa1dbc98 | 1021 | |
c3bdc4e7 | 1022 | /* extract hex from sharded "xx/x{38}" filename */ |
1aa40df6 | 1023 | static int get_oid_hex_from_objpath(const char *path, struct object_id *oid) |
67a31f61 | 1024 | { |
f024b87a | 1025 | if (strlen(path) != the_hash_algo->hexsz + 1) |
67a31f61 JK |
1026 | return -1; |
1027 | ||
c3bdc4e7 RS |
1028 | if (hex_to_bytes(oid->hash, path, 1)) |
1029 | return -1; | |
67a31f61 JK |
1030 | path += 2; |
1031 | path++; /* skip '/' */ | |
67a31f61 | 1032 | |
f024b87a | 1033 | return hex_to_bytes(oid->hash + 1, path, the_hash_algo->rawsz - 1); |
67a31f61 JK |
1034 | } |
1035 | ||
3030baa7 NH |
1036 | static void process_ls_object(struct remote_ls_ctx *ls) |
1037 | { | |
1038 | unsigned int *parent = (unsigned int *)ls->userData; | |
67a31f61 | 1039 | const char *path = ls->dentry_name; |
1aa40df6 | 1040 | struct object_id oid; |
aa1dbc98 | 1041 | |
3030baa7 NH |
1042 | if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) { |
1043 | remote_dir_exists[*parent] = 1; | |
1044 | return; | |
1045 | } | |
aa1dbc98 | 1046 | |
67a31f61 | 1047 | if (!skip_prefix(path, "objects/", &path) || |
1aa40df6 | 1048 | get_oid_hex_from_objpath(path, &oid)) |
3030baa7 | 1049 | return; |
67a31f61 | 1050 | |
1aa40df6 | 1051 | one_remote_object(&oid); |
3030baa7 | 1052 | } |
aa1dbc98 | 1053 | |
3030baa7 NH |
1054 | static void process_ls_ref(struct remote_ls_ctx *ls) |
1055 | { | |
1056 | if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) { | |
1057 | fprintf(stderr, " %s\n", ls->dentry_name); | |
1058 | return; | |
1059 | } | |
aa1dbc98 | 1060 | |
3030baa7 NH |
1061 | if (!(ls->dentry_flags & IS_DIR)) |
1062 | one_remote_ref(ls->dentry_name); | |
1063 | } | |
aa1dbc98 | 1064 | |
3030baa7 NH |
1065 | static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) |
1066 | { | |
1067 | struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData; | |
aa1dbc98 | 1068 | |
3030baa7 NH |
1069 | if (tag_closed) { |
1070 | if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) { | |
1071 | if (ls->dentry_flags & IS_DIR) { | |
0fdadc50 TRC |
1072 | |
1073 | /* ensure collection names end with slash */ | |
1074 | str_end_url_with_slash(ls->dentry_name, &ls->dentry_name); | |
1075 | ||
3030baa7 NH |
1076 | if (ls->flags & PROCESS_DIRS) { |
1077 | ls->userFunc(ls); | |
1078 | } | |
1079 | if (strcmp(ls->dentry_name, ls->path) && | |
1080 | ls->flags & RECURSIVE) { | |
1081 | remote_ls(ls->dentry_name, | |
1082 | ls->flags, | |
1083 | ls->userFunc, | |
1084 | ls->userData); | |
1085 | } | |
1086 | } else if (ls->flags & PROCESS_FILES) { | |
1087 | ls->userFunc(ls); | |
aa1dbc98 | 1088 | } |
3030baa7 | 1089 | } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { |
e1f33efe KK |
1090 | char *path = ctx->cdata; |
1091 | if (*ctx->cdata == 'h') { | |
1092 | path = strstr(path, "//"); | |
1093 | if (path) { | |
1094 | path = strchr(path+2, '/'); | |
1095 | } | |
1096 | } | |
1097 | if (path) { | |
dfc2dcd9 TRC |
1098 | const char *url = repo->url; |
1099 | if (repo->path) | |
1100 | url = repo->path; | |
1101 | if (strncmp(path, url, repo->path_len)) | |
82247e9b | 1102 | error("Parsed path '%s' does not match url: '%s'", |
dfc2dcd9 TRC |
1103 | path, url); |
1104 | else { | |
1105 | path += repo->path_len; | |
1106 | ls->dentry_name = xstrdup(path); | |
1107 | } | |
e1f33efe | 1108 | } |
3030baa7 NH |
1109 | } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { |
1110 | ls->dentry_flags |= IS_DIR; | |
aa1dbc98 | 1111 | } |
3030baa7 | 1112 | } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) { |
6a83d902 | 1113 | FREE_AND_NULL(ls->dentry_name); |
3030baa7 | 1114 | ls->dentry_flags = 0; |
aa1dbc98 | 1115 | } |
aa1dbc98 NH |
1116 | } |
1117 | ||
20642801 JS |
1118 | /* |
1119 | * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it | |
1120 | * should _only_ heed the information from that file, instead of trying to | |
1121 | * determine the refs from the remote file system (badly: it does not even | |
1122 | * know about packed-refs). | |
1123 | */ | |
3030baa7 NH |
1124 | static void remote_ls(const char *path, int flags, |
1125 | void (*userFunc)(struct remote_ls_ctx *ls), | |
1126 | void *userData) | |
aa1dbc98 | 1127 | { |
28310186 | 1128 | char *url = xstrfmt("%s%s", repo->url, path); |
aa1dbc98 | 1129 | struct active_request_slot *slot; |
baa7b67d | 1130 | struct slot_results results; |
028c2976 MH |
1131 | struct strbuf in_buffer = STRBUF_INIT; |
1132 | struct buffer out_buffer = { STRBUF_INIT, 0 }; | |
8cb01e2f | 1133 | struct curl_slist *dav_headers = http_copy_default_headers(); |
aa1dbc98 | 1134 | struct xml_ctx ctx; |
3030baa7 NH |
1135 | struct remote_ls_ctx ls; |
1136 | ||
1137 | ls.flags = flags; | |
9befac47 | 1138 | ls.path = xstrdup(path); |
3030baa7 NH |
1139 | ls.dentry_name = NULL; |
1140 | ls.dentry_flags = 0; | |
1141 | ls.userData = userData; | |
1142 | ls.userFunc = userFunc; | |
aa1dbc98 | 1143 | |
02962d36 | 1144 | strbuf_addstr(&out_buffer.buf, PROPFIND_ALL_REQUEST); |
aa1dbc98 NH |
1145 | |
1146 | dav_headers = curl_slist_append(dav_headers, "Depth: 1"); | |
1147 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
1148 | ||
1149 | slot = get_active_slot(); | |
baa7b67d | 1150 | slot->results = &results; |
ebaaf316 DM |
1151 | curl_setup_http(slot->curl, url, DAV_PROPFIND, |
1152 | &out_buffer, fwrite_buffer); | |
aa1dbc98 | 1153 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 1154 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
aa1dbc98 NH |
1155 | |
1156 | if (start_active_slot(slot)) { | |
1157 | run_active_slot(slot); | |
baa7b67d | 1158 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
1159 | XML_Parser parser = XML_ParserCreate(NULL); |
1160 | enum XML_Status result; | |
aa1dbc98 NH |
1161 | ctx.name = xcalloc(10, 1); |
1162 | ctx.len = 0; | |
1163 | ctx.cdata = NULL; | |
3030baa7 NH |
1164 | ctx.userFunc = handle_remote_ls_ctx; |
1165 | ctx.userData = &ls; | |
aa1dbc98 NH |
1166 | XML_SetUserData(parser, &ctx); |
1167 | XML_SetElementHandler(parser, xml_start_tag, | |
1168 | xml_end_tag); | |
1169 | XML_SetCharacterDataHandler(parser, xml_cdata); | |
028c2976 MH |
1170 | result = XML_Parse(parser, in_buffer.buf, |
1171 | in_buffer.len, 1); | |
aa1dbc98 NH |
1172 | free(ctx.name); |
1173 | ||
1174 | if (result != XML_STATUS_OK) { | |
1175 | fprintf(stderr, "XML error: %s\n", | |
1176 | XML_ErrorString( | |
1177 | XML_GetErrorCode(parser))); | |
1178 | } | |
472b2570 | 1179 | XML_ParserFree(parser); |
aa1dbc98 NH |
1180 | } |
1181 | } else { | |
3030baa7 | 1182 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
aa1dbc98 NH |
1183 | } |
1184 | ||
3030baa7 | 1185 | free(ls.path); |
aa1dbc98 | 1186 | free(url); |
028c2976 MH |
1187 | strbuf_release(&out_buffer.buf); |
1188 | strbuf_release(&in_buffer); | |
aa1dbc98 NH |
1189 | curl_slist_free_all(dav_headers); |
1190 | } | |
1191 | ||
3030baa7 NH |
1192 | static void get_remote_object_list(unsigned char parent) |
1193 | { | |
1194 | char path[] = "objects/XX/"; | |
1195 | static const char hex[] = "0123456789abcdef"; | |
1196 | unsigned int val = parent; | |
1197 | ||
1198 | path[8] = hex[val >> 4]; | |
1199 | path[9] = hex[val & 0xf]; | |
1200 | remote_dir_exists[val] = 0; | |
1201 | remote_ls(path, (PROCESS_FILES | PROCESS_DIRS), | |
1202 | process_ls_object, &val); | |
1203 | } | |
1204 | ||
acf59575 | 1205 | static int locking_available(void) |
58e60dd2 NH |
1206 | { |
1207 | struct active_request_slot *slot; | |
baa7b67d | 1208 | struct slot_results results; |
028c2976 MH |
1209 | struct strbuf in_buffer = STRBUF_INIT; |
1210 | struct buffer out_buffer = { STRBUF_INIT, 0 }; | |
8cb01e2f | 1211 | struct curl_slist *dav_headers = http_copy_default_headers(); |
acf59575 NH |
1212 | struct xml_ctx ctx; |
1213 | int lock_flags = 0; | |
519d05be | 1214 | char *escaped; |
58e60dd2 | 1215 | |
519d05be MH |
1216 | escaped = xml_entities(repo->url); |
1217 | strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, escaped); | |
1218 | free(escaped); | |
58e60dd2 NH |
1219 | |
1220 | dav_headers = curl_slist_append(dav_headers, "Depth: 0"); | |
1221 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); | |
baa7b67d | 1222 | |
58e60dd2 | 1223 | slot = get_active_slot(); |
baa7b67d | 1224 | slot->results = &results; |
ebaaf316 DM |
1225 | curl_setup_http(slot->curl, repo->url, DAV_PROPFIND, |
1226 | &out_buffer, fwrite_buffer); | |
58e60dd2 | 1227 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
ebaaf316 | 1228 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
58e60dd2 NH |
1229 | |
1230 | if (start_active_slot(slot)) { | |
1231 | run_active_slot(slot); | |
baa7b67d | 1232 | if (results.curl_result == CURLE_OK) { |
472b2570 MH |
1233 | XML_Parser parser = XML_ParserCreate(NULL); |
1234 | enum XML_Status result; | |
acf59575 NH |
1235 | ctx.name = xcalloc(10, 1); |
1236 | ctx.len = 0; | |
1237 | ctx.cdata = NULL; | |
1238 | ctx.userFunc = handle_lockprop_ctx; | |
1239 | ctx.userData = &lock_flags; | |
1240 | XML_SetUserData(parser, &ctx); | |
1241 | XML_SetElementHandler(parser, xml_start_tag, | |
1242 | xml_end_tag); | |
028c2976 MH |
1243 | result = XML_Parse(parser, in_buffer.buf, |
1244 | in_buffer.len, 1); | |
acf59575 NH |
1245 | free(ctx.name); |
1246 | ||
1247 | if (result != XML_STATUS_OK) { | |
1248 | fprintf(stderr, "XML error: %s\n", | |
1249 | XML_ErrorString( | |
1250 | XML_GetErrorCode(parser))); | |
1251 | lock_flags = 0; | |
1252 | } | |
472b2570 | 1253 | XML_ParserFree(parser); |
325ce395 | 1254 | if (!lock_flags) |
d5c87cb4 | 1255 | error("no DAV locking support on %s", |
7b5201a6 | 1256 | repo->url); |
325ce395 JH |
1257 | |
1258 | } else { | |
1259 | error("Cannot access URL %s, return code %d", | |
7b5201a6 | 1260 | repo->url, results.curl_result); |
325ce395 | 1261 | lock_flags = 0; |
58e60dd2 | 1262 | } |
58e60dd2 | 1263 | } else { |
7b5201a6 | 1264 | error("Unable to start PROPFIND request on %s", repo->url); |
58e60dd2 NH |
1265 | } |
1266 | ||
028c2976 MH |
1267 | strbuf_release(&out_buffer.buf); |
1268 | strbuf_release(&in_buffer); | |
acf59575 NH |
1269 | curl_slist_free_all(dav_headers); |
1270 | ||
1271 | return lock_flags; | |
58e60dd2 NH |
1272 | } |
1273 | ||
b5bf7cd6 | 1274 | static struct object_list **add_one_object(struct object *obj, struct object_list **p) |
1f1e895f LT |
1275 | { |
1276 | struct object_list *entry = xmalloc(sizeof(struct object_list)); | |
1277 | entry->item = obj; | |
1278 | entry->next = *p; | |
1279 | *p = entry; | |
1280 | return &entry->next; | |
1281 | } | |
1282 | ||
aa1dbc98 | 1283 | static struct object_list **process_blob(struct blob *blob, |
41595938 | 1284 | struct object_list **p) |
58e60dd2 | 1285 | { |
aa1dbc98 | 1286 | struct object *obj = &blob->object; |
58e60dd2 | 1287 | |
aa1dbc98 NH |
1288 | obj->flags |= LOCAL; |
1289 | ||
1290 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1291 | return p; | |
1292 | ||
1293 | obj->flags |= SEEN; | |
1f1e895f | 1294 | return add_one_object(obj, p); |
aa1dbc98 NH |
1295 | } |
1296 | ||
1297 | static struct object_list **process_tree(struct tree *tree, | |
41595938 | 1298 | struct object_list **p) |
aa1dbc98 NH |
1299 | { |
1300 | struct object *obj = &tree->object; | |
2d9c58c6 | 1301 | struct tree_desc desc; |
4c068a98 | 1302 | struct name_entry entry; |
aa1dbc98 NH |
1303 | |
1304 | obj->flags |= LOCAL; | |
1305 | ||
1306 | if (obj->flags & (UNINTERESTING | SEEN)) | |
1307 | return p; | |
1308 | if (parse_tree(tree) < 0) | |
f2fd0760 | 1309 | die("bad tree object %s", oid_to_hex(&obj->oid)); |
aa1dbc98 NH |
1310 | |
1311 | obj->flags |= SEEN; | |
1f1e895f | 1312 | p = add_one_object(obj, p); |
2d9c58c6 | 1313 | |
6fda5e51 | 1314 | init_tree_desc(&desc, tree->buffer, tree->size); |
2d9c58c6 | 1315 | |
1bbeb4c6 JS |
1316 | while (tree_entry(&desc, &entry)) |
1317 | switch (object_type(entry.mode)) { | |
1318 | case OBJ_TREE: | |
ea82b2a0 | 1319 | p = process_tree(lookup_tree(the_repository, &entry.oid), |
f86bcc7b | 1320 | p); |
1bbeb4c6 JS |
1321 | break; |
1322 | case OBJ_BLOB: | |
ea82b2a0 | 1323 | p = process_blob(lookup_blob(the_repository, &entry.oid), |
da14a7ff | 1324 | p); |
1bbeb4c6 JS |
1325 | break; |
1326 | default: | |
1327 | /* Subproject commit - not in this repository */ | |
1328 | break; | |
1329 | } | |
1330 | ||
6e454b9a | 1331 | free_tree_buffer(tree); |
aa1dbc98 | 1332 | return p; |
58e60dd2 NH |
1333 | } |
1334 | ||
1a703cba | 1335 | static int get_delta(struct rev_info *revs, struct remote_lock *lock) |
58e60dd2 | 1336 | { |
1f1e895f | 1337 | int i; |
58e60dd2 | 1338 | struct commit *commit; |
1f1e895f | 1339 | struct object_list **p = &objects; |
1a703cba | 1340 | int count = 0; |
58e60dd2 | 1341 | |
aa1dbc98 | 1342 | while ((commit = get_revision(revs)) != NULL) { |
2e27bd77 | 1343 | p = process_tree(get_commit_tree(commit), p); |
aa1dbc98 NH |
1344 | commit->object.flags |= LOCAL; |
1345 | if (!(commit->object.flags & UNINTERESTING)) | |
1a703cba | 1346 | count += add_send_request(&commit->object, lock); |
aa1dbc98 | 1347 | } |
58e60dd2 | 1348 | |
1f1e895f LT |
1349 | for (i = 0; i < revs->pending.nr; i++) { |
1350 | struct object_array_entry *entry = revs->pending.objects + i; | |
1351 | struct object *obj = entry->item; | |
1352 | const char *name = entry->name; | |
58e60dd2 | 1353 | |
aa1dbc98 NH |
1354 | if (obj->flags & (UNINTERESTING | SEEN)) |
1355 | continue; | |
1974632c | 1356 | if (obj->type == OBJ_TAG) { |
aa1dbc98 | 1357 | obj->flags |= SEEN; |
1f1e895f | 1358 | p = add_one_object(obj, p); |
aa1dbc98 | 1359 | continue; |
58e60dd2 | 1360 | } |
1974632c | 1361 | if (obj->type == OBJ_TREE) { |
41595938 | 1362 | p = process_tree((struct tree *)obj, p); |
aa1dbc98 | 1363 | continue; |
58e60dd2 | 1364 | } |
1974632c | 1365 | if (obj->type == OBJ_BLOB) { |
41595938 | 1366 | p = process_blob((struct blob *)obj, p); |
aa1dbc98 | 1367 | continue; |
58e60dd2 | 1368 | } |
f2fd0760 | 1369 | die("unknown pending object %s (%s)", oid_to_hex(&obj->oid), name); |
aa1dbc98 NH |
1370 | } |
1371 | ||
1372 | while (objects) { | |
1373 | if (!(objects->item->flags & UNINTERESTING)) | |
1a703cba | 1374 | count += add_send_request(objects->item, lock); |
aa1dbc98 | 1375 | objects = objects->next; |
58e60dd2 | 1376 | } |
1a703cba NH |
1377 | |
1378 | return count; | |
58e60dd2 NH |
1379 | } |
1380 | ||
1cb158b6 | 1381 | static int update_remote(const struct object_id *oid, struct remote_lock *lock) |
58e60dd2 NH |
1382 | { |
1383 | struct active_request_slot *slot; | |
baa7b67d | 1384 | struct slot_results results; |
028c2976 | 1385 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
b1c7d4aa | 1386 | struct curl_slist *dav_headers; |
58e60dd2 | 1387 | |
b1c7d4aa | 1388 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
58e60dd2 | 1389 | |
1cb158b6 | 1390 | strbuf_addf(&out_buffer.buf, "%s\n", oid_to_hex(oid)); |
58e60dd2 NH |
1391 | |
1392 | slot = get_active_slot(); | |
baa7b67d | 1393 | slot->results = &results; |
ebaaf316 DM |
1394 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
1395 | &out_buffer, fwrite_null); | |
58e60dd2 | 1396 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
58e60dd2 NH |
1397 | |
1398 | if (start_active_slot(slot)) { | |
1399 | run_active_slot(slot); | |
028c2976 | 1400 | strbuf_release(&out_buffer.buf); |
baa7b67d | 1401 | if (results.curl_result != CURLE_OK) { |
58e60dd2 NH |
1402 | fprintf(stderr, |
1403 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
baa7b67d | 1404 | results.curl_result, results.http_code); |
58e60dd2 NH |
1405 | /* We should attempt recovery? */ |
1406 | return 0; | |
1407 | } | |
1408 | } else { | |
028c2976 | 1409 | strbuf_release(&out_buffer.buf); |
58e60dd2 NH |
1410 | fprintf(stderr, "Unable to start PUT request\n"); |
1411 | return 0; | |
1412 | } | |
1413 | ||
1414 | return 1; | |
1415 | } | |
1416 | ||
6d2bf96e | 1417 | static struct ref *remote_refs; |
aa1dbc98 | 1418 | |
2aab167a | 1419 | static void one_remote_ref(const char *refname) |
aa1dbc98 NH |
1420 | { |
1421 | struct ref *ref; | |
197e8951 | 1422 | struct object *obj; |
aa1dbc98 | 1423 | |
59c69c0c | 1424 | ref = alloc_ref(refname); |
c13b2633 | 1425 | |
7b5201a6 | 1426 | if (http_fetch_ref(repo->url, ref) != 0) { |
aa1dbc98 NH |
1427 | fprintf(stderr, |
1428 | "Unable to fetch ref %s from %s\n", | |
7b5201a6 | 1429 | refname, repo->url); |
c13b2633 | 1430 | free(ref); |
aa1dbc98 NH |
1431 | return; |
1432 | } | |
1433 | ||
197e8951 NH |
1434 | /* |
1435 | * Fetch a copy of the object if it doesn't exist locally - it | |
1436 | * may be required for updating server info later. | |
1437 | */ | |
f4e54d02 | 1438 | if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) { |
0ebbcf70 | 1439 | obj = lookup_unknown_object(&ref->old_oid); |
e94eac49 RS |
1440 | fprintf(stderr, " fetch %s for %s\n", |
1441 | oid_to_hex(&ref->old_oid), refname); | |
1442 | add_fetch_request(obj); | |
197e8951 NH |
1443 | } |
1444 | ||
6d2bf96e CB |
1445 | ref->next = remote_refs; |
1446 | remote_refs = ref; | |
aa1dbc98 NH |
1447 | } |
1448 | ||
aa1dbc98 NH |
1449 | static void get_dav_remote_heads(void) |
1450 | { | |
3030baa7 | 1451 | remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL); |
aa1dbc98 NH |
1452 | } |
1453 | ||
197e8951 NH |
1454 | static void add_remote_info_ref(struct remote_ls_ctx *ls) |
1455 | { | |
028c2976 | 1456 | struct strbuf *buf = (struct strbuf *)ls->userData; |
197e8951 | 1457 | struct object *o; |
c13b2633 DB |
1458 | struct ref *ref; |
1459 | ||
59c69c0c | 1460 | ref = alloc_ref(ls->dentry_name); |
197e8951 | 1461 | |
7b5201a6 | 1462 | if (http_fetch_ref(repo->url, ref) != 0) { |
197e8951 NH |
1463 | fprintf(stderr, |
1464 | "Unable to fetch ref %s from %s\n", | |
7b5201a6 | 1465 | ls->dentry_name, repo->url); |
197e8951 | 1466 | aborted = 1; |
c13b2633 | 1467 | free(ref); |
197e8951 NH |
1468 | return; |
1469 | } | |
1470 | ||
109cd76d | 1471 | o = parse_object(the_repository, &ref->old_oid); |
197e8951 NH |
1472 | if (!o) { |
1473 | fprintf(stderr, | |
1474 | "Unable to parse object %s for remote ref %s\n", | |
f4e54d02 | 1475 | oid_to_hex(&ref->old_oid), ls->dentry_name); |
197e8951 | 1476 | aborted = 1; |
c13b2633 | 1477 | free(ref); |
197e8951 NH |
1478 | return; |
1479 | } | |
1480 | ||
7d0581a9 | 1481 | strbuf_addf(buf, "%s\t%s\n", |
f4e54d02 | 1482 | oid_to_hex(&ref->old_oid), ls->dentry_name); |
197e8951 | 1483 | |
1974632c | 1484 | if (o->type == OBJ_TAG) { |
a74093da | 1485 | o = deref_tag(the_repository, o, ls->dentry_name, 0); |
7d0581a9 JK |
1486 | if (o) |
1487 | strbuf_addf(buf, "%s\t%s^{}\n", | |
f2fd0760 | 1488 | oid_to_hex(&o->oid), ls->dentry_name); |
197e8951 | 1489 | } |
c13b2633 | 1490 | free(ref); |
197e8951 NH |
1491 | } |
1492 | ||
1493 | static void update_remote_info_refs(struct remote_lock *lock) | |
1494 | { | |
028c2976 | 1495 | struct buffer buffer = { STRBUF_INIT, 0 }; |
197e8951 NH |
1496 | struct active_request_slot *slot; |
1497 | struct slot_results results; | |
b1c7d4aa | 1498 | struct curl_slist *dav_headers; |
197e8951 | 1499 | |
197e8951 | 1500 | remote_ls("refs/", (PROCESS_FILES | RECURSIVE), |
028c2976 | 1501 | add_remote_info_ref, &buffer.buf); |
197e8951 | 1502 | if (!aborted) { |
b1c7d4aa | 1503 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
197e8951 NH |
1504 | |
1505 | slot = get_active_slot(); | |
1506 | slot->results = &results; | |
ebaaf316 DM |
1507 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
1508 | &buffer, fwrite_null); | |
197e8951 | 1509 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
197e8951 | 1510 | |
197e8951 NH |
1511 | if (start_active_slot(slot)) { |
1512 | run_active_slot(slot); | |
1513 | if (results.curl_result != CURLE_OK) { | |
1514 | fprintf(stderr, | |
1515 | "PUT error: curl result=%d, HTTP code=%ld\n", | |
1516 | results.curl_result, results.http_code); | |
1517 | } | |
1518 | } | |
197e8951 | 1519 | } |
028c2976 | 1520 | strbuf_release(&buffer.buf); |
197e8951 NH |
1521 | } |
1522 | ||
1523 | static int remote_exists(const char *path) | |
1524 | { | |
28310186 | 1525 | char *url = xstrfmt("%s%s", repo->url, path); |
446b941a | 1526 | int ret; |
197e8951 | 1527 | |
197e8951 | 1528 | |
1bbcc224 | 1529 | switch (http_get_strbuf(url, NULL, NULL)) { |
446b941a MH |
1530 | case HTTP_OK: |
1531 | ret = 1; | |
1532 | break; | |
1533 | case HTTP_MISSING_TARGET: | |
1534 | ret = 0; | |
1535 | break; | |
1536 | case HTTP_ERROR: | |
4df13f69 | 1537 | error("unable to access '%s': %s", url, curl_errorstr); |
1cf01a34 | 1538 | /* fallthrough */ |
446b941a MH |
1539 | default: |
1540 | ret = -1; | |
197e8951 | 1541 | } |
3a462bc9 MH |
1542 | free(url); |
1543 | return ret; | |
197e8951 NH |
1544 | } |
1545 | ||
8eb94600 | 1546 | static void fetch_symref(const char *path, char **symref, struct object_id *oid) |
3dfaf7bc | 1547 | { |
28310186 | 1548 | char *url = xstrfmt("%s%s", repo->url, path); |
028c2976 | 1549 | struct strbuf buffer = STRBUF_INIT; |
ae021d87 | 1550 | const char *name; |
3dfaf7bc | 1551 | |
1bbcc224 | 1552 | if (http_get_strbuf(url, &buffer, NULL) != HTTP_OK) |
9af5abd9 MH |
1553 | die("Couldn't get %s for remote symref\n%s", url, |
1554 | curl_errorstr); | |
3dfaf7bc NH |
1555 | free(url); |
1556 | ||
6a83d902 | 1557 | FREE_AND_NULL(*symref); |
8eb94600 | 1558 | oidclr(oid); |
3dfaf7bc | 1559 | |
028c2976 | 1560 | if (buffer.len == 0) |
3dfaf7bc NH |
1561 | return; |
1562 | ||
f6786c8d JK |
1563 | /* Cut off trailing newline. */ |
1564 | strbuf_rtrim(&buffer); | |
1565 | ||
3dfaf7bc | 1566 | /* If it's a symref, set the refname; otherwise try for a sha1 */ |
ae021d87 JK |
1567 | if (skip_prefix(buffer.buf, "ref: ", &name)) { |
1568 | *symref = xmemdupz(name, buffer.len - (name - buffer.buf)); | |
3dfaf7bc | 1569 | } else { |
8eb94600 | 1570 | get_oid_hex(buffer.buf, oid); |
3dfaf7bc NH |
1571 | } |
1572 | ||
028c2976 | 1573 | strbuf_release(&buffer); |
3dfaf7bc NH |
1574 | } |
1575 | ||
8eb94600 | 1576 | static int verify_merge_base(struct object_id *head_oid, struct ref *remote) |
3dfaf7bc | 1577 | { |
bc83266a | 1578 | struct commit *head = lookup_commit_or_die(head_oid, "HEAD"); |
1579 | struct commit *branch = lookup_commit_or_die(&remote->old_oid, | |
1580 | remote->name); | |
3dfaf7bc | 1581 | |
65712251 | 1582 | return in_merge_bases(branch, head); |
3dfaf7bc NH |
1583 | } |
1584 | ||
2aab167a | 1585 | static int delete_remote_branch(const char *pattern, int force) |
3dfaf7bc NH |
1586 | { |
1587 | struct ref *refs = remote_refs; | |
1588 | struct ref *remote_ref = NULL; | |
8eb94600 | 1589 | struct object_id head_oid; |
3dfaf7bc NH |
1590 | char *symref = NULL; |
1591 | int match; | |
1592 | int patlen = strlen(pattern); | |
1593 | int i; | |
1594 | struct active_request_slot *slot; | |
1595 | struct slot_results results; | |
1596 | char *url; | |
1597 | ||
1598 | /* Find the remote branch(es) matching the specified branch name */ | |
1599 | for (match = 0; refs; refs = refs->next) { | |
1600 | char *name = refs->name; | |
1601 | int namelen = strlen(name); | |
1602 | if (namelen < patlen || | |
1603 | memcmp(name + namelen - patlen, pattern, patlen)) | |
1604 | continue; | |
1605 | if (namelen != patlen && name[namelen - patlen - 1] != '/') | |
1606 | continue; | |
1607 | match++; | |
1608 | remote_ref = refs; | |
1609 | } | |
1610 | if (match == 0) | |
1611 | return error("No remote branch matches %s", pattern); | |
1612 | if (match != 1) | |
1613 | return error("More than one remote branch matches %s", | |
1614 | pattern); | |
1615 | ||
1616 | /* | |
1617 | * Remote HEAD must be a symref (not exactly foolproof; a remote | |
1618 | * symlink to a symref will look like a symref) | |
1619 | */ | |
8eb94600 | 1620 | fetch_symref("HEAD", &symref, &head_oid); |
3dfaf7bc NH |
1621 | if (!symref) |
1622 | return error("Remote HEAD is not a symref"); | |
1623 | ||
1624 | /* Remote branch must not be the remote HEAD */ | |
cd2b8ae9 | 1625 | for (i = 0; symref && i < MAXDEPTH; i++) { |
3dfaf7bc NH |
1626 | if (!strcmp(remote_ref->name, symref)) |
1627 | return error("Remote branch %s is the current HEAD", | |
1628 | remote_ref->name); | |
8eb94600 | 1629 | fetch_symref(symref, &symref, &head_oid); |
3dfaf7bc NH |
1630 | } |
1631 | ||
1632 | /* Run extra sanity checks if delete is not forced */ | |
1633 | if (!force) { | |
1634 | /* Remote HEAD must resolve to a known object */ | |
1635 | if (symref) | |
1636 | return error("Remote HEAD symrefs too deep"); | |
8eb94600 | 1637 | if (is_null_oid(&head_oid)) |
3dfaf7bc | 1638 | return error("Unable to resolve remote HEAD"); |
8eb94600 | 1639 | if (!has_object_file(&head_oid)) |
1640 | return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", oid_to_hex(&head_oid)); | |
3dfaf7bc NH |
1641 | |
1642 | /* Remote branch must resolve to a known object */ | |
f4e54d02 | 1643 | if (is_null_oid(&remote_ref->old_oid)) |
3dfaf7bc NH |
1644 | return error("Unable to resolve remote branch %s", |
1645 | remote_ref->name); | |
f4e54d02 | 1646 | if (!has_object_file(&remote_ref->old_oid)) |
1647 | return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, oid_to_hex(&remote_ref->old_oid)); | |
3dfaf7bc NH |
1648 | |
1649 | /* Remote branch must be an ancestor of remote HEAD */ | |
8eb94600 | 1650 | if (!verify_merge_base(&head_oid, remote_ref)) { |
00ae8289 BF |
1651 | return error("The branch '%s' is not an ancestor " |
1652 | "of your current HEAD.\n" | |
1653 | "If you are sure you want to delete it," | |
1654 | " run:\n\t'git http-push -D %s %s'", | |
7b5201a6 | 1655 | remote_ref->name, repo->url, pattern); |
3dfaf7bc NH |
1656 | } |
1657 | } | |
1658 | ||
1659 | /* Send delete request */ | |
1660 | fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name); | |
6eaf4060 CB |
1661 | if (dry_run) |
1662 | return 0; | |
28310186 | 1663 | url = xstrfmt("%s%s", repo->url, remote_ref->name); |
3dfaf7bc NH |
1664 | slot = get_active_slot(); |
1665 | slot->results = &results; | |
ebaaf316 | 1666 | curl_setup_http_get(slot->curl, url, DAV_DELETE); |
3dfaf7bc NH |
1667 | if (start_active_slot(slot)) { |
1668 | run_active_slot(slot); | |
1669 | free(url); | |
1670 | if (results.curl_result != CURLE_OK) | |
82247e9b | 1671 | return error("DELETE request failed (%d/%ld)", |
3dfaf7bc NH |
1672 | results.curl_result, results.http_code); |
1673 | } else { | |
1674 | free(url); | |
1675 | return error("Unable to start DELETE request"); | |
1676 | } | |
1677 | ||
1678 | return 0; | |
1679 | } | |
1680 | ||
2af202be | 1681 | static void run_request_queue(void) |
4f66250d TRC |
1682 | { |
1683 | #ifdef USE_CURL_MULTI | |
1684 | is_running_queue = 1; | |
1685 | fill_active_slots(); | |
1686 | add_fill_function(NULL, fill_active_slot); | |
1687 | #endif | |
1688 | do { | |
1689 | finish_all_active_slots(); | |
1690 | #ifdef USE_CURL_MULTI | |
1691 | fill_active_slots(); | |
1692 | #endif | |
1693 | } while (request_queue_head && !aborted); | |
1694 | ||
1695 | #ifdef USE_CURL_MULTI | |
1696 | is_running_queue = 0; | |
1697 | #endif | |
1698 | } | |
1699 | ||
3f2e2297 | 1700 | int cmd_main(int argc, const char **argv) |
58e60dd2 | 1701 | { |
58e60dd2 NH |
1702 | struct transfer_request *request; |
1703 | struct transfer_request *next_request; | |
38490dd4 | 1704 | struct refspec rs = REFSPEC_INIT_PUSH; |
512d632c | 1705 | struct remote_lock *ref_lock = NULL; |
197e8951 | 1706 | struct remote_lock *info_ref_lock = NULL; |
aa1dbc98 | 1707 | struct rev_info revs; |
3dfaf7bc NH |
1708 | int delete_branch = 0; |
1709 | int force_delete = 0; | |
1a703cba | 1710 | int objects_to_send; |
58e60dd2 NH |
1711 | int rc = 0; |
1712 | int i; | |
8c9e7947 | 1713 | int new_refs; |
454e2025 | 1714 | struct ref *ref, *local_refs; |
58e60dd2 | 1715 | |
f3d51ffd | 1716 | repo = xcalloc(1, sizeof(*repo)); |
58e60dd2 NH |
1717 | |
1718 | argv++; | |
1719 | for (i = 1; i < argc; i++, argv++) { | |
3f2e2297 | 1720 | const char *arg = *argv; |
58e60dd2 NH |
1721 | |
1722 | if (*arg == '-') { | |
aa1dbc98 | 1723 | if (!strcmp(arg, "--all")) { |
28b9d6e5 | 1724 | push_all = MATCH_REFS_ALL; |
58e60dd2 NH |
1725 | continue; |
1726 | } | |
1727 | if (!strcmp(arg, "--force")) { | |
1728 | force_all = 1; | |
1729 | continue; | |
1730 | } | |
fe5d1d3e SP |
1731 | if (!strcmp(arg, "--dry-run")) { |
1732 | dry_run = 1; | |
1733 | continue; | |
1734 | } | |
ae4efe19 SP |
1735 | if (!strcmp(arg, "--helper-status")) { |
1736 | helper_status = 1; | |
1737 | continue; | |
1738 | } | |
58e60dd2 NH |
1739 | if (!strcmp(arg, "--verbose")) { |
1740 | push_verbosely = 1; | |
e9176745 | 1741 | http_is_verbose = 1; |
58e60dd2 NH |
1742 | continue; |
1743 | } | |
3dfaf7bc NH |
1744 | if (!strcmp(arg, "-d")) { |
1745 | delete_branch = 1; | |
1746 | continue; | |
1747 | } | |
1748 | if (!strcmp(arg, "-D")) { | |
1749 | delete_branch = 1; | |
1750 | force_delete = 1; | |
1751 | continue; | |
1752 | } | |
548d3464 JN |
1753 | if (!strcmp(arg, "-h")) |
1754 | usage(http_push_usage); | |
58e60dd2 | 1755 | } |
7b5201a6 | 1756 | if (!repo->url) { |
aa1dbc98 | 1757 | char *path = strstr(arg, "//"); |
1462d1af TRC |
1758 | str_end_url_with_slash(arg, &repo->url); |
1759 | repo->path_len = strlen(repo->url); | |
aa1dbc98 | 1760 | if (path) { |
7b5201a6 AK |
1761 | repo->path = strchr(path+2, '/'); |
1762 | if (repo->path) | |
1763 | repo->path_len = strlen(repo->path); | |
aa1dbc98 | 1764 | } |
58e60dd2 NH |
1765 | continue; |
1766 | } | |
38490dd4 | 1767 | refspec_appendn(&rs, argv, argc - i); |
58e60dd2 NH |
1768 | break; |
1769 | } | |
1770 | ||
f854824b GB |
1771 | #ifndef USE_CURL_MULTI |
1772 | die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI"); | |
1773 | #endif | |
1774 | ||
7b5201a6 | 1775 | if (!repo->url) |
3e9fabc8 NH |
1776 | usage(http_push_usage); |
1777 | ||
38490dd4 | 1778 | if (delete_branch && rs.nr != 1) |
3dfaf7bc NH |
1779 | die("You must specify only one branch name when deleting a remote branch"); |
1780 | ||
548d3464 JN |
1781 | setup_git_directory(); |
1782 | ||
aa1dbc98 | 1783 | memset(remote_dir_exists, -1, 256); |
0dd276b8 | 1784 | |
a4ddbc33 | 1785 | http_init(NULL, repo->url, 1); |
58e60dd2 | 1786 | |
68862a31 | 1787 | #ifdef USE_CURL_MULTI |
4f66250d | 1788 | is_running_queue = 0; |
68862a31 | 1789 | #endif |
4f66250d | 1790 | |
58e60dd2 | 1791 | /* Verify DAV compliance/lock support */ |
acf59575 | 1792 | if (!locking_available()) { |
58e60dd2 NH |
1793 | rc = 1; |
1794 | goto cleanup; | |
1795 | } | |
1796 | ||
57b235a4 | 1797 | sigchain_push_common(remove_locks_on_signal); |
6a491a17 | 1798 | |
197e8951 | 1799 | /* Check whether the remote has server info files */ |
7b5201a6 AK |
1800 | repo->can_update_info_refs = 0; |
1801 | repo->has_info_refs = remote_exists("info/refs"); | |
1802 | repo->has_info_packs = remote_exists("objects/info/packs"); | |
1803 | if (repo->has_info_refs) { | |
197e8951 NH |
1804 | info_ref_lock = lock_remote("info/refs", LOCK_TIME); |
1805 | if (info_ref_lock) | |
7b5201a6 | 1806 | repo->can_update_info_refs = 1; |
9bdbabad | 1807 | else { |
d5c87cb4 | 1808 | error("cannot lock existing info/refs"); |
9bdbabad GB |
1809 | rc = 1; |
1810 | goto cleanup; | |
1811 | } | |
197e8951 | 1812 | } |
7b5201a6 | 1813 | if (repo->has_info_packs) |
197e8951 NH |
1814 | fetch_indices(); |
1815 | ||
aa1dbc98 | 1816 | /* Get a list of all local and remote heads to validate refspecs */ |
454e2025 | 1817 | local_refs = get_local_heads(); |
aa1dbc98 NH |
1818 | fprintf(stderr, "Fetching remote heads...\n"); |
1819 | get_dav_remote_heads(); | |
4f66250d | 1820 | run_request_queue(); |
aa1dbc98 | 1821 | |
3dfaf7bc NH |
1822 | /* Remove a remote branch if -d or -D was specified */ |
1823 | if (delete_branch) { | |
38490dd4 BW |
1824 | const char *branch = rs.items[i].src; |
1825 | if (delete_remote_branch(branch, force_delete) == -1) { | |
3dfaf7bc | 1826 | fprintf(stderr, "Unable to delete remote branch %s\n", |
38490dd4 | 1827 | branch); |
ae4efe19 | 1828 | if (helper_status) |
38490dd4 | 1829 | printf("error %s cannot remove\n", branch); |
ae4efe19 | 1830 | } |
3dfaf7bc NH |
1831 | goto cleanup; |
1832 | } | |
1833 | ||
aa1dbc98 | 1834 | /* match them up */ |
5c7ec846 | 1835 | if (match_push_refs(local_refs, &remote_refs, &rs, push_all)) { |
9116de59 GB |
1836 | rc = -1; |
1837 | goto cleanup; | |
1838 | } | |
aa1dbc98 NH |
1839 | if (!remote_refs) { |
1840 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); | |
ae4efe19 SP |
1841 | if (helper_status) |
1842 | printf("error null no match\n"); | |
9116de59 GB |
1843 | rc = 0; |
1844 | goto cleanup; | |
aa1dbc98 NH |
1845 | } |
1846 | ||
8c9e7947 | 1847 | new_refs = 0; |
aa1dbc98 | 1848 | for (ref = remote_refs; ref; ref = ref->next) { |
ef8d7ac4 | 1849 | struct strvec commit_argv = STRVEC_INIT; |
8c9e7947 | 1850 | |
aa1dbc98 NH |
1851 | if (!ref->peer_ref) |
1852 | continue; | |
6eaf4060 | 1853 | |
f4e54d02 | 1854 | if (is_null_oid(&ref->peer_ref->new_oid)) { |
6eaf4060 CB |
1855 | if (delete_remote_branch(ref->name, 1) == -1) { |
1856 | error("Could not remove %s", ref->name); | |
ae4efe19 SP |
1857 | if (helper_status) |
1858 | printf("error %s cannot remove\n", ref->name); | |
6eaf4060 CB |
1859 | rc = -4; |
1860 | } | |
ae4efe19 SP |
1861 | else if (helper_status) |
1862 | printf("ok %s\n", ref->name); | |
6eaf4060 CB |
1863 | new_refs++; |
1864 | continue; | |
1865 | } | |
1866 | ||
4a7e27e9 | 1867 | if (oideq(&ref->old_oid, &ref->peer_ref->new_oid)) { |
b5e59989 | 1868 | if (push_verbosely) |
aa1dbc98 | 1869 | fprintf(stderr, "'%s': up-to-date\n", ref->name); |
ae4efe19 SP |
1870 | if (helper_status) |
1871 | printf("ok %s up to date\n", ref->name); | |
aa1dbc98 NH |
1872 | continue; |
1873 | } | |
1874 | ||
1875 | if (!force_all && | |
f4e54d02 | 1876 | !is_null_oid(&ref->old_oid) && |
aa1dbc98 | 1877 | !ref->force) { |
f4e54d02 | 1878 | if (!has_object_file(&ref->old_oid) || |
6f3d57b6 | 1879 | !ref_newer(&ref->peer_ref->new_oid, |
1880 | &ref->old_oid)) { | |
00ae8289 BF |
1881 | /* |
1882 | * We do not have the remote ref, or | |
aa1dbc98 NH |
1883 | * we know that the remote ref is not |
1884 | * an ancestor of what we are trying to | |
1885 | * push. Either way this can be losing | |
1886 | * commits at the remote end and likely | |
1887 | * we were not up to date to begin with. | |
1888 | */ | |
00ae8289 BF |
1889 | error("remote '%s' is not an ancestor of\n" |
1890 | "local '%s'.\n" | |
1891 | "Maybe you are not up-to-date and " | |
aa1dbc98 NH |
1892 | "need to pull first?", |
1893 | ref->name, | |
1894 | ref->peer_ref->name); | |
ae4efe19 SP |
1895 | if (helper_status) |
1896 | printf("error %s non-fast forward\n", ref->name); | |
1a703cba | 1897 | rc = -2; |
aa1dbc98 NH |
1898 | continue; |
1899 | } | |
58e60dd2 | 1900 | } |
f4e54d02 | 1901 | oidcpy(&ref->new_oid, &ref->peer_ref->new_oid); |
aa1dbc98 | 1902 | new_refs++; |
aa1dbc98 NH |
1903 | |
1904 | fprintf(stderr, "updating '%s'", ref->name); | |
1905 | if (strcmp(ref->name, ref->peer_ref->name)) | |
1906 | fprintf(stderr, " using '%s'", ref->peer_ref->name); | |
2b87d3a8 | 1907 | fprintf(stderr, "\n from %s\n to %s\n", |
f4e54d02 | 1908 | oid_to_hex(&ref->old_oid), oid_to_hex(&ref->new_oid)); |
ae4efe19 SP |
1909 | if (dry_run) { |
1910 | if (helper_status) | |
1911 | printf("ok %s\n", ref->name); | |
fe5d1d3e | 1912 | continue; |
ae4efe19 | 1913 | } |
58e60dd2 NH |
1914 | |
1915 | /* Lock remote branch ref */ | |
aa1dbc98 NH |
1916 | ref_lock = lock_remote(ref->name, LOCK_TIME); |
1917 | if (ref_lock == NULL) { | |
58e60dd2 | 1918 | fprintf(stderr, "Unable to lock remote branch %s\n", |
aa1dbc98 | 1919 | ref->name); |
ae4efe19 SP |
1920 | if (helper_status) |
1921 | printf("error %s lock error\n", ref->name); | |
58e60dd2 NH |
1922 | rc = 1; |
1923 | continue; | |
1924 | } | |
1925 | ||
aa1dbc98 | 1926 | /* Set up revision info for this refspec */ |
ef8d7ac4 JK |
1927 | strvec_push(&commit_argv, ""); /* ignored */ |
1928 | strvec_push(&commit_argv, "--objects"); | |
1929 | strvec_push(&commit_argv, oid_to_hex(&ref->new_oid)); | |
f4e54d02 | 1930 | if (!push_all && !is_null_oid(&ref->old_oid)) |
ef8d7ac4 | 1931 | strvec_pushf(&commit_argv, "^%s", |
f6d8942b | 1932 | oid_to_hex(&ref->old_oid)); |
2abf3503 | 1933 | repo_init_revisions(the_repository, &revs, setup_git_directory()); |
d70a9eb6 | 1934 | setup_revisions(commit_argv.nr, commit_argv.v, &revs, NULL); |
d633c882 | 1935 | revs.edge_hint = 0; /* just in case */ |
58e60dd2 | 1936 | |
aa1dbc98 | 1937 | /* Generate a list of objects that need to be pushed */ |
58e60dd2 | 1938 | pushing = 0; |
3d51e1b5 MK |
1939 | if (prepare_revision_walk(&revs)) |
1940 | die("revision walk setup failed"); | |
4f6d26b1 | 1941 | mark_edges_uninteresting(&revs, NULL, 0); |
1a703cba | 1942 | objects_to_send = get_delta(&revs, ref_lock); |
29508e1e | 1943 | finish_all_active_slots(); |
58e60dd2 NH |
1944 | |
1945 | /* Push missing objects to remote, this would be a | |
1946 | convenient time to pack them first if appropriate. */ | |
1947 | pushing = 1; | |
1a703cba NH |
1948 | if (objects_to_send) |
1949 | fprintf(stderr, " sending %d objects\n", | |
1950 | objects_to_send); | |
4f66250d TRC |
1951 | |
1952 | run_request_queue(); | |
58e60dd2 NH |
1953 | |
1954 | /* Update the remote branch if all went well */ | |
1cb158b6 | 1955 | if (aborted || !update_remote(&ref->new_oid, ref_lock)) |
aa1dbc98 | 1956 | rc = 1; |
58e60dd2 | 1957 | |
aa1dbc98 NH |
1958 | if (!rc) |
1959 | fprintf(stderr, " done\n"); | |
ae4efe19 SP |
1960 | if (helper_status) |
1961 | printf("%s %s\n", !rc ? "ok" : "error", ref->name); | |
aa1dbc98 | 1962 | unlock_remote(ref_lock); |
512d632c | 1963 | check_locks(); |
ef8d7ac4 | 1964 | strvec_clear(&commit_argv); |
58e60dd2 NH |
1965 | } |
1966 | ||
197e8951 | 1967 | /* Update remote server info if appropriate */ |
7b5201a6 AK |
1968 | if (repo->has_info_refs && new_refs) { |
1969 | if (info_ref_lock && repo->can_update_info_refs) { | |
197e8951 | 1970 | fprintf(stderr, "Updating remote server info\n"); |
fe5d1d3e SP |
1971 | if (!dry_run) |
1972 | update_remote_info_refs(info_ref_lock); | |
197e8951 NH |
1973 | } else { |
1974 | fprintf(stderr, "Unable to update server info\n"); | |
1975 | } | |
1976 | } | |
197e8951 | 1977 | |
58e60dd2 | 1978 | cleanup: |
9116de59 GB |
1979 | if (info_ref_lock) |
1980 | unlock_remote(info_ref_lock); | |
7b5201a6 | 1981 | free(repo); |
58e60dd2 | 1982 | |
29508e1e | 1983 | http_cleanup(); |
58e60dd2 NH |
1984 | |
1985 | request = request_queue_head; | |
1986 | while (request != NULL) { | |
1987 | next_request = request->next; | |
1988 | release_request(request); | |
58e60dd2 NH |
1989 | request = next_request; |
1990 | } | |
1991 | ||
58e60dd2 NH |
1992 | return rc; |
1993 | } |