aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-12 15:00:13 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-12 15:10:29 -0800
commitb60daf0515889ca75f88f1d4d49a6a9c4117ba36 (patch)
tree2a51df5279f109da473efb03b8a85434e2f68e83
parentf215f27013e785ac11bf1190d0c03ba870faf080 (diff)
downloadgit-b60daf0515889ca75f88f1d4d49a6a9c4117ba36.tar.gz
git-b60daf0515889ca75f88f1d4d49a6a9c4117ba36.tar.xz
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>
-rw-r--r--Documentation/git-prune-packed.txt5
-rw-r--r--builtin-prune-packed.c24
-rwxr-xr-xgit-repack.sh2
3 files changed, 22 insertions, 9 deletions
diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index 234882685..a79193fb0 100644
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -9,7 +9,7 @@ residing in a pack file.
SYNOPSIS
--------
-'git-prune-packed' [-n]
+'git-prune-packed' [-n] [-q]
DESCRIPTION
@@ -32,6 +32,9 @@ OPTIONS
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>
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 24e3b0a8c..a57b76d7b 100644
--- 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 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];
@@ -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 (dryrun)
+ if (opts & DRY_RUN)
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);
}
-void prune_packed_objects(int dryrun)
+void prune_packed_objects(int opts)
{
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);
+ if (opts == VERBOSE && (d || i == 255))
+ fprintf(stderr, "Removing unused objects %d%%...\015",
+ ((i+1) * 100) / 256);
if (!d)
continue;
- prune_dir(i, d, pathname, len + 3, dryrun);
+ prune_dir(i, d, pathname, len + 3, opts);
closedir(d);
}
+ if (opts == VERBOSE)
+ fprintf(stderr, "\nDone.\n");
}
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"))
- dryrun = 1;
+ opts |= DRY_RUN;
+ else if (!strcmp(arg, "-q"))
+ opts &= ~VERBOSE;
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();
- prune_packed_objects(dryrun);
+ prune_packed_objects(opts);
return 0;
}
diff --git a/git-repack.sh b/git-repack.sh
index 375434b1d..da8e67f7a 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -110,7 +110,7 @@ then
done
)
fi
- git-prune-packed
+ git-prune-packed $quiet
fi
case "$no_update_info" in