bisect: rework some rev related functions to make them more reusable

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 907e36828f61ee925adfe5eff111abb2fe3f0681..4942892e9f83abc7beed6570d508cfe76da126a0 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -3,21 +3,18 @@
 #include "progress.h"
 
 static const char prune_packed_usage[] =
-"git-prune-packed [-n] [-q]";
+"git prune-packed [-n] [-q]";
 
 #define DRY_RUN 01
 #define VERBOSE 02
 
-static struct progress progress;
+static struct progress *progress;
 
 static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 {
        struct dirent *de;
        char hex[40];
 
-       if (opts == VERBOSE)
-               display_progress(&progress, i + 1);
-
        sprintf(hex, "%02x", i);
        while ((de = readdir(dir)) != NULL) {
                unsigned char sha1[20];
@@ -26,13 +23,14 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
                memcpy(hex+2, de->d_name, 38);
                if (get_sha1_hex(hex, sha1))
                        continue;
-               if (!has_sha1_pack(sha1, NULL))
+               if (!has_sha1_pack(sha1))
                        continue;
                memcpy(pathname + len, de->d_name, 38);
                if (opts & DRY_RUN)
                        printf("rm -f %s\n", pathname);
                else if (unlink(pathname) < 0)
                        error("unable to unlink %s", pathname);
+               display_progress(progress, i + 1);
        }
        pathname[len] = 0;
        rmdir(pathname);
@@ -46,8 +44,7 @@ void prune_packed_objects(int opts)
        int len = strlen(dir);
 
        if (opts == VERBOSE)
-               start_progress_delay(&progress,
-                       "Removing duplicate objects",
+               progress = start_progress_delay("Removing duplicate objects",
                        256, 95, 2);
 
        if (len > PATH_MAX - 42)
@@ -58,6 +55,7 @@ void prune_packed_objects(int opts)
        for (i = 0; i < 256; i++) {
                DIR *d;
 
+               display_progress(progress, i + 1);
                sprintf(pathname + len, "%02x/", i);
                d = opendir(pathname);
                if (!d)
@@ -65,8 +63,7 @@ void prune_packed_objects(int opts)
                prune_dir(i, d, pathname, len + 3, opts);
                closedir(d);
        }
-       if (opts == VERBOSE)
-               stop_progress(&progress);
+       stop_progress(&progress);
 }
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
@@ -89,7 +86,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
                /* Handle arguments here .. */
                usage(prune_packed_usage);
        }
-       sync();
        prune_packed_objects(opts);
        return 0;
 }