Merge branch 'en/sparse-checkout'

[thirdparty/git.git] / prune-packed.c

diff --git a/prune-packed.c b/prune-packed.c
index a2f448830c8c89cd19f82f2ec215ad349583777e..261520b472c9c2bbac57ea94460dcabeefb3a91b 100644 (file)
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -1,66 +1,43 @@
-#include "cache.h"
+#include "object-store.h"
+#include "packfile.h"
+#include "progress.h"
+#include "prune-packed.h"
 
-static const char prune_packed_usage[] = "git-prune-packed (no arguments)";
+static struct progress *progress;
 
-static void prune_dir(int i, DIR *dir, char *pathname, int len)
+static int prune_subdir(unsigned int nr, const char *path, void *data)
 {
-       struct dirent *de;
-       char hex[40];
-
-       sprintf(hex, "%02x", i);
-       while ((de = readdir(dir)) != NULL) {
-               unsigned char sha1[20];
-               if (strlen(de->d_name) != 38)
-                       continue;
-               memcpy(hex+2, de->d_name, 38);
-               if (get_sha1_hex(hex, sha1))
-                       continue;
-               if (!has_sha1_pack(sha1))
-                       continue;
-               memcpy(pathname + len, de->d_name, 38);
-               if (unlink(pathname) < 0)
-                       error("unable to unlink %s", pathname);
-       }
+       int *opts = data;
+       display_progress(progress, nr + 1);
+       if (!(*opts & PRUNE_PACKED_DRY_RUN))
+               rmdir(path);
+       return 0;
 }
 
-static void prune_packed_objects(void)
+static int prune_object(const struct object_id *oid, const char *path,
+                        void *data)
 {
-       int i;
-       static char pathname[PATH_MAX];
-       const char *dir = get_object_directory();
-       int len = strlen(dir);
+       int *opts = data;
 
-       if (len > PATH_MAX - 42)
-               die("impossible object directory");
-       memcpy(pathname, dir, len);
-       if (len && pathname[len-1] != '/')
-               pathname[len++] = '/';
-       for (i = 0; i < 256; i++) {
-               DIR *d;
+       if (!has_object_pack(oid))
+               return 0;
 
-               sprintf(pathname + len, "%02x/", i);
-               d = opendir(pathname);
-               if (!d)
-                       die("unable to open %s", pathname);
-               prune_dir(i, d, pathname, len + 3);
-               closedir(d);
-       }
+       if (*opts & PRUNE_PACKED_DRY_RUN)
+               printf("rm -f %s\n", path);
+       else
+               unlink_or_warn(path);
+       return 0;
 }
 
-int main(int argc, char **argv)
+void prune_packed_objects(int opts)
 {
-       int i;
+       if (opts & PRUNE_PACKED_VERBOSE)
+               progress = start_delayed_progress(_("Removing duplicate objects"), 256);
 
-       for (i = 1; i < argc; i++) {
-               const char *arg = argv[i];
+       for_each_loose_file_in_objdir(get_object_directory(),
+                                     prune_object, NULL, prune_subdir, &opts);
 
-               if (*arg == '-') {
-                       /* Handle flags here .. */
-                       usage(prune_packed_usage);
-               }
-               /* Handle arguments here .. */
-               usage(prune_packed_usage);
-       }
-       prune_packed_objects();
-       return 0;
+       /* Ensure we show 100% before finishing progress */
+       display_progress(progress, 256);
+       stop_progress(&progress);
 }