@matheusbsbs / matheus-bagliano / commits / 217542640e
Fork 0

built-in tar-tree and remote tar-tree

This makes tar-tree a built-in. As an added bonus, you can now say: git tar-tree --remote=remote-repository <ent> [<base>] This does not work with git-daemon yet, but should work with localhost and git over ssh transports. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed May 18, 2006 at 18:46 UTC 217542640ed219c980fff2b3c307c4520120f20f
5 files changed +142 -6
Makefile
+3 -3
@@ -161,7 +161,7 @@ PROGRAMS = \
161 git-receive-pack$X git-rev-parse$X \
162 git-send-pack$X git-show-branch$X git-shell$X \
163 git-show-index$X git-ssh-fetch$X \
164 - git-ssh-upload$X git-tar-tree$X git-unpack-file$X \
164 + git-ssh-upload$X git-unpack-file$X \
165 git-unpack-objects$X git-update-index$X git-update-server-info$X \
166 git-upload-pack$X git-verify-pack$X git-write-tree$X \
167 git-update-ref$X git-symbolic-ref$X \
@@ -171,7 +171,7 @@ PROGRAMS = \
171 BUILT_INS = git-log$X git-whatchanged$X git-show$X \
172 git-count-objects$X git-diff$X git-push$X \
173 git-grep$X git-rev-list$X git-check-ref-format$X \
174 - git-init-db$X
174 + git-init-db$X git-tar-tree$X git-upload-tar$X
175
176 # what 'all' will build and 'install' will install, in gitexecdir
177 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -220,7 +220,7 @@ LIB_OBJS = \
220 BUILTIN_OBJS = \
221 builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
222 builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \
223 - builtin-init-db.o
223 + builtin-init-db.o builtin-tar-tree.o builtin-upload-tar.o
224
225 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
226 LIBS = $(GITLIBS) -lz
builtin-tar-tree.c renamed
+60 -2
@@ -7,11 +7,14 @@
7 #include "commit.h"
8 #include "strbuf.h"
9 #include "tar.h"
10 +#include "builtin.h"
11 +#include "pkt-line.h"
12
13 #define RECORDSIZE (512)
14 #define BLOCKSIZE (RECORDSIZE * 20)
15
14 -static const char tar_tree_usage[] = "git-tar-tree <key> [basedir]";
16 +static const char tar_tree_usage[] =
17 +"git-tar-tree [--remote=<repo>] <ent> [basedir]";
18
19 static char block[BLOCKSIZE];
20 static unsigned long offset;
@@ -301,7 +304,7 @@ static void traverse_tree(struct tree_desc *tree, struct strbuf *path)
304 }
305 }
306
304 -int main(int argc, char **argv)
307 +int generate_tar(int argc, const char **argv)
308 {
309 unsigned char sha1[20], tree_sha1[20];
310 struct commit *commit;
@@ -348,3 +351,58 @@ int main(int argc, char **argv)
351 free(current_path.buf);
352 return 0;
353 }
354 +
355 +static const char *exec = "git-upload-tar";
356 +
357 +static int remote_tar(int argc, const char **argv)
358 +{
359 + int fd[2], ret, len;
360 + pid_t pid;
361 + char buf[1024];
362 + char *url;
363 +
364 + if (argc < 3 || 4 < argc)
365 + usage(tar_tree_usage);
366 +
367 + /* --remote=<repo> */
368 + url = strdup(argv[1]+9);
369 + pid = git_connect(fd, url, exec);
370 + if (pid < 0)
371 + return 1;
372 +
373 + packet_write(fd[1], "want %s\n", argv[2]);
374 + if (argv[3])
375 + packet_write(fd[1], "base %s\n", argv[3]);
376 + packet_flush(fd[1]);
377 +
378 + len = packet_read_line(fd[0], buf, sizeof(buf));
379 + if (!len)
380 + die("git-tar-tree: expected ACK/NAK, got EOF");
381 + if (buf[len-1] == '\n')
382 + buf[--len] = 0;
383 + if (strcmp(buf, "ACK")) {
384 + if (5 < len && !strncmp(buf, "NACK ", 5))
385 + die("git-tar-tree: NACK %s", buf + 5);
386 + die("git-tar-tree: protocol error");
387 + }
388 + /* expect a flush */
389 + len = packet_read_line(fd[0], buf, sizeof(buf));
390 + if (len)
391 + die("git-tar-tree: expected a flush");
392 +
393 + /* Now, start reading from fd[0] and spit it out to stdout */
394 + ret = copy_fd(fd[0], 1);
395 + close(fd[0]);
396 +
397 + ret |= finish_connect(pid);
398 + return !!ret;
399 +}
400 +
401 +int cmd_tar_tree(int argc, const char **argv, char **envp)
402 +{
403 + if (argc < 2)
404 + usage(tar_tree_usage);
405 + if (!strncmp("--remote=", argv[1], 9))
406 + return remote_tar(argc, argv);
407 + return generate_tar(argc, argv);
408 +}
builtin-upload-tar.c new
+74
@@ -0,0 +1,74 @@
1 +/*
2 + * Copyright (c) 2006 Junio C Hamano
3 + */
4 +#include "cache.h"
5 +#include "pkt-line.h"
6 +#include "exec_cmd.h"
7 +#include "builtin.h"
8 +
9 +static const char upload_tar_usage[] = "git-upload-tar <repo>";
10 +
11 +static int nak(const char *reason)
12 +{
13 + packet_write(1, "NACK %s\n", reason);
14 + packet_flush(1);
15 + return 1;
16 +}
17 +
18 +int cmd_upload_tar(int argc, const char **argv, char **envp)
19 +{
20 + int len;
21 + const char *dir = argv[1];
22 + char buf[8192];
23 + unsigned char sha1[20];
24 + char *base = NULL;
25 + char hex[41];
26 + int ac;
27 + const char *av[4];
28 +
29 + if (argc != 2)
30 + usage(upload_tar_usage);
31 + if (strlen(dir) < sizeof(buf)-1)
32 + strcpy(buf, dir); /* enter-repo smudges its argument */
33 + else
34 + packet_write(1, "NACK insanely long repository name %s\n", dir);
35 + if (!enter_repo(buf, 0)) {
36 + packet_write(1, "NACK not a git archive %s\n", dir);
37 + packet_flush(1);
38 + return 1;
39 + }
40 +
41 + len = packet_read_line(0, buf, sizeof(buf));
42 + if (len < 5 || strncmp("want ", buf, 5))
43 + return nak("expected want");
44 + if (buf[len-1] == '\n')
45 + buf[--len] = 0;
46 + if (get_sha1(buf + 5, sha1))
47 + return nak("expected sha1");
48 + strcpy(hex, sha1_to_hex(sha1));
49 +
50 + len = packet_read_line(0, buf, sizeof(buf));
51 + if (len) {
52 + if (len < 5 || strncmp("base ", buf, 5))
53 + return nak("expected (optional) base");
54 + if (buf[len-1] == '\n')
55 + buf[--len] = 0;
56 + base = strdup(buf + 5);
57 + len = packet_read_line(0, buf, sizeof(buf));
58 + }
59 + if (len)
60 + return nak("expected flush");
61 +
62 + packet_write(1, "ACK\n");
63 + packet_flush(1);
64 +
65 + ac = 0;
66 + av[ac++] = "tar-tree";
67 + av[ac++] = hex;
68 + if (base)
69 + av[ac++] = base;
70 + av[ac++] = NULL;
71 + execv_git_cmd(av);
72 + /* should it return that is an error */
73 + return 1;
74 +}
builtin.h
+2
@@ -27,5 +27,7 @@ extern int cmd_grep(int argc, const char **argv, char **envp);
27 extern int cmd_rev_list(int argc, const char **argv, char **envp);
28 extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
29 extern int cmd_init_db(int argc, const char **argv, char **envp);
30 +extern int cmd_tar_tree(int argc, const char **argv, char **envp);
31 +extern int cmd_upload_tar(int argc, const char **argv, char **envp);
32
33 #endif
git.c
+3 -1
@@ -50,8 +50,10 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
50 { "count-objects", cmd_count_objects },
51 { "diff", cmd_diff },
52 { "grep", cmd_grep },
53 - { "rev-list", cmd_rev_list },
53 { "init-db", cmd_init_db },
54 + { "tar-tree", cmd_tar_tree },
55 + { "upload-tar", cmd_upload_tar },
56 + { "rev-list", cmd_rev_list },
57 { "check-ref-format", cmd_check_ref_format }
58 };
59 int i;