]>
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" |
13eb4626 | 19 | #include "sha1-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; | |
125 | }; | |
126 | ||
834cf34b BW |
127 | static struct ref *get_refs_from_bundle(struct transport *transport, |
128 | int for_push, | |
129 | const struct argv_array *ref_prefixes) | |
c7a8a162 JS |
130 | { |
131 | struct bundle_transport_data *data = transport->data; | |
132 | struct ref *result = NULL; | |
133 | int i; | |
134 | ||
64fcef2d DB |
135 | if (for_push) |
136 | return NULL; | |
137 | ||
c7a8a162 JS |
138 | if (data->fd > 0) |
139 | close(data->fd); | |
140 | data->fd = read_bundle_header(transport->url, &data->header); | |
141 | if (data->fd < 0) | |
68e39e41 | 142 | die(_("could not read bundle '%s'"), transport->url); |
c7a8a162 JS |
143 | for (i = 0; i < data->header.references.nr; i++) { |
144 | struct ref_list_entry *e = data->header.references.list + i; | |
59c69c0c | 145 | struct ref *ref = alloc_ref(e->name); |
b8607f35 | 146 | oidcpy(&ref->old_oid, &e->oid); |
c7a8a162 JS |
147 | ref->next = result; |
148 | result = ref; | |
149 | } | |
150 | return result; | |
151 | } | |
152 | ||
1788c39c | 153 | static int fetch_refs_from_bundle(struct transport *transport, |
e2842b39 | 154 | int nr_heads, struct ref **to_fetch) |
c7a8a162 JS |
155 | { |
156 | struct bundle_transport_data *data = transport->data; | |
74ae4b63 | 157 | return unbundle(the_repository, &data->header, data->fd, |
be042aff | 158 | transport->progress ? BUNDLE_VERBOSE : 0); |
c7a8a162 JS |
159 | } |
160 | ||
161 | static int close_bundle(struct transport *transport) | |
162 | { | |
163 | struct bundle_transport_data *data = transport->data; | |
164 | if (data->fd > 0) | |
165 | close(data->fd); | |
f4e95765 | 166 | free(data); |
c7a8a162 JS |
167 | return 0; |
168 | } | |
169 | ||
9b288516 | 170 | struct git_transport_data { |
aa5af974 | 171 | struct git_transport_options options; |
ba227857 DB |
172 | struct child_process *conn; |
173 | int fd[2]; | |
61b075bd | 174 | unsigned got_remote_heads : 1; |
432e9565 | 175 | enum protocol_version version; |
910650d2 | 176 | struct oid_array extra_have; |
177 | struct oid_array shallow; | |
9b288516 DB |
178 | }; |
179 | ||
aa5af974 | 180 | static int set_git_option(struct git_transport_options *opts, |
9b288516 DB |
181 | const char *name, const char *value) |
182 | { | |
c29727d5 | 183 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
aa5af974 | 184 | opts->uploadpack = value; |
c29727d5 DB |
185 | return 0; |
186 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { | |
aa5af974 | 187 | opts->receivepack = value; |
9b288516 DB |
188 | return 0; |
189 | } else if (!strcmp(name, TRANS_OPT_THIN)) { | |
aa5af974 | 190 | opts->thin = !!value; |
9b288516 | 191 | return 0; |
41fa7d2e | 192 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
aa5af974 | 193 | opts->followtags = !!value; |
41fa7d2e | 194 | return 0; |
c29727d5 | 195 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
aa5af974 | 196 | opts->keep = !!value; |
c29727d5 | 197 | return 0; |
48d25cae NTND |
198 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
199 | opts->update_shallow = !!value; | |
200 | return 0; | |
c29727d5 DB |
201 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
202 | if (!value) | |
aa5af974 | 203 | opts->depth = 0; |
e7622ce8 NTND |
204 | else { |
205 | char *end; | |
206 | opts->depth = strtol(value, &end, 0); | |
207 | if (*end) | |
7ab1d44f | 208 | die(_("transport: invalid depth option '%s'"), value); |
e7622ce8 | 209 | } |
c29727d5 | 210 | return 0; |
508ea882 NTND |
211 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { |
212 | opts->deepen_since = value; | |
213 | return 0; | |
a45a2600 NTND |
214 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { |
215 | opts->deepen_not = (const struct string_list *)value; | |
216 | return 0; | |
cccf74e2 NTND |
217 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { |
218 | opts->deepen_relative = !!value; | |
219 | return 0; | |
88e2f9ed JT |
220 | } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { |
221 | opts->from_promisor = !!value; | |
222 | return 0; | |
223 | } else if (!strcmp(name, TRANS_OPT_NO_DEPENDENTS)) { | |
224 | opts->no_dependents = !!value; | |
225 | return 0; | |
640d8b72 JH |
226 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { |
227 | parse_list_objects_filter(&opts->filter_options, value); | |
228 | return 0; | |
9b288516 DB |
229 | } |
230 | return 1; | |
231 | } | |
232 | ||
f3ee9ca5 | 233 | static int connect_setup(struct transport *transport, int for_push) |
ba227857 DB |
234 | { |
235 | struct git_transport_data *data = transport->data; | |
f3ee9ca5 | 236 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; |
61b075bd IL |
237 | |
238 | if (data->conn) | |
239 | return 0; | |
240 | ||
c915f11e EW |
241 | switch (transport->family) { |
242 | case TRANSPORT_FAMILY_ALL: break; | |
243 | case TRANSPORT_FAMILY_IPV4: flags |= CONNECT_IPV4; break; | |
244 | case TRANSPORT_FAMILY_IPV6: flags |= CONNECT_IPV6; break; | |
245 | } | |
246 | ||
5a277f3f JH |
247 | data->conn = git_connect(data->fd, transport->url, |
248 | for_push ? data->options.receivepack : | |
249 | data->options.uploadpack, | |
f3ee9ca5 | 250 | flags); |
61b075bd | 251 | |
ba227857 DB |
252 | return 0; |
253 | } | |
254 | ||
99bcb883 JT |
255 | /* |
256 | * Obtains the protocol version from the transport and writes it to | |
257 | * transport->data->version, first connecting if not already connected. | |
258 | * | |
259 | * If the protocol version is one that allows skipping the listing of remote | |
260 | * refs, and must_list_refs is 0, the listing of remote refs is skipped and | |
261 | * this function returns NULL. Otherwise, this function returns the list of | |
262 | * remote refs. | |
263 | */ | |
264 | static struct ref *handshake(struct transport *transport, int for_push, | |
265 | const struct argv_array *ref_prefixes, | |
266 | int must_list_refs) | |
c29727d5 DB |
267 | { |
268 | struct git_transport_data *data = transport->data; | |
ad6ac124 BW |
269 | struct ref *refs = NULL; |
270 | struct packet_reader reader; | |
c29727d5 | 271 | |
f3ee9ca5 | 272 | connect_setup(transport, for_push); |
ad6ac124 BW |
273 | |
274 | packet_reader_init(&reader, data->fd[0], NULL, 0, | |
275 | PACKET_READ_CHOMP_NEWLINE | | |
2d103c31 MS |
276 | PACKET_READ_GENTLE_ON_EOF | |
277 | PACKET_READ_DIE_ON_ERR_PACKET); | |
ad6ac124 | 278 | |
432e9565 BW |
279 | data->version = discover_version(&reader); |
280 | switch (data->version) { | |
8f6982b4 | 281 | case protocol_v2: |
99bcb883 JT |
282 | if (must_list_refs) |
283 | get_remote_refs(data->fd[1], &reader, &refs, for_push, | |
284 | ref_prefixes, | |
285 | transport->server_options); | |
8f6982b4 | 286 | break; |
ad6ac124 BW |
287 | case protocol_v1: |
288 | case protocol_v0: | |
289 | get_remote_heads(&reader, &refs, | |
290 | for_push ? REF_NORMAL : 0, | |
291 | &data->extra_have, | |
292 | &data->shallow); | |
293 | break; | |
294 | case protocol_unknown_version: | |
295 | BUG("unknown protocol version"); | |
296 | } | |
61b075bd | 297 | data->got_remote_heads = 1; |
c29727d5 | 298 | |
99bcb883 JT |
299 | if (reader.line_peeked) |
300 | BUG("buffer must be empty at the end of handshake()"); | |
301 | ||
c29727d5 DB |
302 | return refs; |
303 | } | |
304 | ||
99bcb883 JT |
305 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push, |
306 | const struct argv_array *ref_prefixes) | |
307 | { | |
308 | return handshake(transport, for_push, ref_prefixes, 1); | |
309 | } | |
310 | ||
1788c39c | 311 | static int fetch_refs_via_pack(struct transport *transport, |
e2842b39 | 312 | int nr_heads, struct ref **to_fetch) |
c29727d5 | 313 | { |
e70a65c5 | 314 | int ret = 0; |
c29727d5 | 315 | struct git_transport_data *data = transport->data; |
432e9565 | 316 | struct ref *refs = NULL; |
c29727d5 | 317 | struct fetch_pack_args args; |
00183cbb | 318 | struct ref *refs_tmp = NULL; |
c29727d5 | 319 | |
fa740529 | 320 | memset(&args, 0, sizeof(args)); |
aa5af974 IL |
321 | args.uploadpack = data->options.uploadpack; |
322 | args.keep_pack = data->options.keep; | |
fa740529 | 323 | args.lock_pack = 1; |
aa5af974 IL |
324 | args.use_thin_pack = data->options.thin; |
325 | args.include_tag = data->options.followtags; | |
bd2c86ef | 326 | args.verbose = (transport->verbose > 1); |
fe8aa148 | 327 | args.quiet = (transport->verbose < 0); |
d01b3c02 | 328 | args.no_progress = !transport->progress; |
aa5af974 | 329 | args.depth = data->options.depth; |
508ea882 | 330 | args.deepen_since = data->options.deepen_since; |
a45a2600 | 331 | args.deepen_not = data->options.deepen_not; |
cccf74e2 | 332 | args.deepen_relative = data->options.deepen_relative; |
c6807a40 NTND |
333 | args.check_self_contained_and_connected = |
334 | data->options.check_self_contained_and_connected; | |
beea4152 | 335 | args.cloning = transport->cloning; |
48d25cae | 336 | args.update_shallow = data->options.update_shallow; |
88e2f9ed JT |
337 | args.from_promisor = data->options.from_promisor; |
338 | args.no_dependents = data->options.no_dependents; | |
640d8b72 | 339 | args.filter_options = data->options.filter_options; |
edc9caf7 | 340 | args.stateless_rpc = transport->stateless_rpc; |
5e3548ef | 341 | args.server_options = transport->server_options; |
3390e42a | 342 | args.negotiation_tips = data->options.negotiation_tips; |
c29727d5 | 343 | |
01775651 JT |
344 | if (!data->got_remote_heads) { |
345 | int i; | |
346 | int must_list_refs = 0; | |
347 | for (i = 0; i < nr_heads; i++) { | |
348 | if (!to_fetch[i]->exact_oid) { | |
349 | must_list_refs = 1; | |
350 | break; | |
351 | } | |
352 | } | |
353 | refs_tmp = handshake(transport, 0, NULL, must_list_refs); | |
354 | } | |
ba227857 | 355 | |
432e9565 | 356 | switch (data->version) { |
8f6982b4 | 357 | case protocol_v2: |
0f804b0b | 358 | refs = fetch_pack(&args, data->fd, |
685fbd32 | 359 | refs_tmp ? refs_tmp : transport->remote_refs, |
0f804b0b | 360 | to_fetch, nr_heads, &data->shallow, |
685fbd32 | 361 | &transport->pack_lockfile, data->version); |
8f6982b4 | 362 | break; |
432e9565 BW |
363 | case protocol_v1: |
364 | case protocol_v0: | |
0f804b0b | 365 | refs = fetch_pack(&args, data->fd, |
432e9565 | 366 | refs_tmp ? refs_tmp : transport->remote_refs, |
0f804b0b | 367 | to_fetch, nr_heads, &data->shallow, |
685fbd32 | 368 | &transport->pack_lockfile, data->version); |
432e9565 BW |
369 | break; |
370 | case protocol_unknown_version: | |
371 | BUG("unknown protocol version"); | |
ba227857 DB |
372 | } |
373 | ||
ba227857 DB |
374 | close(data->fd[0]); |
375 | close(data->fd[1]); | |
e70a65c5 MM |
376 | if (finish_connect(data->conn)) |
377 | ret = -1; | |
ba227857 | 378 | data->conn = NULL; |
61b075bd | 379 | data->got_remote_heads = 0; |
c6807a40 NTND |
380 | data->options.self_contained_and_connected = |
381 | args.self_contained_and_connected; | |
cf1e7c07 | 382 | data->options.connectivity_checked = args.connectivity_checked; |
c29727d5 | 383 | |
e70a65c5 MM |
384 | if (refs == NULL) |
385 | ret = -1; | |
386 | if (report_unmatched_refs(to_fetch, nr_heads)) | |
387 | ret = -1; | |
388 | ||
00183cbb | 389 | free_refs(refs_tmp); |
e2842b39 | 390 | free_refs(refs); |
e70a65c5 | 391 | return ret; |
c29727d5 DB |
392 | } |
393 | ||
481c7a6d JK |
394 | static int push_had_errors(struct ref *ref) |
395 | { | |
396 | for (; ref; ref = ref->next) { | |
397 | switch (ref->status) { | |
398 | case REF_STATUS_NONE: | |
399 | case REF_STATUS_UPTODATE: | |
400 | case REF_STATUS_OK: | |
401 | break; | |
402 | default: | |
403 | return 1; | |
404 | } | |
405 | } | |
406 | return 0; | |
407 | } | |
408 | ||
f1863d0d | 409 | int transport_refs_pushed(struct ref *ref) |
64fcef2d DB |
410 | { |
411 | for (; ref; ref = ref->next) { | |
412 | switch(ref->status) { | |
413 | case REF_STATUS_NONE: | |
414 | case REF_STATUS_UPTODATE: | |
415 | break; | |
416 | default: | |
417 | return 1; | |
418 | } | |
419 | } | |
420 | return 0; | |
421 | } | |
422 | ||
f1863d0d | 423 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
64fcef2d | 424 | { |
0ad4a5ff | 425 | struct refspec_item rs; |
64fcef2d DB |
426 | |
427 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) | |
428 | return; | |
429 | ||
430 | rs.src = ref->name; | |
431 | rs.dst = NULL; | |
432 | ||
433 | if (!remote_find_tracking(remote, &rs)) { | |
434 | if (verbose) | |
435 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); | |
436 | if (ref->deletion) { | |
755b49ae | 437 | delete_ref(NULL, rs.dst, NULL, 0); |
64fcef2d | 438 | } else |
ae077771 | 439 | update_ref("update by push", rs.dst, &ref->new_oid, |
440 | NULL, 0, 0); | |
64fcef2d DB |
441 | free(rs.dst); |
442 | } | |
443 | } | |
444 | ||
7101e10c JH |
445 | static void print_ref_status(char flag, const char *summary, |
446 | struct ref *to, struct ref *from, const char *msg, | |
447 | int porcelain, int summary_width) | |
64fcef2d | 448 | { |
1965ff74 LA |
449 | if (porcelain) { |
450 | if (from) | |
451 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); | |
452 | else | |
453 | fprintf(stdout, "%c\t:%s\t", flag, to->name); | |
454 | if (msg) | |
455 | fprintf(stdout, "%s (%s)\n", summary, msg); | |
456 | else | |
457 | fprintf(stdout, "%s\n", summary); | |
458 | } else { | |
960786e7 RD |
459 | const char *red = "", *reset = ""; |
460 | if (push_had_errors(to)) { | |
461 | red = transport_get_color(TRANSPORT_COLOR_REJECTED); | |
462 | reset = transport_get_color(TRANSPORT_COLOR_RESET); | |
463 | } | |
464 | fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width, | |
465 | summary, reset); | |
1965ff74 LA |
466 | if (from) |
467 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); | |
468 | else | |
469 | fputs(prettify_refname(to->name), stderr); | |
470 | if (msg) { | |
471 | fputs(" (", stderr); | |
472 | fputs(msg, stderr); | |
473 | fputc(')', stderr); | |
474 | } | |
475 | fputc('\n', stderr); | |
64fcef2d | 476 | } |
64fcef2d DB |
477 | } |
478 | ||
7101e10c | 479 | static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width) |
64fcef2d DB |
480 | { |
481 | if (ref->deletion) | |
7101e10c JH |
482 | print_ref_status('-', "[deleted]", ref, NULL, NULL, |
483 | porcelain, summary_width); | |
f4e54d02 | 484 | else if (is_null_oid(&ref->old_oid)) |
64fcef2d | 485 | print_ref_status('*', |
59556548 | 486 | (starts_with(ref->name, "refs/tags/") ? "[new tag]" : |
1965ff74 | 487 | "[new branch]"), |
7101e10c | 488 | ref, ref->peer_ref, NULL, porcelain, summary_width); |
64fcef2d | 489 | else { |
bd22d4ff | 490 | struct strbuf quickref = STRBUF_INIT; |
64fcef2d DB |
491 | char type; |
492 | const char *msg; | |
493 | ||
30e677e0 | 494 | strbuf_add_unique_abbrev(&quickref, &ref->old_oid, |
1eb47f16 | 495 | DEFAULT_ABBREV); |
5ece083f | 496 | if (ref->forced_update) { |
bd22d4ff | 497 | strbuf_addstr(&quickref, "..."); |
64fcef2d DB |
498 | type = '+'; |
499 | msg = "forced update"; | |
500 | } else { | |
bd22d4ff | 501 | strbuf_addstr(&quickref, ".."); |
64fcef2d DB |
502 | type = ' '; |
503 | msg = NULL; | |
504 | } | |
30e677e0 | 505 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, |
1eb47f16 | 506 | DEFAULT_ABBREV); |
64fcef2d | 507 | |
7101e10c JH |
508 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, |
509 | porcelain, summary_width); | |
bd22d4ff | 510 | strbuf_release(&quickref); |
64fcef2d DB |
511 | } |
512 | } | |
513 | ||
7101e10c JH |
514 | static int print_one_push_status(struct ref *ref, const char *dest, int count, |
515 | int porcelain, int summary_width) | |
64fcef2d | 516 | { |
882d49ca JK |
517 | if (!count) { |
518 | char *url = transport_anonymize_url(dest); | |
519 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); | |
520 | free(url); | |
521 | } | |
64fcef2d DB |
522 | |
523 | switch(ref->status) { | |
524 | case REF_STATUS_NONE: | |
7101e10c JH |
525 | print_ref_status('X', "[no match]", ref, NULL, NULL, |
526 | porcelain, summary_width); | |
64fcef2d DB |
527 | break; |
528 | case REF_STATUS_REJECT_NODELETE: | |
529 | print_ref_status('!', "[rejected]", ref, NULL, | |
7101e10c JH |
530 | "remote does not support deleting refs", |
531 | porcelain, summary_width); | |
64fcef2d DB |
532 | break; |
533 | case REF_STATUS_UPTODATE: | |
534 | print_ref_status('=', "[up to date]", ref, | |
7101e10c | 535 | ref->peer_ref, NULL, porcelain, summary_width); |
64fcef2d DB |
536 | break; |
537 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
538 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 539 | "non-fast-forward", porcelain, summary_width); |
64fcef2d | 540 | break; |
dbfeddb1 CR |
541 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
542 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 543 | "already exists", porcelain, summary_width); |
dbfeddb1 | 544 | break; |
75e5c0dc JH |
545 | case REF_STATUS_REJECT_FETCH_FIRST: |
546 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 547 | "fetch first", porcelain, summary_width); |
75e5c0dc JH |
548 | break; |
549 | case REF_STATUS_REJECT_NEEDS_FORCE: | |
550 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 551 | "needs force", porcelain, summary_width); |
75e5c0dc | 552 | break; |
631b5ef2 JH |
553 | case REF_STATUS_REJECT_STALE: |
554 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 555 | "stale info", porcelain, summary_width); |
631b5ef2 | 556 | break; |
4820a33b NTND |
557 | case REF_STATUS_REJECT_SHALLOW: |
558 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c JH |
559 | "new shallow roots not allowed", |
560 | porcelain, summary_width); | |
4820a33b | 561 | break; |
64fcef2d DB |
562 | case REF_STATUS_REMOTE_REJECT: |
563 | print_ref_status('!', "[remote rejected]", ref, | |
7101e10c JH |
564 | ref->deletion ? NULL : ref->peer_ref, |
565 | ref->remote_status, porcelain, summary_width); | |
64fcef2d DB |
566 | break; |
567 | case REF_STATUS_EXPECTING_REPORT: | |
568 | print_ref_status('!', "[remote failure]", ref, | |
7101e10c JH |
569 | ref->deletion ? NULL : ref->peer_ref, |
570 | "remote failed to report status", | |
571 | porcelain, summary_width); | |
64fcef2d | 572 | break; |
4ff17f10 RS |
573 | case REF_STATUS_ATOMIC_PUSH_FAILED: |
574 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 575 | "atomic push failed", porcelain, summary_width); |
4ff17f10 | 576 | break; |
64fcef2d | 577 | case REF_STATUS_OK: |
7101e10c | 578 | print_ok_ref_status(ref, porcelain, summary_width); |
64fcef2d DB |
579 | break; |
580 | } | |
581 | ||
582 | return 1; | |
583 | } | |
584 | ||
db98d9ba JH |
585 | static int measure_abbrev(const struct object_id *oid, int sofar) |
586 | { | |
dc01505f | 587 | char hex[GIT_MAX_HEXSZ + 1]; |
aab9583f | 588 | int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV); |
db98d9ba JH |
589 | |
590 | return (w < sofar) ? sofar : w; | |
591 | } | |
592 | ||
11fd66de JH |
593 | int transport_summary_width(const struct ref *refs) |
594 | { | |
db98d9ba JH |
595 | int maxw = -1; |
596 | ||
597 | for (; refs; refs = refs->next) { | |
598 | maxw = measure_abbrev(&refs->old_oid, maxw); | |
599 | maxw = measure_abbrev(&refs->new_oid, maxw); | |
600 | } | |
601 | if (maxw < 0) | |
602 | maxw = FALLBACK_DEFAULT_ABBREV; | |
603 | return (2 * maxw + 3); | |
11fd66de JH |
604 | } |
605 | ||
f1863d0d | 606 | void transport_print_push_status(const char *dest, struct ref *refs, |
10643d4e | 607 | int verbose, int porcelain, unsigned int *reject_reasons) |
64fcef2d DB |
608 | { |
609 | struct ref *ref; | |
610 | int n = 0; | |
f25950f3 | 611 | char *head; |
11fd66de | 612 | int summary_width = transport_summary_width(refs); |
f25950f3 | 613 | |
960786e7 RD |
614 | if (transport_color_config() < 0) |
615 | warning(_("could not parse transport.color.* config")); | |
616 | ||
efbd4fdf | 617 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); |
64fcef2d DB |
618 | |
619 | if (verbose) { | |
620 | for (ref = refs; ref; ref = ref->next) | |
621 | if (ref->status == REF_STATUS_UPTODATE) | |
7101e10c JH |
622 | n += print_one_push_status(ref, dest, n, |
623 | porcelain, summary_width); | |
64fcef2d DB |
624 | } |
625 | ||
626 | for (ref = refs; ref; ref = ref->next) | |
627 | if (ref->status == REF_STATUS_OK) | |
7101e10c JH |
628 | n += print_one_push_status(ref, dest, n, |
629 | porcelain, summary_width); | |
64fcef2d | 630 | |
10643d4e | 631 | *reject_reasons = 0; |
64fcef2d DB |
632 | for (ref = refs; ref; ref = ref->next) { |
633 | if (ref->status != REF_STATUS_NONE && | |
634 | ref->status != REF_STATUS_UPTODATE && | |
635 | ref->status != REF_STATUS_OK) | |
7101e10c JH |
636 | n += print_one_push_status(ref, dest, n, |
637 | porcelain, summary_width); | |
10643d4e | 638 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
1d2c14df | 639 | if (head != NULL && !strcmp(head, ref->name)) |
10643d4e | 640 | *reject_reasons |= REJECT_NON_FF_HEAD; |
f25950f3 | 641 | else |
10643d4e | 642 | *reject_reasons |= REJECT_NON_FF_OTHER; |
dbfeddb1 CR |
643 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
644 | *reject_reasons |= REJECT_ALREADY_EXISTS; | |
75e5c0dc JH |
645 | } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { |
646 | *reject_reasons |= REJECT_FETCH_FIRST; | |
647 | } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { | |
648 | *reject_reasons |= REJECT_NEEDS_FORCE; | |
f25950f3 | 649 | } |
64fcef2d | 650 | } |
dc76c7f7 | 651 | free(head); |
64fcef2d DB |
652 | } |
653 | ||
64fcef2d | 654 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
f3fa1838 | 655 | { |
9b288516 | 656 | struct git_transport_data *data = transport->data; |
40cb4fab | 657 | struct send_pack_args args; |
432e9565 | 658 | int ret = 0; |
64fcef2d | 659 | |
960786e7 RD |
660 | if (transport_color_config() < 0) |
661 | return -1; | |
662 | ||
635365eb | 663 | if (!data->got_remote_heads) |
834cf34b | 664 | get_refs_via_connect(transport, 1, NULL); |
9b288516 | 665 | |
de1a2fdd | 666 | memset(&args, 0, sizeof(args)); |
94c89ba6 | 667 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
40cb4fab | 668 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
aa5af974 | 669 | args.use_thin_pack = data->options.thin; |
8afd8dc0 TRC |
670 | args.verbose = (transport->verbose > 0); |
671 | args.quiet = (transport->verbose < 0); | |
d7c411b7 | 672 | args.progress = transport->progress; |
40cb4fab | 673 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
77555854 | 674 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
d0e8e09c | 675 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); |
f6a4e61f | 676 | args.push_options = transport->push_options; |
9be89160 | 677 | args.url = transport->url; |
40cb4fab | 678 | |
30261094 DB |
679 | if (flags & TRANSPORT_PUSH_CERT_ALWAYS) |
680 | args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS; | |
681 | else if (flags & TRANSPORT_PUSH_CERT_IF_ASKED) | |
682 | args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED; | |
683 | else | |
684 | args.push_cert = SEND_PACK_PUSH_CERT_NEVER; | |
685 | ||
432e9565 | 686 | switch (data->version) { |
8f6982b4 | 687 | case protocol_v2: |
68e39e41 | 688 | die(_("support for protocol v2 not implemented yet")); |
8f6982b4 | 689 | break; |
432e9565 BW |
690 | case protocol_v1: |
691 | case protocol_v0: | |
692 | ret = send_pack(&args, data->fd, data->conn, remote_refs, | |
693 | &data->extra_have); | |
694 | break; | |
695 | case protocol_unknown_version: | |
696 | BUG("unknown protocol version"); | |
697 | } | |
64fcef2d DB |
698 | |
699 | close(data->fd[1]); | |
700 | close(data->fd[0]); | |
701 | ret |= finish_connect(data->conn); | |
702 | data->conn = NULL; | |
61b075bd | 703 | data->got_remote_heads = 0; |
64fcef2d DB |
704 | |
705 | return ret; | |
9b288516 DB |
706 | } |
707 | ||
b236752a IL |
708 | static int connect_git(struct transport *transport, const char *name, |
709 | const char *executable, int fd[2]) | |
710 | { | |
711 | struct git_transport_data *data = transport->data; | |
712 | data->conn = git_connect(data->fd, transport->url, | |
713 | executable, 0); | |
714 | fd[0] = data->fd[0]; | |
715 | fd[1] = data->fd[1]; | |
716 | return 0; | |
717 | } | |
718 | ||
f4e95765 SP |
719 | static int disconnect_git(struct transport *transport) |
720 | { | |
ba227857 DB |
721 | struct git_transport_data *data = transport->data; |
722 | if (data->conn) { | |
61b075bd IL |
723 | if (data->got_remote_heads) |
724 | packet_flush(data->fd[1]); | |
ba227857 DB |
725 | close(data->fd[0]); |
726 | close(data->fd[1]); | |
727 | finish_connect(data->conn); | |
728 | } | |
729 | ||
730 | free(data); | |
f4e95765 SP |
731 | return 0; |
732 | } | |
733 | ||
e967ca38 | 734 | static struct transport_vtable taken_over_vtable = { |
6ab40557 | 735 | 1, |
e967ca38 JT |
736 | NULL, |
737 | get_refs_via_connect, | |
738 | fetch_refs_via_pack, | |
739 | git_transport_push, | |
740 | NULL, | |
741 | disconnect_git | |
742 | }; | |
743 | ||
61b075bd IL |
744 | void transport_take_over(struct transport *transport, |
745 | struct child_process *child) | |
746 | { | |
747 | struct git_transport_data *data; | |
748 | ||
749 | if (!transport->smart_options) | |
033abf97 | 750 | BUG("taking over transport requires non-NULL " |
61b075bd IL |
751 | "smart_options field."); |
752 | ||
753 | data = xcalloc(1, sizeof(*data)); | |
754 | data->options = *transport->smart_options; | |
755 | data->conn = child; | |
756 | data->fd[0] = data->conn->out; | |
757 | data->fd[1] = data->conn->in; | |
758 | data->got_remote_heads = 0; | |
759 | transport->data = data; | |
760 | ||
e967ca38 | 761 | transport->vtable = &taken_over_vtable; |
61b075bd | 762 | transport->smart_options = &(data->options); |
b26ed430 JH |
763 | |
764 | transport->cannot_reuse = 1; | |
61b075bd IL |
765 | } |
766 | ||
9b288516 DB |
767 | static int is_file(const char *url) |
768 | { | |
769 | struct stat buf; | |
770 | if (stat(url, &buf)) | |
771 | return 0; | |
772 | return S_ISREG(buf.st_mode); | |
773 | } | |
774 | ||
25d5cc48 IL |
775 | static int external_specification_len(const char *url) |
776 | { | |
777 | return strchr(url, ':') - url; | |
778 | } | |
779 | ||
5088d3b3 | 780 | static const struct string_list *protocol_whitelist(void) |
a5adaced | 781 | { |
5088d3b3 JK |
782 | static int enabled = -1; |
783 | static struct string_list allowed = STRING_LIST_INIT_DUP; | |
a5adaced | 784 | |
5088d3b3 JK |
785 | if (enabled < 0) { |
786 | const char *v = getenv("GIT_ALLOW_PROTOCOL"); | |
787 | if (v) { | |
788 | string_list_split(&allowed, v, ':', -1); | |
789 | string_list_sort(&allowed); | |
790 | enabled = 1; | |
791 | } else { | |
792 | enabled = 0; | |
793 | } | |
794 | } | |
795 | ||
796 | return enabled ? &allowed : NULL; | |
797 | } | |
a5adaced | 798 | |
f1762d77 BW |
799 | enum protocol_allow_config { |
800 | PROTOCOL_ALLOW_NEVER = 0, | |
801 | PROTOCOL_ALLOW_USER_ONLY, | |
802 | PROTOCOL_ALLOW_ALWAYS | |
803 | }; | |
804 | ||
805 | static enum protocol_allow_config parse_protocol_config(const char *key, | |
806 | const char *value) | |
5088d3b3 | 807 | { |
f1762d77 BW |
808 | if (!strcasecmp(value, "always")) |
809 | return PROTOCOL_ALLOW_ALWAYS; | |
810 | else if (!strcasecmp(value, "never")) | |
811 | return PROTOCOL_ALLOW_NEVER; | |
812 | else if (!strcasecmp(value, "user")) | |
813 | return PROTOCOL_ALLOW_USER_ONLY; | |
814 | ||
68e39e41 | 815 | die(_("unknown value for config '%s': %s"), key, value); |
5088d3b3 JK |
816 | } |
817 | ||
f1762d77 | 818 | static enum protocol_allow_config get_protocol_config(const char *type) |
5088d3b3 | 819 | { |
f1762d77 BW |
820 | char *key = xstrfmt("protocol.%s.allow", type); |
821 | char *value; | |
822 | ||
823 | /* first check the per-protocol config */ | |
824 | if (!git_config_get_string(key, &value)) { | |
825 | enum protocol_allow_config ret = | |
826 | parse_protocol_config(key, value); | |
827 | free(key); | |
828 | free(value); | |
829 | return ret; | |
830 | } | |
831 | free(key); | |
832 | ||
833 | /* if defined, fallback to user-defined default for unknown protocols */ | |
834 | if (!git_config_get_string("protocol.allow", &value)) { | |
835 | enum protocol_allow_config ret = | |
836 | parse_protocol_config("protocol.allow", value); | |
837 | free(value); | |
838 | return ret; | |
839 | } | |
840 | ||
841 | /* fallback to built-in defaults */ | |
842 | /* known safe */ | |
843 | if (!strcmp(type, "http") || | |
844 | !strcmp(type, "https") || | |
845 | !strcmp(type, "git") || | |
846 | !strcmp(type, "ssh") || | |
847 | !strcmp(type, "file")) | |
848 | return PROTOCOL_ALLOW_ALWAYS; | |
849 | ||
850 | /* known scary; err on the side of caution */ | |
851 | if (!strcmp(type, "ext")) | |
852 | return PROTOCOL_ALLOW_NEVER; | |
853 | ||
854 | /* unknown; by default let them be used only directly by the user */ | |
855 | return PROTOCOL_ALLOW_USER_ONLY; | |
5088d3b3 JK |
856 | } |
857 | ||
a768a022 | 858 | int is_transport_allowed(const char *type, int from_user) |
5088d3b3 | 859 | { |
f1762d77 BW |
860 | const struct string_list *whitelist = protocol_whitelist(); |
861 | if (whitelist) | |
862 | return string_list_has_string(whitelist, type); | |
863 | ||
864 | switch (get_protocol_config(type)) { | |
865 | case PROTOCOL_ALLOW_ALWAYS: | |
866 | return 1; | |
867 | case PROTOCOL_ALLOW_NEVER: | |
868 | return 0; | |
869 | case PROTOCOL_ALLOW_USER_ONLY: | |
a768a022 BW |
870 | if (from_user < 0) |
871 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); | |
872 | return from_user; | |
f1762d77 BW |
873 | } |
874 | ||
033abf97 | 875 | BUG("invalid protocol_allow_config type"); |
5088d3b3 JK |
876 | } |
877 | ||
878 | void transport_check_allowed(const char *type) | |
879 | { | |
a768a022 | 880 | if (!is_transport_allowed(type, -1)) |
68e39e41 | 881 | die(_("transport '%s' not allowed"), type); |
a5adaced JK |
882 | } |
883 | ||
e967ca38 | 884 | static struct transport_vtable bundle_vtable = { |
6ab40557 | 885 | 0, |
e967ca38 JT |
886 | NULL, |
887 | get_refs_from_bundle, | |
888 | fetch_refs_from_bundle, | |
889 | NULL, | |
890 | NULL, | |
891 | close_bundle | |
892 | }; | |
893 | ||
894 | static struct transport_vtable builtin_smart_vtable = { | |
6ab40557 | 895 | 1, |
e967ca38 JT |
896 | NULL, |
897 | get_refs_via_connect, | |
898 | fetch_refs_via_pack, | |
899 | git_transport_push, | |
900 | connect_git, | |
901 | disconnect_git | |
902 | }; | |
903 | ||
e5f4e214 | 904 | struct transport *transport_get(struct remote *remote, const char *url) |
9b288516 | 905 | { |
4da50460 | 906 | const char *helper; |
8eb554ae SP |
907 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
908 | ||
d01b3c02 TRC |
909 | ret->progress = isatty(2); |
910 | ||
c1d45cf7 | 911 | if (!remote) |
1a07e59c | 912 | BUG("No remote provided to transport_get()"); |
c1d45cf7 | 913 | |
b0d66e15 | 914 | ret->got_remote_refs = 0; |
8eb554ae | 915 | ret->remote = remote; |
4da50460 | 916 | helper = remote->foreign_vcs; |
fb0cc87e | 917 | |
cb21d8f0 | 918 | if (!url && remote->url) |
fb0cc87e | 919 | url = remote->url[0]; |
8eb554ae | 920 | ret->url = url; |
8eb554ae | 921 | |
87422439 JS |
922 | /* maybe it is a foreign URL? */ |
923 | if (url) { | |
924 | const char *p = url; | |
925 | ||
638794cd | 926 | while (is_urlschemechar(p == url, *p)) |
87422439 | 927 | p++; |
59556548 | 928 | if (starts_with(p, "::")) |
4da50460 | 929 | helper = xstrndup(url, p - url); |
87422439 JS |
930 | } |
931 | ||
4da50460 IL |
932 | if (helper) { |
933 | transport_helper_init(ret, helper); | |
59556548 | 934 | } else if (starts_with(url, "rsync:")) { |
68e39e41 | 935 | die(_("git-over-rsync is no longer supported")); |
c59ab2e5 | 936 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
c7a8a162 | 937 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
a5adaced | 938 | transport_check_allowed("file"); |
c7a8a162 | 939 | ret->data = data; |
e967ca38 | 940 | ret->vtable = &bundle_vtable; |
aa5af974 | 941 | ret->smart_options = NULL; |
25d5cc48 | 942 | } else if (!is_url(url) |
59556548 CC |
943 | || starts_with(url, "file://") |
944 | || starts_with(url, "git://") | |
945 | || starts_with(url, "ssh://") | |
07c7782c CMN |
946 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ |
947 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ | |
948 | ) { | |
a5adaced JK |
949 | /* |
950 | * These are builtin smart transports; "allowed" transports | |
951 | * will be checked individually in git_connect. | |
952 | */ | |
9b288516 | 953 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
9b288516 | 954 | ret->data = data; |
e967ca38 | 955 | ret->vtable = &builtin_smart_vtable; |
aa5af974 | 956 | ret->smart_options = &(data->options); |
824d5776 | 957 | |
ba227857 | 958 | data->conn = NULL; |
61b075bd | 959 | data->got_remote_heads = 0; |
25d5cc48 IL |
960 | } else { |
961 | /* Unknown protocol in URL. Pass to external handler. */ | |
962 | int len = external_specification_len(url); | |
6b33894f | 963 | char *handler = xmemdupz(url, len); |
25d5cc48 | 964 | transport_helper_init(ret, handler); |
9b288516 | 965 | } |
8eb554ae | 966 | |
aa5af974 IL |
967 | if (ret->smart_options) { |
968 | ret->smart_options->thin = 1; | |
969 | ret->smart_options->uploadpack = "git-upload-pack"; | |
970 | if (remote->uploadpack) | |
971 | ret->smart_options->uploadpack = remote->uploadpack; | |
972 | ret->smart_options->receivepack = "git-receive-pack"; | |
973 | if (remote->receivepack) | |
974 | ret->smart_options->receivepack = remote->receivepack; | |
975 | } | |
976 | ||
9b288516 DB |
977 | return ret; |
978 | } | |
979 | ||
980 | int transport_set_option(struct transport *transport, | |
981 | const char *name, const char *value) | |
982 | { | |
aa5af974 IL |
983 | int git_reports = 1, protocol_reports = 1; |
984 | ||
985 | if (transport->smart_options) | |
986 | git_reports = set_git_option(transport->smart_options, | |
987 | name, value); | |
988 | ||
e967ca38 JT |
989 | if (transport->vtable->set_option) |
990 | protocol_reports = transport->vtable->set_option(transport, | |
991 | name, value); | |
aa5af974 IL |
992 | |
993 | /* If either report is 0, report 0 (success). */ | |
994 | if (!git_reports || !protocol_reports) | |
995 | return 0; | |
996 | /* If either reports -1 (invalid value), report -1. */ | |
997 | if ((git_reports == -1) || (protocol_reports == -1)) | |
998 | return -1; | |
999 | /* Otherwise if both report unknown, report unknown. */ | |
ab865e6e | 1000 | return 1; |
9b288516 DB |
1001 | } |
1002 | ||
d01b3c02 TRC |
1003 | void transport_set_verbosity(struct transport *transport, int verbosity, |
1004 | int force_progress) | |
bde873c5 | 1005 | { |
bd2c86ef | 1006 | if (verbosity >= 1) |
bde873c5 TRC |
1007 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
1008 | if (verbosity < 0) | |
1009 | transport->verbose = -1; | |
d01b3c02 TRC |
1010 | |
1011 | /** | |
1012 | * Rules used to determine whether to report progress (processing aborts | |
1013 | * when a rule is satisfied): | |
1014 | * | |
01fdc21f CB |
1015 | * . Report progress, if force_progress is 1 (ie. --progress). |
1016 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). | |
1017 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). | |
1018 | * . Report progress if isatty(2) is 1. | |
d01b3c02 | 1019 | **/ |
01fdc21f CB |
1020 | if (force_progress >= 0) |
1021 | transport->progress = !!force_progress; | |
1022 | else | |
1023 | transport->progress = verbosity >= 0 && isatty(2); | |
bde873c5 TRC |
1024 | } |
1025 | ||
a762e51e HV |
1026 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
1027 | { | |
1028 | int i; | |
1029 | ||
7ab1d44f VA |
1030 | fprintf(stderr, _("The following submodule paths contain changes that can\n" |
1031 | "not be found on any remote:\n")); | |
a762e51e | 1032 | for (i = 0; i < needs_pushing->nr; i++) |
5cb5fe4a | 1033 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); |
7ab1d44f VA |
1034 | fprintf(stderr, _("\nPlease try\n\n" |
1035 | " git push --recurse-submodules=on-demand\n\n" | |
1036 | "or cd to the path and use\n\n" | |
1037 | " git push\n\n" | |
1038 | "to push them to a remote.\n\n")); | |
a762e51e HV |
1039 | |
1040 | string_list_clear(needs_pushing, 0); | |
1041 | ||
7ab1d44f | 1042 | die(_("Aborting.")); |
a762e51e HV |
1043 | } |
1044 | ||
ec55559f AS |
1045 | static int run_pre_push_hook(struct transport *transport, |
1046 | struct ref *remote_refs) | |
1047 | { | |
1048 | int ret = 0, x; | |
1049 | struct ref *r; | |
d3180279 | 1050 | struct child_process proc = CHILD_PROCESS_INIT; |
ec55559f AS |
1051 | struct strbuf buf; |
1052 | const char *argv[4]; | |
1053 | ||
1054 | if (!(argv[0] = find_hook("pre-push"))) | |
1055 | return 0; | |
1056 | ||
1057 | argv[1] = transport->remote->name; | |
1058 | argv[2] = transport->url; | |
1059 | argv[3] = NULL; | |
1060 | ||
ec55559f AS |
1061 | proc.argv = argv; |
1062 | proc.in = -1; | |
6206286e | 1063 | proc.trace2_hook_name = "pre-push"; |
ec55559f AS |
1064 | |
1065 | if (start_command(&proc)) { | |
1066 | finish_command(&proc); | |
1067 | return -1; | |
1068 | } | |
1069 | ||
af65f68c CB |
1070 | sigchain_push(SIGPIPE, SIG_IGN); |
1071 | ||
ec55559f AS |
1072 | strbuf_init(&buf, 256); |
1073 | ||
1074 | for (r = remote_refs; r; r = r->next) { | |
1075 | if (!r->peer_ref) continue; | |
1076 | if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; | |
631b5ef2 | 1077 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
ec55559f AS |
1078 | if (r->status == REF_STATUS_UPTODATE) continue; |
1079 | ||
1080 | strbuf_reset(&buf); | |
1081 | strbuf_addf( &buf, "%s %s %s %s\n", | |
f4e54d02 | 1082 | r->peer_ref->name, oid_to_hex(&r->new_oid), |
1083 | r->name, oid_to_hex(&r->old_oid)); | |
ec55559f | 1084 | |
af65f68c CB |
1085 | if (write_in_full(proc.in, buf.buf, buf.len) < 0) { |
1086 | /* We do not mind if a hook does not read all refs. */ | |
1087 | if (errno != EPIPE) | |
1088 | ret = -1; | |
ec55559f AS |
1089 | break; |
1090 | } | |
1091 | } | |
1092 | ||
1093 | strbuf_release(&buf); | |
1094 | ||
1095 | x = close(proc.in); | |
1096 | if (!ret) | |
1097 | ret = x; | |
1098 | ||
af65f68c CB |
1099 | sigchain_pop(SIGPIPE); |
1100 | ||
ec55559f AS |
1101 | x = finish_command(&proc); |
1102 | if (!ret) | |
1103 | ret = x; | |
1104 | ||
1105 | return ret; | |
1106 | } | |
1107 | ||
6c6d5d07 NTND |
1108 | int transport_push(struct repository *r, |
1109 | struct transport *transport, | |
306f22db | 1110 | struct refspec *rs, int flags, |
10643d4e | 1111 | unsigned int *reject_reasons) |
9b288516 | 1112 | { |
10643d4e | 1113 | *reject_reasons = 0; |
64fcef2d | 1114 | |
960786e7 RD |
1115 | if (transport_color_config() < 0) |
1116 | return -1; | |
1117 | ||
e967ca38 | 1118 | if (transport->vtable->push_refs) { |
ba928c13 | 1119 | struct ref *remote_refs; |
64fcef2d DB |
1120 | struct ref *local_refs = get_local_heads(); |
1121 | int match_flags = MATCH_REFS_NONE; | |
8afd8dc0 TRC |
1122 | int verbose = (transport->verbose > 0); |
1123 | int quiet = (transport->verbose < 0); | |
1965ff74 | 1124 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
e9fcd1e2 | 1125 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
77555854 | 1126 | int push_ret, ret, err; |
5b872fff | 1127 | struct argv_array ref_prefixes = ARGV_ARRAY_INIT; |
64fcef2d | 1128 | |
afb1aed4 | 1129 | if (check_push_refs(local_refs, rs) < 0) |
ba928c13 JK |
1130 | return -1; |
1131 | ||
6373cb59 | 1132 | refspec_ref_prefixes(rs, &ref_prefixes); |
5b872fff BW |
1133 | |
1134 | remote_refs = transport->vtable->get_refs_list(transport, 1, | |
1135 | &ref_prefixes); | |
1136 | ||
1137 | argv_array_clear(&ref_prefixes); | |
ba928c13 | 1138 | |
64fcef2d DB |
1139 | if (flags & TRANSPORT_PUSH_ALL) |
1140 | match_flags |= MATCH_REFS_ALL; | |
1141 | if (flags & TRANSPORT_PUSH_MIRROR) | |
1142 | match_flags |= MATCH_REFS_MIRROR; | |
6ddba5e2 FC |
1143 | if (flags & TRANSPORT_PUSH_PRUNE) |
1144 | match_flags |= MATCH_REFS_PRUNE; | |
c2aba155 JH |
1145 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) |
1146 | match_flags |= MATCH_REFS_FOLLOW_TAGS; | |
64fcef2d | 1147 | |
5c7ec846 | 1148 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) |
64fcef2d | 1149 | return -1; |
64fcef2d | 1150 | |
91048a95 JH |
1151 | if (transport->smart_options && |
1152 | transport->smart_options->cas && | |
1153 | !is_empty_cas(transport->smart_options->cas)) | |
1154 | apply_push_cas(transport->smart_options->cas, | |
1155 | transport->remote, remote_refs); | |
1156 | ||
20e8b465 TRC |
1157 | set_ref_status_for_push(remote_refs, |
1158 | flags & TRANSPORT_PUSH_MIRROR, | |
1159 | flags & TRANSPORT_PUSH_FORCE); | |
1160 | ||
ec55559f AS |
1161 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) |
1162 | if (run_pre_push_hook(transport, remote_refs)) | |
1163 | return -1; | |
1164 | ||
225e8bf7 BW |
1165 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
1166 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
1167 | !is_bare_repository()) { | |
d2b17b32 | 1168 | struct ref *ref = remote_refs; |
910650d2 | 1169 | struct oid_array commits = OID_ARRAY_INIT; |
9cfa1c26 | 1170 | |
d2b17b32 | 1171 | for (; ref; ref = ref->next) |
9cfa1c26 | 1172 | if (!is_null_oid(&ref->new_oid)) |
910650d2 | 1173 | oid_array_append(&commits, |
98a72ddc | 1174 | &ref->new_oid); |
9cfa1c26 | 1175 | |
6c6d5d07 | 1176 | if (!push_unpushed_submodules(r, |
174d131f | 1177 | &commits, |
06bf4ad1 | 1178 | transport->remote, |
60fba4bf | 1179 | rs, |
2a90556d | 1180 | transport->push_options, |
0301c821 | 1181 | pretend)) { |
910650d2 | 1182 | oid_array_clear(&commits); |
68e39e41 | 1183 | die(_("failed to push all needed submodules")); |
9cfa1c26 | 1184 | } |
910650d2 | 1185 | oid_array_clear(&commits); |
eb21c732 HV |
1186 | } |
1187 | ||
0301c821 | 1188 | if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || |
225e8bf7 BW |
1189 | ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
1190 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && | |
0301c821 | 1191 | !pretend)) && !is_bare_repository()) { |
d2b17b32 | 1192 | struct ref *ref = remote_refs; |
f93d7c6f | 1193 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; |
910650d2 | 1194 | struct oid_array commits = OID_ARRAY_INIT; |
a762e51e | 1195 | |
d2b17b32 | 1196 | for (; ref; ref = ref->next) |
9cfa1c26 | 1197 | if (!is_null_oid(&ref->new_oid)) |
910650d2 | 1198 | oid_array_append(&commits, |
98a72ddc | 1199 | &ref->new_oid); |
9cfa1c26 | 1200 | |
6c6d5d07 | 1201 | if (find_unpushed_submodules(r, |
174d131f NTND |
1202 | &commits, |
1203 | transport->remote->name, | |
1204 | &needs_pushing)) { | |
910650d2 | 1205 | oid_array_clear(&commits); |
9cfa1c26 HV |
1206 | die_with_unpushed_submodules(&needs_pushing); |
1207 | } | |
1208 | string_list_clear(&needs_pushing, 0); | |
910650d2 | 1209 | oid_array_clear(&commits); |
d2b17b32 FG |
1210 | } |
1211 | ||
225e8bf7 | 1212 | if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) |
e967ca38 | 1213 | push_ret = transport->vtable->push_refs(transport, remote_refs, flags); |
225e8bf7 BW |
1214 | else |
1215 | push_ret = 0; | |
42328267 | 1216 | err = push_had_errors(remote_refs); |
77555854 | 1217 | ret = push_ret | err; |
64fcef2d | 1218 | |
42328267 | 1219 | if (!quiet || err) |
f1863d0d | 1220 | transport_print_push_status(transport->url, remote_refs, |
6ffd7812 | 1221 | verbose | porcelain, porcelain, |
10643d4e | 1222 | reject_reasons); |
64fcef2d | 1223 | |
e9fcd1e2 IL |
1224 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
1225 | set_upstreams(transport, remote_refs, pretend); | |
1226 | ||
225e8bf7 BW |
1227 | if (!(flags & (TRANSPORT_PUSH_DRY_RUN | |
1228 | TRANSPORT_RECURSE_SUBMODULES_ONLY))) { | |
64fcef2d DB |
1229 | struct ref *ref; |
1230 | for (ref = remote_refs; ref; ref = ref->next) | |
f1863d0d | 1231 | transport_update_tracking_ref(transport->remote, ref, verbose); |
64fcef2d DB |
1232 | } |
1233 | ||
77555854 LA |
1234 | if (porcelain && !push_ret) |
1235 | puts("Done"); | |
66bce02e | 1236 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
64fcef2d | 1237 | fprintf(stderr, "Everything up-to-date\n"); |
77555854 | 1238 | |
64fcef2d DB |
1239 | return ret; |
1240 | } | |
1241 | return 1; | |
9b288516 DB |
1242 | } |
1243 | ||
1af8ae1c BW |
1244 | const struct ref *transport_get_remote_refs(struct transport *transport, |
1245 | const struct argv_array *ref_prefixes) | |
c29727d5 | 1246 | { |
b0d66e15 | 1247 | if (!transport->got_remote_refs) { |
1af8ae1c BW |
1248 | transport->remote_refs = |
1249 | transport->vtable->get_refs_list(transport, 0, | |
1250 | ref_prefixes); | |
b0d66e15 TRC |
1251 | transport->got_remote_refs = 1; |
1252 | } | |
61b075bd | 1253 | |
c29727d5 DB |
1254 | return transport->remote_refs; |
1255 | } | |
1256 | ||
e2842b39 | 1257 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
c29727d5 | 1258 | { |
425b1393 | 1259 | int rc; |
86386829 | 1260 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
37148311 DB |
1261 | struct ref **heads = NULL; |
1262 | struct ref *rm; | |
c29727d5 | 1263 | |
6ab40557 JT |
1264 | if (!transport->vtable->fetch_without_list) |
1265 | /* | |
1266 | * Some transports (e.g. the built-in bundle transport and the | |
1267 | * transport helper interface) do not work when fetching is | |
1268 | * done immediately after transport creation. List the remote | |
1269 | * refs anyway (if not already listed) as a workaround. | |
1270 | */ | |
1271 | transport_get_remote_refs(transport, NULL); | |
1272 | ||
c29727d5 | 1273 | for (rm = refs; rm; rm = rm->next) { |
86386829 | 1274 | nr_refs++; |
c29727d5 | 1275 | if (rm->peer_ref && |
f4e54d02 | 1276 | !is_null_oid(&rm->old_oid) && |
4a7e27e9 | 1277 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) |
c29727d5 | 1278 | continue; |
7a2bff45 | 1279 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
425b1393 | 1280 | heads[nr_heads++] = rm; |
c29727d5 DB |
1281 | } |
1282 | ||
86386829 NP |
1283 | if (!nr_heads) { |
1284 | /* | |
1285 | * When deepening of a shallow repository is requested, | |
1286 | * then local and remote refs are likely to still be equal. | |
1287 | * Just feed them all to the fetch method in that case. | |
1288 | * This condition shouldn't be met in a non-deepening fetch | |
09b7e220 | 1289 | * (see builtin/fetch.c:quickfetch()). |
86386829 | 1290 | */ |
b32fa95f | 1291 | ALLOC_ARRAY(heads, nr_refs); |
86386829 NP |
1292 | for (rm = refs; rm; rm = rm->next) |
1293 | heads[nr_heads++] = rm; | |
1294 | } | |
1295 | ||
e2842b39 | 1296 | rc = transport->vtable->fetch(transport, nr_heads, heads); |
61b075bd | 1297 | |
c29727d5 | 1298 | free(heads); |
425b1393 | 1299 | return rc; |
c29727d5 DB |
1300 | } |
1301 | ||
1788c39c SP |
1302 | void transport_unlock_pack(struct transport *transport) |
1303 | { | |
1304 | if (transport->pack_lockfile) { | |
691f1a28 | 1305 | unlink_or_warn(transport->pack_lockfile); |
6a83d902 | 1306 | FREE_AND_NULL(transport->pack_lockfile); |
1788c39c SP |
1307 | } |
1308 | } | |
1309 | ||
b236752a IL |
1310 | int transport_connect(struct transport *transport, const char *name, |
1311 | const char *exec, int fd[2]) | |
1312 | { | |
e967ca38 JT |
1313 | if (transport->vtable->connect) |
1314 | return transport->vtable->connect(transport, name, exec, fd); | |
b236752a | 1315 | else |
68e39e41 | 1316 | die(_("operation not supported by protocol")); |
b236752a IL |
1317 | } |
1318 | ||
9b288516 DB |
1319 | int transport_disconnect(struct transport *transport) |
1320 | { | |
1321 | int ret = 0; | |
e967ca38 JT |
1322 | if (transport->vtable->disconnect) |
1323 | ret = transport->vtable->disconnect(transport); | |
9b288516 DB |
1324 | free(transport); |
1325 | return ret; | |
1326 | } | |
47abd85b AE |
1327 | |
1328 | /* | |
a7793a74 | 1329 | * Strip username (and password) from a URL and return |
47abd85b AE |
1330 | * it in a newly allocated string. |
1331 | */ | |
1332 | char *transport_anonymize_url(const char *url) | |
1333 | { | |
21f9d0f6 | 1334 | char *scheme_prefix, *anon_part; |
47abd85b AE |
1335 | size_t anon_len, prefix_len = 0; |
1336 | ||
1337 | anon_part = strchr(url, '@'); | |
c59ab2e5 | 1338 | if (url_is_local_not_ssh(url) || !anon_part) |
47abd85b AE |
1339 | goto literal_copy; |
1340 | ||
1341 | anon_len = strlen(++anon_part); | |
1342 | scheme_prefix = strstr(url, "://"); | |
1343 | if (!scheme_prefix) { | |
1344 | if (!strchr(anon_part, ':')) | |
1345 | /* cannot be "me@there:/path/name" */ | |
1346 | goto literal_copy; | |
1347 | } else { | |
1348 | const char *cp; | |
1349 | /* make sure scheme is reasonable */ | |
1350 | for (cp = url; cp < scheme_prefix; cp++) { | |
1351 | switch (*cp) { | |
1352 | /* RFC 1738 2.1 */ | |
1353 | case '+': case '.': case '-': | |
1354 | break; /* ok */ | |
1355 | default: | |
1356 | if (isalnum(*cp)) | |
1357 | break; | |
1358 | /* it isn't */ | |
1359 | goto literal_copy; | |
1360 | } | |
1361 | } | |
1362 | /* @ past the first slash does not count */ | |
1363 | cp = strchr(scheme_prefix + 3, '/'); | |
1364 | if (cp && cp < anon_part) | |
1365 | goto literal_copy; | |
1366 | prefix_len = scheme_prefix - url + 3; | |
1367 | } | |
21f9d0f6 JK |
1368 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, |
1369 | (int)anon_len, anon_part); | |
47abd85b AE |
1370 | literal_copy: |
1371 | return xstrdup(url); | |
1372 | } | |
36cfda15 | 1373 | |
1e5f31d4 TB |
1374 | static void fill_alternate_refs_command(struct child_process *cmd, |
1375 | const char *repo_path) | |
1376 | { | |
89284c1d TB |
1377 | const char *value; |
1378 | ||
1379 | if (!git_config_get_value("core.alternateRefsCommand", &value)) { | |
1380 | cmd->use_shell = 1; | |
1381 | ||
1382 | argv_array_push(&cmd->args, value); | |
1383 | argv_array_push(&cmd->args, repo_path); | |
1384 | } else { | |
1385 | cmd->git_cmd = 1; | |
1386 | ||
1387 | argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path); | |
1388 | argv_array_push(&cmd->args, "for-each-ref"); | |
1389 | argv_array_push(&cmd->args, "--format=%(objectname)"); | |
40f327fa TB |
1390 | |
1391 | if (!git_config_get_value("core.alternateRefsPrefixes", &value)) { | |
1392 | argv_array_push(&cmd->args, "--"); | |
1393 | argv_array_split(&cmd->args, value); | |
1394 | } | |
89284c1d TB |
1395 | } |
1396 | ||
1e5f31d4 TB |
1397 | cmd->env = local_repo_env; |
1398 | cmd->out = -1; | |
1399 | } | |
1400 | ||
a10a1787 JK |
1401 | static void read_alternate_refs(const char *path, |
1402 | alternate_ref_fn *cb, | |
1403 | void *data) | |
1404 | { | |
1405 | struct child_process cmd = CHILD_PROCESS_INIT; | |
1406 | struct strbuf line = STRBUF_INIT; | |
1407 | FILE *fh; | |
1408 | ||
1e5f31d4 | 1409 | fill_alternate_refs_command(&cmd, path); |
a10a1787 JK |
1410 | |
1411 | if (start_command(&cmd)) | |
1412 | return; | |
1413 | ||
1414 | fh = xfdopen(cmd.out, "r"); | |
1415 | while (strbuf_getline_lf(&line, fh) != EOF) { | |
1416 | struct object_id oid; | |
fbd0e37c | 1417 | const char *p; |
a10a1787 | 1418 | |
d829d491 | 1419 | if (parse_oid_hex(line.buf, &oid, &p) || *p) { |
68e39e41 | 1420 | warning(_("invalid line while parsing alternate refs: %s"), |
a10a1787 JK |
1421 | line.buf); |
1422 | break; | |
1423 | } | |
1424 | ||
bdf4276c | 1425 | cb(&oid, data); |
a10a1787 JK |
1426 | } |
1427 | ||
1428 | fclose(fh); | |
1429 | finish_command(&cmd); | |
1430 | } | |
1431 | ||
114a6a88 JK |
1432 | struct alternate_refs_data { |
1433 | alternate_ref_fn *fn; | |
1434 | void *data; | |
1435 | }; | |
1436 | ||
263db403 | 1437 | static int refs_from_alternate_cb(struct object_directory *e, |
114a6a88 | 1438 | void *data) |
36cfda15 | 1439 | { |
5e8c968c JK |
1440 | struct strbuf path = STRBUF_INIT; |
1441 | size_t base_len; | |
114a6a88 | 1442 | struct alternate_refs_data *cb = data; |
36cfda15 | 1443 | |
5e8c968c JK |
1444 | if (!strbuf_realpath(&path, e->path, 0)) |
1445 | goto out; | |
1446 | if (!strbuf_strip_suffix(&path, "/objects")) | |
def06971 | 1447 | goto out; |
5e8c968c JK |
1448 | base_len = path.len; |
1449 | ||
36cfda15 | 1450 | /* Is this a git repository with refs? */ |
5e8c968c JK |
1451 | strbuf_addstr(&path, "/refs"); |
1452 | if (!is_directory(path.buf)) | |
def06971 | 1453 | goto out; |
5e8c968c JK |
1454 | strbuf_setlen(&path, base_len); |
1455 | ||
a10a1787 JK |
1456 | read_alternate_refs(path.buf, cb->fn, cb->data); |
1457 | ||
def06971 | 1458 | out: |
5e8c968c | 1459 | strbuf_release(&path); |
36cfda15 JH |
1460 | return 0; |
1461 | } | |
114a6a88 JK |
1462 | |
1463 | void for_each_alternate_ref(alternate_ref_fn fn, void *data) | |
1464 | { | |
1465 | struct alternate_refs_data cb; | |
1466 | cb.fn = fn; | |
1467 | cb.data = data; | |
1468 | foreach_alt_odb(refs_from_alternate_cb, &cb); | |
1469 | } |