X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=send-pack.c;h=af93b11f238e4583f6e7fb9dab5a2224acf4ee1f;hb=HEAD;hp=5a3aff6822c424b814ed6ec3e6daa02f82581720;hpb=0bc3cdfc823e48069b778468196d8f5185a452cb;p=git.git diff --git a/send-pack.c b/send-pack.c index 5a3aff68..af93b11f 100644 --- a/send-pack.c +++ b/send-pack.c @@ -1,14 +1,18 @@ #include "cache.h" #include "commit.h" +#include "tag.h" #include "refs.h" #include "pkt-line.h" +#include "exec_cmd.h" static const char send_pack_usage[] = "git-send-pack [--all] [--exec=git-receive-pack] [...]\n" " --all and explicit specification are mutually exclusive."; static const char *exec = "git-receive-pack"; +static int verbose = 0; static int send_all = 0; static int force_update = 0; +static int use_thin_pack = 0; static int is_zero_sha1(const unsigned char *sha1) { @@ -23,39 +27,61 @@ static int is_zero_sha1(const unsigned char *sha1) static void exec_pack_objects(void) { - static char *args[] = { - "git-pack-objects", + static const char *args[] = { + "pack-objects", "--stdout", NULL }; - execvp("git-pack-objects", args); + execv_git_cmd(args); die("git-pack-objects exec failed (%s)", strerror(errno)); } static void exec_rev_list(struct ref *refs) { - static char *args[1000]; - int i = 0; - - args[i++] = "git-rev-list"; /* 0 */ - args[i++] = "--objects"; /* 1 */ - while (refs) { - char *buf = malloc(100); - if (i > 900) + struct ref *ref; + static const char *args[1000]; + int i = 0, j; + + args[i++] = "rev-list"; /* 0 */ + if (use_thin_pack) /* 1 */ + args[i++] = "--objects-edge"; + else + args[i++] = "--objects"; + + /* First send the ones we care about most */ + for (ref = refs; ref; ref = ref->next) { + if (900 < i) die("git-rev-list environment overflow"); - if (!is_zero_sha1(refs->old_sha1)) { + if (!is_zero_sha1(ref->new_sha1)) { + char *buf = malloc(100); args[i++] = buf; - snprintf(buf, 50, "^%s", sha1_to_hex(refs->old_sha1)); + snprintf(buf, 50, "%s", sha1_to_hex(ref->new_sha1)); buf += 50; + if (!is_zero_sha1(ref->old_sha1) && + has_sha1_file(ref->old_sha1)) { + args[i++] = buf; + snprintf(buf, 50, "^%s", + sha1_to_hex(ref->old_sha1)); + } } - if (!is_zero_sha1(refs->new_sha1)) { + } + + /* Then a handful of the remainder + * NEEDSWORK: we would be better off if used the newer ones first. + */ + for (ref = refs, j = i + 16; + i < 900 && i < j && ref; + ref = ref->next) { + if (is_zero_sha1(ref->new_sha1) && + !is_zero_sha1(ref->old_sha1) && + has_sha1_file(ref->old_sha1)) { + char *buf = malloc(42); args[i++] = buf; - snprintf(buf, 50, "%s", sha1_to_hex(refs->new_sha1)); + snprintf(buf, 42, "^%s", sha1_to_hex(ref->old_sha1)); } - refs = refs->next; } args[i] = NULL; - execvp("git-rev-list", args); + execv_git_cmd(args); die("git-rev-list exec failed (%s)", strerror(errno)); } @@ -103,148 +129,230 @@ static int pack_objects(int fd, struct ref *refs) return 0; } -static int read_ref(const char *ref, unsigned char *sha1) +static void unmark_and_free(struct commit_list *list, unsigned int mark) { - int fd, ret; - char buffer[60]; - - fd = open(git_path("%s", ref), O_RDONLY); - if (fd < 0) - return -1; - ret = -1; - if (read(fd, buffer, sizeof(buffer)) >= 40) - ret = get_sha1_hex(buffer, sha1); - close(fd); - return ret; + while (list) { + struct commit_list *temp = list; + temp->item->object.flags &= ~mark; + list = temp->next; + free(temp); + } } -static int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1) +static int ref_newer(const unsigned char *new_sha1, + const unsigned char *old_sha1) { - struct commit *new, *old; - struct commit_list *list; + struct object *o; + struct commit *old, *new; + struct commit_list *list, *used; + int found = 0; - if (force_update) - return 1; - old = lookup_commit_reference(old_sha1); - if (!old) + /* Both new and old must be commit-ish and new is descendant of + * old. Otherwise we require --force. + */ + o = deref_tag(parse_object(old_sha1), NULL, 0); + if (!o || o->type != TYPE_COMMIT) return 0; - new = lookup_commit_reference(new_sha1); - if (!new) + old = (struct commit *) o; + + o = deref_tag(parse_object(new_sha1), NULL, 0); + if (!o || o->type != TYPE_COMMIT) return 0; + new = (struct commit *) o; + if (parse_commit(new) < 0) return 0; - list = NULL; + + used = list = NULL; commit_list_insert(new, &list); while (list) { new = pop_most_recent_commit(&list, 1); - if (new == old) - return 1; + commit_list_insert(new, &used); + if (new == old) { + found = 1; + break; + } } - return 0; + unmark_and_free(list, 1); + unmark_and_free(used, 1); + return found; } -static int local_ref_nr_match; -static char **local_ref_match; -static struct ref *local_ref_list; -static struct ref **local_last_ref; +static struct ref *local_refs, **local_tail; +static struct ref *remote_refs, **remote_tail; -static int try_to_match(const char *refname, const unsigned char *sha1) +static int one_local_ref(const char *refname, const unsigned char *sha1) { struct ref *ref; - int len; - - if (!path_match(refname, local_ref_nr_match, local_ref_match)) { - if (!send_all) - return 0; - - /* If we have it listed already, skip it */ - for (ref = local_ref_list ; ref ; ref = ref->next) { - if (!strcmp(ref->name, refname)) - return 0; - } - } - - len = strlen(refname)+1; - ref = xmalloc(sizeof(*ref) + len); - memset(ref->old_sha1, 0, 20); + int len = strlen(refname) + 1; + ref = xcalloc(1, sizeof(*ref) + len); memcpy(ref->new_sha1, sha1, 20); memcpy(ref->name, refname, len); - ref->next = NULL; - *local_last_ref = ref; - local_last_ref = &ref->next; + *local_tail = ref; + local_tail = &ref->next; return 0; } -static int send_pack(int in, int out, int nr_match, char **match) +static void get_local_heads(void) { - struct ref *ref_list, **last_ref; - struct ref *ref; - int new_refs; - - /* First we get all heads, whether matching or not.. */ - last_ref = get_remote_heads(in, &ref_list, 0, NULL); - - /* - * Go through the refs, see if we want to update - * any of them.. - */ - for (ref = ref_list; ref; ref = ref->next) { - unsigned char new_sha1[20]; - char *name = ref->name; - - if (nr_match && !path_match(name, nr_match, match)) - continue; - - if (read_ref(name, new_sha1) < 0) - continue; + local_tail = &local_refs; + for_each_ref(one_local_ref); +} - if (!memcmp(ref->old_sha1, new_sha1, 20)) { - fprintf(stderr, "'%s' unchanged\n", name); - continue; +static int receive_status(int in) +{ + char line[1000]; + int ret = 0; + int len = packet_read_line(in, line, sizeof(line)); + if (len < 10 || memcmp(line, "unpack ", 7)) { + fprintf(stderr, "did not receive status back\n"); + return -1; + } + if (memcmp(line, "unpack ok\n", 10)) { + fputs(line, stderr); + ret = -1; + } + while (1) { + len = packet_read_line(in, line, sizeof(line)); + if (!len) + break; + if (len < 3 || + (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) { + fprintf(stderr, "protocol error: %s\n", line); + ret = -1; + break; } - - if (!ref_newer(new_sha1, ref->old_sha1)) { - error("remote '%s' isn't a strict parent of local", name); + if (!memcmp(line, "ok", 2)) continue; - } - - /* Ok, mark it for update */ - memcpy(ref->new_sha1, new_sha1, 20); + fputs(line, stderr); + ret = -1; } + return ret; +} - /* - * See if we have any refs that the other end didn't have - */ - if (nr_match || send_all) { - local_ref_nr_match = nr_match; - local_ref_match = match; - local_ref_list = ref_list; - local_last_ref = last_ref; - for_each_ref(try_to_match); +static int send_pack(int in, int out, int nr_refspec, char **refspec) +{ + struct ref *ref; + int new_refs; + int ret = 0; + int ask_for_status_report = 0; + int expect_status_report = 0; + + /* No funny business with the matcher */ + remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1); + get_local_heads(); + + /* Does the other end support the reporting? */ + if (server_supports("report-status")) + ask_for_status_report = 1; + + /* match them up */ + if (!remote_tail) + remote_tail = &remote_refs; + if (match_refs(local_refs, remote_refs, &remote_tail, + nr_refspec, refspec, send_all)) + return -1; + + if (!remote_refs) { + fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); + return 0; } /* * Finally, tell the other end! */ new_refs = 0; - for (ref = ref_list; ref; ref = ref->next) { + for (ref = remote_refs; ref; ref = ref->next) { char old_hex[60], *new_hex; - if (is_zero_sha1(ref->new_sha1)) + if (!ref->peer_ref) continue; + if (!memcmp(ref->old_sha1, ref->peer_ref->new_sha1, 20)) { + if (verbose) + fprintf(stderr, "'%s': up-to-date\n", ref->name); + continue; + } + + /* This part determines what can overwrite what. + * The rules are: + * + * (0) you can always use --force or +A:B notation to + * selectively force individual ref pairs. + * + * (1) if the old thing does not exist, it is OK. + * + * (2) if you do not have the old thing, you are not allowed + * to overwrite it; you would not know what you are losing + * otherwise. + * + * (3) if both new and old are commit-ish, and new is a + * descendant of old, it is OK. + */ + + if (!force_update && + !is_zero_sha1(ref->old_sha1) && + !ref->force) { + if (!has_sha1_file(ref->old_sha1) || + !ref_newer(ref->peer_ref->new_sha1, + ref->old_sha1)) { + /* We do not have the remote ref, or + * we know that the remote ref is not + * an ancestor of what we are trying to + * push. Either way this can be losing + * commits at the remote end and likely + * we were not up to date to begin with. + */ + error("remote '%s' is not a strict " + "subset of local ref '%s'. " + "maybe you are not up-to-date and " + "need to pull first?", + ref->name, + ref->peer_ref->name); + ret = -2; + continue; + } + } + memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20); + if (is_zero_sha1(ref->new_sha1)) { + error("cannot happen anymore"); + ret = -3; + continue; + } new_refs++; strcpy(old_hex, sha1_to_hex(ref->old_sha1)); new_hex = sha1_to_hex(ref->new_sha1); - packet_write(out, "%s %s %s", old_hex, new_hex, ref->name); - fprintf(stderr, "'%s': updating from %s to %s\n", ref->name, old_hex, new_hex); + + if (ask_for_status_report) { + packet_write(out, "%s %s %s%c%s", + old_hex, new_hex, ref->name, 0, + "report-status"); + ask_for_status_report = 0; + expect_status_report = 1; + } + else + packet_write(out, "%s %s %s", + old_hex, new_hex, ref->name); + fprintf(stderr, "updating '%s'", ref->name); + if (strcmp(ref->name, ref->peer_ref->name)) + fprintf(stderr, " using '%s'", ref->peer_ref->name); + fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex); } - + packet_flush(out); if (new_refs) - pack_objects(out, ref_list); + pack_objects(out, remote_refs); close(out); - return 0; + + if (expect_status_report) { + if (receive_status(in)) + ret = -4; + } + + if (!new_refs && ret == 0) + fprintf(stderr, "Everything up-to-date\n"); + return ret; } + int main(int argc, char **argv) { int i, nr_heads = 0; @@ -253,6 +361,9 @@ int main(int argc, char **argv) int fd[2], ret; pid_t pid; + setup_git_directory(); + git_config(git_default_config); + argv++; for (i = 1; i < argc; i++, argv++) { char *arg = *argv; @@ -270,6 +381,14 @@ int main(int argc, char **argv) force_update = 1; continue; } + if (!strcmp(arg, "--verbose")) { + verbose = 1; + continue; + } + if (!strcmp(arg, "--thin")) { + use_thin_pack = 1; + continue; + } usage(send_pack_usage); } if (!dest) {