send-pack: check ref->status before updating tracking refs
[git/jrn.git] / builtin-send-pack.c
blob3f86acb315165c495f121c520c5367583db42d11
1 #include "cache.h"
2 #include "commit.h"
3 #include "tag.h"
4 #include "refs.h"
5 #include "pkt-line.h"
6 #include "run-command.h"
7 #include "remote.h"
8 #include "send-pack.h"
10 static const char send_pack_usage[] =
11 "git-send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
12 " --all and explicit <ref> specification are mutually exclusive.";
14 static struct send_pack_args args = {
15 /* .receivepack = */ "git-receive-pack",
19 * Make a pack stream and spit it out into file descriptor fd
21 static int pack_objects(int fd, struct ref *refs)
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.
28 const char *argv[] = {
29 "pack-objects",
30 "--all-progress",
31 "--revs",
32 "--stdout",
33 NULL,
34 NULL,
36 struct child_process po;
38 if (args.use_thin_pack)
39 argv[4] = "--thin";
40 memset(&po, 0, sizeof(po));
41 po.argv = argv;
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));
49 * We feed the pack-objects we just spawned with revision
50 * parameters by writing to the pipe.
52 while (refs) {
53 char buf[42];
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';
60 if (!write_or_whine(po.in, buf, 42,
61 "send-pack: send refs"))
62 break;
64 if (!is_null_sha1(refs->new_sha1)) {
65 memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
66 buf[40] = '\n';
67 if (!write_or_whine(po.in, buf, 41,
68 "send-pack: send refs"))
69 break;
71 refs = refs->next;
74 if (finish_command(&po))
75 return error("pack-objects died with strange error");
76 return 0;
79 static void unmark_and_free(struct commit_list *list, unsigned int mark)
81 while (list) {
82 struct commit_list *temp = list;
83 temp->item->object.flags &= ~mark;
84 list = temp->next;
85 free(temp);
89 static int ref_newer(const unsigned char *new_sha1,
90 const unsigned char *old_sha1)
92 struct object *o;
93 struct commit *old, *new;
94 struct commit_list *list, *used;
95 int found = 0;
97 /* Both new and old must be commit-ish and new is descendant of
98 * old. Otherwise we require --force.
100 o = deref_tag(parse_object(old_sha1), NULL, 0);
101 if (!o || o->type != OBJ_COMMIT)
102 return 0;
103 old = (struct commit *) o;
105 o = deref_tag(parse_object(new_sha1), NULL, 0);
106 if (!o || o->type != OBJ_COMMIT)
107 return 0;
108 new = (struct commit *) o;
110 if (parse_commit(new) < 0)
111 return 0;
113 used = list = NULL;
114 commit_list_insert(new, &list);
115 while (list) {
116 new = pop_most_recent_commit(&list, 1);
117 commit_list_insert(new, &used);
118 if (new == old) {
119 found = 1;
120 break;
123 unmark_and_free(list, 1);
124 unmark_and_free(used, 1);
125 return found;
128 static struct ref *local_refs, **local_tail;
129 static struct ref *remote_refs, **remote_tail;
131 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
133 struct ref *ref;
134 int len = strlen(refname) + 1;
135 ref = xcalloc(1, sizeof(*ref) + len);
136 hashcpy(ref->new_sha1, sha1);
137 memcpy(ref->name, refname, len);
138 *local_tail = ref;
139 local_tail = &ref->next;
140 return 0;
143 static void get_local_heads(void)
145 local_tail = &local_refs;
146 for_each_ref(one_local_ref, NULL);
149 static int receive_status(int in)
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;
158 if (memcmp(line, "unpack ok\n", 10)) {
159 fputs(line, stderr);
160 ret = -1;
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;
172 if (!memcmp(line, "ok", 2))
173 continue;
174 fputs(line, stderr);
175 ret = -1;
177 return ret;
180 static void update_tracking_ref(struct remote *remote, struct ref *ref)
182 struct refspec rs;
184 if (ref->status != REF_STATUS_OK)
185 return;
187 rs.src = ref->name;
188 rs.dst = NULL;
190 if (!remote_find_tracking(remote, &rs)) {
191 if (args.verbose)
192 fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
193 if (ref->deletion) {
194 if (delete_ref(rs.dst, NULL))
195 error("Failed to delete");
196 } else
197 update_ref("update by push", rs.dst,
198 ref->new_sha1, NULL, 0, 0);
199 free(rs.dst);
203 static const char *prettify_ref(const struct ref *ref)
205 const char *name = ref->name;
206 return name + (
207 !prefixcmp(name, "refs/heads/") ? 11 :
208 !prefixcmp(name, "refs/tags/") ? 10 :
209 !prefixcmp(name, "refs/remotes/") ? 13 :
213 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
215 static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
217 fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
218 if (from)
219 fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
220 else
221 fputs(prettify_ref(to), stderr);
222 if (msg) {
223 fputs(" (", stderr);
224 fputs(msg, stderr);
225 fputc(')', stderr);
227 fputc('\n', stderr);
230 static const char *status_abbrev(unsigned char sha1[20])
232 const char *abbrev;
233 abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
234 return abbrev ? abbrev : sha1_to_hex(sha1);
237 static void print_ok_ref_status(struct ref *ref)
239 if (ref->deletion)
240 print_ref_status('-', "[deleted]", ref, NULL, NULL);
241 else if (is_null_sha1(ref->old_sha1))
242 print_ref_status('*',
243 (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
244 "[new branch]"),
245 ref, ref->peer_ref, NULL);
246 else {
247 char quickref[84];
248 char type;
249 const char *msg;
251 strcpy(quickref, status_abbrev(ref->old_sha1));
252 if (ref->nonfastforward) {
253 strcat(quickref, "...");
254 type = '+';
255 msg = "forced update";
256 } else {
257 strcat(quickref, "..");
258 type = ' ';
259 msg = NULL;
261 strcat(quickref, status_abbrev(ref->new_sha1));
263 print_ref_status(type, quickref, ref, ref->peer_ref, msg);
267 static void print_push_status(const char *dest, struct ref *refs)
269 struct ref *ref;
270 int shown_dest = 0;
272 for (ref = refs; ref; ref = ref->next) {
273 if (!ref->status)
274 continue;
275 if (ref->status == REF_STATUS_UPTODATE && !args.verbose)
276 continue;
278 if (!shown_dest) {
279 fprintf(stderr, "To %s\n", dest);
280 shown_dest = 1;
283 switch(ref->status) {
284 case REF_STATUS_NONE:
285 print_ref_status('X', "[no match]", ref, NULL, NULL);
286 break;
287 case REF_STATUS_REJECT_NODELETE:
288 print_ref_status('!', "[rejected]", ref, NULL,
289 "remote does not support deleting refs");
290 break;
291 case REF_STATUS_UPTODATE:
292 print_ref_status('=', "[up to date]", ref,
293 ref->peer_ref, NULL);
294 break;
295 case REF_STATUS_REJECT_NONFASTFORWARD:
296 print_ref_status('!', "[rejected]", ref, ref->peer_ref,
297 "non-fast forward");
298 break;
299 case REF_STATUS_OK:
300 print_ok_ref_status(ref);
301 break;
306 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
308 struct ref *ref;
309 int new_refs;
310 int ask_for_status_report = 0;
311 int allow_deleting_refs = 0;
312 int expect_status_report = 0;
313 int flags = MATCH_REFS_NONE;
315 if (args.send_all)
316 flags |= MATCH_REFS_ALL;
317 if (args.send_mirror)
318 flags |= MATCH_REFS_MIRROR;
320 /* No funny business with the matcher */
321 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
322 get_local_heads();
324 /* Does the other end support the reporting? */
325 if (server_supports("report-status"))
326 ask_for_status_report = 1;
327 if (server_supports("delete-refs"))
328 allow_deleting_refs = 1;
330 /* match them up */
331 if (!remote_tail)
332 remote_tail = &remote_refs;
333 if (match_refs(local_refs, remote_refs, &remote_tail,
334 nr_refspec, refspec, flags))
335 return -1;
337 if (!remote_refs) {
338 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
339 "Perhaps you should specify a branch such as 'master'.\n");
340 return 0;
344 * Finally, tell the other end!
346 new_refs = 0;
347 for (ref = remote_refs; ref; ref = ref->next) {
348 const unsigned char *new_sha1;
350 if (!ref->peer_ref) {
351 if (!args.send_mirror)
352 continue;
353 new_sha1 = null_sha1;
355 else
356 new_sha1 = ref->peer_ref->new_sha1;
359 ref->deletion = is_null_sha1(new_sha1);
360 if (ref->deletion && !allow_deleting_refs) {
361 ref->status = REF_STATUS_REJECT_NODELETE;
362 continue;
364 if (!ref->deletion &&
365 !hashcmp(ref->old_sha1, new_sha1)) {
366 ref->status = REF_STATUS_UPTODATE;
367 continue;
370 /* This part determines what can overwrite what.
371 * The rules are:
373 * (0) you can always use --force or +A:B notation to
374 * selectively force individual ref pairs.
376 * (1) if the old thing does not exist, it is OK.
378 * (2) if you do not have the old thing, you are not allowed
379 * to overwrite it; you would not know what you are losing
380 * otherwise.
382 * (3) if both new and old are commit-ish, and new is a
383 * descendant of old, it is OK.
385 * (4) regardless of all of the above, removing :B is
386 * always allowed.
389 ref->nonfastforward =
390 !ref->deletion &&
391 !is_null_sha1(ref->old_sha1) &&
392 (!has_sha1_file(ref->old_sha1)
393 || !ref_newer(new_sha1, ref->old_sha1));
395 if (ref->nonfastforward && !ref->force && !args.force_update) {
396 ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
397 continue;
400 hashcpy(ref->new_sha1, new_sha1);
401 if (!ref->deletion)
402 new_refs++;
403 ref->status = REF_STATUS_OK;
405 if (!args.dry_run) {
406 char *old_hex = sha1_to_hex(ref->old_sha1);
407 char *new_hex = sha1_to_hex(ref->new_sha1);
409 if (ask_for_status_report) {
410 packet_write(out, "%s %s %s%c%s",
411 old_hex, new_hex, ref->name, 0,
412 "report-status");
413 ask_for_status_report = 0;
414 expect_status_report = 1;
416 else
417 packet_write(out, "%s %s %s",
418 old_hex, new_hex, ref->name);
422 packet_flush(out);
423 if (new_refs && !args.dry_run) {
424 if (pack_objects(out, remote_refs) < 0) {
425 close(out);
426 return -1;
429 close(out);
431 print_push_status(dest, remote_refs);
433 if (expect_status_report) {
434 if (receive_status(in))
435 return -1;
438 if (!args.dry_run && remote) {
439 for (ref = remote_refs; ref; ref = ref->next)
440 update_tracking_ref(remote, ref);
443 if (!new_refs)
444 fprintf(stderr, "Everything up-to-date\n");
445 for (ref = remote_refs; ref; ref = ref->next) {
446 switch (ref->status) {
447 case REF_STATUS_NONE:
448 case REF_STATUS_UPTODATE:
449 case REF_STATUS_OK:
450 break;
451 default:
452 return -1;
455 return 0;
458 static void verify_remote_names(int nr_heads, const char **heads)
460 int i;
462 for (i = 0; i < nr_heads; i++) {
463 const char *remote = strchr(heads[i], ':');
465 remote = remote ? (remote + 1) : heads[i];
466 switch (check_ref_format(remote)) {
467 case 0: /* ok */
468 case -2: /* ok but a single level -- that is fine for
469 * a match pattern.
471 case -3: /* ok but ends with a pattern-match character */
472 continue;
474 die("remote part of refspec is not a valid name in %s",
475 heads[i]);
479 int cmd_send_pack(int argc, const char **argv, const char *prefix)
481 int i, nr_heads = 0;
482 const char **heads = NULL;
483 const char *remote_name = NULL;
484 struct remote *remote = NULL;
485 const char *dest = NULL;
487 argv++;
488 for (i = 1; i < argc; i++, argv++) {
489 const char *arg = *argv;
491 if (*arg == '-') {
492 if (!prefixcmp(arg, "--receive-pack=")) {
493 args.receivepack = arg + 15;
494 continue;
496 if (!prefixcmp(arg, "--exec=")) {
497 args.receivepack = arg + 7;
498 continue;
500 if (!prefixcmp(arg, "--remote=")) {
501 remote_name = arg + 9;
502 continue;
504 if (!strcmp(arg, "--all")) {
505 args.send_all = 1;
506 continue;
508 if (!strcmp(arg, "--dry-run")) {
509 args.dry_run = 1;
510 continue;
512 if (!strcmp(arg, "--mirror")) {
513 args.send_mirror = 1;
514 continue;
516 if (!strcmp(arg, "--force")) {
517 args.force_update = 1;
518 continue;
520 if (!strcmp(arg, "--verbose")) {
521 args.verbose = 1;
522 continue;
524 if (!strcmp(arg, "--thin")) {
525 args.use_thin_pack = 1;
526 continue;
528 usage(send_pack_usage);
530 if (!dest) {
531 dest = arg;
532 continue;
534 heads = (const char **) argv;
535 nr_heads = argc - i;
536 break;
538 if (!dest)
539 usage(send_pack_usage);
541 * --all and --mirror are incompatible; neither makes sense
542 * with any refspecs.
544 if ((heads && (args.send_all || args.send_mirror)) ||
545 (args.send_all && args.send_mirror))
546 usage(send_pack_usage);
548 if (remote_name) {
549 remote = remote_get(remote_name);
550 if (!remote_has_url(remote, dest)) {
551 die("Destination %s is not a uri for %s",
552 dest, remote_name);
556 return send_pack(&args, dest, remote, nr_heads, heads);
559 int send_pack(struct send_pack_args *my_args,
560 const char *dest, struct remote *remote,
561 int nr_heads, const char **heads)
563 int fd[2], ret;
564 struct child_process *conn;
566 memcpy(&args, my_args, sizeof(args));
568 verify_remote_names(nr_heads, heads);
570 conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
571 ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
572 close(fd[0]);
573 close(fd[1]);
574 ret |= finish_connect(conn);
575 return !!ret;