mirror of
https://github.com/git/git.git
synced 2026-02-18 21:59:08 +00:00
b5d72f0a4c
Rather than reimplementing the progress meter logic and always showing 100 lines of output while pruning already packed objects we now use a delayed progress meter and only show it if there are enough objects to make us take a little while. Most users won't see the message anymore as it usually doesn't take very long to delete the already packed loose objects. This neatens the output of a git-gc or git-repack execution, which is especially important for a `git gc --auto` triggered from within another command. We perform the display_progress() call from within the very innermost loop in case we spend more than 1 second within any single object directory. This ensures that a progress_update event from the timer will still trigger in a timely fashion and allow the user to see the progress meter. While I'm in here I changed the message to be more descriptive of its actual task. "Removing unused objects" is a little scary for new users as they wonder where these unused objects came from and how they should avoid them. Truth is these objects aren't unused in the sense of what git-prune would call a dangling object, these are used but are just duplicates of things we have already stored in a packfile. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
95 lines
1.9 KiB
C
95 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, NULL))
|
|
continue;
|
|
memcpy(pathname + len, de->d_name, 38);
|
|
if (opts == VERBOSE)
|
|
display_progress(&progress, i + 1);
|
|
if (opts & DRY_RUN)
|
|
printf("rm -f %s\n", pathname);
|
|
else if (unlink(pathname) < 0)
|
|
error("unable to unlink %s", pathname);
|
|
}
|
|
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)
|
|
start_progress_delay(&progress,
|
|
"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;
|
|
|
|
sprintf(pathname + len, "%02x/", i);
|
|
d = opendir(pathname);
|
|
if (!d)
|
|
continue;
|
|
prune_dir(i, d, pathname, len + 3, opts);
|
|
closedir(d);
|
|
}
|
|
if (opts == VERBOSE)
|
|
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);
|
|
}
|
|
sync();
|
|
prune_packed_objects(opts);
|
|
return 0;
|
|
}
|