diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-11-05 19:00:08 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-11-07 22:12:19 -0800 |
| commit | dc347195ccfbc87b6e445f5c31a5500e1df6c9b5 (patch) | |
| tree | 88de64bfe9c15cb9d97e05afd8fa5e99cff7f45a /builtin | |
| parent | parse-options: deprecate OPT_BOOLEAN (diff) | |
| download | tgif-dc347195ccfbc87b6e445f5c31a5500e1df6c9b5.tar.xz | |
prune: show progress while marking reachable objects
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/prune.c | 6 | ||||
| -rw-r--r-- | builtin/reflog.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/builtin/prune.c b/builtin/prune.c index e65690ba37..6b39d3fdeb 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -5,6 +5,7 @@ #include "builtin.h" #include "reachable.h" #include "parse-options.h" +#include "progress.h" #include "dir.h" 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) { struct rev_info revs; + struct progress *progress; const struct option options[] = { OPT__DRY_RUN(&show_only, "do not remove, show only"), OPT__VERBOSE(&verbose, "report pruned objects"), @@ -152,7 +154,9 @@ int cmd_prune(int argc, const char **argv, const char *prefix) else 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_packed_objects(show_only); diff --git a/builtin/reflog.c b/builtin/reflog.c index 3a9c80f3db..062d7dad1b 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -647,7 +647,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) init_revisions(&cb.revs, prefix); if (cb.verbose) printf("Marking reachable objects..."); - mark_reachable_objects(&cb.revs, 0); + mark_reachable_objects(&cb.revs, 0, NULL); if (cb.verbose) putchar('\n'); } |