[PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges.
[debian-git.git] / ssh-fetch.c
blobd8f4368bc5eb09c3303a2a9cdbfb5bf395a6dcdf
1 #include "cache.h"
2 #include "commit.h"
3 #include "rsh.h"
4 #include "fetch.h"
5 #include "refs.h"
7 static int fd_in;
8 static int fd_out;
10 static unsigned char remote_version = 0;
11 static unsigned char local_version = 1;
13 static ssize_t force_write(int fd, void *buffer, size_t length)
15 ssize_t ret = 0;
16 while (ret < length) {
17 ssize_t size = write(fd, buffer + ret, length - ret);
18 if (size < 0) {
19 return size;
21 if (size == 0) {
22 return ret;
24 ret += size;
26 return ret;
29 void prefetch(unsigned char *sha1)
31 char type = 'o';
32 force_write(fd_out, &type, 1);
33 force_write(fd_out, sha1, 20);
34 //memcpy(requested + 20 * prefetches++, sha1, 20);
37 static char conn_buf[4096];
38 static size_t conn_buf_posn = 0;
40 int fetch(unsigned char *sha1)
42 int ret;
43 signed char remote;
45 if (conn_buf_posn) {
46 remote = conn_buf[0];
47 memmove(conn_buf, conn_buf + 1, --conn_buf_posn);
48 } else {
49 if (read(fd_in, &remote, 1) < 1)
50 return -1;
52 //fprintf(stderr, "Got %d\n", remote);
53 if (remote < 0)
54 return remote;
55 ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);
56 if (!ret)
57 pull_say("got %s\n", sha1_to_hex(sha1));
58 return ret;
61 static int get_version(void)
63 char type = 'v';
64 write(fd_out, &type, 1);
65 write(fd_out, &local_version, 1);
66 if (read(fd_in, &remote_version, 1) < 1) {
67 return error("Couldn't read version from remote end");
69 return 0;
72 int fetch_ref(char *ref, unsigned char *sha1)
74 signed char remote;
75 char type = 'r';
76 write(fd_out, &type, 1);
77 write(fd_out, ref, strlen(ref) + 1);
78 read(fd_in, &remote, 1);
79 if (remote < 0)
80 return remote;
81 read(fd_in, sha1, 20);
82 return 0;
85 int main(int argc, char **argv)
87 char *commit_id;
88 char *url;
89 int arg = 1;
90 const char *prog;
92 prog = getenv("GIT_SSH_PUSH");
93 if (!prog) prog = "git-ssh-upload";
95 while (arg < argc && argv[arg][0] == '-') {
96 if (argv[arg][1] == 't') {
97 get_tree = 1;
98 } else if (argv[arg][1] == 'c') {
99 get_history = 1;
100 } else if (argv[arg][1] == 'a') {
101 get_all = 1;
102 get_tree = 1;
103 get_history = 1;
104 } else if (argv[arg][1] == 'v') {
105 get_verbosely = 1;
106 } else if (argv[arg][1] == 'w') {
107 write_ref = argv[arg + 1];
108 arg++;
110 arg++;
112 if (argc < arg + 2) {
113 usage("git-ssh-fetch [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
114 return 1;
116 commit_id = argv[arg];
117 url = argv[arg + 1];
119 if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
120 return 1;
122 if (get_version())
123 return 1;
125 if (pull(commit_id))
126 return 1;
128 return 0;