Code

more terse push output
[git.git] / builtin-send-pack.c
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] [--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",
16 };
18 /*
19  * Make a pack stream and spit it out into file descriptor fd
20  */
21 static int pack_objects(int fd, struct ref *refs)
22 {
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          */
28         const char *argv[] = {
29                 "pack-objects",
30                 "--all-progress",
31                 "--revs",
32                 "--stdout",
33                 NULL,
34                 NULL,
35         };
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));
48         /*
49          * We feed the pack-objects we just spawned with revision
50          * parameters by writing to the pipe.
51          */
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;
63                 }
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;
70                 }
71                 refs = refs->next;
72         }
74         if (finish_command(&po))
75                 return error("pack-objects died with strange error");
76         return 0;
77 }
79 static 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 }
89 static int ref_newer(const unsigned char *new_sha1,
90                      const unsigned char *old_sha1)
91 {
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.
99          */
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;
121                 }
122         }
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;
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;
180 static void update_tracking_ref(struct remote *remote, struct ref *ref)
182         struct refspec rs;
183         int will_delete_ref;
185         rs.src = ref->name;
186         rs.dst = NULL;
188         if (!ref->peer_ref)
189                 return;
191         will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
193         if (!will_delete_ref &&
194                         !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1))
195                 return;
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         }
209 static const char *prettify_ref(const char *name)
211         return name + (
212                 !prefixcmp(name, "refs/heads/") ? 11 :
213                 !prefixcmp(name, "refs/tags/") ? 10 :
214                 !prefixcmp(name, "refs/remotes/") ? 13 :
215                 0);
218 #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
220 static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
222         struct ref *ref;
223         int new_refs;
224         int ret = 0;
225         int ask_for_status_report = 0;
226         int allow_deleting_refs = 0;
227         int expect_status_report = 0;
228         int shown_dest = 0;
230         /* No funny business with the matcher */
231         remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
232         get_local_heads();
234         /* Does the other end support the reporting? */
235         if (server_supports("report-status"))
236                 ask_for_status_report = 1;
237         if (server_supports("delete-refs"))
238                 allow_deleting_refs = 1;
240         /* match them up */
241         if (!remote_tail)
242                 remote_tail = &remote_refs;
243         if (match_refs(local_refs, remote_refs, &remote_tail,
244                        nr_refspec, refspec, args.send_all))
245                 return -1;
247         if (!remote_refs) {
248                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
249                         "Perhaps you should specify a branch such as 'master'.\n");
250                 return 0;
251         }
253         /*
254          * Finally, tell the other end!
255          */
256         new_refs = 0;
257         for (ref = remote_refs; ref; ref = ref->next) {
258                 char old_hex[60], *new_hex;
259                 int will_delete_ref;
260                 const char *pretty_ref;
261                 const char *pretty_peer;
263                 if (!ref->peer_ref)
264                         continue;
266                 if (!shown_dest) {
267                         fprintf(stderr, "To %s\n", dest);
268                         shown_dest = 1;
269                 }
271                 pretty_ref = prettify_ref(ref->name);
272                 pretty_peer = prettify_ref(ref->peer_ref->name);
274                 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
275                 if (will_delete_ref && !allow_deleting_refs) {
276                         fprintf(stderr, " ! %-*s %s (remote does not support deleting refs)\n",
277                                         SUMMARY_WIDTH, "[rejected]", pretty_ref);
278                         ret = -2;
279                         continue;
280                 }
281                 if (!will_delete_ref &&
282                     !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
283                         if (args.verbose)
284                                 fprintf(stderr, " = %-*s %s -> %s\n",
285                                         SUMMARY_WIDTH, "[up to date]",
286                                         pretty_peer, pretty_ref);
287                         continue;
288                 }
290                 /* This part determines what can overwrite what.
291                  * The rules are:
292                  *
293                  * (0) you can always use --force or +A:B notation to
294                  *     selectively force individual ref pairs.
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.
304                  *
305                  * (4) regardless of all of the above, removing :B is
306                  *     always allowed.
307                  */
309                 if (!args.force_update &&
310                     !will_delete_ref &&
311                     !is_null_sha1(ref->old_sha1) &&
312                     !ref->force) {
313                         if (!has_sha1_file(ref->old_sha1) ||
314                             !ref_newer(ref->peer_ref->new_sha1,
315                                        ref->old_sha1)) {
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                                  */
323                                 fprintf(stderr, " ! %-*s %s -> %s (non-fast forward)\n",
324                                                 SUMMARY_WIDTH, "[rejected]",
325                                                 pretty_peer, pretty_ref);
326                                 ret = -2;
327                                 continue;
328                         }
329                 }
330                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
331                 if (!will_delete_ref)
332                         new_refs++;
333                 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
334                 new_hex = sha1_to_hex(ref->new_sha1);
336                 if (!args.dry_run) {
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);
347                 }
348                 if (will_delete_ref)
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;
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                 }
363                 else {
364                         char quickref[83];
365                         char type = ' ';
366                         const char *msg = "";
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));
378                         fprintf(stderr, " %c %-*s %s -> %s%s\n",
379                                 type,
380                                 SUMMARY_WIDTH, quickref,
381                                 pretty_peer, pretty_ref,
382                                 msg);
383                 }
384         }
386         packet_flush(out);
387         if (new_refs && !args.dry_run)
388                 ret = pack_objects(out, remote_refs);
389         close(out);
391         if (expect_status_report) {
392                 if (receive_status(in))
393                         ret = -4;
394         }
396         if (!args.dry_run && remote && ret == 0) {
397                 for (ref = remote_refs; ref; ref = ref->next)
398                         update_tracking_ref(remote, ref);
399         }
401         if (!new_refs && ret == 0)
402                 fprintf(stderr, "Everything up-to-date\n");
403         return ret;
406 static void verify_remote_names(int nr_heads, const char **heads)
408         int i;
410         for (i = 0; i < nr_heads; i++) {
411                 const char *remote = strchr(heads[i], ':');
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                           */
419                 case -3: /* ok but ends with a pattern-match character */
420                         continue;
421                 }
422                 die("remote part of refspec is not a valid name in %s",
423                     heads[i]);
424         }
427 int cmd_send_pack(int argc, const char **argv, const char *prefix)
429         int i, nr_heads = 0;
430         const char **heads = NULL;
431         const char *remote_name = NULL;
432         struct remote *remote = NULL;
433         const char *dest = NULL;
435         argv++;
436         for (i = 1; i < argc; i++, argv++) {
437                 const char *arg = *argv;
439                 if (*arg == '-') {
440                         if (!prefixcmp(arg, "--receive-pack=")) {
441                                 args.receivepack = arg + 15;
442                                 continue;
443                         }
444                         if (!prefixcmp(arg, "--exec=")) {
445                                 args.receivepack = arg + 7;
446                                 continue;
447                         }
448                         if (!prefixcmp(arg, "--remote=")) {
449                                 remote_name = arg + 9;
450                                 continue;
451                         }
452                         if (!strcmp(arg, "--all")) {
453                                 args.send_all = 1;
454                                 continue;
455                         }
456                         if (!strcmp(arg, "--dry-run")) {
457                                 args.dry_run = 1;
458                                 continue;
459                         }
460                         if (!strcmp(arg, "--force")) {
461                                 args.force_update = 1;
462                                 continue;
463                         }
464                         if (!strcmp(arg, "--verbose")) {
465                                 args.verbose = 1;
466                                 continue;
467                         }
468                         if (!strcmp(arg, "--thin")) {
469                                 args.use_thin_pack = 1;
470                                 continue;
471                         }
472                         usage(send_pack_usage);
473                 }
474                 if (!dest) {
475                         dest = arg;
476                         continue;
477                 }
478                 heads = (const char **) argv;
479                 nr_heads = argc - i;
480                 break;
481         }
482         if (!dest)
483                 usage(send_pack_usage);
484         if (heads && args.send_all)
485                 usage(send_pack_usage);
487         if (remote_name) {
488                 remote = remote_get(remote_name);
489                 if (!remote_has_url(remote, dest)) {
490                         die("Destination %s is not a uri for %s",
491                             dest, remote_name);
492                 }
493         }
495         return send_pack(&args, dest, remote, nr_heads, heads);
498 int send_pack(struct send_pack_args *my_args,
499               const char *dest, struct remote *remote,
500               int nr_heads, const char **heads)
502         int fd[2], ret;
503         struct child_process *conn;
505         memcpy(&args, my_args, sizeof(args));
507         verify_remote_names(nr_heads, heads);
509         conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
510         ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
511         close(fd[0]);
512         close(fd[1]);
513         ret |= finish_connect(conn);
514         return !!ret;