Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 2 | #include "config.h" |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 3 | #include "transport.h" |
| 4 | #include "run-command.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 5 | #include "pkt-line.h" |
| 6 | #include "fetch-pack.h" |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 7 | #include "remote.h" |
| 8 | #include "connect.h" |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 9 | #include "send-pack.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 10 | #include "walker.h" |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 11 | #include "bundle.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 12 | #include "dir.h" |
| 13 | #include "refs.h" |
Brandon Williams | ec0cb49 | 2018-05-16 15:57:48 -0700 | [diff] [blame] | 14 | #include "refspec.h" |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 15 | #include "branch.h" |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 16 | #include "url.h" |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 17 | #include "submodule.h" |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 18 | #include "string-list.h" |
Nguyễn Thái Ngọc Duy | 13eb462 | 2013-12-05 20:02:29 +0700 | [diff] [blame] | 19 | #include "sha1-array.h" |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 20 | #include "sigchain.h" |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 21 | #include "transport-internal.h" |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 22 | #include "protocol.h" |
Stefan Beller | 0d4a132 | 2018-03-23 18:20:56 +0100 | [diff] [blame] | 23 | #include "object-store.h" |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 24 | #include "color.h" |
| 25 | |
| 26 | static int transport_use_color = -1; |
| 27 | static char transport_colors[][COLOR_MAXLEN] = { |
| 28 | GIT_COLOR_RESET, |
| 29 | GIT_COLOR_RED /* REJECTED */ |
| 30 | }; |
| 31 | |
| 32 | enum color_transport { |
| 33 | TRANSPORT_COLOR_RESET = 0, |
| 34 | TRANSPORT_COLOR_REJECTED = 1 |
| 35 | }; |
| 36 | |
| 37 | static int transport_color_config(void) |
| 38 | { |
| 39 | const char *keys[] = { |
| 40 | "color.transport.reset", |
| 41 | "color.transport.rejected" |
| 42 | }, *key = "color.transport"; |
| 43 | char *value; |
| 44 | int i; |
| 45 | static int initialized; |
| 46 | |
| 47 | if (initialized) |
| 48 | return 0; |
| 49 | initialized = 1; |
| 50 | |
| 51 | if (!git_config_get_string(key, &value)) |
| 52 | transport_use_color = git_config_colorbool(key, value); |
| 53 | |
| 54 | if (!want_color_stderr(transport_use_color)) |
| 55 | return 0; |
| 56 | |
| 57 | for (i = 0; i < ARRAY_SIZE(keys); i++) |
| 58 | if (!git_config_get_string(keys[i], &value)) { |
| 59 | if (!value) |
| 60 | return config_error_nonbool(keys[i]); |
| 61 | if (color_parse(value, transport_colors[i]) < 0) |
| 62 | return -1; |
| 63 | } |
| 64 | |
| 65 | return 0; |
| 66 | } |
| 67 | |
| 68 | static const char *transport_get_color(enum color_transport ix) |
| 69 | { |
| 70 | if (want_color_stderr(transport_use_color)) |
| 71 | return transport_colors[ix]; |
| 72 | return ""; |
| 73 | } |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 74 | |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 75 | static void set_upstreams(struct transport *transport, struct ref *refs, |
| 76 | int pretend) |
| 77 | { |
| 78 | struct ref *ref; |
| 79 | for (ref = refs; ref; ref = ref->next) { |
| 80 | const char *localname; |
| 81 | const char *tmp; |
| 82 | const char *remotename; |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 83 | int flag = 0; |
| 84 | /* |
| 85 | * Check suitability for tracking. Must be successful / |
| 86 | * already up-to-date ref create/modify (not delete). |
| 87 | */ |
| 88 | if (ref->status != REF_STATUS_OK && |
| 89 | ref->status != REF_STATUS_UPTODATE) |
| 90 | continue; |
| 91 | if (!ref->peer_ref) |
| 92 | continue; |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 93 | if (is_null_oid(&ref->new_oid)) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 94 | continue; |
| 95 | |
| 96 | /* Follow symbolic refs (mainly for HEAD). */ |
| 97 | localname = ref->peer_ref->name; |
| 98 | remotename = ref->name; |
Ronnie Sahlberg | 7695d11 | 2014-07-15 12:59:36 -0700 | [diff] [blame] | 99 | tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING, |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 100 | NULL, &flag); |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 101 | if (tmp && flag & REF_ISSYMREF && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 102 | starts_with(tmp, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 103 | localname = tmp; |
| 104 | |
| 105 | /* Both source and destination must be local branches. */ |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 106 | if (!localname || !starts_with(localname, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 107 | continue; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 108 | if (!remotename || !starts_with(remotename, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 109 | continue; |
| 110 | |
| 111 | if (!pretend) |
| 112 | install_branch_config(BRANCH_CONFIG_VERBOSE, |
| 113 | localname + 11, transport->remote->name, |
| 114 | remotename); |
| 115 | else |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 116 | printf(_("Would set upstream of '%s' to '%s' of '%s'\n"), |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 117 | localname + 11, remotename + 11, |
| 118 | transport->remote->name); |
| 119 | } |
| 120 | } |
| 121 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 122 | struct bundle_transport_data { |
| 123 | int fd; |
| 124 | struct bundle_header header; |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 125 | unsigned get_refs_from_bundle_called : 1; |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 126 | }; |
| 127 | |
Brandon Williams | 834cf34 | 2018-03-15 10:31:22 -0700 | [diff] [blame] | 128 | static struct ref *get_refs_from_bundle(struct transport *transport, |
| 129 | int for_push, |
| 130 | const struct argv_array *ref_prefixes) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 131 | { |
| 132 | struct bundle_transport_data *data = transport->data; |
| 133 | struct ref *result = NULL; |
| 134 | int i; |
| 135 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 136 | if (for_push) |
| 137 | return NULL; |
| 138 | |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 139 | data->get_refs_from_bundle_called = 1; |
| 140 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 141 | if (data->fd > 0) |
| 142 | close(data->fd); |
| 143 | data->fd = read_bundle_header(transport->url, &data->header); |
| 144 | if (data->fd < 0) |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 145 | die(_("could not read bundle '%s'"), transport->url); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 146 | for (i = 0; i < data->header.references.nr; i++) { |
| 147 | struct ref_list_entry *e = data->header.references.list + i; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 148 | struct ref *ref = alloc_ref(e->name); |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 149 | oidcpy(&ref->old_oid, &e->oid); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 150 | ref->next = result; |
| 151 | result = ref; |
| 152 | } |
| 153 | return result; |
| 154 | } |
| 155 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 156 | static int fetch_refs_from_bundle(struct transport *transport, |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 157 | int nr_heads, struct ref **to_fetch) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 158 | { |
| 159 | struct bundle_transport_data *data = transport->data; |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 160 | |
| 161 | if (!data->get_refs_from_bundle_called) |
| 162 | get_refs_from_bundle(transport, 0, NULL); |
Nguyễn Thái Ngọc Duy | 74ae4b6 | 2018-11-10 06:49:01 +0100 | [diff] [blame] | 163 | return unbundle(the_repository, &data->header, data->fd, |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 164 | transport->progress ? BUNDLE_VERBOSE : 0); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 165 | } |
| 166 | |
| 167 | static int close_bundle(struct transport *transport) |
| 168 | { |
| 169 | struct bundle_transport_data *data = transport->data; |
| 170 | if (data->fd > 0) |
| 171 | close(data->fd); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 172 | free(data); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 173 | return 0; |
| 174 | } |
| 175 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 176 | struct git_transport_data { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 177 | struct git_transport_options options; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 178 | struct child_process *conn; |
| 179 | int fd[2]; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 180 | unsigned got_remote_heads : 1; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 181 | enum protocol_version version; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 182 | struct oid_array extra_have; |
| 183 | struct oid_array shallow; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 184 | }; |
| 185 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 186 | static int set_git_option(struct git_transport_options *opts, |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 187 | const char *name, const char *value) |
| 188 | { |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 189 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 190 | opts->uploadpack = value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 191 | return 0; |
| 192 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 193 | opts->receivepack = value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 194 | return 0; |
| 195 | } else if (!strcmp(name, TRANS_OPT_THIN)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 196 | opts->thin = !!value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 197 | return 0; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 198 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 199 | opts->followtags = !!value; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 200 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 201 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 202 | opts->keep = !!value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 203 | return 0; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 204 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
| 205 | opts->update_shallow = !!value; |
| 206 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 207 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
| 208 | if (!value) |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 209 | opts->depth = 0; |
Nguyễn Thái Ngọc Duy | e7622ce | 2012-01-04 17:01:55 +0700 | [diff] [blame] | 210 | else { |
| 211 | char *end; |
| 212 | opts->depth = strtol(value, &end, 0); |
| 213 | if (*end) |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 214 | die(_("transport: invalid depth option '%s'"), value); |
Nguyễn Thái Ngọc Duy | e7622ce | 2012-01-04 17:01:55 +0700 | [diff] [blame] | 215 | } |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 216 | return 0; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 217 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { |
| 218 | opts->deepen_since = value; |
| 219 | return 0; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 220 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { |
| 221 | opts->deepen_not = (const struct string_list *)value; |
| 222 | return 0; |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 223 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { |
| 224 | opts->deepen_relative = !!value; |
| 225 | return 0; |
Jonathan Tan | 88e2f9e | 2017-12-05 16:58:49 +0000 | [diff] [blame] | 226 | } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { |
| 227 | opts->from_promisor = !!value; |
| 228 | return 0; |
| 229 | } else if (!strcmp(name, TRANS_OPT_NO_DEPENDENTS)) { |
| 230 | opts->no_dependents = !!value; |
| 231 | return 0; |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 232 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { |
Matthew DeVore | 489fc9e | 2019-06-27 15:54:12 -0700 | [diff] [blame] | 233 | list_objects_filter_die_if_populated(&opts->filter_options); |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 234 | parse_list_objects_filter(&opts->filter_options, value); |
| 235 | return 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 236 | } |
| 237 | return 1; |
| 238 | } |
| 239 | |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 240 | static int connect_setup(struct transport *transport, int for_push) |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 241 | { |
| 242 | struct git_transport_data *data = transport->data; |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 243 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 244 | |
| 245 | if (data->conn) |
| 246 | return 0; |
| 247 | |
Eric Wong | c915f11 | 2016-02-03 04:09:14 +0000 | [diff] [blame] | 248 | switch (transport->family) { |
| 249 | case TRANSPORT_FAMILY_ALL: break; |
| 250 | case TRANSPORT_FAMILY_IPV4: flags |= CONNECT_IPV4; break; |
| 251 | case TRANSPORT_FAMILY_IPV6: flags |= CONNECT_IPV6; break; |
| 252 | } |
| 253 | |
Junio C Hamano | 5a277f3 | 2011-09-06 11:06:32 -0700 | [diff] [blame] | 254 | data->conn = git_connect(data->fd, transport->url, |
| 255 | for_push ? data->options.receivepack : |
| 256 | data->options.uploadpack, |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 257 | flags); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 258 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 259 | return 0; |
| 260 | } |
| 261 | |
Jonathan Tan | 35eb824 | 2019-04-12 12:51:21 -0700 | [diff] [blame] | 262 | static void die_if_server_options(struct transport *transport) |
| 263 | { |
| 264 | if (!transport->server_options || !transport->server_options->nr) |
| 265 | return; |
| 266 | advise(_("see protocol.version in 'git help config' for more details")); |
| 267 | die(_("server options require protocol version 2 or later")); |
| 268 | } |
| 269 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 270 | /* |
| 271 | * Obtains the protocol version from the transport and writes it to |
| 272 | * transport->data->version, first connecting if not already connected. |
| 273 | * |
| 274 | * If the protocol version is one that allows skipping the listing of remote |
| 275 | * refs, and must_list_refs is 0, the listing of remote refs is skipped and |
| 276 | * this function returns NULL. Otherwise, this function returns the list of |
| 277 | * remote refs. |
| 278 | */ |
| 279 | static struct ref *handshake(struct transport *transport, int for_push, |
| 280 | const struct argv_array *ref_prefixes, |
| 281 | int must_list_refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 282 | { |
| 283 | struct git_transport_data *data = transport->data; |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 284 | struct ref *refs = NULL; |
| 285 | struct packet_reader reader; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 286 | |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 287 | connect_setup(transport, for_push); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 288 | |
| 289 | packet_reader_init(&reader, data->fd[0], NULL, 0, |
| 290 | PACKET_READ_CHOMP_NEWLINE | |
Masaya Suzuki | 2d103c3 | 2018-12-29 13:19:15 -0800 | [diff] [blame] | 291 | PACKET_READ_GENTLE_ON_EOF | |
| 292 | PACKET_READ_DIE_ON_ERR_PACKET); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 293 | |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 294 | data->version = discover_version(&reader); |
| 295 | switch (data->version) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 296 | case protocol_v2: |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 297 | if (must_list_refs) |
| 298 | get_remote_refs(data->fd[1], &reader, &refs, for_push, |
| 299 | ref_prefixes, |
| 300 | transport->server_options); |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 301 | break; |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 302 | case protocol_v1: |
| 303 | case protocol_v0: |
Jonathan Tan | 35eb824 | 2019-04-12 12:51:21 -0700 | [diff] [blame] | 304 | die_if_server_options(transport); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 305 | get_remote_heads(&reader, &refs, |
| 306 | for_push ? REF_NORMAL : 0, |
| 307 | &data->extra_have, |
| 308 | &data->shallow); |
| 309 | break; |
| 310 | case protocol_unknown_version: |
| 311 | BUG("unknown protocol version"); |
| 312 | } |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 313 | data->got_remote_heads = 1; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 314 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 315 | if (reader.line_peeked) |
| 316 | BUG("buffer must be empty at the end of handshake()"); |
| 317 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 318 | return refs; |
| 319 | } |
| 320 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 321 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push, |
| 322 | const struct argv_array *ref_prefixes) |
| 323 | { |
| 324 | return handshake(transport, for_push, ref_prefixes, 1); |
| 325 | } |
| 326 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 327 | static int fetch_refs_via_pack(struct transport *transport, |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 328 | int nr_heads, struct ref **to_fetch) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 329 | { |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 330 | int ret = 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 331 | struct git_transport_data *data = transport->data; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 332 | struct ref *refs = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 333 | struct fetch_pack_args args; |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 334 | struct ref *refs_tmp = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 335 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 336 | memset(&args, 0, sizeof(args)); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 337 | args.uploadpack = data->options.uploadpack; |
| 338 | args.keep_pack = data->options.keep; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 339 | args.lock_pack = 1; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 340 | args.use_thin_pack = data->options.thin; |
| 341 | args.include_tag = data->options.followtags; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 342 | args.verbose = (transport->verbose > 1); |
Tuncer Ayaz | fe8aa14 | 2008-10-05 15:53:00 +0200 | [diff] [blame] | 343 | args.quiet = (transport->verbose < 0); |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 344 | args.no_progress = !transport->progress; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 345 | args.depth = data->options.depth; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 346 | args.deepen_since = data->options.deepen_since; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 347 | args.deepen_not = data->options.deepen_not; |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 348 | args.deepen_relative = data->options.deepen_relative; |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 349 | args.check_self_contained_and_connected = |
| 350 | data->options.check_self_contained_and_connected; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 351 | args.cloning = transport->cloning; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 352 | args.update_shallow = data->options.update_shallow; |
Jonathan Tan | 88e2f9e | 2017-12-05 16:58:49 +0000 | [diff] [blame] | 353 | args.from_promisor = data->options.from_promisor; |
| 354 | args.no_dependents = data->options.no_dependents; |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 355 | args.filter_options = data->options.filter_options; |
Brandon Williams | edc9caf | 2018-03-15 10:31:34 -0700 | [diff] [blame] | 356 | args.stateless_rpc = transport->stateless_rpc; |
Brandon Williams | 5e3548e | 2018-04-23 15:46:24 -0700 | [diff] [blame] | 357 | args.server_options = transport->server_options; |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 358 | args.negotiation_tips = data->options.negotiation_tips; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 359 | |
Jonathan Tan | 0177565 | 2018-09-27 12:24:05 -0700 | [diff] [blame] | 360 | if (!data->got_remote_heads) { |
| 361 | int i; |
| 362 | int must_list_refs = 0; |
| 363 | for (i = 0; i < nr_heads; i++) { |
| 364 | if (!to_fetch[i]->exact_oid) { |
| 365 | must_list_refs = 1; |
| 366 | break; |
| 367 | } |
| 368 | } |
| 369 | refs_tmp = handshake(transport, 0, NULL, must_list_refs); |
| 370 | } |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 371 | |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 372 | switch (data->version) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 373 | case protocol_v2: |
Jeff King | 0f804b0 | 2019-03-20 04:16:14 -0400 | [diff] [blame] | 374 | refs = fetch_pack(&args, data->fd, |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 375 | refs_tmp ? refs_tmp : transport->remote_refs, |
Jeff King | 0f804b0 | 2019-03-20 04:16:14 -0400 | [diff] [blame] | 376 | to_fetch, nr_heads, &data->shallow, |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 377 | &transport->pack_lockfile, data->version); |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 378 | break; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 379 | case protocol_v1: |
| 380 | case protocol_v0: |
Jonathan Tan | 35eb824 | 2019-04-12 12:51:21 -0700 | [diff] [blame] | 381 | die_if_server_options(transport); |
Jeff King | 0f804b0 | 2019-03-20 04:16:14 -0400 | [diff] [blame] | 382 | refs = fetch_pack(&args, data->fd, |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 383 | refs_tmp ? refs_tmp : transport->remote_refs, |
Jeff King | 0f804b0 | 2019-03-20 04:16:14 -0400 | [diff] [blame] | 384 | to_fetch, nr_heads, &data->shallow, |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 385 | &transport->pack_lockfile, data->version); |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 386 | break; |
| 387 | case protocol_unknown_version: |
| 388 | BUG("unknown protocol version"); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 389 | } |
| 390 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 391 | close(data->fd[0]); |
| 392 | close(data->fd[1]); |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 393 | if (finish_connect(data->conn)) |
| 394 | ret = -1; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 395 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 396 | data->got_remote_heads = 0; |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 397 | data->options.self_contained_and_connected = |
| 398 | args.self_contained_and_connected; |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 399 | data->options.connectivity_checked = args.connectivity_checked; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 400 | |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 401 | if (refs == NULL) |
| 402 | ret = -1; |
| 403 | if (report_unmatched_refs(to_fetch, nr_heads)) |
| 404 | ret = -1; |
| 405 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 406 | free_refs(refs_tmp); |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 407 | free_refs(refs); |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 408 | return ret; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 409 | } |
| 410 | |
Jeff King | 481c7a6 | 2009-08-05 16:23:26 -0400 | [diff] [blame] | 411 | static int push_had_errors(struct ref *ref) |
| 412 | { |
| 413 | for (; ref; ref = ref->next) { |
| 414 | switch (ref->status) { |
| 415 | case REF_STATUS_NONE: |
| 416 | case REF_STATUS_UPTODATE: |
| 417 | case REF_STATUS_OK: |
| 418 | break; |
| 419 | default: |
| 420 | return 1; |
| 421 | } |
| 422 | } |
| 423 | return 0; |
| 424 | } |
| 425 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 426 | int transport_refs_pushed(struct ref *ref) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 427 | { |
| 428 | for (; ref; ref = ref->next) { |
| 429 | switch(ref->status) { |
| 430 | case REF_STATUS_NONE: |
| 431 | case REF_STATUS_UPTODATE: |
| 432 | break; |
| 433 | default: |
| 434 | return 1; |
| 435 | } |
| 436 | } |
| 437 | return 0; |
| 438 | } |
| 439 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 440 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 441 | { |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 442 | struct refspec_item rs; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 443 | |
| 444 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) |
| 445 | return; |
| 446 | |
| 447 | rs.src = ref->name; |
| 448 | rs.dst = NULL; |
| 449 | |
| 450 | if (!remote_find_tracking(remote, &rs)) { |
| 451 | if (verbose) |
| 452 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); |
| 453 | if (ref->deletion) { |
Kyle Meyer | 755b49a | 2017-02-20 20:10:32 -0500 | [diff] [blame] | 454 | delete_ref(NULL, rs.dst, NULL, 0); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 455 | } else |
brian m. carlson | ae07777 | 2017-10-15 22:06:51 +0000 | [diff] [blame] | 456 | update_ref("update by push", rs.dst, &ref->new_oid, |
| 457 | NULL, 0, 0); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 458 | free(rs.dst); |
| 459 | } |
| 460 | } |
| 461 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 462 | static void print_ref_status(char flag, const char *summary, |
| 463 | struct ref *to, struct ref *from, const char *msg, |
| 464 | int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 465 | { |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 466 | if (porcelain) { |
| 467 | if (from) |
| 468 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); |
| 469 | else |
| 470 | fprintf(stdout, "%c\t:%s\t", flag, to->name); |
| 471 | if (msg) |
| 472 | fprintf(stdout, "%s (%s)\n", summary, msg); |
| 473 | else |
| 474 | fprintf(stdout, "%s\n", summary); |
| 475 | } else { |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 476 | const char *red = "", *reset = ""; |
| 477 | if (push_had_errors(to)) { |
| 478 | red = transport_get_color(TRANSPORT_COLOR_REJECTED); |
| 479 | reset = transport_get_color(TRANSPORT_COLOR_RESET); |
| 480 | } |
| 481 | fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width, |
| 482 | summary, reset); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 483 | if (from) |
| 484 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); |
| 485 | else |
| 486 | fputs(prettify_refname(to->name), stderr); |
| 487 | if (msg) { |
| 488 | fputs(" (", stderr); |
| 489 | fputs(msg, stderr); |
| 490 | fputc(')', stderr); |
| 491 | } |
| 492 | fputc('\n', stderr); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 493 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 494 | } |
| 495 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 496 | static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 497 | { |
| 498 | if (ref->deletion) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 499 | print_ref_status('-', "[deleted]", ref, NULL, NULL, |
| 500 | porcelain, summary_width); |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 501 | else if (is_null_oid(&ref->old_oid)) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 502 | print_ref_status('*', |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 503 | (starts_with(ref->name, "refs/tags/") ? "[new tag]" : |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 504 | "[new branch]"), |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 505 | ref, ref->peer_ref, NULL, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 506 | else { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 507 | struct strbuf quickref = STRBUF_INIT; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 508 | char type; |
| 509 | const char *msg; |
| 510 | |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 511 | strbuf_add_unique_abbrev(&quickref, &ref->old_oid, |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 512 | DEFAULT_ABBREV); |
Junio C Hamano | 5ece083 | 2013-01-21 20:24:07 -0800 | [diff] [blame] | 513 | if (ref->forced_update) { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 514 | strbuf_addstr(&quickref, "..."); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 515 | type = '+'; |
| 516 | msg = "forced update"; |
| 517 | } else { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 518 | strbuf_addstr(&quickref, ".."); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 519 | type = ' '; |
| 520 | msg = NULL; |
| 521 | } |
brian m. carlson | 30e677e | 2018-03-12 02:27:28 +0000 | [diff] [blame] | 522 | strbuf_add_unique_abbrev(&quickref, &ref->new_oid, |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 523 | DEFAULT_ABBREV); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 524 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 525 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, |
| 526 | porcelain, summary_width); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 527 | strbuf_release(&quickref); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 528 | } |
| 529 | } |
| 530 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 531 | static int print_one_push_status(struct ref *ref, const char *dest, int count, |
| 532 | int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 533 | { |
Jeff King | 882d49c | 2016-07-13 19:36:53 -0400 | [diff] [blame] | 534 | if (!count) { |
| 535 | char *url = transport_anonymize_url(dest); |
| 536 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); |
| 537 | free(url); |
| 538 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 539 | |
| 540 | switch(ref->status) { |
| 541 | case REF_STATUS_NONE: |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 542 | print_ref_status('X', "[no match]", ref, NULL, NULL, |
| 543 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 544 | break; |
| 545 | case REF_STATUS_REJECT_NODELETE: |
| 546 | print_ref_status('!', "[rejected]", ref, NULL, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 547 | "remote does not support deleting refs", |
| 548 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 549 | break; |
| 550 | case REF_STATUS_UPTODATE: |
| 551 | print_ref_status('=', "[up to date]", ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 552 | ref->peer_ref, NULL, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 553 | break; |
| 554 | case REF_STATUS_REJECT_NONFASTFORWARD: |
| 555 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 556 | "non-fast-forward", porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 557 | break; |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 558 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
| 559 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 560 | "already exists", porcelain, summary_width); |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 561 | break; |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 562 | case REF_STATUS_REJECT_FETCH_FIRST: |
| 563 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 564 | "fetch first", porcelain, summary_width); |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 565 | break; |
| 566 | case REF_STATUS_REJECT_NEEDS_FORCE: |
| 567 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 568 | "needs force", porcelain, summary_width); |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 569 | break; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 570 | case REF_STATUS_REJECT_STALE: |
| 571 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 572 | "stale info", porcelain, summary_width); |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 573 | break; |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 574 | case REF_STATUS_REJECT_SHALLOW: |
| 575 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 576 | "new shallow roots not allowed", |
| 577 | porcelain, summary_width); |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 578 | break; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 579 | case REF_STATUS_REMOTE_REJECT: |
| 580 | print_ref_status('!', "[remote rejected]", ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 581 | ref->deletion ? NULL : ref->peer_ref, |
| 582 | ref->remote_status, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 583 | break; |
| 584 | case REF_STATUS_EXPECTING_REPORT: |
| 585 | print_ref_status('!', "[remote failure]", ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 586 | ref->deletion ? NULL : ref->peer_ref, |
| 587 | "remote failed to report status", |
| 588 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 589 | break; |
Ronnie Sahlberg | 4ff17f1 | 2015-01-07 19:23:22 -0800 | [diff] [blame] | 590 | case REF_STATUS_ATOMIC_PUSH_FAILED: |
| 591 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 592 | "atomic push failed", porcelain, summary_width); |
Ronnie Sahlberg | 4ff17f1 | 2015-01-07 19:23:22 -0800 | [diff] [blame] | 593 | break; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 594 | case REF_STATUS_OK: |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 595 | print_ok_ref_status(ref, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 596 | break; |
| 597 | } |
| 598 | |
| 599 | return 1; |
| 600 | } |
| 601 | |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 602 | static int measure_abbrev(const struct object_id *oid, int sofar) |
| 603 | { |
brian m. carlson | dc01505 | 2017-03-26 16:01:24 +0000 | [diff] [blame] | 604 | char hex[GIT_MAX_HEXSZ + 1]; |
brian m. carlson | aab9583 | 2018-03-12 02:27:30 +0000 | [diff] [blame] | 605 | int w = find_unique_abbrev_r(hex, oid, DEFAULT_ABBREV); |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 606 | |
| 607 | return (w < sofar) ? sofar : w; |
| 608 | } |
| 609 | |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 610 | int transport_summary_width(const struct ref *refs) |
| 611 | { |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 612 | int maxw = -1; |
| 613 | |
| 614 | for (; refs; refs = refs->next) { |
| 615 | maxw = measure_abbrev(&refs->old_oid, maxw); |
| 616 | maxw = measure_abbrev(&refs->new_oid, maxw); |
| 617 | } |
| 618 | if (maxw < 0) |
| 619 | maxw = FALLBACK_DEFAULT_ABBREV; |
| 620 | return (2 * maxw + 3); |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 621 | } |
| 622 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 623 | void transport_print_push_status(const char *dest, struct ref *refs, |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 624 | int verbose, int porcelain, unsigned int *reject_reasons) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 625 | { |
| 626 | struct ref *ref; |
| 627 | int n = 0; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 628 | char *head; |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 629 | int summary_width = transport_summary_width(refs); |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 630 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 631 | if (transport_color_config() < 0) |
| 632 | warning(_("could not parse transport.color.* config")); |
| 633 | |
René Scharfe | efbd4fd | 2017-10-01 09:29:03 +0200 | [diff] [blame] | 634 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 635 | |
| 636 | if (verbose) { |
| 637 | for (ref = refs; ref; ref = ref->next) |
| 638 | if (ref->status == REF_STATUS_UPTODATE) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 639 | n += print_one_push_status(ref, dest, n, |
| 640 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 641 | } |
| 642 | |
| 643 | for (ref = refs; ref; ref = ref->next) |
| 644 | if (ref->status == REF_STATUS_OK) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 645 | n += print_one_push_status(ref, dest, n, |
| 646 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 647 | |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 648 | *reject_reasons = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 649 | for (ref = refs; ref; ref = ref->next) { |
| 650 | if (ref->status != REF_STATUS_NONE && |
| 651 | ref->status != REF_STATUS_UPTODATE && |
| 652 | ref->status != REF_STATUS_OK) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 653 | n += print_one_push_status(ref, dest, n, |
| 654 | porcelain, summary_width); |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 655 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
Fraser Tweedale | 1d2c14d | 2013-01-31 22:22:51 +1000 | [diff] [blame] | 656 | if (head != NULL && !strcmp(head, ref->name)) |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 657 | *reject_reasons |= REJECT_NON_FF_HEAD; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 658 | else |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 659 | *reject_reasons |= REJECT_NON_FF_OTHER; |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 660 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
| 661 | *reject_reasons |= REJECT_ALREADY_EXISTS; |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 662 | } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { |
| 663 | *reject_reasons |= REJECT_FETCH_FIRST; |
| 664 | } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { |
| 665 | *reject_reasons |= REJECT_NEEDS_FORCE; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 666 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 667 | } |
Stefan Beller | dc76c7f | 2014-10-20 18:50:44 -0700 | [diff] [blame] | 668 | free(head); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 669 | } |
| 670 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 671 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
Junio C Hamano | f3fa183 | 2007-11-08 15:35:32 -0800 | [diff] [blame] | 672 | { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 673 | struct git_transport_data *data = transport->data; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 674 | struct send_pack_args args; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 675 | int ret = 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 676 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 677 | if (transport_color_config() < 0) |
| 678 | return -1; |
| 679 | |
Brandon Williams | 635365e | 2018-03-14 11:31:43 -0700 | [diff] [blame] | 680 | if (!data->got_remote_heads) |
Brandon Williams | 834cf34 | 2018-03-15 10:31:22 -0700 | [diff] [blame] | 681 | get_refs_via_connect(transport, 1, NULL); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 682 | |
Shawn O. Pearce | de1a2fd | 2009-10-30 17:47:41 -0700 | [diff] [blame] | 683 | memset(&args, 0, sizeof(args)); |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 684 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 685 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 686 | args.use_thin_pack = data->options.thin; |
Tay Ray Chuan | 8afd8dc | 2010-02-24 20:50:24 +0800 | [diff] [blame] | 687 | args.verbose = (transport->verbose > 0); |
| 688 | args.quiet = (transport->verbose < 0); |
Jeff King | d7c411b | 2010-10-17 02:37:03 +0800 | [diff] [blame] | 689 | args.progress = transport->progress; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 690 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 691 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
Ronnie Sahlberg | d0e8e09 | 2015-01-07 19:23:23 -0800 | [diff] [blame] | 692 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); |
Stefan Beller | f6a4e61 | 2016-07-14 14:49:47 -0700 | [diff] [blame] | 693 | args.push_options = transport->push_options; |
Junio C Hamano | 9be8916 | 2014-08-22 18:15:24 -0700 | [diff] [blame] | 694 | args.url = transport->url; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 695 | |
Dave Borowitz | 3026109 | 2015-08-19 11:26:46 -0400 | [diff] [blame] | 696 | if (flags & TRANSPORT_PUSH_CERT_ALWAYS) |
| 697 | args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS; |
| 698 | else if (flags & TRANSPORT_PUSH_CERT_IF_ASKED) |
| 699 | args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED; |
| 700 | else |
| 701 | args.push_cert = SEND_PACK_PUSH_CERT_NEVER; |
| 702 | |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 703 | switch (data->version) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 704 | case protocol_v2: |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 705 | die(_("support for protocol v2 not implemented yet")); |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 706 | break; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 707 | case protocol_v1: |
| 708 | case protocol_v0: |
| 709 | ret = send_pack(&args, data->fd, data->conn, remote_refs, |
| 710 | &data->extra_have); |
| 711 | break; |
| 712 | case protocol_unknown_version: |
| 713 | BUG("unknown protocol version"); |
| 714 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 715 | |
| 716 | close(data->fd[1]); |
| 717 | close(data->fd[0]); |
| 718 | ret |= finish_connect(data->conn); |
| 719 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 720 | data->got_remote_heads = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 721 | |
| 722 | return ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 723 | } |
| 724 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 725 | static int connect_git(struct transport *transport, const char *name, |
| 726 | const char *executable, int fd[2]) |
| 727 | { |
| 728 | struct git_transport_data *data = transport->data; |
| 729 | data->conn = git_connect(data->fd, transport->url, |
| 730 | executable, 0); |
| 731 | fd[0] = data->fd[0]; |
| 732 | fd[1] = data->fd[1]; |
| 733 | return 0; |
| 734 | } |
| 735 | |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 736 | static int disconnect_git(struct transport *transport) |
| 737 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 738 | struct git_transport_data *data = transport->data; |
| 739 | if (data->conn) { |
Jeff King | 4d8cab9 | 2020-01-08 02:10:09 -0500 | [diff] [blame] | 740 | if (data->got_remote_heads && !transport->stateless_rpc) |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 741 | packet_flush(data->fd[1]); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 742 | close(data->fd[0]); |
| 743 | close(data->fd[1]); |
| 744 | finish_connect(data->conn); |
| 745 | } |
| 746 | |
| 747 | free(data); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 748 | return 0; |
| 749 | } |
| 750 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 751 | static struct transport_vtable taken_over_vtable = { |
| 752 | NULL, |
| 753 | get_refs_via_connect, |
| 754 | fetch_refs_via_pack, |
| 755 | git_transport_push, |
| 756 | NULL, |
| 757 | disconnect_git |
| 758 | }; |
| 759 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 760 | void transport_take_over(struct transport *transport, |
| 761 | struct child_process *child) |
| 762 | { |
| 763 | struct git_transport_data *data; |
| 764 | |
| 765 | if (!transport->smart_options) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 766 | BUG("taking over transport requires non-NULL " |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 767 | "smart_options field."); |
| 768 | |
| 769 | data = xcalloc(1, sizeof(*data)); |
| 770 | data->options = *transport->smart_options; |
| 771 | data->conn = child; |
| 772 | data->fd[0] = data->conn->out; |
| 773 | data->fd[1] = data->conn->in; |
| 774 | data->got_remote_heads = 0; |
| 775 | transport->data = data; |
| 776 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 777 | transport->vtable = &taken_over_vtable; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 778 | transport->smart_options = &(data->options); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 779 | |
| 780 | transport->cannot_reuse = 1; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 781 | } |
| 782 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 783 | static int is_file(const char *url) |
| 784 | { |
| 785 | struct stat buf; |
| 786 | if (stat(url, &buf)) |
| 787 | return 0; |
| 788 | return S_ISREG(buf.st_mode); |
| 789 | } |
| 790 | |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 791 | static int external_specification_len(const char *url) |
| 792 | { |
| 793 | return strchr(url, ':') - url; |
| 794 | } |
| 795 | |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 796 | static const struct string_list *protocol_whitelist(void) |
| 797 | { |
| 798 | static int enabled = -1; |
| 799 | static struct string_list allowed = STRING_LIST_INIT_DUP; |
| 800 | |
| 801 | if (enabled < 0) { |
| 802 | const char *v = getenv("GIT_ALLOW_PROTOCOL"); |
| 803 | if (v) { |
| 804 | string_list_split(&allowed, v, ':', -1); |
| 805 | string_list_sort(&allowed); |
| 806 | enabled = 1; |
| 807 | } else { |
| 808 | enabled = 0; |
| 809 | } |
| 810 | } |
| 811 | |
| 812 | return enabled ? &allowed : NULL; |
| 813 | } |
| 814 | |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 815 | enum protocol_allow_config { |
| 816 | PROTOCOL_ALLOW_NEVER = 0, |
| 817 | PROTOCOL_ALLOW_USER_ONLY, |
| 818 | PROTOCOL_ALLOW_ALWAYS |
| 819 | }; |
| 820 | |
| 821 | static enum protocol_allow_config parse_protocol_config(const char *key, |
| 822 | const char *value) |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 823 | { |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 824 | if (!strcasecmp(value, "always")) |
| 825 | return PROTOCOL_ALLOW_ALWAYS; |
| 826 | else if (!strcasecmp(value, "never")) |
| 827 | return PROTOCOL_ALLOW_NEVER; |
| 828 | else if (!strcasecmp(value, "user")) |
| 829 | return PROTOCOL_ALLOW_USER_ONLY; |
| 830 | |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 831 | die(_("unknown value for config '%s': %s"), key, value); |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 832 | } |
| 833 | |
| 834 | static enum protocol_allow_config get_protocol_config(const char *type) |
| 835 | { |
| 836 | char *key = xstrfmt("protocol.%s.allow", type); |
| 837 | char *value; |
| 838 | |
| 839 | /* first check the per-protocol config */ |
| 840 | if (!git_config_get_string(key, &value)) { |
| 841 | enum protocol_allow_config ret = |
| 842 | parse_protocol_config(key, value); |
| 843 | free(key); |
| 844 | free(value); |
| 845 | return ret; |
| 846 | } |
| 847 | free(key); |
| 848 | |
| 849 | /* if defined, fallback to user-defined default for unknown protocols */ |
| 850 | if (!git_config_get_string("protocol.allow", &value)) { |
| 851 | enum protocol_allow_config ret = |
| 852 | parse_protocol_config("protocol.allow", value); |
| 853 | free(value); |
| 854 | return ret; |
| 855 | } |
| 856 | |
| 857 | /* fallback to built-in defaults */ |
| 858 | /* known safe */ |
| 859 | if (!strcmp(type, "http") || |
| 860 | !strcmp(type, "https") || |
| 861 | !strcmp(type, "git") || |
| 862 | !strcmp(type, "ssh") || |
| 863 | !strcmp(type, "file")) |
| 864 | return PROTOCOL_ALLOW_ALWAYS; |
| 865 | |
| 866 | /* known scary; err on the side of caution */ |
| 867 | if (!strcmp(type, "ext")) |
| 868 | return PROTOCOL_ALLOW_NEVER; |
| 869 | |
| 870 | /* unknown; by default let them be used only directly by the user */ |
| 871 | return PROTOCOL_ALLOW_USER_ONLY; |
| 872 | } |
| 873 | |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 874 | int is_transport_allowed(const char *type, int from_user) |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 875 | { |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 876 | const struct string_list *whitelist = protocol_whitelist(); |
| 877 | if (whitelist) |
| 878 | return string_list_has_string(whitelist, type); |
| 879 | |
| 880 | switch (get_protocol_config(type)) { |
| 881 | case PROTOCOL_ALLOW_ALWAYS: |
| 882 | return 1; |
| 883 | case PROTOCOL_ALLOW_NEVER: |
| 884 | return 0; |
| 885 | case PROTOCOL_ALLOW_USER_ONLY: |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 886 | if (from_user < 0) |
| 887 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); |
| 888 | return from_user; |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 889 | } |
| 890 | |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 891 | BUG("invalid protocol_allow_config type"); |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 892 | } |
| 893 | |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 894 | void transport_check_allowed(const char *type) |
| 895 | { |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 896 | if (!is_transport_allowed(type, -1)) |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 897 | die(_("transport '%s' not allowed"), type); |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 898 | } |
| 899 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 900 | static struct transport_vtable bundle_vtable = { |
| 901 | NULL, |
| 902 | get_refs_from_bundle, |
| 903 | fetch_refs_from_bundle, |
| 904 | NULL, |
| 905 | NULL, |
| 906 | close_bundle |
| 907 | }; |
| 908 | |
| 909 | static struct transport_vtable builtin_smart_vtable = { |
| 910 | NULL, |
| 911 | get_refs_via_connect, |
| 912 | fetch_refs_via_pack, |
| 913 | git_transport_push, |
| 914 | connect_git, |
| 915 | disconnect_git |
| 916 | }; |
| 917 | |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 918 | struct transport *transport_get(struct remote *remote, const char *url) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 919 | { |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 920 | const char *helper; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 921 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
| 922 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 923 | ret->progress = isatty(2); |
| 924 | |
Daniel Barkalow | c1d45cf | 2009-11-03 21:38:51 -0500 | [diff] [blame] | 925 | if (!remote) |
Nguyễn Thái Ngọc Duy | 1a07e59 | 2018-07-21 09:49:19 +0200 | [diff] [blame] | 926 | BUG("No remote provided to transport_get()"); |
Daniel Barkalow | c1d45cf | 2009-11-03 21:38:51 -0500 | [diff] [blame] | 927 | |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 928 | ret->got_remote_refs = 0; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 929 | ret->remote = remote; |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 930 | helper = remote->foreign_vcs; |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 931 | |
Junio C Hamano | cb21d8f | 2010-01-27 12:22:37 -0800 | [diff] [blame] | 932 | if (!url && remote->url) |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 933 | url = remote->url[0]; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 934 | ret->url = url; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 935 | |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 936 | /* maybe it is a foreign URL? */ |
| 937 | if (url) { |
| 938 | const char *p = url; |
| 939 | |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 940 | while (is_urlschemechar(p == url, *p)) |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 941 | p++; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 942 | if (starts_with(p, "::")) |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 943 | helper = xstrndup(url, p - url); |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 944 | } |
| 945 | |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 946 | if (helper) { |
| 947 | transport_helper_init(ret, helper); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 948 | } else if (starts_with(url, "rsync:")) { |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 949 | die(_("git-over-rsync is no longer supported")); |
Torsten Bögershausen | c59ab2e | 2013-11-28 20:50:03 +0100 | [diff] [blame] | 950 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 951 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 952 | transport_check_allowed("file"); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 953 | ret->data = data; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 954 | ret->vtable = &bundle_vtable; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 955 | ret->smart_options = NULL; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 956 | } else if (!is_url(url) |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 957 | || starts_with(url, "file://") |
| 958 | || starts_with(url, "git://") |
| 959 | || starts_with(url, "ssh://") |
Carlos Martín Nieto | 07c7782 | 2016-02-15 15:29:06 +0100 | [diff] [blame] | 960 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ |
| 961 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ |
| 962 | ) { |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 963 | /* |
| 964 | * These are builtin smart transports; "allowed" transports |
| 965 | * will be checked individually in git_connect. |
| 966 | */ |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 967 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 968 | ret->data = data; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 969 | ret->vtable = &builtin_smart_vtable; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 970 | ret->smart_options = &(data->options); |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 971 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 972 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 973 | data->got_remote_heads = 0; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 974 | } else { |
| 975 | /* Unknown protocol in URL. Pass to external handler. */ |
| 976 | int len = external_specification_len(url); |
René Scharfe | 6b33894 | 2014-12-24 01:18:31 +0100 | [diff] [blame] | 977 | char *handler = xmemdupz(url, len); |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 978 | transport_helper_init(ret, handler); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 979 | } |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 980 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 981 | if (ret->smart_options) { |
| 982 | ret->smart_options->thin = 1; |
| 983 | ret->smart_options->uploadpack = "git-upload-pack"; |
| 984 | if (remote->uploadpack) |
| 985 | ret->smart_options->uploadpack = remote->uploadpack; |
| 986 | ret->smart_options->receivepack = "git-receive-pack"; |
| 987 | if (remote->receivepack) |
| 988 | ret->smart_options->receivepack = remote->receivepack; |
| 989 | } |
| 990 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 991 | return ret; |
| 992 | } |
| 993 | |
| 994 | int transport_set_option(struct transport *transport, |
| 995 | const char *name, const char *value) |
| 996 | { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 997 | int git_reports = 1, protocol_reports = 1; |
| 998 | |
| 999 | if (transport->smart_options) |
| 1000 | git_reports = set_git_option(transport->smart_options, |
| 1001 | name, value); |
| 1002 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1003 | if (transport->vtable->set_option) |
| 1004 | protocol_reports = transport->vtable->set_option(transport, |
| 1005 | name, value); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1006 | |
| 1007 | /* If either report is 0, report 0 (success). */ |
| 1008 | if (!git_reports || !protocol_reports) |
| 1009 | return 0; |
| 1010 | /* If either reports -1 (invalid value), report -1. */ |
| 1011 | if ((git_reports == -1) || (protocol_reports == -1)) |
| 1012 | return -1; |
| 1013 | /* Otherwise if both report unknown, report unknown. */ |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 1014 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1015 | } |
| 1016 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1017 | void transport_set_verbosity(struct transport *transport, int verbosity, |
| 1018 | int force_progress) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1019 | { |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 1020 | if (verbosity >= 1) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1021 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
| 1022 | if (verbosity < 0) |
| 1023 | transport->verbose = -1; |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1024 | |
| 1025 | /** |
| 1026 | * Rules used to determine whether to report progress (processing aborts |
| 1027 | * when a rule is satisfied): |
| 1028 | * |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1029 | * . Report progress, if force_progress is 1 (ie. --progress). |
| 1030 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). |
| 1031 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). |
| 1032 | * . Report progress if isatty(2) is 1. |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1033 | **/ |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1034 | if (force_progress >= 0) |
| 1035 | transport->progress = !!force_progress; |
| 1036 | else |
| 1037 | transport->progress = verbosity >= 0 && isatty(2); |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1038 | } |
| 1039 | |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1040 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
| 1041 | { |
| 1042 | int i; |
| 1043 | |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1044 | fprintf(stderr, _("The following submodule paths contain changes that can\n" |
| 1045 | "not be found on any remote:\n")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1046 | for (i = 0; i < needs_pushing->nr; i++) |
Stefan Beller | 5cb5fe4 | 2016-08-23 14:40:08 -0700 | [diff] [blame] | 1047 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1048 | fprintf(stderr, _("\nPlease try\n\n" |
| 1049 | " git push --recurse-submodules=on-demand\n\n" |
| 1050 | "or cd to the path and use\n\n" |
| 1051 | " git push\n\n" |
| 1052 | "to push them to a remote.\n\n")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1053 | |
| 1054 | string_list_clear(needs_pushing, 0); |
| 1055 | |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1056 | die(_("Aborting.")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1057 | } |
| 1058 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1059 | static int run_pre_push_hook(struct transport *transport, |
| 1060 | struct ref *remote_refs) |
| 1061 | { |
| 1062 | int ret = 0, x; |
| 1063 | struct ref *r; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 1064 | struct child_process proc = CHILD_PROCESS_INIT; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1065 | struct strbuf buf; |
| 1066 | const char *argv[4]; |
| 1067 | |
| 1068 | if (!(argv[0] = find_hook("pre-push"))) |
| 1069 | return 0; |
| 1070 | |
| 1071 | argv[1] = transport->remote->name; |
| 1072 | argv[2] = transport->url; |
| 1073 | argv[3] = NULL; |
| 1074 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1075 | proc.argv = argv; |
| 1076 | proc.in = -1; |
Jeff Hostetler | 6206286 | 2019-02-22 14:25:06 -0800 | [diff] [blame] | 1077 | proc.trace2_hook_name = "pre-push"; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1078 | |
| 1079 | if (start_command(&proc)) { |
| 1080 | finish_command(&proc); |
| 1081 | return -1; |
| 1082 | } |
| 1083 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1084 | sigchain_push(SIGPIPE, SIG_IGN); |
| 1085 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1086 | strbuf_init(&buf, 256); |
| 1087 | |
| 1088 | for (r = remote_refs; r; r = r->next) { |
| 1089 | if (!r->peer_ref) continue; |
| 1090 | if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1091 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1092 | if (r->status == REF_STATUS_UPTODATE) continue; |
| 1093 | |
| 1094 | strbuf_reset(&buf); |
| 1095 | strbuf_addf( &buf, "%s %s %s %s\n", |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1096 | r->peer_ref->name, oid_to_hex(&r->new_oid), |
| 1097 | r->name, oid_to_hex(&r->old_oid)); |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1098 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1099 | if (write_in_full(proc.in, buf.buf, buf.len) < 0) { |
| 1100 | /* We do not mind if a hook does not read all refs. */ |
| 1101 | if (errno != EPIPE) |
| 1102 | ret = -1; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1103 | break; |
| 1104 | } |
| 1105 | } |
| 1106 | |
| 1107 | strbuf_release(&buf); |
| 1108 | |
| 1109 | x = close(proc.in); |
| 1110 | if (!ret) |
| 1111 | ret = x; |
| 1112 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1113 | sigchain_pop(SIGPIPE); |
| 1114 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1115 | x = finish_command(&proc); |
| 1116 | if (!ret) |
| 1117 | ret = x; |
| 1118 | |
| 1119 | return ret; |
| 1120 | } |
| 1121 | |
Nguyễn Thái Ngọc Duy | 6c6d5d0 | 2018-11-10 06:48:55 +0100 | [diff] [blame] | 1122 | int transport_push(struct repository *r, |
| 1123 | struct transport *transport, |
Brandon Williams | 306f22d | 2018-05-16 15:58:17 -0700 | [diff] [blame] | 1124 | struct refspec *rs, int flags, |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 1125 | unsigned int *reject_reasons) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1126 | { |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 1127 | *reject_reasons = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1128 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 1129 | if (transport_color_config() < 0) |
| 1130 | return -1; |
| 1131 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1132 | if (transport->vtable->push_refs) { |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1133 | struct ref *remote_refs; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1134 | struct ref *local_refs = get_local_heads(); |
| 1135 | int match_flags = MATCH_REFS_NONE; |
Tay Ray Chuan | 8afd8dc | 2010-02-24 20:50:24 +0800 | [diff] [blame] | 1136 | int verbose = (transport->verbose > 0); |
| 1137 | int quiet = (transport->verbose < 0); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 1138 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 1139 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1140 | int push_ret, ret, err; |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1141 | struct argv_array ref_prefixes = ARGV_ARRAY_INIT; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1142 | |
Brandon Williams | afb1aed | 2018-05-16 15:58:22 -0700 | [diff] [blame] | 1143 | if (check_push_refs(local_refs, rs) < 0) |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1144 | return -1; |
| 1145 | |
Brandon Williams | 6373cb5 | 2018-05-16 16:48:21 -0700 | [diff] [blame] | 1146 | refspec_ref_prefixes(rs, &ref_prefixes); |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1147 | |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1148 | trace2_region_enter("transport_push", "get_refs_list", r); |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1149 | remote_refs = transport->vtable->get_refs_list(transport, 1, |
| 1150 | &ref_prefixes); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1151 | trace2_region_leave("transport_push", "get_refs_list", r); |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1152 | |
| 1153 | argv_array_clear(&ref_prefixes); |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1154 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1155 | if (flags & TRANSPORT_PUSH_ALL) |
| 1156 | match_flags |= MATCH_REFS_ALL; |
| 1157 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 1158 | match_flags |= MATCH_REFS_MIRROR; |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1159 | if (flags & TRANSPORT_PUSH_PRUNE) |
| 1160 | match_flags |= MATCH_REFS_PRUNE; |
Junio C Hamano | c2aba15 | 2013-03-04 12:09:50 -0800 | [diff] [blame] | 1161 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) |
| 1162 | match_flags |= MATCH_REFS_FOLLOW_TAGS; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1163 | |
Brandon Williams | 5c7ec84 | 2018-05-16 15:58:21 -0700 | [diff] [blame] | 1164 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1165 | return -1; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1166 | |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 1167 | if (transport->smart_options && |
| 1168 | transport->smart_options->cas && |
| 1169 | !is_empty_cas(transport->smart_options->cas)) |
| 1170 | apply_push_cas(transport->smart_options->cas, |
| 1171 | transport->remote, remote_refs); |
| 1172 | |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1173 | set_ref_status_for_push(remote_refs, |
| 1174 | flags & TRANSPORT_PUSH_MIRROR, |
| 1175 | flags & TRANSPORT_PUSH_FORCE); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1176 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1177 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) |
| 1178 | if (run_pre_push_hook(transport, remote_refs)) |
| 1179 | return -1; |
| 1180 | |
Brandon Williams | 225e8bf | 2016-12-19 10:25:33 -0800 | [diff] [blame] | 1181 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
| 1182 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && |
| 1183 | !is_bare_repository()) { |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1184 | struct ref *ref = remote_refs; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1185 | struct oid_array commits = OID_ARRAY_INIT; |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1186 | |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1187 | trace2_region_enter("transport_push", "push_submodules", r); |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1188 | for (; ref; ref = ref->next) |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1189 | if (!is_null_oid(&ref->new_oid)) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1190 | oid_array_append(&commits, |
brian m. carlson | 98a72dd | 2017-03-31 01:39:56 +0000 | [diff] [blame] | 1191 | &ref->new_oid); |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1192 | |
Nguyễn Thái Ngọc Duy | 6c6d5d0 | 2018-11-10 06:48:55 +0100 | [diff] [blame] | 1193 | if (!push_unpushed_submodules(r, |
Nguyễn Thái Ngọc Duy | 174d131 | 2018-09-21 17:57:35 +0200 | [diff] [blame] | 1194 | &commits, |
Brandon Williams | 06bf4ad | 2017-04-05 10:47:19 -0700 | [diff] [blame] | 1195 | transport->remote, |
Brandon Williams | 60fba4b | 2018-05-16 15:58:23 -0700 | [diff] [blame] | 1196 | rs, |
Brandon Williams | 2a90556 | 2017-04-05 10:47:16 -0700 | [diff] [blame] | 1197 | transport->push_options, |
Brandon Williams | 0301c82 | 2016-11-17 10:46:04 -0800 | [diff] [blame] | 1198 | pretend)) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1199 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1200 | trace2_region_leave("transport_push", "push_submodules", r); |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1201 | die(_("failed to push all needed submodules")); |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1202 | } |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1203 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1204 | trace2_region_leave("transport_push", "push_submodules", r); |
Heiko Voigt | eb21c73 | 2012-03-29 09:21:24 +0200 | [diff] [blame] | 1205 | } |
| 1206 | |
Brandon Williams | 0301c82 | 2016-11-17 10:46:04 -0800 | [diff] [blame] | 1207 | if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || |
Brandon Williams | 225e8bf | 2016-12-19 10:25:33 -0800 | [diff] [blame] | 1208 | ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
| 1209 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && |
Brandon Williams | 0301c82 | 2016-11-17 10:46:04 -0800 | [diff] [blame] | 1210 | !pretend)) && !is_bare_repository()) { |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1211 | struct ref *ref = remote_refs; |
Tanay Abhra | f93d7c6 | 2014-07-18 02:19:00 -0700 | [diff] [blame] | 1212 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1213 | struct oid_array commits = OID_ARRAY_INIT; |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1214 | |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1215 | trace2_region_enter("transport_push", "check_submodules", r); |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1216 | for (; ref; ref = ref->next) |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1217 | if (!is_null_oid(&ref->new_oid)) |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1218 | oid_array_append(&commits, |
brian m. carlson | 98a72dd | 2017-03-31 01:39:56 +0000 | [diff] [blame] | 1219 | &ref->new_oid); |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1220 | |
Nguyễn Thái Ngọc Duy | 6c6d5d0 | 2018-11-10 06:48:55 +0100 | [diff] [blame] | 1221 | if (find_unpushed_submodules(r, |
Nguyễn Thái Ngọc Duy | 174d131 | 2018-09-21 17:57:35 +0200 | [diff] [blame] | 1222 | &commits, |
| 1223 | transport->remote->name, |
| 1224 | &needs_pushing)) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1225 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1226 | trace2_region_leave("transport_push", "check_submodules", r); |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1227 | die_with_unpushed_submodules(&needs_pushing); |
| 1228 | } |
| 1229 | string_list_clear(&needs_pushing, 0); |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1230 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1231 | trace2_region_leave("transport_push", "check_submodules", r); |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1232 | } |
| 1233 | |
Josh Steadmon | 25e4b80 | 2019-10-02 16:49:29 -0700 | [diff] [blame] | 1234 | if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1235 | trace2_region_enter("transport_push", "push_refs", r); |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1236 | push_ret = transport->vtable->push_refs(transport, remote_refs, flags); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1237 | trace2_region_leave("transport_push", "push_refs", r); |
Josh Steadmon | 25e4b80 | 2019-10-02 16:49:29 -0700 | [diff] [blame] | 1238 | } else |
Brandon Williams | 225e8bf | 2016-12-19 10:25:33 -0800 | [diff] [blame] | 1239 | push_ret = 0; |
Tay Ray Chuan | 4232826 | 2010-01-08 10:12:43 +0800 | [diff] [blame] | 1240 | err = push_had_errors(remote_refs); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1241 | ret = push_ret | err; |
Tay Ray Chuan | 4232826 | 2010-01-08 10:12:43 +0800 | [diff] [blame] | 1242 | |
Emily Shaffer | 3bca1e7 | 2019-07-11 14:19:19 -0700 | [diff] [blame] | 1243 | if ((flags & TRANSPORT_PUSH_ATOMIC) && err) { |
Junio C Hamano | 2581ea3 | 2019-07-16 13:28:21 -0700 | [diff] [blame] | 1244 | struct ref *it; |
| 1245 | for (it = remote_refs; it; it = it->next) |
Emily Shaffer | 3bca1e7 | 2019-07-11 14:19:19 -0700 | [diff] [blame] | 1246 | switch (it->status) { |
| 1247 | case REF_STATUS_NONE: |
| 1248 | case REF_STATUS_UPTODATE: |
| 1249 | case REF_STATUS_OK: |
| 1250 | it->status = REF_STATUS_ATOMIC_PUSH_FAILED; |
| 1251 | break; |
| 1252 | default: |
| 1253 | break; |
| 1254 | } |
| 1255 | } |
| 1256 | |
Tay Ray Chuan | 4232826 | 2010-01-08 10:12:43 +0800 | [diff] [blame] | 1257 | if (!quiet || err) |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 1258 | transport_print_push_status(transport->url, remote_refs, |
Junio C Hamano | 6ffd781 | 2009-08-12 16:36:04 -0700 | [diff] [blame] | 1259 | verbose | porcelain, porcelain, |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 1260 | reject_reasons); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1261 | |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 1262 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
| 1263 | set_upstreams(transport, remote_refs, pretend); |
| 1264 | |
Brandon Williams | 225e8bf | 2016-12-19 10:25:33 -0800 | [diff] [blame] | 1265 | if (!(flags & (TRANSPORT_PUSH_DRY_RUN | |
| 1266 | TRANSPORT_RECURSE_SUBMODULES_ONLY))) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1267 | struct ref *ref; |
| 1268 | for (ref = remote_refs; ref; ref = ref->next) |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 1269 | transport_update_tracking_ref(transport->remote, ref, verbose); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1270 | } |
| 1271 | |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1272 | if (porcelain && !push_ret) |
| 1273 | puts("Done"); |
Junio C Hamano | 66bce02 | 2010-03-15 00:58:24 -0700 | [diff] [blame] | 1274 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1275 | fprintf(stderr, "Everything up-to-date\n"); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1276 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1277 | return ret; |
| 1278 | } |
| 1279 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1280 | } |
| 1281 | |
Brandon Williams | 1af8ae1 | 2018-03-15 10:31:23 -0700 | [diff] [blame] | 1282 | const struct ref *transport_get_remote_refs(struct transport *transport, |
| 1283 | const struct argv_array *ref_prefixes) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1284 | { |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1285 | if (!transport->got_remote_refs) { |
Brandon Williams | 1af8ae1 | 2018-03-15 10:31:23 -0700 | [diff] [blame] | 1286 | transport->remote_refs = |
| 1287 | transport->vtable->get_refs_list(transport, 0, |
| 1288 | ref_prefixes); |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1289 | transport->got_remote_refs = 1; |
| 1290 | } |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1291 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1292 | return transport->remote_refs; |
| 1293 | } |
| 1294 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1295 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1296 | { |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1297 | int rc; |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1298 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 1299 | struct ref **heads = NULL; |
| 1300 | struct ref *rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1301 | |
| 1302 | for (rm = refs; rm; rm = rm->next) { |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1303 | nr_refs++; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1304 | if (rm->peer_ref && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1305 | !is_null_oid(&rm->old_oid) && |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 1306 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1307 | continue; |
Shawn O. Pearce | 7a2bff4 | 2007-09-14 03:31:18 -0400 | [diff] [blame] | 1308 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1309 | heads[nr_heads++] = rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1310 | } |
| 1311 | |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1312 | if (!nr_heads) { |
| 1313 | /* |
| 1314 | * When deepening of a shallow repository is requested, |
| 1315 | * then local and remote refs are likely to still be equal. |
| 1316 | * Just feed them all to the fetch method in that case. |
| 1317 | * This condition shouldn't be met in a non-deepening fetch |
Phil Hord | 09b7e22 | 2013-06-18 13:44:58 -0400 | [diff] [blame] | 1318 | * (see builtin/fetch.c:quickfetch()). |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1319 | */ |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 1320 | ALLOC_ARRAY(heads, nr_refs); |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1321 | for (rm = refs; rm; rm = rm->next) |
| 1322 | heads[nr_heads++] = rm; |
| 1323 | } |
| 1324 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1325 | rc = transport->vtable->fetch(transport, nr_heads, heads); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1326 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1327 | free(heads); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1328 | return rc; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1329 | } |
| 1330 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1331 | void transport_unlock_pack(struct transport *transport) |
| 1332 | { |
| 1333 | if (transport->pack_lockfile) { |
Alex Riesen | 691f1a2 | 2009-04-29 23:22:56 +0200 | [diff] [blame] | 1334 | unlink_or_warn(transport->pack_lockfile); |
Ævar Arnfjörð Bjarmason | 6a83d90 | 2017-06-15 23:15:46 +0000 | [diff] [blame] | 1335 | FREE_AND_NULL(transport->pack_lockfile); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1336 | } |
| 1337 | } |
| 1338 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1339 | int transport_connect(struct transport *transport, const char *name, |
| 1340 | const char *exec, int fd[2]) |
| 1341 | { |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1342 | if (transport->vtable->connect) |
| 1343 | return transport->vtable->connect(transport, name, exec, fd); |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1344 | else |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1345 | die(_("operation not supported by protocol")); |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1346 | } |
| 1347 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1348 | int transport_disconnect(struct transport *transport) |
| 1349 | { |
| 1350 | int ret = 0; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1351 | if (transport->vtable->disconnect) |
| 1352 | ret = transport->vtable->disconnect(transport); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1353 | free(transport); |
| 1354 | return ret; |
| 1355 | } |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1356 | |
| 1357 | /* |
Jim Meyering | a7793a7 | 2012-03-28 10:41:54 +0200 | [diff] [blame] | 1358 | * Strip username (and password) from a URL and return |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1359 | * it in a newly allocated string. |
| 1360 | */ |
| 1361 | char *transport_anonymize_url(const char *url) |
| 1362 | { |
Jeff King | 21f9d0f | 2016-02-22 17:45:05 -0500 | [diff] [blame] | 1363 | char *scheme_prefix, *anon_part; |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1364 | size_t anon_len, prefix_len = 0; |
| 1365 | |
| 1366 | anon_part = strchr(url, '@'); |
Torsten Bögershausen | c59ab2e | 2013-11-28 20:50:03 +0100 | [diff] [blame] | 1367 | if (url_is_local_not_ssh(url) || !anon_part) |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1368 | goto literal_copy; |
| 1369 | |
| 1370 | anon_len = strlen(++anon_part); |
| 1371 | scheme_prefix = strstr(url, "://"); |
| 1372 | if (!scheme_prefix) { |
| 1373 | if (!strchr(anon_part, ':')) |
| 1374 | /* cannot be "me@there:/path/name" */ |
| 1375 | goto literal_copy; |
| 1376 | } else { |
| 1377 | const char *cp; |
| 1378 | /* make sure scheme is reasonable */ |
| 1379 | for (cp = url; cp < scheme_prefix; cp++) { |
| 1380 | switch (*cp) { |
| 1381 | /* RFC 1738 2.1 */ |
| 1382 | case '+': case '.': case '-': |
| 1383 | break; /* ok */ |
| 1384 | default: |
| 1385 | if (isalnum(*cp)) |
| 1386 | break; |
| 1387 | /* it isn't */ |
| 1388 | goto literal_copy; |
| 1389 | } |
| 1390 | } |
| 1391 | /* @ past the first slash does not count */ |
| 1392 | cp = strchr(scheme_prefix + 3, '/'); |
| 1393 | if (cp && cp < anon_part) |
| 1394 | goto literal_copy; |
| 1395 | prefix_len = scheme_prefix - url + 3; |
| 1396 | } |
Jeff King | 21f9d0f | 2016-02-22 17:45:05 -0500 | [diff] [blame] | 1397 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, |
| 1398 | (int)anon_len, anon_part); |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1399 | literal_copy: |
| 1400 | return xstrdup(url); |
| 1401 | } |