diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-24 20:20:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 20:20:02 +0300 |
| commit | d33a43323676e110b2ad78c9baa54ec424d40d6b (patch) | |
| tree | 555a797278ae14639bc7a56641dc629b657949f8 /builtin | |
| parent | 6ea13d88456c116b14c3bc756993b5f462c981cb (diff) | |
| parent | 8aade107dd84dcaff3f23caae80a013878db2de7 (diff) | |
Merge branch 'jc/simplify-progress'
The API to start showing progress meter after a short delay has
been simplified.
* jc/simplify-progress:
progress: simplify "delayed" progress API
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 3 | ||||
| -rw-r--r-- | builtin/fsck.c | 2 | ||||
| -rw-r--r-- | builtin/log.c | 2 | ||||
| -rw-r--r-- | builtin/prune-packed.c | 3 | ||||
| -rw-r--r-- | builtin/prune.c | 2 | ||||
| -rw-r--r-- | builtin/rev-list.c | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index bda1a78726..e0daf17548 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -925,8 +925,7 @@ parse_done: sb.found_guilty_entry = &found_guilty_entry; sb.found_guilty_entry_data = π if (show_progress) - pi.progress = start_progress_delay(_("Blaming lines"), - sb.num_lines, 50, 1); + pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines); assign_blame(&sb, opt); diff --git a/builtin/fsck.c b/builtin/fsck.c index b0964a8d34..0ab13848a4 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -179,7 +179,7 @@ static int traverse_reachable(void) unsigned int nr = 0; int result = 0; if (show_progress) - progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2); + progress = start_delayed_progress(_("Checking connectivity"), 0); while (pending.nr) { struct object_array_entry *entry; struct object *obj; diff --git a/builtin/log.c b/builtin/log.c index 25c0808409..f8cccbc964 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1759,7 +1759,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.add_signoff = do_signoff; if (show_progress) - progress = start_progress_delay(_("Generating patches"), total, 0, 2); + progress = start_delayed_progress(_("Generating patches"), total); while (0 <= --nr) { int shown; display_progress(progress, total - nr); diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c index ac978ad401..8f41f7c20e 100644 --- a/builtin/prune-packed.c +++ b/builtin/prune-packed.c @@ -37,8 +37,7 @@ static int prune_object(const struct object_id *oid, const char *path, void prune_packed_objects(int opts) { if (opts & PRUNE_PACKED_VERBOSE) - progress = start_progress_delay(_("Removing duplicate objects"), - 256, 95, 2); + progress = start_delayed_progress(_("Removing duplicate objects"), 256); for_each_loose_file_in_objdir(get_object_directory(), prune_object, NULL, prune_subdir, &opts); diff --git a/builtin/prune.c b/builtin/prune.c index c378690545..cddabf26a9 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -138,7 +138,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) if (show_progress == -1) show_progress = isatty(2); if (show_progress) - progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2); + progress = start_delayed_progress(_("Checking connectivity"), 0); mark_reachable_objects(&revs, 1, expire, progress); stop_progress(&progress); diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 95b4128250..c1c74d4a79 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -367,7 +367,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) revs.limited = 1; if (show_progress) - progress = start_progress_delay(show_progress, 0, 0, 2); + progress = start_delayed_progress(show_progress, 0); if (use_bitmap_index && !revs.prune) { if (revs.count && !revs.left_right && !revs.cherry_mark) { |