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

prune: show progress while marking reachable objects

Browse Source 
prune already shows progress meter while pruning. The marking part may
take a few seconds or more, depending on repository size. Show
progress meter during this time too.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2011-11-05 19:00:08 +07:00 committed by Junio C Hamano
parent b04ba2bb42
commit dc347195cc
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/prune.c
View File

@ -5,6 +5,7 @@
#include "builtin.h" #include "builtin.h"
#include "reachable.h" #include "reachable.h"
#include "parse-options.h" #include "parse-options.h"
#include "progress.h"
#include "dir.h" #include "dir.h"
static const char * const prune_usage[] = { static const char * const prune_usage[] = {
@ -124,6 +125,7 @@ static void remove_temporary_files(const char *path)
int cmd_prune(int argc, const char **argv, const char *prefix) int cmd_prune(int argc, const char **argv, const char *prefix)
{ {
struct rev_info revs; struct rev_info revs;
struct progress *progress;
const struct option options[] = { const struct option options[] = {
OPT__DRY_RUN(&show_only, "do not remove, show only"), OPT__DRY_RUN(&show_only, "do not remove, show only"),
OPT__VERBOSE(&verbose, "report pruned objects"), OPT__VERBOSE(&verbose, "report pruned objects"),
@ -152,7 +154,9 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
else else
die("unrecognized argument: %s", name); die("unrecognized argument: %s", name);
} }
mark_reachable_objects(&revs, 1); progress = start_progress_delay("Checking connectivity", 0, 0, 2);
mark_reachable_objects(&revs, 1, progress);
stop_progress(&progress);
prune_object_dir(get_object_directory()); prune_object_dir(get_object_directory());
prune_packed_objects(show_only); prune_packed_objects(show_only);

2
builtin/reflog.c
View File

@ -647,7 +647,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
init_revisions(&cb.revs, prefix); init_revisions(&cb.revs, prefix);
if (cb.verbose) if (cb.verbose)
printf("Marking reachable objects..."); printf("Marking reachable objects...");
mark_reachable_objects(&cb.revs, 0); mark_reachable_objects(&cb.revs, 0, NULL);
if (cb.verbose) if (cb.verbose)
putchar('\n'); putchar('\n');
} }

14
reachable.c
View File

@ -7,6 +7,7 @@
#include "revision.h" #include "revision.h"
#include "reachable.h" #include "reachable.h"
#include "cache-tree.h" #include "cache-tree.h"
#include "progress.h"
static void process_blob(struct blob *blob, static void process_blob(struct blob *blob,
struct object_array *p, struct object_array *p,
@ -81,21 +82,25 @@ static void process_tag(struct tag *tag, struct object_array *p, const char *nam
add_object(tag->tagged, p, NULL, name); add_object(tag->tagged, p, NULL, name);
} }
static void walk_commit_list(struct rev_info *revs) static void walk_commit_list(struct rev_info *revs, struct progress *progress)
{ {
int i; int i;
struct commit *commit; struct commit *commit;
struct object_array objects = OBJECT_ARRAY_INIT; struct object_array objects = OBJECT_ARRAY_INIT;
uint32_t count = 0;
/* Walk all commits, process their trees */ /* Walk all commits, process their trees */
while ((commit = get_revision(revs)) != NULL) while ((commit = get_revision(revs)) != NULL) {
process_tree(commit->tree, &objects, NULL, ""); process_tree(commit->tree, &objects, NULL, "");
display_progress(progress, ++count);
}
/* Then walk all the pending objects, recursively processing them too */ /* Then walk all the pending objects, recursively processing them too */
for (i = 0; i < revs->pending.nr; i++) { for (i = 0; i < revs->pending.nr; i++) {
struct object_array_entry *pending = revs->pending.objects + i; struct object_array_entry *pending = revs->pending.objects + i;
struct object *obj = pending->item; struct object *obj = pending->item;
const char *name = pending->name; const char *name = pending->name;
display_progress(progress, ++count);
if (obj->type == OBJ_TAG) { if (obj->type == OBJ_TAG) {
process_tag((struct tag *) obj, &objects, name); process_tag((struct tag *) obj, &objects, name);
continue; continue;
@ -191,7 +196,8 @@ static void add_cache_refs(struct rev_info *revs)
add_cache_tree(active_cache_tree, revs); add_cache_tree(active_cache_tree, revs);
} }
void mark_reachable_objects(struct rev_info *revs, int mark_reflog) void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
struct progress *progress)
{ {
/* /*
* Set up revision parsing, and mark us as being interested * Set up revision parsing, and mark us as being interested
@ -217,5 +223,5 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog)
*/ */
if (prepare_revision_walk(revs)) if (prepare_revision_walk(revs))
die("revision walk setup failed"); die("revision walk setup failed");
walk_commit_list(revs); walk_commit_list(revs, progress);
} }

3
reachable.h
View File

@ -1,6 +1,7 @@
#ifndef REACHEABLE_H #ifndef REACHEABLE_H
#define REACHEABLE_H #define REACHEABLE_H
extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog); struct progress;
extern void mark_reachable_objects(struct rev_info *revs, int mark_reflog, struct progress *);
#endif #endif