mirror of
https://github.com/git/git.git
synced 2024-09-29 13:11:21 +02:00
531e6daa03
A progress indicator is used to count through the 256 object fan-out directories while unused object files are removed. (However, it becomes visible only if this process takes long enough.) Previously, display_progress() was only called if object files were actually removed. But if directories towards the end (fd/, fe/, ff/) did not exist, this could leave a strange line Removing duplicate objects: 99% (255/256), done. in the terminal instead of the expected "100% (256/256)". Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
92 lines
1.9 KiB
C
92 lines
1.9 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "progress.h"
|
|
|
|
static const char prune_packed_usage[] =
|
|
"git prune-packed [-n] [-q]";
|
|
|
|
#define DRY_RUN 01
|
|
#define VERBOSE 02
|
|
|
|
static struct progress *progress;
|
|
|
|
static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
|
|
{
|
|
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 (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);
|
|
}
|
|
|
|
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);
|
|
if (len && pathname[len-1] != '/')
|
|
pathname[len++] = '/';
|
|
for (i = 0; i < 256; i++) {
|
|
DIR *d;
|
|
|
|
display_progress(progress, i + 1);
|
|
sprintf(pathname + len, "%02x/", i);
|
|
d = opendir(pathname);
|
|
if (!d)
|
|
continue;
|
|
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"))
|
|
opts |= DRY_RUN;
|
|
else if (!strcmp(arg, "-q"))
|
|
opts &= ~VERBOSE;
|
|
else
|
|
usage(prune_packed_usage);
|
|
continue;
|
|
}
|
|
/* Handle arguments here .. */
|
|
usage(prune_packed_usage);
|
|
}
|
|
prune_packed_objects(opts);
|
|
return 0;
|
|
}
|