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