Move most output behind a -v (verbose mode) flag.

Author: apenwarr

git-subtrac.go

@@ -8,10 +8,6 @@ import (
 	"os"
 )
 
-func debugf(fmt string, args ...interface{}) {
-	log.Printf(fmt, args...)
-}
-
 func fatalf(fmt string, args ...interface{}) {
 	log.Fatalf("git-subtrac: "+fmt, args...)
 }
@@ -32,10 +28,12 @@ func usagef(format string, args ...interface{}) {
 
 func main() {
 	log.SetFlags(0)
+	infof := log.Printf
 
 	repodir := getopt.StringLong("git-dir", 'd', ".", "path to git repo")
 	excludes := getopt.ListLong("exclude", 'x', "", "commitids to exclude")
 	autoexclude := getopt.BoolLong("auto-exclude", 0, "auto exclude missing commits")
+	verbose := getopt.BoolLong("verbose", 'v', "verbose mode")
 	getopt.Parse()
 
 	r, err := git.PlainOpen(*repodir)
@@ -48,7 +46,13 @@ func main() {
 		usagef("no command specified.")
 	}
 
-	c := NewCache(*repodir, r, *excludes, *autoexclude, debugf)
+	var debugf func(fmt string, args ...interface{})
+	if *verbose {
+		debugf = infof
+	} else {
+		debugf = func(fmt string, args ...interface{}) {}
+	}
+	c := NewCache(*repodir, r, *excludes, *autoexclude, debugf, infof)
 
 	switch args[0] {
 	case "update":

subtrac.go

@@ -38,6 +38,7 @@ func (t Trac) String() string {
 
 type Cache struct {
 	debugf      func(fmt string, args ...interface{})
+	infof       func(fmt string, args ...interface{})
 	repoDir     string
 	repo        *git.Repository
 	autoexclude bool
@@ -47,9 +48,10 @@ type Cache struct {
 
 func NewCache(rdir string, r *git.Repository, excludes []string,
 	autoexclude bool,
-	debugf func(fmt string, args ...interface{})) *Cache {
+	debugf, infof func(fmt string, args ...interface{})) *Cache {
 	c := Cache{
 		debugf:      debugf,
+		infof:       infof,
 		repoDir:     rdir,
 		repo:        r,
 		autoexclude: autoexclude,
@@ -93,7 +95,7 @@ func (c *Cache) UpdateBranchRefs() error {
 		if strings.HasSuffix(name, ".trac") {
 			return nil
 		}
-		c.debugf("Scanning branch: %v\n", name)
+		c.infof("Scanning branch: %v\n", name)
 		commit, err := c.TracByRef(name)
 		if err != nil {
 			return err
@@ -110,7 +112,7 @@ func (c *Cache) UpdateBranchRefs() error {
 	for i := range branches {
 		newname := string(branches[i].Name()) + ".trac"
 		hash := commits[i].Hash
-		c.debugf("Updating %.10v -> %v\n", hash, newname)
+		c.infof("Updating %.10v -> %v\n", hash, newname)
 
 		refname := plumbing.ReferenceName(newname)
 		ref := plumbing.NewHashReference(refname, hash)
@@ -290,7 +292,7 @@ func commitPath(path string, sub int) string {
 }
 
 func (c *Cache) tryFetchFromSubmodules(path string, hash plumbing.Hash) error {
-	c.debugf("Searching submodules for: %v\n", path)
+	c.infof("Searching submodules for: %v\n", path)
 	wt, err := c.repo.Worktree()
 	if err != nil {
 		return fmt.Errorf("git worktree: %v", err)
@@ -307,9 +309,10 @@ func (c *Cache) tryFetchFromSubmodules(path string, hash plumbing.Hash) error {
 		}
 		_, err = subr.CommitObject(hash)
 		if err != nil {
-			c.debugf("  ...not in %v\n", subpath)
+			c.infof("  ...not in %v\n", subpath)
 			continue
 		}
+		c.infof("  ...found! in %v\n", subpath)
 		brname := fmt.Sprintf("subtrac-tmp-%v", hash)
 		brrefname := plumbing.NewBranchReferenceName(brname)
 		ref := plumbing.NewHashReference(brrefname, hash)