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