Git importer fixes.

Author: nasdf

cmd/multi/import.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"os"
+	"path/filepath"
 
 	"github.com/multiverse-vcs/go-multiverse/rpc"
 	"github.com/urfave/cli/v2"
@@ -49,6 +50,11 @@ func importAction(c *cli.Context) error {
 		return errors.New("repo already exists")
 	}
 
+	dir, err := filepath.Abs(c.String("dir"))
+	if err != nil {
+		return err
+	}
+
 	client, err := rpc.NewClient()
 	if err != nil {
 		return err
@@ -58,7 +64,7 @@ func importAction(c *cli.Context) error {
 		Name: name,
 		Type: c.String("type"),
 		URL:  c.String("url"),
-		Dir:  c.String("dir"),
+		Dir:  dir,
 	}
 
 	var reply rpc.ImportReply

data/repository.go

@@ -96,6 +96,14 @@ func NewRepository(name string) *Repository {
 	}
 }
 
+// DefaultBranch returns the default branch of the repo.
+func (r *Repository) DefaultBranch() string {
+	for branch := range r.Branches {
+		return branch
+	}
+	return ""
+}
+
 // Ref returns the cid of the given ref.
 func (r *Repository) Ref(ref string) (cid.Cid, error) {
 	if id, ok := r.Branches[ref]; ok {

git/git.go

@@ -4,6 +4,7 @@ package git
 import (
 	"context"
 	"io/ioutil"
+	"path"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -27,6 +28,7 @@ type importer struct {
 	dag      ipld.DAGService
 	name     string
 	repo     *git.Repository
+	objects  map[string]cid.Cid
 	branches map[string]cid.Cid
 	tags     map[string]cid.Cid
 }
@@ -64,6 +66,7 @@ func NewImporter(ctx context.Context, dag ipld.DAGService, repo *git.Repository,
 		dag:      dag,
 		name:     name,
 		repo:     repo,
+		objects:  make(map[string]cid.Cid),
 		branches: make(map[string]cid.Cid),
 		tags:     make(map[string]cid.Cid),
 	}
@@ -103,7 +106,10 @@ func (i *importer) AddBranch(ref *plumbing.Reference) error {
 		return err
 	}
 
-	i.branches[string(ref.Name())] = id
+	name := string(ref.Name())
+	name = path.Base(name)
+
+	i.branches[name] = id
 	return nil
 }
 
@@ -114,12 +120,19 @@ func (i *importer) AddTag(ref *plumbing.Reference) error {
 		return err
 	}
 
-	i.tags[string(ref.Name())] = id
+	name := string(ref.Name())
+	name = path.Base(name)
+
+	i.tags[name] = id
 	return nil
 }
 
 // AddCommit adds the commit with the given hash to the dag.
 func (i *importer) AddCommit(hash plumbing.Hash) (cid.Cid, error) {
+	if id, ok := i.objects[hash.String()]; ok {
+		return id, nil
+	}
+
 	commit, err := i.repo.CommitObject(hash)
 	if err != nil {
 		return cid.Cid{}, err
@@ -149,11 +162,21 @@ func (i *importer) AddCommit(hash plumbing.Hash) (cid.Cid, error) {
 	mcommit.Metadata["git_committer_email"] = commit.Committer.Email
 	mcommit.Metadata["git_committer_date"] = commit.Committer.When.Format(DateFormat)
 
-	return data.AddCommit(i.ctx, i.dag, mcommit)
+	id, err := data.AddCommit(i.ctx, i.dag, mcommit)
+	if err != nil {
+		return cid.Cid{}, err
+	}
+
+	i.objects[hash.String()] = id
+	return id, nil
 }
 
 // AddTree adds the tree with the given hash to the dag.
 func (i *importer) AddTree(hash plumbing.Hash) (ipld.Node, error) {
+	if id, ok := i.objects[hash.String()]; ok {
+		return i.dag.Get(i.ctx, id)
+	}
+
 	tree, err := i.repo.TreeObject(hash)
 	if err != nil {
 		return nil, err
@@ -180,6 +203,7 @@ func (i *importer) AddTree(hash plumbing.Hash) (ipld.Node, error) {
 		return nil, err
 	}
 
+	i.objects[hash.String()] = node.Cid()
 	return node, nil
 }
 

git/git_test.go

@@ -25,4 +25,4 @@ func TestImportFromURL(t *testing.T) {
 	if repo.Name != "go-multiverse" {
 		t.Error("unexpected repo name")
 	}
-}
+}

web/tree.go

@@ -47,11 +47,7 @@ func (s *Server) Tree(w http.ResponseWriter, req *http.Request) error {
 
 	name := params.ByName("name")
 	file := params.ByName("file")
-
 	ref := params.ByName("ref")
-	if ref == "" {
-		ref = "default"
-	}
 
 	id, err := s.store.GetCid(name)
 	if err != nil {
@@ -63,6 +59,10 @@ func (s *Server) Tree(w http.ResponseWriter, req *http.Request) error {
 		return err
 	}
 
+	if ref == "" {
+		ref = repo.DefaultBranch()
+	}
+
 	head, err := repo.Ref(ref)
 	if err != nil {
 		return err