]> asedeno.scripts.mit.edu Git - git.git/blob - builtin-send-pack.c
Reteach builtin-ls-remote to understand remotes
[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"
9
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.";
13
14 static struct send_pack_args args = {
15         /* .receivepack = */ "git-receive-pack",
16 };
17
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;
37
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));
47
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];
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';
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         }
73
74         if (finish_command(&po))
75                 return error("pack-objects died with strange error");
76         return 0;
77 }
78
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 }
88
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;
96
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;
104
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;
109
110         if (parse_commit(new) < 0)
111                 return 0;
112
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;
126 }
127
128 static struct ref *local_refs, **local_tail;
129 static struct ref *remote_refs, **remote_tail;
130
131 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
132 {
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;
141 }
142
143 static void get_local_heads(void)
144 {
145         local_tail = &local_refs;
146         for_each_ref(one_local_ref, NULL);
147 }
148
149 static 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
180 static 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
209 static int do_send_pack(int in, int out, struct remote *remote, int nr_refspec, const char **refspec)
210 {
211         struct ref *ref;
212         int new_refs;
213         int ret = 0;
214         int ask_for_status_report = 0;
215         int allow_deleting_refs = 0;
216         int expect_status_report = 0;
217
218         /* No funny business with the matcher */
219         remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
220         get_local_heads();
221
222         /* Does the other end support the reporting? */
223         if (server_supports("report-status"))
224                 ask_for_status_report = 1;
225         if (server_supports("delete-refs"))
226                 allow_deleting_refs = 1;
227
228         /* match them up */
229         if (!remote_tail)
230                 remote_tail = &remote_refs;
231         if (match_refs(local_refs, remote_refs, &remote_tail,
232                        nr_refspec, refspec, args.send_all))
233                 return -1;
234
235         if (!remote_refs) {
236                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
237                         "Perhaps you should specify a branch such as 'master'.\n");
238                 return 0;
239         }
240
241         /*
242          * Finally, tell the other end!
243          */
244         new_refs = 0;
245         for (ref = remote_refs; ref; ref = ref->next) {
246                 char old_hex[60], *new_hex;
247                 int will_delete_ref;
248
249                 if (!ref->peer_ref)
250                         continue;
251
252
253                 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
254                 if (will_delete_ref && !allow_deleting_refs) {
255                         error("remote does not support deleting refs");
256                         ret = -2;
257                         continue;
258                 }
259                 if (!will_delete_ref &&
260                     !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
261                         if (args.verbose)
262                                 fprintf(stderr, "'%s': up-to-date\n", ref->name);
263                         continue;
264                 }
265
266                 /* This part determines what can overwrite what.
267                  * The rules are:
268                  *
269                  * (0) you can always use --force or +A:B notation to
270                  *     selectively force individual ref pairs.
271                  *
272                  * (1) if the old thing does not exist, it is OK.
273                  *
274                  * (2) if you do not have the old thing, you are not allowed
275                  *     to overwrite it; you would not know what you are losing
276                  *     otherwise.
277                  *
278                  * (3) if both new and old are commit-ish, and new is a
279                  *     descendant of old, it is OK.
280                  *
281                  * (4) regardless of all of the above, removing :B is
282                  *     always allowed.
283                  */
284
285                 if (!args.force_update &&
286                     !will_delete_ref &&
287                     !is_null_sha1(ref->old_sha1) &&
288                     !ref->force) {
289                         if (!has_sha1_file(ref->old_sha1) ||
290                             !ref_newer(ref->peer_ref->new_sha1,
291                                        ref->old_sha1)) {
292                                 /* We do not have the remote ref, or
293                                  * we know that the remote ref is not
294                                  * an ancestor of what we are trying to
295                                  * push.  Either way this can be losing
296                                  * commits at the remote end and likely
297                                  * we were not up to date to begin with.
298                                  */
299                                 error("remote '%s' is not a strict "
300                                       "subset of local ref '%s'. "
301                                       "maybe you are not up-to-date and "
302                                       "need to pull first?",
303                                       ref->name,
304                                       ref->peer_ref->name);
305                                 ret = -2;
306                                 continue;
307                         }
308                 }
309                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
310                 if (!will_delete_ref)
311                         new_refs++;
312                 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
313                 new_hex = sha1_to_hex(ref->new_sha1);
314
315                 if (!args.dry_run) {
316                         if (ask_for_status_report) {
317                                 packet_write(out, "%s %s %s%c%s",
318                                         old_hex, new_hex, ref->name, 0,
319                                         "report-status");
320                                 ask_for_status_report = 0;
321                                 expect_status_report = 1;
322                         }
323                         else
324                                 packet_write(out, "%s %s %s",
325                                         old_hex, new_hex, ref->name);
326                 }
327                 if (will_delete_ref)
328                         fprintf(stderr, "deleting '%s'\n", ref->name);
329                 else {
330                         fprintf(stderr, "updating '%s'", ref->name);
331                         if (strcmp(ref->name, ref->peer_ref->name))
332                                 fprintf(stderr, " using '%s'",
333                                         ref->peer_ref->name);
334                         fprintf(stderr, "\n  from %s\n  to   %s\n",
335                                 old_hex, new_hex);
336                 }
337         }
338
339         packet_flush(out);
340         if (new_refs && !args.dry_run)
341                 ret = pack_objects(out, remote_refs);
342         close(out);
343
344         if (expect_status_report) {
345                 if (receive_status(in))
346                         ret = -4;
347         }
348
349         if (!args.dry_run && remote && ret == 0) {
350                 for (ref = remote_refs; ref; ref = ref->next)
351                         update_tracking_ref(remote, ref);
352         }
353
354         if (!new_refs && ret == 0)
355                 fprintf(stderr, "Everything up-to-date\n");
356         return ret;
357 }
358
359 static void verify_remote_names(int nr_heads, const char **heads)
360 {
361         int i;
362
363         for (i = 0; i < nr_heads; i++) {
364                 const char *remote = strchr(heads[i], ':');
365
366                 remote = remote ? (remote + 1) : heads[i];
367                 switch (check_ref_format(remote)) {
368                 case 0: /* ok */
369                 case -2: /* ok but a single level -- that is fine for
370                           * a match pattern.
371                           */
372                 case -3: /* ok but ends with a pattern-match character */
373                         continue;
374                 }
375                 die("remote part of refspec is not a valid name in %s",
376                     heads[i]);
377         }
378 }
379
380 int cmd_send_pack(int argc, const char **argv, const char *prefix)
381 {
382         int i, nr_heads = 0;
383         const char **heads = NULL;
384         const char *remote_name = NULL;
385         struct remote *remote = NULL;
386         const char *dest = NULL;
387
388         argv++;
389         for (i = 1; i < argc; i++, argv++) {
390                 const char *arg = *argv;
391
392                 if (*arg == '-') {
393                         if (!prefixcmp(arg, "--receive-pack=")) {
394                                 args.receivepack = arg + 15;
395                                 continue;
396                         }
397                         if (!prefixcmp(arg, "--exec=")) {
398                                 args.receivepack = arg + 7;
399                                 continue;
400                         }
401                         if (!prefixcmp(arg, "--remote=")) {
402                                 remote_name = arg + 9;
403                                 continue;
404                         }
405                         if (!strcmp(arg, "--all")) {
406                                 args.send_all = 1;
407                                 continue;
408                         }
409                         if (!strcmp(arg, "--dry-run")) {
410                                 args.dry_run = 1;
411                                 continue;
412                         }
413                         if (!strcmp(arg, "--force")) {
414                                 args.force_update = 1;
415                                 continue;
416                         }
417                         if (!strcmp(arg, "--verbose")) {
418                                 args.verbose = 1;
419                                 continue;
420                         }
421                         if (!strcmp(arg, "--thin")) {
422                                 args.use_thin_pack = 1;
423                                 continue;
424                         }
425                         usage(send_pack_usage);
426                 }
427                 if (!dest) {
428                         dest = arg;
429                         continue;
430                 }
431                 heads = (const char **) argv;
432                 nr_heads = argc - i;
433                 break;
434         }
435         if (!dest)
436                 usage(send_pack_usage);
437         if (heads && args.send_all)
438                 usage(send_pack_usage);
439
440         if (remote_name) {
441                 remote = remote_get(remote_name);
442                 if (!remote_has_url(remote, dest)) {
443                         die("Destination %s is not a uri for %s",
444                             dest, remote_name);
445                 }
446         }
447
448         return send_pack(&args, dest, remote, nr_heads, heads);
449 }
450
451 int send_pack(struct send_pack_args *my_args,
452               const char *dest, struct remote *remote,
453               int nr_heads, const char **heads)
454 {
455         int fd[2], ret;
456         struct child_process *conn;
457
458         memcpy(&args, my_args, sizeof(args));
459
460         verify_remote_names(nr_heads, heads);
461
462         conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
463         ret = do_send_pack(fd[0], fd[1], remote, nr_heads, heads);
464         close(fd[0]);
465         close(fd[1]);
466         ret |= finish_connect(conn);
467         return !!ret;
468 }