X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=send-pack.c;h=3c6abaede73868fdd6d154fe29d0dc701bc0b63a;hb=944d858969e4e14adefdd8f21fac5c8ab45f83f7;hp=ca3eabbd7f69a6ce2fef93c4dadb7287aaea65cd;hpb=56b6ed8881f3504b686a254cccdb5aa1a1a9e925;p=git.git

diff --git a/send-pack.c b/send-pack.c
index ca3eabbd..3c6abaed 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -3,9 +3,29 @@
 #include <sys/wait.h>
 
 static const char send_pack_usage[] = "git-send-pack [--exec=other] destination [heads]*";
-
 static const char *exec = "git-receive-pack";
 
+static int path_match(const char *path, int nr, char **match)
+{
+	int i;
+	int pathlen = strlen(path);
+
+	for (i = 0; i < nr; i++) {
+		char *s = match[i];
+		int len = strlen(s);
+
+		if (!len || len > pathlen)
+			continue;
+		if (memcmp(path + pathlen - len, s, len))
+			continue;
+		if (pathlen > len && path[pathlen - len - 1] != '/')
+			continue;
+		*s = 0;
+		return 1;
+	}
+	return 0;
+}
+
 struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
@@ -13,7 +33,83 @@ struct ref {
 	char name[0];
 };
 
-static struct ref *ref_list = NULL, **last_ref = &ref_list;
+static void exec_pack_objects(void)
+{
+	static char *args[] = {
+		"git-pack-objects",
+		"--stdout",
+		NULL
+	};
+	execvp("git-pack-objects", args);
+	die("git-pack-objects exec failed (%s)", strerror(errno));
+}
+
+static void exec_rev_list(struct ref *refs)
+{
+	static char *args[1000];
+	int i = 0;
+
+	args[i++] = "git-rev-list";	/* 0 */
+	args[i++] = "--objects";	/* 1 */
+	while (refs) {
+		char *buf = malloc(100);
+		if (i > 900)
+			die("git-rev-list environment overflow");
+		args[i++] = buf;
+		snprintf(buf, 50, "^%s", sha1_to_hex(refs->old_sha1));
+		buf += 50;
+		args[i++] = buf;
+		snprintf(buf, 50, "%s", sha1_to_hex(refs->new_sha1));
+		refs = refs->next;
+	}
+	args[i] = NULL;
+	execvp("git-rev-list", args);
+	die("git-rev-list exec failed (%s)", strerror(errno));
+}
+
+static void rev_list(int fd, struct ref *refs)
+{
+	int pipe_fd[2];
+	pid_t pack_objects_pid;
+
+	if (pipe(pipe_fd) < 0)
+		die("rev-list setup: pipe failed");
+	pack_objects_pid = fork();
+	if (!pack_objects_pid) {
+		dup2(pipe_fd[0], 0);
+		dup2(fd, 1);
+		close(pipe_fd[0]);
+		close(pipe_fd[1]);
+		close(fd);
+		exec_pack_objects();
+		die("pack-objects setup failed");
+	}
+	if (pack_objects_pid < 0)
+		die("pack-objects fork failed");
+	dup2(pipe_fd[1], 1);
+	close(pipe_fd[0]);
+	close(pipe_fd[1]);
+	close(fd);
+	exec_rev_list(refs);
+}
+
+static int pack_objects(int fd, struct ref *refs)
+{
+	pid_t rev_list_pid;
+
+	rev_list_pid = fork();
+	if (!rev_list_pid) {
+		rev_list(fd, refs);
+		die("rev-list setup failed");
+	}
+	if (rev_list_pid < 0)
+		die("rev-list fork failed");
+	/*
+	 * We don't wait for the rev-list pipeline in the parent:
+	 * we end up waiting for the other end instead
+	 */
+	return 0;
+}
 
 static int read_ref(const char *ref, unsigned char *sha1)
 {
@@ -33,8 +129,9 @@ static int read_ref(const char *ref, unsigned char *sha1)
 	return ret;
 }
 
-static int send_pack(int in, int out)
+static int send_pack(int in, int out, int nr_match, char **match)
 {
+	struct ref *ref_list = NULL, **last_ref = &ref_list;
 	struct ref *ref;
 
 	for (;;) {
@@ -53,6 +150,8 @@ static int send_pack(int in, int out)
 		if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ')
 			die("protocol error: expected sha/ref, got '%s'", buffer);
 		name = buffer + 41;
+		if (nr_match && !path_match(name, nr_match, match))
+			continue;
 		if (read_ref(name, new_sha1) < 0)
 			return error("no such local reference '%s'", name);
 		if (!has_sha1_file(old_sha1))
@@ -79,17 +178,8 @@ static int send_pack(int in, int out)
 	}
 	
 	packet_flush(out);
-	/*
-	 * FIXME! Here we need to now send the pack-file to the "out" fd, using something
-	 * like this:
-	 *
-	 *   fork() +
-	 *	dup2(out, 1) +
-	 *	execve("/bin/sh git-rev-list --objects ..for-each-ref-list.. | "
-	 *		"git-pack-objects --stdout");
-	 *
-	 * but I'm too tired right now.
-	 */
+	if (ref_list)
+		pack_objects(out, ref_list);
 	close(out);
 	return 0;
 }
@@ -193,7 +283,7 @@ int main(int argc, char **argv)
 	pid = setup_connection(fd, dest, heads);
 	if (pid < 0)
 		return 1;
-	ret = send_pack(fd[0], fd[1]);
+	ret = send_pack(fd[0], fd[1], nr_heads, heads);
 	close(fd[0]);
 	close(fd[1]);
 	waitpid(pid, NULL, 0);