Changeset 782 for git/branches/dmik/archive.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• archive.c (modified) (18 diffs)

git/branches/dmik/archive.c ¶

@@ -8 +8 @@
 
 static char const * const archive_usage[] = {
-        "git archive [options] <tree-ish> [<path>...]",
-        "git archive --list",
-        "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]",
-        "git archive --remote <repo> [--exec <cmd>] --list",
+        N_("git archive [options] <tree-ish> [<path>...]"),
+        N_("git archive --list"),
+        N_("git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"),
+        N_("git archive --remote <repo> [--exec <cmd>] --list"),
         NULL
 };
@@ -18 +18 @@
 static int nr_archivers;
 static int alloc_archivers;
+static int remote_allow_unreachable;
 
 void register_archiver(struct archiver *ar)
@@ -60 +61 @@
 }
 
-static void *sha1_file_to_archive(const char *path, const unsigned char *sha1,
-                unsigned int mode, enum object_type *type,
-                unsigned long *sizep, const struct commit *commit)
+void *sha1_file_to_archive(const struct archiver_args *args,
+                           const char *path, const unsigned char *sha1,
+                           unsigned int mode, enum object_type *type,
+                           unsigned long *sizep)
 {
         void *buffer;
-
+        const struct commit *commit = args->convert ? args->commit : NULL;
+
+        path += args->baselen;
         buffer = read_sha1_file(sha1, type, sizep);
         if (buffer && S_ISREG(mode)) {
@@ -110 +114 @@
         struct git_attr_check check[2];
         const char *path_without_prefix;
-        int convert = 0;
         int err;
-        enum object_type type;
-        unsigned long size;
-        void *buffer;
-
+
+        args->convert = 0;
         strbuf_reset(&path);
         strbuf_grow(&path, PATH_MAX);
@@ -121 +122 @@
         strbuf_add(&path, base, baselen);
         strbuf_addstr(&path, filename);
+        if (S_ISDIR(mode) || S_ISGITLINK(mode))
+                strbuf_addch(&path, '/');
         path_without_prefix = path.buf + args->baselen;
 
@@ -127 +130 @@
                 if (ATTR_TRUE(check[0].value))
                         return 0;
-                convert = ATTR_TRUE(check[1].value);
+                args->convert = ATTR_TRUE(check[1].value);
         }
 
         if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
-                strbuf_addch(&path, '/');
                 if (args->verbose)
                         fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-                err = write_entry(args, sha1, path.buf, path.len, mode, NULL, 0);
+                err = write_entry(args, sha1, path.buf, path.len, mode);
                 if (err)
                         return err;
@@ -140 +142 @@
         }
 
-        buffer = sha1_file_to_archive(path_without_prefix, sha1, mode,
-                        &type, &size, convert ? args->commit : NULL);
-        if (!buffer)
-                return error("cannot read %s", sha1_to_hex(sha1));
         if (args->verbose)
                 fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-        err = write_entry(args, sha1, path.buf, path.len, mode, buffer, size);
-        free(buffer);
-        return err;
+        return write_entry(args, sha1, path.buf, path.len, mode);
 }
 
@@ -157 +153 @@
         struct unpack_trees_options opts;
         struct tree_desc t;
-        struct pathspec pathspec;
         int err;
 
@@ -168 +163 @@
                         fprintf(stderr, "%.*s\n", (int)len, args->base);
                 err = write_entry(args, args->tree->object.sha1, args->base,
-                                len, 040777, NULL, 0);
+                                  len, 040777);
                 if (err)
                         return err;
@@ -192 +187 @@
         }
 
-        init_pathspec(&pathspec, args->pathspec);
-        err = read_tree_recursive(args->tree, "", 0, 0, &pathspec,
+        err = read_tree_recursive(args->tree, "", 0, 0, &args->pathspec,
                                   write_archive_entry, &context);
-        free_pathspec(&pathspec);
         if (err == READ_TREE_RECURSIVE)
                 err = 0;
@@ -228 +221 @@
         int ret;
 
-        init_pathspec(&pathspec, paths);
+        parse_pathspec(&pathspec, 0, 0, "", paths);
         ret = read_tree_recursive(tree, "", 0, 0, &pathspec, reject_entry, NULL);
         free_pathspec(&pathspec);
@@ -237 +230 @@
                 struct archiver_args *ar_args)
 {
-        ar_args->pathspec = pathspec = get_pathspec("", pathspec);
+        /*
+         * must be consistent with parse_pathspec in path_exists()
+         * Also if pathspec patterns are dependent, we're in big
+         * trouble as we test each one separately
+         */
+        parse_pathspec(&ar_args->pathspec, 0,
+                       PATHSPEC_PREFER_FULL,
+                       "", pathspec);
         if (pathspec) {
                 while (*pathspec) {
-                        if (!path_exists(ar_args->tree, *pathspec))
-                                die("path not found: %s", *pathspec);
+                        if (**pathspec && !path_exists(ar_args->tree, *pathspec))
+                                die(_("pathspec '%s' did not match any files"), *pathspec);
                         pathspec++;
                 }
@@ -259 +259 @@
 
         /* Remotes are only allowed to fetch actual refs */
-        if (remote) {
+        if (remote && !remote_allow_unreachable) {
                 char *ref = NULL;
-                const char *refname, *colon = NULL;
-
-                colon = strchr(name, ':');
-                if (colon)
-                        refname = xstrndup(name, colon - name);
-                else
-                        refname = name;
-
-                if (!dwim_ref(refname, strlen(refname), sha1, &ref))
-                        die("no such ref: %s", refname);
-                if (refname != name)
-                        free((void *)refname);
+                const char *colon = strchrnul(name, ':');
+                int refnamelen = colon - name;
+
+                if (!dwim_ref(name, refnamelen, sha1, &ref))
+                        die("no such ref: %.*s", refnamelen, name);
                 free(ref);
         }
@@ -333 +326 @@
         struct option opts[] = {
                 OPT_GROUP(""),
-                OPT_STRING(0, "format", &format, "fmt", "archive format"),
-                OPT_STRING(0, "prefix", &base, "prefix",
-                        "prepend prefix to each pathname in the archive"),
-                OPT_STRING('o', "output", &output, "file",
-                        "write the archive to this file"),
+                OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")),
+                OPT_STRING(0, "prefix", &base, N_("prefix"),
+                        N_("prepend prefix to each pathname in the archive")),
+                OPT_STRING('o', "output", &output, N_("file"),
+                        N_("write the archive to this file")),
                 OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
-                        "read .gitattributes in working directory"),
-                OPT__VERBOSE(&verbose, "report archived files on stderr"),
-                OPT__COMPR('0', &compression_level, "store only", 0),
-                OPT__COMPR('1', &compression_level, "compress faster", 1),
+                        N_("read .gitattributes in working directory")),
+                OPT__VERBOSE(&verbose, N_("report archived files on stderr")),
+                OPT__COMPR('0', &compression_level, N_("store only"), 0),
+                OPT__COMPR('1', &compression_level, N_("compress faster"), 1),
                 OPT__COMPR_HIDDEN('2', &compression_level, 2),
                 OPT__COMPR_HIDDEN('3', &compression_level, 3),
@@ -350 +343 @@
                 OPT__COMPR_HIDDEN('7', &compression_level, 7),
                 OPT__COMPR_HIDDEN('8', &compression_level, 8),
-                OPT__COMPR('9', &compression_level, "compress better", 9),
+                OPT__COMPR('9', &compression_level, N_("compress better"), 9),
                 OPT_GROUP(""),
                 OPT_BOOL('l', "list", &list,
-                        "list supported archive formats"),
+                        N_("list supported archive formats")),
                 OPT_GROUP(""),
-                OPT_STRING(0, "remote", &remote, "repo",
-                        "retrieve the archive from remote repository <repo>"),
-                OPT_STRING(0, "exec", &exec, "cmd",
-                        "path to the remote git-upload-archive command"),
+                OPT_STRING(0, "remote", &remote, N_("repo"),
+                        N_("retrieve the archive from remote repository <repo>")),
+                OPT_STRING(0, "exec", &exec, N_("command"),
+                        N_("path to the remote git-upload-archive command")),
                 OPT_END()
         };
@@ -410 +403 @@
 }
 
+static int git_default_archive_config(const char *var, const char *value,
+                                      void *cb)
+{
+        if (!strcmp(var, "uploadarchive.allowunreachable"))
+                remote_allow_unreachable = git_config_bool(var, value);
+        return git_default_config(var, value, cb);
+}
+
 int write_archive(int argc, const char **argv, const char *prefix,
                   int setup_prefix, const char *name_hint, int remote)
@@ -420 +421 @@
                 prefix = setup_git_directory_gently(&nongit);
 
-        git_config(git_default_config, NULL);
+        git_config(git_default_archive_config, NULL);
         init_tar_archiver();
         init_zip_archiver();
@@ -449 +450 @@
          * filename).
          */
-        if (prefixlen < 2 || filename[prefixlen-1] != '.')
+        if (prefixlen < 2 || filename[prefixlen - 1] != '.')
                 return 0;
         return !strcmp(filename + prefixlen, ext);