215a7ad1ef
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
130 lines
2.5 KiB
C
130 lines
2.5 KiB
C
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "rsh.h"
|
|
#include "fetch.h"
|
|
#include "refs.h"
|
|
|
|
static int fd_in;
|
|
static int fd_out;
|
|
|
|
static unsigned char remote_version = 0;
|
|
static unsigned char local_version = 1;
|
|
|
|
static ssize_t force_write(int fd, void *buffer, size_t length)
|
|
{
|
|
ssize_t ret = 0;
|
|
while (ret < length) {
|
|
ssize_t size = write(fd, buffer + ret, length - ret);
|
|
if (size < 0) {
|
|
return size;
|
|
}
|
|
if (size == 0) {
|
|
return ret;
|
|
}
|
|
ret += size;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void prefetch(unsigned char *sha1)
|
|
{
|
|
char type = 'o';
|
|
force_write(fd_out, &type, 1);
|
|
force_write(fd_out, sha1, 20);
|
|
//memcpy(requested + 20 * prefetches++, sha1, 20);
|
|
}
|
|
|
|
static char conn_buf[4096];
|
|
static size_t conn_buf_posn = 0;
|
|
|
|
int fetch(unsigned char *sha1)
|
|
{
|
|
int ret;
|
|
signed char remote;
|
|
|
|
if (conn_buf_posn) {
|
|
remote = conn_buf[0];
|
|
memmove(conn_buf, conn_buf + 1, --conn_buf_posn);
|
|
} else {
|
|
if (read(fd_in, &remote, 1) < 1)
|
|
return -1;
|
|
}
|
|
//fprintf(stderr, "Got %d\n", remote);
|
|
if (remote < 0)
|
|
return remote;
|
|
ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);
|
|
if (!ret)
|
|
pull_say("got %s\n", sha1_to_hex(sha1));
|
|
return ret;
|
|
}
|
|
|
|
static int get_version(void)
|
|
{
|
|
char type = 'v';
|
|
write(fd_out, &type, 1);
|
|
write(fd_out, &local_version, 1);
|
|
if (read(fd_in, &remote_version, 1) < 1) {
|
|
return error("Couldn't read version from remote end");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int fetch_ref(char *ref, unsigned char *sha1)
|
|
{
|
|
signed char remote;
|
|
char type = 'r';
|
|
write(fd_out, &type, 1);
|
|
write(fd_out, ref, strlen(ref) + 1);
|
|
read(fd_in, &remote, 1);
|
|
if (remote < 0)
|
|
return remote;
|
|
read(fd_in, sha1, 20);
|
|
return 0;
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
char *commit_id;
|
|
char *url;
|
|
int arg = 1;
|
|
const char *prog;
|
|
|
|
prog = getenv("GIT_SSH_PUSH");
|
|
if (!prog) prog = "git-ssh-upload";
|
|
|
|
while (arg < argc && argv[arg][0] == '-') {
|
|
if (argv[arg][1] == 't') {
|
|
get_tree = 1;
|
|
} else if (argv[arg][1] == 'c') {
|
|
get_history = 1;
|
|
} else if (argv[arg][1] == 'a') {
|
|
get_all = 1;
|
|
get_tree = 1;
|
|
get_history = 1;
|
|
} else if (argv[arg][1] == 'v') {
|
|
get_verbosely = 1;
|
|
} else if (argv[arg][1] == 'w') {
|
|
write_ref = argv[arg + 1];
|
|
arg++;
|
|
}
|
|
arg++;
|
|
}
|
|
if (argc < arg + 2) {
|
|
usage("git-ssh-fetch [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
|
|
return 1;
|
|
}
|
|
commit_id = argv[arg];
|
|
url = argv[arg + 1];
|
|
|
|
if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
|
|
return 1;
|
|
|
|
if (get_version())
|
|
return 1;
|
|
|
|
if (pull(commit_id))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|