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