user-manual: update for new default --track behavior

[git.git] / progress.c

diff --git a/progress.c b/progress.c
index 702e1160660363ba727e5ad398edd1f6e13c0fde..4344f4eed5e46c4e013018af8ef9ab062f740d8f 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -13,6 +13,8 @@ static void set_progress_signal(void)
        struct sigaction sa;
        struct itimerval v;
 
+       progress_update = 0;
+
        memset(&sa, 0, sizeof(sa));
        sa.sa_handler = progress_interval;
        sigemptyset(&sa.sa_mask);
@@ -35,34 +37,74 @@ static void clear_progress_signal(void)
 
 int display_progress(struct progress *progress, unsigned n)
 {
+       if (progress->delay) {
+               char buf[80];
+               if (!progress_update || --progress->delay)
+                       return 0;
+               if (progress->total) {
+                       unsigned percent = n * 100 / progress->total;
+                       if (percent > progress->delayed_percent_treshold) {
+                               /* inhibit this progress report entirely */
+                               clear_progress_signal();
+                               progress->delay = -1;
+                               progress->total = 0;
+                               return 0;
+                       }
+               }
+               if (snprintf(buf, sizeof(buf),
+                            progress->delayed_title, progress->total))
+                       fprintf(stderr, "%s\n", buf);
+       }
        if (progress->total) {
                unsigned percent = n * 100 / progress->total;
                if (percent != progress->last_percent || progress_update) {
                        progress->last_percent = percent;
                        fprintf(stderr, "%s%4u%% (%u/%u) done\r",
-                               progress->msg, percent, n, progress->total);
+                               progress->prefix, percent, n, progress->total);
                        progress_update = 0;
+                       progress->need_lf = 1;
                        return 1;
                }
        } else if (progress_update) {
-               fprintf(stderr, "%s%u\r", progress->msg, n);
+               fprintf(stderr, "%s%u\r", progress->prefix, n);
                progress_update = 0;
+               progress->need_lf = 1;
                return 1;
        }
        return 0;
 }
 
-void start_progress(struct progress *progress, const char *msg, unsigned total)
+void start_progress(struct progress *progress, const char *title,
+                   const char *prefix, unsigned total)
+{
+       char buf[80];
+       progress->prefix = prefix;
+       progress->total = total;
+       progress->last_percent = -1;
+       progress->delay = 0;
+       progress->need_lf = 0;
+       if (snprintf(buf, sizeof(buf), title, total))
+               fprintf(stderr, "%s\n", buf);
+       set_progress_signal();
+}
+
+void start_progress_delay(struct progress *progress, const char *title,
+                         const char *prefix, unsigned total,
+                         unsigned percent_treshold, unsigned delay)
 {
-       progress->msg = msg;
+       progress->prefix = prefix;
        progress->total = total;
        progress->last_percent = -1;
+       progress->delayed_percent_treshold = percent_treshold;
+       progress->delayed_title = title;
+       progress->delay = delay;
+       progress->need_lf = 0;
        set_progress_signal();
 }
 
 void stop_progress(struct progress *progress)
 {
        clear_progress_signal();
-       if (progress->total)
+       if (progress->need_lf)
                fputc('\n', stderr);
 }