X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rpull.c;h=f4ab89836455a40aaab3ff4114396185f6d5655a;hb=000182eacf99cde27d5916aa415921924b82972c;hp=6624440d5ad24854e1bd1a8dff628427581198e0;hpb=4250a5e5b1755e45153248217fe1d5550c972c8d;p=git.git

diff --git a/rpull.c b/rpull.c
index 6624440d..f4ab8983 100644
--- a/rpull.c
+++ b/rpull.c
@@ -1,23 +1,42 @@
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
 #include "rsh.h"
 #include "pull.h"
 
 static int fd_in;
 static int fd_out;
 
+static unsigned char remote_version = 0;
+static unsigned char local_version = 1;
+
 int fetch(unsigned char *sha1)
 {
+	int ret;
+	signed char remote;
+	char type = 'o';
 	if (has_sha1_file(sha1))
 		return 0;
+	write(fd_out, &type, 1);
 	write(fd_out, sha1, 20);
-	return write_sha1_from_fd(sha1, fd_in);
+	if (read(fd_in, &remote, 1) < 1)
+		return -1;
+	if (remote < 0)
+		return remote;
+	ret = write_sha1_from_fd(sha1, fd_in);
+	if (!ret)
+		pull_say("got %s\n", sha1_to_hex(sha1));
+	return ret;
+}
+
+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 main(int argc, char **argv)
@@ -31,21 +50,28 @@ int main(int argc, char **argv)
 			get_tree = 1;
 		} else if (argv[arg][1] == 'c') {
 			get_history = 1;
+		} else if (argv[arg][1] == 'd') {
+			get_delta = 0;
 		} else if (argv[arg][1] == 'a') {
 			get_all = 1;
 			get_tree = 1;
 			get_history = 1;
+		} else if (argv[arg][1] == 'v') {
+			get_verbosely = 1;
 		}
 		arg++;
 	}
 	if (argc < arg + 2) {
-		usage("rpull [-c] [-t] [-a] commit-id url");
+		usage("git-rpull [-c] [-t] [-a] [-v] [-d] commit-id url");
 		return 1;
 	}
 	commit_id = argv[arg];
 	url = argv[arg + 1];
 
-	if (setup_connection(&fd_in, &fd_out, "rpush", url, arg, argv + 1))
+	if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1))
+		return 1;
+
+	if (get_version())
 		return 1;
 
 	if (pull(commit_id))