Commit | Line | Data |
---|---|---|
9b288516 DB |
1 | #include "cache.h" |
2 | #include "transport.h" | |
3 | #include "run-command.h" | |
c29727d5 DB |
4 | #include "pkt-line.h" |
5 | #include "fetch-pack.h" | |
47a59185 JH |
6 | #include "remote.h" |
7 | #include "connect.h" | |
40cb4fab | 8 | #include "send-pack.h" |
c29727d5 | 9 | #include "walker.h" |
c7a8a162 | 10 | #include "bundle.h" |
cd547b48 JS |
11 | #include "dir.h" |
12 | #include "refs.h" | |
e9fcd1e2 | 13 | #include "branch.h" |
638794cd | 14 | #include "url.h" |
d2b17b32 | 15 | #include "submodule.h" |
a762e51e | 16 | #include "string-list.h" |
13eb4626 | 17 | #include "sha1-array.h" |
cd547b48 JS |
18 | |
19 | /* rsync support */ | |
20 | ||
21 | /* | |
22 | * We copy packed-refs and refs/ into a temporary file, then read the | |
23 | * loose refs recursively (sorting whenever possible), and then inserting | |
24 | * those packed refs that are not yet in the list (not validating, but | |
25 | * assuming that the file is sorted). | |
26 | * | |
27 | * Appears refactoring this from refs.c is too cumbersome. | |
28 | */ | |
29 | ||
30 | static int str_cmp(const void *a, const void *b) | |
31 | { | |
32 | const char *s1 = a; | |
33 | const char *s2 = b; | |
34 | ||
35 | return strcmp(s1, s2); | |
36 | } | |
37 | ||
38 | /* path->buf + name_offset is expected to point to "refs/" */ | |
39 | ||
40 | static int read_loose_refs(struct strbuf *path, int name_offset, | |
41 | struct ref **tail) | |
42 | { | |
43 | DIR *dir = opendir(path->buf); | |
44 | struct dirent *de; | |
45 | struct { | |
46 | char **entries; | |
47 | int nr, alloc; | |
48 | } list; | |
49 | int i, pathlen; | |
50 | ||
51 | if (!dir) | |
52 | return -1; | |
53 | ||
54 | memset (&list, 0, sizeof(list)); | |
55 | ||
56 | while ((de = readdir(dir))) { | |
8ca12c0d | 57 | if (is_dot_or_dotdot(de->d_name)) |
cd547b48 JS |
58 | continue; |
59 | ALLOC_GROW(list.entries, list.nr + 1, list.alloc); | |
60 | list.entries[list.nr++] = xstrdup(de->d_name); | |
61 | } | |
62 | closedir(dir); | |
63 | ||
64 | /* sort the list */ | |
65 | ||
66 | qsort(list.entries, list.nr, sizeof(char *), str_cmp); | |
67 | ||
68 | pathlen = path->len; | |
69 | strbuf_addch(path, '/'); | |
70 | ||
71 | for (i = 0; i < list.nr; i++, strbuf_setlen(path, pathlen + 1)) { | |
72 | strbuf_addstr(path, list.entries[i]); | |
73 | if (read_loose_refs(path, name_offset, tail)) { | |
74 | int fd = open(path->buf, O_RDONLY); | |
75 | char buffer[40]; | |
76 | struct ref *next; | |
77 | ||
78 | if (fd < 0) | |
79 | continue; | |
59c69c0c | 80 | next = alloc_ref(path->buf + name_offset); |
cd547b48 JS |
81 | if (read_in_full(fd, buffer, 40) != 40 || |
82 | get_sha1_hex(buffer, next->old_sha1)) { | |
83 | close(fd); | |
84 | free(next); | |
85 | continue; | |
86 | } | |
87 | close(fd); | |
cd547b48 JS |
88 | (*tail)->next = next; |
89 | *tail = next; | |
90 | } | |
91 | } | |
92 | strbuf_setlen(path, pathlen); | |
93 | ||
94 | for (i = 0; i < list.nr; i++) | |
95 | free(list.entries[i]); | |
96 | free(list.entries); | |
97 | ||
98 | return 0; | |
99 | } | |
100 | ||
101 | /* insert the packed refs for which no loose refs were found */ | |
102 | ||
103 | static void insert_packed_refs(const char *packed_refs, struct ref **list) | |
104 | { | |
105 | FILE *f = fopen(packed_refs, "r"); | |
106 | static char buffer[PATH_MAX]; | |
107 | ||
108 | if (!f) | |
109 | return; | |
110 | ||
111 | for (;;) { | |
04fe1184 JH |
112 | int cmp = 0; /* assigned before used */ |
113 | int len; | |
cd547b48 JS |
114 | |
115 | if (!fgets(buffer, sizeof(buffer), f)) { | |
116 | fclose(f); | |
117 | return; | |
118 | } | |
119 | ||
120 | if (hexval(buffer[0]) > 0xf) | |
121 | continue; | |
122 | len = strlen(buffer); | |
872c930d | 123 | if (len && buffer[len - 1] == '\n') |
cd547b48 JS |
124 | buffer[--len] = '\0'; |
125 | if (len < 41) | |
126 | continue; | |
127 | while ((*list)->next && | |
128 | (cmp = strcmp(buffer + 41, | |
129 | (*list)->next->name)) > 0) | |
130 | list = &(*list)->next; | |
131 | if (!(*list)->next || cmp < 0) { | |
59c69c0c | 132 | struct ref *next = alloc_ref(buffer + 41); |
cd547b48 JS |
133 | buffer[40] = '\0'; |
134 | if (get_sha1_hex(buffer, next->old_sha1)) { | |
135 | warning ("invalid SHA-1: %s", buffer); | |
136 | free(next); | |
137 | continue; | |
138 | } | |
cd547b48 JS |
139 | next->next = (*list)->next; |
140 | (*list)->next = next; | |
141 | list = &(*list)->next; | |
142 | } | |
143 | } | |
144 | } | |
145 | ||
e9fcd1e2 IL |
146 | static void set_upstreams(struct transport *transport, struct ref *refs, |
147 | int pretend) | |
148 | { | |
149 | struct ref *ref; | |
150 | for (ref = refs; ref; ref = ref->next) { | |
151 | const char *localname; | |
152 | const char *tmp; | |
153 | const char *remotename; | |
154 | unsigned char sha[20]; | |
155 | int flag = 0; | |
156 | /* | |
157 | * Check suitability for tracking. Must be successful / | |
158 | * already up-to-date ref create/modify (not delete). | |
159 | */ | |
160 | if (ref->status != REF_STATUS_OK && | |
161 | ref->status != REF_STATUS_UPTODATE) | |
162 | continue; | |
163 | if (!ref->peer_ref) | |
164 | continue; | |
5dd56489 | 165 | if (is_null_sha1(ref->new_sha1)) |
e9fcd1e2 IL |
166 | continue; |
167 | ||
168 | /* Follow symbolic refs (mainly for HEAD). */ | |
169 | localname = ref->peer_ref->name; | |
170 | remotename = ref->name; | |
8cad4744 | 171 | tmp = resolve_ref_unsafe(localname, sha, 1, &flag); |
e9fcd1e2 | 172 | if (tmp && flag & REF_ISSYMREF && |
59556548 | 173 | starts_with(tmp, "refs/heads/")) |
e9fcd1e2 IL |
174 | localname = tmp; |
175 | ||
176 | /* Both source and destination must be local branches. */ | |
59556548 | 177 | if (!localname || !starts_with(localname, "refs/heads/")) |
e9fcd1e2 | 178 | continue; |
59556548 | 179 | if (!remotename || !starts_with(remotename, "refs/heads/")) |
e9fcd1e2 IL |
180 | continue; |
181 | ||
182 | if (!pretend) | |
183 | install_branch_config(BRANCH_CONFIG_VERBOSE, | |
184 | localname + 11, transport->remote->name, | |
185 | remotename); | |
186 | else | |
187 | printf("Would set upstream of '%s' to '%s' of '%s'\n", | |
188 | localname + 11, remotename + 11, | |
189 | transport->remote->name); | |
190 | } | |
191 | } | |
192 | ||
7efaeba2 JS |
193 | static const char *rsync_url(const char *url) |
194 | { | |
59556548 | 195 | return !starts_with(url, "rsync://") ? skip_prefix(url, "rsync:") : url; |
7efaeba2 JS |
196 | } |
197 | ||
64fcef2d | 198 | static struct ref *get_refs_via_rsync(struct transport *transport, int for_push) |
cd547b48 JS |
199 | { |
200 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; | |
c2e86add | 201 | struct ref dummy = {NULL}, *tail = &dummy; |
cd547b48 JS |
202 | struct child_process rsync; |
203 | const char *args[5]; | |
204 | int temp_dir_len; | |
205 | ||
64fcef2d DB |
206 | if (for_push) |
207 | return NULL; | |
208 | ||
cd547b48 JS |
209 | /* copy the refs to the temporary directory */ |
210 | ||
211 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); | |
212 | if (!mkdtemp(temp_dir.buf)) | |
0721c314 | 213 | die_errno ("Could not make temporary directory"); |
cd547b48 JS |
214 | temp_dir_len = temp_dir.len; |
215 | ||
7efaeba2 | 216 | strbuf_addstr(&buf, rsync_url(transport->url)); |
cd547b48 JS |
217 | strbuf_addstr(&buf, "/refs"); |
218 | ||
219 | memset(&rsync, 0, sizeof(rsync)); | |
220 | rsync.argv = args; | |
221 | rsync.stdout_to_stderr = 1; | |
222 | args[0] = "rsync"; | |
bd2c86ef | 223 | args[1] = (transport->verbose > 1) ? "-rv" : "-r"; |
cd547b48 JS |
224 | args[2] = buf.buf; |
225 | args[3] = temp_dir.buf; | |
226 | args[4] = NULL; | |
227 | ||
228 | if (run_command(&rsync)) | |
229 | die ("Could not run rsync to get refs"); | |
230 | ||
231 | strbuf_reset(&buf); | |
7efaeba2 | 232 | strbuf_addstr(&buf, rsync_url(transport->url)); |
cd547b48 JS |
233 | strbuf_addstr(&buf, "/packed-refs"); |
234 | ||
235 | args[2] = buf.buf; | |
236 | ||
237 | if (run_command(&rsync)) | |
238 | die ("Could not run rsync to get refs"); | |
239 | ||
240 | /* read the copied refs */ | |
241 | ||
242 | strbuf_addstr(&temp_dir, "/refs"); | |
243 | read_loose_refs(&temp_dir, temp_dir_len + 1, &tail); | |
244 | strbuf_setlen(&temp_dir, temp_dir_len); | |
245 | ||
246 | tail = &dummy; | |
247 | strbuf_addstr(&temp_dir, "/packed-refs"); | |
248 | insert_packed_refs(temp_dir.buf, &tail); | |
249 | strbuf_setlen(&temp_dir, temp_dir_len); | |
250 | ||
251 | if (remove_dir_recursively(&temp_dir, 0)) | |
252 | warning ("Error removing temporary directory %s.", | |
253 | temp_dir.buf); | |
254 | ||
255 | strbuf_release(&buf); | |
256 | strbuf_release(&temp_dir); | |
257 | ||
258 | return dummy.next; | |
259 | } | |
260 | ||
261 | static int fetch_objs_via_rsync(struct transport *transport, | |
37148311 | 262 | int nr_objs, struct ref **to_fetch) |
cd547b48 JS |
263 | { |
264 | struct strbuf buf = STRBUF_INIT; | |
265 | struct child_process rsync; | |
266 | const char *args[8]; | |
267 | int result; | |
268 | ||
7efaeba2 | 269 | strbuf_addstr(&buf, rsync_url(transport->url)); |
cd547b48 JS |
270 | strbuf_addstr(&buf, "/objects/"); |
271 | ||
272 | memset(&rsync, 0, sizeof(rsync)); | |
273 | rsync.argv = args; | |
274 | rsync.stdout_to_stderr = 1; | |
275 | args[0] = "rsync"; | |
bd2c86ef | 276 | args[1] = (transport->verbose > 1) ? "-rv" : "-r"; |
cd547b48 JS |
277 | args[2] = "--ignore-existing"; |
278 | args[3] = "--exclude"; | |
279 | args[4] = "info"; | |
280 | args[5] = buf.buf; | |
281 | args[6] = get_object_directory(); | |
282 | args[7] = NULL; | |
283 | ||
284 | /* NEEDSWORK: handle one level of alternates */ | |
285 | result = run_command(&rsync); | |
286 | ||
287 | strbuf_release(&buf); | |
288 | ||
289 | return result; | |
290 | } | |
291 | ||
292 | static int write_one_ref(const char *name, const unsigned char *sha1, | |
293 | int flags, void *data) | |
294 | { | |
295 | struct strbuf *buf = data; | |
296 | int len = buf->len; | |
297 | FILE *f; | |
298 | ||
299 | /* when called via for_each_ref(), flags is non-zero */ | |
59556548 CC |
300 | if (flags && !starts_with(name, "refs/heads/") && |
301 | !starts_with(name, "refs/tags/")) | |
cd547b48 JS |
302 | return 0; |
303 | ||
304 | strbuf_addstr(buf, name); | |
305 | if (safe_create_leading_directories(buf->buf) || | |
306 | !(f = fopen(buf->buf, "w")) || | |
307 | fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 || | |
308 | fclose(f)) | |
309 | return error("problems writing temporary file %s", buf->buf); | |
310 | strbuf_setlen(buf, len); | |
311 | return 0; | |
312 | } | |
313 | ||
314 | static int write_refs_to_temp_dir(struct strbuf *temp_dir, | |
315 | int refspec_nr, const char **refspec) | |
316 | { | |
317 | int i; | |
318 | ||
319 | for (i = 0; i < refspec_nr; i++) { | |
320 | unsigned char sha1[20]; | |
321 | char *ref; | |
322 | ||
323 | if (dwim_ref(refspec[i], strlen(refspec[i]), sha1, &ref) != 1) | |
324 | return error("Could not get ref %s", refspec[i]); | |
325 | ||
326 | if (write_one_ref(ref, sha1, 0, temp_dir)) { | |
327 | free(ref); | |
328 | return -1; | |
329 | } | |
330 | free(ref); | |
331 | } | |
332 | return 0; | |
333 | } | |
334 | ||
335 | static int rsync_transport_push(struct transport *transport, | |
336 | int refspec_nr, const char **refspec, int flags) | |
337 | { | |
338 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; | |
339 | int result = 0, i; | |
340 | struct child_process rsync; | |
ee020f35 | 341 | const char *args[10]; |
cd547b48 | 342 | |
94c89ba6 AW |
343 | if (flags & TRANSPORT_PUSH_MIRROR) |
344 | return error("rsync transport does not support mirror mode"); | |
345 | ||
cd547b48 JS |
346 | /* first push the objects */ |
347 | ||
7efaeba2 | 348 | strbuf_addstr(&buf, rsync_url(transport->url)); |
cd547b48 JS |
349 | strbuf_addch(&buf, '/'); |
350 | ||
351 | memset(&rsync, 0, sizeof(rsync)); | |
352 | rsync.argv = args; | |
353 | rsync.stdout_to_stderr = 1; | |
ee020f35 SP |
354 | i = 0; |
355 | args[i++] = "rsync"; | |
356 | args[i++] = "-a"; | |
357 | if (flags & TRANSPORT_PUSH_DRY_RUN) | |
358 | args[i++] = "--dry-run"; | |
bd2c86ef | 359 | if (transport->verbose > 1) |
ee020f35 SP |
360 | args[i++] = "-v"; |
361 | args[i++] = "--ignore-existing"; | |
362 | args[i++] = "--exclude"; | |
363 | args[i++] = "info"; | |
364 | args[i++] = get_object_directory(); | |
365 | args[i++] = buf.buf; | |
366 | args[i++] = NULL; | |
cd547b48 JS |
367 | |
368 | if (run_command(&rsync)) | |
7efaeba2 JS |
369 | return error("Could not push objects to %s", |
370 | rsync_url(transport->url)); | |
cd547b48 JS |
371 | |
372 | /* copy the refs to the temporary directory; they could be packed. */ | |
373 | ||
374 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); | |
375 | if (!mkdtemp(temp_dir.buf)) | |
0721c314 | 376 | die_errno ("Could not make temporary directory"); |
cd547b48 JS |
377 | strbuf_addch(&temp_dir, '/'); |
378 | ||
379 | if (flags & TRANSPORT_PUSH_ALL) { | |
380 | if (for_each_ref(write_one_ref, &temp_dir)) | |
381 | return -1; | |
382 | } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec)) | |
383 | return -1; | |
384 | ||
ee020f35 SP |
385 | i = 2; |
386 | if (flags & TRANSPORT_PUSH_DRY_RUN) | |
387 | args[i++] = "--dry-run"; | |
388 | if (!(flags & TRANSPORT_PUSH_FORCE)) | |
389 | args[i++] = "--ignore-existing"; | |
cd547b48 | 390 | args[i++] = temp_dir.buf; |
7efaeba2 | 391 | args[i++] = rsync_url(transport->url); |
cd547b48 JS |
392 | args[i++] = NULL; |
393 | if (run_command(&rsync)) | |
7efaeba2 JS |
394 | result = error("Could not push to %s", |
395 | rsync_url(transport->url)); | |
cd547b48 JS |
396 | |
397 | if (remove_dir_recursively(&temp_dir, 0)) | |
398 | warning ("Could not remove temporary directory %s.", | |
399 | temp_dir.buf); | |
400 | ||
401 | strbuf_release(&buf); | |
402 | strbuf_release(&temp_dir); | |
403 | ||
404 | return result; | |
405 | } | |
c29727d5 | 406 | |
c7a8a162 JS |
407 | struct bundle_transport_data { |
408 | int fd; | |
409 | struct bundle_header header; | |
410 | }; | |
411 | ||
64fcef2d | 412 | static struct ref *get_refs_from_bundle(struct transport *transport, int for_push) |
c7a8a162 JS |
413 | { |
414 | struct bundle_transport_data *data = transport->data; | |
415 | struct ref *result = NULL; | |
416 | int i; | |
417 | ||
64fcef2d DB |
418 | if (for_push) |
419 | return NULL; | |
420 | ||
c7a8a162 JS |
421 | if (data->fd > 0) |
422 | close(data->fd); | |
423 | data->fd = read_bundle_header(transport->url, &data->header); | |
424 | if (data->fd < 0) | |
425 | die ("Could not read bundle '%s'.", transport->url); | |
426 | for (i = 0; i < data->header.references.nr; i++) { | |
427 | struct ref_list_entry *e = data->header.references.list + i; | |
59c69c0c | 428 | struct ref *ref = alloc_ref(e->name); |
c7a8a162 | 429 | hashcpy(ref->old_sha1, e->sha1); |
c7a8a162 JS |
430 | ref->next = result; |
431 | result = ref; | |
432 | } | |
433 | return result; | |
434 | } | |
435 | ||
1788c39c | 436 | static int fetch_refs_from_bundle(struct transport *transport, |
37148311 | 437 | int nr_heads, struct ref **to_fetch) |
c7a8a162 JS |
438 | { |
439 | struct bundle_transport_data *data = transport->data; | |
be042aff JH |
440 | return unbundle(&data->header, data->fd, |
441 | transport->progress ? BUNDLE_VERBOSE : 0); | |
c7a8a162 JS |
442 | } |
443 | ||
444 | static int close_bundle(struct transport *transport) | |
445 | { | |
446 | struct bundle_transport_data *data = transport->data; | |
447 | if (data->fd > 0) | |
448 | close(data->fd); | |
f4e95765 | 449 | free(data); |
c7a8a162 JS |
450 | return 0; |
451 | } | |
452 | ||
9b288516 | 453 | struct git_transport_data { |
aa5af974 | 454 | struct git_transport_options options; |
ba227857 DB |
455 | struct child_process *conn; |
456 | int fd[2]; | |
61b075bd | 457 | unsigned got_remote_heads : 1; |
13eb4626 | 458 | struct sha1_array extra_have; |
beea4152 | 459 | struct sha1_array shallow; |
9b288516 DB |
460 | }; |
461 | ||
aa5af974 | 462 | static int set_git_option(struct git_transport_options *opts, |
9b288516 DB |
463 | const char *name, const char *value) |
464 | { | |
c29727d5 | 465 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
aa5af974 | 466 | opts->uploadpack = value; |
c29727d5 DB |
467 | return 0; |
468 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { | |
aa5af974 | 469 | opts->receivepack = value; |
9b288516 DB |
470 | return 0; |
471 | } else if (!strcmp(name, TRANS_OPT_THIN)) { | |
aa5af974 | 472 | opts->thin = !!value; |
9b288516 | 473 | return 0; |
41fa7d2e | 474 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
aa5af974 | 475 | opts->followtags = !!value; |
41fa7d2e | 476 | return 0; |
c29727d5 | 477 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
aa5af974 | 478 | opts->keep = !!value; |
c29727d5 | 479 | return 0; |
48d25cae NTND |
480 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
481 | opts->update_shallow = !!value; | |
482 | return 0; | |
c29727d5 DB |
483 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
484 | if (!value) | |
aa5af974 | 485 | opts->depth = 0; |
e7622ce8 NTND |
486 | else { |
487 | char *end; | |
488 | opts->depth = strtol(value, &end, 0); | |
489 | if (*end) | |
490 | die("transport: invalid depth option '%s'", value); | |
491 | } | |
c29727d5 | 492 | return 0; |
9b288516 DB |
493 | } |
494 | return 1; | |
495 | } | |
496 | ||
64fcef2d | 497 | static int connect_setup(struct transport *transport, int for_push, int verbose) |
ba227857 DB |
498 | { |
499 | struct git_transport_data *data = transport->data; | |
61b075bd IL |
500 | |
501 | if (data->conn) | |
502 | return 0; | |
503 | ||
5a277f3f JH |
504 | data->conn = git_connect(data->fd, transport->url, |
505 | for_push ? data->options.receivepack : | |
506 | data->options.uploadpack, | |
64fcef2d | 507 | verbose ? CONNECT_VERBOSE : 0); |
61b075bd | 508 | |
ba227857 DB |
509 | return 0; |
510 | } | |
511 | ||
64fcef2d | 512 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push) |
c29727d5 DB |
513 | { |
514 | struct git_transport_data *data = transport->data; | |
515 | struct ref *refs; | |
c29727d5 | 516 | |
64fcef2d | 517 | connect_setup(transport, for_push, 0); |
85edf4f5 | 518 | get_remote_heads(data->fd[0], NULL, 0, &refs, |
beea4152 NTND |
519 | for_push ? REF_NORMAL : 0, |
520 | &data->extra_have, | |
4820a33b | 521 | &data->shallow); |
61b075bd | 522 | data->got_remote_heads = 1; |
c29727d5 DB |
523 | |
524 | return refs; | |
525 | } | |
526 | ||
1788c39c | 527 | static int fetch_refs_via_pack(struct transport *transport, |
37148311 | 528 | int nr_heads, struct ref **to_fetch) |
c29727d5 DB |
529 | { |
530 | struct git_transport_data *data = transport->data; | |
ba227857 | 531 | const struct ref *refs; |
c29727d5 DB |
532 | char *dest = xstrdup(transport->url); |
533 | struct fetch_pack_args args; | |
00183cbb | 534 | struct ref *refs_tmp = NULL; |
c29727d5 | 535 | |
fa740529 | 536 | memset(&args, 0, sizeof(args)); |
aa5af974 IL |
537 | args.uploadpack = data->options.uploadpack; |
538 | args.keep_pack = data->options.keep; | |
fa740529 | 539 | args.lock_pack = 1; |
aa5af974 IL |
540 | args.use_thin_pack = data->options.thin; |
541 | args.include_tag = data->options.followtags; | |
bd2c86ef | 542 | args.verbose = (transport->verbose > 1); |
fe8aa148 | 543 | args.quiet = (transport->verbose < 0); |
d01b3c02 | 544 | args.no_progress = !transport->progress; |
aa5af974 | 545 | args.depth = data->options.depth; |
c6807a40 NTND |
546 | args.check_self_contained_and_connected = |
547 | data->options.check_self_contained_and_connected; | |
beea4152 | 548 | args.cloning = transport->cloning; |
48d25cae | 549 | args.update_shallow = data->options.update_shallow; |
c29727d5 | 550 | |
61b075bd | 551 | if (!data->got_remote_heads) { |
64fcef2d | 552 | connect_setup(transport, 0, 0); |
b06dcd7d | 553 | get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0, |
4820a33b | 554 | NULL, &data->shallow); |
61b075bd | 555 | data->got_remote_heads = 1; |
ba227857 DB |
556 | } |
557 | ||
00183cbb DB |
558 | refs = fetch_pack(&args, data->fd, data->conn, |
559 | refs_tmp ? refs_tmp : transport->remote_refs, | |
beea4152 | 560 | dest, to_fetch, nr_heads, &data->shallow, |
f2db854d | 561 | &transport->pack_lockfile); |
ba227857 DB |
562 | close(data->fd[0]); |
563 | close(data->fd[1]); | |
564 | if (finish_connect(data->conn)) | |
565 | refs = NULL; | |
566 | data->conn = NULL; | |
61b075bd | 567 | data->got_remote_heads = 0; |
c6807a40 NTND |
568 | data->options.self_contained_and_connected = |
569 | args.self_contained_and_connected; | |
c29727d5 | 570 | |
00183cbb DB |
571 | free_refs(refs_tmp); |
572 | ||
c29727d5 | 573 | free(dest); |
c6bc4005 | 574 | return (refs ? 0 : -1); |
c29727d5 DB |
575 | } |
576 | ||
481c7a6d JK |
577 | static int push_had_errors(struct ref *ref) |
578 | { | |
579 | for (; ref; ref = ref->next) { | |
580 | switch (ref->status) { | |
581 | case REF_STATUS_NONE: | |
582 | case REF_STATUS_UPTODATE: | |
583 | case REF_STATUS_OK: | |
584 | break; | |
585 | default: | |
586 | return 1; | |
587 | } | |
588 | } | |
589 | return 0; | |
590 | } | |
591 | ||
f1863d0d | 592 | int transport_refs_pushed(struct ref *ref) |
64fcef2d DB |
593 | { |
594 | for (; ref; ref = ref->next) { | |
595 | switch(ref->status) { | |
596 | case REF_STATUS_NONE: | |
597 | case REF_STATUS_UPTODATE: | |
598 | break; | |
599 | default: | |
600 | return 1; | |
601 | } | |
602 | } | |
603 | return 0; | |
604 | } | |
605 | ||
f1863d0d | 606 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
64fcef2d DB |
607 | { |
608 | struct refspec rs; | |
609 | ||
610 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) | |
611 | return; | |
612 | ||
613 | rs.src = ref->name; | |
614 | rs.dst = NULL; | |
615 | ||
616 | if (!remote_find_tracking(remote, &rs)) { | |
617 | if (verbose) | |
618 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); | |
619 | if (ref->deletion) { | |
620 | delete_ref(rs.dst, NULL, 0); | |
621 | } else | |
622 | update_ref("update by push", rs.dst, | |
623 | ref->new_sha1, NULL, 0, 0); | |
624 | free(rs.dst); | |
625 | } | |
626 | } | |
627 | ||
1965ff74 | 628 | static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg, int porcelain) |
64fcef2d | 629 | { |
1965ff74 LA |
630 | if (porcelain) { |
631 | if (from) | |
632 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); | |
633 | else | |
634 | fprintf(stdout, "%c\t:%s\t", flag, to->name); | |
635 | if (msg) | |
636 | fprintf(stdout, "%s (%s)\n", summary, msg); | |
637 | else | |
638 | fprintf(stdout, "%s\n", summary); | |
639 | } else { | |
f1863d0d | 640 | fprintf(stderr, " %c %-*s ", flag, TRANSPORT_SUMMARY_WIDTH, summary); |
1965ff74 LA |
641 | if (from) |
642 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); | |
643 | else | |
644 | fputs(prettify_refname(to->name), stderr); | |
645 | if (msg) { | |
646 | fputs(" (", stderr); | |
647 | fputs(msg, stderr); | |
648 | fputc(')', stderr); | |
649 | } | |
650 | fputc('\n', stderr); | |
64fcef2d | 651 | } |
64fcef2d DB |
652 | } |
653 | ||
654 | static const char *status_abbrev(unsigned char sha1[20]) | |
655 | { | |
656 | return find_unique_abbrev(sha1, DEFAULT_ABBREV); | |
657 | } | |
658 | ||
1965ff74 | 659 | static void print_ok_ref_status(struct ref *ref, int porcelain) |
64fcef2d DB |
660 | { |
661 | if (ref->deletion) | |
1965ff74 | 662 | print_ref_status('-', "[deleted]", ref, NULL, NULL, porcelain); |
64fcef2d DB |
663 | else if (is_null_sha1(ref->old_sha1)) |
664 | print_ref_status('*', | |
59556548 | 665 | (starts_with(ref->name, "refs/tags/") ? "[new tag]" : |
1965ff74 LA |
666 | "[new branch]"), |
667 | ref, ref->peer_ref, NULL, porcelain); | |
64fcef2d DB |
668 | else { |
669 | char quickref[84]; | |
670 | char type; | |
671 | const char *msg; | |
672 | ||
673 | strcpy(quickref, status_abbrev(ref->old_sha1)); | |
5ece083f | 674 | if (ref->forced_update) { |
64fcef2d DB |
675 | strcat(quickref, "..."); |
676 | type = '+'; | |
677 | msg = "forced update"; | |
678 | } else { | |
679 | strcat(quickref, ".."); | |
680 | type = ' '; | |
681 | msg = NULL; | |
682 | } | |
683 | strcat(quickref, status_abbrev(ref->new_sha1)); | |
684 | ||
1965ff74 | 685 | print_ref_status(type, quickref, ref, ref->peer_ref, msg, porcelain); |
64fcef2d DB |
686 | } |
687 | } | |
688 | ||
1965ff74 | 689 | static int print_one_push_status(struct ref *ref, const char *dest, int count, int porcelain) |
64fcef2d DB |
690 | { |
691 | if (!count) | |
60cfeb8e | 692 | fprintf(porcelain ? stdout : stderr, "To %s\n", dest); |
64fcef2d DB |
693 | |
694 | switch(ref->status) { | |
695 | case REF_STATUS_NONE: | |
1965ff74 | 696 | print_ref_status('X', "[no match]", ref, NULL, NULL, porcelain); |
64fcef2d DB |
697 | break; |
698 | case REF_STATUS_REJECT_NODELETE: | |
699 | print_ref_status('!', "[rejected]", ref, NULL, | |
1965ff74 | 700 | "remote does not support deleting refs", porcelain); |
64fcef2d DB |
701 | break; |
702 | case REF_STATUS_UPTODATE: | |
703 | print_ref_status('=', "[up to date]", ref, | |
1965ff74 | 704 | ref->peer_ref, NULL, porcelain); |
64fcef2d DB |
705 | break; |
706 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
707 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
a75d7b54 | 708 | "non-fast-forward", porcelain); |
64fcef2d | 709 | break; |
dbfeddb1 CR |
710 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
711 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
712 | "already exists", porcelain); | |
713 | break; | |
75e5c0dc JH |
714 | case REF_STATUS_REJECT_FETCH_FIRST: |
715 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
716 | "fetch first", porcelain); | |
717 | break; | |
718 | case REF_STATUS_REJECT_NEEDS_FORCE: | |
719 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
720 | "needs force", porcelain); | |
721 | break; | |
631b5ef2 JH |
722 | case REF_STATUS_REJECT_STALE: |
723 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
724 | "stale info", porcelain); | |
725 | break; | |
4820a33b NTND |
726 | case REF_STATUS_REJECT_SHALLOW: |
727 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
728 | "new shallow roots not allowed", porcelain); | |
729 | break; | |
64fcef2d DB |
730 | case REF_STATUS_REMOTE_REJECT: |
731 | print_ref_status('!', "[remote rejected]", ref, | |
1965ff74 LA |
732 | ref->deletion ? NULL : ref->peer_ref, |
733 | ref->remote_status, porcelain); | |
64fcef2d DB |
734 | break; |
735 | case REF_STATUS_EXPECTING_REPORT: | |
736 | print_ref_status('!', "[remote failure]", ref, | |
1965ff74 LA |
737 | ref->deletion ? NULL : ref->peer_ref, |
738 | "remote failed to report status", porcelain); | |
64fcef2d DB |
739 | break; |
740 | case REF_STATUS_OK: | |
1965ff74 | 741 | print_ok_ref_status(ref, porcelain); |
64fcef2d DB |
742 | break; |
743 | } | |
744 | ||
745 | return 1; | |
746 | } | |
747 | ||
f1863d0d | 748 | void transport_print_push_status(const char *dest, struct ref *refs, |
10643d4e | 749 | int verbose, int porcelain, unsigned int *reject_reasons) |
64fcef2d DB |
750 | { |
751 | struct ref *ref; | |
752 | int n = 0; | |
f25950f3 CT |
753 | unsigned char head_sha1[20]; |
754 | char *head; | |
755 | ||
756 | head = resolve_refdup("HEAD", head_sha1, 1, NULL); | |
64fcef2d DB |
757 | |
758 | if (verbose) { | |
759 | for (ref = refs; ref; ref = ref->next) | |
760 | if (ref->status == REF_STATUS_UPTODATE) | |
1965ff74 | 761 | n += print_one_push_status(ref, dest, n, porcelain); |
64fcef2d DB |
762 | } |
763 | ||
764 | for (ref = refs; ref; ref = ref->next) | |
765 | if (ref->status == REF_STATUS_OK) | |
1965ff74 | 766 | n += print_one_push_status(ref, dest, n, porcelain); |
64fcef2d | 767 | |
10643d4e | 768 | *reject_reasons = 0; |
64fcef2d DB |
769 | for (ref = refs; ref; ref = ref->next) { |
770 | if (ref->status != REF_STATUS_NONE && | |
771 | ref->status != REF_STATUS_UPTODATE && | |
772 | ref->status != REF_STATUS_OK) | |
1965ff74 | 773 | n += print_one_push_status(ref, dest, n, porcelain); |
10643d4e | 774 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
1d2c14df | 775 | if (head != NULL && !strcmp(head, ref->name)) |
10643d4e | 776 | *reject_reasons |= REJECT_NON_FF_HEAD; |
f25950f3 | 777 | else |
10643d4e | 778 | *reject_reasons |= REJECT_NON_FF_OTHER; |
dbfeddb1 CR |
779 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
780 | *reject_reasons |= REJECT_ALREADY_EXISTS; | |
75e5c0dc JH |
781 | } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { |
782 | *reject_reasons |= REJECT_FETCH_FIRST; | |
783 | } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { | |
784 | *reject_reasons |= REJECT_NEEDS_FORCE; | |
f25950f3 | 785 | } |
64fcef2d DB |
786 | } |
787 | } | |
788 | ||
f1863d0d | 789 | void transport_verify_remote_names(int nr_heads, const char **heads) |
64fcef2d DB |
790 | { |
791 | int i; | |
792 | ||
793 | for (i = 0; i < nr_heads; i++) { | |
794 | const char *local = heads[i]; | |
795 | const char *remote = strrchr(heads[i], ':'); | |
796 | ||
797 | if (*local == '+') | |
798 | local++; | |
799 | ||
800 | /* A matching refspec is okay. */ | |
801 | if (remote == local && remote[1] == '\0') | |
802 | continue; | |
803 | ||
804 | remote = remote ? (remote + 1) : local; | |
8d9c5010 MH |
805 | if (check_refname_format(remote, |
806 | REFNAME_ALLOW_ONELEVEL|REFNAME_REFSPEC_PATTERN)) | |
807 | die("remote part of refspec is not a valid name in %s", | |
808 | heads[i]); | |
64fcef2d DB |
809 | } |
810 | } | |
811 | ||
812 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) | |
f3fa1838 | 813 | { |
9b288516 | 814 | struct git_transport_data *data = transport->data; |
40cb4fab | 815 | struct send_pack_args args; |
64fcef2d DB |
816 | int ret; |
817 | ||
61b075bd | 818 | if (!data->got_remote_heads) { |
64fcef2d DB |
819 | struct ref *tmp_refs; |
820 | connect_setup(transport, 1, 0); | |
821 | ||
b016918b NTND |
822 | get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL, |
823 | NULL, &data->shallow); | |
61b075bd | 824 | data->got_remote_heads = 1; |
64fcef2d | 825 | } |
9b288516 | 826 | |
de1a2fdd | 827 | memset(&args, 0, sizeof(args)); |
94c89ba6 | 828 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
40cb4fab | 829 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
aa5af974 | 830 | args.use_thin_pack = data->options.thin; |
8afd8dc0 TRC |
831 | args.verbose = (transport->verbose > 0); |
832 | args.quiet = (transport->verbose < 0); | |
d7c411b7 | 833 | args.progress = transport->progress; |
40cb4fab | 834 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
77555854 | 835 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
40cb4fab | 836 | |
64fcef2d DB |
837 | ret = send_pack(&args, data->fd, data->conn, remote_refs, |
838 | &data->extra_have); | |
839 | ||
840 | close(data->fd[1]); | |
841 | close(data->fd[0]); | |
842 | ret |= finish_connect(data->conn); | |
843 | data->conn = NULL; | |
61b075bd | 844 | data->got_remote_heads = 0; |
64fcef2d DB |
845 | |
846 | return ret; | |
9b288516 DB |
847 | } |
848 | ||
b236752a IL |
849 | static int connect_git(struct transport *transport, const char *name, |
850 | const char *executable, int fd[2]) | |
851 | { | |
852 | struct git_transport_data *data = transport->data; | |
853 | data->conn = git_connect(data->fd, transport->url, | |
854 | executable, 0); | |
855 | fd[0] = data->fd[0]; | |
856 | fd[1] = data->fd[1]; | |
857 | return 0; | |
858 | } | |
859 | ||
f4e95765 SP |
860 | static int disconnect_git(struct transport *transport) |
861 | { | |
ba227857 DB |
862 | struct git_transport_data *data = transport->data; |
863 | if (data->conn) { | |
61b075bd IL |
864 | if (data->got_remote_heads) |
865 | packet_flush(data->fd[1]); | |
ba227857 DB |
866 | close(data->fd[0]); |
867 | close(data->fd[1]); | |
868 | finish_connect(data->conn); | |
869 | } | |
870 | ||
871 | free(data); | |
f4e95765 SP |
872 | return 0; |
873 | } | |
874 | ||
61b075bd IL |
875 | void transport_take_over(struct transport *transport, |
876 | struct child_process *child) | |
877 | { | |
878 | struct git_transport_data *data; | |
879 | ||
880 | if (!transport->smart_options) | |
881 | die("Bug detected: Taking over transport requires non-NULL " | |
882 | "smart_options field."); | |
883 | ||
884 | data = xcalloc(1, sizeof(*data)); | |
885 | data->options = *transport->smart_options; | |
886 | data->conn = child; | |
887 | data->fd[0] = data->conn->out; | |
888 | data->fd[1] = data->conn->in; | |
889 | data->got_remote_heads = 0; | |
890 | transport->data = data; | |
891 | ||
892 | transport->set_option = NULL; | |
893 | transport->get_refs_list = get_refs_via_connect; | |
894 | transport->fetch = fetch_refs_via_pack; | |
895 | transport->push = NULL; | |
896 | transport->push_refs = git_transport_push; | |
897 | transport->disconnect = disconnect_git; | |
898 | transport->smart_options = &(data->options); | |
b26ed430 JH |
899 | |
900 | transport->cannot_reuse = 1; | |
61b075bd IL |
901 | } |
902 | ||
9b288516 DB |
903 | static int is_file(const char *url) |
904 | { | |
905 | struct stat buf; | |
906 | if (stat(url, &buf)) | |
907 | return 0; | |
908 | return S_ISREG(buf.st_mode); | |
909 | } | |
910 | ||
25d5cc48 IL |
911 | static int external_specification_len(const char *url) |
912 | { | |
913 | return strchr(url, ':') - url; | |
914 | } | |
915 | ||
e5f4e214 | 916 | struct transport *transport_get(struct remote *remote, const char *url) |
9b288516 | 917 | { |
4da50460 | 918 | const char *helper; |
8eb554ae SP |
919 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
920 | ||
d01b3c02 TRC |
921 | ret->progress = isatty(2); |
922 | ||
c1d45cf7 DB |
923 | if (!remote) |
924 | die("No remote provided to transport_get()"); | |
925 | ||
b0d66e15 | 926 | ret->got_remote_refs = 0; |
8eb554ae | 927 | ret->remote = remote; |
4da50460 | 928 | helper = remote->foreign_vcs; |
fb0cc87e | 929 | |
cb21d8f0 | 930 | if (!url && remote->url) |
fb0cc87e | 931 | url = remote->url[0]; |
8eb554ae | 932 | ret->url = url; |
8eb554ae | 933 | |
87422439 JS |
934 | /* maybe it is a foreign URL? */ |
935 | if (url) { | |
936 | const char *p = url; | |
937 | ||
638794cd | 938 | while (is_urlschemechar(p == url, *p)) |
87422439 | 939 | p++; |
59556548 | 940 | if (starts_with(p, "::")) |
4da50460 | 941 | helper = xstrndup(url, p - url); |
87422439 JS |
942 | } |
943 | ||
4da50460 IL |
944 | if (helper) { |
945 | transport_helper_init(ret, helper); | |
59556548 | 946 | } else if (starts_with(url, "rsync:")) { |
cd547b48 JS |
947 | ret->get_refs_list = get_refs_via_rsync; |
948 | ret->fetch = fetch_objs_via_rsync; | |
949 | ret->push = rsync_transport_push; | |
aa5af974 | 950 | ret->smart_options = NULL; |
c59ab2e5 | 951 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
c7a8a162 | 952 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
c7a8a162 | 953 | ret->data = data; |
824d5776 SP |
954 | ret->get_refs_list = get_refs_from_bundle; |
955 | ret->fetch = fetch_refs_from_bundle; | |
956 | ret->disconnect = close_bundle; | |
aa5af974 | 957 | ret->smart_options = NULL; |
25d5cc48 | 958 | } else if (!is_url(url) |
59556548 CC |
959 | || starts_with(url, "file://") |
960 | || starts_with(url, "git://") | |
961 | || starts_with(url, "ssh://") | |
962 | || starts_with(url, "git+ssh://") | |
963 | || starts_with(url, "ssh+git://")) { | |
25d5cc48 | 964 | /* These are builtin smart transports. */ |
9b288516 | 965 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
9b288516 | 966 | ret->data = data; |
aa5af974 | 967 | ret->set_option = NULL; |
824d5776 SP |
968 | ret->get_refs_list = get_refs_via_connect; |
969 | ret->fetch = fetch_refs_via_pack; | |
64fcef2d | 970 | ret->push_refs = git_transport_push; |
b236752a | 971 | ret->connect = connect_git; |
f4e95765 | 972 | ret->disconnect = disconnect_git; |
aa5af974 | 973 | ret->smart_options = &(data->options); |
824d5776 | 974 | |
ba227857 | 975 | data->conn = NULL; |
61b075bd | 976 | data->got_remote_heads = 0; |
25d5cc48 IL |
977 | } else { |
978 | /* Unknown protocol in URL. Pass to external handler. */ | |
979 | int len = external_specification_len(url); | |
980 | char *handler = xmalloc(len + 1); | |
981 | handler[len] = 0; | |
982 | strncpy(handler, url, len); | |
983 | transport_helper_init(ret, handler); | |
9b288516 | 984 | } |
8eb554ae | 985 | |
aa5af974 IL |
986 | if (ret->smart_options) { |
987 | ret->smart_options->thin = 1; | |
988 | ret->smart_options->uploadpack = "git-upload-pack"; | |
989 | if (remote->uploadpack) | |
990 | ret->smart_options->uploadpack = remote->uploadpack; | |
991 | ret->smart_options->receivepack = "git-receive-pack"; | |
992 | if (remote->receivepack) | |
993 | ret->smart_options->receivepack = remote->receivepack; | |
994 | } | |
995 | ||
9b288516 DB |
996 | return ret; |
997 | } | |
998 | ||
999 | int transport_set_option(struct transport *transport, | |
1000 | const char *name, const char *value) | |
1001 | { | |
aa5af974 IL |
1002 | int git_reports = 1, protocol_reports = 1; |
1003 | ||
1004 | if (transport->smart_options) | |
1005 | git_reports = set_git_option(transport->smart_options, | |
1006 | name, value); | |
1007 | ||
824d5776 | 1008 | if (transport->set_option) |
aa5af974 IL |
1009 | protocol_reports = transport->set_option(transport, name, |
1010 | value); | |
1011 | ||
1012 | /* If either report is 0, report 0 (success). */ | |
1013 | if (!git_reports || !protocol_reports) | |
1014 | return 0; | |
1015 | /* If either reports -1 (invalid value), report -1. */ | |
1016 | if ((git_reports == -1) || (protocol_reports == -1)) | |
1017 | return -1; | |
1018 | /* Otherwise if both report unknown, report unknown. */ | |
ab865e6e | 1019 | return 1; |
9b288516 DB |
1020 | } |
1021 | ||
d01b3c02 TRC |
1022 | void transport_set_verbosity(struct transport *transport, int verbosity, |
1023 | int force_progress) | |
bde873c5 | 1024 | { |
bd2c86ef | 1025 | if (verbosity >= 1) |
bde873c5 TRC |
1026 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
1027 | if (verbosity < 0) | |
1028 | transport->verbose = -1; | |
d01b3c02 TRC |
1029 | |
1030 | /** | |
1031 | * Rules used to determine whether to report progress (processing aborts | |
1032 | * when a rule is satisfied): | |
1033 | * | |
01fdc21f CB |
1034 | * . Report progress, if force_progress is 1 (ie. --progress). |
1035 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). | |
1036 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). | |
1037 | * . Report progress if isatty(2) is 1. | |
d01b3c02 | 1038 | **/ |
01fdc21f CB |
1039 | if (force_progress >= 0) |
1040 | transport->progress = !!force_progress; | |
1041 | else | |
1042 | transport->progress = verbosity >= 0 && isatty(2); | |
bde873c5 TRC |
1043 | } |
1044 | ||
a762e51e HV |
1045 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
1046 | { | |
1047 | int i; | |
1048 | ||
1049 | fprintf(stderr, "The following submodule paths contain changes that can\n" | |
1050 | "not be found on any remote:\n"); | |
1051 | for (i = 0; i < needs_pushing->nr; i++) | |
1052 | printf(" %s\n", needs_pushing->items[i].string); | |
eb21c732 HV |
1053 | fprintf(stderr, "\nPlease try\n\n" |
1054 | " git push --recurse-submodules=on-demand\n\n" | |
1055 | "or cd to the path and use\n\n" | |
1056 | " git push\n\n" | |
1057 | "to push them to a remote.\n\n"); | |
a762e51e HV |
1058 | |
1059 | string_list_clear(needs_pushing, 0); | |
1060 | ||
1061 | die("Aborting."); | |
1062 | } | |
1063 | ||
ec55559f AS |
1064 | static int run_pre_push_hook(struct transport *transport, |
1065 | struct ref *remote_refs) | |
1066 | { | |
1067 | int ret = 0, x; | |
1068 | struct ref *r; | |
1069 | struct child_process proc; | |
1070 | struct strbuf buf; | |
1071 | const char *argv[4]; | |
1072 | ||
1073 | if (!(argv[0] = find_hook("pre-push"))) | |
1074 | return 0; | |
1075 | ||
1076 | argv[1] = transport->remote->name; | |
1077 | argv[2] = transport->url; | |
1078 | argv[3] = NULL; | |
1079 | ||
1080 | memset(&proc, 0, sizeof(proc)); | |
1081 | proc.argv = argv; | |
1082 | proc.in = -1; | |
1083 | ||
1084 | if (start_command(&proc)) { | |
1085 | finish_command(&proc); | |
1086 | return -1; | |
1087 | } | |
1088 | ||
1089 | strbuf_init(&buf, 256); | |
1090 | ||
1091 | for (r = remote_refs; r; r = r->next) { | |
1092 | if (!r->peer_ref) continue; | |
1093 | if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; | |
631b5ef2 | 1094 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
ec55559f AS |
1095 | if (r->status == REF_STATUS_UPTODATE) continue; |
1096 | ||
1097 | strbuf_reset(&buf); | |
1098 | strbuf_addf( &buf, "%s %s %s %s\n", | |
1099 | r->peer_ref->name, sha1_to_hex(r->new_sha1), | |
1100 | r->name, sha1_to_hex(r->old_sha1)); | |
1101 | ||
1102 | if (write_in_full(proc.in, buf.buf, buf.len) != buf.len) { | |
1103 | ret = -1; | |
1104 | break; | |
1105 | } | |
1106 | } | |
1107 | ||
1108 | strbuf_release(&buf); | |
1109 | ||
1110 | x = close(proc.in); | |
1111 | if (!ret) | |
1112 | ret = x; | |
1113 | ||
1114 | x = finish_command(&proc); | |
1115 | if (!ret) | |
1116 | ret = x; | |
1117 | ||
1118 | return ret; | |
1119 | } | |
1120 | ||
9b288516 | 1121 | int transport_push(struct transport *transport, |
07436e43 | 1122 | int refspec_nr, const char **refspec, int flags, |
10643d4e | 1123 | unsigned int *reject_reasons) |
9b288516 | 1124 | { |
10643d4e | 1125 | *reject_reasons = 0; |
f1863d0d | 1126 | transport_verify_remote_names(refspec_nr, refspec); |
64fcef2d | 1127 | |
61b075bd | 1128 | if (transport->push) { |
e9fcd1e2 IL |
1129 | /* Maybe FIXME. But no important transport uses this case. */ |
1130 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) | |
1131 | die("This transport does not support using --set-upstream"); | |
1132 | ||
64fcef2d | 1133 | return transport->push(transport, refspec_nr, refspec, flags); |
61b075bd | 1134 | } else if (transport->push_refs) { |
ba928c13 | 1135 | struct ref *remote_refs; |
64fcef2d DB |
1136 | struct ref *local_refs = get_local_heads(); |
1137 | int match_flags = MATCH_REFS_NONE; | |
8afd8dc0 TRC |
1138 | int verbose = (transport->verbose > 0); |
1139 | int quiet = (transport->verbose < 0); | |
1965ff74 | 1140 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
e9fcd1e2 | 1141 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
77555854 | 1142 | int push_ret, ret, err; |
64fcef2d | 1143 | |
ba928c13 JK |
1144 | if (check_push_refs(local_refs, refspec_nr, refspec) < 0) |
1145 | return -1; | |
1146 | ||
1147 | remote_refs = transport->get_refs_list(transport, 1); | |
1148 | ||
64fcef2d DB |
1149 | if (flags & TRANSPORT_PUSH_ALL) |
1150 | match_flags |= MATCH_REFS_ALL; | |
1151 | if (flags & TRANSPORT_PUSH_MIRROR) | |
1152 | match_flags |= MATCH_REFS_MIRROR; | |
6ddba5e2 FC |
1153 | if (flags & TRANSPORT_PUSH_PRUNE) |
1154 | match_flags |= MATCH_REFS_PRUNE; | |
c2aba155 JH |
1155 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) |
1156 | match_flags |= MATCH_REFS_FOLLOW_TAGS; | |
64fcef2d | 1157 | |
29753cdd JH |
1158 | if (match_push_refs(local_refs, &remote_refs, |
1159 | refspec_nr, refspec, match_flags)) { | |
64fcef2d DB |
1160 | return -1; |
1161 | } | |
1162 | ||
91048a95 JH |
1163 | if (transport->smart_options && |
1164 | transport->smart_options->cas && | |
1165 | !is_empty_cas(transport->smart_options->cas)) | |
1166 | apply_push_cas(transport->smart_options->cas, | |
1167 | transport->remote, remote_refs); | |
1168 | ||
20e8b465 TRC |
1169 | set_ref_status_for_push(remote_refs, |
1170 | flags & TRANSPORT_PUSH_MIRROR, | |
1171 | flags & TRANSPORT_PUSH_FORCE); | |
1172 | ||
ec55559f AS |
1173 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) |
1174 | if (run_pre_push_hook(transport, remote_refs)) | |
1175 | return -1; | |
1176 | ||
eb21c732 | 1177 | if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) { |
d2b17b32 FG |
1178 | struct ref *ref = remote_refs; |
1179 | for (; ref; ref = ref->next) | |
1180 | if (!is_null_sha1(ref->new_sha1) && | |
eb21c732 HV |
1181 | !push_unpushed_submodules(ref->new_sha1, |
1182 | transport->remote->name)) | |
1183 | die ("Failed to push all needed submodules!"); | |
1184 | } | |
1185 | ||
1186 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | | |
1187 | TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) { | |
d2b17b32 | 1188 | struct ref *ref = remote_refs; |
a762e51e HV |
1189 | struct string_list needs_pushing; |
1190 | ||
1191 | memset(&needs_pushing, 0, sizeof(struct string_list)); | |
1192 | needs_pushing.strdup_strings = 1; | |
d2b17b32 FG |
1193 | for (; ref; ref = ref->next) |
1194 | if (!is_null_sha1(ref->new_sha1) && | |
a762e51e HV |
1195 | find_unpushed_submodules(ref->new_sha1, |
1196 | transport->remote->name, &needs_pushing)) | |
1197 | die_with_unpushed_submodules(&needs_pushing); | |
d2b17b32 FG |
1198 | } |
1199 | ||
77555854 | 1200 | push_ret = transport->push_refs(transport, remote_refs, flags); |
42328267 | 1201 | err = push_had_errors(remote_refs); |
77555854 | 1202 | ret = push_ret | err; |
64fcef2d | 1203 | |
42328267 | 1204 | if (!quiet || err) |
f1863d0d | 1205 | transport_print_push_status(transport->url, remote_refs, |
6ffd7812 | 1206 | verbose | porcelain, porcelain, |
10643d4e | 1207 | reject_reasons); |
64fcef2d | 1208 | |
e9fcd1e2 IL |
1209 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
1210 | set_upstreams(transport, remote_refs, pretend); | |
1211 | ||
64fcef2d DB |
1212 | if (!(flags & TRANSPORT_PUSH_DRY_RUN)) { |
1213 | struct ref *ref; | |
1214 | for (ref = remote_refs; ref; ref = ref->next) | |
f1863d0d | 1215 | transport_update_tracking_ref(transport->remote, ref, verbose); |
64fcef2d DB |
1216 | } |
1217 | ||
77555854 LA |
1218 | if (porcelain && !push_ret) |
1219 | puts("Done"); | |
66bce02e | 1220 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
64fcef2d | 1221 | fprintf(stderr, "Everything up-to-date\n"); |
77555854 | 1222 | |
64fcef2d DB |
1223 | return ret; |
1224 | } | |
1225 | return 1; | |
9b288516 DB |
1226 | } |
1227 | ||
4577370e | 1228 | const struct ref *transport_get_remote_refs(struct transport *transport) |
c29727d5 | 1229 | { |
b0d66e15 | 1230 | if (!transport->got_remote_refs) { |
64fcef2d | 1231 | transport->remote_refs = transport->get_refs_list(transport, 0); |
b0d66e15 TRC |
1232 | transport->got_remote_refs = 1; |
1233 | } | |
61b075bd | 1234 | |
c29727d5 DB |
1235 | return transport->remote_refs; |
1236 | } | |
1237 | ||
37148311 | 1238 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
c29727d5 | 1239 | { |
425b1393 | 1240 | int rc; |
86386829 | 1241 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
37148311 DB |
1242 | struct ref **heads = NULL; |
1243 | struct ref *rm; | |
c29727d5 DB |
1244 | |
1245 | for (rm = refs; rm; rm = rm->next) { | |
86386829 | 1246 | nr_refs++; |
c29727d5 | 1247 | if (rm->peer_ref && |
37148311 | 1248 | !is_null_sha1(rm->old_sha1) && |
c29727d5 DB |
1249 | !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1)) |
1250 | continue; | |
7a2bff45 | 1251 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
425b1393 | 1252 | heads[nr_heads++] = rm; |
c29727d5 DB |
1253 | } |
1254 | ||
86386829 NP |
1255 | if (!nr_heads) { |
1256 | /* | |
1257 | * When deepening of a shallow repository is requested, | |
1258 | * then local and remote refs are likely to still be equal. | |
1259 | * Just feed them all to the fetch method in that case. | |
1260 | * This condition shouldn't be met in a non-deepening fetch | |
09b7e220 | 1261 | * (see builtin/fetch.c:quickfetch()). |
86386829 NP |
1262 | */ |
1263 | heads = xmalloc(nr_refs * sizeof(*heads)); | |
1264 | for (rm = refs; rm; rm = rm->next) | |
1265 | heads[nr_heads++] = rm; | |
1266 | } | |
1267 | ||
824d5776 | 1268 | rc = transport->fetch(transport, nr_heads, heads); |
61b075bd | 1269 | |
c29727d5 | 1270 | free(heads); |
425b1393 | 1271 | return rc; |
c29727d5 DB |
1272 | } |
1273 | ||
1788c39c SP |
1274 | void transport_unlock_pack(struct transport *transport) |
1275 | { | |
1276 | if (transport->pack_lockfile) { | |
691f1a28 | 1277 | unlink_or_warn(transport->pack_lockfile); |
1788c39c SP |
1278 | free(transport->pack_lockfile); |
1279 | transport->pack_lockfile = NULL; | |
1280 | } | |
1281 | } | |
1282 | ||
b236752a IL |
1283 | int transport_connect(struct transport *transport, const char *name, |
1284 | const char *exec, int fd[2]) | |
1285 | { | |
1286 | if (transport->connect) | |
1287 | return transport->connect(transport, name, exec, fd); | |
1288 | else | |
1289 | die("Operation not supported by protocol"); | |
1290 | } | |
1291 | ||
9b288516 DB |
1292 | int transport_disconnect(struct transport *transport) |
1293 | { | |
1294 | int ret = 0; | |
824d5776 SP |
1295 | if (transport->disconnect) |
1296 | ret = transport->disconnect(transport); | |
9b288516 DB |
1297 | free(transport); |
1298 | return ret; | |
1299 | } | |
47abd85b AE |
1300 | |
1301 | /* | |
a7793a74 | 1302 | * Strip username (and password) from a URL and return |
47abd85b AE |
1303 | * it in a newly allocated string. |
1304 | */ | |
1305 | char *transport_anonymize_url(const char *url) | |
1306 | { | |
1307 | char *anon_url, *scheme_prefix, *anon_part; | |
1308 | size_t anon_len, prefix_len = 0; | |
1309 | ||
1310 | anon_part = strchr(url, '@'); | |
c59ab2e5 | 1311 | if (url_is_local_not_ssh(url) || !anon_part) |
47abd85b AE |
1312 | goto literal_copy; |
1313 | ||
1314 | anon_len = strlen(++anon_part); | |
1315 | scheme_prefix = strstr(url, "://"); | |
1316 | if (!scheme_prefix) { | |
1317 | if (!strchr(anon_part, ':')) | |
1318 | /* cannot be "me@there:/path/name" */ | |
1319 | goto literal_copy; | |
1320 | } else { | |
1321 | const char *cp; | |
1322 | /* make sure scheme is reasonable */ | |
1323 | for (cp = url; cp < scheme_prefix; cp++) { | |
1324 | switch (*cp) { | |
1325 | /* RFC 1738 2.1 */ | |
1326 | case '+': case '.': case '-': | |
1327 | break; /* ok */ | |
1328 | default: | |
1329 | if (isalnum(*cp)) | |
1330 | break; | |
1331 | /* it isn't */ | |
1332 | goto literal_copy; | |
1333 | } | |
1334 | } | |
1335 | /* @ past the first slash does not count */ | |
1336 | cp = strchr(scheme_prefix + 3, '/'); | |
1337 | if (cp && cp < anon_part) | |
1338 | goto literal_copy; | |
1339 | prefix_len = scheme_prefix - url + 3; | |
1340 | } | |
1341 | anon_url = xcalloc(1, 1 + prefix_len + anon_len); | |
1342 | memcpy(anon_url, url, prefix_len); | |
1343 | memcpy(anon_url + prefix_len, anon_part, anon_len); | |
1344 | return anon_url; | |
1345 | literal_copy: | |
1346 | return xstrdup(url); | |
1347 | } | |
36cfda15 | 1348 | |
114a6a88 JK |
1349 | struct alternate_refs_data { |
1350 | alternate_ref_fn *fn; | |
1351 | void *data; | |
1352 | }; | |
1353 | ||
1354 | static int refs_from_alternate_cb(struct alternate_object_database *e, | |
1355 | void *data) | |
36cfda15 JH |
1356 | { |
1357 | char *other; | |
1358 | size_t len; | |
1359 | struct remote *remote; | |
1360 | struct transport *transport; | |
1361 | const struct ref *extra; | |
114a6a88 | 1362 | struct alternate_refs_data *cb = data; |
36cfda15 JH |
1363 | |
1364 | e->name[-1] = '\0'; | |
91b3c7ce | 1365 | other = xstrdup(real_path(e->base)); |
36cfda15 JH |
1366 | e->name[-1] = '/'; |
1367 | len = strlen(other); | |
1368 | ||
1369 | while (other[len-1] == '/') | |
1370 | other[--len] = '\0'; | |
1371 | if (len < 8 || memcmp(other + len - 8, "/objects", 8)) | |
1372 | return 0; | |
1373 | /* Is this a git repository with refs? */ | |
1374 | memcpy(other + len - 8, "/refs", 6); | |
1375 | if (!is_directory(other)) | |
1376 | return 0; | |
1377 | other[len - 8] = '\0'; | |
1378 | remote = remote_get(other); | |
1379 | transport = transport_get(remote, other); | |
1380 | for (extra = transport_get_remote_refs(transport); | |
1381 | extra; | |
1382 | extra = extra->next) | |
114a6a88 | 1383 | cb->fn(extra, cb->data); |
36cfda15 JH |
1384 | transport_disconnect(transport); |
1385 | free(other); | |
1386 | return 0; | |
1387 | } | |
114a6a88 JK |
1388 | |
1389 | void for_each_alternate_ref(alternate_ref_fn fn, void *data) | |
1390 | { | |
1391 | struct alternate_refs_data cb; | |
1392 | cb.fn = fn; | |
1393 | cb.data = data; | |
1394 | foreach_alt_odb(refs_from_alternate_cb, &cb); | |
1395 | } |