rebase: support --no-autostash

diff --git a/progress.h b/progress.h
index 1f2661e81094ce44a11223a2cb1880b302e88b7a..611e4c4d42d8d1164add09f926ad5b2ce088db5e 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -1,15 +1,14 @@
-#ifndef __progress_h__
-#define __progress_h__
+#ifndef PROGRESS_H
+#define PROGRESS_H
 
-struct progress {
-       const char *prefix;
-       unsigned total;
-       unsigned last_percent;
-};
+struct progress;
 
+void display_throughput(struct progress *progress, off_t total);
 int display_progress(struct progress *progress, unsigned n);
-void start_progress(struct progress *progress, const char *title,
-                   const char *prefix, unsigned total);
-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);
+void stop_progress_msg(struct progress **progress, const char *msg);
 
 #endif