add current progress output

2 files changed, 40 insertions, 0 deletions

diff --git a/filter.go b/filter.go
index dec3cd8..d52b191 100644
--- a/filter.go
+++ b/filter.go
@@ -30,6 +30,8 @@ type Filter struct {
 
 	curCommitIn  libfastimport.CmdCommit
 	curCommitOut map[string]fullcommit
+
+	OnCommit func()
 }
 
 func NewFilter(fromRef string, toPfx string) (*Filter, error) {
@@ -191,6 +193,10 @@ func (f *Filter) Run() error {
 			// TODO: synthesize ABS-tree submodule commits
 			f.curCommitIn = libfastimport.CmdCommit{}
 			f.curCommitOut = nil
+
+			if f.OnCommit != nil {
+				f.OnCommit()
+			}
 		case libfastimport.FileModify:
 			branchname := filename2branchname(string(cmdt.Path))
 			if branchname == "" {
diff --git a/main.go b/main.go
index ad158c1..8e92df5 100644
--- a/main.go
+++ b/main.go
@@ -5,8 +5,19 @@ import (
 	"io"
 	"os"
 	"strings"
+	"time"
 )
 
+func fmtDuration(d time.Duration) string {
+	h := d / time.Hour
+	d -= h * time.Hour
+	m := d / time.Minute
+	d -= m * time.Minute
+	s := d / time.Second
+
+	return fmt.Sprintf("%02d:%02d:%02", h, m, s)
+}
+
 func usage(w io.Writer) {
 	fmt.Fprintf(w, "Usage: %s refs/FROM_REFNAME refs/TO_PREFIX\n", os.Args[0])
 	fmt.Fprintf(w, "   or: %s -h|--help\n", os.Args[0])
@@ -33,12 +44,35 @@ func main() {
 		os.Exit(2)
 	}
 
+	commits := 0
+	beg := time.Now()
+	maxline := 0
+	status := func() {
+		duration := time.Since(beg)
+		line := fmt.Sprintf("[%s] commits (%.2f commit/s)",
+			fmtDuration(duration),
+			commits,
+			float64(commits)/duration.Seconds())
+		if len(line) > maxline {
+			maxline = len(line)
+		}
+		fmt.Fprintf(os.Stderr, "\r%-[1]*[2]s", maxline, line)
+	}
+
 	filter, err := NewFilter(fromRef, toPfx)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Could not initialize filter:", err)
 		os.Exit(1)
 	}
+
+	filter.OnCommit = func() {
+		commits++
+		status()
+	}
+
 	err = filter.Run()
+	status()
+	fmt.Fprintln(os.Stderr)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Error:", err)
 		os.Exit(1)