new plumbing package (#118)

* plumbing: now core was renamed to core, and formats and clients moved inside

Author: mcuadros

blame.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"gopkg.in/src-d/go-git.v4/core"
 	"gopkg.in/src-d/go-git.v4/diff"
+	"gopkg.in/src-d/go-git.v4/plumbing"
 )
 
 type Blame struct {
 	Path  string
-	Rev   core.Hash
+	Rev   plumbing.Hash
 	Lines []*line
 }
 
@@ -256,7 +256,7 @@ func prettyPrintAuthor(c *Commit) string {
 // utility function to calculate the number of runes needed
 // to print the longest author name in the blame of a file.
 func (b *blame) maxAuthorLength() int {
-	memo := make(map[core.Hash]struct{}, len(b.graph)-1)
+	memo := make(map[plumbing.Hash]struct{}, len(b.graph)-1)
 	fVs := b.graph[len(b.graph)-1]
 	m := 0
 	for ln := range fVs {

blame_test.go

@@ -1,8 +1,8 @@
 package git
 
 import (
-	"gopkg.in/src-d/go-git.v4/core"
 	"gopkg.in/src-d/go-git.v4/fixtures"
+	"gopkg.in/src-d/go-git.v4/plumbing"
 
 	. "gopkg.in/check.v1"
 )
@@ -24,7 +24,7 @@ func (s *BlameSuite) mockBlame(t blameTest, c *C) (blame *Blame) {
 	r, ok := s.Repositories[t.repo]
 	c.Assert(ok, Equals, true)
 
-	commit, err := r.Commit(core.NewHash(t.rev))
+	commit, err := r.Commit(plumbing.NewHash(t.rev))
 	c.Assert(err, IsNil, Commentf("%v: repo=%s, rev=%s", err, r, t.rev))
 
 	f, err := commit.File(t.path)
@@ -36,7 +36,7 @@ func (s *BlameSuite) mockBlame(t blameTest, c *C) (blame *Blame) {
 
 	blamedLines := make([]*line, 0, len(t.blames))
 	for i := range t.blames {
-		commit, err := r.Commit(core.NewHash(t.blames[i]))
+		commit, err := r.Commit(plumbing.NewHash(t.blames[i]))
 		c.Assert(err, IsNil)
 		l := &line{
 			author: commit.Author.Email,
@@ -47,7 +47,7 @@ func (s *BlameSuite) mockBlame(t blameTest, c *C) (blame *Blame) {
 
 	return &Blame{
 		Path:  t.path,
-		Rev:   core.NewHash(t.rev),
+		Rev:   plumbing.NewHash(t.rev),
 		Lines: blamedLines,
 	}
 }
@@ -65,7 +65,7 @@ func (s *BlameSuite) TestBlame(c *C) {
 		r, ok := s.Repositories[t.repo]
 		c.Assert(ok, Equals, true)
 
-		commit, err := r.Commit(core.NewHash(t.rev))
+		commit, err := r.Commit(plumbing.NewHash(t.rev))
 		c.Assert(err, IsNil)
 
 		obt, err := commit.Blame(t.path)

blobs.go

@@ -3,35 +3,36 @@ package git
 import (
 	"io"
 
-	"gopkg.in/src-d/go-git.v4/core"
+	"gopkg.in/src-d/go-git.v4/plumbing"
+	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 )
 
 // Blob is used to store file data - it is generally a file.
 type Blob struct {
-	Hash core.Hash
+	Hash plumbing.Hash
 	Size int64
 
-	obj core.Object
+	obj plumbing.Object
 }
 
 // ID returns the object ID of the blob. The returned value will always match
 // the current value of Blob.Hash.
 //
 // ID is present to fulfill the Object interface.
-func (b *Blob) ID() core.Hash {
+func (b *Blob) ID() plumbing.Hash {
 	return b.Hash
 }
 
-// Type returns the type of object. It always returns core.BlobObject.
+// Type returns the type of object. It always returns plumbing.BlobObject.
 //
 // Type is present to fulfill the Object interface.
-func (b *Blob) Type() core.ObjectType {
-	return core.BlobObject
+func (b *Blob) Type() plumbing.ObjectType {
+	return plumbing.BlobObject
 }
 
-// Decode transforms a core.Object into a Blob struct.
-func (b *Blob) Decode(o core.Object) error {
-	if o.Type() != core.BlobObject {
+// Decode transforms a plumbing.Object into a Blob struct.
+func (b *Blob) Decode(o plumbing.Object) error {
+	if o.Type() != plumbing.BlobObject {
 		return ErrUnsupportedObject
 	}
 
@@ -42,8 +43,8 @@ func (b *Blob) Decode(o core.Object) error {
 	return nil
 }
 
-// Encode transforms a Blob into a core.Object.
-func (b *Blob) Encode(o core.Object) error {
+// Encode transforms a Blob into a plumbing.Object.
+func (b *Blob) Encode(o plumbing.Object) error {
 	w, err := o.Writer()
 	if err != nil {
 		return err
@@ -55,7 +56,7 @@ func (b *Blob) Encode(o core.Object) error {
 	}
 	defer checkClose(r, &err)
 	_, err = io.Copy(w, r)
-	o.SetType(core.BlobObject)
+	o.SetType(plumbing.BlobObject)
 	return err
 }
 
@@ -66,15 +67,15 @@ func (b *Blob) Reader() (io.ReadCloser, error) {
 
 // BlobIter provides an iterator for a set of blobs.
 type BlobIter struct {
-	core.ObjectIter
+	storer.ObjectIter
 	r *Repository
 }
 
 // NewBlobIter returns a CommitIter for the given repository and underlying
 // object iterator.
 //
 // The returned BlobIter will automatically skip over non-blob objects.
-func NewBlobIter(r *Repository, iter core.ObjectIter) *BlobIter {
+func NewBlobIter(r *Repository, iter storer.ObjectIter) *BlobIter {
 	return &BlobIter{iter, r}
 }
 
@@ -87,7 +88,7 @@ func (iter *BlobIter) Next() (*Blob, error) {
 			return nil, err
 		}
 
-		if obj.Type() != core.BlobObject {
+		if obj.Type() != plumbing.BlobObject {
 			continue
 		}
 
@@ -100,8 +101,8 @@ func (iter *BlobIter) Next() (*Blob, error) {
 // an error happens or the end of the iter is reached. If ErrStop is sent
 // the iteration is stop but no error is returned. The iterator is closed.
 func (iter *BlobIter) ForEach(cb func(*Blob) error) error {
-	return iter.ObjectIter.ForEach(func(obj core.Object) error {
-		if obj.Type() != core.BlobObject {
+	return iter.ObjectIter.ForEach(func(obj plumbing.Object) error {
+		if obj.Type() != plumbing.BlobObject {
 			return nil
 		}
 

blobs_test.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"gopkg.in/src-d/go-git.v4/core"
+	"gopkg.in/src-d/go-git.v4/plumbing"
 
 	. "gopkg.in/check.v1"
 )
@@ -16,8 +16,8 @@ type BlobsSuite struct {
 var _ = Suite(&BlobsSuite{})
 
 func (s *BlobsSuite) TestBlobHash(c *C) {
-	o := &core.MemoryObject{}
-	o.SetType(core.BlobObject)
+	o := &plumbing.MemoryObject{}
+	o.SetType(plumbing.BlobObject)
 	o.SetSize(3)
 
 	writer, err := o.Writer()
@@ -42,19 +42,19 @@ func (s *BlobsSuite) TestBlobHash(c *C) {
 }
 
 func (s *BlobsSuite) TestBlobDecodeEncodeIdempotent(c *C) {
-	var objects []*core.MemoryObject
+	var objects []*plumbing.MemoryObject
 	for _, str := range []string{"foo", "foo\n"} {
-		obj := &core.MemoryObject{}
+		obj := &plumbing.MemoryObject{}
 		obj.Write([]byte(str))
-		obj.SetType(core.BlobObject)
+		obj.SetType(plumbing.BlobObject)
 		obj.Hash()
 		objects = append(objects, obj)
 	}
 	for _, object := range objects {
 		blob := &Blob{}
 		err := blob.Decode(object)
 		c.Assert(err, IsNil)
-		newObject := &core.MemoryObject{}
+		newObject := &plumbing.MemoryObject{}
 		err = blob.Encode(newObject)
 		c.Assert(err, IsNil)
 		newObject.Hash() // Ensure Hash is pre-computed before deep comparison

commit.go

@@ -8,25 +8,26 @@ import (
 	"sort"
 	"strings"
 
-	"gopkg.in/src-d/go-git.v4/core"
+	"gopkg.in/src-d/go-git.v4/plumbing"
+	"gopkg.in/src-d/go-git.v4/plumbing/storer"
 )
 
 // Hash hash of an object
-type Hash core.Hash
+type Hash plumbing.Hash
 
 // Commit points to a single tree, marking it as what the project looked like
 // at a certain point in time. It contains meta-information about that point
 // in time, such as a timestamp, the author of the changes since the last
 // commit, a pointer to the previous commit(s), etc.
 // http://schacon.github.io/gitbook/1_the_git_object_model.html
 type Commit struct {
-	Hash      core.Hash
+	Hash      plumbing.Hash
 	Author    Signature
 	Committer Signature
 	Message   string
 
-	tree    core.Hash
-	parents []core.Hash
+	tree    plumbing.Hash
+	parents []plumbing.Hash
 	r       *Repository
 }
 
@@ -38,7 +39,7 @@ func (c *Commit) Tree() (*Tree, error) {
 // Parents return a CommitIter to the parent Commits
 func (c *Commit) Parents() *CommitIter {
 	return NewCommitIter(c.r,
-		core.NewObjectLookupIter(c.r.s, core.CommitObject, c.parents),
+		storer.NewObjectLookupIter(c.r.s, plumbing.CommitObject, c.parents),
 	)
 }
 
@@ -73,20 +74,20 @@ func (c *Commit) Files() (*FileIter, error) {
 // the current value of Commit.Hash.
 //
 // ID is present to fulfill the Object interface.
-func (c *Commit) ID() core.Hash {
+func (c *Commit) ID() plumbing.Hash {
 	return c.Hash
 }
 
-// Type returns the type of object. It always returns core.CommitObject.
+// Type returns the type of object. It always returns plumbing.CommitObject.
 //
 // Type is present to fulfill the Object interface.
-func (c *Commit) Type() core.ObjectType {
-	return core.CommitObject
+func (c *Commit) Type() plumbing.ObjectType {
+	return plumbing.CommitObject
 }
 
-// Decode transforms a core.Object into a Commit struct.
-func (c *Commit) Decode(o core.Object) (err error) {
-	if o.Type() != core.CommitObject {
+// Decode transforms a plumbing.Object into a Commit struct.
+func (c *Commit) Decode(o plumbing.Object) (err error) {
+	if o.Type() != plumbing.CommitObject {
 		return ErrUnsupportedObject
 	}
 
@@ -117,9 +118,9 @@ func (c *Commit) Decode(o core.Object) (err error) {
 			split := bytes.SplitN(line, []byte{' '}, 2)
 			switch string(split[0]) {
 			case "tree":
-				c.tree = core.NewHash(string(split[1]))
+				c.tree = plumbing.NewHash(string(split[1]))
 			case "parent":
-				c.parents = append(c.parents, core.NewHash(string(split[1])))
+				c.parents = append(c.parents, plumbing.NewHash(string(split[1])))
 			case "author":
 				c.Author.Decode(split[1])
 			case "committer":
@@ -147,9 +148,9 @@ func (c *Commit) History() ([]*Commit, error) {
 	return commits, err
 }
 
-// Encode transforms a Commit into a core.Object.
-func (b *Commit) Encode(o core.Object) error {
-	o.SetType(core.CommitObject)
+// Encode transforms a Commit into a plumbing.Object.
+func (b *Commit) Encode(o plumbing.Object) error {
+	o.SetType(plumbing.CommitObject)
 	w, err := o.Writer()
 	if err != nil {
 		return err
@@ -184,7 +185,7 @@ func (b *Commit) Encode(o core.Object) error {
 func (c *Commit) String() string {
 	return fmt.Sprintf(
 		"%s %s\nAuthor: %s\nDate:   %s\n\n%s\n",
-		core.CommitObject, c.Hash, c.Author.String(),
+		plumbing.CommitObject, c.Hash, c.Author.String(),
 		c.Author.When.Format(DateFormat), indent(c.Message),
 	)
 }
@@ -204,15 +205,15 @@ func indent(t string) string {
 
 // CommitIter provides an iterator for a set of commits.
 type CommitIter struct {
-	core.ObjectIter
+	storer.ObjectIter
 	r *Repository
 }
 
 // NewCommitIter returns a CommitIter for the given repository and underlying
 // object iterator.
 //
 // The returned CommitIter will automatically skip over non-commit objects.
-func NewCommitIter(r *Repository, iter core.ObjectIter) *CommitIter {
+func NewCommitIter(r *Repository, iter storer.ObjectIter) *CommitIter {
 	return &CommitIter{iter, r}
 }
 
@@ -232,7 +233,7 @@ func (iter *CommitIter) Next() (*Commit, error) {
 // an error happends or the end of the iter is reached. If ErrStop is sent
 // the iteration is stop but no error is returned. The iterator is closed.
 func (iter *CommitIter) ForEach(cb func(*Commit) error) error {
-	return iter.ObjectIter.ForEach(func(obj core.Object) error {
+	return iter.ObjectIter.ForEach(func(obj plumbing.Object) error {
 		commit := &Commit{r: iter.r}
 		if err := commit.Decode(obj); err != nil {
 			return err