Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1 | #include "cache.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" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 12 | |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 13 | static int transfer_unpack_limit = -1; |
| 14 | static int fetch_unpack_limit = -1; |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 15 | static int unpack_limit = 100; |
Daniel Barkalow | 09149c7 | 2007-10-29 22:35:08 -0400 | [diff] [blame] | 16 | static struct fetch_pack_args args = { |
| 17 | /* .uploadpack = */ "git-upload-pack", |
| 18 | }; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 19 | |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 20 | static const char fetch_pack_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 21 | "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] | 22 | |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 23 | #define COMPLETE (1U << 0) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 24 | #define COMMON (1U << 1) |
| 25 | #define COMMON_REF (1U << 2) |
| 26 | #define SEEN (1U << 3) |
| 27 | #define POPPED (1U << 4) |
| 28 | |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 29 | static int marked; |
| 30 | |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 31 | /* |
| 32 | * After sending this many "have"s if we do not get any new ACK , we |
| 33 | * give up traversing our history. |
| 34 | */ |
| 35 | #define MAX_IN_VAIN 256 |
| 36 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 37 | static struct commit_list *rev_list; |
Nicolas Pitre | 3891f39 | 2007-11-07 17:20:22 -0500 | [diff] [blame] | 38 | static int non_common_revs, multi_ack, use_sideband; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 39 | |
| 40 | static void rev_list_push(struct commit *commit, int mark) |
| 41 | { |
| 42 | if (!(commit->object.flags & mark)) { |
| 43 | commit->object.flags |= mark; |
| 44 | |
| 45 | if (!(commit->object.parsed)) |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 46 | if (parse_commit(commit)) |
| 47 | return; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 48 | |
| 49 | insert_by_date(commit, &rev_list); |
| 50 | |
| 51 | if (!(commit->object.flags & COMMON)) |
| 52 | non_common_revs++; |
| 53 | } |
| 54 | } |
| 55 | |
Junio C Hamano | 8da1977 | 2006-09-20 22:02:01 -0700 | [diff] [blame] | 56 | static int rev_list_insert_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 57 | { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 58 | struct object *o = deref_tag(parse_object(sha1), path, 0); |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 59 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 60 | if (o && o->type == OBJ_COMMIT) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 61 | rev_list_push((struct commit *)o, SEEN); |
| 62 | |
| 63 | return 0; |
| 64 | } |
| 65 | |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 66 | static int clear_marks(const char *path, const unsigned char *sha1, int flag, void *cb_data) |
| 67 | { |
| 68 | struct object *o = deref_tag(parse_object(sha1), path, 0); |
| 69 | |
| 70 | if (o && o->type == OBJ_COMMIT) |
| 71 | clear_commit_marks((struct commit *)o, |
| 72 | COMMON | COMMON_REF | SEEN | POPPED); |
| 73 | return 0; |
| 74 | } |
| 75 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 76 | /* |
| 77 | This function marks a rev and its ancestors as common. |
| 78 | In some cases, it is desirable to mark only the ancestors (for example |
| 79 | when only the server does not yet know that they are common). |
| 80 | */ |
| 81 | |
| 82 | static void mark_common(struct commit *commit, |
| 83 | int ancestors_only, int dont_parse) |
| 84 | { |
| 85 | if (commit != NULL && !(commit->object.flags & COMMON)) { |
| 86 | struct object *o = (struct object *)commit; |
| 87 | |
| 88 | if (!ancestors_only) |
| 89 | o->flags |= COMMON; |
| 90 | |
| 91 | if (!(o->flags & SEEN)) |
| 92 | rev_list_push(commit, SEEN); |
| 93 | else { |
| 94 | struct commit_list *parents; |
| 95 | |
| 96 | if (!ancestors_only && !(o->flags & POPPED)) |
| 97 | non_common_revs--; |
| 98 | if (!o->parsed && !dont_parse) |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 99 | if (parse_commit(commit)) |
| 100 | return; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 101 | |
| 102 | for (parents = commit->parents; |
| 103 | parents; |
| 104 | parents = parents->next) |
| 105 | mark_common(parents->item, 0, dont_parse); |
| 106 | } |
| 107 | } |
| 108 | } |
| 109 | |
| 110 | /* |
| 111 | Get the next rev to send, ignoring the common. |
| 112 | */ |
| 113 | |
Timo Hirvonen | 962554c | 2006-02-26 17:13:46 +0200 | [diff] [blame] | 114 | static const unsigned char* get_rev(void) |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 115 | { |
| 116 | struct commit *commit = NULL; |
| 117 | |
| 118 | while (commit == NULL) { |
| 119 | unsigned int mark; |
Linus Torvalds | 72269ad | 2008-04-28 16:27:49 -0700 | [diff] [blame] | 120 | struct commit_list *parents; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 121 | |
| 122 | if (rev_list == NULL || non_common_revs == 0) |
| 123 | return NULL; |
| 124 | |
| 125 | commit = rev_list->item; |
Junio C Hamano | 2d8bed9 | 2008-04-30 11:42:05 -0700 | [diff] [blame] | 126 | if (!commit->object.parsed) |
Linus Torvalds | 72269ad | 2008-04-28 16:27:49 -0700 | [diff] [blame] | 127 | parse_commit(commit); |
| 128 | parents = commit->parents; |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 129 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 130 | commit->object.flags |= POPPED; |
| 131 | if (!(commit->object.flags & COMMON)) |
| 132 | non_common_revs--; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 133 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 134 | if (commit->object.flags & COMMON) { |
| 135 | /* do not send "have", and ignore ancestors */ |
| 136 | commit = NULL; |
| 137 | mark = COMMON | SEEN; |
| 138 | } else if (commit->object.flags & COMMON_REF) |
| 139 | /* send "have", and ignore ancestors */ |
| 140 | mark = COMMON | SEEN; |
| 141 | else |
| 142 | /* send "have", also for its ancestors */ |
| 143 | mark = SEEN; |
| 144 | |
| 145 | while (parents) { |
| 146 | if (!(parents->item->object.flags & SEEN)) |
| 147 | rev_list_push(parents->item, mark); |
| 148 | if (mark & COMMON) |
| 149 | mark_common(parents->item, 1, 0); |
| 150 | parents = parents->next; |
| 151 | } |
| 152 | |
| 153 | rev_list = rev_list->next; |
| 154 | } |
| 155 | |
| 156 | return commit->object.sha1; |
| 157 | } |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 158 | |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 159 | static int find_common(int fd[2], unsigned char *result_sha1, |
| 160 | struct ref *refs) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 161 | { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 162 | int fetching; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 163 | int count = 0, flushes = 0, retval; |
| 164 | const unsigned char *sha1; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 165 | unsigned in_vain = 0; |
| 166 | int got_continue = 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 167 | |
Daniel Barkalow | 420e9af | 2008-03-17 22:15:02 -0400 | [diff] [blame] | 168 | if (marked) |
| 169 | for_each_ref(clear_marks, NULL); |
| 170 | marked = 1; |
| 171 | |
Junio C Hamano | cb5d709 | 2006-09-20 21:47:42 -0700 | [diff] [blame] | 172 | for_each_ref(rev_list_insert_ref, NULL); |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 173 | |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 174 | fetching = 0; |
| 175 | for ( ; refs ; refs = refs->next) { |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 176 | unsigned char *remote = refs->old_sha1; |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 177 | struct object *o; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 178 | |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 179 | /* |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 180 | * If that object is complete (i.e. it is an ancestor of a |
| 181 | * local ref), we tell them we have it but do not have to |
| 182 | * tell them about its ancestors, which they already know |
| 183 | * about. |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 184 | * |
| 185 | * We use lookup_object here because we are only |
| 186 | * interested in the case we *know* the object is |
| 187 | * reachable and we have already scanned it. |
Junio C Hamano | 4dab94d | 2005-10-19 18:28:17 -0700 | [diff] [blame] | 188 | */ |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 189 | if (((o = lookup_object(remote)) != NULL) && |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 190 | (o->flags & COMPLETE)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 191 | continue; |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 192 | } |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 193 | |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 194 | if (!fetching) |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 195 | packet_write(fd[1], "want %s%s%s%s%s%s%s%s\n", |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 196 | sha1_to_hex(remote), |
| 197 | (multi_ack ? " multi_ack" : ""), |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 198 | (use_sideband == 2 ? " side-band-64k" : ""), |
| 199 | (use_sideband == 1 ? " side-band" : ""), |
Nicolas Pitre | 3891f39 | 2007-11-07 17:20:22 -0500 | [diff] [blame] | 200 | (args.use_thin_pack ? " thin-pack" : ""), |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 201 | (args.no_progress ? " no-progress" : ""), |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 202 | (args.include_tag ? " include-tag" : ""), |
Nicolas Pitre | e4fe4b8 | 2006-09-26 11:27:39 -0400 | [diff] [blame] | 203 | " ofs-delta"); |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 204 | else |
| 205 | packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 206 | fetching++; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 207 | } |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 208 | if (is_repository_shallow()) |
| 209 | write_shallow_commits(fd[1], 1); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 210 | if (args.depth > 0) |
| 211 | packet_write(fd[1], "deepen %d", args.depth); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 212 | packet_flush(fd[1]); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 213 | if (!fetching) |
| 214 | return 1; |
Johannes Schindelin | 0a8944d | 2005-10-19 16:14:34 -0700 | [diff] [blame] | 215 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 216 | if (args.depth > 0) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 217 | char line[1024]; |
| 218 | unsigned char sha1[20]; |
| 219 | int len; |
| 220 | |
| 221 | while ((len = packet_read_line(fd[0], line, sizeof(line)))) { |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 222 | if (!prefixcmp(line, "shallow ")) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 223 | if (get_sha1_hex(line + 8, sha1)) |
| 224 | die("invalid shallow line: %s", line); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 225 | register_shallow(sha1); |
Junio C Hamano | cf01bd5 | 2006-11-13 22:04:56 -0800 | [diff] [blame] | 226 | continue; |
| 227 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 228 | if (!prefixcmp(line, "unshallow ")) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 229 | if (get_sha1_hex(line + 10, sha1)) |
| 230 | die("invalid unshallow line: %s", line); |
| 231 | if (!lookup_object(sha1)) |
| 232 | die("object not found: %s", line); |
| 233 | /* make sure that it is parsed as shallow */ |
Martin Koegler | f3ec549 | 2008-03-03 07:31:23 +0100 | [diff] [blame] | 234 | if (!parse_object(sha1)) |
| 235 | die("error in object: %s", line); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 236 | if (unregister_shallow(sha1)) |
| 237 | die("no shallow found: %s", line); |
Junio C Hamano | cf01bd5 | 2006-11-13 22:04:56 -0800 | [diff] [blame] | 238 | continue; |
| 239 | } |
| 240 | die("expected shallow/unshallow, got %s", line); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 241 | } |
| 242 | } |
| 243 | |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 244 | flushes = 0; |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 245 | retval = -1; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 246 | while ((sha1 = get_rev())) { |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 247 | packet_write(fd[1], "have %s\n", sha1_to_hex(sha1)); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 248 | if (args.verbose) |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 249 | fprintf(stderr, "have %s\n", sha1_to_hex(sha1)); |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 250 | in_vain++; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 251 | if (!(31 & ++count)) { |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 252 | int ack; |
| 253 | |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 254 | packet_flush(fd[1]); |
| 255 | flushes++; |
| 256 | |
| 257 | /* |
| 258 | * We keep one window "ahead" of the other side, and |
| 259 | * will wait for an ACK only on the next one |
| 260 | */ |
| 261 | if (count == 32) |
| 262 | continue; |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 263 | |
| 264 | do { |
| 265 | ack = get_ack(fd[0], result_sha1); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 266 | if (args.verbose && ack) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 267 | fprintf(stderr, "got ack %d %s\n", ack, |
| 268 | sha1_to_hex(result_sha1)); |
| 269 | if (ack == 1) { |
| 270 | flushes = 0; |
| 271 | multi_ack = 0; |
| 272 | retval = 0; |
| 273 | goto done; |
| 274 | } else if (ack == 2) { |
| 275 | struct commit *commit = |
| 276 | lookup_commit(result_sha1); |
| 277 | mark_common(commit, 0, 1); |
| 278 | retval = 0; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 279 | in_vain = 0; |
| 280 | got_continue = 1; |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 281 | } |
| 282 | } while (ack); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 283 | flushes--; |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 284 | if (got_continue && MAX_IN_VAIN < in_vain) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 285 | if (args.verbose) |
Junio C Hamano | f061e5f | 2006-05-24 21:48:34 -0700 | [diff] [blame] | 286 | fprintf(stderr, "giving up\n"); |
| 287 | break; /* give up */ |
| 288 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 289 | } |
| 290 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 291 | done: |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 292 | packet_write(fd[1], "done\n"); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 293 | if (args.verbose) |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 294 | fprintf(stderr, "done\n"); |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 295 | if (retval != 0) { |
| 296 | multi_ack = 0; |
Johannes Schindelin | 23d61f8 | 2005-10-28 04:46:27 +0200 | [diff] [blame] | 297 | flushes++; |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 298 | } |
| 299 | while (flushes || multi_ack) { |
| 300 | int ack = get_ack(fd[0], result_sha1); |
| 301 | if (ack) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 302 | if (args.verbose) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 303 | fprintf(stderr, "got ack (%d) %s\n", ack, |
| 304 | sha1_to_hex(result_sha1)); |
| 305 | if (ack == 1) |
| 306 | return 0; |
| 307 | multi_ack = 1; |
| 308 | continue; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 309 | } |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 310 | flushes--; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 311 | } |
Johannes Schindelin | 8cb560f | 2008-07-02 18:06:56 +0100 | [diff] [blame] | 312 | /* it is no error to fetch into a completely empty repo */ |
| 313 | return count ? retval : 0; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 314 | } |
| 315 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 316 | static struct commit_list *complete; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 317 | |
Junio C Hamano | 8da1977 | 2006-09-20 22:02:01 -0700 | [diff] [blame] | 318 | static int mark_complete(const char *path, const unsigned char *sha1, int flag, void *cb_data) |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 319 | { |
| 320 | struct object *o = parse_object(sha1); |
| 321 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 322 | while (o && o->type == OBJ_TAG) { |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 323 | struct tag *t = (struct tag *) o; |
| 324 | if (!t->tagged) |
| 325 | break; /* broken repository */ |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 326 | o->flags |= COMPLETE; |
Junio C Hamano | f1f0a2b | 2005-10-19 21:55:49 -0700 | [diff] [blame] | 327 | o = parse_object(t->tagged->sha1); |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 328 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 329 | if (o && o->type == OBJ_COMMIT) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 330 | struct commit *commit = (struct commit *)o; |
| 331 | commit->object.flags |= COMPLETE; |
| 332 | insert_by_date(commit, &complete); |
| 333 | } |
| 334 | return 0; |
| 335 | } |
| 336 | |
| 337 | static void mark_recent_complete_commits(unsigned long cutoff) |
| 338 | { |
| 339 | while (complete && cutoff <= complete->item->date) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 340 | if (args.verbose) |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 341 | fprintf(stderr, "Marking %s as complete\n", |
| 342 | sha1_to_hex(complete->item->object.sha1)); |
| 343 | pop_most_recent_commit(&complete, COMPLETE); |
| 344 | } |
| 345 | } |
| 346 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 347 | static void filter_refs(struct ref **refs, int nr_match, char **match) |
| 348 | { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 349 | struct ref **return_refs; |
| 350 | struct ref *newlist = NULL; |
| 351 | struct ref **newtail = &newlist; |
| 352 | struct ref *ref, *next; |
| 353 | struct ref *fastarray[32]; |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 354 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 355 | if (nr_match && !args.fetch_all) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 356 | if (ARRAY_SIZE(fastarray) < nr_match) |
| 357 | return_refs = xcalloc(nr_match, sizeof(struct ref *)); |
| 358 | else { |
| 359 | return_refs = fastarray; |
| 360 | memset(return_refs, 0, sizeof(struct ref *) * nr_match); |
| 361 | } |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 362 | } |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 363 | else |
| 364 | return_refs = NULL; |
| 365 | |
| 366 | for (ref = *refs; ref; ref = next) { |
| 367 | next = ref->next; |
| 368 | if (!memcmp(ref->name, "refs/", 5) && |
| 369 | check_ref_format(ref->name + 5)) |
| 370 | ; /* trash */ |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 371 | else if (args.fetch_all && |
| 372 | (!args.depth || prefixcmp(ref->name, "refs/tags/") )) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 373 | *newtail = ref; |
| 374 | ref->next = NULL; |
| 375 | newtail = &ref->next; |
| 376 | continue; |
| 377 | } |
| 378 | else { |
| 379 | int order = path_match(ref->name, nr_match, match); |
| 380 | if (order) { |
| 381 | return_refs[order-1] = ref; |
| 382 | continue; /* we will link it later */ |
| 383 | } |
| 384 | } |
| 385 | free(ref); |
| 386 | } |
| 387 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 388 | if (!args.fetch_all) { |
Junio C Hamano | 9546010 | 2006-05-11 15:28:44 -0700 | [diff] [blame] | 389 | int i; |
| 390 | for (i = 0; i < nr_match; i++) { |
| 391 | ref = return_refs[i]; |
| 392 | if (ref) { |
| 393 | *newtail = ref; |
| 394 | ref->next = NULL; |
| 395 | newtail = &ref->next; |
| 396 | } |
| 397 | } |
| 398 | if (return_refs != fastarray) |
| 399 | free(return_refs); |
| 400 | } |
| 401 | *refs = newlist; |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 402 | } |
| 403 | |
| 404 | static int everything_local(struct ref **refs, int nr_match, char **match) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 405 | { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 406 | struct ref *ref; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 407 | int retval; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 408 | unsigned long cutoff = 0; |
| 409 | |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 410 | save_commit_buffer = 0; |
| 411 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 412 | for (ref = *refs; ref; ref = ref->next) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 413 | struct object *o; |
| 414 | |
| 415 | o = parse_object(ref->old_sha1); |
| 416 | if (!o) |
| 417 | continue; |
| 418 | |
| 419 | /* We already have it -- which may mean that we were |
| 420 | * in sync with the other side at some time after |
| 421 | * that (it is OK if we guess wrong here). |
| 422 | */ |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 423 | if (o->type == OBJ_COMMIT) { |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 424 | struct commit *commit = (struct commit *)o; |
| 425 | if (!cutoff || cutoff < commit->date) |
| 426 | cutoff = commit->date; |
| 427 | } |
| 428 | } |
| 429 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 430 | if (!args.depth) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 431 | for_each_ref(mark_complete, NULL); |
| 432 | if (cutoff) |
| 433 | mark_recent_complete_commits(cutoff); |
| 434 | } |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 435 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 436 | /* |
| 437 | * Mark all complete remote refs as common refs. |
| 438 | * Don't mark them common yet; the server has to be told so first. |
| 439 | */ |
| 440 | for (ref = *refs; ref; ref = ref->next) { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 441 | struct object *o = deref_tag(lookup_object(ref->old_sha1), |
| 442 | NULL, 0); |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 443 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 444 | if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE)) |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 445 | continue; |
| 446 | |
| 447 | if (!(o->flags & SEEN)) { |
| 448 | rev_list_push((struct commit *)o, COMMON_REF | SEEN); |
| 449 | |
| 450 | mark_common((struct commit *)o, 1, 1); |
| 451 | } |
| 452 | } |
| 453 | |
| 454 | filter_refs(refs, nr_match, match); |
| 455 | |
| 456 | for (retval = 1, ref = *refs; ref ; ref = ref->next) { |
| 457 | const unsigned char *remote = ref->old_sha1; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 458 | unsigned char local[20]; |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 459 | struct object *o; |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 460 | |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 461 | o = lookup_object(remote); |
Junio C Hamano | 49bb805 | 2005-10-19 14:27:02 -0700 | [diff] [blame] | 462 | if (!o || !(o->flags & COMPLETE)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 463 | retval = 0; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 464 | if (!args.verbose) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 465 | continue; |
| 466 | fprintf(stderr, |
| 467 | "want %s (%s)\n", sha1_to_hex(remote), |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 468 | ref->name); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 469 | continue; |
| 470 | } |
| 471 | |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 472 | hashcpy(ref->new_sha1, local); |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 473 | if (!args.verbose) |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 474 | continue; |
| 475 | fprintf(stderr, |
| 476 | "already have %s (%s)\n", sha1_to_hex(remote), |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 477 | ref->name); |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 478 | } |
| 479 | return retval; |
| 480 | } |
| 481 | |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 482 | static int sideband_demux(int fd, void *data) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 483 | { |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 484 | int *xd = data; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 485 | |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 486 | return recv_sideband("fetch-pack", xd[0], fd, 2); |
| 487 | } |
| 488 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 489 | static int get_pack(int xd[2], char **pack_lockfile) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 490 | { |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 491 | struct async demux; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 492 | const char *argv[20]; |
| 493 | char keep_arg[256]; |
| 494 | char hdr_arg[256]; |
| 495 | const char **av; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 496 | int do_keep = args.keep_pack; |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 497 | struct child_process cmd; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 498 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 499 | memset(&demux, 0, sizeof(demux)); |
| 500 | if (use_sideband) { |
| 501 | /* xd[] is talking with upload-pack; subprocess reads from |
| 502 | * xd[0], spits out band#2 to stderr, and feeds us band#1 |
| 503 | * through demux->out. |
| 504 | */ |
| 505 | demux.proc = sideband_demux; |
| 506 | demux.data = xd; |
| 507 | if (start_async(&demux)) |
| 508 | die("fetch-pack: unable to fork off sideband" |
| 509 | " demultiplexer"); |
| 510 | } |
| 511 | else |
| 512 | demux.out = xd[0]; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 513 | |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 514 | memset(&cmd, 0, sizeof(cmd)); |
| 515 | cmd.argv = argv; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 516 | av = argv; |
| 517 | *hdr_arg = 0; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 518 | if (!args.keep_pack && unpack_limit) { |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 519 | struct pack_header header; |
| 520 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 521 | if (read_pack_header(demux.out, &header)) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 522 | die("protocol error: bad pack header"); |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 523 | snprintf(hdr_arg, sizeof(hdr_arg), |
| 524 | "--pack_header=%"PRIu32",%"PRIu32, |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 525 | ntohl(header.hdr_version), ntohl(header.hdr_entries)); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 526 | if (ntohl(header.hdr_entries) < unpack_limit) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 527 | do_keep = 0; |
| 528 | else |
| 529 | do_keep = 1; |
| 530 | } |
| 531 | |
| 532 | if (do_keep) { |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 533 | if (pack_lockfile) |
| 534 | cmd.out = -1; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 535 | *av++ = "index-pack"; |
| 536 | *av++ = "--stdin"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 537 | if (!args.quiet && !args.no_progress) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 538 | *av++ = "-v"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 539 | if (args.use_thin_pack) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 540 | *av++ = "--fix-thin"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 541 | if (args.lock_pack || unpack_limit) { |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 542 | int s = sprintf(keep_arg, |
David Soria Parra | 85e7283 | 2008-08-31 14:09:39 +0200 | [diff] [blame] | 543 | "--keep=fetch-pack %"PRIuMAX " on ", (uintmax_t) getpid()); |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 544 | if (gethostname(keep_arg + s, sizeof(keep_arg) - s)) |
| 545 | strcpy(keep_arg + s, "localhost"); |
| 546 | *av++ = keep_arg; |
| 547 | } |
| 548 | } |
| 549 | else { |
| 550 | *av++ = "unpack-objects"; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 551 | if (args.quiet) |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 552 | *av++ = "-q"; |
| 553 | } |
| 554 | if (*hdr_arg) |
| 555 | *av++ = hdr_arg; |
| 556 | *av++ = NULL; |
| 557 | |
Johannes Sixt | 1f759ee | 2007-11-17 23:09:28 +0100 | [diff] [blame] | 558 | cmd.in = demux.out; |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 559 | cmd.git_cmd = 1; |
| 560 | if (start_command(&cmd)) |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 561 | die("fetch-pack: unable to fork off %s", argv[0]); |
Johannes Sixt | e72ae28 | 2008-02-16 18:36:38 +0100 | [diff] [blame] | 562 | if (do_keep && pack_lockfile) { |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 563 | *pack_lockfile = index_pack_lockfile(cmd.out); |
Johannes Sixt | e72ae28 | 2008-02-16 18:36:38 +0100 | [diff] [blame] | 564 | close(cmd.out); |
| 565 | } |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 566 | |
| 567 | if (finish_command(&cmd)) |
| 568 | die("%s failed", argv[0]); |
Johannes Sixt | 088fab5 | 2007-10-19 21:48:01 +0200 | [diff] [blame] | 569 | if (use_sideband && finish_async(&demux)) |
| 570 | die("error in sideband demultiplexer"); |
Johannes Sixt | 477822c | 2007-10-19 21:47:57 +0200 | [diff] [blame] | 571 | return 0; |
Nicolas Pitre | da093d3 | 2006-11-01 17:06:23 -0500 | [diff] [blame] | 572 | } |
| 573 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 574 | static struct ref *do_fetch_pack(int fd[2], |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 575 | const struct ref *orig_ref, |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 576 | int nr_match, |
| 577 | char **match, |
| 578 | char **pack_lockfile) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 579 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 580 | struct ref *ref = copy_ref_list(orig_ref); |
Linus Torvalds | d1c133f | 2005-07-16 13:55:50 -0700 | [diff] [blame] | 581 | unsigned char sha1[20]; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 582 | |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 583 | if (is_repository_shallow() && !server_supports("shallow")) |
| 584 | die("Server does not support shallow clients"); |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 585 | if (server_supports("multi_ack")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 586 | if (args.verbose) |
Johannes Schindelin | c4c86f0 | 2005-10-28 04:50:26 +0200 | [diff] [blame] | 587 | fprintf(stderr, "Server supports multi_ack\n"); |
| 588 | multi_ack = 1; |
| 589 | } |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 590 | if (server_supports("side-band-64k")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 591 | if (args.verbose) |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 592 | fprintf(stderr, "Server supports side-band-64k\n"); |
| 593 | use_sideband = 2; |
| 594 | } |
| 595 | else if (server_supports("side-band")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 596 | if (args.verbose) |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 597 | fprintf(stderr, "Server supports side-band\n"); |
| 598 | use_sideband = 1; |
| 599 | } |
Johannes Schindelin | 1baaae5 | 2005-10-28 04:47:07 +0200 | [diff] [blame] | 600 | if (everything_local(&ref, nr_match, match)) { |
Linus Torvalds | 2759cbc | 2005-10-18 11:35:17 -0700 | [diff] [blame] | 601 | packet_flush(fd[1]); |
| 602 | goto all_done; |
| 603 | } |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 604 | if (find_common(fd, sha1, ref) < 0) |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 605 | if (!args.keep_pack) |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 606 | /* When cloning, it is not unusual to have |
| 607 | * no common commit. |
| 608 | */ |
| 609 | fprintf(stderr, "warning: no common commits\n"); |
Junio C Hamano | ad89721 | 2005-12-14 22:17:38 -0800 | [diff] [blame] | 610 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 611 | if (get_pack(fd, pack_lockfile)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 612 | die("git fetch-pack: fetch failed."); |
Junio C Hamano | ad89721 | 2005-12-14 22:17:38 -0800 | [diff] [blame] | 613 | |
| 614 | all_done: |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 615 | return ref; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 616 | } |
| 617 | |
Junio C Hamano | 310b86d | 2006-11-25 01:33:06 -0800 | [diff] [blame] | 618 | static int remove_duplicates(int nr_heads, char **heads) |
| 619 | { |
| 620 | int src, dst; |
| 621 | |
| 622 | for (src = dst = 0; src < nr_heads; src++) { |
| 623 | /* If heads[src] is different from any of |
| 624 | * heads[0..dst], push it in. |
| 625 | */ |
| 626 | int i; |
| 627 | for (i = 0; i < dst; i++) { |
| 628 | if (!strcmp(heads[i], heads[src])) |
| 629 | break; |
| 630 | } |
| 631 | if (i < dst) |
| 632 | continue; |
| 633 | if (src != dst) |
| 634 | heads[dst] = heads[src]; |
| 635 | dst++; |
| 636 | } |
Junio C Hamano | 310b86d | 2006-11-25 01:33:06 -0800 | [diff] [blame] | 637 | return dst; |
| 638 | } |
| 639 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 640 | 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] | 641 | { |
| 642 | if (strcmp(var, "fetch.unpacklimit") == 0) { |
Junio C Hamano | e28714c | 2007-01-24 17:02:15 -0800 | [diff] [blame] | 643 | fetch_unpack_limit = git_config_int(var, value); |
| 644 | return 0; |
| 645 | } |
| 646 | |
| 647 | if (strcmp(var, "transfer.unpacklimit") == 0) { |
| 648 | transfer_unpack_limit = git_config_int(var, value); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 649 | return 0; |
| 650 | } |
| 651 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 652 | return git_default_config(var, value, cb); |
Junio C Hamano | af7cf26 | 2007-01-24 16:47:24 -0800 | [diff] [blame] | 653 | } |
| 654 | |
Junio C Hamano | 54b9e02 | 2007-01-02 11:22:08 -0800 | [diff] [blame] | 655 | static struct lock_file lock; |
| 656 | |
Shawn O. Pearce | 50ab5fd | 2007-09-19 00:49:39 -0400 | [diff] [blame] | 657 | static void fetch_pack_setup(void) |
| 658 | { |
| 659 | static int did_setup; |
| 660 | if (did_setup) |
| 661 | return; |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 662 | git_config(fetch_pack_config, NULL); |
Shawn O. Pearce | 50ab5fd | 2007-09-19 00:49:39 -0400 | [diff] [blame] | 663 | if (0 <= transfer_unpack_limit) |
| 664 | unpack_limit = transfer_unpack_limit; |
| 665 | else if (0 <= fetch_unpack_limit) |
| 666 | unpack_limit = fetch_unpack_limit; |
| 667 | did_setup = 1; |
| 668 | } |
| 669 | |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 670 | int cmd_fetch_pack(int argc, const char **argv, const char *prefix) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 671 | { |
| 672 | int i, ret, nr_heads; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 673 | struct ref *ref = NULL; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 674 | char *dest = NULL, **heads; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 675 | int fd[2]; |
| 676 | struct child_process *conn; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 677 | |
| 678 | nr_heads = 0; |
| 679 | heads = NULL; |
| 680 | for (i = 1; i < argc; i++) { |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 681 | const char *arg = argv[i]; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 682 | |
| 683 | if (*arg == '-') { |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 684 | if (!prefixcmp(arg, "--upload-pack=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 685 | args.uploadpack = arg + 14; |
Uwe Kleine-König | 27dca07 | 2007-01-23 09:20:17 +0100 | [diff] [blame] | 686 | continue; |
| 687 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 688 | if (!prefixcmp(arg, "--exec=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 689 | args.uploadpack = arg + 7; |
Junio C Hamano | 8b3d9dc | 2005-07-14 00:08:37 -0700 | [diff] [blame] | 690 | continue; |
| 691 | } |
Junio C Hamano | 2247efb | 2005-12-18 01:55:29 -0800 | [diff] [blame] | 692 | if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 693 | args.quiet = 1; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 694 | continue; |
| 695 | } |
Junio C Hamano | 2247efb | 2005-12-18 01:55:29 -0800 | [diff] [blame] | 696 | if (!strcmp("--keep", arg) || !strcmp("-k", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 697 | args.lock_pack = args.keep_pack; |
| 698 | args.keep_pack = 1; |
Junio C Hamano | 9e10fd1 | 2007-01-22 22:37:33 -0800 | [diff] [blame] | 699 | continue; |
| 700 | } |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 701 | if (!strcmp("--thin", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 702 | args.use_thin_pack = 1; |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 703 | continue; |
| 704 | } |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 705 | if (!strcmp("--include-tag", arg)) { |
| 706 | args.include_tag = 1; |
| 707 | continue; |
| 708 | } |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 709 | if (!strcmp("--all", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 710 | args.fetch_all = 1; |
Junio C Hamano | dfeff66 | 2006-03-20 00:21:10 -0800 | [diff] [blame] | 711 | continue; |
| 712 | } |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 713 | if (!strcmp("-v", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 714 | args.verbose = 1; |
Junio C Hamano | 33b8303 | 2005-08-12 02:08:29 -0700 | [diff] [blame] | 715 | continue; |
| 716 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 717 | if (!prefixcmp(arg, "--depth=")) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 718 | args.depth = strtol(arg + 8, NULL, 0); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 719 | continue; |
| 720 | } |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 721 | if (!strcmp("--no-progress", arg)) { |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 722 | args.no_progress = 1; |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 723 | continue; |
| 724 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 725 | usage(fetch_pack_usage); |
| 726 | } |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 727 | dest = (char *)arg; |
| 728 | heads = (char **)(argv + i + 1); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 729 | nr_heads = argc - i - 1; |
| 730 | break; |
| 731 | } |
| 732 | if (!dest) |
| 733 | usage(fetch_pack_usage); |
Daniel Barkalow | 2d4177c | 2007-09-10 23:03:00 -0400 | [diff] [blame] | 734 | |
Junio C Hamano | 4340a81 | 2007-11-01 13:47:47 -0700 | [diff] [blame] | 735 | conn = git_connect(fd, (char *)dest, args.uploadpack, |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 736 | args.verbose ? CONNECT_VERBOSE : 0); |
| 737 | if (conn) { |
Junio C Hamano | 40c155f | 2008-09-09 01:27:09 -0700 | [diff] [blame] | 738 | get_remote_heads(fd[0], &ref, 0, NULL, 0, NULL); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 739 | |
| 740 | ref = fetch_pack(&args, fd, conn, ref, dest, nr_heads, heads, NULL); |
| 741 | close(fd[0]); |
| 742 | close(fd[1]); |
| 743 | if (finish_connect(conn)) |
| 744 | ref = NULL; |
| 745 | } else { |
| 746 | ref = NULL; |
| 747 | } |
| 748 | ret = !ref; |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 749 | |
| 750 | if (!ret && nr_heads) { |
| 751 | /* If the heads to pull were given, we should have |
| 752 | * consumed all of them by matching the remote. |
Heikki Orsila | 05207a2 | 2008-09-09 13:28:30 +0300 | [diff] [blame] | 753 | * Otherwise, 'git fetch remote no-such-ref' would |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 754 | * silently succeed without issuing an error. |
| 755 | */ |
| 756 | for (i = 0; i < nr_heads; i++) |
| 757 | if (heads[i] && heads[i][0]) { |
| 758 | error("no such remote ref %s", heads[i]); |
| 759 | ret = 1; |
| 760 | } |
| 761 | } |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 762 | while (ref) { |
| 763 | printf("%s %s\n", |
| 764 | sha1_to_hex(ref->old_sha1), ref->name); |
| 765 | ref = ref->next; |
| 766 | } |
Junio C Hamano | 9e5d2b4 | 2005-11-06 00:09:59 -0800 | [diff] [blame] | 767 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 768 | return ret; |
| 769 | } |
| 770 | |
| 771 | struct ref *fetch_pack(struct fetch_pack_args *my_args, |
| 772 | int fd[], struct child_process *conn, |
| 773 | const struct ref *ref, |
| 774 | const char *dest, |
| 775 | int nr_heads, |
| 776 | char **heads, |
| 777 | char **pack_lockfile) |
| 778 | { |
| 779 | struct stat st; |
| 780 | struct ref *ref_cpy; |
| 781 | |
| 782 | fetch_pack_setup(); |
Thomas Rast | d551bba | 2008-12-06 21:50:09 +0100 | [diff] [blame] | 783 | if (&args != my_args) |
| 784 | memcpy(&args, my_args, sizeof(args)); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 785 | if (args.depth > 0) { |
| 786 | if (stat(git_path("shallow"), &st)) |
| 787 | st.st_mtime = 0; |
| 788 | } |
| 789 | |
| 790 | if (heads && nr_heads) |
| 791 | nr_heads = remove_duplicates(nr_heads, heads); |
| 792 | if (!ref) { |
| 793 | packet_flush(fd[1]); |
| 794 | die("no matching remote head"); |
| 795 | } |
| 796 | ref_cpy = do_fetch_pack(fd, ref, nr_heads, heads, pack_lockfile); |
| 797 | |
| 798 | if (args.depth > 0) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 799 | struct cache_time mtime; |
| 800 | char *shallow = git_path("shallow"); |
| 801 | int fd; |
| 802 | |
| 803 | mtime.sec = st.st_mtime; |
| 804 | #ifdef USE_NSEC |
| 805 | mtime.usec = st.st_mtim.usec; |
| 806 | #endif |
| 807 | if (stat(shallow, &st)) { |
| 808 | if (mtime.sec) |
| 809 | die("shallow file was removed during fetch"); |
| 810 | } else if (st.st_mtime != mtime.sec |
| 811 | #ifdef USE_NSEC |
| 812 | || st.st_mtim.usec != mtime.usec |
| 813 | #endif |
| 814 | ) |
| 815 | die("shallow file was changed during fetch"); |
| 816 | |
Junio C Hamano | acd3b9e | 2008-10-17 15:44:39 -0700 | [diff] [blame] | 817 | fd = hold_lock_file_for_update(&lock, shallow, |
| 818 | LOCK_DIE_ON_ERROR); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 819 | if (!write_shallow_commits(fd, 0)) { |
Alexandre Julliard | d6491e3 | 2006-11-24 15:58:04 +0100 | [diff] [blame] | 820 | unlink(shallow); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 821 | rollback_lock_file(&lock); |
| 822 | } else { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 823 | commit_lock_file(&lock); |
| 824 | } |
| 825 | } |
| 826 | |
Johan Herland | 48ec3e5 | 2008-06-15 16:04:20 +0200 | [diff] [blame] | 827 | reprepare_packed_git(); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 828 | return ref_cpy; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 829 | } |