standard rill() with statsv0.22.135v0.22.134

3 files changed, 5 insertions, 28 deletions

diff --git a/doNormal.go b/doNormal.go
index 7ba172b..edf1699 100644
--- a/doNormal.go
+++ b/doNormal.go
@@ -19,8 +19,8 @@ func doNormal() bool {
 	stats := me.forge.RillRepos(checkNormalRepoState)
 	for path, stat := range stats {
 		dur := stat.End.Sub(stat.Start)
-		if dur > time.Second {
-			log.Infof("%-30v %s took a long time\n", dur, path)
+		if dur > 10*time.Second {
+			log.Infof("%-30v %s checkNormalRepoState() took a long time\n", dur, path)
 		}
 		if stat.Err == nil {
 			continue
diff --git a/doPull.go b/doPull.go
index d174d24..c3c0870 100644
--- a/doPull.go
+++ b/doPull.go
@@ -50,14 +50,14 @@ func doGitPullNew() error {
 
 	if argv.Force {
 		now := time.Now()
-		pullcount := me.forge.RillFuncError(rillPull)
+		stats := me.forge.RillFuncError(rillPull)
 		count := me.forge.RillReload()
 		if count != 0 {
 			me.forge.ConfigSave()
 		}
 
 		total, count, nope, _ := IsEverythingOnMaster()
-		log.Printf("Master branch check. %d total repos. (%d git pulled) (%d not on master branch) (%s) git pull total=%d\n", total, count, nope, shell.FormatDuration(time.Since(now)), pullcount)
+		log.Printf("Master branch check. %d total repos. (%d git pulled) (%d not on master branch) (%s) git pull total=FIXME%d\n", total, count, nope, shell.FormatDuration(time.Since(now)), len(stats))
 		return nil
 	}
 
diff --git a/doSync.go b/doSync.go
index 08d23fc..5ddd11d 100644
--- a/doSync.go
+++ b/doSync.go
@@ -6,9 +6,7 @@ package main
 import (
 	"fmt"
 	"path/filepath"
-	"time"
 
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -27,28 +25,7 @@ func doSync() error {
 }
 
 func doSyncClean() error {
-	if err := doAllCheckoutMaster(); err != nil {
-		return err
-	}
-
-	if _, _, _, err := IsEverythingOnMaster(); err != nil {
-		log.Info("Not all repos are on the master branch")
-		return err
-	}
-
-	// force everything
-	argv.Force = true
-
-	now := time.Now()
-	pullcount := me.forge.RillFuncError(rillPull)
-	count := me.forge.RillReload()
-	if count != 0 {
-		me.forge.ConfigSave()
-	}
-
-	total, count, nope, _ := IsEverythingOnMaster()
-	log.Printf("doSyncClean() ok. %d total repos. (%d git pulled) (%d not on master branch) (%s) git pull total=%d\n", total, count, nope, shell.FormatDuration(time.Since(now)), pullcount)
-
+	log.Printf("todo: fix this?")
 	return nil
 }