]>
Commit | Line | Data |
---|---|---|
1 | #include "cache.h" | |
2 | #include "config.h" | |
3 | #include "transport.h" | |
4 | #include "run-command.h" | |
5 | #include "pkt-line.h" | |
6 | #include "fetch-pack.h" | |
7 | #include "remote.h" | |
8 | #include "connect.h" | |
9 | #include "send-pack.h" | |
10 | #include "walker.h" | |
11 | #include "bundle.h" | |
12 | #include "dir.h" | |
13 | #include "refs.h" | |
14 | #include "refspec.h" | |
15 | #include "branch.h" | |
16 | #include "url.h" | |
17 | #include "submodule.h" | |
18 | #include "string-list.h" | |
19 | #include "oid-array.h" | |
20 | #include "sigchain.h" | |
21 | #include "transport-internal.h" | |
22 | #include "protocol.h" | |
23 | #include "object-store.h" | |
24 | #include "color.h" | |
25 | ||
26 | static int transport_use_color = -1; | |
27 | static char transport_colors[][COLOR_MAXLEN] = { | |
28 | GIT_COLOR_RESET, | |
29 | GIT_COLOR_RED /* REJECTED */ | |
30 | }; | |
31 | ||
32 | enum color_transport { | |
33 | TRANSPORT_COLOR_RESET = 0, | |
34 | TRANSPORT_COLOR_REJECTED = 1 | |
35 | }; | |
36 | ||
37 | static int transport_color_config(void) | |
38 | { | |
39 | const char *keys[] = { | |
40 | "color.transport.reset", | |
41 | "color.transport.rejected" | |
42 | }, *key = "color.transport"; | |
43 | char *value; | |
44 | int i; | |
45 | static int initialized; | |
46 | ||
47 | if (initialized) | |
48 | return 0; | |
49 | initialized = 1; | |
50 | ||
51 | if (!git_config_get_string(key, &value)) | |
52 | transport_use_color = git_config_colorbool(key, value); | |
53 | ||
54 | if (!want_color_stderr(transport_use_color)) | |
55 | return 0; | |
56 | ||
57 | for (i = 0; i < ARRAY_SIZE(keys); i++) | |
58 | if (!git_config_get_string(keys[i], &value)) { | |
59 | if (!value) | |
60 | return config_error_nonbool(keys[i]); | |
61 | if (color_parse(value, transport_colors[i]) < 0) | |
62 | return -1; | |
63 | } | |
64 | ||
65 | return 0; | |
66 | } | |
67 | ||
68 | static const char *transport_get_color(enum color_transport ix) | |
69 | { | |
70 | if (want_color_stderr(transport_use_color)) | |
71 | return transport_colors[ix]; | |
72 | return ""; | |
73 | } | |
74 | ||
75 | static void set_upstreams(struct transport *transport, struct ref *refs, | |
76 | int pretend) | |
77 | { | |
78 | struct ref *ref; | |
79 | for (ref = refs; ref; ref = ref->next) { | |
80 | const char *localname; | |
81 | const char *tmp; | |
82 | const char *remotename; | |
83 | int flag = 0; | |
84 | /* | |
85 | * Check suitability for tracking. Must be successful / | |
86 | * already up-to-date ref create/modify (not delete). | |
87 | */ | |
88 | if (ref->status != REF_STATUS_OK && | |
89 | ref->status != REF_STATUS_UPTODATE) | |
90 | continue; | |
91 | if (!ref->peer_ref) | |
92 | continue; | |
93 | if (is_null_oid(&ref->new_oid)) | |
94 | continue; | |
95 | ||
96 | /* Follow symbolic refs (mainly for HEAD). */ | |
97 | localname = ref->peer_ref->name; | |
98 | remotename = ref->name; | |
99 | tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING, | |
100 | NULL, &flag); | |
101 | if (tmp && flag & REF_ISSYMREF && | |
102 | starts_with(tmp, "refs/heads/")) | |
103 | localname = tmp; | |
104 | ||
105 | /* Both source and destination must be local branches. */ | |
106 | if (!localname || !starts_with(localname, "refs/heads/")) | |
107 | continue; | |
108 | if (!remotename || !starts_with(remotename, "refs/heads/")) | |
109 | continue; | |
110 | ||
111 | if (!pretend) | |
112 | install_branch_config(BRANCH_CONFIG_VERBOSE, | |
113 | localname + 11, transport->remote->name, | |
114 | remotename); | |
115 | else | |
116 | printf(_("Would set upstream of '%s' to '%s' of '%s'\n"), | |
117 | localname + 11, remotename + 11, | |
118 | transport->remote->name); | |
119 | } | |
120 | } | |
121 | ||
122 | struct bundle_transport_data { | |
123 | int fd; | |
124 | struct bundle_header header; | |
125 | unsigned get_refs_from_bundle_called : 1; | |
126 | }; | |
127 | ||
128 | static struct ref *get_refs_from_bundle(struct transport *transport, | |
129 | int for_push, | |
130 | const struct argv_array *ref_prefixes) | |
131 | { | |
132 | struct bundle_transport_data *data = transport->data; | |
133 | struct ref *result = NULL; | |
134 | int i; | |
135 | ||
136 | if (for_push) | |
137 | return NULL; | |
138 | ||
139 | data->get_refs_from_bundle_called = 1; | |
140 | ||
141 | if (data->fd > 0) | |
142 | close(data->fd); | |
143 | data->fd = read_bundle_header(transport->url, &data->header); | |
144 | if (data->fd < 0) | |
145 | die(_("could not read bundle '%s'"), transport->url); | |
146 | for (i = 0; i < data->header.references.nr; i++) { | |
147 | struct ref_list_entry *e = data->header.references.list + i; | |
148 | struct ref *ref = alloc_ref(e->name); | |
149 | oidcpy(&ref->old_oid, &e->oid); | |
150 | ref->next = result; | |
151 | result = ref; | |
152 | } | |
153 | return result; | |
154 | } | |
155 | ||
156 | static int fetch_refs_from_bundle(struct transport *transport, | |
157 | int nr_heads, struct ref **to_fetch) | |
158 | { | |
159 | struct bundle_transport_data *data = transport->data; | |
160 | ||
161 | if (!data->get_refs_from_bundle_called) | |
162 | get_refs_from_bundle(transport, 0, NULL); | |
163 | return unbundle(the_repository, &data->header, data->fd, | |
164 | transport->progress ? BUNDLE_VERBOSE : 0); | |
165 | } | |
166 | ||
167 | static int close_bundle(struct transport *transport) | |
168 | { | |
169 | struct bundle_transport_data *data = transport->data; | |
170 | if (data->fd > 0) | |
171 | close(data->fd); | |
172 | free(data); | |
173 | return 0; | |
174 | } | |
175 | ||
176 | struct git_transport_data { | |
177 | struct git_transport_options options; | |
178 | struct child_process *conn; | |
179 | int fd[2]; | |
180 | unsigned got_remote_heads : 1; | |
181 | enum protocol_version version; | |
182 | struct oid_array extra_have; | |
183 | struct oid_array shallow; | |
184 | }; | |
185 | ||
186 | static int set_git_option(struct git_transport_options *opts, | |
187 | const char *name, const char *value) | |
188 | { | |
189 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { | |
190 | opts->uploadpack = value; | |
191 | return 0; | |
192 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { | |
193 | opts->receivepack = value; | |
194 | return 0; | |
195 | } else if (!strcmp(name, TRANS_OPT_THIN)) { | |
196 | opts->thin = !!value; | |
197 | return 0; | |
198 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { | |
199 | opts->followtags = !!value; | |
200 | return 0; | |
201 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { | |
202 | opts->keep = !!value; | |
203 | return 0; | |
204 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { | |
205 | opts->update_shallow = !!value; | |
206 | return 0; | |
207 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { | |
208 | if (!value) | |
209 | opts->depth = 0; | |
210 | else { | |
211 | char *end; | |
212 | opts->depth = strtol(value, &end, 0); | |
213 | if (*end) | |
214 | die(_("transport: invalid depth option '%s'"), value); | |
215 | } | |
216 | return 0; | |
217 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { | |
218 | opts->deepen_since = value; | |
219 | return 0; | |
220 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { | |
221 | opts->deepen_not = (const struct string_list *)value; | |
222 | return 0; | |
223 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { | |
224 | opts->deepen_relative = !!value; | |
225 | return 0; | |
226 | } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { | |
227 | opts->from_promisor = !!value; | |
228 | return 0; | |
229 | } else if (!strcmp(name, TRANS_OPT_NO_DEPENDENTS)) { | |
230 | opts->no_dependents = !!value; | |
231 | return 0; | |
232 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { | |
233 | list_objects_filter_die_if_populated(&opts->filter_options); | |
234 | parse_list_objects_filter(&opts->filter_options, value); | |
235 | return 0; | |
236 | } | |
237 | return 1; | |
238 | } | |
239 | ||
240 | static int connect_setup(struct transport *transport, int for_push) | |
241 | { | |
242 | struct git_transport_data *data = transport->data; | |
243 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; | |
244 | ||
245 | if (data->conn) | |
246 | return 0; | |
247 | ||
248 | switch (transport->family) { | |
249 | case TRANSPORT_FAMILY_ALL: break; | |
250 | case TRANSPORT_FAMILY_IPV4: flags |= CONNECT_IPV4; break; | |
251 | case TRANSPORT_FAMILY_IPV6: flags |= CONNECT_IPV6; break; | |
252 | } | |
253 | ||
254 | data->conn = git_connect(data->fd, transport->url, | |
255 | for_push ? data->options.receivepack : | |
256 | data->options.uploadpack, | |
257 | flags); | |
258 | ||
259 | return 0; | |
260 | } | |
261 | ||
262 | static void die_if_server_options(struct transport *transport) | |
263 | { | |
264 | if (!transport->server_options || !transport->server_options->nr) | |
265 | return; | |
266 | advise(_("see protocol.version in 'git help config' for more details")); | |
267 | die(_("server options require protocol version 2 or later")); | |
268 | } | |
269 | ||
270 | /* | |
271 | * Obtains the protocol version from the transport and writes it to | |
272 | * transport->data->version, first connecting if not already connected. | |
273 | * | |
274 | * If the protocol version is one that allows skipping the listing of remote | |
275 | * refs, and must_list_refs is 0, the listing of remote refs is skipped and | |
276 | * this function returns NULL. Otherwise, this function returns the list of | |
277 | * remote refs. | |
278 | */ | |
279 | static struct ref *handshake(struct transport *transport, int for_push, | |
280 | const struct argv_array *ref_prefixes, | |
281 | int must_list_refs) | |
282 | { | |
283 | struct git_transport_data *data = transport->data; | |
284 | struct ref *refs = NULL; | |
285 | struct packet_reader reader; | |
286 | ||
287 | connect_setup(transport, for_push); | |
288 | ||
289 | packet_reader_init(&reader, data->fd[0], NULL, 0, | |
290 | PACKET_READ_CHOMP_NEWLINE | | |
291 | PACKET_READ_GENTLE_ON_EOF | | |
292 | PACKET_READ_DIE_ON_ERR_PACKET); | |
293 | ||
294 | data->version = discover_version(&reader); | |
295 | switch (data->version) { | |
296 | case protocol_v2: | |
297 | if (must_list_refs) | |
298 | get_remote_refs(data->fd[1], &reader, &refs, for_push, | |
299 | ref_prefixes, | |
300 | transport->server_options); | |
301 | break; | |
302 | case protocol_v1: | |
303 | case protocol_v0: | |
304 | die_if_server_options(transport); | |
305 | get_remote_heads(&reader, &refs, | |
306 | for_push ? REF_NORMAL : 0, | |
307 | &data->extra_have, | |
308 | &data->shallow); | |
309 | break; | |
310 | case protocol_unknown_version: | |
311 | BUG("unknown protocol version"); | |
312 | } | |
313 | data->got_remote_heads = 1; | |
314 | ||
315 | if (reader.line_peeked) | |
316 | BUG("buffer must be empty at the end of handshake()"); | |
317 | ||
318 | return refs; | |
319 | } | |
320 | ||
321 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push, | |
322 | const struct argv_array *ref_prefixes) | |
323 | { | |
324 | return handshake(transport, for_push, ref_prefixes, 1); | |
325 | } | |
326 | ||
327 | static int fetch_refs_via_pack(struct transport *transport, | |
328 | int nr_heads, struct ref **to_fetch) | |
329 | { | |
330 | int ret = 0; | |
331 | struct git_transport_data *data = transport->data; | |
332 | struct ref *refs = NULL; | |
333 | struct fetch_pack_args args; | |
334 | struct ref *refs_tmp = NULL; | |
335 | ||
336 | memset(&args, 0, sizeof(args)); | |
337 | args.uploadpack = data->options.uploadpack; | |
338 | args.keep_pack = data->options.keep; | |
339 | args.lock_pack = 1; | |
340 | args.use_thin_pack = data->options.thin; | |
341 | args.include_tag = data->options.followtags; | |
342 | args.verbose = (transport->verbose > 1); | |
343 | args.quiet = (transport->verbose < 0); | |
344 | args.no_progress = !transport->progress; | |
345 | args.depth = data->options.depth; | |
346 | args.deepen_since = data->options.deepen_since; | |
347 | args.deepen_not = data->options.deepen_not; | |
348 | args.deepen_relative = data->options.deepen_relative; | |
349 | args.check_self_contained_and_connected = | |
350 | data->options.check_self_contained_and_connected; | |
351 | args.cloning = transport->cloning; | |
352 | args.update_shallow = data->options.update_shallow; | |
353 | args.from_promisor = data->options.from_promisor; | |
354 | args.no_dependents = data->options.no_dependents; | |
355 | args.filter_options = data->options.filter_options; | |
356 | args.stateless_rpc = transport->stateless_rpc; | |
357 | args.server_options = transport->server_options; | |
358 | args.negotiation_tips = data->options.negotiation_tips; | |
359 | ||
360 | if (!data->got_remote_heads) { | |
361 | int i; | |
362 | int must_list_refs = 0; | |
363 | for (i = 0; i < nr_heads; i++) { | |
364 | if (!to_fetch[i]->exact_oid) { | |
365 | must_list_refs = 1; | |
366 | break; | |
367 | } | |
368 | } | |
369 | refs_tmp = handshake(transport, 0, NULL, must_list_refs); | |
370 | } | |
371 | ||
372 | if (data->version == protocol_unknown_version) | |
373 | BUG("unknown protocol version"); | |
374 | else if (data->version <= protocol_v1) | |
375 | die_if_server_options(transport); | |
376 | ||
377 | refs = fetch_pack(&args, data->fd, | |
378 | refs_tmp ? refs_tmp : transport->remote_refs, | |
379 | to_fetch, nr_heads, &data->shallow, | |
380 | &transport->pack_lockfile, data->version); | |
381 | ||
382 | close(data->fd[0]); | |
383 | close(data->fd[1]); | |
384 | if (finish_connect(data->conn)) | |
385 | ret = -1; | |
386 | data->conn = NULL; | |
387 | data->got_remote_heads = 0; | |
388 | data->options.self_contained_and_connected = | |
389 | args.self_contained_and_connected; | |
390 | data->options.connectivity_checked = args.connectivity_checked; | |
391 | ||
392 | if (refs == NULL) | |
393 | ret = -1; | |
394 | if (report_unmatched_refs(to_fetch, nr_heads)) | |
395 | ret = -1; | |
396 | ||
397 | free_refs(refs_tmp); | |
398 | free_refs(refs); | |
399 | return ret; | |
400 | } | |
401 | ||
402 | static int push_had_errors(struct ref *ref) | |
403 | { | |
404 | for (; ref; ref = ref->next) { | |
405 | switch (ref->status) { | |
406 | case REF_STATUS_NONE: | |
407 | case REF_STATUS_UPTODATE: | |
408 | case REF_STATUS_OK: | |
409 | break; | |
410 | default: | |
411 | return 1; | |
412 | } | |
413 | } | |
414 | return 0; | |
415 | } | |
416 | ||
417 | int transport_refs_pushed(struct ref *ref) | |
418 | { | |
419 | for (; ref; ref = ref->next) { | |
420 | switch(ref->status) { | |
421 | case REF_STATUS_NONE: | |
422 | case REF_STATUS_UPTODATE: | |
423 | break; | |
424 | default: | |
425 | return 1; | |
426 | } | |
427 | } | |
428 | return 0; | |
429 | } | |
430 | ||
431 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) | |
432 | { | |
433 | struct refspec_item rs; | |
434 | ||
435 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) | |
436 | return; | |
437 | ||
438 | rs.src = ref->name; | |
439 | rs.dst = NULL; | |
440 | ||
441 | if (!remote_find_tracking(remote, &rs)) { | |
442 | if (verbose) | |
443 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); | |
444 | if (ref->deletion) { | |
445 | delete_ref(NULL, rs.dst, NULL, 0); | |
446 | } else | |
447 | update_ref("update by push", rs.dst, &ref->new_oid, | |
448 | NULL, 0, 0); | |
449 | free(rs.dst); | |
450 | } | |
451 | } | |
452 | ||
453 | static void print_ref_status(char flag, const char *summary, | |
454 | struct ref *to, struct ref *from, const char *msg, | |
455 | int porcelain, int summary_width) | |
456 | { | |
457 | if (porcelain) { | |
458 | if (from) | |
459 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); | |
460 | else | |
461 | fprintf(stdout, "%c\t:%s\t", flag, to->name); | |
462 | if (msg) | |
463 | fprintf(stdout, "%s (%s)\n", summary, msg); | |
464 | else | |
465 | fprintf(stdout, "%s\n", summary); | |
466 | } else { | |
467 | const char *red = "", *reset = ""; | |
468 | if (push_had_errors(to)) { | |
469 | red = transport_get_color(TRANSPORT_COLOR_REJECTED); | |
470 | reset = transport_get_color(TRANSPORT_COLOR_RESET); | |
471 | } | |
472 | fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width, | |
473 | summary, reset); | |
474 | if (from) | |
475 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); | |
476 | else | |
477 | fputs(prettify_refname(to->name), stderr); | |
478 | if (msg) { | |
479 | fputs(" (", stderr); | |
480 | fputs(msg, stderr); | |
481 | fputc(')', stderr); | |
482 | } | |
483 | fputc('\n', stderr); | |
484 | } | |
485 | } | |
486 | ||
487 | static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width) | |
488 | { | |
489 | if (ref->deletion) | |
490 | print_ref_status('-', "[deleted]", ref, NULL, NULL, | |
491 | porcelain, summary_width); | |
492 | else if (is_null_oid(&ref->old_oid)) | |
493 | print_ref_status('*', | |
494 | (starts_with(ref->name, "refs/tags/") ? "[new tag]" : | |
495 | "[new branch]"), | |
496 | ref, ref->peer_ref, NULL, porcelain, summary_width); | |
497 | else { | |
498 | struct strbuf quickref = STRBUF_INIT; | |
499 | char type; | |
500 | const char *msg; | |
501 | ||
502 | strbuf_add_unique_abbrev(&quickref, &ref->old_oid, | |
503 | DEFAULT_ABBREV); | |
504 | if (ref->forced_update) { | |
505 | strbuf_addstr(&quickref, "..."); | |
506 | type = '+'; | |
507 | msg = "forced update"; | |
508 | } else { | |
509 | strbuf_addstr(&quickref, ".."); | |
510 | type = ' '; | |
511 | msg = NULL; | |
512 | } | |
513 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, | |
514 | DEFAULT_ABBREV); | |
515 | ||
516 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, | |
517 | porcelain, summary_width); | |
518 | strbuf_release(&quickref); | |
519 | } | |
520 | } | |
521 | ||
522 | static int print_one_push_status(struct ref *ref, const char *dest, int count, | |
523 | int porcelain, int summary_width) | |
524 | { | |
525 | if (!count) { | |
526 | char *url = transport_anonymize_url(dest); | |
527 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); | |
528 | free(url); | |
529 | } | |
530 | ||
531 | switch(ref->status) { | |
532 | case REF_STATUS_NONE: | |
533 | print_ref_status('X', "[no match]", ref, NULL, NULL, | |
534 | porcelain, summary_width); | |
535 | break; | |
536 | case REF_STATUS_REJECT_NODELETE: | |
537 | print_ref_status('!', "[rejected]", ref, NULL, | |
538 | "remote does not support deleting refs", | |
539 | porcelain, summary_width); | |
540 | break; | |
541 | case REF_STATUS_UPTODATE: | |
542 | print_ref_status('=', "[up to date]", ref, | |
543 | ref->peer_ref, NULL, porcelain, summary_width); | |
544 | break; | |
545 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
546 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
547 | "non-fast-forward", porcelain, summary_width); | |
548 | break; | |
549 | case REF_STATUS_REJECT_ALREADY_EXISTS: | |
550 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
551 | "already exists", porcelain, summary_width); | |
552 | break; | |
553 | case REF_STATUS_REJECT_FETCH_FIRST: | |
554 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
555 | "fetch first", porcelain, summary_width); | |
556 | break; | |
557 | case REF_STATUS_REJECT_NEEDS_FORCE: | |
558 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
559 | "needs force", porcelain, summary_width); | |
560 | break; | |
561 | case REF_STATUS_REJECT_STALE: | |
562 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
563 | "stale info", porcelain, summary_width); | |
564 | break; | |
565 | case REF_STATUS_REJECT_SHALLOW: | |
566 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
567 | "new shallow roots not allowed", | |
568 | porcelain, summary_width); | |
569 | break; | |
570 | case REF_STATUS_REMOTE_REJECT: | |
571 | print_ref_status('!', "[remote rejected]", ref, | |
572 | ref->deletion ? NULL : ref->peer_ref, | |
573 | ref->remote_status, porcelain, summary_width); | |
574 | break; | |
575 | case REF_STATUS_EXPECTING_REPORT: | |
576 | print_ref_status('!', "[remote failure]", ref, | |
577 | ref->deletion ? NULL : ref->peer_ref, | |
578 | "remote failed to report status", | |
579 | porcelain, summary_width); | |
580 | break; | |
581 | case REF_STATUS_ATOMIC_PUSH_FAILED: | |
582 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
583 | "atomic push failed", porcelain, summary_width); | |
584 | break; | |
585 | case REF_STATUS_OK: | |
586 | print_ok_ref_status(ref, porcelain, summary_width); | |
587 | break; | |
588 | } | |
589 | ||
590 | return 1; | |
591 | } | |
592 | ||
593 | static int measure_abbrev(const struct object_id *oid, int sofar) | |
594 | { | |
595 | char hex[GIT_MAX_HEXSZ + 1]; | |
596 | int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV); | |
597 | ||
598 | return (w < sofar) ? sofar : w; | |
599 | } | |
600 | ||
601 | int transport_summary_width(const struct ref *refs) | |
602 | { | |
603 | int maxw = -1; | |
604 | ||
605 | for (; refs; refs = refs->next) { | |
606 | maxw = measure_abbrev(&refs->old_oid, maxw); | |
607 | maxw = measure_abbrev(&refs->new_oid, maxw); | |
608 | } | |
609 | if (maxw < 0) | |
610 | maxw = FALLBACK_DEFAULT_ABBREV; | |
611 | return (2 * maxw + 3); | |
612 | } | |
613 | ||
614 | void transport_print_push_status(const char *dest, struct ref *refs, | |
615 | int verbose, int porcelain, unsigned int *reject_reasons) | |
616 | { | |
617 | struct ref *ref; | |
618 | int n = 0; | |
619 | char *head; | |
620 | int summary_width = transport_summary_width(refs); | |
621 | ||
622 | if (transport_color_config() < 0) | |
623 | warning(_("could not parse transport.color.* config")); | |
624 | ||
625 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); | |
626 | ||
627 | if (verbose) { | |
628 | for (ref = refs; ref; ref = ref->next) | |
629 | if (ref->status == REF_STATUS_UPTODATE) | |
630 | n += print_one_push_status(ref, dest, n, | |
631 | porcelain, summary_width); | |
632 | } | |
633 | ||
634 | for (ref = refs; ref; ref = ref->next) | |
635 | if (ref->status == REF_STATUS_OK) | |
636 | n += print_one_push_status(ref, dest, n, | |
637 | porcelain, summary_width); | |
638 | ||
639 | *reject_reasons = 0; | |
640 | for (ref = refs; ref; ref = ref->next) { | |
641 | if (ref->status != REF_STATUS_NONE && | |
642 | ref->status != REF_STATUS_UPTODATE && | |
643 | ref->status != REF_STATUS_OK) | |
644 | n += print_one_push_status(ref, dest, n, | |
645 | porcelain, summary_width); | |
646 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { | |
647 | if (head != NULL && !strcmp(head, ref->name)) | |
648 | *reject_reasons |= REJECT_NON_FF_HEAD; | |
649 | else | |
650 | *reject_reasons |= REJECT_NON_FF_OTHER; | |
651 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { | |
652 | *reject_reasons |= REJECT_ALREADY_EXISTS; | |
653 | } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { | |
654 | *reject_reasons |= REJECT_FETCH_FIRST; | |
655 | } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { | |
656 | *reject_reasons |= REJECT_NEEDS_FORCE; | |
657 | } | |
658 | } | |
659 | free(head); | |
660 | } | |
661 | ||
662 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) | |
663 | { | |
664 | struct git_transport_data *data = transport->data; | |
665 | struct send_pack_args args; | |
666 | int ret = 0; | |
667 | ||
668 | if (transport_color_config() < 0) | |
669 | return -1; | |
670 | ||
671 | if (!data->got_remote_heads) | |
672 | get_refs_via_connect(transport, 1, NULL); | |
673 | ||
674 | memset(&args, 0, sizeof(args)); | |
675 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); | |
676 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); | |
677 | args.use_thin_pack = data->options.thin; | |
678 | args.verbose = (transport->verbose > 0); | |
679 | args.quiet = (transport->verbose < 0); | |
680 | args.progress = transport->progress; | |
681 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); | |
682 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); | |
683 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); | |
684 | args.push_options = transport->push_options; | |
685 | args.url = transport->url; | |
686 | ||
687 | if (flags & TRANSPORT_PUSH_CERT_ALWAYS) | |
688 | args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS; | |
689 | else if (flags & TRANSPORT_PUSH_CERT_IF_ASKED) | |
690 | args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED; | |
691 | else | |
692 | args.push_cert = SEND_PACK_PUSH_CERT_NEVER; | |
693 | ||
694 | switch (data->version) { | |
695 | case protocol_v2: | |
696 | die(_("support for protocol v2 not implemented yet")); | |
697 | break; | |
698 | case protocol_v1: | |
699 | case protocol_v0: | |
700 | ret = send_pack(&args, data->fd, data->conn, remote_refs, | |
701 | &data->extra_have); | |
702 | break; | |
703 | case protocol_unknown_version: | |
704 | BUG("unknown protocol version"); | |
705 | } | |
706 | ||
707 | close(data->fd[1]); | |
708 | close(data->fd[0]); | |
709 | /* | |
710 | * Atomic push may abort the connection early and close the pipe, | |
711 | * which may cause an error for `finish_connect()`. Ignore this error | |
712 | * for atomic git-push. | |
713 | */ | |
714 | if (ret || args.atomic) | |
715 | finish_connect(data->conn); | |
716 | else | |
717 | ret = finish_connect(data->conn); | |
718 | data->conn = NULL; | |
719 | data->got_remote_heads = 0; | |
720 | ||
721 | return ret; | |
722 | } | |
723 | ||
724 | static int connect_git(struct transport *transport, const char *name, | |
725 | const char *executable, int fd[2]) | |
726 | { | |
727 | struct git_transport_data *data = transport->data; | |
728 | data->conn = git_connect(data->fd, transport->url, | |
729 | executable, 0); | |
730 | fd[0] = data->fd[0]; | |
731 | fd[1] = data->fd[1]; | |
732 | return 0; | |
733 | } | |
734 | ||
735 | static int disconnect_git(struct transport *transport) | |
736 | { | |
737 | struct git_transport_data *data = transport->data; | |
738 | if (data->conn) { | |
739 | if (data->got_remote_heads && !transport->stateless_rpc) | |
740 | packet_flush(data->fd[1]); | |
741 | close(data->fd[0]); | |
742 | close(data->fd[1]); | |
743 | finish_connect(data->conn); | |
744 | } | |
745 | ||
746 | free(data); | |
747 | return 0; | |
748 | } | |
749 | ||
750 | static struct transport_vtable taken_over_vtable = { | |
751 | NULL, | |
752 | get_refs_via_connect, | |
753 | fetch_refs_via_pack, | |
754 | git_transport_push, | |
755 | NULL, | |
756 | disconnect_git | |
757 | }; | |
758 | ||
759 | void transport_take_over(struct transport *transport, | |
760 | struct child_process *child) | |
761 | { | |
762 | struct git_transport_data *data; | |
763 | ||
764 | if (!transport->smart_options) | |
765 | BUG("taking over transport requires non-NULL " | |
766 | "smart_options field."); | |
767 | ||
768 | data = xcalloc(1, sizeof(*data)); | |
769 | data->options = *transport->smart_options; | |
770 | data->conn = child; | |
771 | data->fd[0] = data->conn->out; | |
772 | data->fd[1] = data->conn->in; | |
773 | data->got_remote_heads = 0; | |
774 | transport->data = data; | |
775 | ||
776 | transport->vtable = &taken_over_vtable; | |
777 | transport->smart_options = &(data->options); | |
778 | ||
779 | transport->cannot_reuse = 1; | |
780 | } | |
781 | ||
782 | static int is_file(const char *url) | |
783 | { | |
784 | struct stat buf; | |
785 | if (stat(url, &buf)) | |
786 | return 0; | |
787 | return S_ISREG(buf.st_mode); | |
788 | } | |
789 | ||
790 | static int external_specification_len(const char *url) | |
791 | { | |
792 | return strchr(url, ':') - url; | |
793 | } | |
794 | ||
795 | static const struct string_list *protocol_whitelist(void) | |
796 | { | |
797 | static int enabled = -1; | |
798 | static struct string_list allowed = STRING_LIST_INIT_DUP; | |
799 | ||
800 | if (enabled < 0) { | |
801 | const char *v = getenv("GIT_ALLOW_PROTOCOL"); | |
802 | if (v) { | |
803 | string_list_split(&allowed, v, ':', -1); | |
804 | string_list_sort(&allowed); | |
805 | enabled = 1; | |
806 | } else { | |
807 | enabled = 0; | |
808 | } | |
809 | } | |
810 | ||
811 | return enabled ? &allowed : NULL; | |
812 | } | |
813 | ||
814 | enum protocol_allow_config { | |
815 | PROTOCOL_ALLOW_NEVER = 0, | |
816 | PROTOCOL_ALLOW_USER_ONLY, | |
817 | PROTOCOL_ALLOW_ALWAYS | |
818 | }; | |
819 | ||
820 | static enum protocol_allow_config parse_protocol_config(const char *key, | |
821 | const char *value) | |
822 | { | |
823 | if (!strcasecmp(value, "always")) | |
824 | return PROTOCOL_ALLOW_ALWAYS; | |
825 | else if (!strcasecmp(value, "never")) | |
826 | return PROTOCOL_ALLOW_NEVER; | |
827 | else if (!strcasecmp(value, "user")) | |
828 | return PROTOCOL_ALLOW_USER_ONLY; | |
829 | ||
830 | die(_("unknown value for config '%s': %s"), key, value); | |
831 | } | |
832 | ||
833 | static enum protocol_allow_config get_protocol_config(const char *type) | |
834 | { | |
835 | char *key = xstrfmt("protocol.%s.allow", type); | |
836 | char *value; | |
837 | ||
838 | /* first check the per-protocol config */ | |
839 | if (!git_config_get_string(key, &value)) { | |
840 | enum protocol_allow_config ret = | |
841 | parse_protocol_config(key, value); | |
842 | free(key); | |
843 | free(value); | |
844 | return ret; | |
845 | } | |
846 | free(key); | |
847 | ||
848 | /* if defined, fallback to user-defined default for unknown protocols */ | |
849 | if (!git_config_get_string("protocol.allow", &value)) { | |
850 | enum protocol_allow_config ret = | |
851 | parse_protocol_config("protocol.allow", value); | |
852 | free(value); | |
853 | return ret; | |
854 | } | |
855 | ||
856 | /* fallback to built-in defaults */ | |
857 | /* known safe */ | |
858 | if (!strcmp(type, "http") || | |
859 | !strcmp(type, "https") || | |
860 | !strcmp(type, "git") || | |
861 | !strcmp(type, "ssh") || | |
862 | !strcmp(type, "file")) | |
863 | return PROTOCOL_ALLOW_ALWAYS; | |
864 | ||
865 | /* known scary; err on the side of caution */ | |
866 | if (!strcmp(type, "ext")) | |
867 | return PROTOCOL_ALLOW_NEVER; | |
868 | ||
869 | /* unknown; by default let them be used only directly by the user */ | |
870 | return PROTOCOL_ALLOW_USER_ONLY; | |
871 | } | |
872 | ||
873 | int is_transport_allowed(const char *type, int from_user) | |
874 | { | |
875 | const struct string_list *whitelist = protocol_whitelist(); | |
876 | if (whitelist) | |
877 | return string_list_has_string(whitelist, type); | |
878 | ||
879 | switch (get_protocol_config(type)) { | |
880 | case PROTOCOL_ALLOW_ALWAYS: | |
881 | return 1; | |
882 | case PROTOCOL_ALLOW_NEVER: | |
883 | return 0; | |
884 | case PROTOCOL_ALLOW_USER_ONLY: | |
885 | if (from_user < 0) | |
886 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); | |
887 | return from_user; | |
888 | } | |
889 | ||
890 | BUG("invalid protocol_allow_config type"); | |
891 | } | |
892 | ||
893 | void transport_check_allowed(const char *type) | |
894 | { | |
895 | if (!is_transport_allowed(type, -1)) | |
896 | die(_("transport '%s' not allowed"), type); | |
897 | } | |
898 | ||
899 | static struct transport_vtable bundle_vtable = { | |
900 | NULL, | |
901 | get_refs_from_bundle, | |
902 | fetch_refs_from_bundle, | |
903 | NULL, | |
904 | NULL, | |
905 | close_bundle | |
906 | }; | |
907 | ||
908 | static struct transport_vtable builtin_smart_vtable = { | |
909 | NULL, | |
910 | get_refs_via_connect, | |
911 | fetch_refs_via_pack, | |
912 | git_transport_push, | |
913 | connect_git, | |
914 | disconnect_git | |
915 | }; | |
916 | ||
917 | struct transport *transport_get(struct remote *remote, const char *url) | |
918 | { | |
919 | const char *helper; | |
920 | struct transport *ret = xcalloc(1, sizeof(*ret)); | |
921 | ||
922 | ret->progress = isatty(2); | |
923 | ||
924 | if (!remote) | |
925 | BUG("No remote provided to transport_get()"); | |
926 | ||
927 | ret->got_remote_refs = 0; | |
928 | ret->remote = remote; | |
929 | helper = remote->foreign_vcs; | |
930 | ||
931 | if (!url && remote->url) | |
932 | url = remote->url[0]; | |
933 | ret->url = url; | |
934 | ||
935 | /* maybe it is a foreign URL? */ | |
936 | if (url) { | |
937 | const char *p = url; | |
938 | ||
939 | while (is_urlschemechar(p == url, *p)) | |
940 | p++; | |
941 | if (starts_with(p, "::")) | |
942 | helper = xstrndup(url, p - url); | |
943 | } | |
944 | ||
945 | if (helper) { | |
946 | transport_helper_init(ret, helper); | |
947 | } else if (starts_with(url, "rsync:")) { | |
948 | die(_("git-over-rsync is no longer supported")); | |
949 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { | |
950 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); | |
951 | transport_check_allowed("file"); | |
952 | ret->data = data; | |
953 | ret->vtable = &bundle_vtable; | |
954 | ret->smart_options = NULL; | |
955 | } else if (!is_url(url) | |
956 | || starts_with(url, "file://") | |
957 | || starts_with(url, "git://") | |
958 | || starts_with(url, "ssh://") | |
959 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ | |
960 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ | |
961 | ) { | |
962 | /* | |
963 | * These are builtin smart transports; "allowed" transports | |
964 | * will be checked individually in git_connect. | |
965 | */ | |
966 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); | |
967 | ret->data = data; | |
968 | ret->vtable = &builtin_smart_vtable; | |
969 | ret->smart_options = &(data->options); | |
970 | ||
971 | data->conn = NULL; | |
972 | data->got_remote_heads = 0; | |
973 | } else { | |
974 | /* Unknown protocol in URL. Pass to external handler. */ | |
975 | int len = external_specification_len(url); | |
976 | char *handler = xmemdupz(url, len); | |
977 | transport_helper_init(ret, handler); | |
978 | } | |
979 | ||
980 | if (ret->smart_options) { | |
981 | ret->smart_options->thin = 1; | |
982 | ret->smart_options->uploadpack = "git-upload-pack"; | |
983 | if (remote->uploadpack) | |
984 | ret->smart_options->uploadpack = remote->uploadpack; | |
985 | ret->smart_options->receivepack = "git-receive-pack"; | |
986 | if (remote->receivepack) | |
987 | ret->smart_options->receivepack = remote->receivepack; | |
988 | } | |
989 | ||
990 | return ret; | |
991 | } | |
992 | ||
993 | int transport_set_option(struct transport *transport, | |
994 | const char *name, const char *value) | |
995 | { | |
996 | int git_reports = 1, protocol_reports = 1; | |
997 | ||
998 | if (transport->smart_options) | |
999 | git_reports = set_git_option(transport->smart_options, | |
1000 | name, value); | |
1001 | ||
1002 | if (transport->vtable->set_option) | |
1003 | protocol_reports = transport->vtable->set_option(transport, | |
1004 | name, value); | |
1005 | ||
1006 | /* If either report is 0, report 0 (success). */ | |
1007 | if (!git_reports || !protocol_reports) | |
1008 | return 0; | |
1009 | /* If either reports -1 (invalid value), report -1. */ | |
1010 | if ((git_reports == -1) || (protocol_reports == -1)) | |
1011 | return -1; | |
1012 | /* Otherwise if both report unknown, report unknown. */ | |
1013 | return 1; | |
1014 | } | |
1015 | ||
1016 | void transport_set_verbosity(struct transport *transport, int verbosity, | |
1017 | int force_progress) | |
1018 | { | |
1019 | if (verbosity >= 1) | |
1020 | transport->verbose = verbosity <= 3 ? verbosity : 3; | |
1021 | if (verbosity < 0) | |
1022 | transport->verbose = -1; | |
1023 | ||
1024 | /** | |
1025 | * Rules used to determine whether to report progress (processing aborts | |
1026 | * when a rule is satisfied): | |
1027 | * | |
1028 | * . Report progress, if force_progress is 1 (ie. --progress). | |
1029 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). | |
1030 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). | |
1031 | * . Report progress if isatty(2) is 1. | |
1032 | **/ | |
1033 | if (force_progress >= 0) | |
1034 | transport->progress = !!force_progress; | |
1035 | else | |
1036 | transport->progress = verbosity >= 0 && isatty(2); | |
1037 | } | |
1038 | ||
1039 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) | |
1040 | { | |
1041 | int i; | |
1042 | ||
1043 | fprintf(stderr, _("The following submodule paths contain changes that can\n" | |
1044 | "not be found on any remote:\n")); | |
1045 | for (i = 0; i < needs_pushing->nr; i++) | |
1046 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); | |
1047 | fprintf(stderr, _("\nPlease try\n\n" | |
1048 | " git push --recurse-submodules=on-demand\n\n" | |
1049 | "or cd to the path and use\n\n" | |
1050 | " git push\n\n" | |
1051 | "to push them to a remote.\n\n")); | |
1052 | ||
1053 | string_list_clear(needs_pushing, 0); | |
1054 | ||
1055 | die(_("Aborting.")); | |
1056 | } | |
1057 | ||
1058 | static int run_pre_push_hook(struct transport *transport, | |
1059 | struct ref *remote_refs) | |
1060 | { | |
1061 | int ret = 0, x; | |
1062 | struct ref *r; | |
1063 | struct child_process proc = CHILD_PROCESS_INIT; | |
1064 | struct strbuf buf; | |
1065 | const char *argv[4]; | |
1066 | ||
1067 | if (!(argv[0] = find_hook("pre-push"))) | |
1068 | return 0; | |
1069 | ||
1070 | argv[1] = transport->remote->name; | |
1071 | argv[2] = transport->url; | |
1072 | argv[3] = NULL; | |
1073 | ||
1074 | proc.argv = argv; | |
1075 | proc.in = -1; | |
1076 | proc.trace2_hook_name = "pre-push"; | |
1077 | ||
1078 | if (start_command(&proc)) { | |
1079 | finish_command(&proc); | |
1080 | return -1; | |
1081 | } | |
1082 | ||
1083 | sigchain_push(SIGPIPE, SIG_IGN); | |
1084 | ||
1085 | strbuf_init(&buf, 256); | |
1086 | ||
1087 | for (r = remote_refs; r; r = r->next) { | |
1088 | if (!r->peer_ref) continue; | |
1089 | if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; | |
1090 | if (r->status == REF_STATUS_REJECT_STALE) continue; | |
1091 | if (r->status == REF_STATUS_UPTODATE) continue; | |
1092 | ||
1093 | strbuf_reset(&buf); | |
1094 | strbuf_addf( &buf, "%s %s %s %s\n", | |
1095 | r->peer_ref->name, oid_to_hex(&r->new_oid), | |
1096 | r->name, oid_to_hex(&r->old_oid)); | |
1097 | ||
1098 | if (write_in_full(proc.in, buf.buf, buf.len) < 0) { | |
1099 | /* We do not mind if a hook does not read all refs. */ | |
1100 | if (errno != EPIPE) | |
1101 | ret = -1; | |
1102 | break; | |
1103 | } | |
1104 | } | |
1105 | ||
1106 | strbuf_release(&buf); | |
1107 | ||
1108 | x = close(proc.in); | |
1109 | if (!ret) | |
1110 | ret = x; | |
1111 | ||
1112 | sigchain_pop(SIGPIPE); | |
1113 | ||
1114 | x = finish_command(&proc); | |
1115 | if (!ret) | |
1116 | ret = x; | |
1117 | ||
1118 | return ret; | |
1119 | } | |
1120 | ||
1121 | int transport_push(struct repository *r, | |
1122 | struct transport *transport, | |
1123 | struct refspec *rs, int flags, | |
1124 | unsigned int *reject_reasons) | |
1125 | { | |
1126 | *reject_reasons = 0; | |
1127 | ||
1128 | if (transport_color_config() < 0) | |
1129 | return -1; | |
1130 | ||
1131 | if (transport->vtable->push_refs) { | |
1132 | struct ref *remote_refs; | |
1133 | struct ref *local_refs = get_local_heads(); | |
1134 | int match_flags = MATCH_REFS_NONE; | |
1135 | int verbose = (transport->verbose > 0); | |
1136 | int quiet = (transport->verbose < 0); | |
1137 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; | |
1138 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; | |
1139 | int push_ret, ret, err; | |
1140 | struct argv_array ref_prefixes = ARGV_ARRAY_INIT; | |
1141 | ||
1142 | if (check_push_refs(local_refs, rs) < 0) | |
1143 | return -1; | |
1144 | ||
1145 | refspec_ref_prefixes(rs, &ref_prefixes); | |
1146 | ||
1147 | trace2_region_enter("transport_push", "get_refs_list", r); | |
1148 | remote_refs = transport->vtable->get_refs_list(transport, 1, | |
1149 | &ref_prefixes); | |
1150 | trace2_region_leave("transport_push", "get_refs_list", r); | |
1151 | ||
1152 | argv_array_clear(&ref_prefixes); | |
1153 | ||
1154 | if (flags & TRANSPORT_PUSH_ALL) | |
1155 | match_flags |= MATCH_REFS_ALL; | |
1156 | if (flags & TRANSPORT_PUSH_MIRROR) | |
1157 | match_flags |= MATCH_REFS_MIRROR; | |
1158 | if (flags & TRANSPORT_PUSH_PRUNE) | |
1159 | match_flags |= MATCH_REFS_PRUNE; | |
1160 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) | |
1161 | match_flags |= MATCH_REFS_FOLLOW_TAGS; | |
1162 | ||
1163 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) | |
1164 | return -1; | |
1165 | ||
1166 | if (transport->smart_options && | |
1167 | transport->smart_options->cas && | |
1168 | !is_empty_cas(transport->smart_options->cas)) | |
1169 | apply_push_cas(transport->smart_options->cas, | |
1170 | transport->remote, remote_refs); | |
1171 | ||
1172 | set_ref_status_for_push(remote_refs, | |
1173 | flags & TRANSPORT_PUSH_MIRROR, | |
1174 | flags & TRANSPORT_PUSH_FORCE); | |
1175 | ||
1176 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) | |
1177 | if (run_pre_push_hook(transport, remote_refs)) | |
1178 | return -1; | |
1179 | ||
1180 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | | |
1181 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
1182 | !is_bare_repository()) { | |
1183 | struct ref *ref = remote_refs; | |
1184 | struct oid_array commits = OID_ARRAY_INIT; | |
1185 | ||
1186 | trace2_region_enter("transport_push", "push_submodules", r); | |
1187 | for (; ref; ref = ref->next) | |
1188 | if (!is_null_oid(&ref->new_oid)) | |
1189 | oid_array_append(&commits, | |
1190 | &ref->new_oid); | |
1191 | ||
1192 | if (!push_unpushed_submodules(r, | |
1193 | &commits, | |
1194 | transport->remote, | |
1195 | rs, | |
1196 | transport->push_options, | |
1197 | pretend)) { | |
1198 | oid_array_clear(&commits); | |
1199 | trace2_region_leave("transport_push", "push_submodules", r); | |
1200 | die(_("failed to push all needed submodules")); | |
1201 | } | |
1202 | oid_array_clear(&commits); | |
1203 | trace2_region_leave("transport_push", "push_submodules", r); | |
1204 | } | |
1205 | ||
1206 | if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || | |
1207 | ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | | |
1208 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
1209 | !pretend)) && !is_bare_repository()) { | |
1210 | struct ref *ref = remote_refs; | |
1211 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; | |
1212 | struct oid_array commits = OID_ARRAY_INIT; | |
1213 | ||
1214 | trace2_region_enter("transport_push", "check_submodules", r); | |
1215 | for (; ref; ref = ref->next) | |
1216 | if (!is_null_oid(&ref->new_oid)) | |
1217 | oid_array_append(&commits, | |
1218 | &ref->new_oid); | |
1219 | ||
1220 | if (find_unpushed_submodules(r, | |
1221 | &commits, | |
1222 | transport->remote->name, | |
1223 | &needs_pushing)) { | |
1224 | oid_array_clear(&commits); | |
1225 | trace2_region_leave("transport_push", "check_submodules", r); | |
1226 | die_with_unpushed_submodules(&needs_pushing); | |
1227 | } | |
1228 | string_list_clear(&needs_pushing, 0); | |
1229 | oid_array_clear(&commits); | |
1230 | trace2_region_leave("transport_push", "check_submodules", r); | |
1231 | } | |
1232 | ||
1233 | if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { | |
1234 | trace2_region_enter("transport_push", "push_refs", r); | |
1235 | push_ret = transport->vtable->push_refs(transport, remote_refs, flags); | |
1236 | trace2_region_leave("transport_push", "push_refs", r); | |
1237 | } else | |
1238 | push_ret = 0; | |
1239 | err = push_had_errors(remote_refs); | |
1240 | ret = push_ret | err; | |
1241 | ||
1242 | if (!quiet || err) | |
1243 | transport_print_push_status(transport->url, remote_refs, | |
1244 | verbose | porcelain, porcelain, | |
1245 | reject_reasons); | |
1246 | ||
1247 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) | |
1248 | set_upstreams(transport, remote_refs, pretend); | |
1249 | ||
1250 | if (!(flags & (TRANSPORT_PUSH_DRY_RUN | | |
1251 | TRANSPORT_RECURSE_SUBMODULES_ONLY))) { | |
1252 | struct ref *ref; | |
1253 | for (ref = remote_refs; ref; ref = ref->next) | |
1254 | transport_update_tracking_ref(transport->remote, ref, verbose); | |
1255 | } | |
1256 | ||
1257 | if (porcelain && !push_ret) | |
1258 | puts("Done"); | |
1259 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) | |
1260 | fprintf(stderr, "Everything up-to-date\n"); | |
1261 | ||
1262 | return ret; | |
1263 | } | |
1264 | return 1; | |
1265 | } | |
1266 | ||
1267 | const struct ref *transport_get_remote_refs(struct transport *transport, | |
1268 | const struct argv_array *ref_prefixes) | |
1269 | { | |
1270 | if (!transport->got_remote_refs) { | |
1271 | transport->remote_refs = | |
1272 | transport->vtable->get_refs_list(transport, 0, | |
1273 | ref_prefixes); | |
1274 | transport->got_remote_refs = 1; | |
1275 | } | |
1276 | ||
1277 | return transport->remote_refs; | |
1278 | } | |
1279 | ||
1280 | int transport_fetch_refs(struct transport *transport, struct ref *refs) | |
1281 | { | |
1282 | int rc; | |
1283 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; | |
1284 | struct ref **heads = NULL; | |
1285 | struct ref *rm; | |
1286 | ||
1287 | for (rm = refs; rm; rm = rm->next) { | |
1288 | nr_refs++; | |
1289 | if (rm->peer_ref && | |
1290 | !is_null_oid(&rm->old_oid) && | |
1291 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) | |
1292 | continue; | |
1293 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); | |
1294 | heads[nr_heads++] = rm; | |
1295 | } | |
1296 | ||
1297 | if (!nr_heads) { | |
1298 | /* | |
1299 | * When deepening of a shallow repository is requested, | |
1300 | * then local and remote refs are likely to still be equal. | |
1301 | * Just feed them all to the fetch method in that case. | |
1302 | * This condition shouldn't be met in a non-deepening fetch | |
1303 | * (see builtin/fetch.c:quickfetch()). | |
1304 | */ | |
1305 | ALLOC_ARRAY(heads, nr_refs); | |
1306 | for (rm = refs; rm; rm = rm->next) | |
1307 | heads[nr_heads++] = rm; | |
1308 | } | |
1309 | ||
1310 | rc = transport->vtable->fetch(transport, nr_heads, heads); | |
1311 | ||
1312 | free(heads); | |
1313 | return rc; | |
1314 | } | |
1315 | ||
1316 | void transport_unlock_pack(struct transport *transport) | |
1317 | { | |
1318 | if (transport->pack_lockfile) { | |
1319 | unlink_or_warn(transport->pack_lockfile); | |
1320 | FREE_AND_NULL(transport->pack_lockfile); | |
1321 | } | |
1322 | } | |
1323 | ||
1324 | int transport_connect(struct transport *transport, const char *name, | |
1325 | const char *exec, int fd[2]) | |
1326 | { | |
1327 | if (transport->vtable->connect) | |
1328 | return transport->vtable->connect(transport, name, exec, fd); | |
1329 | else | |
1330 | die(_("operation not supported by protocol")); | |
1331 | } | |
1332 | ||
1333 | int transport_disconnect(struct transport *transport) | |
1334 | { | |
1335 | int ret = 0; | |
1336 | if (transport->vtable->disconnect) | |
1337 | ret = transport->vtable->disconnect(transport); | |
1338 | free(transport); | |
1339 | return ret; | |
1340 | } | |
1341 | ||
1342 | /* | |
1343 | * Strip username (and password) from a URL and return | |
1344 | * it in a newly allocated string. | |
1345 | */ | |
1346 | char *transport_anonymize_url(const char *url) | |
1347 | { | |
1348 | char *scheme_prefix, *anon_part; | |
1349 | size_t anon_len, prefix_len = 0; | |
1350 | ||
1351 | anon_part = strchr(url, '@'); | |
1352 | if (url_is_local_not_ssh(url) || !anon_part) | |
1353 | goto literal_copy; | |
1354 | ||
1355 | anon_len = strlen(++anon_part); | |
1356 | scheme_prefix = strstr(url, "://"); | |
1357 | if (!scheme_prefix) { | |
1358 | if (!strchr(anon_part, ':')) | |
1359 | /* cannot be "me@there:/path/name" */ | |
1360 | goto literal_copy; | |
1361 | } else { | |
1362 | const char *cp; | |
1363 | /* make sure scheme is reasonable */ | |
1364 | for (cp = url; cp < scheme_prefix; cp++) { | |
1365 | switch (*cp) { | |
1366 | /* RFC 1738 2.1 */ | |
1367 | case '+': case '.': case '-': | |
1368 | break; /* ok */ | |
1369 | default: | |
1370 | if (isalnum(*cp)) | |
1371 | break; | |
1372 | /* it isn't */ | |
1373 | goto literal_copy; | |
1374 | } | |
1375 | } | |
1376 | /* @ past the first slash does not count */ | |
1377 | cp = strchr(scheme_prefix + 3, '/'); | |
1378 | if (cp && cp < anon_part) | |
1379 | goto literal_copy; | |
1380 | prefix_len = scheme_prefix - url + 3; | |
1381 | } | |
1382 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, | |
1383 | (int)anon_len, anon_part); | |
1384 | literal_copy: | |
1385 | return xstrdup(url); | |
1386 | } |