]>
Commit | Line | Data |
---|---|---|
9b288516 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
9b288516 DB |
3 | #include "transport.h" |
4 | #include "run-command.h" | |
c29727d5 DB |
5 | #include "pkt-line.h" |
6 | #include "fetch-pack.h" | |
47a59185 JH |
7 | #include "remote.h" |
8 | #include "connect.h" | |
40cb4fab | 9 | #include "send-pack.h" |
c29727d5 | 10 | #include "walker.h" |
c7a8a162 | 11 | #include "bundle.h" |
cd547b48 JS |
12 | #include "dir.h" |
13 | #include "refs.h" | |
ec0cb496 | 14 | #include "refspec.h" |
e9fcd1e2 | 15 | #include "branch.h" |
638794cd | 16 | #include "url.h" |
d2b17b32 | 17 | #include "submodule.h" |
a762e51e | 18 | #include "string-list.h" |
fe299ec5 | 19 | #include "oid-array.h" |
af65f68c | 20 | #include "sigchain.h" |
e967ca38 | 21 | #include "transport-internal.h" |
ad6ac124 | 22 | #include "protocol.h" |
0d4a1321 | 23 | #include "object-store.h" |
960786e7 RD |
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 | } | |
cd547b48 | 74 | |
e9fcd1e2 IL |
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; | |
e9fcd1e2 IL |
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; | |
f4e54d02 | 93 | if (is_null_oid(&ref->new_oid)) |
e9fcd1e2 IL |
94 | continue; |
95 | ||
96 | /* Follow symbolic refs (mainly for HEAD). */ | |
97 | localname = ref->peer_ref->name; | |
98 | remotename = ref->name; | |
7695d118 | 99 | tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING, |
744c040b | 100 | NULL, &flag); |
e9fcd1e2 | 101 | if (tmp && flag & REF_ISSYMREF && |
59556548 | 102 | starts_with(tmp, "refs/heads/")) |
e9fcd1e2 IL |
103 | localname = tmp; |
104 | ||
105 | /* Both source and destination must be local branches. */ | |
59556548 | 106 | if (!localname || !starts_with(localname, "refs/heads/")) |
e9fcd1e2 | 107 | continue; |
59556548 | 108 | if (!remotename || !starts_with(remotename, "refs/heads/")) |
e9fcd1e2 IL |
109 | continue; |
110 | ||
111 | if (!pretend) | |
112 | install_branch_config(BRANCH_CONFIG_VERBOSE, | |
113 | localname + 11, transport->remote->name, | |
114 | remotename); | |
115 | else | |
7ab1d44f | 116 | printf(_("Would set upstream of '%s' to '%s' of '%s'\n"), |
e9fcd1e2 IL |
117 | localname + 11, remotename + 11, |
118 | transport->remote->name); | |
119 | } | |
120 | } | |
121 | ||
c7a8a162 JS |
122 | struct bundle_transport_data { |
123 | int fd; | |
124 | struct bundle_header header; | |
fddf2ebe | 125 | unsigned get_refs_from_bundle_called : 1; |
c7a8a162 JS |
126 | }; |
127 | ||
834cf34b BW |
128 | static struct ref *get_refs_from_bundle(struct transport *transport, |
129 | int for_push, | |
130 | const struct argv_array *ref_prefixes) | |
c7a8a162 JS |
131 | { |
132 | struct bundle_transport_data *data = transport->data; | |
133 | struct ref *result = NULL; | |
134 | int i; | |
135 | ||
64fcef2d DB |
136 | if (for_push) |
137 | return NULL; | |
138 | ||
fddf2ebe JT |
139 | data->get_refs_from_bundle_called = 1; |
140 | ||
c7a8a162 JS |
141 | if (data->fd > 0) |
142 | close(data->fd); | |
143 | data->fd = read_bundle_header(transport->url, &data->header); | |
144 | if (data->fd < 0) | |
68e39e41 | 145 | die(_("could not read bundle '%s'"), transport->url); |
c7a8a162 JS |
146 | for (i = 0; i < data->header.references.nr; i++) { |
147 | struct ref_list_entry *e = data->header.references.list + i; | |
59c69c0c | 148 | struct ref *ref = alloc_ref(e->name); |
b8607f35 | 149 | oidcpy(&ref->old_oid, &e->oid); |
c7a8a162 JS |
150 | ref->next = result; |
151 | result = ref; | |
152 | } | |
153 | return result; | |
154 | } | |
155 | ||
1788c39c | 156 | static int fetch_refs_from_bundle(struct transport *transport, |
e2842b39 | 157 | int nr_heads, struct ref **to_fetch) |
c7a8a162 JS |
158 | { |
159 | struct bundle_transport_data *data = transport->data; | |
fddf2ebe JT |
160 | |
161 | if (!data->get_refs_from_bundle_called) | |
162 | get_refs_from_bundle(transport, 0, NULL); | |
74ae4b63 | 163 | return unbundle(the_repository, &data->header, data->fd, |
be042aff | 164 | transport->progress ? BUNDLE_VERBOSE : 0); |
c7a8a162 JS |
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); | |
f4e95765 | 172 | free(data); |
c7a8a162 JS |
173 | return 0; |
174 | } | |
175 | ||
9b288516 | 176 | struct git_transport_data { |
aa5af974 | 177 | struct git_transport_options options; |
ba227857 DB |
178 | struct child_process *conn; |
179 | int fd[2]; | |
61b075bd | 180 | unsigned got_remote_heads : 1; |
432e9565 | 181 | enum protocol_version version; |
910650d2 | 182 | struct oid_array extra_have; |
183 | struct oid_array shallow; | |
9b288516 DB |
184 | }; |
185 | ||
aa5af974 | 186 | static int set_git_option(struct git_transport_options *opts, |
9b288516 DB |
187 | const char *name, const char *value) |
188 | { | |
c29727d5 | 189 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
aa5af974 | 190 | opts->uploadpack = value; |
c29727d5 DB |
191 | return 0; |
192 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { | |
aa5af974 | 193 | opts->receivepack = value; |
9b288516 DB |
194 | return 0; |
195 | } else if (!strcmp(name, TRANS_OPT_THIN)) { | |
aa5af974 | 196 | opts->thin = !!value; |
9b288516 | 197 | return 0; |
41fa7d2e | 198 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
aa5af974 | 199 | opts->followtags = !!value; |
41fa7d2e | 200 | return 0; |
c29727d5 | 201 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
aa5af974 | 202 | opts->keep = !!value; |
c29727d5 | 203 | return 0; |
48d25cae NTND |
204 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
205 | opts->update_shallow = !!value; | |
206 | return 0; | |
c29727d5 DB |
207 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
208 | if (!value) | |
aa5af974 | 209 | opts->depth = 0; |
e7622ce8 NTND |
210 | else { |
211 | char *end; | |
212 | opts->depth = strtol(value, &end, 0); | |
213 | if (*end) | |
7ab1d44f | 214 | die(_("transport: invalid depth option '%s'"), value); |
e7622ce8 | 215 | } |
c29727d5 | 216 | return 0; |
508ea882 NTND |
217 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { |
218 | opts->deepen_since = value; | |
219 | return 0; | |
a45a2600 NTND |
220 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { |
221 | opts->deepen_not = (const struct string_list *)value; | |
222 | return 0; | |
cccf74e2 NTND |
223 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { |
224 | opts->deepen_relative = !!value; | |
225 | return 0; | |
88e2f9ed JT |
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; | |
640d8b72 | 232 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { |
489fc9ee | 233 | list_objects_filter_die_if_populated(&opts->filter_options); |
640d8b72 JH |
234 | parse_list_objects_filter(&opts->filter_options, value); |
235 | return 0; | |
9b288516 DB |
236 | } |
237 | return 1; | |
238 | } | |
239 | ||
f3ee9ca5 | 240 | static int connect_setup(struct transport *transport, int for_push) |
ba227857 DB |
241 | { |
242 | struct git_transport_data *data = transport->data; | |
f3ee9ca5 | 243 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; |
61b075bd IL |
244 | |
245 | if (data->conn) | |
246 | return 0; | |
247 | ||
c915f11e EW |
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 | ||
5a277f3f JH |
254 | data->conn = git_connect(data->fd, transport->url, |
255 | for_push ? data->options.receivepack : | |
256 | data->options.uploadpack, | |
f3ee9ca5 | 257 | flags); |
61b075bd | 258 | |
ba227857 DB |
259 | return 0; |
260 | } | |
261 | ||
35eb8240 JT |
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 | ||
99bcb883 JT |
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) | |
c29727d5 DB |
282 | { |
283 | struct git_transport_data *data = transport->data; | |
ad6ac124 BW |
284 | struct ref *refs = NULL; |
285 | struct packet_reader reader; | |
c29727d5 | 286 | |
f3ee9ca5 | 287 | connect_setup(transport, for_push); |
ad6ac124 BW |
288 | |
289 | packet_reader_init(&reader, data->fd[0], NULL, 0, | |
290 | PACKET_READ_CHOMP_NEWLINE | | |
2d103c31 MS |
291 | PACKET_READ_GENTLE_ON_EOF | |
292 | PACKET_READ_DIE_ON_ERR_PACKET); | |
ad6ac124 | 293 | |
432e9565 BW |
294 | data->version = discover_version(&reader); |
295 | switch (data->version) { | |
8f6982b4 | 296 | case protocol_v2: |
99bcb883 JT |
297 | if (must_list_refs) |
298 | get_remote_refs(data->fd[1], &reader, &refs, for_push, | |
299 | ref_prefixes, | |
300 | transport->server_options); | |
8f6982b4 | 301 | break; |
ad6ac124 BW |
302 | case protocol_v1: |
303 | case protocol_v0: | |
35eb8240 | 304 | die_if_server_options(transport); |
ad6ac124 BW |
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 | } | |
61b075bd | 313 | data->got_remote_heads = 1; |
c29727d5 | 314 | |
99bcb883 JT |
315 | if (reader.line_peeked) |
316 | BUG("buffer must be empty at the end of handshake()"); | |
317 | ||
c29727d5 DB |
318 | return refs; |
319 | } | |
320 | ||
99bcb883 JT |
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 | ||
1788c39c | 327 | static int fetch_refs_via_pack(struct transport *transport, |
e2842b39 | 328 | int nr_heads, struct ref **to_fetch) |
c29727d5 | 329 | { |
e70a65c5 | 330 | int ret = 0; |
c29727d5 | 331 | struct git_transport_data *data = transport->data; |
432e9565 | 332 | struct ref *refs = NULL; |
c29727d5 | 333 | struct fetch_pack_args args; |
00183cbb | 334 | struct ref *refs_tmp = NULL; |
c29727d5 | 335 | |
fa740529 | 336 | memset(&args, 0, sizeof(args)); |
aa5af974 IL |
337 | args.uploadpack = data->options.uploadpack; |
338 | args.keep_pack = data->options.keep; | |
fa740529 | 339 | args.lock_pack = 1; |
aa5af974 IL |
340 | args.use_thin_pack = data->options.thin; |
341 | args.include_tag = data->options.followtags; | |
bd2c86ef | 342 | args.verbose = (transport->verbose > 1); |
fe8aa148 | 343 | args.quiet = (transport->verbose < 0); |
d01b3c02 | 344 | args.no_progress = !transport->progress; |
aa5af974 | 345 | args.depth = data->options.depth; |
508ea882 | 346 | args.deepen_since = data->options.deepen_since; |
a45a2600 | 347 | args.deepen_not = data->options.deepen_not; |
cccf74e2 | 348 | args.deepen_relative = data->options.deepen_relative; |
c6807a40 NTND |
349 | args.check_self_contained_and_connected = |
350 | data->options.check_self_contained_and_connected; | |
beea4152 | 351 | args.cloning = transport->cloning; |
48d25cae | 352 | args.update_shallow = data->options.update_shallow; |
88e2f9ed JT |
353 | args.from_promisor = data->options.from_promisor; |
354 | args.no_dependents = data->options.no_dependents; | |
640d8b72 | 355 | args.filter_options = data->options.filter_options; |
edc9caf7 | 356 | args.stateless_rpc = transport->stateless_rpc; |
5e3548ef | 357 | args.server_options = transport->server_options; |
3390e42a | 358 | args.negotiation_tips = data->options.negotiation_tips; |
c29727d5 | 359 | |
01775651 JT |
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 | } | |
ba227857 | 371 | |
dde72f94 | 372 | if (data->version == protocol_unknown_version) |
432e9565 | 373 | BUG("unknown protocol version"); |
dde72f94 DL |
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); | |
ba227857 | 381 | |
ba227857 DB |
382 | close(data->fd[0]); |
383 | close(data->fd[1]); | |
e70a65c5 MM |
384 | if (finish_connect(data->conn)) |
385 | ret = -1; | |
ba227857 | 386 | data->conn = NULL; |
61b075bd | 387 | data->got_remote_heads = 0; |
c6807a40 NTND |
388 | data->options.self_contained_and_connected = |
389 | args.self_contained_and_connected; | |
cf1e7c07 | 390 | data->options.connectivity_checked = args.connectivity_checked; |
c29727d5 | 391 | |
e70a65c5 MM |
392 | if (refs == NULL) |
393 | ret = -1; | |
394 | if (report_unmatched_refs(to_fetch, nr_heads)) | |
395 | ret = -1; | |
396 | ||
00183cbb | 397 | free_refs(refs_tmp); |
e2842b39 | 398 | free_refs(refs); |
e70a65c5 | 399 | return ret; |
c29727d5 DB |
400 | } |
401 | ||
481c7a6d JK |
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 | ||
f1863d0d | 417 | int transport_refs_pushed(struct ref *ref) |
64fcef2d DB |
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 | ||
f1863d0d | 431 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
64fcef2d | 432 | { |
0ad4a5ff | 433 | struct refspec_item rs; |
64fcef2d DB |
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) { | |
755b49ae | 445 | delete_ref(NULL, rs.dst, NULL, 0); |
64fcef2d | 446 | } else |
ae077771 | 447 | update_ref("update by push", rs.dst, &ref->new_oid, |
448 | NULL, 0, 0); | |
64fcef2d DB |
449 | free(rs.dst); |
450 | } | |
451 | } | |
452 | ||
7101e10c JH |
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) | |
64fcef2d | 456 | { |
1965ff74 LA |
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 { | |
960786e7 RD |
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); | |
1965ff74 LA |
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); | |
64fcef2d | 484 | } |
64fcef2d DB |
485 | } |
486 | ||
7101e10c | 487 | static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width) |
64fcef2d DB |
488 | { |
489 | if (ref->deletion) | |
7101e10c JH |
490 | print_ref_status('-', "[deleted]", ref, NULL, NULL, |
491 | porcelain, summary_width); | |
f4e54d02 | 492 | else if (is_null_oid(&ref->old_oid)) |
64fcef2d | 493 | print_ref_status('*', |
59556548 | 494 | (starts_with(ref->name, "refs/tags/") ? "[new tag]" : |
1965ff74 | 495 | "[new branch]"), |
7101e10c | 496 | ref, ref->peer_ref, NULL, porcelain, summary_width); |
64fcef2d | 497 | else { |
bd22d4ff | 498 | struct strbuf quickref = STRBUF_INIT; |
64fcef2d DB |
499 | char type; |
500 | const char *msg; | |
501 | ||
30e677e0 | 502 | strbuf_add_unique_abbrev(&quickref, &ref->old_oid, |
1eb47f16 | 503 | DEFAULT_ABBREV); |
5ece083f | 504 | if (ref->forced_update) { |
bd22d4ff | 505 | strbuf_addstr(&quickref, "..."); |
64fcef2d DB |
506 | type = '+'; |
507 | msg = "forced update"; | |
508 | } else { | |
bd22d4ff | 509 | strbuf_addstr(&quickref, ".."); |
64fcef2d DB |
510 | type = ' '; |
511 | msg = NULL; | |
512 | } | |
30e677e0 | 513 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, |
1eb47f16 | 514 | DEFAULT_ABBREV); |
64fcef2d | 515 | |
7101e10c JH |
516 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, |
517 | porcelain, summary_width); | |
bd22d4ff | 518 | strbuf_release(&quickref); |
64fcef2d DB |
519 | } |
520 | } | |
521 | ||
7101e10c JH |
522 | static int print_one_push_status(struct ref *ref, const char *dest, int count, |
523 | int porcelain, int summary_width) | |
64fcef2d | 524 | { |
882d49ca JK |
525 | if (!count) { |
526 | char *url = transport_anonymize_url(dest); | |
527 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); | |
528 | free(url); | |
529 | } | |
64fcef2d DB |
530 | |
531 | switch(ref->status) { | |
532 | case REF_STATUS_NONE: | |
7101e10c JH |
533 | print_ref_status('X', "[no match]", ref, NULL, NULL, |
534 | porcelain, summary_width); | |
64fcef2d DB |
535 | break; |
536 | case REF_STATUS_REJECT_NODELETE: | |
537 | print_ref_status('!', "[rejected]", ref, NULL, | |
7101e10c JH |
538 | "remote does not support deleting refs", |
539 | porcelain, summary_width); | |
64fcef2d DB |
540 | break; |
541 | case REF_STATUS_UPTODATE: | |
542 | print_ref_status('=', "[up to date]", ref, | |
7101e10c | 543 | ref->peer_ref, NULL, porcelain, summary_width); |
64fcef2d DB |
544 | break; |
545 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
546 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 547 | "non-fast-forward", porcelain, summary_width); |
64fcef2d | 548 | break; |
dbfeddb1 CR |
549 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
550 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 551 | "already exists", porcelain, summary_width); |
dbfeddb1 | 552 | break; |
75e5c0dc JH |
553 | case REF_STATUS_REJECT_FETCH_FIRST: |
554 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 555 | "fetch first", porcelain, summary_width); |
75e5c0dc JH |
556 | break; |
557 | case REF_STATUS_REJECT_NEEDS_FORCE: | |
558 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 559 | "needs force", porcelain, summary_width); |
75e5c0dc | 560 | break; |
631b5ef2 JH |
561 | case REF_STATUS_REJECT_STALE: |
562 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 563 | "stale info", porcelain, summary_width); |
631b5ef2 | 564 | break; |
4820a33b NTND |
565 | case REF_STATUS_REJECT_SHALLOW: |
566 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c JH |
567 | "new shallow roots not allowed", |
568 | porcelain, summary_width); | |
4820a33b | 569 | break; |
64fcef2d DB |
570 | case REF_STATUS_REMOTE_REJECT: |
571 | print_ref_status('!', "[remote rejected]", ref, | |
7101e10c JH |
572 | ref->deletion ? NULL : ref->peer_ref, |
573 | ref->remote_status, porcelain, summary_width); | |
64fcef2d DB |
574 | break; |
575 | case REF_STATUS_EXPECTING_REPORT: | |
576 | print_ref_status('!', "[remote failure]", ref, | |
7101e10c JH |
577 | ref->deletion ? NULL : ref->peer_ref, |
578 | "remote failed to report status", | |
579 | porcelain, summary_width); | |
64fcef2d | 580 | break; |
4ff17f10 RS |
581 | case REF_STATUS_ATOMIC_PUSH_FAILED: |
582 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 583 | "atomic push failed", porcelain, summary_width); |
4ff17f10 | 584 | break; |
64fcef2d | 585 | case REF_STATUS_OK: |
7101e10c | 586 | print_ok_ref_status(ref, porcelain, summary_width); |
64fcef2d DB |
587 | break; |
588 | } | |
589 | ||
590 | return 1; | |
591 | } | |
592 | ||
db98d9ba JH |
593 | static int measure_abbrev(const struct object_id *oid, int sofar) |
594 | { | |
dc01505f | 595 | char hex[GIT_MAX_HEXSZ + 1]; |
aab9583f | 596 | int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV); |
db98d9ba JH |
597 | |
598 | return (w < sofar) ? sofar : w; | |
599 | } | |
600 | ||
11fd66de JH |
601 | int transport_summary_width(const struct ref *refs) |
602 | { | |
db98d9ba JH |
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); | |
11fd66de JH |
612 | } |
613 | ||
f1863d0d | 614 | void transport_print_push_status(const char *dest, struct ref *refs, |
10643d4e | 615 | int verbose, int porcelain, unsigned int *reject_reasons) |
64fcef2d DB |
616 | { |
617 | struct ref *ref; | |
618 | int n = 0; | |
f25950f3 | 619 | char *head; |
11fd66de | 620 | int summary_width = transport_summary_width(refs); |
f25950f3 | 621 | |
960786e7 RD |
622 | if (transport_color_config() < 0) |
623 | warning(_("could not parse transport.color.* config")); | |
624 | ||
efbd4fdf | 625 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); |
64fcef2d DB |
626 | |
627 | if (verbose) { | |
628 | for (ref = refs; ref; ref = ref->next) | |
629 | if (ref->status == REF_STATUS_UPTODATE) | |
7101e10c JH |
630 | n += print_one_push_status(ref, dest, n, |
631 | porcelain, summary_width); | |
64fcef2d DB |
632 | } |
633 | ||
634 | for (ref = refs; ref; ref = ref->next) | |
635 | if (ref->status == REF_STATUS_OK) | |
7101e10c JH |
636 | n += print_one_push_status(ref, dest, n, |
637 | porcelain, summary_width); | |
64fcef2d | 638 | |
10643d4e | 639 | *reject_reasons = 0; |
64fcef2d DB |
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) | |
7101e10c JH |
644 | n += print_one_push_status(ref, dest, n, |
645 | porcelain, summary_width); | |
10643d4e | 646 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
1d2c14df | 647 | if (head != NULL && !strcmp(head, ref->name)) |
10643d4e | 648 | *reject_reasons |= REJECT_NON_FF_HEAD; |
f25950f3 | 649 | else |
10643d4e | 650 | *reject_reasons |= REJECT_NON_FF_OTHER; |
dbfeddb1 CR |
651 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
652 | *reject_reasons |= REJECT_ALREADY_EXISTS; | |
75e5c0dc JH |
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; | |
f25950f3 | 657 | } |
64fcef2d | 658 | } |
dc76c7f7 | 659 | free(head); |
64fcef2d DB |
660 | } |
661 | ||
64fcef2d | 662 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
f3fa1838 | 663 | { |
9b288516 | 664 | struct git_transport_data *data = transport->data; |
40cb4fab | 665 | struct send_pack_args args; |
432e9565 | 666 | int ret = 0; |
64fcef2d | 667 | |
960786e7 RD |
668 | if (transport_color_config() < 0) |
669 | return -1; | |
670 | ||
635365eb | 671 | if (!data->got_remote_heads) |
834cf34b | 672 | get_refs_via_connect(transport, 1, NULL); |
9b288516 | 673 | |
de1a2fdd | 674 | memset(&args, 0, sizeof(args)); |
94c89ba6 | 675 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
40cb4fab | 676 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
aa5af974 | 677 | args.use_thin_pack = data->options.thin; |
8afd8dc0 TRC |
678 | args.verbose = (transport->verbose > 0); |
679 | args.quiet = (transport->verbose < 0); | |
d7c411b7 | 680 | args.progress = transport->progress; |
40cb4fab | 681 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
77555854 | 682 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
d0e8e09c | 683 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); |
f6a4e61f | 684 | args.push_options = transport->push_options; |
9be89160 | 685 | args.url = transport->url; |
40cb4fab | 686 | |
30261094 DB |
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 | ||
432e9565 | 694 | switch (data->version) { |
8f6982b4 | 695 | case protocol_v2: |
68e39e41 | 696 | die(_("support for protocol v2 not implemented yet")); |
8f6982b4 | 697 | break; |
432e9565 BW |
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 | } | |
64fcef2d DB |
706 | |
707 | close(data->fd[1]); | |
708 | close(data->fd[0]); | |
7dcbeaa0 JX |
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); | |
64fcef2d | 718 | data->conn = NULL; |
61b075bd | 719 | data->got_remote_heads = 0; |
64fcef2d DB |
720 | |
721 | return ret; | |
9b288516 DB |
722 | } |
723 | ||
b236752a IL |
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 | ||
f4e95765 SP |
735 | static int disconnect_git(struct transport *transport) |
736 | { | |
ba227857 DB |
737 | struct git_transport_data *data = transport->data; |
738 | if (data->conn) { | |
4d8cab95 | 739 | if (data->got_remote_heads && !transport->stateless_rpc) |
61b075bd | 740 | packet_flush(data->fd[1]); |
ba227857 DB |
741 | close(data->fd[0]); |
742 | close(data->fd[1]); | |
743 | finish_connect(data->conn); | |
744 | } | |
745 | ||
746 | free(data); | |
f4e95765 SP |
747 | return 0; |
748 | } | |
749 | ||
e967ca38 JT |
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 | ||
61b075bd IL |
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) | |
033abf97 | 765 | BUG("taking over transport requires non-NULL " |
61b075bd IL |
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 | ||
e967ca38 | 776 | transport->vtable = &taken_over_vtable; |
61b075bd | 777 | transport->smart_options = &(data->options); |
b26ed430 JH |
778 | |
779 | transport->cannot_reuse = 1; | |
61b075bd IL |
780 | } |
781 | ||
9b288516 DB |
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 | ||
25d5cc48 IL |
790 | static int external_specification_len(const char *url) |
791 | { | |
792 | return strchr(url, ':') - url; | |
793 | } | |
794 | ||
5088d3b3 | 795 | static const struct string_list *protocol_whitelist(void) |
a5adaced | 796 | { |
5088d3b3 JK |
797 | static int enabled = -1; |
798 | static struct string_list allowed = STRING_LIST_INIT_DUP; | |
a5adaced | 799 | |
5088d3b3 JK |
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 | } | |
a5adaced | 813 | |
f1762d77 BW |
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) | |
5088d3b3 | 822 | { |
f1762d77 BW |
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 | ||
68e39e41 | 830 | die(_("unknown value for config '%s': %s"), key, value); |
5088d3b3 JK |
831 | } |
832 | ||
f1762d77 | 833 | static enum protocol_allow_config get_protocol_config(const char *type) |
5088d3b3 | 834 | { |
f1762d77 BW |
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; | |
5088d3b3 JK |
871 | } |
872 | ||
a768a022 | 873 | int is_transport_allowed(const char *type, int from_user) |
5088d3b3 | 874 | { |
f1762d77 BW |
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: | |
a768a022 BW |
885 | if (from_user < 0) |
886 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); | |
887 | return from_user; | |
f1762d77 BW |
888 | } |
889 | ||
033abf97 | 890 | BUG("invalid protocol_allow_config type"); |
5088d3b3 JK |
891 | } |
892 | ||
893 | void transport_check_allowed(const char *type) | |
894 | { | |
a768a022 | 895 | if (!is_transport_allowed(type, -1)) |
68e39e41 | 896 | die(_("transport '%s' not allowed"), type); |
a5adaced JK |
897 | } |
898 | ||
e967ca38 JT |
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 | ||
e5f4e214 | 917 | struct transport *transport_get(struct remote *remote, const char *url) |
9b288516 | 918 | { |
4da50460 | 919 | const char *helper; |
8eb554ae SP |
920 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
921 | ||
d01b3c02 TRC |
922 | ret->progress = isatty(2); |
923 | ||
c1d45cf7 | 924 | if (!remote) |
1a07e59c | 925 | BUG("No remote provided to transport_get()"); |
c1d45cf7 | 926 | |
b0d66e15 | 927 | ret->got_remote_refs = 0; |
8eb554ae | 928 | ret->remote = remote; |
4da50460 | 929 | helper = remote->foreign_vcs; |
fb0cc87e | 930 | |
cb21d8f0 | 931 | if (!url && remote->url) |
fb0cc87e | 932 | url = remote->url[0]; |
8eb554ae | 933 | ret->url = url; |
8eb554ae | 934 | |
87422439 JS |
935 | /* maybe it is a foreign URL? */ |
936 | if (url) { | |
937 | const char *p = url; | |
938 | ||
638794cd | 939 | while (is_urlschemechar(p == url, *p)) |
87422439 | 940 | p++; |
59556548 | 941 | if (starts_with(p, "::")) |
4da50460 | 942 | helper = xstrndup(url, p - url); |
87422439 JS |
943 | } |
944 | ||
4da50460 IL |
945 | if (helper) { |
946 | transport_helper_init(ret, helper); | |
59556548 | 947 | } else if (starts_with(url, "rsync:")) { |
68e39e41 | 948 | die(_("git-over-rsync is no longer supported")); |
c59ab2e5 | 949 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
c7a8a162 | 950 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
a5adaced | 951 | transport_check_allowed("file"); |
c7a8a162 | 952 | ret->data = data; |
e967ca38 | 953 | ret->vtable = &bundle_vtable; |
aa5af974 | 954 | ret->smart_options = NULL; |
25d5cc48 | 955 | } else if (!is_url(url) |
59556548 CC |
956 | || starts_with(url, "file://") |
957 | || starts_with(url, "git://") | |
958 | || starts_with(url, "ssh://") | |
07c7782c CMN |
959 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ |
960 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ | |
961 | ) { | |
a5adaced JK |
962 | /* |
963 | * These are builtin smart transports; "allowed" transports | |
964 | * will be checked individually in git_connect. | |
965 | */ | |
9b288516 | 966 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
9b288516 | 967 | ret->data = data; |
e967ca38 | 968 | ret->vtable = &builtin_smart_vtable; |
aa5af974 | 969 | ret->smart_options = &(data->options); |
824d5776 | 970 | |
ba227857 | 971 | data->conn = NULL; |
61b075bd | 972 | data->got_remote_heads = 0; |
25d5cc48 IL |
973 | } else { |
974 | /* Unknown protocol in URL. Pass to external handler. */ | |
975 | int len = external_specification_len(url); | |
6b33894f | 976 | char *handler = xmemdupz(url, len); |
25d5cc48 | 977 | transport_helper_init(ret, handler); |
9b288516 | 978 | } |
8eb554ae | 979 | |
aa5af974 IL |
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 | ||
9b288516 DB |
990 | return ret; |
991 | } | |
992 | ||
993 | int transport_set_option(struct transport *transport, | |
994 | const char *name, const char *value) | |
995 | { | |
aa5af974 IL |
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 | ||
e967ca38 JT |
1002 | if (transport->vtable->set_option) |
1003 | protocol_reports = transport->vtable->set_option(transport, | |
1004 | name, value); | |
aa5af974 IL |
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. */ | |
ab865e6e | 1013 | return 1; |
9b288516 DB |
1014 | } |
1015 | ||
d01b3c02 TRC |
1016 | void transport_set_verbosity(struct transport *transport, int verbosity, |
1017 | int force_progress) | |
bde873c5 | 1018 | { |
bd2c86ef | 1019 | if (verbosity >= 1) |
bde873c5 TRC |
1020 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
1021 | if (verbosity < 0) | |
1022 | transport->verbose = -1; | |
d01b3c02 TRC |
1023 | |
1024 | /** | |
1025 | * Rules used to determine whether to report progress (processing aborts | |
1026 | * when a rule is satisfied): | |
1027 | * | |
01fdc21f CB |
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. | |
d01b3c02 | 1032 | **/ |
01fdc21f CB |
1033 | if (force_progress >= 0) |
1034 | transport->progress = !!force_progress; | |
1035 | else | |
1036 | transport->progress = verbosity >= 0 && isatty(2); | |
bde873c5 TRC |
1037 | } |
1038 | ||
a762e51e HV |
1039 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
1040 | { | |
1041 | int i; | |
1042 | ||
7ab1d44f VA |
1043 | fprintf(stderr, _("The following submodule paths contain changes that can\n" |
1044 | "not be found on any remote:\n")); | |
a762e51e | 1045 | for (i = 0; i < needs_pushing->nr; i++) |
5cb5fe4a | 1046 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); |
7ab1d44f VA |
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")); | |
a762e51e HV |
1052 | |
1053 | string_list_clear(needs_pushing, 0); | |
1054 | ||
7ab1d44f | 1055 | die(_("Aborting.")); |
a762e51e HV |
1056 | } |
1057 | ||
ec55559f AS |
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; | |
d3180279 | 1063 | struct child_process proc = CHILD_PROCESS_INIT; |
ec55559f AS |
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 | ||
ec55559f AS |
1074 | proc.argv = argv; |
1075 | proc.in = -1; | |
6206286e | 1076 | proc.trace2_hook_name = "pre-push"; |
ec55559f AS |
1077 | |
1078 | if (start_command(&proc)) { | |
1079 | finish_command(&proc); | |
1080 | return -1; | |
1081 | } | |
1082 | ||
af65f68c CB |
1083 | sigchain_push(SIGPIPE, SIG_IGN); |
1084 | ||
ec55559f AS |
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; | |
631b5ef2 | 1090 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
ec55559f AS |
1091 | if (r->status == REF_STATUS_UPTODATE) continue; |
1092 | ||
1093 | strbuf_reset(&buf); | |
1094 | strbuf_addf( &buf, "%s %s %s %s\n", | |
f4e54d02 | 1095 | r->peer_ref->name, oid_to_hex(&r->new_oid), |
1096 | r->name, oid_to_hex(&r->old_oid)); | |
ec55559f | 1097 | |
af65f68c CB |
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; | |
ec55559f AS |
1102 | break; |
1103 | } | |
1104 | } | |
1105 | ||
1106 | strbuf_release(&buf); | |
1107 | ||
1108 | x = close(proc.in); | |
1109 | if (!ret) | |
1110 | ret = x; | |
1111 | ||
af65f68c CB |
1112 | sigchain_pop(SIGPIPE); |
1113 | ||
ec55559f AS |
1114 | x = finish_command(&proc); |
1115 | if (!ret) | |
1116 | ret = x; | |
1117 | ||
1118 | return ret; | |
1119 | } | |
1120 | ||
6c6d5d07 NTND |
1121 | int transport_push(struct repository *r, |
1122 | struct transport *transport, | |
306f22db | 1123 | struct refspec *rs, int flags, |
10643d4e | 1124 | unsigned int *reject_reasons) |
9b288516 | 1125 | { |
10643d4e | 1126 | *reject_reasons = 0; |
64fcef2d | 1127 | |
960786e7 RD |
1128 | if (transport_color_config() < 0) |
1129 | return -1; | |
1130 | ||
e967ca38 | 1131 | if (transport->vtable->push_refs) { |
ba928c13 | 1132 | struct ref *remote_refs; |
64fcef2d DB |
1133 | struct ref *local_refs = get_local_heads(); |
1134 | int match_flags = MATCH_REFS_NONE; | |
8afd8dc0 TRC |
1135 | int verbose = (transport->verbose > 0); |
1136 | int quiet = (transport->verbose < 0); | |
1965ff74 | 1137 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
e9fcd1e2 | 1138 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
77555854 | 1139 | int push_ret, ret, err; |
5b872fff | 1140 | struct argv_array ref_prefixes = ARGV_ARRAY_INIT; |
64fcef2d | 1141 | |
afb1aed4 | 1142 | if (check_push_refs(local_refs, rs) < 0) |
ba928c13 JK |
1143 | return -1; |
1144 | ||
6373cb59 | 1145 | refspec_ref_prefixes(rs, &ref_prefixes); |
5b872fff | 1146 | |
360c7ba3 | 1147 | trace2_region_enter("transport_push", "get_refs_list", r); |
5b872fff BW |
1148 | remote_refs = transport->vtable->get_refs_list(transport, 1, |
1149 | &ref_prefixes); | |
360c7ba3 | 1150 | trace2_region_leave("transport_push", "get_refs_list", r); |
5b872fff BW |
1151 | |
1152 | argv_array_clear(&ref_prefixes); | |
ba928c13 | 1153 | |
64fcef2d DB |
1154 | if (flags & TRANSPORT_PUSH_ALL) |
1155 | match_flags |= MATCH_REFS_ALL; | |
1156 | if (flags & TRANSPORT_PUSH_MIRROR) | |
1157 | match_flags |= MATCH_REFS_MIRROR; | |
6ddba5e2 FC |
1158 | if (flags & TRANSPORT_PUSH_PRUNE) |
1159 | match_flags |= MATCH_REFS_PRUNE; | |
c2aba155 JH |
1160 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) |
1161 | match_flags |= MATCH_REFS_FOLLOW_TAGS; | |
64fcef2d | 1162 | |
5c7ec846 | 1163 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) |
64fcef2d | 1164 | return -1; |
64fcef2d | 1165 | |
91048a95 JH |
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 | ||
20e8b465 TRC |
1172 | set_ref_status_for_push(remote_refs, |
1173 | flags & TRANSPORT_PUSH_MIRROR, | |
1174 | flags & TRANSPORT_PUSH_FORCE); | |
1175 | ||
ec55559f AS |
1176 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) |
1177 | if (run_pre_push_hook(transport, remote_refs)) | |
1178 | return -1; | |
1179 | ||
225e8bf7 BW |
1180 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
1181 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
1182 | !is_bare_repository()) { | |
d2b17b32 | 1183 | struct ref *ref = remote_refs; |
910650d2 | 1184 | struct oid_array commits = OID_ARRAY_INIT; |
9cfa1c26 | 1185 | |
360c7ba3 | 1186 | trace2_region_enter("transport_push", "push_submodules", r); |
d2b17b32 | 1187 | for (; ref; ref = ref->next) |
9cfa1c26 | 1188 | if (!is_null_oid(&ref->new_oid)) |
910650d2 | 1189 | oid_array_append(&commits, |
98a72ddc | 1190 | &ref->new_oid); |
9cfa1c26 | 1191 | |
6c6d5d07 | 1192 | if (!push_unpushed_submodules(r, |
174d131f | 1193 | &commits, |
06bf4ad1 | 1194 | transport->remote, |
60fba4bf | 1195 | rs, |
2a90556d | 1196 | transport->push_options, |
0301c821 | 1197 | pretend)) { |
910650d2 | 1198 | oid_array_clear(&commits); |
360c7ba3 | 1199 | trace2_region_leave("transport_push", "push_submodules", r); |
68e39e41 | 1200 | die(_("failed to push all needed submodules")); |
9cfa1c26 | 1201 | } |
910650d2 | 1202 | oid_array_clear(&commits); |
360c7ba3 | 1203 | trace2_region_leave("transport_push", "push_submodules", r); |
eb21c732 HV |
1204 | } |
1205 | ||
0301c821 | 1206 | if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || |
225e8bf7 BW |
1207 | ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
1208 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
0301c821 | 1209 | !pretend)) && !is_bare_repository()) { |
d2b17b32 | 1210 | struct ref *ref = remote_refs; |
f93d7c6f | 1211 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; |
910650d2 | 1212 | struct oid_array commits = OID_ARRAY_INIT; |
a762e51e | 1213 | |
360c7ba3 | 1214 | trace2_region_enter("transport_push", "check_submodules", r); |
d2b17b32 | 1215 | for (; ref; ref = ref->next) |
9cfa1c26 | 1216 | if (!is_null_oid(&ref->new_oid)) |
910650d2 | 1217 | oid_array_append(&commits, |
98a72ddc | 1218 | &ref->new_oid); |
9cfa1c26 | 1219 | |
6c6d5d07 | 1220 | if (find_unpushed_submodules(r, |
174d131f NTND |
1221 | &commits, |
1222 | transport->remote->name, | |
1223 | &needs_pushing)) { | |
910650d2 | 1224 | oid_array_clear(&commits); |
360c7ba3 | 1225 | trace2_region_leave("transport_push", "check_submodules", r); |
9cfa1c26 HV |
1226 | die_with_unpushed_submodules(&needs_pushing); |
1227 | } | |
1228 | string_list_clear(&needs_pushing, 0); | |
910650d2 | 1229 | oid_array_clear(&commits); |
360c7ba3 | 1230 | trace2_region_leave("transport_push", "check_submodules", r); |
d2b17b32 FG |
1231 | } |
1232 | ||
25e4b809 | 1233 | if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { |
360c7ba3 | 1234 | trace2_region_enter("transport_push", "push_refs", r); |
e967ca38 | 1235 | push_ret = transport->vtable->push_refs(transport, remote_refs, flags); |
360c7ba3 | 1236 | trace2_region_leave("transport_push", "push_refs", r); |
25e4b809 | 1237 | } else |
225e8bf7 | 1238 | push_ret = 0; |
42328267 | 1239 | err = push_had_errors(remote_refs); |
77555854 | 1240 | ret = push_ret | err; |
64fcef2d | 1241 | |
42328267 | 1242 | if (!quiet || err) |
f1863d0d | 1243 | transport_print_push_status(transport->url, remote_refs, |
6ffd7812 | 1244 | verbose | porcelain, porcelain, |
10643d4e | 1245 | reject_reasons); |
64fcef2d | 1246 | |
e9fcd1e2 IL |
1247 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
1248 | set_upstreams(transport, remote_refs, pretend); | |
1249 | ||
225e8bf7 BW |
1250 | if (!(flags & (TRANSPORT_PUSH_DRY_RUN | |
1251 | TRANSPORT_RECURSE_SUBMODULES_ONLY))) { | |
64fcef2d DB |
1252 | struct ref *ref; |
1253 | for (ref = remote_refs; ref; ref = ref->next) | |
f1863d0d | 1254 | transport_update_tracking_ref(transport->remote, ref, verbose); |
64fcef2d DB |
1255 | } |
1256 | ||
77555854 LA |
1257 | if (porcelain && !push_ret) |
1258 | puts("Done"); | |
66bce02e | 1259 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
64fcef2d | 1260 | fprintf(stderr, "Everything up-to-date\n"); |
77555854 | 1261 | |
64fcef2d DB |
1262 | return ret; |
1263 | } | |
1264 | return 1; | |
9b288516 DB |
1265 | } |
1266 | ||
1af8ae1c BW |
1267 | const struct ref *transport_get_remote_refs(struct transport *transport, |
1268 | const struct argv_array *ref_prefixes) | |
c29727d5 | 1269 | { |
b0d66e15 | 1270 | if (!transport->got_remote_refs) { |
1af8ae1c BW |
1271 | transport->remote_refs = |
1272 | transport->vtable->get_refs_list(transport, 0, | |
1273 | ref_prefixes); | |
b0d66e15 TRC |
1274 | transport->got_remote_refs = 1; |
1275 | } | |
61b075bd | 1276 | |
c29727d5 DB |
1277 | return transport->remote_refs; |
1278 | } | |
1279 | ||
e2842b39 | 1280 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
c29727d5 | 1281 | { |
425b1393 | 1282 | int rc; |
86386829 | 1283 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
37148311 DB |
1284 | struct ref **heads = NULL; |
1285 | struct ref *rm; | |
c29727d5 DB |
1286 | |
1287 | for (rm = refs; rm; rm = rm->next) { | |
86386829 | 1288 | nr_refs++; |
c29727d5 | 1289 | if (rm->peer_ref && |
f4e54d02 | 1290 | !is_null_oid(&rm->old_oid) && |
4a7e27e9 | 1291 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) |
c29727d5 | 1292 | continue; |
7a2bff45 | 1293 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
425b1393 | 1294 | heads[nr_heads++] = rm; |
c29727d5 DB |
1295 | } |
1296 | ||
86386829 NP |
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 | |
09b7e220 | 1303 | * (see builtin/fetch.c:quickfetch()). |
86386829 | 1304 | */ |
b32fa95f | 1305 | ALLOC_ARRAY(heads, nr_refs); |
86386829 NP |
1306 | for (rm = refs; rm; rm = rm->next) |
1307 | heads[nr_heads++] = rm; | |
1308 | } | |
1309 | ||
e2842b39 | 1310 | rc = transport->vtable->fetch(transport, nr_heads, heads); |
61b075bd | 1311 | |
c29727d5 | 1312 | free(heads); |
425b1393 | 1313 | return rc; |
c29727d5 DB |
1314 | } |
1315 | ||
1788c39c SP |
1316 | void transport_unlock_pack(struct transport *transport) |
1317 | { | |
1318 | if (transport->pack_lockfile) { | |
691f1a28 | 1319 | unlink_or_warn(transport->pack_lockfile); |
6a83d902 | 1320 | FREE_AND_NULL(transport->pack_lockfile); |
1788c39c SP |
1321 | } |
1322 | } | |
1323 | ||
b236752a IL |
1324 | int transport_connect(struct transport *transport, const char *name, |
1325 | const char *exec, int fd[2]) | |
1326 | { | |
e967ca38 JT |
1327 | if (transport->vtable->connect) |
1328 | return transport->vtable->connect(transport, name, exec, fd); | |
b236752a | 1329 | else |
68e39e41 | 1330 | die(_("operation not supported by protocol")); |
b236752a IL |
1331 | } |
1332 | ||
9b288516 DB |
1333 | int transport_disconnect(struct transport *transport) |
1334 | { | |
1335 | int ret = 0; | |
e967ca38 JT |
1336 | if (transport->vtable->disconnect) |
1337 | ret = transport->vtable->disconnect(transport); | |
9b288516 DB |
1338 | free(transport); |
1339 | return ret; | |
1340 | } | |
47abd85b AE |
1341 | |
1342 | /* | |
a7793a74 | 1343 | * Strip username (and password) from a URL and return |
47abd85b AE |
1344 | * it in a newly allocated string. |
1345 | */ | |
1346 | char *transport_anonymize_url(const char *url) | |
1347 | { | |
21f9d0f6 | 1348 | char *scheme_prefix, *anon_part; |
47abd85b AE |
1349 | size_t anon_len, prefix_len = 0; |
1350 | ||
1351 | anon_part = strchr(url, '@'); | |
c59ab2e5 | 1352 | if (url_is_local_not_ssh(url) || !anon_part) |
47abd85b AE |
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 | } | |
21f9d0f6 JK |
1382 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, |
1383 | (int)anon_len, anon_part); | |
47abd85b AE |
1384 | literal_copy: |
1385 | return xstrdup(url); | |
1386 | } |