prepare_packed_git(): refactor garbage reporting in pack directory

The hook to report "garbage" files in $GIT_OBJECT_DIRECTORY/pack/
could be generic but is too specific to count-object's needs.

Move the part to produce human-readable messages to count-objects,
and refine the interface to callback with the "bits" with values
defined in the cache.h header file, so that other callers (e.g.
prune) can later use the same mechanism to enumerate different
kinds of garbage files and do something intelligent about them,
other than reporting in textual messages.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index ad0c79954aa0dfb8b9918500d08dd841d19d4ab3..ba9291944f7752a0b7c671cd4d63309a15ba5df2 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -15,9 +15,31 @@ static int verbose;
 static unsigned long loose, packed, packed_loose;
 static off_t loose_size;
 
 static unsigned long loose, packed, packed_loose;
 static off_t loose_size;
 

-static void real_report_garbage(const char *desc, const char *path)
+static const char *bits_to_msg(unsigned seen_bits)
+{
+       switch (seen_bits) {
+       case 0:
+               return "no corresponding .idx or .pack";
+       case PACKDIR_FILE_GARBAGE:
+               return "garbage found";
+       case PACKDIR_FILE_PACK:
+               return "no corresponding .idx";
+       case PACKDIR_FILE_IDX:
+               return "no corresponding .pack";
+       case PACKDIR_FILE_PACK|PACKDIR_FILE_IDX:
+       default:
+               return NULL;
+       }
+}
+
+static void real_report_garbage(unsigned seen_bits, const char *path)

 {
        struct stat st;
 {
        struct stat st;

+       const char *desc = bits_to_msg(seen_bits);
+
+       if (!desc)
+               return;
+

        if (!stat(path, &st))
                size_garbage += st.st_size;
        warning("%s: %s", desc, path);
        if (!stat(path, &st))
                size_garbage += st.st_size;
        warning("%s: %s", desc, path);


@@ -27,7 +49,7 @@ static void real_report_garbage(const char *desc, const char *path)
 static void loose_garbage(const char *path)
 {
        if (verbose)
 static void loose_garbage(const char *path)
 {
        if (verbose)

-               report_garbage("garbage found", path);
+               report_garbage(PACKDIR_FILE_GARBAGE, path);

 }
 
 static int count_loose(const unsigned char *sha1, const char *path, void *data)
 }
 
 static int count_loose(const unsigned char *sha1, const char *path, void *data)

diff --git a/cache.h b/cache.h
index 4f554664c5bd064405082797ee1e8786ebdcea75..c6de1e9c0e0387956a015271fcf60f737663a038 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1255,8 +1255,11 @@ struct pack_entry {
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
 
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
 

-/* A hook for count-objects to report invalid files in pack directory */
-extern void (*report_garbage)(const char *desc, const char *path);
+/* A hook to report invalid files in pack directory */
+#define PACKDIR_FILE_PACK 1
+#define PACKDIR_FILE_IDX 2
+#define PACKDIR_FILE_GARBAGE 4
+extern void (*report_garbage)(unsigned seen_bits, const char *path);

 
 extern void prepare_packed_git(void);
 extern void reprepare_packed_git(void);
 
 extern void prepare_packed_git(void);
 extern void reprepare_packed_git(void);

diff --git a/path.c b/path.c
index 10f4cbf6b78607870461f21dd1cd0f7a2776bc49..75ec2363fdd94a891e7177fd9469dbc17855ea99 100644 (file)
--- a/path.c
+++ b/path.c
@@ -143,7 +143,7 @@ void report_linked_checkout_garbage(void)
                strbuf_setlen(&sb, len);
                strbuf_addstr(&sb, path);
                if (file_exists(sb.buf))
                strbuf_setlen(&sb, len);
                strbuf_addstr(&sb, path);
                if (file_exists(sb.buf))

-                       report_garbage("unused in linked checkout", sb.buf);
+                       report_garbage(PACKDIR_FILE_GARBAGE, sb.buf);

        }
        strbuf_release(&sb);
 }
        }
        strbuf_release(&sb);
 }

diff --git a/sha1_file.c b/sha1_file.c
index 1cee4384225fb9fab1a4b2a4949c8f730eb125ae..0c0b6529490a7d5908cd0ed62f17ed33ada86548 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1183,27 +1183,16 @@ void install_packed_git(struct packed_git *pack)
        packed_git = pack;
 }
 
        packed_git = pack;
 }
 

-void (*report_garbage)(const char *desc, const char *path);
+void (*report_garbage)(unsigned seen_bits, const char *path);

 
 static void report_helper(const struct string_list *list,
                          int seen_bits, int first, int last)
 {
 
 static void report_helper(const struct string_list *list,
                          int seen_bits, int first, int last)
 {

-       const char *msg;
-       switch (seen_bits) {
-       case 0:
-               msg = "no corresponding .idx or .pack";
-               break;
-       case 1:
-               msg = "no corresponding .idx";
-               break;
-       case 2:
-               msg = "no corresponding .pack";
-               break;
-       default:
+       if (seen_bits == (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX))

                return;
                return;

-       }
+

        for (; first < last; first++)
        for (; first < last; first++)

-               report_garbage(msg, list->items[first].string);
+               report_garbage(seen_bits, list->items[first].string);

 }
 
 static void report_pack_garbage(struct string_list *list)
 }
 
 static void report_pack_garbage(struct string_list *list)


@@ -1226,7 +1215,7 @@ static void report_pack_garbage(struct string_list *list)
                if (baselen == -1) {
                        const char *dot = strrchr(path, '.');
                        if (!dot) {
                if (baselen == -1) {
                        const char *dot = strrchr(path, '.');
                        if (!dot) {

-                               report_garbage("garbage found", path);
+                               report_garbage(PACKDIR_FILE_GARBAGE, path);

                                continue;
                        }
                        baselen = dot - path + 1;
                                continue;
                        }
                        baselen = dot - path + 1;


@@ -1298,7 +1287,7 @@ static void prepare_packed_git_one(char *objdir, int local)
                    ends_with(de->d_name, ".keep"))
                        string_list_append(&garbage, path.buf);
                else
                    ends_with(de->d_name, ".keep"))
                        string_list_append(&garbage, path.buf);
                else

-                       report_garbage("garbage found", path.buf);
+                       report_garbage(PACKDIR_FILE_GARBAGE, path.buf);

        }
        closedir(dir);
        report_pack_garbage(&garbage);
        }
        closedir(dir);
        report_pack_garbage(&garbage);