Add 'update' command and --autoexclude option.

Author: apenwarr

git-subtrac.go

@@ -21,6 +21,7 @@ Usage: %v [-d GIT_DIR] <command>
 
 Commands:
     cid <ref>    Generate a tracking commit id based on the given ref
+    update       Update all local branches with a matching *.trac branch
 `
 
 func usagef(format string, args ...interface{}) {
@@ -34,6 +35,7 @@ func main() {
 
 	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")
 	getopt.Parse()
 
 	r, err := git.PlainOpen(*repodir)
@@ -46,12 +48,21 @@ func main() {
 		usagef("no command specified.")
 	}
 
+	c := NewCache(*repodir, r, *excludes, *autoexclude, debugf)
+
 	switch args[0] {
+	case "update":
+		if len(args) != 1 {
+			usagef("command 'update' takes no arguments")
+		}
+		err := c.UpdateBranchRefs()
+		if err != nil {
+			fatalf("%v\n", err)
+		}
 	case "cid":
 		if len(args) != 2 {
-			usagef("command cid takes exactly 1 argument")
+			usagef("command 'cid' takes exactly 1 argument")
 		}
-		c := NewCache(*repodir, r, *excludes, debugf)
 		refname := args[1]
 		trac, err := c.TracByRef(refname)
 		if err != nil {

subtrac.go

@@ -37,21 +37,24 @@ func (t Trac) String() string {
 }
 
 type Cache struct {
-	debugf   func(fmt string, args ...interface{})
-	repoDir  string
-	repo     *git.Repository
-	excludes map[plumbing.Hash]bool
-	tracs    map[plumbing.Hash]*Trac
+	debugf      func(fmt string, args ...interface{})
+	repoDir     string
+	repo        *git.Repository
+	autoexclude bool
+	excludes    map[plumbing.Hash]bool
+	tracs       map[plumbing.Hash]*Trac
 }
 
 func NewCache(rdir string, r *git.Repository, excludes []string,
+	autoexclude bool,
 	debugf func(fmt string, args ...interface{})) *Cache {
 	c := Cache{
-		debugf:   debugf,
-		repoDir:  rdir,
-		repo:     r,
-		excludes: make(map[plumbing.Hash]bool),
-		tracs:    make(map[plumbing.Hash]*Trac),
+		debugf:      debugf,
+		repoDir:     rdir,
+		repo:        r,
+		autoexclude: autoexclude,
+		excludes:    make(map[plumbing.Hash]bool),
+		tracs:       make(map[plumbing.Hash]*Trac),
 	}
 	for _, x := range excludes {
 		hash := plumbing.NewHash(x)
@@ -77,6 +80,49 @@ func (c *Cache) String() string {
 	return strings.Join(out, "\n")
 }
 
+func (c *Cache) UpdateBranchRefs() error {
+	branchIter, err := c.repo.Branches()
+	if err != nil {
+		return fmt.Errorf("GetBranches: %v", err)
+	}
+
+	var branches []*plumbing.Reference
+	var commits []*object.Commit
+	err = branchIter.ForEach(func(b *plumbing.Reference) error {
+		name := string(b.Name())
+		if strings.HasSuffix(name, ".trac") {
+			return nil
+		}
+		c.debugf("Scanning branch: %v\n", name)
+		commit, err := c.TracByRef(name)
+		if err != nil {
+			return err
+		} else {
+			branches = append(branches, b)
+			commits = append(commits, commit)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	for i := range branches {
+		newname := string(branches[i].Name()) + ".trac"
+		hash := commits[i].Hash
+		c.debugf("Updating %.10v -> %v\n", hash, newname)
+
+		refname := plumbing.ReferenceName(newname)
+		ref := plumbing.NewHashReference(refname, hash)
+		err = c.repo.Storer.SetReference(ref)
+		if err != nil {
+			return fmt.Errorf("update %v: %v", refname, err)
+		}
+	}
+
+	return nil
+}
+
 func (c *Cache) TracByRef(refname string) (*object.Commit, error) {
 	h, err := c.repo.ResolveRevision(plumbing.Revision(refname))
 	if err != nil {
@@ -326,6 +372,9 @@ func (c *Cache) tracTree(path string, tree *object.Tree) (*Trac, error) {
 				if err != nil {
 					err = c.tryFetchFromSubmodules(subpath, e.Hash)
 					if err != nil {
+						if c.autoexclude {
+							continue
+						}
 						return nil, fmt.Errorf("%v (maybe fetch it manually?)", err)
 					}
 				}