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