Make git-prune-packed a bit more chatty.

Steven Grimm noticed that git-repack's verbosity is inconsistent
because pack-objects is chatty and prune-packed is not.  This
makes the latter a bit more chatty and gives -q option to
squelch it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index 234882685d923d632c4e09a38cb9ba18439dda4a..a79193fb007bcaa8dc47b2763e4167a6f31a3dff 100644 (file)
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -9,7 +9,7 @@ residing in a pack file.
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-prune-packed' [-n]
+'git-prune-packed' [-n] [-q]

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -32,6 +32,9 @@ OPTIONS
         Don't actually remove any objects, only show those that would have been
         removed.
 
         Don't actually remove any objects, only show those that would have been
         removed.
 

+-q::
+       Squelch the progress indicator.
+

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 24e3b0a8c21b43e0e82e5e505353213ca79f01b0..a57b76d7b7496f3cf81914672845bdebc75c91f8 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -4,7 +4,10 @@
 static const char prune_packed_usage[] =
 "git-prune-packed [-n]";
 
 static const char prune_packed_usage[] =
 "git-prune-packed [-n]";
 

-static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
+#define DRY_RUN 01
+#define VERBOSE 02
+
+static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)

 {
        struct dirent *de;
        char hex[40];
 {
        struct dirent *de;
        char hex[40];


@@ -20,7 +23,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
                if (!has_sha1_pack(sha1, NULL))
                        continue;
                memcpy(pathname + len, de->d_name, 38);
                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);
                        printf("rm -f %s\n", pathname);
                else if (unlink(pathname) < 0)
                        error("unable to unlink %s", pathname);


@@ -29,7 +32,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
        rmdir(pathname);
 }
 
        rmdir(pathname);
 }
 

-void prune_packed_objects(int dryrun)
+void prune_packed_objects(int opts)

 {
        int i;
        static char pathname[PATH_MAX];
 {
        int i;
        static char pathname[PATH_MAX];


@@ -46,24 +49,31 @@ void prune_packed_objects(int dryrun)
 
                sprintf(pathname + len, "%02x/", i);
                d = opendir(pathname);
 
                sprintf(pathname + len, "%02x/", i);
                d = opendir(pathname);

+               if (opts == VERBOSE && (d || i == 255))
+                       fprintf(stderr, "Removing unused objects %d%%...\015",
+                               ((i+1) * 100) / 256);

                if (!d)
                        continue;
                if (!d)
                        continue;

-               prune_dir(i, d, pathname, len + 3, dryrun);
+               prune_dir(i, d, pathname, len + 3, opts);

                closedir(d);
        }
                closedir(d);
        }

+       if (opts == VERBOSE)
+               fprintf(stderr, "\nDone.\n");

 }
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
        int i;
 }
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
        int i;

-       int dryrun = 0;
+       int opts = VERBOSE;

 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
 
                if (*arg == '-') {
                        if (!strcmp(arg, "-n"))
 
        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;
                        else
                                usage(prune_packed_usage);
                        continue;


@@ -72,6 +82,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
                usage(prune_packed_usage);
        }
        sync();
                usage(prune_packed_usage);
        }
        sync();

-       prune_packed_objects(dryrun);
+       prune_packed_objects(opts);

        return 0;
 }
        return 0;
 }

diff --git a/git-repack.sh b/git-repack.sh
index 375434b1dcdd3183c85b1278c4415e9136508192..da8e67f7a558229aa09216e7eb74713ca6c970cd 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -110,7 +110,7 @@ then
                  done
                )
        fi
                  done
                )
        fi

-       git-prune-packed
+       git-prune-packed $quiet

 fi
 
 case "$no_update_info" in
 fi
 
 case "$no_update_info" in