Merge fixes early for next maint series.

1 files changed, 62 insertions, 2 deletions

diff --git a/read-tree.c b/read-tree.c
index 52f06e312..f39fe5ca6 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -9,6 +9,8 @@
 
 #include "object.h"
 #include "tree.h"
+#include <sys/time.h>
+#include <signal.h>
 
 static int merge = 0;
 static int update = 0;
@@ -16,6 +18,8 @@ static int index_only = 0;
 static int nontrivial_merge = 0;
 static int trivial_merges_only = 0;
 static int aggressive = 0;
+static int verbose_update = 0;
+static volatile int progress_update = 0;
 
 static int head_idx = -1;
 static int merge_size = 0;
@@ -267,6 +271,12 @@ static void unlink_entry(char *name)
 	}
 }
 
+static void progress_interval(int signum)
+{
+	signal(SIGALRM, progress_interval);
+	progress_update = 1;
+}
+
 static void check_updates(struct cache_entry **src, int nr)
 {
 	static struct checkout state = {
@@ -276,8 +286,49 @@ static void check_updates(struct cache_entry **src, int nr)
 		.refresh_cache = 1,
 	};
 	unsigned short mask = htons(CE_UPDATE);
+	unsigned last_percent = 200, cnt = 0, total = 0;
+
+	if (update && verbose_update) {
+		struct itimerval v;
+
+		for (total = cnt = 0; cnt < nr; cnt++) {
+			struct cache_entry *ce = src[cnt];
+			if (!ce->ce_mode || ce->ce_flags & mask)
+				total++;
+		}
+
+		/* Don't bother doing this for very small updates */
+		if (total < 250)
+			total = 0;
+
+		if (total) {
+			v.it_interval.tv_sec = 1;
+			v.it_interval.tv_usec = 0;
+			v.it_value = v.it_interval;
+			signal(SIGALRM, progress_interval);
+			setitimer(ITIMER_REAL, &v, NULL);
+			fprintf(stderr, "Checking files out...\n");
+			progress_update = 1;
+		}
+		cnt = 0;
+	}
+
 	while (nr--) {
 		struct cache_entry *ce = *src++;
+
+		if (total) {
+			if (!ce->ce_mode || ce->ce_flags & mask) {
+				unsigned percent;
+				cnt++;
+				percent = (cnt * 100) / total;
+				if (percent != last_percent ||
+				    progress_update) {
+					fprintf(stderr, "%4u%% (%u/%u) done\r",
+						percent, cnt, total);
+					last_percent = percent;
+				}
+			}
+		}
 		if (!ce->ce_mode) {
 			if (update)
 				unlink_entry(ce->name);
@@ -289,6 +340,10 @@ static void check_updates(struct cache_entry **src, int nr)
 				checkout_entry(ce, &state);
 		}
 	}
+	if (total) {
+		fputc('\n', stderr);
+		signal(SIGALRM, SIG_IGN);
+	}
 }
 
 static int unpack_trees(merge_fn_t fn)
@@ -564,7 +619,7 @@ static int twoway_merge(struct cache_entry **src)
 	struct cache_entry *oldtree = src[1], *newtree = src[2];
 
 	if (merge_size != 2)
-		return error("Cannot do a twoway merge of %d trees\n",
+		return error("Cannot do a twoway merge of %d trees",
 			     merge_size);
 
 	if (current) {
@@ -616,7 +671,7 @@ static int oneway_merge(struct cache_entry **src)
 	struct cache_entry *a = src[1];
 
 	if (merge_size != 1)
-		return error("Cannot do a oneway merge of %d trees\n",
+		return error("Cannot do a oneway merge of %d trees",
 			     merge_size);
 
 	if (!a)
@@ -680,6 +735,11 @@ int main(int argc, char **argv)
 			continue;
 		}
 
+		if (!strcmp(arg, "-v")) {
+			verbose_update = 1;
+			continue;
+		}
+
 		/* "-i" means "index only", meaning that a merge will
 		 * not even look at the working tree.
 		 */