Elijah Newren | 5579f44 | 2023-04-11 00:41:48 -0700 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 2 | #include "config.h" |
Elijah Newren | 32a8f51 | 2023-03-21 06:26:03 +0000 | [diff] [blame] | 3 | #include "environment.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 4 | #include "gettext.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 5 | #include "hex.h" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 6 | #include "refs.h" |
| 7 | #include "pkt-line.h" |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 8 | #include "sideband.h" |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 9 | #include "repository.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 10 | #include "object-store-ll.h" |
Elijah Newren | 6f2d743 | 2023-04-11 03:00:42 +0000 | [diff] [blame] | 11 | #include "oid-array.h" |
Junio C Hamano | f6b42a8 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 12 | #include "object.h" |
Johannes Schindelin | f0243f2 | 2005-10-28 04:48:32 +0200 | [diff] [blame] | 13 | #include "commit.h" |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 14 | #include "diff.h" |
| 15 | #include "revision.h" |
Jeff Hostetler | 10ac85c | 2017-12-08 15:58:39 +0000 | [diff] [blame] | 16 | #include "list-objects-filter-options.h" |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 17 | #include "run-command.h" |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 18 | #include "connect.h" |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 19 | #include "sigchain.h" |
Jeff King | ff5effd | 2012-08-03 12:19:16 -0400 | [diff] [blame] | 20 | #include "version.h" |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 21 | #include "string-list.h" |
Jeff King | dbbcd44 | 2020-07-28 16:23:39 -0400 | [diff] [blame] | 22 | #include "strvec.h" |
Elijah Newren | 74ea5c9 | 2023-04-11 03:00:38 +0000 | [diff] [blame] | 23 | #include "trace2.h" |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 24 | #include "protocol.h" |
Brandon Williams | a3d6b53 | 2018-03-14 11:31:41 -0700 | [diff] [blame] | 25 | #include "upload-pack.h" |
Derrick Stolee | 829a321 | 2018-08-20 18:24:34 +0000 | [diff] [blame] | 26 | #include "commit-graph.h" |
Derrick Stolee | ba3ca1e | 2018-07-20 16:33:13 +0000 | [diff] [blame] | 27 | #include "commit-reach.h" |
Taylor Blau | 120ad2b | 2020-04-30 13:48:50 -0600 | [diff] [blame] | 28 | #include "shallow.h" |
Elijah Newren | d48be35 | 2023-03-21 06:26:07 +0000 | [diff] [blame] | 29 | #include "write-or-die.h" |
Robert Coup | b8f58c2 | 2023-10-17 21:12:47 +0000 | [diff] [blame] | 30 | #include "json-writer.h" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 31 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 32 | /* Remember to update object flag allocation in object.h */ |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 33 | #define THEY_HAVE (1u << 11) |
| 34 | #define OUR_REF (1u << 12) |
| 35 | #define WANTED (1u << 13) |
| 36 | #define COMMON_KNOWN (1u << 14) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 37 | |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 38 | #define SHALLOW (1u << 16) |
| 39 | #define NOT_SHALLOW (1u << 17) |
| 40 | #define CLIENT_SHALLOW (1u << 18) |
Junio C Hamano | 390eb36 | 2013-01-28 21:49:57 -0800 | [diff] [blame] | 41 | #define HIDDEN_REF (1u << 19) |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 42 | |
Jonathan Tan | d1035ca | 2018-10-18 13:43:29 -0700 | [diff] [blame] | 43 | #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \ |
| 44 | NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF) |
| 45 | |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 46 | /* Enum for allowed unadvertised object request (UOR) */ |
| 47 | enum allow_uor { |
| 48 | /* Allow specifying sha1 if it is a ref tip. */ |
| 49 | ALLOW_TIP_SHA1 = 0x01, |
| 50 | /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */ |
| 51 | ALLOW_REACHABLE_SHA1 = 0x02, |
| 52 | /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */ |
| 53 | ALLOW_ANY_SHA1 = 0x07 |
| 54 | }; |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 55 | |
Christian Couder | a849728 | 2020-06-04 19:54:39 +0200 | [diff] [blame] | 56 | /* |
| 57 | * Please annotate, and if possible group together, fields used only |
| 58 | * for protocol v0 or only for protocol v2. |
| 59 | */ |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 60 | struct upload_pack_data { |
Christian Couder | a849728 | 2020-06-04 19:54:39 +0200 | [diff] [blame] | 61 | struct string_list symref; /* v0 only */ |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 62 | struct object_array want_obj; |
| 63 | struct object_array have_obj; |
Christian Couder | a849728 | 2020-06-04 19:54:39 +0200 | [diff] [blame] | 64 | struct oid_array haves; /* v2 only */ |
| 65 | struct string_list wanted_refs; /* v2 only */ |
Taylor Blau | c45841f | 2023-07-10 17:12:33 -0400 | [diff] [blame] | 66 | struct strvec hidden_refs; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 67 | |
| 68 | struct object_array shallows; |
| 69 | struct string_list deepen_not; |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 70 | struct object_array extra_edge_obj; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 71 | int depth; |
| 72 | timestamp_t deepen_since; |
| 73 | int deepen_rev_list; |
| 74 | int deepen_relative; |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 75 | int keepalive; |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 76 | int shallow_nr; |
Christian Couder | f01c791 | 2020-06-11 14:05:17 +0200 | [diff] [blame] | 77 | timestamp_t oldest_have; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 78 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 79 | unsigned int timeout; /* v0 only */ |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 80 | enum { |
| 81 | NO_MULTI_ACK = 0, |
| 82 | MULTI_ACK = 1, |
| 83 | MULTI_ACK_DETAILED = 2 |
| 84 | } multi_ack; /* v0 only */ |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 85 | |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 86 | /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */ |
| 87 | int use_sideband; |
| 88 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 89 | struct string_list uri_protocols; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 90 | enum allow_uor allow_uor; |
Christian Couder | f1514c6 | 2020-06-11 14:05:11 +0200 | [diff] [blame] | 91 | |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 92 | struct list_objects_filter_options filter_options; |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 93 | struct string_list allowed_filters; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 94 | |
| 95 | struct packet_writer writer; |
| 96 | |
Christian Couder | 339a984 | 2020-06-04 19:54:50 +0200 | [diff] [blame] | 97 | const char *pack_objects_hook; |
| 98 | |
Christian Couder | a849728 | 2020-06-04 19:54:39 +0200 | [diff] [blame] | 99 | unsigned stateless_rpc : 1; /* v0 only */ |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 100 | unsigned no_done : 1; /* v0 only */ |
| 101 | unsigned daemon_mode : 1; /* v0 only */ |
Christian Couder | 59a9026 | 2020-06-04 19:54:42 +0200 | [diff] [blame] | 102 | unsigned filter_capability_requested : 1; /* v0 only */ |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 103 | |
| 104 | unsigned use_thin_pack : 1; |
| 105 | unsigned use_ofs_delta : 1; |
| 106 | unsigned no_progress : 1; |
| 107 | unsigned use_include_tag : 1; |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 108 | unsigned wait_for_done : 1; |
Christian Couder | 59abe19 | 2020-06-04 19:54:47 +0200 | [diff] [blame] | 109 | unsigned allow_filter : 1; |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 110 | unsigned allow_filter_fallback : 1; |
Taylor Blau | 5b01a4e | 2020-08-03 14:00:17 -0400 | [diff] [blame] | 111 | unsigned long tree_filter_max_depth; |
Christian Couder | a849728 | 2020-06-04 19:54:39 +0200 | [diff] [blame] | 112 | |
| 113 | unsigned done : 1; /* v2 only */ |
Christian Couder | d1d7a94 | 2020-06-04 19:54:48 +0200 | [diff] [blame] | 114 | unsigned allow_ref_in_want : 1; /* v2 only */ |
Christian Couder | e3835cd | 2020-06-04 19:54:49 +0200 | [diff] [blame] | 115 | unsigned allow_sideband_all : 1; /* v2 only */ |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 116 | unsigned advertise_sid : 1; |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 117 | unsigned sent_capabilities : 1; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 118 | }; |
| 119 | |
| 120 | static void upload_pack_data_init(struct upload_pack_data *data) |
| 121 | { |
Christian Couder | 438528f | 2020-05-15 12:04:49 +0200 | [diff] [blame] | 122 | struct string_list symref = STRING_LIST_INIT_DUP; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 123 | struct string_list wanted_refs = STRING_LIST_INIT_DUP; |
Taylor Blau | c45841f | 2023-07-10 17:12:33 -0400 | [diff] [blame] | 124 | struct strvec hidden_refs = STRVEC_INIT; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 125 | struct object_array want_obj = OBJECT_ARRAY_INIT; |
| 126 | struct object_array have_obj = OBJECT_ARRAY_INIT; |
| 127 | struct oid_array haves = OID_ARRAY_INIT; |
| 128 | struct object_array shallows = OBJECT_ARRAY_INIT; |
| 129 | struct string_list deepen_not = STRING_LIST_INIT_DUP; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 130 | struct string_list uri_protocols = STRING_LIST_INIT_DUP; |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 131 | struct object_array extra_edge_obj = OBJECT_ARRAY_INIT; |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 132 | struct string_list allowed_filters = STRING_LIST_INIT_DUP; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 133 | |
| 134 | memset(data, 0, sizeof(*data)); |
Christian Couder | 438528f | 2020-05-15 12:04:49 +0200 | [diff] [blame] | 135 | data->symref = symref; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 136 | data->wanted_refs = wanted_refs; |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 137 | data->hidden_refs = hidden_refs; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 138 | data->want_obj = want_obj; |
| 139 | data->have_obj = have_obj; |
| 140 | data->haves = haves; |
| 141 | data->shallows = shallows; |
| 142 | data->deepen_not = deepen_not; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 143 | data->uri_protocols = uri_protocols; |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 144 | data->extra_edge_obj = extra_edge_obj; |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 145 | data->allowed_filters = allowed_filters; |
| 146 | data->allow_filter_fallback = 1; |
Taylor Blau | 5b01a4e | 2020-08-03 14:00:17 -0400 | [diff] [blame] | 147 | data->tree_filter_max_depth = ULONG_MAX; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 148 | packet_writer_init(&data->writer, 1); |
Jeff King | 2a01bde | 2022-09-11 01:03:07 -0400 | [diff] [blame] | 149 | list_objects_filter_init(&data->filter_options); |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 150 | |
| 151 | data->keepalive = 5; |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 152 | data->advertise_sid = 0; |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 153 | } |
| 154 | |
| 155 | static void upload_pack_data_clear(struct upload_pack_data *data) |
| 156 | { |
Christian Couder | 438528f | 2020-05-15 12:04:49 +0200 | [diff] [blame] | 157 | string_list_clear(&data->symref, 1); |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 158 | string_list_clear(&data->wanted_refs, 1); |
Taylor Blau | c45841f | 2023-07-10 17:12:33 -0400 | [diff] [blame] | 159 | strvec_clear(&data->hidden_refs); |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 160 | object_array_clear(&data->want_obj); |
| 161 | object_array_clear(&data->have_obj); |
| 162 | oid_array_clear(&data->haves); |
| 163 | object_array_clear(&data->shallows); |
| 164 | string_list_clear(&data->deepen_not, 0); |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 165 | object_array_clear(&data->extra_edge_obj); |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 166 | list_objects_filter_release(&data->filter_options); |
Taylor Blau | 8d133f5 | 2020-12-03 13:55:18 -0500 | [diff] [blame] | 167 | string_list_clear(&data->allowed_filters, 0); |
Christian Couder | 339a984 | 2020-06-04 19:54:50 +0200 | [diff] [blame] | 168 | |
| 169 | free((char *)data->pack_objects_hook); |
Christian Couder | e849832 | 2020-05-15 12:04:44 +0200 | [diff] [blame] | 170 | } |
| 171 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 172 | static void reset_timeout(unsigned int timeout) |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 173 | { |
| 174 | alarm(timeout); |
| 175 | } |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 176 | |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 177 | static void send_client_data(int fd, const char *data, ssize_t sz, |
| 178 | int use_sideband) |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 179 | { |
Lukas Fleischer | 4c4b7d1 | 2016-06-14 16:49:16 +0200 | [diff] [blame] | 180 | if (use_sideband) { |
| 181 | send_sideband(1, fd, data, sz, use_sideband); |
Lukas Fleischer | fcf0fe9 | 2016-06-14 16:49:17 +0200 | [diff] [blame] | 182 | return; |
Lukas Fleischer | 4c4b7d1 | 2016-06-14 16:49:16 +0200 | [diff] [blame] | 183 | } |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 184 | if (fd == 3) |
| 185 | /* emergency quit */ |
| 186 | fd = 2; |
| 187 | if (fd == 2) { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 188 | /* XXX: are we happy to lose stuff here? */ |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 189 | xwrite(fd, data, sz); |
Lukas Fleischer | fcf0fe9 | 2016-06-14 16:49:17 +0200 | [diff] [blame] | 190 | return; |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 191 | } |
Jeff King | cdf4fb8 | 2013-02-20 15:01:56 -0500 | [diff] [blame] | 192 | write_or_die(fd, data, sz); |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 193 | } |
| 194 | |
Nguyễn Thái Ngọc Duy | b790e0f | 2014-03-11 19:59:46 +0700 | [diff] [blame] | 195 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) |
| 196 | { |
| 197 | FILE *fp = cb_data; |
| 198 | if (graft->nr_parent == -1) |
brian m. carlson | 7683e2e | 2015-03-13 23:39:34 +0000 | [diff] [blame] | 199 | fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid)); |
Nguyễn Thái Ngọc Duy | b790e0f | 2014-03-11 19:59:46 +0700 | [diff] [blame] | 200 | return 0; |
| 201 | } |
| 202 | |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 203 | struct output_state { |
Jacob Vosmaer | 55a9651 | 2021-12-14 20:46:26 +0100 | [diff] [blame] | 204 | /* |
| 205 | * We do writes no bigger than LARGE_PACKET_DATA_MAX - 1, because with |
| 206 | * sideband-64k the band designator takes up 1 byte of space. Because |
| 207 | * relay_pack_data keeps the last byte to itself, we make the buffer 1 |
| 208 | * byte bigger than the intended maximum write size. |
| 209 | */ |
| 210 | char buffer[(LARGE_PACKET_DATA_MAX - 1) + 1]; |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 211 | int used; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 212 | unsigned packfile_uris_started : 1; |
| 213 | unsigned packfile_started : 1; |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 214 | }; |
| 215 | |
| 216 | static int relay_pack_data(int pack_objects_out, struct output_state *os, |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 217 | int use_sideband, int write_packfile_line) |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 218 | { |
| 219 | /* |
| 220 | * We keep the last byte to ourselves |
| 221 | * in case we detect broken rev-list, so that we |
| 222 | * can leave the stream corrupted. This is |
| 223 | * unfortunate -- unpack-objects would happily |
| 224 | * accept a valid packdata with trailing garbage, |
| 225 | * so appending garbage after we pass all the |
| 226 | * pack data is not good enough to signal |
| 227 | * breakage to downstream. |
| 228 | */ |
| 229 | ssize_t readsz; |
| 230 | |
| 231 | readsz = xread(pack_objects_out, os->buffer + os->used, |
| 232 | sizeof(os->buffer) - os->used); |
| 233 | if (readsz < 0) { |
| 234 | return readsz; |
| 235 | } |
| 236 | os->used += readsz; |
| 237 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 238 | while (!os->packfile_started) { |
| 239 | char *p; |
| 240 | if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) { |
| 241 | os->packfile_started = 1; |
| 242 | if (write_packfile_line) { |
| 243 | if (os->packfile_uris_started) |
| 244 | packet_delim(1); |
| 245 | packet_write_fmt(1, "\1packfile\n"); |
| 246 | } |
| 247 | break; |
| 248 | } |
| 249 | if ((p = memchr(os->buffer, '\n', os->used))) { |
| 250 | if (!os->packfile_uris_started) { |
| 251 | os->packfile_uris_started = 1; |
| 252 | if (!write_packfile_line) |
| 253 | BUG("packfile_uris requires sideband-all"); |
| 254 | packet_write_fmt(1, "\1packfile-uris\n"); |
| 255 | } |
| 256 | *p = '\0'; |
| 257 | packet_write_fmt(1, "\1%s\n", os->buffer); |
| 258 | |
| 259 | os->used -= p - os->buffer + 1; |
| 260 | memmove(os->buffer, p + 1, os->used); |
| 261 | } else { |
| 262 | /* |
| 263 | * Incomplete line. |
| 264 | */ |
| 265 | return readsz; |
| 266 | } |
| 267 | } |
| 268 | |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 269 | if (os->used > 1) { |
| 270 | send_client_data(1, os->buffer, os->used - 1, use_sideband); |
| 271 | os->buffer[0] = os->buffer[os->used - 1]; |
| 272 | os->used = 1; |
| 273 | } else { |
| 274 | send_client_data(1, os->buffer, os->used, use_sideband); |
| 275 | os->used = 0; |
| 276 | } |
| 277 | |
| 278 | return readsz; |
| 279 | } |
| 280 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 281 | static void create_pack_file(struct upload_pack_data *pack_data, |
| 282 | const struct string_list *uri_protocols) |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 283 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 284 | struct child_process pack_objects = CHILD_PROCESS_INIT; |
Jacob Vosmaer | 55a9651 | 2021-12-14 20:46:26 +0100 | [diff] [blame] | 285 | struct output_state *output_state = xcalloc(1, sizeof(struct output_state)); |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 286 | char progress[128]; |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 287 | char abort_msg[] = "aborting due to possible repository " |
| 288 | "corruption on the remote side."; |
Junio C Hamano | 1456b04 | 2009-12-10 12:17:11 -0800 | [diff] [blame] | 289 | ssize_t sz; |
Michael Procter | 65a3629 | 2016-02-25 12:13:26 +0000 | [diff] [blame] | 290 | int i; |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 291 | FILE *pipe_fd; |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 292 | |
Christian Couder | 339a984 | 2020-06-04 19:54:50 +0200 | [diff] [blame] | 293 | if (!pack_data->pack_objects_hook) |
Jeff King | 20b20a2 | 2016-05-18 18:45:37 -0400 | [diff] [blame] | 294 | pack_objects.git_cmd = 1; |
| 295 | else { |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 296 | strvec_push(&pack_objects.args, pack_data->pack_objects_hook); |
| 297 | strvec_push(&pack_objects.args, "git"); |
Jeff King | 20b20a2 | 2016-05-18 18:45:37 -0400 | [diff] [blame] | 298 | pack_objects.use_shell = 1; |
| 299 | } |
| 300 | |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 301 | if (pack_data->shallow_nr) { |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 302 | strvec_push(&pack_objects.args, "--shallow-file"); |
| 303 | strvec_push(&pack_objects.args, ""); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 304 | } |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 305 | strvec_push(&pack_objects.args, "pack-objects"); |
| 306 | strvec_push(&pack_objects.args, "--revs"); |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 307 | if (pack_data->use_thin_pack) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 308 | strvec_push(&pack_objects.args, "--thin"); |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 309 | |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 310 | strvec_push(&pack_objects.args, "--stdout"); |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 311 | if (pack_data->shallow_nr) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 312 | strvec_push(&pack_objects.args, "--shallow"); |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 313 | if (!pack_data->no_progress) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 314 | strvec_push(&pack_objects.args, "--progress"); |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 315 | if (pack_data->use_ofs_delta) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 316 | strvec_push(&pack_objects.args, "--delta-base-offset"); |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 317 | if (pack_data->use_include_tag) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 318 | strvec_push(&pack_objects.args, "--include-tag"); |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 319 | if (pack_data->filter_options.choice) { |
Matthew DeVore | cf9ceb5 | 2019-06-27 15:54:10 -0700 | [diff] [blame] | 320 | const char *spec = |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 321 | expand_list_objects_filter_spec(&pack_data->filter_options); |
Jacob Vosmaer | ad5df6b | 2021-01-28 17:04:53 +0100 | [diff] [blame] | 322 | strvec_pushf(&pack_objects.args, "--filter=%s", spec); |
Jeff Hostetler | 10ac85c | 2017-12-08 15:58:39 +0000 | [diff] [blame] | 323 | } |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 324 | if (uri_protocols) { |
| 325 | for (i = 0; i < uri_protocols->nr; i++) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 326 | strvec_pushf(&pack_objects.args, "--uri-protocol=%s", |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 327 | uri_protocols->items[i].string); |
| 328 | } |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 329 | |
Jeff King | b961219 | 2011-04-06 17:33:33 -0400 | [diff] [blame] | 330 | pack_objects.in = -1; |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 331 | pack_objects.out = -1; |
| 332 | pack_objects.err = -1; |
Jeff King | 309a402 | 2020-12-01 07:15:13 -0500 | [diff] [blame] | 333 | pack_objects.clean_on_exit = 1; |
Johannes Sixt | 21edd3f | 2007-10-19 21:48:03 +0200 | [diff] [blame] | 334 | |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 335 | if (start_command(&pack_objects)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 336 | die("git upload-pack: unable to fork git-pack-objects"); |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 337 | |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 338 | pipe_fd = xfdopen(pack_objects.in, "w"); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 339 | |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 340 | if (pack_data->shallow_nr) |
Nguyễn Thái Ngọc Duy | b790e0f | 2014-03-11 19:59:46 +0700 | [diff] [blame] | 341 | for_each_commit_graft(write_one_shallow, pipe_fd); |
| 342 | |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 343 | for (i = 0; i < pack_data->want_obj.nr; i++) |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 344 | fprintf(pipe_fd, "%s\n", |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 345 | oid_to_hex(&pack_data->want_obj.objects[i].item->oid)); |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 346 | fprintf(pipe_fd, "--not\n"); |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 347 | for (i = 0; i < pack_data->have_obj.nr; i++) |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 348 | fprintf(pipe_fd, "%s\n", |
Christian Couder | c9f0325 | 2020-05-15 12:04:53 +0200 | [diff] [blame] | 349 | oid_to_hex(&pack_data->have_obj.objects[i].item->oid)); |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 350 | for (i = 0; i < pack_data->extra_edge_obj.nr; i++) |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 351 | fprintf(pipe_fd, "%s\n", |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 352 | oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid)); |
Nguyễn Thái Ngọc Duy | cdab485 | 2013-08-16 16:52:05 +0700 | [diff] [blame] | 353 | fprintf(pipe_fd, "\n"); |
| 354 | fflush(pipe_fd); |
| 355 | fclose(pipe_fd); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 356 | |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 357 | /* We read from pack_objects.err to capture stderr output for |
| 358 | * progress bar, and pack_objects.out to capture the pack data. |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 359 | */ |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 360 | |
| 361 | while (1) { |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 362 | struct pollfd pfd[2]; |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 363 | int pe, pu, pollsize, polltimeout; |
Jeff King | 05e9515 | 2013-09-08 05:01:31 -0400 | [diff] [blame] | 364 | int ret; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 365 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 366 | reset_timeout(pack_data->timeout); |
Matthias Lederhofer | 0d516ad | 2006-07-18 19:14:51 +0200 | [diff] [blame] | 367 | |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 368 | pollsize = 0; |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 369 | pe = pu = -1; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 370 | |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 371 | if (0 <= pack_objects.out) { |
| 372 | pfd[pollsize].fd = pack_objects.out; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 373 | pfd[pollsize].events = POLLIN; |
| 374 | pu = pollsize; |
| 375 | pollsize++; |
| 376 | } |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 377 | if (0 <= pack_objects.err) { |
| 378 | pfd[pollsize].fd = pack_objects.err; |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 379 | pfd[pollsize].events = POLLIN; |
| 380 | pe = pollsize; |
| 381 | pollsize++; |
| 382 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 383 | |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 384 | if (!pollsize) |
| 385 | break; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 386 | |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 387 | polltimeout = pack_data->keepalive < 0 |
| 388 | ? -1 |
| 389 | : 1000 * pack_data->keepalive; |
| 390 | |
| 391 | ret = poll(pfd, pollsize, polltimeout); |
Edward Thomson | 6c71f8b | 2014-08-22 15:19:11 +0000 | [diff] [blame] | 392 | |
Jeff King | 05e9515 | 2013-09-08 05:01:31 -0400 | [diff] [blame] | 393 | if (ret < 0) { |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 394 | if (errno != EINTR) { |
Nguyễn Thái Ngọc Duy | d2b6afa | 2016-05-08 16:47:59 +0700 | [diff] [blame] | 395 | error_errno("poll failed, resuming"); |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 396 | sleep(1); |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 397 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 398 | continue; |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 399 | } |
Nicolas Pitre | 6b59f51 | 2009-11-11 17:24:42 -0500 | [diff] [blame] | 400 | if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) { |
| 401 | /* Status ready; we ship that in the side-band |
| 402 | * or dump to the standard error. |
| 403 | */ |
| 404 | sz = xread(pack_objects.err, progress, |
| 405 | sizeof(progress)); |
| 406 | if (0 < sz) |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 407 | send_client_data(2, progress, sz, |
| 408 | pack_data->use_sideband); |
Nicolas Pitre | 6b59f51 | 2009-11-11 17:24:42 -0500 | [diff] [blame] | 409 | else if (sz == 0) { |
| 410 | close(pack_objects.err); |
| 411 | pack_objects.err = -1; |
| 412 | } |
| 413 | else |
| 414 | goto fail; |
| 415 | /* give priority to status messages */ |
| 416 | continue; |
| 417 | } |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 418 | if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 419 | int result = relay_pack_data(pack_objects.out, |
Jacob Vosmaer | 55a9651 | 2021-12-14 20:46:26 +0100 | [diff] [blame] | 420 | output_state, |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 421 | pack_data->use_sideband, |
| 422 | !!uri_protocols); |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 423 | |
| 424 | if (result == 0) { |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 425 | close(pack_objects.out); |
| 426 | pack_objects.out = -1; |
Jonathan Tan | acaaca7 | 2020-06-10 13:57:21 -0700 | [diff] [blame] | 427 | } else if (result < 0) { |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 428 | goto fail; |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 429 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 430 | } |
Jeff King | 05e9515 | 2013-09-08 05:01:31 -0400 | [diff] [blame] | 431 | |
| 432 | /* |
| 433 | * We hit the keepalive timeout without saying anything; send |
| 434 | * an empty message on the data sideband just to let the other |
| 435 | * side know we're still working on it, but don't have any data |
| 436 | * yet. |
| 437 | * |
| 438 | * If we don't have a sideband channel, there's no room in the |
| 439 | * protocol to say anything, so those clients are just out of |
| 440 | * luck. |
| 441 | */ |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 442 | if (!ret && pack_data->use_sideband) { |
Jeff King | 05e9515 | 2013-09-08 05:01:31 -0400 | [diff] [blame] | 443 | static const char buf[] = "0005\1"; |
| 444 | write_or_die(1, buf, 5); |
| 445 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 446 | } |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 447 | |
| 448 | if (finish_command(&pack_objects)) { |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 449 | error("git upload-pack: git-pack-objects died with error."); |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 450 | goto fail; |
| 451 | } |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 452 | |
| 453 | /* flush the data */ |
Jacob Vosmaer | 55a9651 | 2021-12-14 20:46:26 +0100 | [diff] [blame] | 454 | if (output_state->used > 0) { |
| 455 | send_client_data(1, output_state->buffer, output_state->used, |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 456 | pack_data->use_sideband); |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 457 | fprintf(stderr, "flushed.\n"); |
| 458 | } |
Jacob Vosmaer | 55a9651 | 2021-12-14 20:46:26 +0100 | [diff] [blame] | 459 | free(output_state); |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 460 | if (pack_data->use_sideband) |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 461 | packet_flush(1); |
| 462 | return; |
| 463 | |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 464 | fail: |
Ævar Arnfjörð Bjarmason | c68d5db | 2022-07-28 01:13:42 +0200 | [diff] [blame] | 465 | free(output_state); |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 466 | send_client_data(3, abort_msg, sizeof(abort_msg), |
| 467 | pack_data->use_sideband); |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 468 | die("git upload-pack: %s", abort_msg); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 469 | } |
| 470 | |
Christian Couder | ea2c6e6 | 2020-06-11 14:05:18 +0200 | [diff] [blame] | 471 | static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 472 | { |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 473 | int we_knew_they_have = 0; |
Christian Couder | ea2c6e6 | 2020-06-11 14:05:18 +0200 | [diff] [blame] | 474 | struct object *o = parse_object(the_repository, oid); |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 475 | |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 476 | if (!o) |
brian m. carlson | cf93982 | 2017-05-06 22:10:28 +0000 | [diff] [blame] | 477 | die("oops (%s)", oid_to_hex(oid)); |
Junio C Hamano | 182a8da | 2006-08-12 22:16:51 -0700 | [diff] [blame] | 478 | if (o->type == OBJ_COMMIT) { |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 479 | struct commit_list *parents; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 480 | struct commit *commit = (struct commit *)o; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 481 | if (o->flags & THEY_HAVE) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 482 | we_knew_they_have = 1; |
| 483 | else |
| 484 | o->flags |= THEY_HAVE; |
Christian Couder | f01c791 | 2020-06-11 14:05:17 +0200 | [diff] [blame] | 485 | if (!data->oldest_have || (commit->date < data->oldest_have)) |
| 486 | data->oldest_have = commit->date; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 487 | for (parents = commit->parents; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 488 | parents; |
| 489 | parents = parents->next) |
| 490 | parents->item->object.flags |= THEY_HAVE; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 491 | } |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 492 | if (!we_knew_they_have) { |
Christian Couder | 460ed0d | 2020-06-11 14:05:16 +0200 | [diff] [blame] | 493 | add_object_array(o, NULL, &data->have_obj); |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 494 | return 1; |
| 495 | } |
| 496 | return 0; |
| 497 | } |
| 498 | |
Christian Couder | ea2c6e6 | 2020-06-11 14:05:18 +0200 | [diff] [blame] | 499 | static int got_oid(struct upload_pack_data *data, |
| 500 | const char *hex, struct object_id *oid) |
| 501 | { |
| 502 | if (get_oid_hex(hex, oid)) |
| 503 | die("git upload-pack: expected SHA1 object, got '%s'", hex); |
Ævar Arnfjörð Bjarmason | bc726bd | 2023-03-28 15:58:50 +0200 | [diff] [blame] | 504 | if (!repo_has_object_file_with_flags(the_repository, oid, |
| 505 | OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) |
Christian Couder | ea2c6e6 | 2020-06-11 14:05:18 +0200 | [diff] [blame] | 506 | return -1; |
| 507 | return do_got_oid(data, oid); |
| 508 | } |
| 509 | |
Christian Couder | 0866734 | 2020-06-11 14:05:15 +0200 | [diff] [blame] | 510 | static int ok_to_give_up(struct upload_pack_data *data) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 511 | { |
Abhishek Kumar | d7f9278 | 2021-01-16 18:11:13 +0000 | [diff] [blame] | 512 | timestamp_t min_generation = GENERATION_NUMBER_ZERO; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 513 | |
Christian Couder | 0866734 | 2020-06-11 14:05:15 +0200 | [diff] [blame] | 514 | if (!data->have_obj.nr) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 515 | return 0; |
| 516 | |
Christian Couder | 0866734 | 2020-06-11 14:05:15 +0200 | [diff] [blame] | 517 | return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE, |
Christian Couder | f01c791 | 2020-06-11 14:05:17 +0200 | [diff] [blame] | 518 | COMMON_KNOWN, data->oldest_have, |
Derrick Stolee | 4fbcca4 | 2018-07-20 16:33:28 +0000 | [diff] [blame] | 519 | min_generation); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 520 | } |
| 521 | |
Christian Couder | 0797769 | 2020-05-15 12:04:46 +0200 | [diff] [blame] | 522 | static int get_common_commits(struct upload_pack_data *data, |
| 523 | struct packet_reader *reader) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 524 | { |
brian m. carlson | cf93982 | 2017-05-06 22:10:28 +0000 | [diff] [blame] | 525 | struct object_id oid; |
| 526 | char last_hex[GIT_MAX_HEXSZ + 1]; |
Shawn O. Pearce | 49bee71 | 2011-03-14 16:48:39 -0700 | [diff] [blame] | 527 | int got_common = 0; |
| 528 | int got_other = 0; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 529 | int sent_ready = 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 530 | |
Johannes Schindelin | f0243f2 | 2005-10-28 04:48:32 +0200 | [diff] [blame] | 531 | save_commit_buffer = 0; |
| 532 | |
Brian Gianforcaro | eeefa7c | 2009-09-01 01:35:10 -0400 | [diff] [blame] | 533 | for (;;) { |
Nguyễn Thái Ngọc Duy | 8bf3b75 | 2016-06-12 17:53:49 +0700 | [diff] [blame] | 534 | const char *arg; |
| 535 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 536 | reset_timeout(data->timeout); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 537 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 538 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) { |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 539 | if (data->multi_ack == MULTI_ACK_DETAILED |
Christian Couder | 0797769 | 2020-05-15 12:04:46 +0200 | [diff] [blame] | 540 | && got_common |
| 541 | && !got_other |
Christian Couder | 0866734 | 2020-06-11 14:05:15 +0200 | [diff] [blame] | 542 | && ok_to_give_up(data)) { |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 543 | sent_ready = 1; |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 544 | packet_write_fmt(1, "ACK %s ready\n", last_hex); |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 545 | } |
Christian Couder | 53d6950 | 2020-06-04 19:54:43 +0200 | [diff] [blame] | 546 | if (data->have_obj.nr == 0 || data->multi_ack) |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 547 | packet_write_fmt(1, "NAK\n"); |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 548 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 549 | if (data->no_done && sent_ready) { |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 550 | packet_write_fmt(1, "ACK %s\n", last_hex); |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 551 | return 0; |
| 552 | } |
Christian Couder | df654ab | 2020-05-15 12:04:52 +0200 | [diff] [blame] | 553 | if (data->stateless_rpc) |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 554 | exit(0); |
Shawn O. Pearce | 49bee71 | 2011-03-14 16:48:39 -0700 | [diff] [blame] | 555 | got_common = 0; |
| 556 | got_other = 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 557 | continue; |
| 558 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 559 | if (skip_prefix(reader->line, "have ", &arg)) { |
Christian Couder | 460ed0d | 2020-06-11 14:05:16 +0200 | [diff] [blame] | 560 | switch (got_oid(data, arg, &oid)) { |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 561 | case -1: /* they have what we do not */ |
Shawn O. Pearce | 49bee71 | 2011-03-14 16:48:39 -0700 | [diff] [blame] | 562 | got_other = 1; |
Christian Couder | 53d6950 | 2020-06-04 19:54:43 +0200 | [diff] [blame] | 563 | if (data->multi_ack |
Christian Couder | 0866734 | 2020-06-11 14:05:15 +0200 | [diff] [blame] | 564 | && ok_to_give_up(data)) { |
brian m. carlson | cf93982 | 2017-05-06 22:10:28 +0000 | [diff] [blame] | 565 | const char *hex = oid_to_hex(&oid); |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 566 | if (data->multi_ack == MULTI_ACK_DETAILED) { |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 567 | sent_ready = 1; |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 568 | packet_write_fmt(1, "ACK %s ready\n", hex); |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 569 | } else |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 570 | packet_write_fmt(1, "ACK %s continue\n", hex); |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 571 | } |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 572 | break; |
| 573 | default: |
Shawn O. Pearce | 49bee71 | 2011-03-14 16:48:39 -0700 | [diff] [blame] | 574 | got_common = 1; |
brian m. carlson | 55dc227 | 2018-05-02 00:25:51 +0000 | [diff] [blame] | 575 | oid_to_hex_r(last_hex, &oid); |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 576 | if (data->multi_ack == MULTI_ACK_DETAILED) |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 577 | packet_write_fmt(1, "ACK %s common\n", last_hex); |
Christian Couder | 53d6950 | 2020-06-04 19:54:43 +0200 | [diff] [blame] | 578 | else if (data->multi_ack) |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 579 | packet_write_fmt(1, "ACK %s continue\n", last_hex); |
Christian Couder | 0797769 | 2020-05-15 12:04:46 +0200 | [diff] [blame] | 580 | else if (data->have_obj.nr == 1) |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 581 | packet_write_fmt(1, "ACK %s\n", last_hex); |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 582 | break; |
Junio C Hamano | af2d3aa | 2005-10-25 14:55:24 -0700 | [diff] [blame] | 583 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 584 | continue; |
| 585 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 586 | if (!strcmp(reader->line, "done")) { |
Christian Couder | 0797769 | 2020-05-15 12:04:46 +0200 | [diff] [blame] | 587 | if (data->have_obj.nr > 0) { |
Christian Couder | 53d6950 | 2020-06-04 19:54:43 +0200 | [diff] [blame] | 588 | if (data->multi_ack) |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 589 | packet_write_fmt(1, "ACK %s\n", last_hex); |
Johannes Schindelin | 1bd8c8f | 2005-10-28 04:49:16 +0200 | [diff] [blame] | 590 | return 0; |
| 591 | } |
Lars Schneider | 81c634e | 2016-10-16 16:20:29 -0700 | [diff] [blame] | 592 | packet_write_fmt(1, "NAK\n"); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 593 | return -1; |
| 594 | } |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 595 | die("git upload-pack: expected SHA1 list, got '%s'", reader->line); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 596 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 597 | } |
| 598 | |
Taylor Blau | 18b6b1b | 2023-07-10 17:12:45 -0400 | [diff] [blame] | 599 | static int allow_hidden_refs(enum allow_uor allow_uor) |
| 600 | { |
| 601 | if ((allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1) |
| 602 | return 1; |
| 603 | return !(allow_uor & (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)); |
| 604 | } |
| 605 | |
| 606 | static void for_each_namespaced_ref_1(each_ref_fn fn, |
| 607 | struct upload_pack_data *data) |
| 608 | { |
| 609 | const char **excludes = NULL; |
| 610 | /* |
| 611 | * If `data->allow_uor` allows fetching hidden refs, we need to |
| 612 | * mark all references (including hidden ones), to check in |
| 613 | * `is_our_ref()` below. |
| 614 | * |
| 615 | * Otherwise, we only care about whether each reference's object |
| 616 | * has the OUR_REF bit set or not, so do not need to visit |
| 617 | * hidden references. |
| 618 | */ |
| 619 | if (allow_hidden_refs(data->allow_uor)) |
| 620 | excludes = hidden_refs_to_excludes(&data->hidden_refs); |
| 621 | |
| 622 | for_each_namespaced_ref(excludes, fn, data); |
| 623 | } |
| 624 | |
| 625 | |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 626 | static int is_our_ref(struct object *o, enum allow_uor allow_uor) |
Junio C Hamano | 390eb36 | 2013-01-28 21:49:57 -0800 | [diff] [blame] | 627 | { |
Taylor Blau | 18b6b1b | 2023-07-10 17:12:45 -0400 | [diff] [blame] | 628 | return o->flags & ((allow_hidden_refs(allow_uor) ? 0 : HIDDEN_REF) | OUR_REF); |
Junio C Hamano | 390eb36 | 2013-01-28 21:49:57 -0800 | [diff] [blame] | 629 | } |
| 630 | |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 631 | /* |
| 632 | * on successful case, it's up to the caller to close cmd->out |
| 633 | */ |
| 634 | static int do_reachable_revlist(struct child_process *cmd, |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 635 | struct object_array *src, |
Christian Couder | f1514c6 | 2020-06-11 14:05:11 +0200 | [diff] [blame] | 636 | struct object_array *reachable, |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 637 | enum allow_uor allow_uor) |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 638 | { |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 639 | struct object *o; |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 640 | FILE *cmd_in = NULL; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 641 | int i; |
| 642 | |
Ævar Arnfjörð Bjarmason | 2b70989 | 2021-11-25 23:52:20 +0100 | [diff] [blame] | 643 | strvec_pushl(&cmd->args, "rev-list", "--stdin", NULL); |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 644 | cmd->git_cmd = 1; |
| 645 | cmd->no_stderr = 1; |
| 646 | cmd->in = -1; |
| 647 | cmd->out = -1; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 648 | |
| 649 | /* |
Nguyễn Thái Ngọc Duy | 7fcbd37 | 2016-06-12 17:53:51 +0700 | [diff] [blame] | 650 | * If the next rev-list --stdin encounters an unknown commit, |
| 651 | * it terminates, which will cause SIGPIPE in the write loop |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 652 | * below. |
| 653 | */ |
| 654 | sigchain_push(SIGPIPE, SIG_IGN); |
| 655 | |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 656 | if (start_command(cmd)) |
Nguyễn Thái Ngọc Duy | 7fcbd37 | 2016-06-12 17:53:51 +0700 | [diff] [blame] | 657 | goto error; |
| 658 | |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 659 | cmd_in = xfdopen(cmd->in, "w"); |
| 660 | |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 661 | for (i = get_max_object_index(); 0 < i; ) { |
| 662 | o = get_indexed_object(--i); |
Brian Harring | 2a74532 | 2011-08-23 22:47:17 -0700 | [diff] [blame] | 663 | if (!o) |
| 664 | continue; |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 665 | if (reachable && o->type == OBJ_COMMIT) |
| 666 | o->flags &= ~TMP_MARK; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 667 | if (!is_our_ref(o, allow_uor)) |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 668 | continue; |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 669 | if (fprintf(cmd_in, "^%s\n", oid_to_hex(&o->oid)) < 0) |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 670 | goto error; |
| 671 | } |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 672 | for (i = 0; i < src->nr; i++) { |
| 673 | o = src->objects[i].item; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 674 | if (is_our_ref(o, allow_uor)) { |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 675 | if (reachable) |
| 676 | add_object_array(o, NULL, reachable); |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 677 | continue; |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 678 | } |
| 679 | if (reachable && o->type == OBJ_COMMIT) |
| 680 | o->flags |= TMP_MARK; |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 681 | if (fprintf(cmd_in, "%s\n", oid_to_hex(&o->oid)) < 0) |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 682 | goto error; |
| 683 | } |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 684 | if (ferror(cmd_in) || fflush(cmd_in)) |
| 685 | goto error; |
| 686 | fclose(cmd_in); |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 687 | cmd->in = -1; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 688 | sigchain_pop(SIGPIPE); |
| 689 | |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 690 | return 0; |
| 691 | |
| 692 | error: |
| 693 | sigchain_pop(SIGPIPE); |
| 694 | |
René Scharfe | a698d67 | 2020-08-12 18:52:55 +0200 | [diff] [blame] | 695 | if (cmd_in) |
| 696 | fclose(cmd_in); |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 697 | if (cmd->out >= 0) |
| 698 | close(cmd->out); |
| 699 | return -1; |
| 700 | } |
| 701 | |
Christian Couder | f1514c6 | 2020-06-11 14:05:11 +0200 | [diff] [blame] | 702 | static int get_reachable_list(struct upload_pack_data *data, |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 703 | struct object_array *reachable) |
| 704 | { |
| 705 | struct child_process cmd = CHILD_PROCESS_INIT; |
| 706 | int i; |
| 707 | struct object *o; |
brian m. carlson | 55dc227 | 2018-05-02 00:25:51 +0000 | [diff] [blame] | 708 | char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ |
| 709 | const unsigned hexsz = the_hash_algo->hexsz; |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 710 | |
Christian Couder | f1514c6 | 2020-06-11 14:05:11 +0200 | [diff] [blame] | 711 | if (do_reachable_revlist(&cmd, &data->shallows, reachable, |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 712 | data->allow_uor) < 0) |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 713 | return -1; |
| 714 | |
brian m. carlson | 55dc227 | 2018-05-02 00:25:51 +0000 | [diff] [blame] | 715 | while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) { |
Jeff King | 62b89d4 | 2019-06-20 03:40:54 -0400 | [diff] [blame] | 716 | struct object_id oid; |
brian m. carlson | 55dc227 | 2018-05-02 00:25:51 +0000 | [diff] [blame] | 717 | const char *p; |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 718 | |
Jeff King | 62b89d4 | 2019-06-20 03:40:54 -0400 | [diff] [blame] | 719 | if (parse_oid_hex(namebuf, &oid, &p) || *p != '\n') |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 720 | break; |
| 721 | |
Jeff King | d0229ab | 2019-06-20 03:41:14 -0400 | [diff] [blame] | 722 | o = lookup_object(the_repository, &oid); |
Nguyễn Thái Ngọc Duy | 079aa97 | 2016-06-12 17:54:08 +0700 | [diff] [blame] | 723 | if (o && o->type == OBJ_COMMIT) { |
| 724 | o->flags &= ~TMP_MARK; |
| 725 | } |
| 726 | } |
| 727 | for (i = get_max_object_index(); 0 < i; i--) { |
| 728 | o = get_indexed_object(i - 1); |
| 729 | if (o && o->type == OBJ_COMMIT && |
| 730 | (o->flags & TMP_MARK)) { |
| 731 | add_object_array(o, NULL, reachable); |
| 732 | o->flags &= ~TMP_MARK; |
| 733 | } |
| 734 | } |
| 735 | close(cmd.out); |
| 736 | |
| 737 | if (finish_command(&cmd)) |
| 738 | return -1; |
| 739 | |
| 740 | return 0; |
| 741 | } |
| 742 | |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 743 | static int has_unreachable(struct object_array *src, enum allow_uor allow_uor) |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 744 | { |
| 745 | struct child_process cmd = CHILD_PROCESS_INIT; |
| 746 | char buf[1]; |
| 747 | int i; |
| 748 | |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 749 | if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0) |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 750 | return 1; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 751 | |
| 752 | /* |
| 753 | * The commits out of the rev-list are not ancestors of |
| 754 | * our ref. |
| 755 | */ |
Nguyễn Thái Ngọc Duy | 2997178 | 2016-06-12 17:54:07 +0700 | [diff] [blame] | 756 | i = read_in_full(cmd.out, buf, 1); |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 757 | if (i) |
| 758 | goto error; |
| 759 | close(cmd.out); |
Nguyễn Thái Ngọc Duy | 7fcbd37 | 2016-06-12 17:53:51 +0700 | [diff] [blame] | 760 | cmd.out = -1; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 761 | |
| 762 | /* |
| 763 | * rev-list may have died by encountering a bad commit |
| 764 | * in the history, in which case we do want to bail out |
| 765 | * even when it showed no commit. |
| 766 | */ |
| 767 | if (finish_command(&cmd)) |
| 768 | goto error; |
| 769 | |
| 770 | /* All the non-tip ones are ancestors of what we advertised */ |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 771 | return 0; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 772 | |
| 773 | error: |
Nguyễn Thái Ngọc Duy | 7fcbd37 | 2016-06-12 17:53:51 +0700 | [diff] [blame] | 774 | if (cmd.out >= 0) |
| 775 | close(cmd.out); |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 776 | return 1; |
| 777 | } |
Nguyễn Thái Ngọc Duy | 7fcbd37 | 2016-06-12 17:53:51 +0700 | [diff] [blame] | 778 | |
Christian Couder | b08c974 | 2020-05-15 12:04:51 +0200 | [diff] [blame] | 779 | static void check_non_tip(struct upload_pack_data *data) |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 780 | { |
| 781 | int i; |
| 782 | |
| 783 | /* |
| 784 | * In the normal in-process case without |
| 785 | * uploadpack.allowReachableSHA1InWant, |
| 786 | * non-tip requests can never happen. |
| 787 | */ |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 788 | if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1)) |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 789 | goto error; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 790 | if (!has_unreachable(&data->want_obj, data->allow_uor)) |
Nguyễn Thái Ngọc Duy | 3f0f662 | 2016-06-12 17:53:52 +0700 | [diff] [blame] | 791 | /* All the non-tip ones are ancestors of what we advertised */ |
| 792 | return; |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 793 | |
| 794 | error: |
| 795 | /* Pick one of them (we know there at least is one) */ |
Christian Couder | b08c974 | 2020-05-15 12:04:51 +0200 | [diff] [blame] | 796 | for (i = 0; i < data->want_obj.nr; i++) { |
| 797 | struct object *o = data->want_obj.objects[i].item; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 798 | if (!is_our_ref(o, data->allow_uor)) { |
Derrick Stolee | 7ba7c52 | 2023-08-10 14:40:50 +0000 | [diff] [blame] | 799 | error("git upload-pack: not our ref %s", |
| 800 | oid_to_hex(&o->oid)); |
Christian Couder | b08c974 | 2020-05-15 12:04:51 +0200 | [diff] [blame] | 801 | packet_writer_error(&data->writer, |
Jeff King | 014ade7 | 2019-04-13 01:53:34 -0400 | [diff] [blame] | 802 | "upload-pack: not our ref %s", |
| 803 | oid_to_hex(&o->oid)); |
Patrick Steinhardt | 5f33a84 | 2023-08-16 08:06:59 +0200 | [diff] [blame] | 804 | exit(128); |
Jeff King | 014ade7 | 2019-04-13 01:53:34 -0400 | [diff] [blame] | 805 | } |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 806 | } |
| 807 | } |
| 808 | |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 809 | static void send_shallow(struct upload_pack_data *data, |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 810 | struct commit_list *result) |
Nguyễn Thái Ngọc Duy | 5c24cde | 2016-06-12 17:53:46 +0700 | [diff] [blame] | 811 | { |
| 812 | while (result) { |
| 813 | struct object *object = &result->item->object; |
| 814 | if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 815 | packet_writer_write(&data->writer, "shallow %s", |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 816 | oid_to_hex(&object->oid)); |
Stefan Beller | 19143f1 | 2018-05-17 15:51:44 -0700 | [diff] [blame] | 817 | register_shallow(the_repository, &object->oid); |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 818 | data->shallow_nr++; |
Nguyễn Thái Ngọc Duy | 5c24cde | 2016-06-12 17:53:46 +0700 | [diff] [blame] | 819 | } |
| 820 | result = result->next; |
| 821 | } |
| 822 | } |
| 823 | |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 824 | static void send_unshallow(struct upload_pack_data *data) |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 825 | { |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 826 | int i; |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 827 | |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 828 | for (i = 0; i < data->shallows.nr; i++) { |
| 829 | struct object *object = data->shallows.objects[i].item; |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 830 | if (object->flags & NOT_SHALLOW) { |
| 831 | struct commit_list *parents; |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 832 | packet_writer_write(&data->writer, "unshallow %s", |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 833 | oid_to_hex(&object->oid)); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 834 | object->flags &= ~CLIENT_SHALLOW; |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 835 | /* |
| 836 | * We want to _register_ "object" as shallow, but we |
| 837 | * also need to traverse object's parents to deepen a |
| 838 | * shallow clone. Unregister it for now so we can |
| 839 | * parse and add the parents to the want list, then |
| 840 | * re-register it. |
| 841 | */ |
brian m. carlson | e92b848 | 2017-05-06 22:10:06 +0000 | [diff] [blame] | 842 | unregister_shallow(&object->oid); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 843 | object->parsed = 0; |
| 844 | parse_commit_or_die((struct commit *)object); |
| 845 | parents = ((struct commit *)object)->parents; |
| 846 | while (parents) { |
| 847 | add_object_array(&parents->item->object, |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 848 | NULL, &data->want_obj); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 849 | parents = parents->next; |
| 850 | } |
Christian Couder | de0e9f7 | 2020-06-11 14:05:10 +0200 | [diff] [blame] | 851 | add_object_array(object, NULL, &data->extra_edge_obj); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 852 | } |
| 853 | /* make sure commit traversal conforms to client */ |
Stefan Beller | 19143f1 | 2018-05-17 15:51:44 -0700 | [diff] [blame] | 854 | register_shallow(the_repository, &object->oid); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 855 | } |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 856 | } |
| 857 | |
Jonathan Tan | 5056cf4 | 2018-12-18 13:24:35 -0800 | [diff] [blame] | 858 | static int check_ref(const char *refname_full, const struct object_id *oid, |
| 859 | int flag, void *cb_data); |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 860 | static void deepen(struct upload_pack_data *data, int depth) |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 861 | { |
Stefan Beller | c881348 | 2018-05-17 15:51:46 -0700 | [diff] [blame] | 862 | if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) { |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 863 | int i; |
| 864 | |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 865 | for (i = 0; i < data->shallows.nr; i++) { |
| 866 | struct object *object = data->shallows.objects[i].item; |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 867 | object->flags |= NOT_SHALLOW; |
| 868 | } |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 869 | } else if (data->deepen_relative) { |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 870 | struct object_array reachable_shallows = OBJECT_ARRAY_INIT; |
| 871 | struct commit_list *result; |
| 872 | |
Jonathan Tan | 5056cf4 | 2018-12-18 13:24:35 -0800 | [diff] [blame] | 873 | /* |
| 874 | * Checking for reachable shallows requires that our refs be |
| 875 | * marked with OUR_REF. |
| 876 | */ |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 877 | head_ref_namespaced(check_ref, data); |
Taylor Blau | 18b6b1b | 2023-07-10 17:12:45 -0400 | [diff] [blame] | 878 | for_each_namespaced_ref_1(check_ref, data); |
Jonathan Tan | 5056cf4 | 2018-12-18 13:24:35 -0800 | [diff] [blame] | 879 | |
Christian Couder | f1514c6 | 2020-06-11 14:05:11 +0200 | [diff] [blame] | 880 | get_reachable_list(data, &reachable_shallows); |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 881 | result = get_shallow_commits(&reachable_shallows, |
| 882 | depth + 1, |
| 883 | SHALLOW, NOT_SHALLOW); |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 884 | send_shallow(data, result); |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 885 | free_commit_list(result); |
| 886 | object_array_clear(&reachable_shallows); |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 887 | } else { |
| 888 | struct commit_list *result; |
| 889 | |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 890 | result = get_shallow_commits(&data->want_obj, depth, |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 891 | SHALLOW, NOT_SHALLOW); |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 892 | send_shallow(data, result); |
Nguyễn Thái Ngọc Duy | 873700c | 2016-06-12 17:53:48 +0700 | [diff] [blame] | 893 | free_commit_list(result); |
| 894 | } |
| 895 | |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 896 | send_unshallow(data); |
Nguyễn Thái Ngọc Duy | e8e44de | 2016-06-12 17:53:45 +0700 | [diff] [blame] | 897 | } |
| 898 | |
Christian Couder | 446e42c | 2020-06-11 14:05:07 +0200 | [diff] [blame] | 899 | static void deepen_by_rev_list(struct upload_pack_data *data, |
| 900 | int ac, |
| 901 | const char **av) |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 902 | { |
| 903 | struct commit_list *result; |
| 904 | |
Jeff King | 6abada1 | 2019-09-12 10:44:45 -0400 | [diff] [blame] | 905 | disable_commit_graph(the_repository); |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 906 | result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 907 | send_shallow(data, result); |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 908 | free_commit_list(result); |
Christian Couder | 329f996 | 2020-06-11 14:05:08 +0200 | [diff] [blame] | 909 | send_unshallow(data); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 910 | } |
| 911 | |
| 912 | /* Returns 1 if a shallow list is sent or 0 otherwise */ |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 913 | static int send_shallow_list(struct upload_pack_data *data) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 914 | { |
| 915 | int ret = 0; |
| 916 | |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 917 | if (data->depth > 0 && data->deepen_rev_list) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 918 | die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together"); |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 919 | if (data->depth > 0) { |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 920 | deepen(data, data->depth); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 921 | ret = 1; |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 922 | } else if (data->deepen_rev_list) { |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 923 | struct strvec av = STRVEC_INIT; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 924 | int i; |
| 925 | |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 926 | strvec_push(&av, "rev-list"); |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 927 | if (data->deepen_since) |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 928 | strvec_pushf(&av, "--max-age=%"PRItime, data->deepen_since); |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 929 | if (data->deepen_not.nr) { |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 930 | strvec_push(&av, "--not"); |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 931 | for (i = 0; i < data->deepen_not.nr; i++) { |
| 932 | struct string_list_item *s = data->deepen_not.items + i; |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 933 | strvec_push(&av, s->string); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 934 | } |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 935 | strvec_push(&av, "--not"); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 936 | } |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 937 | for (i = 0; i < data->want_obj.nr; i++) { |
| 938 | struct object *o = data->want_obj.objects[i].item; |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 939 | strvec_push(&av, oid_to_hex(&o->oid)); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 940 | } |
Jeff King | d70a9eb | 2020-07-28 20:37:20 -0400 | [diff] [blame] | 941 | deepen_by_rev_list(data, av.nr, av.v); |
Jeff King | c972bf4 | 2020-07-28 16:25:12 -0400 | [diff] [blame] | 942 | strvec_clear(&av); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 943 | ret = 1; |
| 944 | } else { |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 945 | if (data->shallows.nr > 0) { |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 946 | int i; |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 947 | for (i = 0; i < data->shallows.nr; i++) |
Junio C Hamano | 00624d6 | 2018-07-18 12:20:27 -0700 | [diff] [blame] | 948 | register_shallow(the_repository, |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 949 | &data->shallows.objects[i].item->oid); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 950 | } |
| 951 | } |
| 952 | |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 953 | data->shallow_nr += data->shallows.nr; |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 954 | return ret; |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 955 | } |
| 956 | |
Brandon Williams | ae2948f | 2018-03-14 11:31:42 -0700 | [diff] [blame] | 957 | static int process_shallow(const char *line, struct object_array *shallows) |
| 958 | { |
| 959 | const char *arg; |
| 960 | if (skip_prefix(line, "shallow ", &arg)) { |
| 961 | struct object_id oid; |
| 962 | struct object *object; |
| 963 | if (get_oid_hex(arg, &oid)) |
| 964 | die("invalid shallow line: %s", line); |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 965 | object = parse_object(the_repository, &oid); |
Brandon Williams | ae2948f | 2018-03-14 11:31:42 -0700 | [diff] [blame] | 966 | if (!object) |
| 967 | return 1; |
| 968 | if (object->type != OBJ_COMMIT) |
| 969 | die("invalid shallow object %s", oid_to_hex(&oid)); |
| 970 | if (!(object->flags & CLIENT_SHALLOW)) { |
| 971 | object->flags |= CLIENT_SHALLOW; |
| 972 | add_object_array(object, NULL, shallows); |
| 973 | } |
| 974 | return 1; |
| 975 | } |
| 976 | |
| 977 | return 0; |
| 978 | } |
| 979 | |
| 980 | static int process_deepen(const char *line, int *depth) |
| 981 | { |
| 982 | const char *arg; |
| 983 | if (skip_prefix(line, "deepen ", &arg)) { |
| 984 | char *end = NULL; |
| 985 | *depth = (int)strtol(arg, &end, 0); |
| 986 | if (!end || *end || *depth <= 0) |
| 987 | die("Invalid deepen: %s", line); |
| 988 | return 1; |
| 989 | } |
| 990 | |
| 991 | return 0; |
| 992 | } |
| 993 | |
| 994 | static int process_deepen_since(const char *line, timestamp_t *deepen_since, int *deepen_rev_list) |
| 995 | { |
| 996 | const char *arg; |
| 997 | if (skip_prefix(line, "deepen-since ", &arg)) { |
| 998 | char *end = NULL; |
| 999 | *deepen_since = parse_timestamp(arg, &end, 0); |
| 1000 | if (!end || *end || !deepen_since || |
| 1001 | /* revisions.c's max_age -1 is special */ |
| 1002 | *deepen_since == -1) |
| 1003 | die("Invalid deepen-since: %s", line); |
| 1004 | *deepen_rev_list = 1; |
| 1005 | return 1; |
| 1006 | } |
| 1007 | return 0; |
| 1008 | } |
| 1009 | |
| 1010 | static int process_deepen_not(const char *line, struct string_list *deepen_not, int *deepen_rev_list) |
| 1011 | { |
| 1012 | const char *arg; |
| 1013 | if (skip_prefix(line, "deepen-not ", &arg)) { |
| 1014 | char *ref = NULL; |
| 1015 | struct object_id oid; |
Nguyễn Thái Ngọc Duy | 0b1dbf5 | 2019-04-06 18:34:27 +0700 | [diff] [blame] | 1016 | if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1) |
Brandon Williams | ae2948f | 2018-03-14 11:31:42 -0700 | [diff] [blame] | 1017 | die("git upload-pack: ambiguous deepen-not: %s", line); |
| 1018 | string_list_append(deepen_not, ref); |
| 1019 | free(ref); |
| 1020 | *deepen_rev_list = 1; |
| 1021 | return 1; |
| 1022 | } |
| 1023 | return 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1024 | } |
| 1025 | |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1026 | NORETURN __attribute__((format(printf,2,3))) |
| 1027 | static void send_err_and_die(struct upload_pack_data *data, |
| 1028 | const char *fmt, ...) |
| 1029 | { |
| 1030 | struct strbuf buf = STRBUF_INIT; |
| 1031 | va_list ap; |
| 1032 | |
| 1033 | va_start(ap, fmt); |
| 1034 | strbuf_vaddf(&buf, fmt, ap); |
| 1035 | va_end(ap); |
| 1036 | |
| 1037 | packet_writer_error(&data->writer, "%s", buf.buf); |
| 1038 | die("%s", buf.buf); |
| 1039 | } |
| 1040 | |
| 1041 | static void check_one_filter(struct upload_pack_data *data, |
| 1042 | struct list_objects_filter_options *opts) |
| 1043 | { |
| 1044 | const char *key = list_object_filter_config_name(opts->choice); |
| 1045 | struct string_list_item *item = string_list_lookup(&data->allowed_filters, |
| 1046 | key); |
| 1047 | int allowed; |
| 1048 | |
| 1049 | if (item) |
| 1050 | allowed = (intptr_t)item->util; |
| 1051 | else |
| 1052 | allowed = data->allow_filter_fallback; |
| 1053 | |
| 1054 | if (!allowed) |
| 1055 | send_err_and_die(data, "filter '%s' not supported", key); |
Taylor Blau | 5b01a4e | 2020-08-03 14:00:17 -0400 | [diff] [blame] | 1056 | |
| 1057 | if (opts->choice == LOFC_TREE_DEPTH && |
| 1058 | opts->tree_exclude_depth > data->tree_filter_max_depth) |
| 1059 | send_err_and_die(data, |
| 1060 | "tree filter allows max depth %lu, but got %lu", |
| 1061 | data->tree_filter_max_depth, |
| 1062 | opts->tree_exclude_depth); |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1063 | } |
| 1064 | |
| 1065 | static void check_filter_recurse(struct upload_pack_data *data, |
| 1066 | struct list_objects_filter_options *opts) |
| 1067 | { |
| 1068 | size_t i; |
| 1069 | |
| 1070 | check_one_filter(data, opts); |
| 1071 | if (opts->choice != LOFC_COMBINE) |
| 1072 | return; |
| 1073 | |
| 1074 | for (i = 0; i < opts->sub_nr; i++) |
| 1075 | check_filter_recurse(data, &opts->sub[i]); |
| 1076 | } |
| 1077 | |
| 1078 | static void die_if_using_banned_filter(struct upload_pack_data *data) |
| 1079 | { |
| 1080 | check_filter_recurse(data, &data->filter_options); |
| 1081 | } |
| 1082 | |
Christian Couder | d92ae2c | 2020-05-15 12:04:47 +0200 | [diff] [blame] | 1083 | static void receive_needs(struct upload_pack_data *data, |
| 1084 | struct packet_reader *reader) |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1085 | { |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 1086 | int has_non_tip = 0; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1087 | |
Christian Couder | 35b43a1 | 2020-06-11 14:05:09 +0200 | [diff] [blame] | 1088 | data->shallow_nr = 0; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1089 | for (;;) { |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 1090 | struct object *o; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1091 | const char *features; |
brian m. carlson | cf93982 | 2017-05-06 22:10:28 +0000 | [diff] [blame] | 1092 | struct object_id oid_buf; |
Nguyễn Thái Ngọc Duy | 8bf3b75 | 2016-06-12 17:53:49 +0700 | [diff] [blame] | 1093 | const char *arg; |
Jeff King | 7ce4c8f | 2023-04-14 17:25:20 -0400 | [diff] [blame] | 1094 | size_t feature_len; |
Nguyễn Thái Ngọc Duy | 8bf3b75 | 2016-06-12 17:53:49 +0700 | [diff] [blame] | 1095 | |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 1096 | reset_timeout(data->timeout); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1097 | if (packet_reader_read(reader) != PACKET_READ_NORMAL) |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 1098 | break; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1099 | |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1100 | if (process_shallow(reader->line, &data->shallows)) |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 1101 | continue; |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1102 | if (process_deepen(reader->line, &data->depth)) |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1103 | continue; |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1104 | if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list)) |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 1105 | continue; |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1106 | if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list)) |
Nguyễn Thái Ngọc Duy | 269a7a8 | 2016-06-12 17:54:03 +0700 | [diff] [blame] | 1107 | continue; |
Brandon Williams | ae2948f | 2018-03-14 11:31:42 -0700 | [diff] [blame] | 1108 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1109 | if (skip_prefix(reader->line, "filter ", &arg)) { |
Christian Couder | 59a9026 | 2020-06-04 19:54:42 +0200 | [diff] [blame] | 1110 | if (!data->filter_capability_requested) |
Jeff Hostetler | 10ac85c | 2017-12-08 15:58:39 +0000 | [diff] [blame] | 1111 | die("git upload-pack: filtering capability not negotiated"); |
Christian Couder | d92ae2c | 2020-05-15 12:04:47 +0200 | [diff] [blame] | 1112 | list_objects_filter_die_if_populated(&data->filter_options); |
| 1113 | parse_list_objects_filter(&data->filter_options, arg); |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1114 | die_if_using_banned_filter(data); |
Jeff Hostetler | 10ac85c | 2017-12-08 15:58:39 +0000 | [diff] [blame] | 1115 | continue; |
| 1116 | } |
Junio C Hamano | 9bfa0f9 | 2018-05-08 15:59:15 +0900 | [diff] [blame] | 1117 | |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1118 | if (!skip_prefix(reader->line, "want ", &arg) || |
brian m. carlson | 55dc227 | 2018-05-02 00:25:51 +0000 | [diff] [blame] | 1119 | parse_oid_hex(arg, &oid_buf, &features)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 1120 | die("git upload-pack: protocol error, " |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1121 | "expected to get object ID, not '%s'", reader->line); |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1122 | |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1123 | if (parse_feature_request(features, "deepen-relative")) |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1124 | data->deepen_relative = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1125 | if (parse_feature_request(features, "multi_ack_detailed")) |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 1126 | data->multi_ack = MULTI_ACK_DETAILED; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1127 | else if (parse_feature_request(features, "multi_ack")) |
Christian Couder | e9d882b | 2020-06-04 19:54:44 +0200 | [diff] [blame] | 1128 | data->multi_ack = MULTI_ACK; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1129 | if (parse_feature_request(features, "no-done")) |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 1130 | data->no_done = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1131 | if (parse_feature_request(features, "thin-pack")) |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1132 | data->use_thin_pack = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1133 | if (parse_feature_request(features, "ofs-delta")) |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1134 | data->use_ofs_delta = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1135 | if (parse_feature_request(features, "side-band-64k")) |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 1136 | data->use_sideband = LARGE_PACKET_MAX; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1137 | else if (parse_feature_request(features, "side-band")) |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 1138 | data->use_sideband = DEFAULT_PACKET_MAX; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1139 | if (parse_feature_request(features, "no-progress")) |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1140 | data->no_progress = 1; |
Junio C Hamano | f47182c | 2012-01-08 22:06:19 +0100 | [diff] [blame] | 1141 | if (parse_feature_request(features, "include-tag")) |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1142 | data->use_include_tag = 1; |
Christian Couder | 59abe19 | 2020-06-04 19:54:47 +0200 | [diff] [blame] | 1143 | if (data->allow_filter && |
| 1144 | parse_feature_request(features, "filter")) |
Christian Couder | 59a9026 | 2020-06-04 19:54:42 +0200 | [diff] [blame] | 1145 | data->filter_capability_requested = 1; |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 1146 | |
Josh Steadmon | 8295946 | 2020-11-11 15:29:32 -0800 | [diff] [blame] | 1147 | arg = parse_feature_value(features, "session-id", &feature_len, NULL); |
| 1148 | if (arg) { |
| 1149 | char *client_sid = xstrndup(arg, feature_len); |
| 1150 | trace2_data_string("transfer", NULL, "client-sid", client_sid); |
| 1151 | free(client_sid); |
| 1152 | } |
| 1153 | |
Stefan Beller | 109cd76 | 2018-06-28 18:21:51 -0700 | [diff] [blame] | 1154 | o = parse_object(the_repository, &oid_buf); |
Jonathan Tan | bdb31ea | 2017-02-23 10:43:03 -0800 | [diff] [blame] | 1155 | if (!o) { |
Christian Couder | 4ace028 | 2020-05-15 12:04:48 +0200 | [diff] [blame] | 1156 | packet_writer_error(&data->writer, |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1157 | "upload-pack: not our ref %s", |
| 1158 | oid_to_hex(&oid_buf)); |
Elijah Newren | 9f9aa76 | 2010-07-31 14:11:46 -0600 | [diff] [blame] | 1159 | die("git upload-pack: not our ref %s", |
brian m. carlson | cf93982 | 2017-05-06 22:10:28 +0000 | [diff] [blame] | 1160 | oid_to_hex(&oid_buf)); |
Jonathan Tan | bdb31ea | 2017-02-23 10:43:03 -0800 | [diff] [blame] | 1161 | } |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 1162 | if (!(o->flags & WANTED)) { |
| 1163 | o->flags |= WANTED; |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1164 | if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 |
| 1165 | || is_our_ref(o, data->allow_uor))) |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 1166 | has_non_tip = 1; |
Christian Couder | d92ae2c | 2020-05-15 12:04:47 +0200 | [diff] [blame] | 1167 | add_object_array(o, NULL, &data->want_obj); |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 1168 | } |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1169 | } |
Johannes Sixt | 9462e3f | 2009-06-16 20:41:16 +0200 | [diff] [blame] | 1170 | |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 1171 | /* |
| 1172 | * We have sent all our refs already, and the other end |
| 1173 | * should have chosen out of them. When we are operating |
| 1174 | * in the stateless RPC mode, however, their choice may |
| 1175 | * have been based on the set of older refs advertised |
| 1176 | * by another process that handled the initial request. |
| 1177 | */ |
| 1178 | if (has_non_tip) |
Christian Couder | b08c974 | 2020-05-15 12:04:51 +0200 | [diff] [blame] | 1179 | check_non_tip(data); |
Junio C Hamano | 051e400 | 2011-08-05 13:54:06 -0700 | [diff] [blame] | 1180 | |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 1181 | if (!data->use_sideband && data->daemon_mode) |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1182 | data->no_progress = 1; |
Johannes Sixt | 9462e3f | 2009-06-16 20:41:16 +0200 | [diff] [blame] | 1183 | |
Christian Couder | 7a51676 | 2020-05-15 12:04:54 +0200 | [diff] [blame] | 1184 | if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0) |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 1185 | return; |
Nguyễn Thái Ngọc Duy | 569e554 | 2016-06-12 17:53:58 +0700 | [diff] [blame] | 1186 | |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 1187 | if (send_shallow_list(data)) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1188 | packet_flush(1); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 1189 | } |
| 1190 | |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1191 | /* return non-zero if the ref is hidden, otherwise 0 */ |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1192 | static int mark_our_ref(const char *refname, const char *refname_full, |
Taylor Blau | c45841f | 2023-07-10 17:12:33 -0400 | [diff] [blame] | 1193 | const struct object_id *oid, const struct strvec *hidden_refs) |
Junio C Hamano | cbbe50d | 2013-01-18 15:48:49 -0800 | [diff] [blame] | 1194 | { |
Jeff King | 45a187c | 2021-04-13 03:16:36 -0400 | [diff] [blame] | 1195 | struct object *o = lookup_unknown_object(the_repository, oid); |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1196 | |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1197 | if (ref_is_hidden(refname, refname_full, hidden_refs)) { |
Junio C Hamano | 390eb36 | 2013-01-28 21:49:57 -0800 | [diff] [blame] | 1198 | o->flags |= HIDDEN_REF; |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1199 | return 1; |
Junio C Hamano | 390eb36 | 2013-01-28 21:49:57 -0800 | [diff] [blame] | 1200 | } |
Junio C Hamano | 3f1da57 | 2013-01-28 20:45:43 -0800 | [diff] [blame] | 1201 | o->flags |= OUR_REF; |
Junio C Hamano | cbbe50d | 2013-01-18 15:48:49 -0800 | [diff] [blame] | 1202 | return 0; |
| 1203 | } |
| 1204 | |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1205 | static int check_ref(const char *refname_full, const struct object_id *oid, |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1206 | int flag UNUSED, void *cb_data) |
Jeff King | e172755 | 2015-03-13 00:42:12 -0400 | [diff] [blame] | 1207 | { |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1208 | const char *refname = strip_namespace(refname_full); |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1209 | struct upload_pack_data *data = cb_data; |
Lukas Fleischer | 78a766a | 2015-11-03 08:58:16 +0100 | [diff] [blame] | 1210 | |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1211 | mark_our_ref(refname, refname_full, oid, &data->hidden_refs); |
Jeff King | e172755 | 2015-03-13 00:42:12 -0400 | [diff] [blame] | 1212 | return 0; |
| 1213 | } |
| 1214 | |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1215 | static void format_symref_info(struct strbuf *buf, struct string_list *symref) |
| 1216 | { |
| 1217 | struct string_list_item *item; |
| 1218 | |
| 1219 | if (!symref->nr) |
| 1220 | return; |
| 1221 | for_each_string_list_item(item, symref) |
| 1222 | strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util); |
| 1223 | } |
| 1224 | |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1225 | static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) { |
| 1226 | if (d->advertise_sid) |
| 1227 | strbuf_addf(buf, " session-id=%s", trace2_session_id()); |
| 1228 | } |
| 1229 | |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 1230 | static void write_v0_ref(struct upload_pack_data *data, |
| 1231 | const char *refname, const char *refname_nons, |
| 1232 | const struct object_id *oid) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1233 | { |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 1234 | static const char *capabilities = "multi_ack thin-pack side-band" |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 1235 | " side-band-64k ofs-delta shallow deepen-since deepen-not" |
| 1236 | " deepen-relative no-progress include-tag multi_ack_detailed"; |
Michael Haggerty | 21758af | 2015-05-25 18:39:13 +0000 | [diff] [blame] | 1237 | struct object_id peeled; |
Carl Worth | b5b1699 | 2006-02-17 16:14:52 -0800 | [diff] [blame] | 1238 | |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1239 | if (mark_our_ref(refname_nons, refname, oid, &data->hidden_refs)) |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 1240 | return; |
Junio C Hamano | cbbe50d | 2013-01-18 15:48:49 -0800 | [diff] [blame] | 1241 | |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1242 | if (capabilities) { |
| 1243 | struct strbuf symref_info = STRBUF_INIT; |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1244 | struct strbuf session_id = STRBUF_INIT; |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1245 | |
Christian Couder | 762f927 | 2020-05-15 12:04:50 +0200 | [diff] [blame] | 1246 | format_symref_info(&symref_info, &data->symref); |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1247 | format_session_id(&session_id, data); |
Jacob Vosmaer | 70afef5 | 2021-09-01 14:54:42 +0200 | [diff] [blame] | 1248 | packet_fwrite_fmt(stdout, "%s %s%c%s%s%s%s%s%s%s object-format=%s agent=%s\n", |
Michael Haggerty | 363e98b | 2015-05-25 18:39:12 +0000 | [diff] [blame] | 1249 | oid_to_hex(oid), refname_nons, |
Junio C Hamano | cf2ad8e | 2011-03-29 10:24:59 -0700 | [diff] [blame] | 1250 | 0, capabilities, |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1251 | (data->allow_uor & ALLOW_TIP_SHA1) ? |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 1252 | " allow-tip-sha1-in-want" : "", |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1253 | (data->allow_uor & ALLOW_REACHABLE_SHA1) ? |
Fredrik Medley | 68ee628 | 2015-05-21 22:23:39 +0200 | [diff] [blame] | 1254 | " allow-reachable-sha1-in-want" : "", |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1255 | data->no_done ? " no-done" : "", |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1256 | symref_info.buf, |
Christian Couder | 59abe19 | 2020-06-04 19:54:47 +0200 | [diff] [blame] | 1257 | data->allow_filter ? " filter" : "", |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1258 | session_id.buf, |
brian m. carlson | bf30dbf | 2020-05-25 19:58:51 +0000 | [diff] [blame] | 1259 | the_hash_algo->name, |
Jeff King | ff5effd | 2012-08-03 12:19:16 -0400 | [diff] [blame] | 1260 | git_user_agent_sanitized()); |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1261 | strbuf_release(&symref_info); |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1262 | strbuf_release(&session_id); |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 1263 | data->sent_capabilities = 1; |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1264 | } else { |
Jacob Vosmaer | 70afef5 | 2021-09-01 14:54:42 +0200 | [diff] [blame] | 1265 | packet_fwrite_fmt(stdout, "%s %s\n", oid_to_hex(oid), refname_nons); |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1266 | } |
Johannes Schindelin | 1f5881b | 2005-10-28 05:56:41 +0200 | [diff] [blame] | 1267 | capabilities = NULL; |
Jeff King | 36a3179 | 2021-01-20 14:44:43 -0500 | [diff] [blame] | 1268 | if (!peel_iterated_oid(oid, &peeled)) |
Jacob Vosmaer | 70afef5 | 2021-09-01 14:54:42 +0200 | [diff] [blame] | 1269 | packet_fwrite_fmt(stdout, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons); |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 1270 | return; |
| 1271 | } |
| 1272 | |
| 1273 | static int send_ref(const char *refname, const struct object_id *oid, |
| 1274 | int flag UNUSED, void *cb_data) |
| 1275 | { |
| 1276 | write_v0_ref(cb_data, refname, strip_namespace(refname), oid); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1277 | return 0; |
| 1278 | } |
| 1279 | |
Jeff King | 63e14ee | 2022-08-19 06:08:32 -0400 | [diff] [blame] | 1280 | static int find_symref(const char *refname, |
Ævar Arnfjörð Bjarmason | 5cf88fd | 2022-08-25 19:09:48 +0200 | [diff] [blame] | 1281 | const struct object_id *oid UNUSED, |
Michael Haggerty | 7dabd05 | 2015-05-25 18:39:10 +0000 | [diff] [blame] | 1282 | int flag, void *cb_data) |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1283 | { |
| 1284 | const char *symref_target; |
| 1285 | struct string_list_item *item; |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1286 | |
| 1287 | if ((flag & REF_ISSYMREF) == 0) |
| 1288 | return 0; |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 1289 | symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag); |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1290 | if (!symref_target || (flag & REF_ISSYMREF) == 0) |
| 1291 | die("'%s' is a symref but it is not?", refname); |
Jeff King | 533e088 | 2019-05-23 02:11:21 -0400 | [diff] [blame] | 1292 | item = string_list_append(cb_data, strip_namespace(refname)); |
| 1293 | item->util = xstrdup(strip_namespace(symref_target)); |
Junio C Hamano | 7171d8c | 2013-09-17 16:17:33 -0700 | [diff] [blame] | 1294 | return 0; |
| 1295 | } |
| 1296 | |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1297 | static int parse_object_filter_config(const char *var, const char *value, |
Glen Choo | 8868b1e | 2023-06-28 19:26:27 +0000 | [diff] [blame] | 1298 | const struct key_value_info *kvi, |
| 1299 | struct upload_pack_data *data) |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1300 | { |
| 1301 | struct strbuf buf = STRBUF_INIT; |
| 1302 | const char *sub, *key; |
| 1303 | size_t sub_len; |
| 1304 | |
| 1305 | if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key)) |
| 1306 | return 0; |
| 1307 | |
| 1308 | if (!sub) { |
| 1309 | if (!strcmp(key, "allow")) |
| 1310 | data->allow_filter_fallback = git_config_bool(var, value); |
| 1311 | return 0; |
| 1312 | } |
| 1313 | |
| 1314 | strbuf_add(&buf, sub, sub_len); |
| 1315 | |
| 1316 | if (!strcmp(key, "allow")) |
| 1317 | string_list_insert(&data->allowed_filters, buf.buf)->util = |
| 1318 | (void *)(intptr_t)git_config_bool(var, value); |
Taylor Blau | 5b01a4e | 2020-08-03 14:00:17 -0400 | [diff] [blame] | 1319 | else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) { |
| 1320 | if (!value) { |
| 1321 | strbuf_release(&buf); |
| 1322 | return config_error_nonbool(var); |
| 1323 | } |
| 1324 | string_list_insert(&data->allowed_filters, buf.buf)->util = |
| 1325 | (void *)(intptr_t)1; |
Glen Choo | 8868b1e | 2023-06-28 19:26:27 +0000 | [diff] [blame] | 1326 | data->tree_filter_max_depth = git_config_ulong(var, value, |
| 1327 | kvi); |
Taylor Blau | 5b01a4e | 2020-08-03 14:00:17 -0400 | [diff] [blame] | 1328 | } |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1329 | |
| 1330 | strbuf_release(&buf); |
| 1331 | return 0; |
| 1332 | } |
| 1333 | |
Glen Choo | a4e7e31 | 2023-06-28 19:26:22 +0000 | [diff] [blame] | 1334 | static int upload_pack_config(const char *var, const char *value, |
Glen Choo | 8868b1e | 2023-06-28 19:26:27 +0000 | [diff] [blame] | 1335 | const struct config_context *ctx, |
Glen Choo | a4e7e31 | 2023-06-28 19:26:22 +0000 | [diff] [blame] | 1336 | void *cb_data) |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1337 | { |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 1338 | struct upload_pack_data *data = cb_data; |
| 1339 | |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 1340 | if (!strcmp("uploadpack.allowtipsha1inwant", var)) { |
| 1341 | if (git_config_bool(var, value)) |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1342 | data->allow_uor |= ALLOW_TIP_SHA1; |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 1343 | else |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1344 | data->allow_uor &= ~ALLOW_TIP_SHA1; |
Fredrik Medley | 68ee628 | 2015-05-21 22:23:39 +0200 | [diff] [blame] | 1345 | } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) { |
| 1346 | if (git_config_bool(var, value)) |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1347 | data->allow_uor |= ALLOW_REACHABLE_SHA1; |
Fredrik Medley | 68ee628 | 2015-05-21 22:23:39 +0200 | [diff] [blame] | 1348 | else |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1349 | data->allow_uor &= ~ALLOW_REACHABLE_SHA1; |
David Turner | f8edeaa | 2016-11-11 12:23:48 -0500 | [diff] [blame] | 1350 | } else if (!strcmp("uploadpack.allowanysha1inwant", var)) { |
| 1351 | if (git_config_bool(var, value)) |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1352 | data->allow_uor |= ALLOW_ANY_SHA1; |
David Turner | f8edeaa | 2016-11-11 12:23:48 -0500 | [diff] [blame] | 1353 | else |
Christian Couder | 629060d | 2020-06-11 14:05:12 +0200 | [diff] [blame] | 1354 | data->allow_uor &= ~ALLOW_ANY_SHA1; |
Fredrik Medley | 7199c09 | 2015-05-21 22:23:38 +0200 | [diff] [blame] | 1355 | } else if (!strcmp("uploadpack.keepalive", var)) { |
Glen Choo | 8868b1e | 2023-06-28 19:26:27 +0000 | [diff] [blame] | 1356 | data->keepalive = git_config_int(var, value, ctx->kvi); |
Christian Couder | f203a88 | 2020-06-04 19:54:46 +0200 | [diff] [blame] | 1357 | if (!data->keepalive) |
| 1358 | data->keepalive = -1; |
Jeff Hostetler | 10ac85c | 2017-12-08 15:58:39 +0000 | [diff] [blame] | 1359 | } else if (!strcmp("uploadpack.allowfilter", var)) { |
Christian Couder | 59abe19 | 2020-06-04 19:54:47 +0200 | [diff] [blame] | 1360 | data->allow_filter = git_config_bool(var, value); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1361 | } else if (!strcmp("uploadpack.allowrefinwant", var)) { |
Christian Couder | d1d7a94 | 2020-06-04 19:54:48 +0200 | [diff] [blame] | 1362 | data->allow_ref_in_want = git_config_bool(var, value); |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1363 | } else if (!strcmp("uploadpack.allowsidebandall", var)) { |
Christian Couder | e3835cd | 2020-06-04 19:54:49 +0200 | [diff] [blame] | 1364 | data->allow_sideband_all = git_config_bool(var, value); |
Elijah Newren | 8e712ef | 2019-04-25 07:58:54 -0700 | [diff] [blame] | 1365 | } else if (!strcmp("core.precomposeunicode", var)) { |
| 1366 | precomposed_unicode = git_config_bool(var, value); |
Josh Steadmon | 791e1ad | 2020-11-11 15:29:27 -0800 | [diff] [blame] | 1367 | } else if (!strcmp("transfer.advertisesid", var)) { |
| 1368 | data->advertise_sid = git_config_bool(var, value); |
Jeff King | 05e9515 | 2013-09-08 05:01:31 -0400 | [diff] [blame] | 1369 | } |
Jeff King | aaaa881 | 2018-10-24 03:27:52 -0400 | [diff] [blame] | 1370 | |
Glen Choo | 8868b1e | 2023-06-28 19:26:27 +0000 | [diff] [blame] | 1371 | if (parse_object_filter_config(var, value, ctx->kvi, data) < 0) |
Jeff King | d43a21b | 2020-12-03 03:09:42 -0500 | [diff] [blame] | 1372 | return -1; |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1373 | |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1374 | return parse_hide_refs_config(var, value, "uploadpack", &data->hidden_refs); |
Junio C Hamano | daebaa7 | 2013-01-18 16:08:30 -0800 | [diff] [blame] | 1375 | } |
| 1376 | |
Glen Choo | a4e7e31 | 2023-06-28 19:26:22 +0000 | [diff] [blame] | 1377 | static int upload_pack_protected_config(const char *var, const char *value, |
| 1378 | const struct config_context *ctx UNUSED, |
| 1379 | void *cb_data) |
Glen Choo | 5b3c650 | 2022-07-14 21:27:59 +0000 | [diff] [blame] | 1380 | { |
| 1381 | struct upload_pack_data *data = cb_data; |
| 1382 | |
| 1383 | if (!strcmp("uploadpack.packobjectshook", var)) |
| 1384 | return git_config_string(&data->pack_objects_hook, var, value); |
| 1385 | return 0; |
| 1386 | } |
| 1387 | |
| 1388 | static void get_upload_pack_config(struct upload_pack_data *data) |
| 1389 | { |
| 1390 | git_config(upload_pack_config, data); |
| 1391 | git_protected_config(upload_pack_protected_config, data); |
| 1392 | } |
| 1393 | |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1394 | void upload_pack(const int advertise_refs, const int stateless_rpc, |
| 1395 | const int timeout) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1396 | { |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1397 | struct packet_reader reader; |
Christian Couder | ebf8ebc | 2020-05-15 12:04:45 +0200 | [diff] [blame] | 1398 | struct upload_pack_data data; |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 1399 | |
Christian Couder | ebf8ebc | 2020-05-15 12:04:45 +0200 | [diff] [blame] | 1400 | upload_pack_data_init(&data); |
Glen Choo | 5b3c650 | 2022-07-14 21:27:59 +0000 | [diff] [blame] | 1401 | get_upload_pack_config(&data); |
Christian Couder | 8a0e6f1 | 2020-06-04 19:54:45 +0200 | [diff] [blame] | 1402 | |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1403 | data.stateless_rpc = stateless_rpc; |
| 1404 | data.timeout = timeout; |
| 1405 | if (data.timeout) |
| 1406 | data.daemon_mode = 1; |
Christian Couder | df654ab | 2020-05-15 12:04:52 +0200 | [diff] [blame] | 1407 | |
Christian Couder | 438528f | 2020-05-15 12:04:49 +0200 | [diff] [blame] | 1408 | head_ref_namespaced(find_symref, &data.symref); |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 1409 | |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1410 | if (advertise_refs || !data.stateless_rpc) { |
Christian Couder | d40f04e | 2020-06-04 19:54:40 +0200 | [diff] [blame] | 1411 | reset_timeout(data.timeout); |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1412 | if (advertise_refs) |
| 1413 | data.no_done = 1; |
Christian Couder | 762f927 | 2020-05-15 12:04:50 +0200 | [diff] [blame] | 1414 | head_ref_namespaced(send_ref, &data); |
Taylor Blau | 18b6b1b | 2023-07-10 17:12:45 -0400 | [diff] [blame] | 1415 | for_each_namespaced_ref_1(send_ref, &data); |
brian m. carlson | 933e3a4 | 2023-05-17 19:24:43 +0000 | [diff] [blame] | 1416 | if (!data.sent_capabilities) { |
| 1417 | const char *refname = "capabilities^{}"; |
| 1418 | write_v0_ref(&data, refname, refname, null_oid()); |
| 1419 | } |
Jacob Vosmaer | 70afef5 | 2021-09-01 14:54:42 +0200 | [diff] [blame] | 1420 | /* |
| 1421 | * fflush stdout before calling advertise_shallow_grafts because send_ref |
| 1422 | * uses stdio. |
| 1423 | */ |
| 1424 | fflush_or_die(stdout); |
Brandon Williams | a3d6b53 | 2018-03-14 11:31:41 -0700 | [diff] [blame] | 1425 | advertise_shallow_grafts(1); |
| 1426 | packet_flush(1); |
| 1427 | } else { |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1428 | head_ref_namespaced(check_ref, &data); |
Taylor Blau | 18b6b1b | 2023-07-10 17:12:45 -0400 | [diff] [blame] | 1429 | for_each_namespaced_ref_1(check_ref, &data); |
Brandon Williams | aa9bab2 | 2017-10-16 10:55:26 -0700 | [diff] [blame] | 1430 | } |
| 1431 | |
Ævar Arnfjörð Bjarmason | f234da8 | 2021-08-05 03:25:42 +0200 | [diff] [blame] | 1432 | if (!advertise_refs) { |
Christian Couder | ebf8ebc | 2020-05-15 12:04:45 +0200 | [diff] [blame] | 1433 | packet_reader_init(&reader, 0, NULL, 0, |
| 1434 | PACKET_READ_CHOMP_NEWLINE | |
| 1435 | PACKET_READ_DIE_ON_ERR_PACKET); |
Masaya Suzuki | 01f9ec6 | 2018-12-29 13:19:14 -0800 | [diff] [blame] | 1436 | |
Christian Couder | d92ae2c | 2020-05-15 12:04:47 +0200 | [diff] [blame] | 1437 | receive_needs(&data, &reader); |
Daniel Duvall | fb3d1a0 | 2020-10-30 19:39:02 -0700 | [diff] [blame] | 1438 | |
| 1439 | /* |
| 1440 | * An EOF at this exact point in negotiation should be |
| 1441 | * acceptable from stateless clients as they will consume the |
| 1442 | * shallow list before doing subsequent rpc with haves/etc. |
| 1443 | */ |
| 1444 | if (data.stateless_rpc) |
| 1445 | reader.options |= PACKET_READ_GENTLE_ON_EOF; |
| 1446 | |
| 1447 | if (data.want_obj.nr && |
| 1448 | packet_reader_peek(&reader) != PACKET_READ_EOF) { |
| 1449 | reader.options &= ~PACKET_READ_GENTLE_ON_EOF; |
Christian Couder | 0797769 | 2020-05-15 12:04:46 +0200 | [diff] [blame] | 1450 | get_common_commits(&data, &reader); |
Ramsay Jones | cae2ee1 | 2020-06-16 00:00:20 +0100 | [diff] [blame] | 1451 | create_pack_file(&data, NULL); |
Christian Couder | ebf8ebc | 2020-05-15 12:04:45 +0200 | [diff] [blame] | 1452 | } |
Brandon Williams | a3d6b53 | 2018-03-14 11:31:41 -0700 | [diff] [blame] | 1453 | } |
Christian Couder | 08450ef | 2020-05-08 10:01:15 +0200 | [diff] [blame] | 1454 | |
Christian Couder | ebf8ebc | 2020-05-15 12:04:45 +0200 | [diff] [blame] | 1455 | upload_pack_data_clear(&data); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1456 | } |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1457 | |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1458 | static int parse_want(struct packet_writer *writer, const char *line, |
| 1459 | struct object_array *want_obj) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1460 | { |
| 1461 | const char *arg; |
| 1462 | if (skip_prefix(line, "want ", &arg)) { |
| 1463 | struct object_id oid; |
| 1464 | struct object *o; |
| 1465 | |
| 1466 | if (get_oid_hex(arg, &oid)) |
| 1467 | die("git upload-pack: protocol error, " |
| 1468 | "expected to get oid, not '%s'", line); |
| 1469 | |
Jeff King | 9a8c3c4 | 2022-09-06 19:06:25 -0400 | [diff] [blame] | 1470 | o = parse_object_with_flags(the_repository, &oid, |
| 1471 | PARSE_OBJECT_SKIP_HASH_CHECK); |
Patrick Steinhardt | 4de6562 | 2022-03-01 10:33:37 +0100 | [diff] [blame] | 1472 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1473 | if (!o) { |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1474 | packet_writer_error(writer, |
| 1475 | "upload-pack: not our ref %s", |
| 1476 | oid_to_hex(&oid)); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1477 | die("git upload-pack: not our ref %s", |
| 1478 | oid_to_hex(&oid)); |
| 1479 | } |
| 1480 | |
| 1481 | if (!(o->flags & WANTED)) { |
| 1482 | o->flags |= WANTED; |
Jonathan Tan | 1d1243f | 2018-10-18 13:43:28 -0700 | [diff] [blame] | 1483 | add_object_array(o, NULL, want_obj); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1484 | } |
| 1485 | |
| 1486 | return 1; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1487 | } |
| 1488 | |
| 1489 | return 0; |
| 1490 | } |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1491 | |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1492 | static int parse_want_ref(struct packet_writer *writer, const char *line, |
| 1493 | struct string_list *wanted_refs, |
Taylor Blau | c45841f | 2023-07-10 17:12:33 -0400 | [diff] [blame] | 1494 | struct strvec *hidden_refs, |
Jonathan Tan | 1d1243f | 2018-10-18 13:43:28 -0700 | [diff] [blame] | 1495 | struct object_array *want_obj) |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1496 | { |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1497 | const char *refname_nons; |
| 1498 | if (skip_prefix(line, "want-ref ", &refname_nons)) { |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1499 | struct object_id oid; |
| 1500 | struct string_list_item *item; |
Patrick Steinhardt | 4de6562 | 2022-03-01 10:33:37 +0100 | [diff] [blame] | 1501 | struct object *o = NULL; |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1502 | struct strbuf refname = STRBUF_INIT; |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1503 | |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1504 | strbuf_addf(&refname, "%s%s", get_git_namespace(), refname_nons); |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1505 | if (ref_is_hidden(refname_nons, refname.buf, hidden_refs) || |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1506 | read_ref(refname.buf, &oid)) { |
| 1507 | packet_writer_error(writer, "unknown ref %s", refname_nons); |
| 1508 | die("unknown ref %s", refname_nons); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1509 | } |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1510 | strbuf_release(&refname); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1511 | |
Kim Altintop | 3955140 | 2021-08-13 06:23:50 +0000 | [diff] [blame] | 1512 | item = string_list_append(wanted_refs, refname_nons); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1513 | item->util = oiddup(&oid); |
| 1514 | |
Patrick Steinhardt | 4de6562 | 2022-03-01 10:33:37 +0100 | [diff] [blame] | 1515 | if (!starts_with(refname_nons, "refs/tags/")) { |
| 1516 | struct commit *commit = lookup_commit_in_graph(the_repository, &oid); |
| 1517 | if (commit) |
| 1518 | o = &commit->object; |
| 1519 | } |
| 1520 | |
| 1521 | if (!o) |
| 1522 | o = parse_object_or_die(&oid, refname_nons); |
| 1523 | |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1524 | if (!(o->flags & WANTED)) { |
| 1525 | o->flags |= WANTED; |
Jonathan Tan | 1d1243f | 2018-10-18 13:43:28 -0700 | [diff] [blame] | 1526 | add_object_array(o, NULL, want_obj); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1527 | } |
| 1528 | |
| 1529 | return 1; |
| 1530 | } |
| 1531 | |
| 1532 | return 0; |
| 1533 | } |
| 1534 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1535 | static int parse_have(const char *line, struct oid_array *haves) |
| 1536 | { |
| 1537 | const char *arg; |
| 1538 | if (skip_prefix(line, "have ", &arg)) { |
| 1539 | struct object_id oid; |
| 1540 | |
| 1541 | if (get_oid_hex(arg, &oid)) |
| 1542 | die("git upload-pack: expected SHA1 object, got '%s'", arg); |
| 1543 | oid_array_append(haves, &oid); |
| 1544 | return 1; |
| 1545 | } |
| 1546 | |
| 1547 | return 0; |
| 1548 | } |
| 1549 | |
Robert Coup | b8f58c2 | 2023-10-17 21:12:47 +0000 | [diff] [blame] | 1550 | static void trace2_fetch_info(struct upload_pack_data *data) |
| 1551 | { |
| 1552 | struct json_writer jw = JSON_WRITER_INIT; |
| 1553 | |
| 1554 | jw_object_begin(&jw, 0); |
| 1555 | jw_object_intmax(&jw, "haves", data->haves.nr); |
| 1556 | jw_object_intmax(&jw, "wants", data->want_obj.nr); |
| 1557 | jw_object_intmax(&jw, "want-refs", data->wanted_refs.nr); |
| 1558 | jw_object_intmax(&jw, "depth", data->depth); |
| 1559 | jw_object_intmax(&jw, "shallows", data->shallows.nr); |
| 1560 | jw_object_bool(&jw, "deepen-since", data->deepen_since); |
| 1561 | jw_object_intmax(&jw, "deepen-not", data->deepen_not.nr); |
| 1562 | jw_object_bool(&jw, "deepen-relative", data->deepen_relative); |
| 1563 | if (data->filter_options.choice) |
| 1564 | jw_object_string(&jw, "filter", list_object_filter_config_name(data->filter_options.choice)); |
| 1565 | else |
| 1566 | jw_object_null(&jw, "filter"); |
| 1567 | jw_end(&jw); |
| 1568 | |
| 1569 | trace2_data_json("upload-pack", the_repository, "fetch-info", &jw); |
| 1570 | |
| 1571 | jw_release(&jw); |
| 1572 | } |
| 1573 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1574 | static void process_args(struct packet_reader *request, |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1575 | struct upload_pack_data *data) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1576 | { |
Jeff King | 4845b77 | 2020-03-27 04:03:38 -0400 | [diff] [blame] | 1577 | while (packet_reader_read(request) == PACKET_READ_NORMAL) { |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1578 | const char *arg = request->line; |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1579 | const char *p; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1580 | |
| 1581 | /* process want */ |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1582 | if (parse_want(&data->writer, arg, &data->want_obj)) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1583 | continue; |
Christian Couder | d1d7a94 | 2020-06-04 19:54:48 +0200 | [diff] [blame] | 1584 | if (data->allow_ref_in_want && |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1585 | parse_want_ref(&data->writer, arg, &data->wanted_refs, |
Patrick Steinhardt | 9b67eb6 | 2022-11-17 06:46:43 +0100 | [diff] [blame] | 1586 | &data->hidden_refs, &data->want_obj)) |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1587 | continue; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1588 | /* process have line */ |
| 1589 | if (parse_have(arg, &data->haves)) |
| 1590 | continue; |
| 1591 | |
| 1592 | /* process args like thin-pack */ |
| 1593 | if (!strcmp(arg, "thin-pack")) { |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1594 | data->use_thin_pack = 1; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1595 | continue; |
| 1596 | } |
| 1597 | if (!strcmp(arg, "ofs-delta")) { |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1598 | data->use_ofs_delta = 1; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1599 | continue; |
| 1600 | } |
| 1601 | if (!strcmp(arg, "no-progress")) { |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1602 | data->no_progress = 1; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1603 | continue; |
| 1604 | } |
| 1605 | if (!strcmp(arg, "include-tag")) { |
Jeff King | b5a2068 | 2020-06-04 19:54:38 +0200 | [diff] [blame] | 1606 | data->use_include_tag = 1; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1607 | continue; |
| 1608 | } |
| 1609 | if (!strcmp(arg, "done")) { |
| 1610 | data->done = 1; |
| 1611 | continue; |
| 1612 | } |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1613 | if (!strcmp(arg, "wait-for-done")) { |
| 1614 | data->wait_for_done = 1; |
| 1615 | continue; |
| 1616 | } |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1617 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1618 | /* Shallow related arguments */ |
| 1619 | if (process_shallow(arg, &data->shallows)) |
| 1620 | continue; |
| 1621 | if (process_deepen(arg, &data->depth)) |
| 1622 | continue; |
| 1623 | if (process_deepen_since(arg, &data->deepen_since, |
| 1624 | &data->deepen_rev_list)) |
| 1625 | continue; |
| 1626 | if (process_deepen_not(arg, &data->deepen_not, |
| 1627 | &data->deepen_rev_list)) |
| 1628 | continue; |
| 1629 | if (!strcmp(arg, "deepen-relative")) { |
| 1630 | data->deepen_relative = 1; |
| 1631 | continue; |
| 1632 | } |
| 1633 | |
Christian Couder | 59abe19 | 2020-06-04 19:54:47 +0200 | [diff] [blame] | 1634 | if (data->allow_filter && skip_prefix(arg, "filter ", &p)) { |
Christian Couder | 08450ef | 2020-05-08 10:01:15 +0200 | [diff] [blame] | 1635 | list_objects_filter_die_if_populated(&data->filter_options); |
| 1636 | parse_list_objects_filter(&data->filter_options, p); |
Taylor Blau | 6dd3456 | 2020-08-03 14:00:10 -0400 | [diff] [blame] | 1637 | die_if_using_banned_filter(data); |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1638 | continue; |
| 1639 | } |
| 1640 | |
Jonathan Tan | 07c3c2a | 2019-01-16 11:28:15 -0800 | [diff] [blame] | 1641 | if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || |
Christian Couder | e3835cd | 2020-06-04 19:54:49 +0200 | [diff] [blame] | 1642 | data->allow_sideband_all) && |
Jonathan Tan | 07c3c2a | 2019-01-16 11:28:15 -0800 | [diff] [blame] | 1643 | !strcmp(arg, "sideband-all")) { |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1644 | data->writer.use_sideband = 1; |
| 1645 | continue; |
| 1646 | } |
| 1647 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1648 | if (skip_prefix(arg, "packfile-uris ", &p)) { |
| 1649 | string_list_split(&data->uri_protocols, p, ',', -1); |
| 1650 | continue; |
| 1651 | } |
| 1652 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1653 | /* ignore unknown lines maybe? */ |
Jonathan Tan | 7cc6ed2 | 2018-05-01 17:31:29 -0700 | [diff] [blame] | 1654 | die("unexpected line: '%s'", arg); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1655 | } |
Jeff King | 4845b77 | 2020-03-27 04:03:38 -0400 | [diff] [blame] | 1656 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1657 | if (data->uri_protocols.nr && !data->writer.use_sideband) |
| 1658 | string_list_clear(&data->uri_protocols, 0); |
| 1659 | |
Jeff King | 4845b77 | 2020-03-27 04:03:38 -0400 | [diff] [blame] | 1660 | if (request->status != PACKET_READ_FLUSH) |
| 1661 | die(_("expected flush after fetch arguments")); |
Robert Coup | b8f58c2 | 2023-10-17 21:12:47 +0000 | [diff] [blame] | 1662 | |
| 1663 | if (trace2_is_enabled()) |
| 1664 | trace2_fetch_info(data); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1665 | } |
| 1666 | |
Christian Couder | 8dcf227 | 2020-06-11 14:05:13 +0200 | [diff] [blame] | 1667 | static int process_haves(struct upload_pack_data *data, struct oid_array *common) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1668 | { |
| 1669 | int i; |
| 1670 | |
| 1671 | /* Process haves */ |
Christian Couder | 8dcf227 | 2020-06-11 14:05:13 +0200 | [diff] [blame] | 1672 | for (i = 0; i < data->haves.nr; i++) { |
| 1673 | const struct object_id *oid = &data->haves.oid[i]; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1674 | |
Ævar Arnfjörð Bjarmason | bc726bd | 2023-03-28 15:58:50 +0200 | [diff] [blame] | 1675 | if (!repo_has_object_file_with_flags(the_repository, oid, |
| 1676 | OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT)) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1677 | continue; |
| 1678 | |
| 1679 | oid_array_append(common, oid); |
| 1680 | |
Christian Couder | ea2c6e6 | 2020-06-11 14:05:18 +0200 | [diff] [blame] | 1681 | do_got_oid(data, oid); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1682 | } |
| 1683 | |
| 1684 | return 0; |
| 1685 | } |
| 1686 | |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1687 | static int send_acks(struct upload_pack_data *data, struct oid_array *acks) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1688 | { |
| 1689 | int i; |
| 1690 | |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1691 | packet_writer_write(&data->writer, "acknowledgments\n"); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1692 | |
| 1693 | /* Send Acks */ |
| 1694 | if (!acks->nr) |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1695 | packet_writer_write(&data->writer, "NAK\n"); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1696 | |
| 1697 | for (i = 0; i < acks->nr; i++) { |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1698 | packet_writer_write(&data->writer, "ACK %s\n", |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1699 | oid_to_hex(&acks->oid[i])); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1700 | } |
| 1701 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1702 | if (!data->wait_for_done && ok_to_give_up(data)) { |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1703 | /* Send Ready */ |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1704 | packet_writer_write(&data->writer, "ready\n"); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1705 | return 1; |
| 1706 | } |
| 1707 | |
| 1708 | return 0; |
| 1709 | } |
| 1710 | |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1711 | static int process_haves_and_send_acks(struct upload_pack_data *data) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1712 | { |
| 1713 | struct oid_array common = OID_ARRAY_INIT; |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1714 | int ret = 0; |
| 1715 | |
Christian Couder | 8dcf227 | 2020-06-11 14:05:13 +0200 | [diff] [blame] | 1716 | process_haves(data, &common); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1717 | if (data->done) { |
| 1718 | ret = 1; |
Christian Couder | 6fbbc43 | 2020-06-11 14:05:14 +0200 | [diff] [blame] | 1719 | } else if (send_acks(data, &common)) { |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1720 | packet_writer_delim(&data->writer); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1721 | ret = 1; |
| 1722 | } else { |
| 1723 | /* Add Flush */ |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1724 | packet_writer_flush(&data->writer); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1725 | ret = 0; |
| 1726 | } |
| 1727 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1728 | oid_array_clear(&data->haves); |
| 1729 | oid_array_clear(&common); |
| 1730 | return ret; |
| 1731 | } |
| 1732 | |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1733 | static void send_wanted_ref_info(struct upload_pack_data *data) |
| 1734 | { |
| 1735 | const struct string_list_item *item; |
| 1736 | |
| 1737 | if (!data->wanted_refs.nr) |
| 1738 | return; |
| 1739 | |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1740 | packet_writer_write(&data->writer, "wanted-refs\n"); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1741 | |
| 1742 | for_each_string_list_item(item, &data->wanted_refs) { |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1743 | packet_writer_write(&data->writer, "%s %s\n", |
| 1744 | oid_to_hex(item->util), |
| 1745 | item->string); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1746 | } |
| 1747 | |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1748 | packet_writer_delim(&data->writer); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1749 | } |
| 1750 | |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1751 | static void send_shallow_info(struct upload_pack_data *data) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1752 | { |
| 1753 | /* No shallow info needs to be sent */ |
| 1754 | if (!data->depth && !data->deepen_rev_list && !data->shallows.nr && |
Junio C Hamano | 00624d6 | 2018-07-18 12:20:27 -0700 | [diff] [blame] | 1755 | !is_repository_shallow(the_repository)) |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1756 | return; |
| 1757 | |
Jonathan Tan | bc2e795 | 2019-01-15 11:40:27 -0800 | [diff] [blame] | 1758 | packet_writer_write(&data->writer, "shallow-info\n"); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1759 | |
Christian Couder | ee703c8 | 2020-06-11 14:05:05 +0200 | [diff] [blame] | 1760 | if (!send_shallow_list(data) && |
Junio C Hamano | 00624d6 | 2018-07-18 12:20:27 -0700 | [diff] [blame] | 1761 | is_repository_shallow(the_repository)) |
Christian Couder | b1492f2 | 2020-06-11 14:05:06 +0200 | [diff] [blame] | 1762 | deepen(data, INFINITE_DEPTH); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1763 | |
| 1764 | packet_delim(1); |
| 1765 | } |
| 1766 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1767 | enum fetch_state { |
| 1768 | FETCH_PROCESS_ARGS = 0, |
| 1769 | FETCH_SEND_ACKS, |
| 1770 | FETCH_SEND_PACK, |
| 1771 | FETCH_DONE, |
| 1772 | }; |
| 1773 | |
Jeff King | 74595cc | 2023-02-24 01:38:23 -0500 | [diff] [blame] | 1774 | int upload_pack_v2(struct repository *r UNUSED, struct packet_reader *request) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1775 | { |
| 1776 | enum fetch_state state = FETCH_PROCESS_ARGS; |
| 1777 | struct upload_pack_data data; |
Jonathan Tan | d1035ca | 2018-10-18 13:43:29 -0700 | [diff] [blame] | 1778 | |
| 1779 | clear_object_flags(ALL_FLAGS); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1780 | |
| 1781 | upload_pack_data_init(&data); |
Christian Couder | f8edd1c | 2020-06-04 19:54:41 +0200 | [diff] [blame] | 1782 | data.use_sideband = LARGE_PACKET_MAX; |
Glen Choo | 5b3c650 | 2022-07-14 21:27:59 +0000 | [diff] [blame] | 1783 | get_upload_pack_config(&data); |
Christian Couder | 8a0e6f1 | 2020-06-04 19:54:45 +0200 | [diff] [blame] | 1784 | |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1785 | while (state != FETCH_DONE) { |
| 1786 | switch (state) { |
| 1787 | case FETCH_PROCESS_ARGS: |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1788 | process_args(request, &data); |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1789 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1790 | if (!data.want_obj.nr && !data.wait_for_done) { |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1791 | /* |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1792 | * Request didn't contain any 'want' lines (and |
| 1793 | * the request does not contain |
| 1794 | * "wait-for-done", in which it is reasonable |
| 1795 | * to just send 'have's without 'want's); guess |
| 1796 | * they didn't want anything. |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1797 | */ |
| 1798 | state = FETCH_DONE; |
| 1799 | } else if (data.haves.nr) { |
| 1800 | /* |
| 1801 | * Request had 'have' lines, so lets ACK them. |
| 1802 | */ |
| 1803 | state = FETCH_SEND_ACKS; |
| 1804 | } else { |
| 1805 | /* |
| 1806 | * Request had 'want's but no 'have's so we can |
| 1807 | * immedietly go to construct and send a pack. |
| 1808 | */ |
| 1809 | state = FETCH_SEND_PACK; |
| 1810 | } |
| 1811 | break; |
| 1812 | case FETCH_SEND_ACKS: |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1813 | if (process_haves_and_send_acks(&data)) |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1814 | state = FETCH_SEND_PACK; |
| 1815 | else |
| 1816 | state = FETCH_DONE; |
| 1817 | break; |
| 1818 | case FETCH_SEND_PACK: |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1819 | send_wanted_ref_info(&data); |
Christian Couder | 389f161 | 2020-05-15 12:04:43 +0200 | [diff] [blame] | 1820 | send_shallow_info(&data); |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1821 | |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1822 | if (data.uri_protocols.nr) { |
| 1823 | create_pack_file(&data, &data.uri_protocols); |
| 1824 | } else { |
| 1825 | packet_writer_write(&data.writer, "packfile\n"); |
| 1826 | create_pack_file(&data, NULL); |
| 1827 | } |
Brandon Williams | 3145ea9 | 2018-03-15 10:31:27 -0700 | [diff] [blame] | 1828 | state = FETCH_DONE; |
| 1829 | break; |
| 1830 | case FETCH_DONE: |
| 1831 | continue; |
| 1832 | } |
| 1833 | } |
| 1834 | |
| 1835 | upload_pack_data_clear(&data); |
| 1836 | return 0; |
| 1837 | } |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1838 | |
| 1839 | int upload_pack_advertise(struct repository *r, |
| 1840 | struct strbuf *value) |
| 1841 | { |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1842 | if (value) { |
| 1843 | int allow_filter_value; |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1844 | int allow_ref_in_want; |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1845 | int allow_sideband_all_value; |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1846 | char *str = NULL; |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1847 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 1848 | strbuf_addstr(value, "shallow wait-for-done"); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1849 | |
Jeff King | 4b4e75d | 2023-02-24 01:38:10 -0500 | [diff] [blame] | 1850 | if (!repo_config_get_bool(r, |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1851 | "uploadpack.allowfilter", |
| 1852 | &allow_filter_value) && |
| 1853 | allow_filter_value) |
| 1854 | strbuf_addstr(value, " filter"); |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1855 | |
Jeff King | 4b4e75d | 2023-02-24 01:38:10 -0500 | [diff] [blame] | 1856 | if (!repo_config_get_bool(r, |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1857 | "uploadpack.allowrefinwant", |
| 1858 | &allow_ref_in_want) && |
| 1859 | allow_ref_in_want) |
| 1860 | strbuf_addstr(value, " ref-in-want"); |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1861 | |
Jonathan Tan | 07c3c2a | 2019-01-16 11:28:15 -0800 | [diff] [blame] | 1862 | if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || |
Jeff King | 4b4e75d | 2023-02-24 01:38:10 -0500 | [diff] [blame] | 1863 | (!repo_config_get_bool(r, |
Jonathan Tan | 07c3c2a | 2019-01-16 11:28:15 -0800 | [diff] [blame] | 1864 | "uploadpack.allowsidebandall", |
| 1865 | &allow_sideband_all_value) && |
| 1866 | allow_sideband_all_value)) |
Jonathan Tan | 0bbc0bc | 2019-01-16 11:28:14 -0800 | [diff] [blame] | 1867 | strbuf_addstr(value, " sideband-all"); |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1868 | |
Jeff King | 4b4e75d | 2023-02-24 01:38:10 -0500 | [diff] [blame] | 1869 | if (!repo_config_get_string(r, |
Jonathan Tan | dd4b732 | 2020-06-10 13:57:23 -0700 | [diff] [blame] | 1870 | "uploadpack.blobpackfileuri", |
| 1871 | &str) && |
| 1872 | str) { |
| 1873 | strbuf_addstr(value, " packfile-uris"); |
| 1874 | free(str); |
| 1875 | } |
Jonathan Tan | ba95710 | 2018-05-03 16:46:56 -0700 | [diff] [blame] | 1876 | } |
Brandon Williams | 516e2b7 | 2018-06-27 15:30:17 -0700 | [diff] [blame] | 1877 | |
Brandon Williams | 685fbd3 | 2018-03-15 10:31:28 -0700 | [diff] [blame] | 1878 | return 1; |
| 1879 | } |