Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "refs.h" |
| 3 | #include "pkt-line.h" |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 4 | #include "sideband.h" |
Junio C Hamano | f6b42a8 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 5 | #include "tag.h" |
| 6 | #include "object.h" |
Johannes Schindelin | f0243f2 | 2005-10-28 04:48:32 +0200 | [diff] [blame] | 7 | #include "commit.h" |
Michal Ostrowski | 77cb17e | 2006-01-10 21:12:17 -0500 | [diff] [blame] | 8 | #include "exec_cmd.h" |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 9 | #include "diff.h" |
| 10 | #include "revision.h" |
| 11 | #include "list-objects.h" |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 12 | #include "run-command.h" |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 13 | |
Alexander Potashev | 34263de | 2009-01-04 21:39:27 +0300 | [diff] [blame] | 14 | static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] <dir>"; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 15 | |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 16 | /* bits #0..7 in revision.h, #8..10 in commit.c */ |
| 17 | #define THEY_HAVE (1u << 11) |
| 18 | #define OUR_REF (1u << 12) |
| 19 | #define WANTED (1u << 13) |
| 20 | #define COMMON_KNOWN (1u << 14) |
| 21 | #define REACHABLE (1u << 15) |
| 22 | |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 23 | #define SHALLOW (1u << 16) |
| 24 | #define NOT_SHALLOW (1u << 17) |
| 25 | #define CLIENT_SHALLOW (1u << 18) |
| 26 | |
Junio C Hamano | 3fbe2d5 | 2006-11-24 02:34:27 -0800 | [diff] [blame] | 27 | static unsigned long oldest_have; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 28 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 29 | static int multi_ack, nr_our_refs; |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 30 | static int use_thin_pack, use_ofs_delta, use_include_tag; |
Johannes Sixt | 9462e3f | 2009-06-16 20:41:16 +0200 | [diff] [blame] | 31 | static int no_progress, daemon_mode; |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 32 | static int shallow_nr; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 33 | static struct object_array have_obj; |
| 34 | static struct object_array want_obj; |
Nicolas Pitre | 6523078 | 2009-09-03 19:08:33 -0400 | [diff] [blame] | 35 | static struct object_array extra_edge_obj; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 36 | static unsigned int timeout; |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 37 | /* 0 for no sideband, |
| 38 | * otherwise maximum packet size (up to 65520 bytes). |
| 39 | */ |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 40 | static int use_sideband; |
Shawn O. Pearce | 49aaddd | 2008-03-02 21:35:18 -0500 | [diff] [blame] | 41 | static int debug_fd; |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 42 | static int advertise_refs; |
| 43 | static int stateless_rpc; |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 44 | |
| 45 | static void reset_timeout(void) |
| 46 | { |
| 47 | alarm(timeout); |
| 48 | } |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 49 | |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 50 | static int strip(char *line, int len) |
| 51 | { |
| 52 | if (len && line[len-1] == '\n') |
| 53 | line[--len] = 0; |
| 54 | return len; |
| 55 | } |
| 56 | |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 57 | static ssize_t send_client_data(int fd, const char *data, ssize_t sz) |
| 58 | { |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 59 | if (use_sideband) |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 60 | return send_sideband(1, fd, data, sz, use_sideband); |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 61 | if (fd == 3) |
| 62 | /* emergency quit */ |
| 63 | fd = 2; |
| 64 | if (fd == 2) { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 65 | /* XXX: are we happy to lose stuff here? */ |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 66 | xwrite(fd, data, sz); |
| 67 | return sz; |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 68 | } |
Junio C Hamano | 958c24b | 2006-09-10 03:20:24 -0700 | [diff] [blame] | 69 | return safe_write(fd, data, sz); |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 70 | } |
| 71 | |
Junio C Hamano | 16befb8 | 2007-06-08 02:54:57 -0700 | [diff] [blame] | 72 | static FILE *pack_pipe = NULL; |
Christian Couder | 11c211f | 2009-04-06 21:28:36 +0200 | [diff] [blame] | 73 | static void show_commit(struct commit *commit, void *data) |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 74 | { |
| 75 | if (commit->object.flags & BOUNDARY) |
| 76 | fputc('-', pack_pipe); |
| 77 | if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0) |
| 78 | die("broken output pipe"); |
| 79 | fputc('\n', pack_pipe); |
| 80 | fflush(pack_pipe); |
| 81 | free(commit->buffer); |
| 82 | commit->buffer = NULL; |
| 83 | } |
| 84 | |
Linus Torvalds | cf2ab91 | 2009-04-10 18:15:26 -0700 | [diff] [blame] | 85 | static void show_object(struct object *obj, const struct name_path *path, const char *component) |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 86 | { |
| 87 | /* An object with name "foo\n0000000..." can be used to |
| 88 | * confuse downstream git-pack-objects very badly. |
| 89 | */ |
Linus Torvalds | cf2ab91 | 2009-04-10 18:15:26 -0700 | [diff] [blame] | 90 | const char *name = path_name(path, component); |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 91 | const char *ep = strchr(name, '\n'); |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 92 | if (ep) { |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 93 | fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1), |
| 94 | (int) (ep - name), |
| 95 | name); |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 96 | } |
| 97 | else |
| 98 | fprintf(pack_pipe, "%s %s\n", |
Linus Torvalds | 8d2dfc4 | 2009-04-10 17:27:58 -0700 | [diff] [blame] | 99 | sha1_to_hex(obj->sha1), name); |
Linus Torvalds | cf2ab91 | 2009-04-10 18:15:26 -0700 | [diff] [blame] | 100 | free((char *)name); |
Johannes Schindelin | 9b8dc26 | 2006-10-30 20:08:43 +0100 | [diff] [blame] | 101 | } |
| 102 | |
| 103 | static void show_edge(struct commit *commit) |
| 104 | { |
| 105 | fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1)); |
| 106 | } |
| 107 | |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 108 | static int do_rev_list(int in, int out, void *create_full_pack) |
Johannes Sixt | 80ccaa7 | 2007-10-19 21:48:02 +0200 | [diff] [blame] | 109 | { |
| 110 | int i; |
| 111 | struct rev_info revs; |
| 112 | |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 113 | pack_pipe = xfdopen(out, "w"); |
Johannes Sixt | 80ccaa7 | 2007-10-19 21:48:02 +0200 | [diff] [blame] | 114 | init_revisions(&revs, NULL); |
| 115 | revs.tag_objects = 1; |
| 116 | revs.tree_objects = 1; |
| 117 | revs.blob_objects = 1; |
| 118 | if (use_thin_pack) |
| 119 | revs.edge_hint = 1; |
| 120 | |
| 121 | if (create_full_pack) { |
| 122 | const char *args[] = {"rev-list", "--all", NULL}; |
| 123 | setup_revisions(2, args, &revs, NULL); |
| 124 | } else { |
| 125 | for (i = 0; i < want_obj.nr; i++) { |
| 126 | struct object *o = want_obj.objects[i].item; |
| 127 | /* why??? */ |
| 128 | o->flags &= ~UNINTERESTING; |
| 129 | add_pending_object(&revs, o, NULL); |
| 130 | } |
| 131 | for (i = 0; i < have_obj.nr; i++) { |
| 132 | struct object *o = have_obj.objects[i].item; |
| 133 | o->flags |= UNINTERESTING; |
| 134 | add_pending_object(&revs, o, NULL); |
| 135 | } |
| 136 | setup_revisions(0, NULL, &revs, NULL); |
| 137 | } |
Martin Koegler | 3d51e1b | 2008-02-18 08:31:56 +0100 | [diff] [blame] | 138 | if (prepare_revision_walk(&revs)) |
| 139 | die("revision walk setup failed"); |
Johannes Sixt | 80ccaa7 | 2007-10-19 21:48:02 +0200 | [diff] [blame] | 140 | mark_edges_uninteresting(revs.commits, &revs, show_edge); |
Nicolas Pitre | 6523078 | 2009-09-03 19:08:33 -0400 | [diff] [blame] | 141 | if (use_thin_pack) |
| 142 | for (i = 0; i < extra_edge_obj.nr; i++) |
| 143 | fprintf(pack_pipe, "-%s\n", sha1_to_hex( |
| 144 | extra_edge_obj.objects[i].item->sha1)); |
Christian Couder | 11c211f | 2009-04-06 21:28:36 +0200 | [diff] [blame] | 145 | traverse_commit_list(&revs, show_commit, show_object, NULL); |
Johannes Sixt | 618ebe9 | 2007-12-08 22:19:14 +0100 | [diff] [blame] | 146 | fflush(pack_pipe); |
| 147 | fclose(pack_pipe); |
Johannes Sixt | 21edd3f | 2007-10-19 21:48:03 +0200 | [diff] [blame] | 148 | return 0; |
Johannes Sixt | 80ccaa7 | 2007-10-19 21:48:02 +0200 | [diff] [blame] | 149 | } |
| 150 | |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 151 | static void create_pack_file(void) |
| 152 | { |
Johannes Sixt | 21edd3f | 2007-10-19 21:48:03 +0200 | [diff] [blame] | 153 | struct async rev_list; |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 154 | struct child_process pack_objects; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 155 | int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr); |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 156 | char data[8193], progress[128]; |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 157 | char abort_msg[] = "aborting due to possible repository " |
| 158 | "corruption on the remote side."; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 159 | int buffered = -1; |
Junio C Hamano | 1456b04 | 2009-12-10 12:17:11 -0800 | [diff] [blame] | 160 | ssize_t sz; |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 161 | const char *argv[10]; |
| 162 | int arg = 0; |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 163 | |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 164 | if (shallow_nr) { |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 165 | memset(&rev_list, 0, sizeof(rev_list)); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 166 | rev_list.proc = do_rev_list; |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 167 | rev_list.out = -1; |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 168 | if (start_async(&rev_list)) |
| 169 | die("git upload-pack: unable to fork git-rev-list"); |
| 170 | argv[arg++] = "pack-objects"; |
| 171 | } else { |
| 172 | argv[arg++] = "pack-objects"; |
| 173 | argv[arg++] = "--revs"; |
| 174 | if (create_full_pack) |
| 175 | argv[arg++] = "--all"; |
| 176 | else if (use_thin_pack) |
| 177 | argv[arg++] = "--thin"; |
| 178 | } |
Linus Torvalds | 75bfc6c | 2005-07-04 16:35:13 -0700 | [diff] [blame] | 179 | |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 180 | argv[arg++] = "--stdout"; |
| 181 | if (!no_progress) |
| 182 | argv[arg++] = "--progress"; |
| 183 | if (use_ofs_delta) |
| 184 | argv[arg++] = "--delta-base-offset"; |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 185 | if (use_include_tag) |
| 186 | argv[arg++] = "--include-tag"; |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 187 | argv[arg++] = NULL; |
| 188 | |
| 189 | memset(&pack_objects, 0, sizeof(pack_objects)); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 190 | pack_objects.in = shallow_nr ? rev_list.out : -1; |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 191 | pack_objects.out = -1; |
| 192 | pack_objects.err = -1; |
| 193 | pack_objects.git_cmd = 1; |
| 194 | pack_objects.argv = argv; |
Johannes Sixt | 21edd3f | 2007-10-19 21:48:03 +0200 | [diff] [blame] | 195 | |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 196 | if (start_command(&pack_objects)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 197 | die("git upload-pack: unable to fork git-pack-objects"); |
Johannes Schindelin | 83a5ad6 | 2007-02-20 03:01:44 +0100 | [diff] [blame] | 198 | |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 199 | /* pass on revisions we (don't) want */ |
| 200 | if (!shallow_nr) { |
Jim Meyering | 4169837 | 2009-09-12 10:43:27 +0200 | [diff] [blame] | 201 | FILE *pipe_fd = xfdopen(pack_objects.in, "w"); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 202 | if (!create_full_pack) { |
| 203 | int i; |
| 204 | for (i = 0; i < want_obj.nr; i++) |
| 205 | fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1)); |
| 206 | fprintf(pipe_fd, "--not\n"); |
| 207 | for (i = 0; i < have_obj.nr; i++) |
| 208 | fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1)); |
| 209 | } |
| 210 | |
| 211 | fprintf(pipe_fd, "\n"); |
| 212 | fflush(pipe_fd); |
| 213 | fclose(pipe_fd); |
| 214 | } |
| 215 | |
| 216 | |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 217 | /* We read from pack_objects.err to capture stderr output for |
| 218 | * progress bar, and pack_objects.out to capture the pack data. |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 219 | */ |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 220 | |
| 221 | while (1) { |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 222 | struct pollfd pfd[2]; |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 223 | int pe, pu, pollsize; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 224 | |
Matthias Lederhofer | 0d516ad | 2006-07-18 19:14:51 +0200 | [diff] [blame] | 225 | reset_timeout(); |
| 226 | |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 227 | pollsize = 0; |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 228 | pe = pu = -1; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 229 | |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 230 | if (0 <= pack_objects.out) { |
| 231 | pfd[pollsize].fd = pack_objects.out; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 232 | pfd[pollsize].events = POLLIN; |
| 233 | pu = pollsize; |
| 234 | pollsize++; |
| 235 | } |
Johannes Sixt | cc41fa8 | 2007-10-19 21:47:59 +0200 | [diff] [blame] | 236 | if (0 <= pack_objects.err) { |
| 237 | pfd[pollsize].fd = pack_objects.err; |
Junio C Hamano | 363b781 | 2006-06-20 22:48:23 -0700 | [diff] [blame] | 238 | pfd[pollsize].events = POLLIN; |
| 239 | pe = pollsize; |
| 240 | pollsize++; |
| 241 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 242 | |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 243 | if (!pollsize) |
| 244 | break; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 245 | |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 246 | if (poll(pfd, pollsize, -1) < 0) { |
| 247 | if (errno != EINTR) { |
| 248 | error("poll failed, resuming: %s", |
| 249 | strerror(errno)); |
| 250 | sleep(1); |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 251 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 252 | continue; |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 253 | } |
Nicolas Pitre | 6b59f51 | 2009-11-11 17:24:42 -0500 | [diff] [blame] | 254 | if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) { |
| 255 | /* Status ready; we ship that in the side-band |
| 256 | * or dump to the standard error. |
| 257 | */ |
| 258 | sz = xread(pack_objects.err, progress, |
| 259 | sizeof(progress)); |
| 260 | if (0 < sz) |
| 261 | send_client_data(2, progress, sz); |
| 262 | else if (sz == 0) { |
| 263 | close(pack_objects.err); |
| 264 | pack_objects.err = -1; |
| 265 | } |
| 266 | else |
| 267 | goto fail; |
| 268 | /* give priority to status messages */ |
| 269 | continue; |
| 270 | } |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 271 | if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) { |
| 272 | /* Data ready; we keep the last byte to ourselves |
| 273 | * in case we detect broken rev-list, so that we |
| 274 | * can leave the stream corrupted. This is |
| 275 | * unfortunate -- unpack-objects would happily |
| 276 | * accept a valid packdata with trailing garbage, |
| 277 | * so appending garbage after we pass all the |
| 278 | * pack data is not good enough to signal |
| 279 | * breakage to downstream. |
| 280 | */ |
| 281 | char *cp = data; |
| 282 | ssize_t outsz = 0; |
| 283 | if (0 <= buffered) { |
| 284 | *cp++ = buffered; |
| 285 | outsz++; |
| 286 | } |
| 287 | sz = xread(pack_objects.out, cp, |
| 288 | sizeof(data) - outsz); |
| 289 | if (0 < sz) |
Junio C Hamano | 1456b04 | 2009-12-10 12:17:11 -0800 | [diff] [blame] | 290 | ; |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 291 | else if (sz == 0) { |
| 292 | close(pack_objects.out); |
| 293 | pack_objects.out = -1; |
| 294 | } |
| 295 | else |
| 296 | goto fail; |
| 297 | sz += outsz; |
| 298 | if (1 < sz) { |
| 299 | buffered = data[sz-1] & 0xFF; |
| 300 | sz--; |
| 301 | } |
| 302 | else |
| 303 | buffered = -1; |
| 304 | sz = send_client_data(1, data, sz); |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 305 | if (sz < 0) |
| 306 | goto fail; |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 307 | } |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 308 | } |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 309 | |
| 310 | if (finish_command(&pack_objects)) { |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 311 | error("git upload-pack: git-pack-objects died with error."); |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 312 | goto fail; |
| 313 | } |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 314 | if (shallow_nr && finish_async(&rev_list)) |
Johannes Sixt | 4c324c0 | 2007-11-04 20:46:48 +0100 | [diff] [blame] | 315 | goto fail; /* error was already reported */ |
| 316 | |
| 317 | /* flush the data */ |
| 318 | if (0 <= buffered) { |
| 319 | data[0] = buffered; |
| 320 | sz = send_client_data(1, data, 1); |
| 321 | if (sz < 0) |
| 322 | goto fail; |
| 323 | fprintf(stderr, "flushed.\n"); |
| 324 | } |
| 325 | if (use_sideband) |
| 326 | packet_flush(1); |
| 327 | return; |
| 328 | |
Junio C Hamano | b1c71b7 | 2006-06-20 18:26:34 -0700 | [diff] [blame] | 329 | fail: |
Junio C Hamano | 583b7ea | 2006-06-21 00:30:21 -0700 | [diff] [blame] | 330 | send_client_data(3, abort_msg, sizeof(abort_msg)); |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 331 | die("git upload-pack: %s", abort_msg); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 332 | } |
| 333 | |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 334 | static int got_sha1(char *hex, unsigned char *sha1) |
| 335 | { |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 336 | struct object *o; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 337 | int we_knew_they_have = 0; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 338 | |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 339 | if (get_sha1_hex(hex, sha1)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 340 | die("git upload-pack: expected SHA1 object, got '%s'", hex); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 341 | if (!has_sha1_file(sha1)) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 342 | return -1; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 343 | |
| 344 | o = lookup_object(sha1); |
| 345 | if (!(o && o->parsed)) |
| 346 | o = parse_object(sha1); |
| 347 | if (!o) |
| 348 | die("oops (%s)", sha1_to_hex(sha1)); |
Junio C Hamano | 182a8da | 2006-08-12 22:16:51 -0700 | [diff] [blame] | 349 | if (o->type == OBJ_COMMIT) { |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 350 | struct commit_list *parents; |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 351 | struct commit *commit = (struct commit *)o; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 352 | if (o->flags & THEY_HAVE) |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 353 | we_knew_they_have = 1; |
| 354 | else |
| 355 | o->flags |= THEY_HAVE; |
| 356 | if (!oldest_have || (commit->date < oldest_have)) |
| 357 | oldest_have = commit->date; |
| 358 | for (parents = commit->parents; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 359 | parents; |
| 360 | parents = parents->next) |
| 361 | parents->item->object.flags |= THEY_HAVE; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 362 | } |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 363 | if (!we_knew_they_have) { |
| 364 | add_object_array(o, NULL, &have_obj); |
| 365 | return 1; |
| 366 | } |
| 367 | return 0; |
| 368 | } |
| 369 | |
| 370 | static int reachable(struct commit *want) |
| 371 | { |
| 372 | struct commit_list *work = NULL; |
| 373 | |
| 374 | insert_by_date(want, &work); |
| 375 | while (work) { |
| 376 | struct commit_list *list = work->next; |
| 377 | struct commit *commit = work->item; |
| 378 | free(work); |
| 379 | work = list; |
| 380 | |
| 381 | if (commit->object.flags & THEY_HAVE) { |
| 382 | want->object.flags |= COMMON_KNOWN; |
| 383 | break; |
| 384 | } |
| 385 | if (!commit->object.parsed) |
| 386 | parse_object(commit->object.sha1); |
| 387 | if (commit->object.flags & REACHABLE) |
| 388 | continue; |
| 389 | commit->object.flags |= REACHABLE; |
| 390 | if (commit->date < oldest_have) |
| 391 | continue; |
| 392 | for (list = commit->parents; list; list = list->next) { |
| 393 | struct commit *parent = list->item; |
| 394 | if (!(parent->object.flags & REACHABLE)) |
| 395 | insert_by_date(parent, &work); |
| 396 | } |
| 397 | } |
| 398 | want->object.flags |= REACHABLE; |
| 399 | clear_commit_marks(want, REACHABLE); |
| 400 | free_commit_list(work); |
| 401 | return (want->object.flags & COMMON_KNOWN); |
| 402 | } |
| 403 | |
| 404 | static int ok_to_give_up(void) |
| 405 | { |
| 406 | int i; |
| 407 | |
| 408 | if (!have_obj.nr) |
| 409 | return 0; |
| 410 | |
| 411 | for (i = 0; i < want_obj.nr; i++) { |
| 412 | struct object *want = want_obj.objects[i].item; |
| 413 | |
| 414 | if (want->flags & COMMON_KNOWN) |
| 415 | continue; |
| 416 | want = deref_tag(want, "a want line", 0); |
| 417 | if (!want || want->type != OBJ_COMMIT) { |
| 418 | /* no way to tell if this is reachable by |
| 419 | * looking at the ancestry chain alone, so |
| 420 | * leave a note to ourselves not to worry about |
| 421 | * this object anymore. |
| 422 | */ |
| 423 | want_obj.objects[i].item->flags |= COMMON_KNOWN; |
| 424 | continue; |
| 425 | } |
| 426 | if (!reachable((struct commit *)want)) |
| 427 | return 0; |
| 428 | } |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 429 | return 1; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 430 | } |
| 431 | |
| 432 | static int get_common_commits(void) |
| 433 | { |
| 434 | static char line[1000]; |
Junio C Hamano | c04c4e5 | 2006-07-05 18:12:12 -0700 | [diff] [blame] | 435 | unsigned char sha1[20]; |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 436 | char last_hex[41]; |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 437 | |
Johannes Schindelin | f0243f2 | 2005-10-28 04:48:32 +0200 | [diff] [blame] | 438 | save_commit_buffer = 0; |
| 439 | |
Brian Gianforcaro | eeefa7c | 2009-09-01 01:35:10 -0400 | [diff] [blame] | 440 | for (;;) { |
Benjamin Kramer | fd13b21 | 2009-03-07 21:02:26 +0100 | [diff] [blame] | 441 | int len = packet_read_line(0, line, sizeof(line)); |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 442 | reset_timeout(); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 443 | |
| 444 | if (!len) { |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 445 | if (have_obj.nr == 0 || multi_ack) |
Johannes Schindelin | 1bd8c8f | 2005-10-28 04:49:16 +0200 | [diff] [blame] | 446 | packet_write(1, "NAK\n"); |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 447 | if (stateless_rpc) |
| 448 | exit(0); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 449 | continue; |
| 450 | } |
Benjamin Kramer | fd13b21 | 2009-03-07 21:02:26 +0100 | [diff] [blame] | 451 | strip(line, len); |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 452 | if (!prefixcmp(line, "have ")) { |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 453 | switch (got_sha1(line+5, sha1)) { |
| 454 | case -1: /* they have what we do not */ |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 455 | if (multi_ack && ok_to_give_up()) { |
| 456 | const char *hex = sha1_to_hex(sha1); |
| 457 | if (multi_ack == 2) |
| 458 | packet_write(1, "ACK %s ready\n", hex); |
| 459 | else |
| 460 | packet_write(1, "ACK %s continue\n", hex); |
| 461 | } |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 462 | break; |
| 463 | default: |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 464 | memcpy(last_hex, sha1_to_hex(sha1), 41); |
| 465 | if (multi_ack == 2) |
| 466 | packet_write(1, "ACK %s common\n", last_hex); |
| 467 | else if (multi_ack) |
| 468 | packet_write(1, "ACK %s continue\n", last_hex); |
Junio C Hamano | c04c4e5 | 2006-07-05 18:12:12 -0700 | [diff] [blame] | 469 | else if (have_obj.nr == 1) |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 470 | packet_write(1, "ACK %s\n", last_hex); |
Junio C Hamano | 937a515 | 2006-07-05 21:28:20 -0700 | [diff] [blame] | 471 | break; |
Junio C Hamano | af2d3aa | 2005-10-25 14:55:24 -0700 | [diff] [blame] | 472 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 473 | continue; |
| 474 | } |
| 475 | if (!strcmp(line, "done")) { |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 476 | if (have_obj.nr > 0) { |
Johannes Schindelin | 1bd8c8f | 2005-10-28 04:49:16 +0200 | [diff] [blame] | 477 | if (multi_ack) |
Junio C Hamano | c04c4e5 | 2006-07-05 18:12:12 -0700 | [diff] [blame] | 478 | packet_write(1, "ACK %s\n", last_hex); |
Johannes Schindelin | 1bd8c8f | 2005-10-28 04:49:16 +0200 | [diff] [blame] | 479 | return 0; |
| 480 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 481 | packet_write(1, "NAK\n"); |
| 482 | return -1; |
| 483 | } |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 484 | die("git upload-pack: expected SHA1 list, got '%s'", line); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 485 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 486 | } |
| 487 | |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 488 | static void receive_needs(void) |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 489 | { |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 490 | struct object_array shallows = {0, 0, NULL}; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 491 | static char line[1000]; |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 492 | int len, depth = 0; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 493 | |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 494 | shallow_nr = 0; |
Shawn O. Pearce | 49aaddd | 2008-03-02 21:35:18 -0500 | [diff] [blame] | 495 | if (debug_fd) |
Jim Meyering | 2b7ca83 | 2009-09-12 10:54:32 +0200 | [diff] [blame] | 496 | write_str_in_full(debug_fd, "#S\n"); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 497 | for (;;) { |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 498 | struct object *o; |
Junio C Hamano | 6ece0d3 | 2006-07-05 17:41:39 -0700 | [diff] [blame] | 499 | unsigned char sha1_buf[20]; |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 500 | len = packet_read_line(0, line, sizeof(line)); |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 501 | reset_timeout(); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 502 | if (!len) |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 503 | break; |
Shawn O. Pearce | 49aaddd | 2008-03-02 21:35:18 -0500 | [diff] [blame] | 504 | if (debug_fd) |
| 505 | write_in_full(debug_fd, line, len); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 506 | |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 507 | if (!prefixcmp(line, "shallow ")) { |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 508 | unsigned char sha1[20]; |
| 509 | struct object *object; |
| 510 | if (get_sha1(line + 8, sha1)) |
| 511 | die("invalid shallow line: %s", line); |
| 512 | object = parse_object(sha1); |
| 513 | if (!object) |
| 514 | die("did not find object for %s", line); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 515 | object->flags |= CLIENT_SHALLOW; |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 516 | add_object_array(object, NULL, &shallows); |
| 517 | continue; |
| 518 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 519 | if (!prefixcmp(line, "deepen ")) { |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 520 | char *end; |
| 521 | depth = strtol(line + 7, &end, 0); |
| 522 | if (end == line + 7 || depth <= 0) |
| 523 | die("Invalid deepen: %s", line); |
| 524 | continue; |
| 525 | } |
Junio C Hamano | 599065a | 2007-02-20 01:54:00 -0800 | [diff] [blame] | 526 | if (prefixcmp(line, "want ") || |
Junio C Hamano | 6ece0d3 | 2006-07-05 17:41:39 -0700 | [diff] [blame] | 527 | get_sha1_hex(line+5, sha1_buf)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 528 | die("git upload-pack: protocol error, " |
Junio C Hamano | e091eb9 | 2005-10-05 14:49:54 -0700 | [diff] [blame] | 529 | "expected to get sha, not '%s'", line); |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 530 | if (strstr(line+45, "multi_ack_detailed")) |
| 531 | multi_ack = 2; |
| 532 | else if (strstr(line+45, "multi_ack")) |
Johannes Schindelin | 1bd8c8f | 2005-10-28 04:49:16 +0200 | [diff] [blame] | 533 | multi_ack = 1; |
Junio C Hamano | b19696c | 2006-02-20 00:38:39 -0800 | [diff] [blame] | 534 | if (strstr(line+45, "thin-pack")) |
| 535 | use_thin_pack = 1; |
Nicolas Pitre | e4fe4b8 | 2006-09-26 11:27:39 -0400 | [diff] [blame] | 536 | if (strstr(line+45, "ofs-delta")) |
| 537 | use_ofs_delta = 1; |
Junio C Hamano | d47f3db | 2006-09-10 16:27:08 -0700 | [diff] [blame] | 538 | if (strstr(line+45, "side-band-64k")) |
| 539 | use_sideband = LARGE_PACKET_MAX; |
| 540 | else if (strstr(line+45, "side-band")) |
| 541 | use_sideband = DEFAULT_PACKET_MAX; |
Johannes Schindelin | b0e9089 | 2007-02-23 20:03:10 +0100 | [diff] [blame] | 542 | if (strstr(line+45, "no-progress")) |
| 543 | no_progress = 1; |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 544 | if (strstr(line+45, "include-tag")) |
| 545 | use_include_tag = 1; |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 546 | |
| 547 | /* We have sent all our refs already, and the other end |
| 548 | * should have chosen out of them; otherwise they are |
| 549 | * asking for nonsense. |
| 550 | * |
| 551 | * Hmph. We may later want to allow "want" line that |
| 552 | * asks for something like "master~10" (symbolic)... |
| 553 | * would it make sense? I don't know. |
| 554 | */ |
| 555 | o = lookup_object(sha1_buf); |
| 556 | if (!o || !(o->flags & OUR_REF)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 557 | die("git upload-pack: not our ref %s", line+5); |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 558 | if (!(o->flags & WANTED)) { |
| 559 | o->flags |= WANTED; |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 560 | add_object_array(o, NULL, &want_obj); |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 561 | } |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 562 | } |
Shawn O. Pearce | 49aaddd | 2008-03-02 21:35:18 -0500 | [diff] [blame] | 563 | if (debug_fd) |
Jim Meyering | 2b7ca83 | 2009-09-12 10:54:32 +0200 | [diff] [blame] | 564 | write_str_in_full(debug_fd, "#E\n"); |
Johannes Sixt | 9462e3f | 2009-06-16 20:41:16 +0200 | [diff] [blame] | 565 | |
| 566 | if (!use_sideband && daemon_mode) |
| 567 | no_progress = 1; |
| 568 | |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 569 | if (depth == 0 && shallows.nr == 0) |
| 570 | return; |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 571 | if (depth > 0) { |
| 572 | struct commit_list *result, *backup; |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 573 | int i; |
| 574 | backup = result = get_shallow_commits(&want_obj, depth, |
| 575 | SHALLOW, NOT_SHALLOW); |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 576 | while (result) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 577 | struct object *object = &result->item->object; |
Alexandre Julliard | 1f2de76 | 2006-11-24 15:58:25 +0100 | [diff] [blame] | 578 | if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 579 | packet_write(1, "shallow %s", |
| 580 | sha1_to_hex(object->sha1)); |
| 581 | register_shallow(object->sha1); |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 582 | shallow_nr++; |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 583 | } |
Johannes Schindelin | 016e6cc | 2006-10-30 20:09:29 +0100 | [diff] [blame] | 584 | result = result->next; |
| 585 | } |
| 586 | free_commit_list(backup); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 587 | for (i = 0; i < shallows.nr; i++) { |
| 588 | struct object *object = shallows.objects[i].item; |
| 589 | if (object->flags & NOT_SHALLOW) { |
| 590 | struct commit_list *parents; |
| 591 | packet_write(1, "unshallow %s", |
| 592 | sha1_to_hex(object->sha1)); |
| 593 | object->flags &= ~CLIENT_SHALLOW; |
| 594 | /* make sure the real parents are parsed */ |
| 595 | unregister_shallow(object->sha1); |
Junio C Hamano | 176d45c | 2006-11-13 22:47:46 -0800 | [diff] [blame] | 596 | object->parsed = 0; |
Martin Koegler | dec38c8 | 2008-02-18 21:48:03 +0100 | [diff] [blame] | 597 | if (parse_commit((struct commit *)object)) |
| 598 | die("invalid commit"); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 599 | parents = ((struct commit *)object)->parents; |
| 600 | while (parents) { |
| 601 | add_object_array(&parents->item->object, |
| 602 | NULL, &want_obj); |
| 603 | parents = parents->next; |
| 604 | } |
Nicolas Pitre | 6523078 | 2009-09-03 19:08:33 -0400 | [diff] [blame] | 605 | add_object_array(object, NULL, &extra_edge_obj); |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 606 | } |
| 607 | /* make sure commit traversal conforms to client */ |
| 608 | register_shallow(object->sha1); |
| 609 | } |
| 610 | packet_flush(1); |
| 611 | } else |
| 612 | if (shallows.nr > 0) { |
| 613 | int i; |
| 614 | for (i = 0; i < shallows.nr; i++) |
| 615 | register_shallow(shallows.objects[i].item->sha1); |
| 616 | } |
Nick Edelen | f0cea83 | 2009-06-10 01:50:18 +0200 | [diff] [blame] | 617 | |
| 618 | shallow_nr += shallows.nr; |
Johannes Schindelin | f53514b | 2006-10-30 20:09:53 +0100 | [diff] [blame] | 619 | free(shallows.objects); |
Linus Torvalds | fb9040c | 2005-07-04 15:29:17 -0700 | [diff] [blame] | 620 | } |
| 621 | |
Junio C Hamano | 8da1977 | 2006-09-20 22:02:01 -0700 | [diff] [blame] | 622 | static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 623 | { |
Johannes Schindelin | ed09aef | 2006-10-30 20:09:06 +0100 | [diff] [blame] | 624 | static const char *capabilities = "multi_ack thin-pack side-band" |
Shawn O. Pearce | 348e390 | 2008-03-03 22:27:33 -0500 | [diff] [blame] | 625 | " side-band-64k ofs-delta shallow no-progress" |
Shawn O. Pearce | 78affc4 | 2009-10-30 17:47:25 -0700 | [diff] [blame] | 626 | " include-tag multi_ack_detailed"; |
Junio C Hamano | f6b42a8 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 627 | struct object *o = parse_object(sha1); |
| 628 | |
Carl Worth | b5b1699 | 2006-02-17 16:14:52 -0800 | [diff] [blame] | 629 | if (!o) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 630 | die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); |
Carl Worth | b5b1699 | 2006-02-17 16:14:52 -0800 | [diff] [blame] | 631 | |
Johannes Schindelin | 1f5881b | 2005-10-28 05:56:41 +0200 | [diff] [blame] | 632 | if (capabilities) |
| 633 | packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname, |
| 634 | 0, capabilities); |
| 635 | else |
| 636 | packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname); |
| 637 | capabilities = NULL; |
Junio C Hamano | 565ebbf | 2005-10-24 18:59:18 -0700 | [diff] [blame] | 638 | if (!(o->flags & OUR_REF)) { |
| 639 | o->flags |= OUR_REF; |
| 640 | nr_our_refs++; |
| 641 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 642 | if (o->type == OBJ_TAG) { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 643 | o = deref_tag(o, refname, 0); |
Martin Koegler | affeef1 | 2008-02-18 08:31:54 +0100 | [diff] [blame] | 644 | if (o) |
| 645 | packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname); |
Junio C Hamano | f6b42a8 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 646 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 647 | return 0; |
| 648 | } |
| 649 | |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 650 | static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
| 651 | { |
| 652 | struct object *o = parse_object(sha1); |
| 653 | if (!o) |
| 654 | die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); |
| 655 | if (!(o->flags & OUR_REF)) { |
| 656 | o->flags |= OUR_REF; |
| 657 | nr_our_refs++; |
| 658 | } |
| 659 | return 0; |
| 660 | } |
| 661 | |
David Rientjes | 59076eb | 2006-08-14 13:40:51 -0700 | [diff] [blame] | 662 | static void upload_pack(void) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 663 | { |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 664 | if (advertise_refs || !stateless_rpc) { |
| 665 | reset_timeout(); |
| 666 | head_ref(send_ref, NULL); |
| 667 | for_each_ref(send_ref, NULL); |
| 668 | packet_flush(1); |
| 669 | } else { |
| 670 | head_ref(mark_our_ref, NULL); |
| 671 | for_each_ref(mark_our_ref, NULL); |
| 672 | } |
| 673 | if (advertise_refs) |
| 674 | return; |
| 675 | |
Junio C Hamano | b1e9fff | 2006-07-05 18:00:02 -0700 | [diff] [blame] | 676 | receive_needs(); |
David Rientjes | 59076eb | 2006-08-14 13:40:51 -0700 | [diff] [blame] | 677 | if (want_obj.nr) { |
| 678 | get_common_commits(); |
| 679 | create_pack_file(); |
| 680 | } |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 681 | } |
| 682 | |
| 683 | int main(int argc, char **argv) |
| 684 | { |
Andreas Ericsson | 8d63013 | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 685 | char *dir; |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 686 | int i; |
| 687 | int strict = 0; |
| 688 | |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 689 | git_extract_argv0_path(argv[0]); |
Christian Couder | dae556b | 2009-01-23 10:07:46 +0100 | [diff] [blame] | 690 | read_replace_refs = 0; |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 691 | |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 692 | for (i = 1; i < argc; i++) { |
| 693 | char *arg = argv[i]; |
| 694 | |
| 695 | if (arg[0] != '-') |
| 696 | break; |
Shawn O. Pearce | 42526b4 | 2009-10-30 17:47:33 -0700 | [diff] [blame] | 697 | if (!strcmp(arg, "--advertise-refs")) { |
| 698 | advertise_refs = 1; |
| 699 | continue; |
| 700 | } |
| 701 | if (!strcmp(arg, "--stateless-rpc")) { |
| 702 | stateless_rpc = 1; |
| 703 | continue; |
| 704 | } |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 705 | if (!strcmp(arg, "--strict")) { |
| 706 | strict = 1; |
| 707 | continue; |
| 708 | } |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 709 | if (!prefixcmp(arg, "--timeout=")) { |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 710 | timeout = atoi(arg+10); |
Johannes Sixt | 9462e3f | 2009-06-16 20:41:16 +0200 | [diff] [blame] | 711 | daemon_mode = 1; |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 712 | continue; |
| 713 | } |
| 714 | if (!strcmp(arg, "--")) { |
| 715 | i++; |
| 716 | break; |
| 717 | } |
| 718 | } |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 719 | |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 720 | if (i != argc-1) |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 721 | usage(upload_pack_usage); |
Johannes Sixt | 04b3305 | 2008-02-12 12:28:01 +0100 | [diff] [blame] | 722 | |
Johannes Sixt | e1464ca | 2008-07-21 21:19:52 +0200 | [diff] [blame] | 723 | setup_path(); |
Johannes Sixt | 04b3305 | 2008-02-12 12:28:01 +0100 | [diff] [blame] | 724 | |
H. Peter Anvin | 960decc | 2005-10-19 14:27:01 -0700 | [diff] [blame] | 725 | dir = argv[i]; |
Linus Torvalds | 113b947 | 2005-07-08 16:22:22 -0700 | [diff] [blame] | 726 | |
Andreas Ericsson | 8d63013 | 2005-11-17 20:37:14 +0100 | [diff] [blame] | 727 | if (!enter_repo(dir, strict)) |
Jeff King | 05ac6b3 | 2009-03-04 03:32:29 -0500 | [diff] [blame] | 728 | die("'%s' does not appear to be a git repository", dir); |
Junio C Hamano | a0022ee | 2007-01-21 22:23:58 -0800 | [diff] [blame] | 729 | if (is_repository_shallow()) |
| 730 | die("attempt to fetch/clone from a shallow repository"); |
Shawn O. Pearce | 49aaddd | 2008-03-02 21:35:18 -0500 | [diff] [blame] | 731 | if (getenv("GIT_DEBUG_SEND_PACK")) |
| 732 | debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK")); |
Linus Torvalds | def88e9 | 2005-07-04 13:26:53 -0700 | [diff] [blame] | 733 | upload_pack(); |
| 734 | return 0; |
| 735 | } |