references: sort: compare author timestamps when commit timestamps are equal. Fixes #725

.gitignore

@@ -1 +1,4 @@
 coverage.out
+*~
+coverage.txt
+profile.out

.travis.yml

@@ -1,9 +1,8 @@
 language: go
 
 go:
-  - 1.8.x
-  - 1.9.x
   - "1.10"
+  - "1.11"
 
 go_import_path: gopkg.in/src-d/go-git.v4
 

_examples/branch/main.go

@@ -28,7 +28,7 @@ func main() {
 
 	// Create a new plumbing.HashReference object with the name of the branch
 	// and the hash from the HEAD. The reference name should be a full reference
-	// name and now a abbreviated one, as is used on the git cli.
+	// name and not an abbreviated one, as is used on the git cli.
 	//
 	// For tags we should use `refs/tags/%s` instead of `refs/heads/%s` used
 	// for branches.

blame.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 	"unicode/utf8"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -106,12 +107,18 @@ type Line struct {
 	Author string
 	// Text is the original text of the line.
 	Text string
+	// Date is when the original text of the line was introduced
+	Date time.Time
+	// Hash is the commit hash that introduced the original line
+	Hash plumbing.Hash
 }
 
-func newLine(author, text string) *Line {
+func newLine(author, text string, date time.Time, hash plumbing.Hash) *Line {
 	return &Line{
 		Author: author,
 		Text:   text,
+		Hash:   hash,
+		Date:   date,
 	}
 }
 
@@ -121,7 +128,7 @@ func newLines(contents []string, commits []*object.Commit) ([]*Line, error) {
 	}
 	result := make([]*Line, 0, len(contents))
 	for i := range contents {
-		l := newLine(commits[i].Author.Email, contents[i])
+		l := newLine(commits[i].Author.Email, contents[i], commits[i].Author.When, commits[i].Hash)
 		result = append(result, l)
 	}
 	return result, nil

blame_test.go

@@ -32,6 +32,10 @@ func (s *BlameSuite) TestBlame(c *C) {
 		obt, err := Blame(commit, t.path)
 		c.Assert(err, IsNil)
 		c.Assert(obt, DeepEquals, exp)
+
+		for i, l := range obt.Lines {
+			c.Assert(l.Hash.String(), Equals, t.blames[i])
+		}
 	}
 }
 
@@ -53,6 +57,8 @@ func (s *BlameSuite) mockBlame(c *C, t blameTest, r *Repository) (blame *BlameRe
 		l := &Line{
 			Author: commit.Author.Email,
 			Text:   lines[i],
+			Date:   commit.Author.When,
+			Hash:   commit.Hash,
 		}
 		blamedLines = append(blamedLines, l)
 	}

common_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
+	"gopkg.in/src-d/go-git.v4/plumbing/cache"
 	"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
 	"gopkg.in/src-d/go-git.v4/storage/filesystem"
@@ -59,10 +60,7 @@ func (s *BaseSuite) NewRepository(f *fixtures.Fixture) *Repository {
 	dotgit = f.DotGit()
 	worktree = memfs.New()
 
-	st, err := filesystem.NewStorage(dotgit)
-	if err != nil {
-		panic(err)
-	}
+	st := filesystem.NewStorage(dotgit, cache.NewObjectLRUDefault())
 
 	r, err := Open(st, worktree)
 	if err != nil {
@@ -89,10 +87,7 @@ func (s *BaseSuite) NewRepositoryWithEmptyWorktree(f *fixtures.Fixture) *Reposit
 
 	worktree := memfs.New()
 
-	st, err := filesystem.NewStorage(dotgit)
-	if err != nil {
-		panic(err)
-	}
+	st := filesystem.NewStorage(dotgit, cache.NewObjectLRUDefault())
 
 	r, err := Open(st, worktree)
 	if err != nil {
@@ -113,14 +108,7 @@ func (s *BaseSuite) NewRepositoryFromPackfile(f *fixtures.Fixture) *Repository {
 	p := f.Packfile()
 	defer p.Close()
 
-	n := packfile.NewScanner(p)
-	d, err := packfile.NewDecoder(n, storer)
-	if err != nil {
-		panic(err)
-	}
-
-	_, err = d.Decode()
-	if err != nil {
+	if err := packfile.UpdateObjectStorage(storer, p); err != nil {
 		panic(err)
 	}
 

config/branch.go

@@ -0,0 +1,71 @@
+package config
+
+import (
+	"errors"
+
+	"gopkg.in/src-d/go-git.v4/plumbing"
+	format "gopkg.in/src-d/go-git.v4/plumbing/format/config"
+)
+
+var (
+	errBranchEmptyName    = errors.New("branch config: empty name")
+	errBranchInvalidMerge = errors.New("branch config: invalid merge")
+)
+
+// Branch contains information on the
+// local branches and which remote to track
+type Branch struct {
+	// Name of branch
+	Name string
+	// Remote name of remote to track
+	Remote string
+	// Merge is the local refspec for the branch
+	Merge plumbing.ReferenceName
+
+	raw *format.Subsection
+}
+
+// Validate validates fields of branch
+func (b *Branch) Validate() error {
+	if b.Name == "" {
+		return errBranchEmptyName
+	}
+
+	if b.Merge != "" && !b.Merge.IsBranch() {
+		return errBranchInvalidMerge
+	}
+
+	return nil
+}
+
+func (b *Branch) marshal() *format.Subsection {
+	if b.raw == nil {
+		b.raw = &format.Subsection{}
+	}
+
+	b.raw.Name = b.Name
+
+	if b.Remote == "" {
+		b.raw.RemoveOption(remoteSection)
+	} else {
+		b.raw.SetOption(remoteSection, b.Remote)
+	}
+
+	if b.Merge == "" {
+		b.raw.RemoveOption(mergeKey)
+	} else {
+		b.raw.SetOption(mergeKey, string(b.Merge))
+	}
+
+	return b.raw
+}
+
+func (b *Branch) unmarshal(s *format.Subsection) error {
+	b.raw = s
+
+	b.Name = b.raw.Name
+	b.Remote = b.raw.Options.Get(remoteSection)
+	b.Merge = plumbing.ReferenceName(b.raw.Options.Get(mergeKey))
+
+	return b.Validate()
+}

config/branch_test.go

@@ -0,0 +1,76 @@
+package config
+
+import (
+	. "gopkg.in/check.v1"
+	"gopkg.in/src-d/go-git.v4/plumbing"
+)
+
+type BranchSuite struct{}
+
+var _ = Suite(&BranchSuite{})
+
+func (b *BranchSuite) TestValidateName(c *C) {
+	goodBranch := Branch{
+		Name:   "master",
+		Remote: "some_remote",
+		Merge:  "refs/heads/master",
+	}
+	badBranch := Branch{
+		Remote: "some_remote",
+		Merge:  "refs/heads/master",
+	}
+	c.Assert(goodBranch.Validate(), IsNil)
+	c.Assert(badBranch.Validate(), NotNil)
+}
+
+func (b *BranchSuite) TestValidateMerge(c *C) {
+	goodBranch := Branch{
+		Name:   "master",
+		Remote: "some_remote",
+		Merge:  "refs/heads/master",
+	}
+	badBranch := Branch{
+		Name:   "master",
+		Remote: "some_remote",
+		Merge:  "blah",
+	}
+	c.Assert(goodBranch.Validate(), IsNil)
+	c.Assert(badBranch.Validate(), NotNil)
+}
+
+func (b *BranchSuite) TestMarshall(c *C) {
+	expected := []byte(`[core]
+	bare = false
+[branch "branch-tracking-on-clone"]
+	remote = fork
+	merge = refs/heads/branch-tracking-on-clone
+`)
+
+	cfg := NewConfig()
+	cfg.Branches["branch-tracking-on-clone"] = &Branch{
+		Name:   "branch-tracking-on-clone",
+		Remote: "fork",
+		Merge:  plumbing.ReferenceName("refs/heads/branch-tracking-on-clone"),
+	}
+
+	actual, err := cfg.Marshal()
+	c.Assert(err, IsNil)
+	c.Assert(string(actual), Equals, string(expected))
+}
+
+func (b *BranchSuite) TestUnmarshall(c *C) {
+	input := []byte(`[core]
+	bare = false
+[branch "branch-tracking-on-clone"]
+	remote = fork
+	merge = refs/heads/branch-tracking-on-clone
+`)
+
+	cfg := NewConfig()
+	err := cfg.Unmarshal(input)
+	c.Assert(err, IsNil)
+	branch := cfg.Branches["branch-tracking-on-clone"]
+	c.Assert(branch.Name, Equals, "branch-tracking-on-clone")
+	c.Assert(branch.Remote, Equals, "fork")
+	c.Assert(branch.Merge, Equals, plumbing.ReferenceName("refs/heads/branch-tracking-on-clone"))
+}