blob: f05e4229d0d3a3ed34b4bba6636f4d333c74dc22 [file] [log] [blame]
Linus Torvaldsdef88e92005-07-04 13:26:53 -07001#include "cache.h"
2#include "refs.h"
3#include "pkt-line.h"
Junio C Hamano958c24b2006-09-10 03:20:24 -07004#include "sideband.h"
Junio C Hamanof6b42a82005-10-13 18:57:40 -07005#include "tag.h"
6#include "object.h"
Johannes Schindelinf0243f22005-10-28 04:48:32 +02007#include "commit.h"
Michal Ostrowski77cb17e2006-01-10 21:12:17 -05008#include "exec_cmd.h"
Johannes Schindelin9b8dc262006-10-30 20:08:43 +01009#include "diff.h"
10#include "revision.h"
11#include "list-objects.h"
Johannes Sixtcc41fa82007-10-19 21:47:59 +020012#include "run-command.h"
Linus Torvaldsdef88e92005-07-04 13:26:53 -070013
Štěpán Němec62b46982010-10-08 19:31:15 +020014static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
Linus Torvaldsdef88e92005-07-04 13:26:53 -070015
Junio C Hamano937a5152006-07-05 21:28:20 -070016/* 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 Schindelinf53514b2006-10-30 20:09:53 +010023#define SHALLOW (1u << 16)
24#define NOT_SHALLOW (1u << 17)
25#define CLIENT_SHALLOW (1u << 18)
26
Junio C Hamano3fbe2d52006-11-24 02:34:27 -080027static unsigned long oldest_have;
Junio C Hamano937a5152006-07-05 21:28:20 -070028
David Rientjes96f1e582006-08-15 10:23:48 -070029static int multi_ack, nr_our_refs;
Shawn O. Pearce348e3902008-03-03 22:27:33 -050030static int use_thin_pack, use_ofs_delta, use_include_tag;
Johannes Sixt9462e3f2009-06-16 20:41:16 +020031static int no_progress, daemon_mode;
Nick Edelenf0cea832009-06-10 01:50:18 +020032static int shallow_nr;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -070033static struct object_array have_obj;
34static struct object_array want_obj;
Nicolas Pitre65230782009-09-03 19:08:33 -040035static struct object_array extra_edge_obj;
David Rientjes96f1e582006-08-15 10:23:48 -070036static unsigned int timeout;
Junio C Hamanod47f3db2006-09-10 16:27:08 -070037/* 0 for no sideband,
38 * otherwise maximum packet size (up to 65520 bytes).
39 */
David Rientjes96f1e582006-08-15 10:23:48 -070040static int use_sideband;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -050041static int debug_fd;
Shawn O. Pearce42526b42009-10-30 17:47:33 -070042static int advertise_refs;
43static int stateless_rpc;
H. Peter Anvin960decc2005-10-19 14:27:01 -070044
45static void reset_timeout(void)
46{
47 alarm(timeout);
48}
Linus Torvaldsfb9040c2005-07-04 15:29:17 -070049
Linus Torvalds75bfc6c2005-07-04 16:35:13 -070050static 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 Hamano583b7ea2006-06-21 00:30:21 -070057static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
58{
Junio C Hamano958c24b2006-09-10 03:20:24 -070059 if (use_sideband)
Junio C Hamanod47f3db2006-09-10 16:27:08 -070060 return send_sideband(1, fd, data, sz, use_sideband);
Junio C Hamano958c24b2006-09-10 03:20:24 -070061 if (fd == 3)
62 /* emergency quit */
63 fd = 2;
64 if (fd == 2) {
Andy Whitcroft93822c22007-01-08 15:58:23 +000065 /* XXX: are we happy to lose stuff here? */
Junio C Hamano958c24b2006-09-10 03:20:24 -070066 xwrite(fd, data, sz);
67 return sz;
Junio C Hamano583b7ea2006-06-21 00:30:21 -070068 }
Junio C Hamano958c24b2006-09-10 03:20:24 -070069 return safe_write(fd, data, sz);
Junio C Hamano583b7ea2006-06-21 00:30:21 -070070}
71
Junio C Hamano16befb82007-06-08 02:54:57 -070072static FILE *pack_pipe = NULL;
Christian Couder11c211f2009-04-06 21:28:36 +020073static void show_commit(struct commit *commit, void *data)
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010074{
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 Torvaldscf2ab912009-04-10 18:15:26 -070085static void show_object(struct object *obj, const struct name_path *path, const char *component)
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010086{
87 /* An object with name "foo\n0000000..." can be used to
88 * confuse downstream git-pack-objects very badly.
89 */
Linus Torvaldscf2ab912009-04-10 18:15:26 -070090 const char *name = path_name(path, component);
Linus Torvalds8d2dfc42009-04-10 17:27:58 -070091 const char *ep = strchr(name, '\n');
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010092 if (ep) {
Linus Torvalds8d2dfc42009-04-10 17:27:58 -070093 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
94 (int) (ep - name),
95 name);
Johannes Schindelin9b8dc262006-10-30 20:08:43 +010096 }
97 else
98 fprintf(pack_pipe, "%s %s\n",
Linus Torvalds8d2dfc42009-04-10 17:27:58 -070099 sha1_to_hex(obj->sha1), name);
Linus Torvaldscf2ab912009-04-10 18:15:26 -0700100 free((char *)name);
Johannes Schindelin9b8dc262006-10-30 20:08:43 +0100101}
102
103static void show_edge(struct commit *commit)
104{
105 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
106}
107
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700108static int do_rev_list(int in, int out, void *user_data)
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200109{
110 int i;
111 struct rev_info revs;
112
Erik Faye-Lundae6a5602010-02-05 12:57:38 -0800113 pack_pipe = xfdopen(out, "w");
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200114 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
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700121 for (i = 0; i < want_obj.nr; i++) {
122 struct object *o = want_obj.objects[i].item;
123 /* why??? */
124 o->flags &= ~UNINTERESTING;
125 add_pending_object(&revs, o, NULL);
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200126 }
Nguyễn Thái Ngọc Duy1e39d7d2010-07-28 16:39:10 +0700127 for (i = 0; i < have_obj.nr; i++) {
128 struct object *o = have_obj.objects[i].item;
129 o->flags |= UNINTERESTING;
130 add_pending_object(&revs, o, NULL);
131 }
132 setup_revisions(0, NULL, &revs, NULL);
Martin Koegler3d51e1b2008-02-18 08:31:56 +0100133 if (prepare_revision_walk(&revs))
134 die("revision walk setup failed");
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200135 mark_edges_uninteresting(revs.commits, &revs, show_edge);
Nicolas Pitre65230782009-09-03 19:08:33 -0400136 if (use_thin_pack)
137 for (i = 0; i < extra_edge_obj.nr; i++)
138 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
139 extra_edge_obj.objects[i].item->sha1));
Christian Couder11c211f2009-04-06 21:28:36 +0200140 traverse_commit_list(&revs, show_commit, show_object, NULL);
Johannes Sixt618ebe92007-12-08 22:19:14 +0100141 fflush(pack_pipe);
142 fclose(pack_pipe);
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200143 return 0;
Johannes Sixt80ccaa72007-10-19 21:48:02 +0200144}
145
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700146static void create_pack_file(void)
147{
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200148 struct async rev_list;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200149 struct child_process pack_objects;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700150 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
Junio C Hamano363b7812006-06-20 22:48:23 -0700151 char data[8193], progress[128];
Junio C Hamano583b7ea2006-06-21 00:30:21 -0700152 char abort_msg[] = "aborting due to possible repository "
153 "corruption on the remote side.";
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700154 int buffered = -1;
Junio C Hamano1456b042009-12-10 12:17:11 -0800155 ssize_t sz;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200156 const char *argv[10];
157 int arg = 0;
Linus Torvalds75bfc6c2005-07-04 16:35:13 -0700158
Nick Edelenf0cea832009-06-10 01:50:18 +0200159 if (shallow_nr) {
Erik Faye-Lundae6a5602010-02-05 12:57:38 -0800160 memset(&rev_list, 0, sizeof(rev_list));
Nick Edelenf0cea832009-06-10 01:50:18 +0200161 rev_list.proc = do_rev_list;
Erik Faye-Lundae6a5602010-02-05 12:57:38 -0800162 rev_list.out = -1;
Nick Edelenf0cea832009-06-10 01:50:18 +0200163 if (start_async(&rev_list))
164 die("git upload-pack: unable to fork git-rev-list");
165 argv[arg++] = "pack-objects";
166 } else {
167 argv[arg++] = "pack-objects";
168 argv[arg++] = "--revs";
169 if (create_full_pack)
170 argv[arg++] = "--all";
171 else if (use_thin_pack)
172 argv[arg++] = "--thin";
173 }
Linus Torvalds75bfc6c2005-07-04 16:35:13 -0700174
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200175 argv[arg++] = "--stdout";
176 if (!no_progress)
177 argv[arg++] = "--progress";
178 if (use_ofs_delta)
179 argv[arg++] = "--delta-base-offset";
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500180 if (use_include_tag)
181 argv[arg++] = "--include-tag";
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200182 argv[arg++] = NULL;
183
184 memset(&pack_objects, 0, sizeof(pack_objects));
Nick Edelenf0cea832009-06-10 01:50:18 +0200185 pack_objects.in = shallow_nr ? rev_list.out : -1;
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200186 pack_objects.out = -1;
187 pack_objects.err = -1;
188 pack_objects.git_cmd = 1;
189 pack_objects.argv = argv;
Johannes Sixt21edd3f2007-10-19 21:48:03 +0200190
Johannes Sixt4c324c02007-11-04 20:46:48 +0100191 if (start_command(&pack_objects))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700192 die("git upload-pack: unable to fork git-pack-objects");
Johannes Schindelin83a5ad62007-02-20 03:01:44 +0100193
Nick Edelenf0cea832009-06-10 01:50:18 +0200194 /* pass on revisions we (don't) want */
195 if (!shallow_nr) {
Jim Meyering41698372009-09-12 10:43:27 +0200196 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
Nick Edelenf0cea832009-06-10 01:50:18 +0200197 if (!create_full_pack) {
198 int i;
199 for (i = 0; i < want_obj.nr; i++)
200 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
201 fprintf(pipe_fd, "--not\n");
202 for (i = 0; i < have_obj.nr; i++)
203 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
204 }
205
206 fprintf(pipe_fd, "\n");
207 fflush(pipe_fd);
208 fclose(pipe_fd);
209 }
210
211
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200212 /* We read from pack_objects.err to capture stderr output for
213 * progress bar, and pack_objects.out to capture the pack data.
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700214 */
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700215
216 while (1) {
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700217 struct pollfd pfd[2];
Junio C Hamano363b7812006-06-20 22:48:23 -0700218 int pe, pu, pollsize;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700219
Matthias Lederhofer0d516ad2006-07-18 19:14:51 +0200220 reset_timeout();
221
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700222 pollsize = 0;
Junio C Hamano363b7812006-06-20 22:48:23 -0700223 pe = pu = -1;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700224
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200225 if (0 <= pack_objects.out) {
226 pfd[pollsize].fd = pack_objects.out;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700227 pfd[pollsize].events = POLLIN;
228 pu = pollsize;
229 pollsize++;
230 }
Johannes Sixtcc41fa82007-10-19 21:47:59 +0200231 if (0 <= pack_objects.err) {
232 pfd[pollsize].fd = pack_objects.err;
Junio C Hamano363b7812006-06-20 22:48:23 -0700233 pfd[pollsize].events = POLLIN;
234 pe = pollsize;
235 pollsize++;
236 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700237
Johannes Sixt4c324c02007-11-04 20:46:48 +0100238 if (!pollsize)
239 break;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700240
Johannes Sixt4c324c02007-11-04 20:46:48 +0100241 if (poll(pfd, pollsize, -1) < 0) {
242 if (errno != EINTR) {
243 error("poll failed, resuming: %s",
244 strerror(errno));
245 sleep(1);
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700246 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700247 continue;
Johannes Sixt4c324c02007-11-04 20:46:48 +0100248 }
Nicolas Pitre6b59f512009-11-11 17:24:42 -0500249 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
250 /* Status ready; we ship that in the side-band
251 * or dump to the standard error.
252 */
253 sz = xread(pack_objects.err, progress,
254 sizeof(progress));
255 if (0 < sz)
256 send_client_data(2, progress, sz);
257 else if (sz == 0) {
258 close(pack_objects.err);
259 pack_objects.err = -1;
260 }
261 else
262 goto fail;
263 /* give priority to status messages */
264 continue;
265 }
Johannes Sixt4c324c02007-11-04 20:46:48 +0100266 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
267 /* Data ready; we keep the last byte to ourselves
268 * in case we detect broken rev-list, so that we
269 * can leave the stream corrupted. This is
270 * unfortunate -- unpack-objects would happily
271 * accept a valid packdata with trailing garbage,
272 * so appending garbage after we pass all the
273 * pack data is not good enough to signal
274 * breakage to downstream.
275 */
276 char *cp = data;
277 ssize_t outsz = 0;
278 if (0 <= buffered) {
279 *cp++ = buffered;
280 outsz++;
281 }
282 sz = xread(pack_objects.out, cp,
283 sizeof(data) - outsz);
284 if (0 < sz)
Junio C Hamano1456b042009-12-10 12:17:11 -0800285 ;
Johannes Sixt4c324c02007-11-04 20:46:48 +0100286 else if (sz == 0) {
287 close(pack_objects.out);
288 pack_objects.out = -1;
289 }
290 else
291 goto fail;
292 sz += outsz;
293 if (1 < sz) {
294 buffered = data[sz-1] & 0xFF;
295 sz--;
296 }
297 else
298 buffered = -1;
299 sz = send_client_data(1, data, sz);
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700300 if (sz < 0)
301 goto fail;
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700302 }
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700303 }
Johannes Sixt4c324c02007-11-04 20:46:48 +0100304
305 if (finish_command(&pack_objects)) {
Junio C Hamano7e44c932008-08-31 09:39:19 -0700306 error("git upload-pack: git-pack-objects died with error.");
Johannes Sixt4c324c02007-11-04 20:46:48 +0100307 goto fail;
308 }
Nick Edelenf0cea832009-06-10 01:50:18 +0200309 if (shallow_nr && finish_async(&rev_list))
Johannes Sixt4c324c02007-11-04 20:46:48 +0100310 goto fail; /* error was already reported */
311
312 /* flush the data */
313 if (0 <= buffered) {
314 data[0] = buffered;
315 sz = send_client_data(1, data, 1);
316 if (sz < 0)
317 goto fail;
318 fprintf(stderr, "flushed.\n");
319 }
320 if (use_sideband)
321 packet_flush(1);
322 return;
323
Junio C Hamanob1c71b72006-06-20 18:26:34 -0700324 fail:
Junio C Hamano583b7ea2006-06-21 00:30:21 -0700325 send_client_data(3, abort_msg, sizeof(abort_msg));
Junio C Hamano7e44c932008-08-31 09:39:19 -0700326 die("git upload-pack: %s", abort_msg);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700327}
328
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700329static int got_sha1(char *hex, unsigned char *sha1)
330{
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700331 struct object *o;
Junio C Hamano937a5152006-07-05 21:28:20 -0700332 int we_knew_they_have = 0;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700333
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700334 if (get_sha1_hex(hex, sha1))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700335 die("git upload-pack: expected SHA1 object, got '%s'", hex);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700336 if (!has_sha1_file(sha1))
Junio C Hamano937a5152006-07-05 21:28:20 -0700337 return -1;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700338
339 o = lookup_object(sha1);
340 if (!(o && o->parsed))
341 o = parse_object(sha1);
342 if (!o)
343 die("oops (%s)", sha1_to_hex(sha1));
Junio C Hamano182a8da2006-08-12 22:16:51 -0700344 if (o->type == OBJ_COMMIT) {
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700345 struct commit_list *parents;
Junio C Hamano937a5152006-07-05 21:28:20 -0700346 struct commit *commit = (struct commit *)o;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700347 if (o->flags & THEY_HAVE)
Junio C Hamano937a5152006-07-05 21:28:20 -0700348 we_knew_they_have = 1;
349 else
350 o->flags |= THEY_HAVE;
351 if (!oldest_have || (commit->date < oldest_have))
352 oldest_have = commit->date;
353 for (parents = commit->parents;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700354 parents;
355 parents = parents->next)
356 parents->item->object.flags |= THEY_HAVE;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700357 }
Junio C Hamano937a5152006-07-05 21:28:20 -0700358 if (!we_knew_they_have) {
359 add_object_array(o, NULL, &have_obj);
360 return 1;
361 }
362 return 0;
363}
364
365static int reachable(struct commit *want)
366{
367 struct commit_list *work = NULL;
368
369 insert_by_date(want, &work);
370 while (work) {
371 struct commit_list *list = work->next;
372 struct commit *commit = work->item;
373 free(work);
374 work = list;
375
376 if (commit->object.flags & THEY_HAVE) {
377 want->object.flags |= COMMON_KNOWN;
378 break;
379 }
380 if (!commit->object.parsed)
381 parse_object(commit->object.sha1);
382 if (commit->object.flags & REACHABLE)
383 continue;
384 commit->object.flags |= REACHABLE;
385 if (commit->date < oldest_have)
386 continue;
387 for (list = commit->parents; list; list = list->next) {
388 struct commit *parent = list->item;
389 if (!(parent->object.flags & REACHABLE))
390 insert_by_date(parent, &work);
391 }
392 }
393 want->object.flags |= REACHABLE;
394 clear_commit_marks(want, REACHABLE);
395 free_commit_list(work);
396 return (want->object.flags & COMMON_KNOWN);
397}
398
399static int ok_to_give_up(void)
400{
401 int i;
402
403 if (!have_obj.nr)
404 return 0;
405
406 for (i = 0; i < want_obj.nr; i++) {
407 struct object *want = want_obj.objects[i].item;
408
409 if (want->flags & COMMON_KNOWN)
410 continue;
411 want = deref_tag(want, "a want line", 0);
412 if (!want || want->type != OBJ_COMMIT) {
413 /* no way to tell if this is reachable by
414 * looking at the ancestry chain alone, so
415 * leave a note to ourselves not to worry about
416 * this object anymore.
417 */
418 want_obj.objects[i].item->flags |= COMMON_KNOWN;
419 continue;
420 }
421 if (!reachable((struct commit *)want))
422 return 0;
423 }
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700424 return 1;
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700425}
426
427static int get_common_commits(void)
428{
429 static char line[1000];
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700430 unsigned char sha1[20];
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700431 char last_hex[41];
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700432
Johannes Schindelinf0243f22005-10-28 04:48:32 +0200433 save_commit_buffer = 0;
434
Brian Gianforcaroeeefa7c2009-09-01 01:35:10 -0400435 for (;;) {
Benjamin Kramerfd13b212009-03-07 21:02:26 +0100436 int len = packet_read_line(0, line, sizeof(line));
H. Peter Anvin960decc2005-10-19 14:27:01 -0700437 reset_timeout();
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700438
439 if (!len) {
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700440 if (have_obj.nr == 0 || multi_ack)
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200441 packet_write(1, "NAK\n");
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700442 if (stateless_rpc)
443 exit(0);
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700444 continue;
445 }
Benjamin Kramerfd13b212009-03-07 21:02:26 +0100446 strip(line, len);
Junio C Hamanocc44c762007-02-20 01:53:29 -0800447 if (!prefixcmp(line, "have ")) {
Junio C Hamano937a5152006-07-05 21:28:20 -0700448 switch (got_sha1(line+5, sha1)) {
449 case -1: /* they have what we do not */
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700450 if (multi_ack && ok_to_give_up()) {
451 const char *hex = sha1_to_hex(sha1);
452 if (multi_ack == 2)
453 packet_write(1, "ACK %s ready\n", hex);
454 else
455 packet_write(1, "ACK %s continue\n", hex);
456 }
Junio C Hamano937a5152006-07-05 21:28:20 -0700457 break;
458 default:
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700459 memcpy(last_hex, sha1_to_hex(sha1), 41);
460 if (multi_ack == 2)
461 packet_write(1, "ACK %s common\n", last_hex);
462 else if (multi_ack)
463 packet_write(1, "ACK %s continue\n", last_hex);
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700464 else if (have_obj.nr == 1)
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700465 packet_write(1, "ACK %s\n", last_hex);
Junio C Hamano937a5152006-07-05 21:28:20 -0700466 break;
Junio C Hamanoaf2d3aa2005-10-25 14:55:24 -0700467 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700468 continue;
469 }
470 if (!strcmp(line, "done")) {
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700471 if (have_obj.nr > 0) {
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200472 if (multi_ack)
Junio C Hamanoc04c4e52006-07-05 18:12:12 -0700473 packet_write(1, "ACK %s\n", last_hex);
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200474 return 0;
475 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700476 packet_write(1, "NAK\n");
477 return -1;
478 }
Junio C Hamano7e44c932008-08-31 09:39:19 -0700479 die("git upload-pack: expected SHA1 list, got '%s'", line);
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700480 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700481}
482
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700483static void receive_needs(void)
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700484{
Thiago Farina3cd47452010-08-28 23:04:17 -0300485 struct object_array shallows = OBJECT_ARRAY_INIT;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700486 static char line[1000];
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100487 int len, depth = 0;
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700488
Nick Edelenf0cea832009-06-10 01:50:18 +0200489 shallow_nr = 0;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500490 if (debug_fd)
Jim Meyering2b7ca832009-09-12 10:54:32 +0200491 write_str_in_full(debug_fd, "#S\n");
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700492 for (;;) {
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700493 struct object *o;
Junio C Hamano6ece0d32006-07-05 17:41:39 -0700494 unsigned char sha1_buf[20];
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700495 len = packet_read_line(0, line, sizeof(line));
H. Peter Anvin960decc2005-10-19 14:27:01 -0700496 reset_timeout();
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700497 if (!len)
Johannes Schindelined09aef2006-10-30 20:09:06 +0100498 break;
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500499 if (debug_fd)
500 write_in_full(debug_fd, line, len);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700501
Junio C Hamano599065a2007-02-20 01:54:00 -0800502 if (!prefixcmp(line, "shallow ")) {
Johannes Schindelined09aef2006-10-30 20:09:06 +0100503 unsigned char sha1[20];
504 struct object *object;
505 if (get_sha1(line + 8, sha1))
506 die("invalid shallow line: %s", line);
507 object = parse_object(sha1);
508 if (!object)
509 die("did not find object for %s", line);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100510 object->flags |= CLIENT_SHALLOW;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100511 add_object_array(object, NULL, &shallows);
512 continue;
513 }
Junio C Hamano599065a2007-02-20 01:54:00 -0800514 if (!prefixcmp(line, "deepen ")) {
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100515 char *end;
516 depth = strtol(line + 7, &end, 0);
517 if (end == line + 7 || depth <= 0)
518 die("Invalid deepen: %s", line);
519 continue;
520 }
Junio C Hamano599065a2007-02-20 01:54:00 -0800521 if (prefixcmp(line, "want ") ||
Junio C Hamano6ece0d32006-07-05 17:41:39 -0700522 get_sha1_hex(line+5, sha1_buf))
Junio C Hamano7e44c932008-08-31 09:39:19 -0700523 die("git upload-pack: protocol error, "
Junio C Hamanoe091eb92005-10-05 14:49:54 -0700524 "expected to get sha, not '%s'", line);
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700525 if (strstr(line+45, "multi_ack_detailed"))
526 multi_ack = 2;
527 else if (strstr(line+45, "multi_ack"))
Johannes Schindelin1bd8c8f2005-10-28 04:49:16 +0200528 multi_ack = 1;
Junio C Hamanob19696c2006-02-20 00:38:39 -0800529 if (strstr(line+45, "thin-pack"))
530 use_thin_pack = 1;
Nicolas Pitree4fe4b82006-09-26 11:27:39 -0400531 if (strstr(line+45, "ofs-delta"))
532 use_ofs_delta = 1;
Junio C Hamanod47f3db2006-09-10 16:27:08 -0700533 if (strstr(line+45, "side-band-64k"))
534 use_sideband = LARGE_PACKET_MAX;
535 else if (strstr(line+45, "side-band"))
536 use_sideband = DEFAULT_PACKET_MAX;
Johannes Schindelinb0e90892007-02-23 20:03:10 +0100537 if (strstr(line+45, "no-progress"))
538 no_progress = 1;
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500539 if (strstr(line+45, "include-tag"))
540 use_include_tag = 1;
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700541
542 /* We have sent all our refs already, and the other end
543 * should have chosen out of them; otherwise they are
544 * asking for nonsense.
545 *
546 * Hmph. We may later want to allow "want" line that
547 * asks for something like "master~10" (symbolic)...
548 * would it make sense? I don't know.
549 */
550 o = lookup_object(sha1_buf);
551 if (!o || !(o->flags & OUR_REF))
Elijah Newren9f9aa762010-07-31 14:11:46 -0600552 die("git upload-pack: not our ref %s",
553 sha1_to_hex(sha1_buf));
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700554 if (!(o->flags & WANTED)) {
555 o->flags |= WANTED;
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700556 add_object_array(o, NULL, &want_obj);
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700557 }
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700558 }
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500559 if (debug_fd)
Jim Meyering2b7ca832009-09-12 10:54:32 +0200560 write_str_in_full(debug_fd, "#E\n");
Johannes Sixt9462e3f2009-06-16 20:41:16 +0200561
562 if (!use_sideband && daemon_mode)
563 no_progress = 1;
564
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100565 if (depth == 0 && shallows.nr == 0)
566 return;
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100567 if (depth > 0) {
568 struct commit_list *result, *backup;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100569 int i;
570 backup = result = get_shallow_commits(&want_obj, depth,
571 SHALLOW, NOT_SHALLOW);
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100572 while (result) {
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100573 struct object *object = &result->item->object;
Alexandre Julliard1f2de762006-11-24 15:58:25 +0100574 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100575 packet_write(1, "shallow %s",
576 sha1_to_hex(object->sha1));
577 register_shallow(object->sha1);
Nick Edelenf0cea832009-06-10 01:50:18 +0200578 shallow_nr++;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100579 }
Johannes Schindelin016e6cc2006-10-30 20:09:29 +0100580 result = result->next;
581 }
582 free_commit_list(backup);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100583 for (i = 0; i < shallows.nr; i++) {
584 struct object *object = shallows.objects[i].item;
585 if (object->flags & NOT_SHALLOW) {
586 struct commit_list *parents;
587 packet_write(1, "unshallow %s",
588 sha1_to_hex(object->sha1));
589 object->flags &= ~CLIENT_SHALLOW;
590 /* make sure the real parents are parsed */
591 unregister_shallow(object->sha1);
Junio C Hamano176d45c2006-11-13 22:47:46 -0800592 object->parsed = 0;
Martin Koeglerdec38c82008-02-18 21:48:03 +0100593 if (parse_commit((struct commit *)object))
594 die("invalid commit");
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100595 parents = ((struct commit *)object)->parents;
596 while (parents) {
597 add_object_array(&parents->item->object,
598 NULL, &want_obj);
599 parents = parents->next;
600 }
Nicolas Pitre65230782009-09-03 19:08:33 -0400601 add_object_array(object, NULL, &extra_edge_obj);
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100602 }
603 /* make sure commit traversal conforms to client */
604 register_shallow(object->sha1);
605 }
606 packet_flush(1);
607 } else
608 if (shallows.nr > 0) {
609 int i;
610 for (i = 0; i < shallows.nr; i++)
611 register_shallow(shallows.objects[i].item->sha1);
612 }
Nick Edelenf0cea832009-06-10 01:50:18 +0200613
614 shallow_nr += shallows.nr;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100615 free(shallows.objects);
Linus Torvaldsfb9040c2005-07-04 15:29:17 -0700616}
617
Junio C Hamano8da19772006-09-20 22:02:01 -0700618static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700619{
Johannes Schindelined09aef2006-10-30 20:09:06 +0100620 static const char *capabilities = "multi_ack thin-pack side-band"
Shawn O. Pearce348e3902008-03-03 22:27:33 -0500621 " side-band-64k ofs-delta shallow no-progress"
Shawn O. Pearce78affc42009-10-30 17:47:25 -0700622 " include-tag multi_ack_detailed";
Junio C Hamanof6b42a82005-10-13 18:57:40 -0700623 struct object *o = parse_object(sha1);
624
Carl Worthb5b16992006-02-17 16:14:52 -0800625 if (!o)
Junio C Hamano7e44c932008-08-31 09:39:19 -0700626 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
Carl Worthb5b16992006-02-17 16:14:52 -0800627
Johannes Schindelin1f5881b2005-10-28 05:56:41 +0200628 if (capabilities)
629 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
630 0, capabilities);
631 else
632 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
633 capabilities = NULL;
Junio C Hamano565ebbf2005-10-24 18:59:18 -0700634 if (!(o->flags & OUR_REF)) {
635 o->flags |= OUR_REF;
636 nr_our_refs++;
637 }
Linus Torvalds19746322006-07-11 20:45:31 -0700638 if (o->type == OBJ_TAG) {
Junio C Hamano9534f402005-11-02 15:19:13 -0800639 o = deref_tag(o, refname, 0);
Martin Koegleraffeef12008-02-18 08:31:54 +0100640 if (o)
641 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
Junio C Hamanof6b42a82005-10-13 18:57:40 -0700642 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700643 return 0;
644}
645
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700646static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
647{
648 struct object *o = parse_object(sha1);
649 if (!o)
650 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
651 if (!(o->flags & OUR_REF)) {
652 o->flags |= OUR_REF;
653 nr_our_refs++;
654 }
655 return 0;
656}
657
David Rientjes59076eb2006-08-14 13:40:51 -0700658static void upload_pack(void)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700659{
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700660 if (advertise_refs || !stateless_rpc) {
661 reset_timeout();
662 head_ref(send_ref, NULL);
663 for_each_ref(send_ref, NULL);
664 packet_flush(1);
665 } else {
666 head_ref(mark_our_ref, NULL);
667 for_each_ref(mark_our_ref, NULL);
668 }
669 if (advertise_refs)
670 return;
671
Junio C Hamanob1e9fff2006-07-05 18:00:02 -0700672 receive_needs();
David Rientjes59076eb2006-08-14 13:40:51 -0700673 if (want_obj.nr) {
674 get_common_commits();
675 create_pack_file();
676 }
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700677}
678
679int main(int argc, char **argv)
680{
Andreas Ericsson8d630132005-11-17 20:37:14 +0100681 char *dir;
H. Peter Anvin960decc2005-10-19 14:27:01 -0700682 int i;
683 int strict = 0;
684
Steffen Prohaska2fb3f6d2009-01-18 13:00:12 +0100685 git_extract_argv0_path(argv[0]);
Christian Couderdae556b2009-01-23 10:07:46 +0100686 read_replace_refs = 0;
Steffen Prohaska2fb3f6d2009-01-18 13:00:12 +0100687
H. Peter Anvin960decc2005-10-19 14:27:01 -0700688 for (i = 1; i < argc; i++) {
689 char *arg = argv[i];
690
691 if (arg[0] != '-')
692 break;
Shawn O. Pearce42526b42009-10-30 17:47:33 -0700693 if (!strcmp(arg, "--advertise-refs")) {
694 advertise_refs = 1;
695 continue;
696 }
697 if (!strcmp(arg, "--stateless-rpc")) {
698 stateless_rpc = 1;
699 continue;
700 }
H. Peter Anvin960decc2005-10-19 14:27:01 -0700701 if (!strcmp(arg, "--strict")) {
702 strict = 1;
703 continue;
704 }
Junio C Hamanocc44c762007-02-20 01:53:29 -0800705 if (!prefixcmp(arg, "--timeout=")) {
H. Peter Anvin960decc2005-10-19 14:27:01 -0700706 timeout = atoi(arg+10);
Johannes Sixt9462e3f2009-06-16 20:41:16 +0200707 daemon_mode = 1;
H. Peter Anvin960decc2005-10-19 14:27:01 -0700708 continue;
709 }
710 if (!strcmp(arg, "--")) {
711 i++;
712 break;
713 }
714 }
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700715
H. Peter Anvin960decc2005-10-19 14:27:01 -0700716 if (i != argc-1)
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700717 usage(upload_pack_usage);
Johannes Sixt04b33052008-02-12 12:28:01 +0100718
Johannes Sixte1464ca2008-07-21 21:19:52 +0200719 setup_path();
Johannes Sixt04b33052008-02-12 12:28:01 +0100720
H. Peter Anvin960decc2005-10-19 14:27:01 -0700721 dir = argv[i];
Linus Torvalds113b9472005-07-08 16:22:22 -0700722
Andreas Ericsson8d630132005-11-17 20:37:14 +0100723 if (!enter_repo(dir, strict))
Jeff King05ac6b32009-03-04 03:32:29 -0500724 die("'%s' does not appear to be a git repository", dir);
Junio C Hamanoa0022ee2007-01-21 22:23:58 -0800725 if (is_repository_shallow())
726 die("attempt to fetch/clone from a shallow repository");
Shawn O. Pearce49aaddd2008-03-02 21:35:18 -0500727 if (getenv("GIT_DEBUG_SEND_PACK"))
728 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
Linus Torvaldsdef88e92005-07-04 13:26:53 -0700729 upload_pack();
730 return 0;
731}