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