tags tests, Tag.String and Commit.String

Author: mcuadros

commit.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"sort"
+	"strings"
 
 	"gopkg.in/src-d/go-git.v4/core"
 )
@@ -184,11 +185,25 @@ func (b *Commit) Encode(o core.Object) error {
 
 func (c *Commit) String() string {
 	return fmt.Sprintf(
-		"%s %s\nAuthor: %s\nDate:   %s\n",
-		core.CommitObject, c.Hash, c.Author.String(), c.Author.When,
+		"%s %s\nAuthor: %s\nDate:   %s\n\n%s\n",
+		core.CommitObject, c.Hash, c.Author.String(),
+		c.Author.When.Format(DateFormat), indent(c.Message),
 	)
 }
 
+func indent(t string) string {
+	var output []string
+	for _, line := range strings.Split(t, "\n") {
+		if len(line) != 0 {
+			line = "    " + line
+		}
+
+		output = append(output, line)
+	}
+
+	return strings.Join(output, "\n")
+}
+
 // CommitIter provides an iterator for a set of commits.
 type CommitIter struct {
 	core.ObjectIter

commit_test.go

@@ -121,10 +121,33 @@ func (s *SuiteCommit) TestString(c *C) {
 	c.Assert(s.Commit.String(), Equals, ""+
 		"commit 1669dce138d9b841a518c64b10914d88f5e488ea\n"+
 		"Author: Máximo Cuadros Ortiz <[email protected]>\n"+
-		"Date:   2015-03-31 13:48:14 +0200 +0200\n",
+		"Date:   Tue Mar 31 13:48:14 2015 +0200\n"+
+		"\n"+
+		"    Merge branch 'master' of github.com:tyba/git-fixture\n"+
+		"\n",
 	)
 }
 
+func (s *SuiteCommit) TestStringMultiLine(c *C) {
+	hash := core.NewHash("e7d896db87294e33ca3202e536d4d9bb16023db3")
+
+	commit, err := s.Repositories["https://github.com/src-d/go-git.git"].Commit(hash)
+	c.Assert(err, IsNil)
+
+	c.Assert(commit.String(), Equals, ""+
+		"commit e7d896db87294e33ca3202e536d4d9bb16023db3\n"+
+		"Author: Alberto Cortés <[email protected]>\n"+
+		"Date:   Wed Jan 27 11:13:49 2016 +0100\n"+
+		"\n"+
+		"    fix zlib invalid header error\n"+
+		"\n"+
+		"    The return value of reads to the packfile were being ignored, so zlib\n"+
+		"    was getting invalid data on it read buffers.\n"+
+		"\n",
+	)
+
+}
+
 func (s *SuiteCommit) TestCommitIterNext(c *C) {
 	i := s.Commit.Parents()
 

common.go

@@ -51,3 +51,5 @@ func checkClose(c io.Closer, err *error) {
 		*err = cerr
 	}
 }
+
+const DateFormat = "Mon Jan 02 15:04:05 2006 -0700"

fixtures/data/pack-b68617dd8637fe6409d9842825a843a1d9a6e484.idx

@@ -47,6 +47,11 @@ var fixtures = Fixtures{{
 	PackfileHash: core.NewHash("3559b3b47e695b33b0913237a4df3357e739831c"),
 	DotGitHash:   core.NewHash("174be6bd4292c18160542ae6dc6704b877b8a01a"),
 	ObjectsCount: 2133,
+}, {
+	Tags:         []string{"packfile", "tags"},
+	URL:          "https://github.com/git-fixtures/tags.git",
+	Head:         core.NewHash("f7b877701fbf855b44c0a9e86f3fdce2c298b07f"),
+	PackfileHash: core.NewHash("b68617dd8637fe6409d9842825a843a1d9a6e484"),
 }, {
 	Tags:         []string{"packfile"},
 	URL:          "https://github.com/spinnaker/spinnaker.git",

fixtures/data/pack-b68617dd8637fe6409d9842825a843a1d9a6e484.pack

@@ -9,10 +9,6 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-var fixturesURL = []packedFixture{
-	{"https://github.com/spinnaker/spinnaker.git", "formats/packfile/fixtures/spinnaker-spinnaker.pack"},
-}
-
 type ObjectsSuite struct {
 	BaseSuite
 }

fixtures/fixtures.go

@@ -113,20 +113,25 @@ func (t *Tag) Encode(o core.Object) error {
 		return err
 	}
 	defer checkClose(w, &err)
+
 	if _, err = fmt.Fprintf(w,
 		"object %s\ntype %s\ntag %s\ntagger ",
 		t.Target.String(), t.TargetType.Bytes(), t.Name); err != nil {
 		return err
 	}
+
 	if err = t.Tagger.Encode(w); err != nil {
 		return err
 	}
+
 	if _, err = fmt.Fprint(w, "\n\n"); err != nil {
 		return err
 	}
+
 	if _, err = fmt.Fprint(w, t.Message); err != nil {
 		return err
 	}
+
 	return err
 }
 
@@ -143,7 +148,6 @@ func (t *Tag) Commit() (*Commit, error) {
 // object the tree of that commit will be returned. If the tag does not point
 // to a commit or tree object ErrUnsupportedObject will be returned.
 func (t *Tag) Tree() (*Tree, error) {
-	// TODO: If the tag is of type commit, follow the commit to its tree?
 	switch t.TargetType {
 	case core.CommitObject:
 		commit, err := t.r.Commit(t.Target)
@@ -175,9 +179,11 @@ func (t *Tag) Object() (Object, error) {
 // String returns the meta information contained in the tag as a formatted
 // string.
 func (t *Tag) String() string {
+	obj, _ := t.Object()
 	return fmt.Sprintf(
-		"%s %s\nObject: %s\nType: %s\nTag: %s\nTagger: %s\nDate:   %s\n",
-		core.TagObject, t.Hash, t.Target, t.TargetType, t.Name, t.Tagger.String(), t.Tagger.When,
+		"%s %s\nTagger: %s\nDate:   %s\n\n%s\n%s",
+		core.TagObject, t.Name, t.Tagger.String(), t.Tagger.When.Format(DateFormat),
+		t.Message, obj,
 	)
 }