Change fetch_pack() and friends to take string_list arguments
[gitweb.git] / builtin / verify-pack.c
index b6079ae6cb03c7f3112c6eebc8c9a012d690a125..66cd2df0f878d362a86e8dbc3fcd49b0c2f64c0c 100644 (file)
 #include "builtin.h"
 #include "cache.h"
-#include "pack.h"
-#include "pack-revindex.h"
+#include "run-command.h"
 #include "parse-options.h"
 
-#define MAX_CHAIN 50
-
 #define VERIFY_PACK_VERBOSE 01
 #define VERIFY_PACK_STAT_ONLY 02
 
-static void show_pack_info(struct packed_git *p, unsigned int flags)
-{
-       uint32_t nr_objects, i;
-       int cnt;
-       int stat_only = flags & VERIFY_PACK_STAT_ONLY;
-       unsigned long chain_histogram[MAX_CHAIN+1], baseobjects;
-
-       nr_objects = p->num_objects;
-       memset(chain_histogram, 0, sizeof(chain_histogram));
-       baseobjects = 0;
-
-       for (i = 0; i < nr_objects; i++) {
-               const unsigned char *sha1;
-               unsigned char base_sha1[20];
-               const char *type;
-               unsigned long size;
-               unsigned long store_size;
-               off_t offset;
-               unsigned int delta_chain_length;
-
-               sha1 = nth_packed_object_sha1(p, i);
-               if (!sha1)
-                       die("internal error pack-check nth-packed-object");
-               offset = nth_packed_object_offset(p, i);
-               type = packed_object_info_detail(p, offset, &size, &store_size,
-                                                &delta_chain_length,
-                                                base_sha1);
-               if (!stat_only)
-                       printf("%s ", sha1_to_hex(sha1));
-               if (!delta_chain_length) {
-                       if (!stat_only)
-                               printf("%-6s %lu %lu %"PRIuMAX"\n",
-                                      type, size, store_size, (uintmax_t)offset);
-                       baseobjects++;
-               }
-               else {
-                       if (!stat_only)
-                               printf("%-6s %lu %lu %"PRIuMAX" %u %s\n",
-                                      type, size, store_size, (uintmax_t)offset,
-                                      delta_chain_length, sha1_to_hex(base_sha1));
-                       if (delta_chain_length <= MAX_CHAIN)
-                               chain_histogram[delta_chain_length]++;
-                       else
-                               chain_histogram[0]++;
-               }
-       }
-
-       if (baseobjects)
-               printf("non delta: %lu object%s\n",
-                      baseobjects, baseobjects > 1 ? "s" : "");
-
-       for (cnt = 1; cnt <= MAX_CHAIN; cnt++) {
-               if (!chain_histogram[cnt])
-                       continue;
-               printf("chain length = %d: %lu object%s\n", cnt,
-                      chain_histogram[cnt],
-                      chain_histogram[cnt] > 1 ? "s" : "");
-       }
-       if (chain_histogram[0])
-               printf("chain length > %d: %lu object%s\n", MAX_CHAIN,
-                      chain_histogram[0],
-                      chain_histogram[0] > 1 ? "s" : "");
-}
-
 static int verify_one_pack(const char *path, unsigned int flags)
 {
-       char arg[PATH_MAX];
-       int len;
+       struct child_process index_pack;
+       const char *argv[] = {"index-pack", NULL, NULL, NULL };
+       struct strbuf arg = STRBUF_INIT;
        int verbose = flags & VERIFY_PACK_VERBOSE;
        int stat_only = flags & VERIFY_PACK_STAT_ONLY;
-       struct packed_git *pack;
        int err;
 
-       len = strlcpy(arg, path, PATH_MAX);
-       if (len >= PATH_MAX)
-               return error("name too long: %s", path);
-
-       /*
-        * In addition to "foo.idx" we accept "foo.pack" and "foo";
-        * normalize these forms to "foo.idx" for add_packed_git().
-        */
-       if (has_extension(arg, ".pack")) {
-               strcpy(arg + len - 5, ".idx");
-               len--;
-       } else if (!has_extension(arg, ".idx")) {
-               if (len + 4 >= PATH_MAX)
-                       return error("name too long: %s.idx", arg);
-               strcpy(arg + len, ".idx");
-               len += 4;
-       }
+       if (stat_only)
+               argv[1] = "--verify-stat-only";
+       else if (verbose)
+               argv[1] = "--verify-stat";
+       else
+               argv[1] = "--verify";
 
        /*
-        * add_packed_git() uses our buffer (containing "foo.idx") to
-        * build the pack filename ("foo.pack").  Make sure it fits.
+        * In addition to "foo.pack" we accept "foo.idx" and "foo";
+        * normalize these forms to "foo.pack" for "index-pack --verify".
         */
-       if (len + 1 >= PATH_MAX) {
-               arg[len - 4] = '\0';
-               return error("name too long: %s.pack", arg);
-       }
-
-       pack = add_packed_git(arg, len, 1);
-       if (!pack)
-               return error("packfile %s not found.", arg);
+       strbuf_addstr(&arg, path);
+       if (has_extension(arg.buf, ".idx"))
+               strbuf_splice(&arg, arg.len - 3, 3, "pack", 4);
+       else if (!has_extension(arg.buf, ".pack"))
+               strbuf_add(&arg, ".pack", 5);
+       argv[2] = arg.buf;
 
-       install_packed_git(pack);
+       memset(&index_pack, 0, sizeof(index_pack));
+       index_pack.argv = argv;
+       index_pack.git_cmd = 1;
 
-       if (!stat_only)
-               err = verify_pack(pack);
-       else
-               err = open_pack_index(pack);
+       err = run_command(&index_pack);
 
        if (verbose || stat_only) {
                if (err)
-                       printf("%s: bad\n", pack->pack_name);
+                       printf("%s: bad\n", arg.buf);
                else {
-                       show_pack_info(pack, flags);
                        if (!stat_only)
-                               printf("%s: ok\n", pack->pack_name);
+                               printf("%s: ok\n", arg.buf);
                }
        }
+       strbuf_release(&arg);
 
        return err;
 }
 
 static const char * const verify_pack_usage[] = {
-       "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>...",
+       N_("git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."),
        NULL
 };
 
@@ -144,9 +63,9 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        unsigned int flags = 0;
        int i;
        const struct option verify_pack_options[] = {
-               OPT_BIT('v', "verbose", &flags, "verbose",
+               OPT_BIT('v', "verbose", &flags, N_("verbose"),
                        VERIFY_PACK_VERBOSE),
-               OPT_BIT('s', "stat-only", &flags, "show statistics only",
+               OPT_BIT('s', "stat-only", &flags, N_("show statistics only"),
                        VERIFY_PACK_STAT_ONLY),
                OPT_END()
        };
@@ -159,7 +78,6 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        for (i = 0; i < argc; i++) {
                if (verify_one_pack(argv[i], flags))
                        err = 1;
-               discard_revindex();
        }
 
        return err;