X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-prune-packed.c;h=23faf3129fb65ec5592c5021d661498143d4f608;hb=5410a02ab9e6a1987147724f8ea65e6a077b3832;hp=960db49859a286bf5f3515ee7c2bfe25fe44d09e;hpb=340adb8bccf48b9d933f0608fd99c75a5c28003c;p=git.git

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 960db4985..23faf3129 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -1,12 +1,16 @@
 #include "builtin.h"
 #include "cache.h"
+#include "progress.h"
 
 static const char prune_packed_usage[] =
-"git-prune-packed [-n]";
+"git-prune-packed [-n] [-q]";
 
-static int dryrun;
+#define DRY_RUN 01
+#define VERBOSE 02
 
-static void prune_dir(int i, DIR *dir, char *pathname, int len)
+static struct progress *progress;
+
+static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 {
 	struct dirent *de;
 	char hex[40];
@@ -22,22 +26,27 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
 		if (!has_sha1_pack(sha1, NULL))
 			continue;
 		memcpy(pathname + len, de->d_name, 38);
-		if (dryrun)
+		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);
 }
 
-static void prune_packed_objects(void)
+void prune_packed_objects(int opts)
 {
 	int i;
 	static char pathname[PATH_MAX];
 	const char *dir = get_object_directory();
 	int len = strlen(dir);
 
+	if (opts == VERBOSE)
+		progress = start_progress_delay("Removing duplicate objects",
+			256, 95, 2);
+
 	if (len > PATH_MAX - 42)
 		die("impossible object directory");
 	memcpy(pathname, dir, len);
@@ -50,21 +59,25 @@ static void prune_packed_objects(void)
 		d = opendir(pathname);
 		if (!d)
 			continue;
-		prune_dir(i, d, pathname, len + 3);
+		prune_dir(i, d, pathname, len + 3, opts);
 		closedir(d);
 	}
+	stop_progress(&progress);
 }
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
 	int i;
+	int opts = VERBOSE;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
 		if (*arg == '-') {
 			if (!strcmp(arg, "-n"))
-				dryrun = 1;
+				opts |= DRY_RUN;
+			else if (!strcmp(arg, "-q"))
+				opts &= ~VERBOSE;
 			else
 				usage(prune_packed_usage);
 			continue;
@@ -73,6 +86,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 		usage(prune_packed_usage);
 	}
 	sync();
-	prune_packed_objects();
+	prune_packed_objects(opts);
 	return 0;
 }