Code

Make merge-recursive honor diff.renamelimit
[git.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"
9 static const char send_pack_usage[] =
10 "git-send-pack [--all] [--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;
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 *args[] = {
29                 "pack-objects",
30                 "--all-progress",
31                 "--revs",
32                 "--stdout",
33                 NULL,
34                 NULL,
35         };
36         struct child_process po;
38         if (use_thin_pack)
39                 args[4] = "--thin";
40         memset(&po, 0, sizeof(po));
41         po.argv = args;
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 int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
182         struct ref *ref;
183         int new_refs;
184         int ret = 0;
185         int ask_for_status_report = 0;
186         int allow_deleting_refs = 0;
187         int expect_status_report = 0;
189         /* No funny business with the matcher */
190         remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
191         get_local_heads();
193         /* Does the other end support the reporting? */
194         if (server_supports("report-status"))
195                 ask_for_status_report = 1;
196         if (server_supports("delete-refs"))
197                 allow_deleting_refs = 1;
199         /* match them up */
200         if (!remote_tail)
201                 remote_tail = &remote_refs;
202         if (match_refs(local_refs, remote_refs, &remote_tail,
203                        nr_refspec, refspec, send_all))
204                 return -1;
206         if (!remote_refs) {
207                 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
208                         "Perhaps you should specify a branch such as 'master'.\n");
209                 return 0;
210         }
212         /*
213          * Finally, tell the other end!
214          */
215         new_refs = 0;
216         for (ref = remote_refs; ref; ref = ref->next) {
217                 char old_hex[60], *new_hex;
218                 int will_delete_ref;
220                 if (!ref->peer_ref)
221                         continue;
224                 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
225                 if (will_delete_ref && !allow_deleting_refs) {
226                         error("remote does not support deleting refs");
227                         ret = -2;
228                         continue;
229                 }
230                 if (!will_delete_ref &&
231                     !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
232                         if (verbose)
233                                 fprintf(stderr, "'%s': up-to-date\n", ref->name);
234                         continue;
235                 }
237                 /* This part determines what can overwrite what.
238                  * The rules are:
239                  *
240                  * (0) you can always use --force or +A:B notation to
241                  *     selectively force individual ref pairs.
242                  *
243                  * (1) if the old thing does not exist, it is OK.
244                  *
245                  * (2) if you do not have the old thing, you are not allowed
246                  *     to overwrite it; you would not know what you are losing
247                  *     otherwise.
248                  *
249                  * (3) if both new and old are commit-ish, and new is a
250                  *     descendant of old, it is OK.
251                  *
252                  * (4) regardless of all of the above, removing :B is
253                  *     always allowed.
254                  */
256                 if (!force_update &&
257                     !will_delete_ref &&
258                     !is_null_sha1(ref->old_sha1) &&
259                     !ref->force) {
260                         if (!has_sha1_file(ref->old_sha1) ||
261                             !ref_newer(ref->peer_ref->new_sha1,
262                                        ref->old_sha1)) {
263                                 /* We do not have the remote ref, or
264                                  * we know that the remote ref is not
265                                  * an ancestor of what we are trying to
266                                  * push.  Either way this can be losing
267                                  * commits at the remote end and likely
268                                  * we were not up to date to begin with.
269                                  */
270                                 error("remote '%s' is not a strict "
271                                       "subset of local ref '%s'. "
272                                       "maybe you are not up-to-date and "
273                                       "need to pull first?",
274                                       ref->name,
275                                       ref->peer_ref->name);
276                                 ret = -2;
277                                 continue;
278                         }
279                 }
280                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
281                 if (!will_delete_ref)
282                         new_refs++;
283                 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
284                 new_hex = sha1_to_hex(ref->new_sha1);
286                 if (ask_for_status_report) {
287                         packet_write(out, "%s %s %s%c%s",
288                                      old_hex, new_hex, ref->name, 0,
289                                      "report-status");
290                         ask_for_status_report = 0;
291                         expect_status_report = 1;
292                 }
293                 else
294                         packet_write(out, "%s %s %s",
295                                      old_hex, new_hex, ref->name);
296                 if (will_delete_ref)
297                         fprintf(stderr, "deleting '%s'\n", ref->name);
298                 else {
299                         fprintf(stderr, "updating '%s'", ref->name);
300                         if (strcmp(ref->name, ref->peer_ref->name))
301                                 fprintf(stderr, " using '%s'",
302                                         ref->peer_ref->name);
303                         fprintf(stderr, "\n  from %s\n  to   %s\n",
304                                 old_hex, new_hex);
305                 }
306                 if (remote) {
307                         struct refspec rs;
308                         rs.src = ref->name;
309                         rs.dst = NULL;
310                         if (!remote_find_tracking(remote, &rs)) {
311                                 struct ref_lock *lock;
312                                 fprintf(stderr, " Also local %s\n", rs.dst);
313                                 if (will_delete_ref) {
314                                         if (delete_ref(rs.dst, NULL)) {
315                                                 error("Failed to delete");
316                                         }
317                                 } else {
318                                         lock = lock_any_ref_for_update(rs.dst, NULL, 0);
319                                         if (!lock)
320                                                 error("Failed to lock");
321                                         else
322                                                 write_ref_sha1(lock, ref->new_sha1,
323                                                                "update by push");
324                                 }
325                                 free(rs.dst);
326                         }
327                 }
328         }
330         packet_flush(out);
331         if (new_refs)
332                 ret = pack_objects(out, remote_refs);
333         close(out);
335         if (expect_status_report) {
336                 if (receive_status(in))
337                         ret = -4;
338         }
340         if (!new_refs && ret == 0)
341                 fprintf(stderr, "Everything up-to-date\n");
342         return ret;
345 static void verify_remote_names(int nr_heads, char **heads)
347         int i;
349         for (i = 0; i < nr_heads; i++) {
350                 const char *remote = strchr(heads[i], ':');
352                 remote = remote ? (remote + 1) : heads[i];
353                 switch (check_ref_format(remote)) {
354                 case 0: /* ok */
355                 case -2: /* ok but a single level -- that is fine for
356                           * a match pattern.
357                           */
358                 case -3: /* ok but ends with a pattern-match character */
359                         continue;
360                 }
361                 die("remote part of refspec is not a valid name in %s",
362                     heads[i]);
363         }
366 int main(int argc, char **argv)
368         int i, nr_heads = 0;
369         char *dest = NULL;
370         char **heads = NULL;
371         int fd[2], ret;
372         pid_t pid;
373         char *remote_name = NULL;
374         struct remote *remote = NULL;
376         setup_git_directory();
377         git_config(git_default_config);
379         argv++;
380         for (i = 1; i < argc; i++, argv++) {
381                 char *arg = *argv;
383                 if (*arg == '-') {
384                         if (!prefixcmp(arg, "--receive-pack=")) {
385                                 receivepack = arg + 15;
386                                 continue;
387                         }
388                         if (!prefixcmp(arg, "--exec=")) {
389                                 receivepack = arg + 7;
390                                 continue;
391                         }
392                         if (!prefixcmp(arg, "--remote=")) {
393                                 remote_name = arg + 9;
394                                 continue;
395                         }
396                         if (!strcmp(arg, "--all")) {
397                                 send_all = 1;
398                                 continue;
399                         }
400                         if (!strcmp(arg, "--force")) {
401                                 force_update = 1;
402                                 continue;
403                         }
404                         if (!strcmp(arg, "--verbose")) {
405                                 verbose = 1;
406                                 continue;
407                         }
408                         if (!strcmp(arg, "--thin")) {
409                                 use_thin_pack = 1;
410                                 continue;
411                         }
412                         usage(send_pack_usage);
413                 }
414                 if (!dest) {
415                         dest = arg;
416                         continue;
417                 }
418                 heads = argv;
419                 nr_heads = argc - i;
420                 break;
421         }
422         if (!dest)
423                 usage(send_pack_usage);
424         if (heads && send_all)
425                 usage(send_pack_usage);
426         verify_remote_names(nr_heads, heads);
428         if (remote_name) {
429                 remote = remote_get(remote_name);
430                 if (!remote_has_uri(remote, dest)) {
431                         die("Destination %s is not a uri for %s",
432                             dest, remote_name);
433                 }
434         }
436         pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
437         if (pid < 0)
438                 return 1;
439         ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
440         close(fd[0]);
441         close(fd[1]);
442         ret |= finish_connect(pid);
443         return !!ret;