kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

prune-packed: use for_each_loose_file_in_objdir 

This saves us from manually traversing the directory
structure ourselves.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2014-10-15 18:40:53 -04:00 committed by Junio C Hamano
parent 3725427945
commit 0d3b729680
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
builtin/prune-packed.c
View File

@ -10,65 +10,42 @@ static const char * const prune_packed_usage[] = {


static struct progress *progress; static struct progress *progress;


static void prune_dir(int i, DIR *dir, struct strbuf *pathname, int opts) static int prune_subdir(int nr, const char *path, void *data)
{ {
struct dirent *de; int *opts = data;
char hex[40]; display_progress(progress, nr + 1);
int top_len = pathname->len; if (!(*opts & PRUNE_PACKED_DRY_RUN))
rmdir(path);
return 0;
}


sprintf(hex, "%02x", i); static int prune_object(const unsigned char *sha1, const char *path,
while ((de = readdir(dir)) != NULL) { void *data)
unsigned char sha1[20]; {
if (strlen(de->d_name) != 38) int *opts = data;
continue;
memcpy(hex + 2, de->d_name, 38);
if (get_sha1_hex(hex, sha1))
continue;
if (!has_sha1_pack(sha1))
continue;


strbuf_add(pathname, de->d_name, 38); if (!has_sha1_pack(sha1))
if (opts & PRUNE_PACKED_DRY_RUN) return 0;
printf("rm -f %s\n", pathname->buf);
else if (*opts & PRUNE_PACKED_DRY_RUN)
unlink_or_warn(pathname->buf); printf("rm -f %s\n", path);
display_progress(progress, i + 1); else
strbuf_setlen(pathname, top_len); unlink_or_warn(path);
} return 0;
} }


void prune_packed_objects(int opts) void prune_packed_objects(int opts)
{ {
int i;
const char *dir = get_object_directory();
struct strbuf pathname = STRBUF_INIT;
int top_len;

strbuf_addstr(&pathname, dir);
if (opts & PRUNE_PACKED_VERBOSE) if (opts & PRUNE_PACKED_VERBOSE)
progress = start_progress_delay(_("Removing duplicate objects"), progress = start_progress_delay(_("Removing duplicate objects"),
256, 95, 2); 256, 95, 2);


if (pathname.len && pathname.buf[pathname.len - 1] != '/') for_each_loose_file_in_objdir(get_object_directory(),
strbuf_addch(&pathname, '/'); prune_object, NULL, prune_subdir, &opts);


top_len = pathname.len; /* Ensure we show 100% before finishing progress */
for (i = 0; i < 256; i++) { display_progress(progress, 256);
DIR *d;

display_progress(progress, i + 1);
strbuf_setlen(&pathname, top_len);
strbuf_addf(&pathname, "%02x/", i);
d = opendir(pathname.buf);
if (!d)
continue;
prune_dir(i, d, &pathname, opts);
closedir(d);
strbuf_setlen(&pathname, top_len + 2);
rmdir(pathname.buf);
}
stop_progress(&progress); stop_progress(&progress);
strbuf_release(&pathname);
} }


int cmd_prune_packed(int argc, const char **argv, const char *prefix) int cmd_prune_packed(int argc, const char **argv, const char *prefix)