X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch-pack.c;h=9dfd072db786a62d7d971a1b98f539e68ec364fc;hb=0a8944dd48b97d258240af967dfdfcea4f203b85;hp=96ce7f5d5abd9faf66a189e583161e5860f582ef;hpb=4f7770c87ce3c302e1639a7737a6d2531fe4b160;p=git.git diff --git a/fetch-pack.c b/fetch-pack.c index 96ce7f5d..9dfd072d 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1,40 +1,60 @@ #include "cache.h" #include "refs.h" #include "pkt-line.h" +#include "commit.h" +#include "tag.h" +#include #include -static const char fetch_pack_usage[] = "git-fetch-pack [host:]directory [heads]* < mycommitlist"; +static int quiet; +static int verbose; +static const char fetch_pack_usage[] = +"git-fetch-pack [-q] [-v] [--exec=upload-pack] [host:]directory ..."; static const char *exec = "git-upload-pack"; -static int get_ack(int fd, unsigned char *result_sha1) -{ - static char line[1000]; - int len = packet_read_line(fd, line, sizeof(line)); +#define COMPLETE (1U << 0) - if (!len) - die("git-fetch-pack: expected ACK/NAK, got EOF"); - if (line[len-1] == '\n') - line[--len] = 0; - if (!strcmp(line, "NAK")) - return 0; - if (!strncmp(line, "ACK ", 3)) { - if (!get_sha1_hex(line+4, result_sha1)) - return 1; - } - die("git-fetch_pack: expected ACK/NAK, got '%s'", line); -} - -static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *remote) +static int find_common(int fd[2], unsigned char *result_sha1, + struct ref *refs) { + int fetching; static char line[1000]; - int count = 0, flushes = 0, retval; + static char rev_command[1024]; + int count = 0, flushes = 0, retval, rev_command_len; FILE *revs; - revs = popen("git-rev-list $(git-rev-parse --all)", "r"); + strcpy(rev_command, "git-rev-list $(git-rev-parse --all)"); + rev_command_len = strlen(rev_command); + fetching = 0; + for ( ; refs ; refs = refs->next) { + unsigned char *remote = refs->old_sha1; + + /* + If that object is complete (i.e. it is a descendant of a + local ref), we don't want it, nor its descendants. + */ + if (has_sha1_file(remote) + && parse_object(remote)->flags & COMPLETE) { + if (rev_command_len + 44 < sizeof(rev_command)) { + snprintf(rev_command + rev_command_len, 44, + " ^%s^", sha1_to_hex(remote)); + rev_command_len += 43; + } + + continue; + } + + packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); + fetching++; + } + packet_flush(fd[1]); + if (!fetching) + return 1; + + revs = popen(rev_command, "r"); if (!revs) die("unable to run 'git-rev-list'"); - packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); - packet_flush(fd[1]); + flushes = 1; retval = -1; while (fgets(line, sizeof(line), revs) != NULL) { @@ -42,6 +62,8 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem if (get_sha1_hex(line, sha1)) die("git-fetch-pack: expected object name, got crud"); packet_write(fd[1], "have %s\n", sha1_to_hex(sha1)); + if (verbose) + fprintf(stderr, "have %s\n", sha1_to_hex(sha1)); if (!(31 & ++count)) { packet_flush(fd[1]); flushes++; @@ -55,6 +77,8 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem if (get_ack(fd[0], result_sha1)) { flushes = 0; retval = 0; + if (verbose) + fprintf(stderr, "got ack\n"); break; } flushes--; @@ -62,61 +86,131 @@ static int find_common(int fd[2], unsigned char *result_sha1, unsigned char *rem } pclose(revs); packet_write(fd[1], "done\n"); + if (verbose) + fprintf(stderr, "done\n"); while (flushes) { flushes--; - if (get_ack(fd[0], result_sha1)) + if (get_ack(fd[0], result_sha1)) { + if (verbose) + fprintf(stderr, "got ack\n"); return 0; + } } return retval; } -static int get_remote_heads(int fd, int nr_match, char **match, unsigned char *result) +static struct commit_list *complete = NULL; + +static int mark_complete(const char *path, const unsigned char *sha1) { - int count = 0; + struct object *o = parse_object(sha1); - for (;;) { - static char line[1000]; - unsigned char sha1[20]; - char *refname; - int len; - - len = packet_read_line(fd, line, sizeof(line)); - if (!len) - break; - if (line[len-1] == '\n') - line[--len] = 0; - if (len < 42 || get_sha1_hex(line, sha1)) - die("git-fetch-pack: protocol error - expected ref descriptor, got '%s¤'", line); - refname = line+41; - if (nr_match && !path_match(refname, nr_match, match)) + while (o && o->type == tag_type) { + o->flags |= COMPLETE; + o = parse_object(((struct tag *)o)->tagged->sha1); + } + if (o->type == commit_type) { + struct commit *commit = (struct commit *)o; + commit->object.flags |= COMPLETE; + insert_by_date(commit, &complete); + } + return 0; +} + +static void mark_recent_complete_commits(unsigned long cutoff) +{ + while (complete && cutoff <= complete->item->date) { + if (verbose) + fprintf(stderr, "Marking %s as complete\n", + sha1_to_hex(complete->item->object.sha1)); + pop_most_recent_commit(&complete, COMPLETE); + } +} + +static int everything_local(struct ref *refs) +{ + struct ref *ref; + int retval; + unsigned long cutoff = 0; + + track_object_refs = 0; + save_commit_buffer = 0; + + for (ref = refs; ref; ref = ref->next) { + struct object *o; + + o = parse_object(ref->old_sha1); + if (!o) + continue; + + /* We already have it -- which may mean that we were + * in sync with the other side at some time after + * that (it is OK if we guess wrong here). + */ + if (o->type == commit_type) { + struct commit *commit = (struct commit *)o; + if (!cutoff || cutoff < commit->date) + cutoff = commit->date; + } + } + + for_each_ref(mark_complete); + if (cutoff) + mark_recent_complete_commits(cutoff); + + for (retval = 1; refs ; refs = refs->next) { + const unsigned char *remote = refs->old_sha1; + unsigned char local[20]; + struct object *o; + + o = parse_object(remote); + if (!o || !(o->flags & COMPLETE)) { + retval = 0; + if (!verbose) + continue; + fprintf(stderr, + "want %s (%s)\n", sha1_to_hex(remote), + refs->name); + continue; + } + + memcpy(refs->new_sha1, local, 20); + if (!verbose) continue; - count++; - memcpy(result, sha1, 20); + fprintf(stderr, + "already have %s (%s)\n", sha1_to_hex(remote), + refs->name); } - return count; + return retval; } static int fetch_pack(int fd[2], int nr_match, char **match) { - unsigned char sha1[20], remote[20]; - int heads, status; + struct ref *ref; + unsigned char sha1[20]; + int status; pid_t pid; - heads = get_remote_heads(fd[0], nr_match, match, remote); - if (heads != 1) { + get_remote_heads(fd[0], &ref, nr_match, match, 1); + if (!ref) { packet_flush(fd[1]); - die(heads ? "multiple remote heads" : "no matching remote head"); + die("no matching remote head"); } - if (find_common(fd, sha1, remote) < 0) - die("git-fetch-pack: no common commits"); + if (everything_local(ref)) { + packet_flush(fd[1]); + goto all_done; + } + if (find_common(fd, sha1, ref) < 0) + fprintf(stderr, "warning: no common commits\n"); pid = fork(); if (pid < 0) die("git-fetch-pack: unable to fork off git-unpack-objects"); if (!pid) { - close(fd[1]); dup2(fd[0], 0); close(fd[0]); - execlp("git-unpack-objects", "git-unpack-objects", NULL); + close(fd[1]); + execlp("git-unpack-objects", "git-unpack-objects", + quiet ? "-q" : NULL, NULL); die("git-unpack-objects exec failed"); } close(fd[0]); @@ -129,7 +223,12 @@ static int fetch_pack(int fd[2], int nr_match, char **match) int code = WEXITSTATUS(status); if (code) die("git-unpack-objects died with error code %d", code); - puts(sha1_to_hex(remote)); +all_done: + while (ref) { + printf("%s %s\n", + sha1_to_hex(ref->old_sha1), ref->name); + ref = ref->next; + } return 0; } if (WIFSIGNALED(status)) { @@ -152,7 +251,18 @@ int main(int argc, char **argv) char *arg = argv[i]; if (*arg == '-') { - /* Arguments go here */ + if (!strncmp("--exec=", arg, 7)) { + exec = arg + 7; + continue; + } + if (!strcmp("-q", arg)) { + quiet = 1; + continue; + } + if (!strcmp("-v", arg)) { + verbose = 1; + continue; + } usage(fetch_pack_usage); } dest = arg;