Merge branch 'maint'
[git] / 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
9 static const char send_pack_usage[] =
10 "git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
11 "  --all and explicit <ref> specification are mutually exclusive.";
12 static const char *receivepack = "git-receive-pack";
13 static int verbose;
14 static int send_all;
15 static int force_update;
16 static int use_thin_pack;
17 static int dry_run;
18
19 /*
20  * Make a pack stream and spit it out into file descriptor fd
21  */
22 static int pack_objects(int fd, struct ref *refs)
23 {
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;
38
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));
48
49         /*
50          * We feed the pack-objects we just spawned with revision
51          * parameters by writing to the pipe.
52          */
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';
61                         if (!write_or_whine(po.in, buf, 42,
62                                                 "send-pack: send refs"))
63                                 break;
64                 }
65                 if (!is_null_sha1(refs->new_sha1)) {
66                         memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
67                         buf[40] = '\n';
68                         if (!write_or_whine(po.in, buf, 41,
69                                                 "send-pack: send refs"))
70                                 break;
71                 }
72                 refs = refs->next;
73         }
74
75         if (finish_command(&po))
76                 return error("pack-objects died with strange error");
77         return 0;
78 }
79
80 static 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
90 static int ref_newer(const unsigned char *new_sha1,
91                      const unsigned char *old_sha1)
92 {
93         struct object *o;
94         struct commit *old, *new;
95         struct commit_list *list, *used;
96         int found = 0;
97
98         /* Both new and old must be commit-ish and new is descendant of
99          * old.  Otherwise we require --force.
100          */
101         o = deref_tag(parse_object(old_sha1), NULL, 0);
102         if (!o || o->type != OBJ_COMMIT)
103                 return 0;
104         old = (struct commit *) o;
105
106         o = deref_tag(parse_object(new_sha1), NULL, 0);
107         if (!o || o->type != OBJ_COMMIT)
108                 return 0;
109         new = (struct commit *) o;
110
111         if (parse_commit(new) < 0)
112                 return 0;
113
114         used = list = NULL;
115         commit_list_insert(new, &list);
116         while (list) {
117                 new = pop_most_recent_commit(&list, 1);
118                 commit_list_insert(new, &used);
119                 if (new == old) {
120                         found = 1;
121                         break;
122                 }
123         }
124         unmark_and_free(list, 1);
125         unmark_and_free(used, 1);
126         return found;
127 }
128
129 static struct ref *local_refs, **local_tail;
130 static struct ref *remote_refs, **remote_tail;
131
132 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
133 {
134         struct ref *ref;
135         int len = strlen(refname) + 1;
136         ref = xcalloc(1, sizeof(*ref) + len);
137         hashcpy(ref->new_sha1, sha1);
138         memcpy(ref->name, refname, len);
139         *local_tail = ref;
140         local_tail = &ref->next;
141         return 0;
142 }
143
144 static void get_local_heads(void)
145 {
146         local_tail = &local_refs;
147         for_each_ref(one_local_ref, NULL);
148 }
149
150 static 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
181 static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
182 {
183         struct ref *ref;
184         int new_refs;
185         int ret = 0;
186         int ask_for_status_report = 0;
187         int allow_deleting_refs = 0;
188         int expect_status_report = 0;
189
190         /* No funny business with the matcher */
191         remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
192         get_local_heads();
193
194         /* Does the other end support the reporting? */
195         if (server_supports("report-status"))
196                 ask_for_status_report = 1;
197         if (server_supports("delete-refs"))
198                 allow_deleting_refs = 1;
199
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;
206
207         if (!remote_refs) {
208                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
209                         "Perhaps you should specify a branch such as 'master'.\n");
210                 return 0;
211         }
212
213         /*
214          * Finally, tell the other end!
215          */
216         new_refs = 0;
217         for (ref = remote_refs; ref; ref = ref->next) {
218                 char old_hex[60], *new_hex;
219                 int will_delete_ref;
220
221                 if (!ref->peer_ref)
222                         continue;
223
224
225                 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
226                 if (will_delete_ref && !allow_deleting_refs) {
227                         error("remote does not support deleting refs");
228                         ret = -2;
229                         continue;
230                 }
231                 if (!will_delete_ref &&
232                     !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
233                         if (verbose)
234                                 fprintf(stderr, "'%s': up-to-date\n", ref->name);
235                         continue;
236                 }
237
238                 /* This part determines what can overwrite what.
239                  * The rules are:
240                  *
241                  * (0) you can always use --force or +A:B notation to
242                  *     selectively force individual ref pairs.
243                  *
244                  * (1) if the old thing does not exist, it is OK.
245                  *
246                  * (2) if you do not have the old thing, you are not allowed
247                  *     to overwrite it; you would not know what you are losing
248                  *     otherwise.
249                  *
250                  * (3) if both new and old are commit-ish, and new is a
251                  *     descendant of old, it is OK.
252                  *
253                  * (4) regardless of all of the above, removing :B is
254                  *     always allowed.
255                  */
256
257                 if (!force_update &&
258                     !will_delete_ref &&
259                     !is_null_sha1(ref->old_sha1) &&
260                     !ref->force) {
261                         if (!has_sha1_file(ref->old_sha1) ||
262                             !ref_newer(ref->peer_ref->new_sha1,
263                                        ref->old_sha1)) {
264                                 /* We do not have the remote ref, or
265                                  * we know that the remote ref is not
266                                  * an ancestor of what we are trying to
267                                  * push.  Either way this can be losing
268                                  * commits at the remote end and likely
269                                  * we were not up to date to begin with.
270                                  */
271                                 error("remote '%s' is not a strict "
272                                       "subset of local ref '%s'. "
273                                       "maybe you are not up-to-date and "
274                                       "need to pull first?",
275                                       ref->name,
276                                       ref->peer_ref->name);
277                                 ret = -2;
278                                 continue;
279                         }
280                 }
281                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
282                 if (!will_delete_ref)
283                         new_refs++;
284                 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
285                 new_hex = sha1_to_hex(ref->new_sha1);
286
287                 if (!dry_run) {
288                         if (ask_for_status_report) {
289                                 packet_write(out, "%s %s %s%c%s",
290                                         old_hex, new_hex, ref->name, 0,
291                                         "report-status");
292                                 ask_for_status_report = 0;
293                                 expect_status_report = 1;
294                         }
295                         else
296                                 packet_write(out, "%s %s %s",
297                                         old_hex, new_hex, ref->name);
298                 }
299                 if (will_delete_ref)
300                         fprintf(stderr, "deleting '%s'\n", ref->name);
301                 else {
302                         fprintf(stderr, "updating '%s'", ref->name);
303                         if (strcmp(ref->name, ref->peer_ref->name))
304                                 fprintf(stderr, " using '%s'",
305                                         ref->peer_ref->name);
306                         fprintf(stderr, "\n  from %s\n  to   %s\n",
307                                 old_hex, new_hex);
308                 }
309                 if (remote && !dry_run) {
310                         struct refspec rs;
311                         rs.src = ref->name;
312                         rs.dst = NULL;
313                         if (!remote_find_tracking(remote, &rs)) {
314                                 fprintf(stderr, " Also local %s\n", rs.dst);
315                                 if (will_delete_ref) {
316                                         if (delete_ref(rs.dst, NULL)) {
317                                                 error("Failed to delete");
318                                         }
319                                 } else
320                                         update_ref("update by push", rs.dst,
321                                                 ref->new_sha1, NULL, 0, 0);
322                                 free(rs.dst);
323                         }
324                 }
325         }
326
327         packet_flush(out);
328         if (new_refs && !dry_run)
329                 ret = pack_objects(out, remote_refs);
330         close(out);
331
332         if (expect_status_report) {
333                 if (receive_status(in))
334                         ret = -4;
335         }
336
337         if (!new_refs && ret == 0)
338                 fprintf(stderr, "Everything up-to-date\n");
339         return ret;
340 }
341
342 static void verify_remote_names(int nr_heads, char **heads)
343 {
344         int i;
345
346         for (i = 0; i < nr_heads; i++) {
347                 const char *remote = strchr(heads[i], ':');
348
349                 remote = remote ? (remote + 1) : heads[i];
350                 switch (check_ref_format(remote)) {
351                 case 0: /* ok */
352                 case -2: /* ok but a single level -- that is fine for
353                           * a match pattern.
354                           */
355                 case -3: /* ok but ends with a pattern-match character */
356                         continue;
357                 }
358                 die("remote part of refspec is not a valid name in %s",
359                     heads[i]);
360         }
361 }
362
363 int main(int argc, char **argv)
364 {
365         int i, nr_heads = 0;
366         char *dest = NULL;
367         char **heads = NULL;
368         int fd[2], ret;
369         pid_t pid;
370         char *remote_name = NULL;
371         struct remote *remote = NULL;
372
373         setup_git_directory();
374         git_config(git_default_config);
375
376         argv++;
377         for (i = 1; i < argc; i++, argv++) {
378                 char *arg = *argv;
379
380                 if (*arg == '-') {
381                         if (!prefixcmp(arg, "--receive-pack=")) {
382                                 receivepack = arg + 15;
383                                 continue;
384                         }
385                         if (!prefixcmp(arg, "--exec=")) {
386                                 receivepack = arg + 7;
387                                 continue;
388                         }
389                         if (!prefixcmp(arg, "--remote=")) {
390                                 remote_name = arg + 9;
391                                 continue;
392                         }
393                         if (!strcmp(arg, "--all")) {
394                                 send_all = 1;
395                                 continue;
396                         }
397                         if (!strcmp(arg, "--dry-run")) {
398                                 dry_run = 1;
399                                 continue;
400                         }
401                         if (!strcmp(arg, "--force")) {
402                                 force_update = 1;
403                                 continue;
404                         }
405                         if (!strcmp(arg, "--verbose")) {
406                                 verbose = 1;
407                                 continue;
408                         }
409                         if (!strcmp(arg, "--thin")) {
410                                 use_thin_pack = 1;
411                                 continue;
412                         }
413                         usage(send_pack_usage);
414                 }
415                 if (!dest) {
416                         dest = arg;
417                         continue;
418                 }
419                 heads = argv;
420                 nr_heads = argc - i;
421                 break;
422         }
423         if (!dest)
424                 usage(send_pack_usage);
425         if (heads && send_all)
426                 usage(send_pack_usage);
427         verify_remote_names(nr_heads, heads);
428
429         if (remote_name) {
430                 remote = remote_get(remote_name);
431                 if (!remote_has_uri(remote, dest)) {
432                         die("Destination %s is not a uri for %s",
433                             dest, remote_name);
434                 }
435         }
436
437         pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
438         if (pid < 0)
439                 return 1;
440         ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
441         close(fd[0]);
442         close(fd[1]);
443         ret |= finish_connect(pid);
444         return !!ret;
445 }