sequencer (rebase -i): show the progress

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

sequencer.c

@@ -1112,9 +1112,10 @@ struct todo_list {
 	struct strbuf buf;
 	struct todo_item *items;
 	int nr, alloc, current;
+	int done_nr, total_nr;
 };
 
-#define TODO_LIST_INIT { STRBUF_INIT, NULL, 0, 0, 0 }
+#define TODO_LIST_INIT { STRBUF_INIT, NULL, 0, 0, 0, -1, -1 }
 
 static void todo_list_release(struct todo_list *todo_list)
 {
@@ -1222,6 +1223,17 @@ static int parse_insn_buffer(char *buf, struct todo_list *todo_list,
 	return 0;
 }
 
+static int count_commands(struct todo_list *todo_list)
+{
+	int count = 0, i;
+
+	for (i = 0; i < todo_list->nr; i++)
+		if (todo_list->items[i].command != TODO_COMMENT)
+			count++;
+
+	return count;
+}
+
 static int read_populate_todo(struct todo_list *todo_list,
 			struct replay_opts *opts)
 {
@@ -1242,6 +1254,23 @@ static int read_populate_todo(struct todo_list *todo_list,
 	res = parse_insn_buffer(todo_list->buf.buf, todo_list, opts);
 	if (res)
 		return error(_("Unusable instruction sheet: %s"), todo_file);
+
+	if (IS_REBASE_I()) {
+		struct todo_list done = TODO_LIST_INIT;
+
+		if (strbuf_read_file(&done.buf,
+					git_path_rebase_done(), 0) > 0 &&
+				!parse_insn_buffer(done.buf.buf, &done, opts))
+			todo_list->done_nr = count_commands(&done);
+		else
+			todo_list->done_nr = 0;
+
+		todo_list->total_nr = todo_list->done_nr
+			+ count_commands(todo_list);
+
+		todo_list_release(&done);
+	}
+
 	return 0;
 }
 
@@ -1677,6 +1706,11 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
 		if (save_todo(todo_list, opts))
 			return -1;
 		if (IS_REBASE_I()) {
+			if (item->command != TODO_COMMENT)
+				fprintf(stderr, "Rebasing (%d/%d)%s",
+					++(todo_list->done_nr),
+					todo_list->total_nr,
+					file_exists(git_path_rebase_verbose()) ? "\n" : "\r");
 			unlink(git_path_rebase_msg());
 			unlink(author_script());
 			unlink(stopped_sha());