diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:27:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-02 16:27:37 -0700 |
| commit | 265ae188267fda441f92e513fb89641f78e982fd (patch) | |
| tree | 0286ec09fc86fea191aea74b0f4864ab10380253 /progress.h | |
| parent | 7240bfeaf7eccc6d2c4b2df07b7f33caa547953c (diff) | |
| parent | 81f6654a47075a345ba63a394921f77fc87b6500 (diff) | |
| download | git-265ae188267fda441f92e513fb89641f78e982fd.tar.xz | |
Merge branch 'np/progress'
* np/progress:
Show total transferred as part of throughput progress
make sure throughput display gets updated even if progress doesn't move
return the prune-packed progress display to the inner loop
add throughput display to git-push
add some copyright notice to the progress display code
add throughput display to index-pack
add throughput to progress display
relax usage of the progress API
make struct progress an opaque type
prune-packed: don't call display_progress() for every file
Stop displaying "Pack pack-$ID created." during git-gc
Teach prune-packed to use the standard progress meter
Change 'Deltifying objects' to 'Compressing objects'
fix for more minor memory leaks
fix const issues with some functions
pack-objects.c: fix some global variable abuse and memory leaks
pack-objects: no delta possible with only one object in the list
cope with multiple line breaks within sideband progress messages
more compact progress display
Diffstat (limited to 'progress.h')
| -rw-r--r-- | progress.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/progress.h b/progress.h index a7c17ca7c4..61cb68dfa5 100644 --- a/progress.h +++ b/progress.h @@ -1,22 +1,13 @@ #ifndef PROGRESS_H #define PROGRESS_H -struct progress { - const char *prefix; - unsigned total; - unsigned last_percent; - unsigned delay; - unsigned delayed_percent_treshold; - const char *delayed_title; - int need_lf; -}; +struct progress; +void display_throughput(struct progress *progress, unsigned long n); int display_progress(struct progress *progress, unsigned n); -void start_progress(struct progress *progress, const char *title, - const char *prefix, unsigned total); -void start_progress_delay(struct progress *progress, const char *title, - const char *prefix, unsigned total, - unsigned percent_treshold, unsigned delay); -void stop_progress(struct progress *progress); +struct progress *start_progress(const char *title, unsigned total); +struct progress *start_progress_delay(const char *title, unsigned total, + unsigned percent_treshold, unsigned delay); +void stop_progress(struct progress **progress); #endif |