2005-07-06 00:45:37 +02:00
|
|
|
#include "cache.h"
|
|
|
|
#include "refs.h"
|
|
|
|
#include "pkt-line.h"
|
|
|
|
|
2005-10-13 03:12:27 +02:00
|
|
|
static const char clone_pack_usage[] =
|
2005-10-19 23:43:43 +02:00
|
|
|
"git-clone-pack [--exec=<git-upload-pack>] [<host>:]<directory> [<heads>]*";
|
2005-07-06 00:45:37 +02:00
|
|
|
static const char *exec = "git-upload-pack";
|
|
|
|
|
Make "git clone" less of a deathly quiet experience
It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.
Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).
So with this patch, I get something like this on my DSL line:
[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
48.398MB (154 kB/s)
where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").
Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is big step forward, I think.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-11 05:31:09 +01:00
|
|
|
static int quiet = 0;
|
|
|
|
|
2005-07-06 00:45:37 +02:00
|
|
|
static void clone_handshake(int fd[2], struct ref *ref)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
|
|
|
while (ref) {
|
2005-07-16 22:55:50 +02:00
|
|
|
packet_write(fd[1], "want %s\n", sha1_to_hex(ref->old_sha1));
|
2005-07-06 00:45:37 +02:00
|
|
|
ref = ref->next;
|
|
|
|
}
|
|
|
|
packet_flush(fd[1]);
|
|
|
|
|
|
|
|
/* We don't have nuttin' */
|
|
|
|
packet_write(fd[1], "done\n");
|
|
|
|
if (get_ack(fd[0], sha1))
|
|
|
|
error("Huh! git-clone-pack got positive ack for %s", sha1_to_hex(sha1));
|
|
|
|
}
|
|
|
|
|
|
|
|
static int is_master(struct ref *ref)
|
|
|
|
{
|
|
|
|
return !strcmp(ref->name, "refs/heads/master");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_one_ref(struct ref *ref)
|
|
|
|
{
|
2005-08-09 17:30:22 +02:00
|
|
|
char *path = git_path("%s", ref->name);
|
2005-07-06 10:11:52 +02:00
|
|
|
int fd;
|
2005-07-06 00:45:37 +02:00
|
|
|
char *hex;
|
|
|
|
|
2005-10-14 03:57:39 +02:00
|
|
|
if (!strncmp(ref->name, "refs/", 5) &&
|
|
|
|
check_ref_format(ref->name + 5)) {
|
|
|
|
error("refusing to create funny ref '%s' locally", ref->name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-07-06 10:11:52 +02:00
|
|
|
if (safe_create_leading_directories(path))
|
|
|
|
die("unable to create leading directory for %s", ref->name);
|
|
|
|
fd = open(path, O_CREAT | O_EXCL | O_WRONLY, 0666);
|
2005-07-06 00:45:37 +02:00
|
|
|
if (fd < 0)
|
|
|
|
die("unable to create ref %s", ref->name);
|
2005-07-16 22:55:50 +02:00
|
|
|
hex = sha1_to_hex(ref->old_sha1);
|
2005-07-06 00:45:37 +02:00
|
|
|
hex[40] = '\n';
|
|
|
|
if (write(fd, hex, 41) != 41)
|
|
|
|
die("unable to write ref %s", ref->name);
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_refs(struct ref *ref)
|
|
|
|
{
|
|
|
|
struct ref *head = NULL, *head_ptr, *master_ref;
|
|
|
|
char *head_path;
|
|
|
|
|
2005-10-06 00:29:48 +02:00
|
|
|
/* Upload-pack must report HEAD first */
|
2005-07-06 00:45:37 +02:00
|
|
|
if (!strcmp(ref->name, "HEAD")) {
|
|
|
|
head = ref;
|
|
|
|
ref = ref->next;
|
|
|
|
}
|
|
|
|
head_ptr = NULL;
|
|
|
|
master_ref = NULL;
|
|
|
|
while (ref) {
|
|
|
|
if (is_master(ref))
|
|
|
|
master_ref = ref;
|
2005-10-06 00:29:48 +02:00
|
|
|
if (head &&
|
|
|
|
!memcmp(ref->old_sha1, head->old_sha1, 20) &&
|
|
|
|
!strncmp(ref->name, "refs/heads/",11) &&
|
|
|
|
(!head_ptr || ref == master_ref))
|
|
|
|
head_ptr = ref;
|
|
|
|
|
2005-07-06 00:45:37 +02:00
|
|
|
write_one_ref(ref);
|
|
|
|
ref = ref->next;
|
|
|
|
}
|
2005-10-06 00:29:48 +02:00
|
|
|
if (!head) {
|
|
|
|
fprintf(stderr, "No HEAD in remote.\n");
|
2005-07-06 00:45:37 +02:00
|
|
|
return;
|
2005-10-06 00:29:48 +02:00
|
|
|
}
|
2005-07-06 00:45:37 +02:00
|
|
|
|
2005-10-06 00:29:48 +02:00
|
|
|
head_path = strdup(git_path("HEAD"));
|
2005-07-06 00:45:37 +02:00
|
|
|
if (!head_ptr) {
|
|
|
|
/*
|
|
|
|
* If we had a master ref, and it wasn't HEAD, we need to undo the
|
|
|
|
* symlink, and write a standalone HEAD. Give a warning, because that's
|
|
|
|
* really really wrong.
|
|
|
|
*/
|
|
|
|
if (master_ref) {
|
|
|
|
error("HEAD doesn't point to any refs! Making standalone HEAD");
|
|
|
|
unlink(head_path);
|
|
|
|
}
|
|
|
|
write_one_ref(head);
|
2005-10-06 00:29:48 +02:00
|
|
|
free(head_path);
|
2005-07-06 00:45:37 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We reset to the master branch if it's available */
|
|
|
|
if (master_ref)
|
|
|
|
return;
|
|
|
|
|
2005-10-06 00:29:48 +02:00
|
|
|
fprintf(stderr, "Setting HEAD to %s\n", head_ptr->name);
|
|
|
|
|
2005-07-06 00:45:37 +02:00
|
|
|
/*
|
|
|
|
* Uhhuh. Other end didn't have master. We start HEAD off with
|
|
|
|
* the first branch with the same value.
|
|
|
|
*/
|
2005-10-06 00:29:48 +02:00
|
|
|
if (create_symref(head_path, head_ptr->name) < 0)
|
2005-07-06 00:45:37 +02:00
|
|
|
die("unable to link HEAD to %s", head_ptr->name);
|
2005-10-06 00:29:48 +02:00
|
|
|
free(head_path);
|
2005-07-06 00:45:37 +02:00
|
|
|
}
|
|
|
|
|
2005-10-13 03:12:27 +02:00
|
|
|
static int clone_pack(int fd[2], int nr_match, char **match)
|
|
|
|
{
|
|
|
|
struct ref *refs;
|
|
|
|
int status;
|
|
|
|
|
2005-10-14 03:57:40 +02:00
|
|
|
get_remote_heads(fd[0], &refs, nr_match, match, 1);
|
2005-10-13 03:12:27 +02:00
|
|
|
if (!refs) {
|
|
|
|
packet_flush(fd[1]);
|
|
|
|
die("no matching remote head");
|
|
|
|
}
|
|
|
|
clone_handshake(fd, refs);
|
|
|
|
|
Make "git clone" less of a deathly quiet experience
It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.
Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).
So with this patch, I get something like this on my DSL line:
[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
48.398MB (154 kB/s)
where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").
Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is big step forward, I think.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-11 05:31:09 +01:00
|
|
|
status = receive_keep_pack(fd, "git-clone-pack", quiet);
|
2006-02-12 02:54:18 +01:00
|
|
|
if (!quiet)
|
|
|
|
fprintf(stderr, "\n");
|
2005-10-13 03:12:27 +02:00
|
|
|
|
2005-12-15 06:25:22 +01:00
|
|
|
if (!status) {
|
|
|
|
if (nr_match == 0)
|
|
|
|
write_refs(refs);
|
|
|
|
else
|
|
|
|
while (refs) {
|
|
|
|
printf("%s %s\n",
|
|
|
|
sha1_to_hex(refs->old_sha1),
|
|
|
|
refs->name);
|
|
|
|
refs = refs->next;
|
|
|
|
}
|
|
|
|
}
|
2005-10-13 03:12:27 +02:00
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2005-07-06 00:45:37 +02:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
int i, ret, nr_heads;
|
|
|
|
char *dest = NULL, **heads;
|
|
|
|
int fd[2];
|
|
|
|
pid_t pid;
|
|
|
|
|
2005-11-26 09:47:59 +01:00
|
|
|
setup_git_directory();
|
|
|
|
|
2005-07-06 00:45:37 +02:00
|
|
|
nr_heads = 0;
|
|
|
|
heads = NULL;
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
|
|
char *arg = argv[i];
|
|
|
|
|
|
|
|
if (*arg == '-') {
|
Make "git clone" less of a deathly quiet experience
It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.
Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).
So with this patch, I get something like this on my DSL line:
[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
48.398MB (154 kB/s)
where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").
Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is big step forward, I think.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-11 05:31:09 +01:00
|
|
|
if (!strcmp("-q", arg)) {
|
|
|
|
quiet = 1;
|
2005-07-09 19:52:35 +02:00
|
|
|
continue;
|
Make "git clone" less of a deathly quiet experience
It used to be that "git-unpack-objects" would give nice percentages, but
now that we don't unpack the initial clone pack any more, it doesn't. And
I'd love to do that nice percentage view in the pack objects downloader
too, but the thing doesn't even read the pack header, much less know how
much it's going to get, so I was lazy and didn't.
Instead, it at least prints out how much data it's gotten, and what the
packing speed is. Which makes the user realize that it's actually doing
something useful instead of sitting there silently (and if the recipient
knows how large the final result is, he can at least make a guess about
when it migt be done).
So with this patch, I get something like this on my DSL line:
[torvalds@g5 ~]$ time git clone master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 clone-test
Packing 188543 objects
48.398MB (154 kB/s)
where even the speed approximation seems to be roughtly correct (even
though my algorithm is a truly stupid one, and only really gives "speed in
the last half second or so").
Anyway, _something_ like this is definitely needed. It could certainly be
better (if it showed the same kind of thing that git-unpack-objects did,
that would be much nicer, but would require parsing the object stream as
it comes in). But this is big step forward, I think.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-11 05:31:09 +01:00
|
|
|
}
|
2005-07-14 05:25:54 +02:00
|
|
|
if (!strncmp("--exec=", arg, 7)) {
|
|
|
|
exec = arg + 7;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-06 00:45:37 +02:00
|
|
|
usage(clone_pack_usage);
|
|
|
|
}
|
|
|
|
dest = arg;
|
|
|
|
heads = argv + i + 1;
|
|
|
|
nr_heads = argc - i - 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!dest)
|
|
|
|
usage(clone_pack_usage);
|
|
|
|
pid = git_connect(fd, dest, exec);
|
|
|
|
if (pid < 0)
|
|
|
|
return 1;
|
|
|
|
ret = clone_pack(fd, nr_heads, heads);
|
|
|
|
close(fd[0]);
|
|
|
|
close(fd[1]);
|
|
|
|
finish_connect(pid);
|
|
|
|
return ret;
|
|
|
|
}
|