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