fsck: Don't require tmp_obj_ file names are 14 bytes in length
[gitweb.git] / builtin-archive.c
index c2e0c1ea5a676f30baa52151d9e6a2a94d4cd091..22445acbfc5279f391ac6afa855b21064ec54535 100644 (file)
@@ -5,25 +5,8 @@
 #include "cache.h"
 #include "builtin.h"
 #include "archive.h"
-#include "commit.h"
-#include "tree-walk.h"
-#include "exec_cmd.h"
 #include "pkt-line.h"
 #include "sideband.h"
-#include "attr.h"
-
-static const char archive_usage[] = \
-"git-archive --format=<fmt> [--prefix=<prefix>/] [--verbose] [<extra>] <tree-ish> [path...]";
-
-static struct archiver_desc
-{
-       const char *name;
-       write_archive_fn_t write_archive;
-       parse_extra_args_fn_t parse_extra;
-} archivers[] = {
-       { "tar", write_tar_archive, NULL },
-       { "zip", write_zip_archive, parse_extra_zip_args },
-};
 
 static int run_remote_archiver(const char *remote, int argc,
                               const char **argv)
@@ -32,7 +15,7 @@ static int run_remote_archiver(const char *remote, int argc,
        int fd[2], i, len, rv;
        struct child_process *conn;
        const char *exec = "git-upload-archive";
-       int exec_at = 0;
+       int exec_at = 0, exec_value_at = 0;
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
@@ -41,7 +24,14 @@ static int run_remote_archiver(const char *remote, int argc,
                                die("multiple --exec specified");
                        exec = arg + 7;
                        exec_at = i;
-                       break;
+               } else if (!strcmp(arg, "--exec")) {
+                       if (exec_at)
+                               die("multiple --exec specified");
+                       if (i + 1 >= argc)
+                               die("option --exec requires a value");
+                       exec = argv[i + 1];
+                       exec_at = i;
+                       exec_value_at = ++i;
                }
        }
 
@@ -49,7 +39,7 @@ static int run_remote_archiver(const char *remote, int argc,
        conn = git_connect(fd, url, exec, 0);
 
        for (i = 1; i < argc; i++) {
-               if (i == exec_at)
+               if (i == exec_at || i == exec_value_at)
                        continue;
                packet_write(fd[1], "argument %s\n", argv[i]);
        }
@@ -79,132 +69,6 @@ static int run_remote_archiver(const char *remote, int argc,
        return !!rv;
 }
 
-static int init_archiver(const char *name, struct archiver *ar)
-{
-       int rv = -1, i;
-
-       for (i = 0; i < ARRAY_SIZE(archivers); i++) {
-               if (!strcmp(name, archivers[i].name)) {
-                       memset(ar, 0, sizeof(*ar));
-                       ar->name = archivers[i].name;
-                       ar->write_archive = archivers[i].write_archive;
-                       ar->parse_extra = archivers[i].parse_extra;
-                       rv = 0;
-                       break;
-               }
-       }
-       return rv;
-}
-
-void parse_pathspec_arg(const char **pathspec, struct archiver_args *ar_args)
-{
-       ar_args->pathspec = get_pathspec(ar_args->base, pathspec);
-}
-
-void parse_treeish_arg(const char **argv, struct archiver_args *ar_args,
-                      const char *prefix)
-{
-       const char *name = argv[0];
-       const unsigned char *commit_sha1;
-       time_t archive_time;
-       struct tree *tree;
-       const struct commit *commit;
-       unsigned char sha1[20];
-
-       if (get_sha1(name, sha1))
-               die("Not a valid object name");
-
-       commit = lookup_commit_reference_gently(sha1, 1);
-       if (commit) {
-               commit_sha1 = commit->object.sha1;
-               archive_time = commit->date;
-       } else {
-               commit_sha1 = NULL;
-               archive_time = time(NULL);
-       }
-
-       tree = parse_tree_indirect(sha1);
-       if (tree == NULL)
-               die("not a tree object");
-
-       if (prefix) {
-               unsigned char tree_sha1[20];
-               unsigned int mode;
-               int err;
-
-               err = get_tree_entry(tree->object.sha1, prefix,
-                                    tree_sha1, &mode);
-               if (err || !S_ISDIR(mode))
-                       die("current working directory is untracked");
-
-               tree = parse_tree_indirect(tree_sha1);
-       }
-       ar_args->tree = tree;
-       ar_args->commit_sha1 = commit_sha1;
-       ar_args->commit = commit;
-       ar_args->time = archive_time;
-}
-
-int parse_archive_args(int argc, const char **argv, struct archiver *ar)
-{
-       const char *extra_argv[MAX_EXTRA_ARGS];
-       int extra_argc = 0;
-       const char *format = "tar";
-       const char *base = "";
-       int verbose = 0;
-       int i;
-
-       for (i = 1; i < argc; i++) {
-               const char *arg = argv[i];
-
-               if (!strcmp(arg, "--list") || !strcmp(arg, "-l")) {
-                       for (i = 0; i < ARRAY_SIZE(archivers); i++)
-                               printf("%s\n", archivers[i].name);
-                       exit(0);
-               }
-               if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
-                       verbose = 1;
-                       continue;
-               }
-               if (!prefixcmp(arg, "--format=")) {
-                       format = arg + 9;
-                       continue;
-               }
-               if (!prefixcmp(arg, "--prefix=")) {
-                       base = arg + 9;
-                       continue;
-               }
-               if (!strcmp(arg, "--")) {
-                       i++;
-                       break;
-               }
-               if (arg[0] == '-') {
-                       if (extra_argc > MAX_EXTRA_ARGS - 1)
-                               die("Too many extra options");
-                       extra_argv[extra_argc++] = arg;
-                       continue;
-               }
-               break;
-       }
-
-       /* We need at least one parameter -- tree-ish */
-       if (argc - 1 < i)
-               usage(archive_usage);
-       if (init_archiver(format, ar) < 0)
-               die("Unknown archive format '%s'", format);
-
-       if (extra_argc) {
-               if (!ar->parse_extra)
-                       die("'%s' format does not handle %s",
-                           ar->name, extra_argv[0]);
-               ar->args.extra = ar->parse_extra(extra_argc, extra_argv);
-       }
-       ar->args.verbose = verbose;
-       ar->args.base = base;
-
-       return i;
-}
-
 static const char *extract_remote_arg(int *ac, const char **av)
 {
        int ix, iy, cnt = *ac;
@@ -221,6 +85,13 @@ static const char *extract_remote_arg(int *ac, const char **av)
                                        die("Multiple --remote specified");
                                remote = arg + 9;
                                continue;
+                       } else if (!strcmp(arg, "--remote")) {
+                               if (remote)
+                                       die("Multiple --remote specified");
+                               if (++ix >= cnt)
+                                       die("option --remote requires a value");
+                               remote = av[ix];
+                               continue;
                        }
                        if (arg[0] != '-')
                                no_more_options = 1;
@@ -238,8 +109,6 @@ static const char *extract_remote_arg(int *ac, const char **av)
 
 int cmd_archive(int argc, const char **argv, const char *prefix)
 {
-       struct archiver ar;
-       int tree_idx;
        const char *remote = NULL;
 
        remote = extract_remote_arg(&argc, argv);
@@ -248,14 +117,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
 
        setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
 
-       memset(&ar, 0, sizeof(ar));
-       tree_idx = parse_archive_args(argc, argv, &ar);
-       if (prefix == NULL)
-               prefix = setup_git_directory();
-
-       argv += tree_idx;
-       parse_treeish_arg(argv, &ar.args, prefix);
-       parse_pathspec_arg(argv + 1, &ar.args);
-
-       return ar.write_archive(&ar.args);
+       return write_archive(argc, argv, prefix, 1);
 }