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