Stephen Boyd | c2e86ad | 2011-03-22 00:51:05 -0700 | [diff] [blame] | 1 | #include "builtin.h" |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 2 | #include "refs.h" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 3 | #include "pkt-line.h" |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 4 | #include "commit.h" |
| 5 | #include "tag.h" |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 6 | #include "exec_cmd.h" |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 7 | #include "pack.h" |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 8 | #include "sideband.h" |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 9 | #include "fetch-pack.h" |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 10 | #include "remote.h" |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 11 | #include "run-command.h" |
Junio C Hamano | e52d719 | 2011-03-11 11:53:52 -0800 | [diff] [blame] | 12 | #include "transport.h" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 13 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 14 | static int transfer_unpack_limit = -1; |
| 15 | static int fetch_unpack_limit = -1; |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 16 | static int unpack_limit = 100; |
Nicolas Pitre | f04833e | 2009-05-01 20:18:02 -0400 | [diff] [blame] | 17 | static int prefer_ofs_delta = 1; |
Junio C Hamano | ca0c976 | 2011-10-05 12:36:20 -0700 | [diff] [blame] | 18 | static int no_done; |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 19 | static int fetch_fsck_objects = -1; |
| 20 | static int transfer_fsck_objects = -1; |
Daniel Barkalow | 09149c7 | 2007-10-29 22:35:08 -0400 | [diff] [blame] | 21 | static struct fetch_pack_args args = { |
| 22 | /* .uploadpack = */ "git-upload-pack", |
| 23 | }; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 24 | |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 25 | static const char fetch_pack_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 26 | "git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]"; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 27 | |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 28 | #define COMPLETE (1U << 0) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 29 | #define COMMON (1U << 1) |
| 30 | #define COMMON_REF (1U << 2) |
| 31 | #define SEEN (1U << 3) |
| 32 | #define POPPED (1U << 4) |
| 33 | |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 34 | static int marked; |
| 35 | |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 36 | /* |
| 37 | * After sending this many "have"s if we do not get any new ACK , we |
| 38 | * give up traversing our history. |
| 39 | */ |
| 40 | #define MAX_IN_VAIN 256 |
| 41 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 42 | static struct commit_list *rev_list; |
Nicolas Pitre | 3891f39 | 2007-11-07 17:20:22 -0500 | [diff] [blame] | 43 | static int non_common_revs, multi_ack, use_sideband; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 44 | |
| 45 | static void rev_list_push(struct commit *commit, int mark) |
| 46 | { |
| 47 | if (!(commit->object.flags & mark)) { |
| 48 | commit->object.flags |= mark; |
| 49 | |
| 50 | if (!(commit->object.parsed)) |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 51 | if (parse_commit(commit)) |
| 52 | return; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 53 | |
Thiago Farina | 47e44ed | 2010-11-26 23:58:14 -0200 | [diff] [blame] | 54 | commit_list_insert_by_date(commit, &rev_list); |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 55 | |
| 56 | if (!(commit->object.flags & COMMON)) |
| 57 | non_common_revs++; |
| 58 | } |
| 59 | } |
| 60 | |
Michael Haggerty | 65385ef | 2012-02-11 07:20:57 +0100 | [diff] [blame] | 61 | static int rev_list_insert_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 62 | { |
Michael Haggerty | 65385ef | 2012-02-11 07:20:57 +0100 | [diff] [blame] | 63 | struct object *o = deref_tag(parse_object(sha1), refname, 0); |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 64 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 65 | if (o && o->type == OBJ_COMMIT) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 66 | rev_list_push((struct commit *)o, SEEN); |
| 67 | |
| 68 | return 0; |
| 69 | } |
| 70 | |
Michael Haggerty | 65385ef | 2012-02-11 07:20:57 +0100 | [diff] [blame] | 71 | static int clear_marks(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 72 | { |
Michael Haggerty | 65385ef | 2012-02-11 07:20:57 +0100 | [diff] [blame] | 73 | struct object *o = deref_tag(parse_object(sha1), refname, 0); |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 74 | |
| 75 | if (o && o->type == OBJ_COMMIT) |
| 76 | clear_commit_marks((struct commit *)o, |
| 77 | COMMON | COMMON_REF | SEEN | POPPED); |
| 78 | return 0; |
| 79 | } |
| 80 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 81 | /* |
| 82 | This function marks a rev and its ancestors as common. |
| 83 | In some cases, it is desirable to mark only the ancestors (for example |
| 84 | when only the server does not yet know that they are common). |
| 85 | */ |
| 86 | |
| 87 | static void mark_common(struct commit *commit, |
| 88 | int ancestors_only, int dont_parse) |
| 89 | { |
| 90 | if (commit != NULL && !(commit->object.flags & COMMON)) { |
| 91 | struct object *o = (struct object *)commit; |
| 92 | |
| 93 | if (!ancestors_only) |
| 94 | o->flags |= COMMON; |
| 95 | |
| 96 | if (!(o->flags & SEEN)) |
| 97 | rev_list_push(commit, SEEN); |
| 98 | else { |
| 99 | struct commit_list *parents; |
| 100 | |
| 101 | if (!ancestors_only && !(o->flags & POPPED)) |
| 102 | non_common_revs--; |
| 103 | if (!o->parsed && !dont_parse) |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 104 | if (parse_commit(commit)) |
| 105 | return; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 106 | |
| 107 | for (parents = commit->parents; |
| 108 | parents; |
| 109 | parents = parents->next) |
| 110 | mark_common(parents->item, 0, dont_parse); |
| 111 | } |
| 112 | } |
| 113 | } |
| 114 | |
| 115 | /* |
| 116 | Get the next rev to send, ignoring the common. |
| 117 | */ |
| 118 | |
Felipe Contreras | 4b25d09 | 2009-05-01 12:06:36 +0300 | [diff] [blame] | 119 | static const unsigned char *get_rev(void) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 120 | { |
| 121 | struct commit *commit = NULL; |
| 122 | |
| 123 | while (commit == NULL) { |
| 124 | unsigned int mark; |
Linus Torvalds | 72269ad | 2008-04-28 16:27:49 -0700 | [diff] [blame] | 125 | struct commit_list *parents; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 126 | |
| 127 | if (rev_list == NULL || non_common_revs == 0) |
| 128 | return NULL; |
| 129 | |
| 130 | commit = rev_list->item; |
Junio C Hamano | 2d8bed9 | 2008-04-30 11:42:05 -0700 | [diff] [blame] | 131 | if (!commit->object.parsed) |
Linus Torvalds | 72269ad | 2008-04-28 16:27:49 -0700 | [diff] [blame] | 132 | parse_commit(commit); |
| 133 | parents = commit->parents; |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 134 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 135 | commit->object.flags |= POPPED; |
| 136 | if (!(commit->object.flags & COMMON)) |
| 137 | non_common_revs--; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 138 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 139 | if (commit->object.flags & COMMON) { |
| 140 | /* do not send "have", and ignore ancestors */ |
| 141 | commit = NULL; |
| 142 | mark = COMMON | SEEN; |
| 143 | } else if (commit->object.flags & COMMON_REF) |
| 144 | /* send "have", and ignore ancestors */ |
| 145 | mark = COMMON | SEEN; |
| 146 | else |
| 147 | /* send "have", also for its ancestors */ |
| 148 | mark = SEEN; |
| 149 | |
| 150 | while (parents) { |
| 151 | if (!(parents->item->object.flags & SEEN)) |
| 152 | rev_list_push(parents->item, mark); |
| 153 | if (mark & COMMON) |
| 154 | mark_common(parents->item, 1, 0); |
| 155 | parents = parents->next; |
| 156 | } |
| 157 | |
| 158 | rev_list = rev_list->next; |
| 159 | } |
| 160 | |
| 161 | return commit->object.sha1; |
| 162 | } |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 163 | |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 164 | enum ack_type { |
| 165 | NAK = 0, |
| 166 | ACK, |
| 167 | ACK_continue, |
| 168 | ACK_common, |
| 169 | ACK_ready |
| 170 | }; |
| 171 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 172 | static void consume_shallow_list(int fd) |
| 173 | { |
| 174 | if (args.stateless_rpc && args.depth > 0) { |
| 175 | /* If we sent a depth we will get back "duplicate" |
| 176 | * shallow and unshallow commands every time there |
| 177 | * is a block of have lines exchanged. |
| 178 | */ |
| 179 | char line[1000]; |
| 180 | while (packet_read_line(fd, line, sizeof(line))) { |
| 181 | if (!prefixcmp(line, "shallow ")) |
| 182 | continue; |
| 183 | if (!prefixcmp(line, "unshallow ")) |
| 184 | continue; |
| 185 | die("git fetch-pack: expected shallow list"); |
| 186 | } |
| 187 | } |
| 188 | } |
| 189 | |
Nguyễn Thái Ngọc Duy | 294e15f | 2011-08-18 19:29:36 +0700 | [diff] [blame] | 190 | struct write_shallow_data { |
| 191 | struct strbuf *out; |
| 192 | int use_pack_protocol; |
| 193 | int count; |
| 194 | }; |
| 195 | |
| 196 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) |
| 197 | { |
| 198 | struct write_shallow_data *data = cb_data; |
| 199 | const char *hex = sha1_to_hex(graft->sha1); |
| 200 | data->count++; |
| 201 | if (data->use_pack_protocol) |
| 202 | packet_buf_write(data->out, "shallow %s", hex); |
| 203 | else { |
| 204 | strbuf_addstr(data->out, hex); |
| 205 | strbuf_addch(data->out, '\n'); |
| 206 | } |
| 207 | return 0; |
| 208 | } |
| 209 | |
| 210 | static int write_shallow_commits(struct strbuf *out, int use_pack_protocol) |
| 211 | { |
| 212 | struct write_shallow_data data; |
| 213 | data.out = out; |
| 214 | data.use_pack_protocol = use_pack_protocol; |
| 215 | data.count = 0; |
| 216 | for_each_commit_graft(write_one_shallow, &data); |
| 217 | return data.count; |
| 218 | } |
| 219 | |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 220 | static enum ack_type get_ack(int fd, unsigned char *result_sha1) |
Shawn O. Pearce | 28754ab | 2009-10-30 17:47:24 -0700 | [diff] [blame] | 221 | { |
| 222 | static char line[1000]; |
| 223 | int len = packet_read_line(fd, line, sizeof(line)); |
| 224 | |
| 225 | if (!len) |
| 226 | die("git fetch-pack: expected ACK/NAK, got EOF"); |
| 227 | if (line[len-1] == '\n') |
| 228 | line[--len] = 0; |
| 229 | if (!strcmp(line, "NAK")) |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 230 | return NAK; |
Shawn O. Pearce | 28754ab | 2009-10-30 17:47:24 -0700 | [diff] [blame] | 231 | if (!prefixcmp(line, "ACK ")) { |
| 232 | if (!get_sha1_hex(line+4, result_sha1)) { |
| 233 | if (strstr(line+45, "continue")) |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 234 | return ACK_continue; |
| 235 | if (strstr(line+45, "common")) |
| 236 | return ACK_common; |
| 237 | if (strstr(line+45, "ready")) |
| 238 | return ACK_ready; |
| 239 | return ACK; |
Shawn O. Pearce | 28754ab | 2009-10-30 17:47:24 -0700 | [diff] [blame] | 240 | } |
| 241 | } |
| 242 | die("git fetch_pack: expected ACK/NAK, got '%s'", line); |
| 243 | } |
| 244 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 245 | static void send_request(int fd, struct strbuf *buf) |
| 246 | { |
| 247 | if (args.stateless_rpc) { |
| 248 | send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX); |
| 249 | packet_flush(fd); |
| 250 | } else |
| 251 | safe_write(fd, buf->buf, buf->len); |
| 252 | } |
| 253 | |
Junio C Hamano | e52d719 | 2011-03-11 11:53:52 -0800 | [diff] [blame] | 254 | static void insert_one_alternate_ref(const struct ref *ref, void *unused) |
| 255 | { |
| 256 | rev_list_insert_ref(NULL, ref->old_sha1, 0, NULL); |
| 257 | } |
| 258 | |
Junio C Hamano | 066bf4c | 2011-03-20 21:52:45 -0700 | [diff] [blame] | 259 | #define INITIAL_FLUSH 16 |
Junio C Hamano | 44d8dc5 | 2011-03-29 10:06:19 -0700 | [diff] [blame] | 260 | #define PIPESAFE_FLUSH 32 |
Junio C Hamano | 6afca45 | 2011-03-20 21:52:44 -0700 | [diff] [blame] | 261 | #define LARGE_FLUSH 1024 |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 262 | |
| 263 | static int next_flush(int count) |
| 264 | { |
Junio C Hamano | 44d8dc5 | 2011-03-29 10:06:19 -0700 | [diff] [blame] | 265 | int flush_limit = args.stateless_rpc ? LARGE_FLUSH : PIPESAFE_FLUSH; |
| 266 | |
| 267 | if (count < flush_limit) |
Junio C Hamano | 6afca45 | 2011-03-20 21:52:44 -0700 | [diff] [blame] | 268 | count <<= 1; |
| 269 | else |
Junio C Hamano | 44d8dc5 | 2011-03-29 10:06:19 -0700 | [diff] [blame] | 270 | count += flush_limit; |
Junio C Hamano | 6afca45 | 2011-03-20 21:52:44 -0700 | [diff] [blame] | 271 | return count; |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 272 | } |
| 273 | |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 274 | static int find_common(int fd[2], unsigned char *result_sha1, |
| 275 | struct ref *refs) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 276 | { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 277 | int fetching; |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 278 | int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 279 | const unsigned char *sha1; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 280 | unsigned in_vain = 0; |
| 281 | int got_continue = 0; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 282 | int got_ready = 0; |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 283 | struct strbuf req_buf = STRBUF_INIT; |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 284 | size_t state_len = 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 285 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 286 | if (args.stateless_rpc && multi_ack == 1) |
| 287 | die("--stateless-rpc requires multi_ack_detailed"); |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 288 | if (marked) |
| 289 | for_each_ref(clear_marks, NULL); |
| 290 | marked = 1; |
| 291 | |
Junio C Hamano | cb5d709 | 2006-09-20 21:47:42 -0700 | [diff] [blame] | 292 | for_each_ref(rev_list_insert_ref, NULL); |
Michael Haggerty | c41a802 | 2012-02-11 07:20:58 +0100 | [diff] [blame] | 293 | for_each_alternate_ref(insert_one_alternate_ref, NULL); |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 294 | |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 295 | fetching = 0; |
| 296 | for ( ; refs ; refs = refs->next) { |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 297 | unsigned char *remote = refs->old_sha1; |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 298 | const char *remote_hex; |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 299 | struct object *o; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 300 | |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 301 | /* |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 302 | * If that object is complete (i.e. it is an ancestor of a |
| 303 | * local ref), we tell them we have it but do not have to |
| 304 | * tell them about its ancestors, which they already know |
| 305 | * about. |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 306 | * |
| 307 | * We use lookup_object here because we are only |
| 308 | * interested in the case we *know* the object is |
| 309 | * reachable and we have already scanned it. |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 310 | */ |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 311 | if (((o = lookup_object(remote)) != NULL) && |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 312 | (o->flags & COMPLETE)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 313 | continue; |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 314 | } |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 315 | |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 316 | remote_hex = sha1_to_hex(remote); |
| 317 | if (!fetching) { |
| 318 | struct strbuf c = STRBUF_INIT; |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 319 | if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed"); |
| 320 | if (multi_ack == 1) strbuf_addstr(&c, " multi_ack"); |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 321 | if (no_done) strbuf_addstr(&c, " no-done"); |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 322 | if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k"); |
| 323 | if (use_sideband == 1) strbuf_addstr(&c, " side-band"); |
| 324 | if (args.use_thin_pack) strbuf_addstr(&c, " thin-pack"); |
| 325 | if (args.no_progress) strbuf_addstr(&c, " no-progress"); |
| 326 | if (args.include_tag) strbuf_addstr(&c, " include-tag"); |
| 327 | if (prefer_ofs_delta) strbuf_addstr(&c, " ofs-delta"); |
| 328 | packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf); |
| 329 | strbuf_release(&c); |
| 330 | } else |
| 331 | packet_buf_write(&req_buf, "want %s\n", remote_hex); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 332 | fetching++; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 333 | } |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 334 | |
| 335 | if (!fetching) { |
| 336 | strbuf_release(&req_buf); |
| 337 | packet_flush(fd[1]); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 338 | return 1; |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 339 | } |
| 340 | |
| 341 | if (is_repository_shallow()) |
| 342 | write_shallow_commits(&req_buf, 1); |
| 343 | if (args.depth > 0) |
| 344 | packet_buf_write(&req_buf, "deepen %d", args.depth); |
| 345 | packet_buf_flush(&req_buf); |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 346 | state_len = req_buf.len; |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 347 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 348 | if (args.depth > 0) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 349 | char line[1024]; |
| 350 | unsigned char sha1[20]; |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 351 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 352 | send_request(fd[1], &req_buf); |
Benjamin Kramer | eb3a9dd | 2009-03-07 21:02:10 +0100 | [diff] [blame] | 353 | while (packet_read_line(fd[0], line, sizeof(line))) { |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 354 | if (!prefixcmp(line, "shallow ")) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 355 | if (get_sha1_hex(line + 8, sha1)) |
| 356 | die("invalid shallow line: %s", line); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 357 | register_shallow(sha1); |
Junio C Hamano | cf01bd5 | 2006-11-13 22:04:56 -0800 | [diff] [blame] | 358 | continue; |
| 359 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 360 | if (!prefixcmp(line, "unshallow ")) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 361 | if (get_sha1_hex(line + 10, sha1)) |
| 362 | die("invalid unshallow line: %s", line); |
| 363 | if (!lookup_object(sha1)) |
| 364 | die("object not found: %s", line); |
| 365 | /* make sure that it is parsed as shallow */ |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 366 | if (!parse_object(sha1)) |
| 367 | die("error in object: %s", line); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 368 | if (unregister_shallow(sha1)) |
| 369 | die("no shallow found: %s", line); |
Junio C Hamano | cf01bd5 | 2006-11-13 22:04:56 -0800 | [diff] [blame] | 370 | continue; |
| 371 | } |
| 372 | die("expected shallow/unshallow, got %s", line); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 373 | } |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 374 | } else if (!args.stateless_rpc) |
| 375 | send_request(fd[1], &req_buf); |
| 376 | |
| 377 | if (!args.stateless_rpc) { |
| 378 | /* If we aren't using the stateless-rpc interface |
| 379 | * we don't need to retain the headers. |
| 380 | */ |
| 381 | strbuf_setlen(&req_buf, 0); |
| 382 | state_len = 0; |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 383 | } |
| 384 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 385 | flushes = 0; |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 386 | retval = -1; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 387 | while ((sha1 = get_rev())) { |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 388 | packet_buf_write(&req_buf, "have %s\n", sha1_to_hex(sha1)); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 389 | if (args.verbose) |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 390 | fprintf(stderr, "have %s\n", sha1_to_hex(sha1)); |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 391 | in_vain++; |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 392 | if (flush_at <= ++count) { |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 393 | int ack; |
| 394 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 395 | packet_buf_flush(&req_buf); |
| 396 | send_request(fd[1], &req_buf); |
| 397 | strbuf_setlen(&req_buf, state_len); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 398 | flushes++; |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 399 | flush_at = next_flush(count); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 400 | |
| 401 | /* |
| 402 | * We keep one window "ahead" of the other side, and |
| 403 | * will wait for an ACK only on the next one |
| 404 | */ |
Junio C Hamano | c12f591 | 2011-03-20 21:52:40 -0700 | [diff] [blame] | 405 | if (!args.stateless_rpc && count == INITIAL_FLUSH) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 406 | continue; |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 407 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 408 | consume_shallow_list(fd[0]); |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 409 | do { |
| 410 | ack = get_ack(fd[0], result_sha1); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 411 | if (args.verbose && ack) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 412 | fprintf(stderr, "got ack %d %s\n", ack, |
| 413 | sha1_to_hex(result_sha1)); |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 414 | switch (ack) { |
| 415 | case ACK: |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 416 | flushes = 0; |
| 417 | multi_ack = 0; |
| 418 | retval = 0; |
| 419 | goto done; |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 420 | case ACK_common: |
| 421 | case ACK_ready: |
| 422 | case ACK_continue: { |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 423 | struct commit *commit = |
| 424 | lookup_commit(result_sha1); |
Nguyễn Thái Ngọc Duy | ec09954 | 2011-08-18 20:36:03 +0700 | [diff] [blame] | 425 | if (!commit) |
| 426 | die("invalid commit %s", sha1_to_hex(result_sha1)); |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 427 | if (args.stateless_rpc |
| 428 | && ack == ACK_common |
| 429 | && !(commit->object.flags & COMMON)) { |
| 430 | /* We need to replay the have for this object |
| 431 | * on the next RPC request so the peer knows |
| 432 | * it is in common with us. |
| 433 | */ |
| 434 | const char *hex = sha1_to_hex(result_sha1); |
| 435 | packet_buf_write(&req_buf, "have %s\n", hex); |
| 436 | state_len = req_buf.len; |
| 437 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 438 | mark_common(commit, 0, 1); |
| 439 | retval = 0; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 440 | in_vain = 0; |
| 441 | got_continue = 1; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 442 | if (ack == ACK_ready) { |
Shawn O. Pearce | f2cba92 | 2011-03-14 16:48:38 -0700 | [diff] [blame] | 443 | rev_list = NULL; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 444 | got_ready = 1; |
| 445 | } |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 446 | break; |
| 447 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 448 | } |
| 449 | } while (ack); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 450 | flushes--; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 451 | if (got_continue && MAX_IN_VAIN < in_vain) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 452 | if (args.verbose) |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 453 | fprintf(stderr, "giving up\n"); |
| 454 | break; /* give up */ |
| 455 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 456 | } |
| 457 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 458 | done: |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 459 | if (!got_ready || !no_done) { |
| 460 | packet_buf_write(&req_buf, "done\n"); |
| 461 | send_request(fd[1], &req_buf); |
| 462 | } |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 463 | if (args.verbose) |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 464 | fprintf(stderr, "done\n"); |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 465 | if (retval != 0) { |
| 466 | multi_ack = 0; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 467 | flushes++; |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 468 | } |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 469 | strbuf_release(&req_buf); |
| 470 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 471 | consume_shallow_list(fd[0]); |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 472 | while (flushes || multi_ack) { |
| 473 | int ack = get_ack(fd[0], result_sha1); |
| 474 | if (ack) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 475 | if (args.verbose) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 476 | fprintf(stderr, "got ack (%d) %s\n", ack, |
| 477 | sha1_to_hex(result_sha1)); |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 478 | if (ack == ACK) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 479 | return 0; |
| 480 | multi_ack = 1; |
| 481 | continue; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 482 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 483 | flushes--; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 484 | } |
Johannes Schindelin | 8cb560f | 2008-07-02 18:06:56 +0100 | [diff] [blame] | 485 | /* it is no error to fetch into a completely empty repo */ |
| 486 | return count ? retval : 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 487 | } |
| 488 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 489 | static struct commit_list *complete; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 490 | |
Michael Haggerty | 65385ef | 2012-02-11 07:20:57 +0100 | [diff] [blame] | 491 | static int mark_complete(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 492 | { |
| 493 | struct object *o = parse_object(sha1); |
| 494 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 495 | while (o && o->type == OBJ_TAG) { |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 496 | struct tag *t = (struct tag *) o; |
| 497 | if (!t->tagged) |
| 498 | break; /* broken repository */ |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 499 | o->flags |= COMPLETE; |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 500 | o = parse_object(t->tagged->sha1); |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 501 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 502 | if (o && o->type == OBJ_COMMIT) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 503 | struct commit *commit = (struct commit *)o; |
Jeff King | ea5f220 | 2011-05-19 16:48:51 -0400 | [diff] [blame] | 504 | if (!(commit->object.flags & COMPLETE)) { |
| 505 | commit->object.flags |= COMPLETE; |
| 506 | commit_list_insert_by_date(commit, &complete); |
| 507 | } |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 508 | } |
| 509 | return 0; |
| 510 | } |
| 511 | |
| 512 | static void mark_recent_complete_commits(unsigned long cutoff) |
| 513 | { |
| 514 | while (complete && cutoff <= complete->item->date) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 515 | if (args.verbose) |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 516 | fprintf(stderr, "Marking %s as complete\n", |
| 517 | sha1_to_hex(complete->item->object.sha1)); |
| 518 | pop_most_recent_commit(&complete, COMPLETE); |
| 519 | } |
| 520 | } |
| 521 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 522 | static void filter_refs(struct ref **refs, int nr_match, char **match) |
| 523 | { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 524 | struct ref **return_refs; |
| 525 | struct ref *newlist = NULL; |
| 526 | struct ref **newtail = &newlist; |
| 527 | struct ref *ref, *next; |
| 528 | struct ref *fastarray[32]; |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 529 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 530 | if (nr_match && !args.fetch_all) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 531 | if (ARRAY_SIZE(fastarray) < nr_match) |
| 532 | return_refs = xcalloc(nr_match, sizeof(struct ref *)); |
| 533 | else { |
| 534 | return_refs = fastarray; |
| 535 | memset(return_refs, 0, sizeof(struct ref *) * nr_match); |
| 536 | } |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 537 | } |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 538 | else |
| 539 | return_refs = NULL; |
| 540 | |
| 541 | for (ref = *refs; ref; ref = next) { |
| 542 | next = ref->next; |
| 543 | if (!memcmp(ref->name, "refs/", 5) && |
Michael Haggerty | 8d9c501 | 2011-09-15 23:10:25 +0200 | [diff] [blame] | 544 | check_refname_format(ref->name + 5, 0)) |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 545 | ; /* trash */ |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 546 | else if (args.fetch_all && |
| 547 | (!args.depth || prefixcmp(ref->name, "refs/tags/") )) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 548 | *newtail = ref; |
| 549 | ref->next = NULL; |
| 550 | newtail = &ref->next; |
| 551 | continue; |
| 552 | } |
| 553 | else { |
Jeff King | 1e7ba0f | 2011-12-12 19:48:08 -0500 | [diff] [blame] | 554 | int i; |
| 555 | for (i = 0; i < nr_match; i++) { |
| 556 | if (!strcmp(ref->name, match[i])) { |
| 557 | match[i][0] = '\0'; |
| 558 | return_refs[i] = ref; |
| 559 | break; |
| 560 | } |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 561 | } |
Jeff King | 1e7ba0f | 2011-12-12 19:48:08 -0500 | [diff] [blame] | 562 | if (i < nr_match) |
| 563 | continue; /* we will link it later */ |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 564 | } |
| 565 | free(ref); |
| 566 | } |
| 567 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 568 | if (!args.fetch_all) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 569 | int i; |
| 570 | for (i = 0; i < nr_match; i++) { |
| 571 | ref = return_refs[i]; |
| 572 | if (ref) { |
| 573 | *newtail = ref; |
| 574 | ref->next = NULL; |
| 575 | newtail = &ref->next; |
| 576 | } |
| 577 | } |
| 578 | if (return_refs != fastarray) |
| 579 | free(return_refs); |
| 580 | } |
| 581 | *refs = newlist; |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 582 | } |
| 583 | |
Michael Haggerty | f257659 | 2012-02-11 07:20:59 +0100 | [diff] [blame] | 584 | static void mark_alternate_complete(const struct ref *ref, void *unused) |
| 585 | { |
| 586 | mark_complete(NULL, ref->old_sha1, 0, NULL); |
| 587 | } |
| 588 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 589 | static int everything_local(struct ref **refs, int nr_match, char **match) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 590 | { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 591 | struct ref *ref; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 592 | int retval; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 593 | unsigned long cutoff = 0; |
| 594 | |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 595 | save_commit_buffer = 0; |
| 596 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 597 | for (ref = *refs; ref; ref = ref->next) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 598 | struct object *o; |
| 599 | |
| 600 | o = parse_object(ref->old_sha1); |
| 601 | if (!o) |
| 602 | continue; |
| 603 | |
| 604 | /* We already have it -- which may mean that we were |
| 605 | * in sync with the other side at some time after |
| 606 | * that (it is OK if we guess wrong here). |
| 607 | */ |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 608 | if (o->type == OBJ_COMMIT) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 609 | struct commit *commit = (struct commit *)o; |
| 610 | if (!cutoff || cutoff < commit->date) |
| 611 | cutoff = commit->date; |
| 612 | } |
| 613 | } |
| 614 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 615 | if (!args.depth) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 616 | for_each_ref(mark_complete, NULL); |
Michael Haggerty | f257659 | 2012-02-11 07:20:59 +0100 | [diff] [blame] | 617 | for_each_alternate_ref(mark_alternate_complete, NULL); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 618 | if (cutoff) |
| 619 | mark_recent_complete_commits(cutoff); |
| 620 | } |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 621 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 622 | /* |
| 623 | * Mark all complete remote refs as common refs. |
| 624 | * Don't mark them common yet; the server has to be told so first. |
| 625 | */ |
| 626 | for (ref = *refs; ref; ref = ref->next) { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 627 | struct object *o = deref_tag(lookup_object(ref->old_sha1), |
| 628 | NULL, 0); |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 629 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 630 | if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 631 | continue; |
| 632 | |
| 633 | if (!(o->flags & SEEN)) { |
| 634 | rev_list_push((struct commit *)o, COMMON_REF | SEEN); |
| 635 | |
| 636 | mark_common((struct commit *)o, 1, 1); |
| 637 | } |
| 638 | } |
| 639 | |
| 640 | filter_refs(refs, nr_match, match); |
| 641 | |
| 642 | for (retval = 1, ref = *refs; ref ; ref = ref->next) { |
| 643 | const unsigned char *remote = ref->old_sha1; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 644 | unsigned char local[20]; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 645 | struct object *o; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 646 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 647 | o = lookup_object(remote); |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 648 | if (!o || !(o->flags & COMPLETE)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 649 | retval = 0; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 650 | if (!args.verbose) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 651 | continue; |
| 652 | fprintf(stderr, |
| 653 | "want %s (%s)\n", sha1_to_hex(remote), |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 654 | ref->name); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 655 | continue; |
| 656 | } |
| 657 | |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 658 | hashcpy(ref->new_sha1, local); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 659 | if (!args.verbose) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 660 | continue; |
| 661 | fprintf(stderr, |
| 662 | "already have %s (%s)\n", sha1_to_hex(remote), |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 663 | ref->name); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 664 | } |
| 665 | return retval; |
| 666 | } |
| 667 | |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 668 | static int sideband_demux(int in, int out, void *data) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 669 | { |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 670 | int *xd = data; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 671 | |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 672 | int ret = recv_sideband("fetch-pack", xd[0], out); |
| 673 | close(out); |
Johannes Sixt | 3ef67cf | 2009-06-08 10:51:22 +0200 | [diff] [blame] | 674 | return ret; |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 675 | } |
| 676 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 677 | static int get_pack(int xd[2], char **pack_lockfile) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 678 | { |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 679 | struct async demux; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 680 | const char *argv[20]; |
| 681 | char keep_arg[256]; |
| 682 | char hdr_arg[256]; |
| 683 | const char **av; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 684 | int do_keep = args.keep_pack; |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 685 | struct child_process cmd; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 686 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 687 | memset(&demux, 0, sizeof(demux)); |
| 688 | if (use_sideband) { |
| 689 | /* xd[] is talking with upload-pack; subprocess reads from |
| 690 | * xd[0], spits out band#2 to stderr, and feeds us band#1 |
| 691 | * through demux->out. |
| 692 | */ |
| 693 | demux.proc = sideband_demux; |
| 694 | demux.data = xd; |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 695 | demux.out = -1; |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 696 | if (start_async(&demux)) |
| 697 | die("fetch-pack: unable to fork off sideband" |
| 698 | " demultiplexer"); |
| 699 | } |
| 700 | else |
| 701 | demux.out = xd[0]; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 702 | |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 703 | memset(&cmd, 0, sizeof(cmd)); |
| 704 | cmd.argv = argv; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 705 | av = argv; |
| 706 | *hdr_arg = 0; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 707 | if (!args.keep_pack && unpack_limit) { |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 708 | struct pack_header header; |
| 709 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 710 | if (read_pack_header(demux.out, &header)) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 711 | die("protocol error: bad pack header"); |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 712 | snprintf(hdr_arg, sizeof(hdr_arg), |
| 713 | "--pack_header=%"PRIu32",%"PRIu32, |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 714 | ntohl(header.hdr_version), ntohl(header.hdr_entries)); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 715 | if (ntohl(header.hdr_entries) < unpack_limit) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 716 | do_keep = 0; |
| 717 | else |
| 718 | do_keep = 1; |
| 719 | } |
| 720 | |
| 721 | if (do_keep) { |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 722 | if (pack_lockfile) |
| 723 | cmd.out = -1; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 724 | *av++ = "index-pack"; |
| 725 | *av++ = "--stdin"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 726 | if (!args.quiet && !args.no_progress) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 727 | *av++ = "-v"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 728 | if (args.use_thin_pack) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 729 | *av++ = "--fix-thin"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 730 | if (args.lock_pack || unpack_limit) { |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 731 | int s = sprintf(keep_arg, |
David Soria Parra | 85e7283 | 2008-08-31 14:09:39 +0200 | [diff] [blame] | 732 | "--keep=fetch-pack %"PRIuMAX " on ", (uintmax_t) getpid()); |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 733 | if (gethostname(keep_arg + s, sizeof(keep_arg) - s)) |
| 734 | strcpy(keep_arg + s, "localhost"); |
| 735 | *av++ = keep_arg; |
| 736 | } |
| 737 | } |
| 738 | else { |
| 739 | *av++ = "unpack-objects"; |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 740 | if (args.quiet || args.no_progress) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 741 | *av++ = "-q"; |
| 742 | } |
| 743 | if (*hdr_arg) |
| 744 | *av++ = hdr_arg; |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 745 | if (fetch_fsck_objects >= 0 |
| 746 | ? fetch_fsck_objects |
| 747 | : transfer_fsck_objects >= 0 |
| 748 | ? transfer_fsck_objects |
| 749 | : 0) |
Junio C Hamano | 5e838ea | 2011-09-04 12:26:14 -0700 | [diff] [blame] | 750 | *av++ = "--strict"; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 751 | *av++ = NULL; |
| 752 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 753 | cmd.in = demux.out; |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 754 | cmd.git_cmd = 1; |
| 755 | if (start_command(&cmd)) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 756 | die("fetch-pack: unable to fork off %s", argv[0]); |
Johannes Sixt | e72ae28 | 2008-02-16 18:36:38 +0100 | [diff] [blame] | 757 | if (do_keep && pack_lockfile) { |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 758 | *pack_lockfile = index_pack_lockfile(cmd.out); |
Johannes Sixt | e72ae28 | 2008-02-16 18:36:38 +0100 | [diff] [blame] | 759 | close(cmd.out); |
| 760 | } |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 761 | |
| 762 | if (finish_command(&cmd)) |
| 763 | die("%s failed", argv[0]); |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 764 | if (use_sideband && finish_async(&demux)) |
| 765 | die("error in sideband demultiplexer"); |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 766 | return 0; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 767 | } |
| 768 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 769 | static struct ref *do_fetch_pack(int fd[2], |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 770 | const struct ref *orig_ref, |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 771 | int nr_match, |
| 772 | char **match, |
| 773 | char **pack_lockfile) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 774 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 775 | struct ref *ref = copy_ref_list(orig_ref); |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 776 | unsigned char sha1[20]; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 777 | |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 778 | if (is_repository_shallow() && !server_supports("shallow")) |
| 779 | die("Server does not support shallow clients"); |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 780 | if (server_supports("multi_ack_detailed")) { |
| 781 | if (args.verbose) |
| 782 | fprintf(stderr, "Server supports multi_ack_detailed\n"); |
| 783 | multi_ack = 2; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 784 | if (server_supports("no-done")) { |
| 785 | if (args.verbose) |
| 786 | fprintf(stderr, "Server supports no-done\n"); |
Junio C Hamano | 8e9182e | 2011-03-29 10:16:29 -0700 | [diff] [blame] | 787 | if (args.stateless_rpc) |
| 788 | no_done = 1; |
Junio C Hamano | 4e10cf9 | 2011-03-29 12:29:10 -0700 | [diff] [blame] | 789 | } |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 790 | } |
| 791 | else if (server_supports("multi_ack")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 792 | if (args.verbose) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 793 | fprintf(stderr, "Server supports multi_ack\n"); |
| 794 | multi_ack = 1; |
| 795 | } |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 796 | if (server_supports("side-band-64k")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 797 | if (args.verbose) |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 798 | fprintf(stderr, "Server supports side-band-64k\n"); |
| 799 | use_sideband = 2; |
| 800 | } |
| 801 | else if (server_supports("side-band")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 802 | if (args.verbose) |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 803 | fprintf(stderr, "Server supports side-band\n"); |
| 804 | use_sideband = 1; |
| 805 | } |
Nicolas Pitre | f04833e | 2009-05-01 20:18:02 -0400 | [diff] [blame] | 806 | if (server_supports("ofs-delta")) { |
| 807 | if (args.verbose) |
| 808 | fprintf(stderr, "Server supports ofs-delta\n"); |
| 809 | } else |
| 810 | prefer_ofs_delta = 0; |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 811 | if (everything_local(&ref, nr_match, match)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 812 | packet_flush(fd[1]); |
| 813 | goto all_done; |
| 814 | } |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 815 | if (find_common(fd, sha1, ref) < 0) |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 816 | if (!args.keep_pack) |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 817 | /* When cloning, it is not unusual to have |
| 818 | * no common commit. |
| 819 | */ |
Miklos Vajna | 78509d2 | 2009-03-24 02:09:12 +0100 | [diff] [blame] | 820 | warning("no common commits"); |
Junio C Hamano | ad89721 | 2005-12-14 22:17:38 -0800 | [diff] [blame] | 821 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 822 | if (args.stateless_rpc) |
| 823 | packet_flush(fd[1]); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 824 | if (get_pack(fd, pack_lockfile)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 825 | die("git fetch-pack: fetch failed."); |
Junio C Hamano | ad89721 | 2005-12-14 22:17:38 -0800 | [diff] [blame] | 826 | |
| 827 | all_done: |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 828 | return ref; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 829 | } |
| 830 | |
Junio C Hamano | 310b86d | 2006-11-25 01:33:06 -0800 | [diff] [blame] | 831 | static int remove_duplicates(int nr_heads, char **heads) |
| 832 | { |
| 833 | int src, dst; |
| 834 | |
| 835 | for (src = dst = 0; src < nr_heads; src++) { |
| 836 | /* If heads[src] is different from any of |
| 837 | * heads[0..dst], push it in. |
| 838 | */ |
| 839 | int i; |
| 840 | for (i = 0; i < dst; i++) { |
| 841 | if (!strcmp(heads[i], heads[src])) |
| 842 | break; |
| 843 | } |
| 844 | if (i < dst) |
| 845 | continue; |
| 846 | if (src != dst) |
| 847 | heads[dst] = heads[src]; |
| 848 | dst++; |
| 849 | } |
Junio C Hamano | 310b86d | 2006-11-25 01:33:06 -0800 | [diff] [blame] | 850 | return dst; |
| 851 | } |
| 852 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 853 | static int fetch_pack_config(const char *var, const char *value, void *cb) |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 854 | { |
| 855 | if (strcmp(var, "fetch.unpacklimit") == 0) { |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 856 | fetch_unpack_limit = git_config_int(var, value); |
| 857 | return 0; |
| 858 | } |
| 859 | |
| 860 | if (strcmp(var, "transfer.unpacklimit") == 0) { |
| 861 | transfer_unpack_limit = git_config_int(var, value); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 862 | return 0; |
| 863 | } |
| 864 | |
Nicolas Pitre | f04833e | 2009-05-01 20:18:02 -0400 | [diff] [blame] | 865 | if (strcmp(var, "repack.usedeltabaseoffset") == 0) { |
| 866 | prefer_ofs_delta = git_config_bool(var, value); |
| 867 | return 0; |
| 868 | } |
| 869 | |
Junio C Hamano | 5e838ea | 2011-09-04 12:26:14 -0700 | [diff] [blame] | 870 | if (!strcmp(var, "fetch.fsckobjects")) { |
| 871 | fetch_fsck_objects = git_config_bool(var, value); |
| 872 | return 0; |
| 873 | } |
| 874 | |
Junio C Hamano | dab76d3 | 2011-09-04 12:37:45 -0700 | [diff] [blame] | 875 | if (!strcmp(var, "transfer.fsckobjects")) { |
| 876 | transfer_fsck_objects = git_config_bool(var, value); |
| 877 | return 0; |
| 878 | } |
| 879 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 880 | return git_default_config(var, value, cb); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 881 | } |
| 882 | |
Junio C Hamano | 54b9e02 | 2007-01-02 11:22:08 -0800 | [diff] [blame] | 883 | static struct lock_file lock; |
| 884 | |
Shawn O. Pearce | 50ab5fd | 2007-09-19 00:49:39 -0400 | [diff] [blame] | 885 | static void fetch_pack_setup(void) |
| 886 | { |
| 887 | static int did_setup; |
| 888 | if (did_setup) |
| 889 | return; |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 890 | git_config(fetch_pack_config, NULL); |
Shawn O. Pearce | 50ab5fd | 2007-09-19 00:49:39 -0400 | [diff] [blame] | 891 | if (0 <= transfer_unpack_limit) |
| 892 | unpack_limit = transfer_unpack_limit; |
| 893 | else if (0 <= fetch_unpack_limit) |
| 894 | unpack_limit = fetch_unpack_limit; |
| 895 | did_setup = 1; |
| 896 | } |
| 897 | |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 898 | int cmd_fetch_pack(int argc, const char **argv, const char *prefix) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 899 | { |
| 900 | int i, ret, nr_heads; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 901 | struct ref *ref = NULL; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 902 | char *dest = NULL, **heads; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 903 | int fd[2]; |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 904 | char *pack_lockfile = NULL; |
| 905 | char **pack_lockfile_ptr = NULL; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 906 | struct child_process *conn; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 907 | |
Jeff King | bbc30f9 | 2011-02-24 09:30:19 -0500 | [diff] [blame] | 908 | packet_trace_identity("fetch-pack"); |
| 909 | |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 910 | nr_heads = 0; |
| 911 | heads = NULL; |
| 912 | for (i = 1; i < argc; i++) { |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 913 | const char *arg = argv[i]; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 914 | |
| 915 | if (*arg == '-') { |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 916 | if (!prefixcmp(arg, "--upload-pack=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 917 | args.uploadpack = arg + 14; |
Uwe Kleine-König | 27dca07 | 2007-01-23 09:20:17 +0100 | [diff] [blame] | 918 | continue; |
| 919 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 920 | if (!prefixcmp(arg, "--exec=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 921 | args.uploadpack = arg + 7; |
Junio C Hamano | 8b3d9dc | 2005-07-14 00:08:37 -0700 | [diff] [blame] | 922 | continue; |
| 923 | } |
Junio C Hamano | 2247efb | 2005-12-18 01:55:29 -0800 | [diff] [blame] | 924 | if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 925 | args.quiet = 1; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 926 | continue; |
| 927 | } |
Junio C Hamano | 2247efb | 2005-12-18 01:55:29 -0800 | [diff] [blame] | 928 | if (!strcmp("--keep", arg) || !strcmp("-k", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 929 | args.lock_pack = args.keep_pack; |
| 930 | args.keep_pack = 1; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 931 | continue; |
| 932 | } |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 933 | if (!strcmp("--thin", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 934 | args.use_thin_pack = 1; |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 935 | continue; |
| 936 | } |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 937 | if (!strcmp("--include-tag", arg)) { |
| 938 | args.include_tag = 1; |
| 939 | continue; |
| 940 | } |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 941 | if (!strcmp("--all", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 942 | args.fetch_all = 1; |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 943 | continue; |
| 944 | } |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 945 | if (!strcmp("-v", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 946 | args.verbose = 1; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 947 | continue; |
| 948 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 949 | if (!prefixcmp(arg, "--depth=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 950 | args.depth = strtol(arg + 8, NULL, 0); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 951 | continue; |
| 952 | } |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 953 | if (!strcmp("--no-progress", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 954 | args.no_progress = 1; |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 955 | continue; |
| 956 | } |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 957 | if (!strcmp("--stateless-rpc", arg)) { |
| 958 | args.stateless_rpc = 1; |
| 959 | continue; |
| 960 | } |
| 961 | if (!strcmp("--lock-pack", arg)) { |
| 962 | args.lock_pack = 1; |
| 963 | pack_lockfile_ptr = &pack_lockfile; |
| 964 | continue; |
| 965 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 966 | usage(fetch_pack_usage); |
| 967 | } |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 968 | dest = (char *)arg; |
| 969 | heads = (char **)(argv + i + 1); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 970 | nr_heads = argc - i - 1; |
| 971 | break; |
| 972 | } |
| 973 | if (!dest) |
| 974 | usage(fetch_pack_usage); |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 975 | |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 976 | if (args.stateless_rpc) { |
| 977 | conn = NULL; |
| 978 | fd[0] = 0; |
| 979 | fd[1] = 1; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 980 | } else { |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 981 | conn = git_connect(fd, (char *)dest, args.uploadpack, |
| 982 | args.verbose ? CONNECT_VERBOSE : 0); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 983 | } |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 984 | |
Jeff King | afe7c5f | 2011-12-12 19:41:37 -0500 | [diff] [blame] | 985 | get_remote_heads(fd[0], &ref, 0, NULL); |
Shawn O. Pearce | 249b200 | 2009-10-30 17:47:42 -0700 | [diff] [blame] | 986 | |
| 987 | ref = fetch_pack(&args, fd, conn, ref, dest, |
| 988 | nr_heads, heads, pack_lockfile_ptr); |
| 989 | if (pack_lockfile) { |
| 990 | printf("lock %s\n", pack_lockfile); |
| 991 | fflush(stdout); |
| 992 | } |
| 993 | close(fd[0]); |
| 994 | close(fd[1]); |
| 995 | if (finish_connect(conn)) |
| 996 | ref = NULL; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 997 | ret = !ref; |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 998 | |
| 999 | if (!ret && nr_heads) { |
| 1000 | /* If the heads to pull were given, we should have |
| 1001 | * consumed all of them by matching the remote. |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 1002 | * Otherwise, 'git fetch remote no-such-ref' would |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 1003 | * silently succeed without issuing an error. |
| 1004 | */ |
| 1005 | for (i = 0; i < nr_heads; i++) |
| 1006 | if (heads[i] && heads[i][0]) { |
| 1007 | error("no such remote ref %s", heads[i]); |
| 1008 | ret = 1; |
| 1009 | } |
| 1010 | } |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 1011 | while (ref) { |
| 1012 | printf("%s %s\n", |
| 1013 | sha1_to_hex(ref->old_sha1), ref->name); |
| 1014 | ref = ref->next; |
| 1015 | } |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 1016 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 1017 | return ret; |
| 1018 | } |
| 1019 | |
| 1020 | struct ref *fetch_pack(struct fetch_pack_args *my_args, |
| 1021 | int fd[], struct child_process *conn, |
| 1022 | const struct ref *ref, |
| 1023 | const char *dest, |
| 1024 | int nr_heads, |
| 1025 | char **heads, |
| 1026 | char **pack_lockfile) |
| 1027 | { |
| 1028 | struct stat st; |
| 1029 | struct ref *ref_cpy; |
| 1030 | |
| 1031 | fetch_pack_setup(); |
Thomas Rast | d551bba | 2008-12-06 21:50:09 +0100 | [diff] [blame] | 1032 | if (&args != my_args) |
| 1033 | memcpy(&args, my_args, sizeof(args)); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 1034 | if (args.depth > 0) { |
| 1035 | if (stat(git_path("shallow"), &st)) |
| 1036 | st.st_mtime = 0; |
| 1037 | } |
| 1038 | |
| 1039 | if (heads && nr_heads) |
| 1040 | nr_heads = remove_duplicates(nr_heads, heads); |
| 1041 | if (!ref) { |
| 1042 | packet_flush(fd[1]); |
| 1043 | die("no matching remote head"); |
| 1044 | } |
| 1045 | ref_cpy = do_fetch_pack(fd, ref, nr_heads, heads, pack_lockfile); |
| 1046 | |
| 1047 | if (args.depth > 0) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1048 | struct cache_time mtime; |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 1049 | struct strbuf sb = STRBUF_INIT; |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1050 | char *shallow = git_path("shallow"); |
| 1051 | int fd; |
| 1052 | |
| 1053 | mtime.sec = st.st_mtime; |
Kjetil Barvik | c06ff49 | 2009-03-04 18:47:40 +0100 | [diff] [blame] | 1054 | mtime.nsec = ST_MTIME_NSEC(st); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1055 | if (stat(shallow, &st)) { |
| 1056 | if (mtime.sec) |
| 1057 | die("shallow file was removed during fetch"); |
| 1058 | } else if (st.st_mtime != mtime.sec |
| 1059 | #ifdef USE_NSEC |
Kjetil Barvik | 5bcf109 | 2009-03-15 12:38:55 +0100 | [diff] [blame] | 1060 | || ST_MTIME_NSEC(st) != mtime.nsec |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1061 | #endif |
| 1062 | ) |
| 1063 | die("shallow file was changed during fetch"); |
| 1064 | |
Junio C Hamano | acd3b9e | 2008-10-17 15:44:39 -0700 | [diff] [blame] | 1065 | fd = hold_lock_file_for_update(&lock, shallow, |
| 1066 | LOCK_DIE_ON_ERROR); |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 1067 | if (!write_shallow_commits(&sb, 0) |
| 1068 | || write_in_full(fd, sb.buf, sb.len) != sb.len) { |
Alex Riesen | 691f1a2 | 2009-04-29 23:22:56 +0200 | [diff] [blame] | 1069 | unlink_or_warn(shallow); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1070 | rollback_lock_file(&lock); |
| 1071 | } else { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1072 | commit_lock_file(&lock); |
| 1073 | } |
Shawn O. Pearce | edace6f | 2009-10-30 17:47:23 -0700 | [diff] [blame] | 1074 | strbuf_release(&sb); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 1075 | } |
| 1076 | |
Johan Herland | 48ec3e5 | 2008-06-15 16:04:20 +0200 | [diff] [blame] | 1077 | reprepare_packed_git(); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 1078 | return ref_cpy; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1079 | } |