Change git_connect() to return a struct child_process instead of a pid_t.
[git/git.git] / send-pack.c
CommitLineData
61221472 1#include "cache.h"
2a9c3fe8 2#include "commit.h"
37fde874 3#include "tag.h"
584c6cc9 4#include "refs.h"
f3a3214e 5#include "pkt-line.h"
38b1c662 6#include "run-command.h"
6b62816c 7#include "remote.h"
61221472 8
2a245013 9static const char send_pack_usage[] =
a63103ae 10"git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
18bd8821 11" --all and explicit <ref> specification are mutually exclusive.";
d23842fd 12static const char *receivepack = "git-receive-pack";
96f1e58f
DR
13static int verbose;
14static int send_all;
15static int force_update;
16static int use_thin_pack;
a63103ae 17static int dry_run;
61221472 18
c727fe2a 19/*
0ae5f98c 20 * Make a pack stream and spit it out into file descriptor fd
c727fe2a 21 */
0ae5f98c 22static int pack_objects(int fd, struct ref *refs)
c727fe2a 23{
38b1c662
SP
24 /*
25 * The child becomes pack-objects --revs; we feed
26 * the revision parameters to it via its stdin and
27 * let its stdout go back to the other end.
28 */
29 const char *args[] = {
30 "pack-objects",
31 "--all-progress",
32 "--revs",
33 "--stdout",
34 NULL,
35 NULL,
36 };
37 struct child_process po;
c727fe2a 38
38b1c662
SP
39 if (use_thin_pack)
40 args[4] = "--thin";
41 memset(&po, 0, sizeof(po));
42 po.argv = args;
43 po.in = -1;
44 po.out = fd;
45 po.git_cmd = 1;
46 if (start_command(&po))
47 die("git-pack-objects failed (%s)", strerror(errno));
c727fe2a 48
0ae5f98c
JH
49 /*
50 * We feed the pack-objects we just spawned with revision
51 * parameters by writing to the pipe.
c727fe2a 52 */
c727fe2a
AW
53 while (refs) {
54 char buf[42];
55
56 if (!is_null_sha1(refs->old_sha1) &&
57 has_sha1_file(refs->old_sha1)) {
58 memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
59 buf[0] = '^';
60 buf[41] = '\n';
38b1c662 61 if (!write_or_whine(po.in, buf, 42,
825cee7b
AW
62 "send-pack: send refs"))
63 break;
c727fe2a
AW
64 }
65 if (!is_null_sha1(refs->new_sha1)) {
66 memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
67 buf[40] = '\n';
38b1c662 68 if (!write_or_whine(po.in, buf, 41,
825cee7b
AW
69 "send-pack: send refs"))
70 break;
c727fe2a
AW
71 }
72 refs = refs->next;
73 }
c727fe2a 74
38b1c662
SP
75 if (finish_command(&po))
76 return error("pack-objects died with strange error");
77 return 0;
94fdb7aa 78}
e4b5c7ff 79
51b0fca0
JH
80static void unmark_and_free(struct commit_list *list, unsigned int mark)
81{
82 while (list) {
83 struct commit_list *temp = list;
84 temp->item->object.flags &= ~mark;
85 list = temp->next;
86 free(temp);
87 }
88}
89
37fde874
JH
90static int ref_newer(const unsigned char *new_sha1,
91 const unsigned char *old_sha1)
584c6cc9 92{
37fde874
JH
93 struct object *o;
94 struct commit *old, *new;
51b0fca0
JH
95 struct commit_list *list, *used;
96 int found = 0;
2a9c3fe8 97
37fde874
JH
98 /* Both new and old must be commit-ish and new is descendant of
99 * old. Otherwise we require --force.
100 */
9534f40b 101 o = deref_tag(parse_object(old_sha1), NULL, 0);
1974632c 102 if (!o || o->type != OBJ_COMMIT)
584c6cc9 103 return 0;
37fde874
JH
104 old = (struct commit *) o;
105
9534f40b 106 o = deref_tag(parse_object(new_sha1), NULL, 0);
1974632c 107 if (!o || o->type != OBJ_COMMIT)
2a9c3fe8 108 return 0;
37fde874
JH
109 new = (struct commit *) o;
110
2a9c3fe8
LT
111 if (parse_commit(new) < 0)
112 return 0;
51b0fca0
JH
113
114 used = list = NULL;
2a9c3fe8 115 commit_list_insert(new, &list);
bdf25142
LT
116 while (list) {
117 new = pop_most_recent_commit(&list, 1);
51b0fca0
JH
118 commit_list_insert(new, &used);
119 if (new == old) {
120 found = 1;
121 break;
122 }
2a9c3fe8 123 }
51b0fca0
JH
124 unmark_and_free(list, 1);
125 unmark_and_free(used, 1);
126 return found;
584c6cc9
LT
127}
128
f88395ac
JH
129static struct ref *local_refs, **local_tail;
130static struct ref *remote_refs, **remote_tail;
584c6cc9 131
8da19775 132static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
584c6cc9
LT
133{
134 struct ref *ref;
f88395ac
JH
135 int len = strlen(refname) + 1;
136 ref = xcalloc(1, sizeof(*ref) + len);
e702496e 137 hashcpy(ref->new_sha1, sha1);
584c6cc9 138 memcpy(ref->name, refname, len);
f88395ac
JH
139 *local_tail = ref;
140 local_tail = &ref->next;
584c6cc9
LT
141 return 0;
142}
143
f88395ac
JH
144static void get_local_heads(void)
145{
146 local_tail = &local_refs;
cb5d709f 147 for_each_ref(one_local_ref, NULL);
f88395ac
JH
148}
149
cfee10a7
JH
150static int receive_status(int in)
151{
152 char line[1000];
153 int ret = 0;
154 int len = packet_read_line(in, line, sizeof(line));
155 if (len < 10 || memcmp(line, "unpack ", 7)) {
156 fprintf(stderr, "did not receive status back\n");
157 return -1;
158 }
159 if (memcmp(line, "unpack ok\n", 10)) {
160 fputs(line, stderr);
161 ret = -1;
162 }
163 while (1) {
164 len = packet_read_line(in, line, sizeof(line));
165 if (!len)
166 break;
167 if (len < 3 ||
168 (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) {
169 fprintf(stderr, "protocol error: %s\n", line);
170 ret = -1;
171 break;
172 }
173 if (!memcmp(line, "ok", 2))
174 continue;
175 fputs(line, stderr);
176 ret = -1;
177 }
178 return ret;
179}
180
b516968f 181static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
61221472 182{
7f8e9828 183 struct ref *ref;
584c6cc9 184 int new_refs;
ed24928e 185 int ret = 0;
cfee10a7 186 int ask_for_status_report = 0;
d4f694ba 187 int allow_deleting_refs = 0;
cfee10a7 188 int expect_status_report = 0;
7f8e9828 189
f88395ac 190 /* No funny business with the matcher */
2718ff09 191 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
f88395ac 192 get_local_heads();
584c6cc9 193
cfee10a7
JH
194 /* Does the other end support the reporting? */
195 if (server_supports("report-status"))
196 ask_for_status_report = 1;
d4f694ba
JH
197 if (server_supports("delete-refs"))
198 allow_deleting_refs = 1;
cfee10a7 199
f88395ac
JH
200 /* match them up */
201 if (!remote_tail)
202 remote_tail = &remote_refs;
203 if (match_refs(local_refs, remote_refs, &remote_tail,
204 nr_refspec, refspec, send_all))
205 return -1;
4c353e89
DB
206
207 if (!remote_refs) {
208 fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
209 return 0;
210 }
211
584c6cc9 212 /*
f88395ac 213 * Finally, tell the other end!
584c6cc9 214 */
f88395ac
JH
215 new_refs = 0;
216 for (ref = remote_refs; ref; ref = ref->next) {
217 char old_hex[60], *new_hex;
b516968f 218 int will_delete_ref;
d4f694ba 219
f88395ac 220 if (!ref->peer_ref)
7f8e9828 221 continue;
d4f694ba 222
b516968f
DB
223
224 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
225 if (will_delete_ref && !allow_deleting_refs) {
d4f694ba
JH
226 error("remote does not support deleting refs");
227 ret = -2;
228 continue;
229 }
b516968f 230 if (!will_delete_ref &&
d4f694ba 231 !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
41f93a2c
LT
232 if (verbose)
233 fprintf(stderr, "'%s': up-to-date\n", ref->name);
37fde874
JH
234 continue;
235 }
236
237 /* This part determines what can overwrite what.
238 * The rules are:
239 *
ff27adf3
JH
240 * (0) you can always use --force or +A:B notation to
241 * selectively force individual ref pairs.
37fde874
JH
242 *
243 * (1) if the old thing does not exist, it is OK.
244 *
245 * (2) if you do not have the old thing, you are not allowed
246 * to overwrite it; you would not know what you are losing
247 * otherwise.
248 *
249 * (3) if both new and old are commit-ish, and new is a
250 * descendant of old, it is OK.
d4f694ba
JH
251 *
252 * (4) regardless of all of the above, removing :B is
253 * always allowed.
37fde874
JH
254 */
255
ff27adf3 256 if (!force_update &&
b516968f 257 !will_delete_ref &&
4b4ee90e 258 !is_null_sha1(ref->old_sha1) &&
ff27adf3 259 !ref->force) {
69310a34
JH
260 if (!has_sha1_file(ref->old_sha1) ||
261 !ref_newer(ref->peer_ref->new_sha1,
f88395ac 262 ref->old_sha1)) {
69310a34
JH
263 /* We do not have the remote ref, or
264 * we know that the remote ref is not
265 * an ancestor of what we are trying to
266 * push. Either way this can be losing
267 * commits at the remote end and likely
268 * we were not up to date to begin with.
269 */
270 error("remote '%s' is not a strict "
271 "subset of local ref '%s'. "
272 "maybe you are not up-to-date and "
273 "need to pull first?",
274 ref->name,
f88395ac 275 ref->peer_ref->name);
ed24928e 276 ret = -2;
f88395ac
JH
277 continue;
278 }
e4b5c7ff 279 }
e702496e 280 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
b516968f 281 if (!will_delete_ref)
d4f694ba 282 new_refs++;
7f8e9828
LT
283 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
284 new_hex = sha1_to_hex(ref->new_sha1);
cfee10a7 285
a63103ae
BE
286 if (!dry_run) {
287 if (ask_for_status_report) {
288 packet_write(out, "%s %s %s%c%s",
289 old_hex, new_hex, ref->name, 0,
290 "report-status");
291 ask_for_status_report = 0;
292 expect_status_report = 1;
293 }
294 else
295 packet_write(out, "%s %s %s",
296 old_hex, new_hex, ref->name);
cfee10a7 297 }
b516968f 298 if (will_delete_ref)
d4f694ba
JH
299 fprintf(stderr, "deleting '%s'\n", ref->name);
300 else {
301 fprintf(stderr, "updating '%s'", ref->name);
302 if (strcmp(ref->name, ref->peer_ref->name))
303 fprintf(stderr, " using '%s'",
304 ref->peer_ref->name);
305 fprintf(stderr, "\n from %s\n to %s\n",
306 old_hex, new_hex);
307 }
a63103ae 308 if (remote && !dry_run) {
b516968f
DB
309 struct refspec rs;
310 rs.src = ref->name;
b42f6927
JS
311 rs.dst = NULL;
312 if (!remote_find_tracking(remote, &rs)) {
b516968f
DB
313 fprintf(stderr, " Also local %s\n", rs.dst);
314 if (will_delete_ref) {
315 if (delete_ref(rs.dst, NULL)) {
316 error("Failed to delete");
317 }
3d9f037c
CR
318 } else
319 update_ref("update by push", rs.dst,
320 ref->new_sha1, NULL, 0, 0);
b516968f
DB
321 free(rs.dst);
322 }
323 }
61221472 324 }
f88395ac 325
f3a3214e 326 packet_flush(out);
a63103ae 327 if (new_refs && !dry_run)
0ae5f98c 328 ret = pack_objects(out, remote_refs);
61221472 329 close(out);
cfee10a7
JH
330
331 if (expect_status_report) {
332 if (receive_status(in))
333 ret = -4;
334 }
335
336 if (!new_refs && ret == 0)
337 fprintf(stderr, "Everything up-to-date\n");
ed24928e 338 return ret;
61221472
LT
339}
340
37adac76
JH
341static void verify_remote_names(int nr_heads, char **heads)
342{
343 int i;
344
345 for (i = 0; i < nr_heads; i++) {
346 const char *remote = strchr(heads[i], ':');
347
348 remote = remote ? (remote + 1) : heads[i];
349 switch (check_ref_format(remote)) {
350 case 0: /* ok */
351 case -2: /* ok but a single level -- that is fine for
352 * a match pattern.
353 */
8558fd9e 354 case -3: /* ok but ends with a pattern-match character */
37adac76
JH
355 continue;
356 }
357 die("remote part of refspec is not a valid name in %s",
358 heads[i]);
359 }
360}
f88395ac 361
61221472
LT
362int main(int argc, char **argv)
363{
364 int i, nr_heads = 0;
365 char *dest = NULL;
366 char **heads = NULL;
7f8e9828 367 int fd[2], ret;
98158e9c 368 struct child_process *conn;
b516968f
DB
369 char *remote_name = NULL;
370 struct remote *remote = NULL;
61221472 371
5a327713 372 setup_git_directory();
84a9b58c
JH
373 git_config(git_default_config);
374
61221472 375 argv++;
d089391c
LT
376 for (i = 1; i < argc; i++, argv++) {
377 char *arg = *argv;
61221472
LT
378
379 if (*arg == '-') {
cc44c765 380 if (!prefixcmp(arg, "--receive-pack=")) {
d23842fd
UKK
381 receivepack = arg + 15;
382 continue;
383 }
cc44c765 384 if (!prefixcmp(arg, "--exec=")) {
d23842fd 385 receivepack = arg + 7;
61221472
LT
386 continue;
387 }
b516968f
DB
388 if (!prefixcmp(arg, "--remote=")) {
389 remote_name = arg + 9;
390 continue;
391 }
d089391c
LT
392 if (!strcmp(arg, "--all")) {
393 send_all = 1;
394 continue;
395 }
a63103ae
BE
396 if (!strcmp(arg, "--dry-run")) {
397 dry_run = 1;
398 continue;
399 }
2a9c3fe8
LT
400 if (!strcmp(arg, "--force")) {
401 force_update = 1;
402 continue;
403 }
41f93a2c
LT
404 if (!strcmp(arg, "--verbose")) {
405 verbose = 1;
406 continue;
407 }
2245be3e
JH
408 if (!strcmp(arg, "--thin")) {
409 use_thin_pack = 1;
410 continue;
411 }
61221472
LT
412 usage(send_pack_usage);
413 }
d089391c
LT
414 if (!dest) {
415 dest = arg;
416 continue;
417 }
61221472 418 heads = argv;
d089391c 419 nr_heads = argc - i;
61221472
LT
420 break;
421 }
422 if (!dest)
423 usage(send_pack_usage);
0bc3cdfc
JH
424 if (heads && send_all)
425 usage(send_pack_usage);
37adac76
JH
426 verify_remote_names(nr_heads, heads);
427
b516968f
DB
428 if (remote_name) {
429 remote = remote_get(remote_name);
28b91f8a 430 if (!remote_has_url(remote, dest)) {
b516968f
DB
431 die("Destination %s is not a uri for %s",
432 dest, remote_name);
433 }
434 }
435
98158e9c 436 conn = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
b516968f 437 ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
7f8e9828
LT
438 close(fd[0]);
439 close(fd[1]);
98158e9c 440 ret |= finish_connect(conn);
8a5dbef8 441 return !!ret;
61221472 442}