undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make git-prune-packed a bit more chatty.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2007-01-12 15:00:13 -08:00
parent f215f27013
commit b60daf0515
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-prune-packed.txt
View File

@ -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 Don't actually remove any objects, only show those that would have been
removed. removed.
-q::
Squelch the progress indicator.
Author Author
------ ------
Written by Linus Torvalds <torvalds@osdl.org> Written by Linus Torvalds <torvalds@osdl.org>

24
builtin-prune-packed.c
View File

@ -4,7 +4,10 @@
static const char prune_packed_usage[] = static const char prune_packed_usage[] =
"git-prune-packed [-n]"; "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; struct dirent *de;
char hex[40]; 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)) if (!has_sha1_pack(sha1, NULL))
continue; continue;
memcpy(pathname + len, de->d_name, 38); memcpy(pathname + len, de->d_name, 38);
if (dryrun) if (opts & DRY_RUN)
printf("rm -f %s\n", pathname); printf("rm -f %s\n", pathname);
else if (unlink(pathname) < 0) else if (unlink(pathname) < 0)
error("unable to unlink %s", pathname); 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; int i;
static char pathname[PATH_MAX]; static char pathname[PATH_MAX];
@ -46,24 +49,31 @@ void prune_packed_objects(int dryrun)
sprintf(pathname + len, "%02x/", i); sprintf(pathname + len, "%02x/", i);
d = opendir(pathname); d = opendir(pathname);
if (opts == VERBOSE && (d || i == 255))
fprintf(stderr, "Removing unused objects %d%%...\015",
((i+1) * 100) / 256);
if (!d) if (!d)
continue; 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 cmd_prune_packed(int argc, const char **argv, const char *prefix)
{ {
int i; int i;
int dryrun = 0; int opts = VERBOSE;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
if (*arg == '-') { if (*arg == '-') {
if (!strcmp(arg, "-n")) if (!strcmp(arg, "-n"))
dryrun = 1; opts |= DRY_RUN;
else if (!strcmp(arg, "-q"))
opts &= ~VERBOSE;
else else
usage(prune_packed_usage); usage(prune_packed_usage);
continue; continue;
@ -72,6 +82,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
usage(prune_packed_usage); usage(prune_packed_usage);
} }
sync(); sync();
prune_packed_objects(dryrun); prune_packed_objects(opts);
return 0; return 0;
} }

2
git-repack.sh
View File

@ -110,7 +110,7 @@ then
done done
) )
fi fi
git-prune-packed git-prune-packed $quiet
fi fi
case "$no_update_info" in case "$no_update_info" in