Skip to content
This repository has been archived by the owner on Sep 11, 2020. It is now read-only.

plumbing: commit.StatsContext and fix for orphan commit #1115

Merged
merged 3 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions plumbing/object/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (c *Commit) Tree() (*Tree, error) {
return GetTree(c.s, c.TreeHash)
}

// Patch returns the Patch between the actual commit and the provided one.
// PatchContext returns the Patch between the actual commit and the provided one.
// Error will be return if context expires. Provided context must be non-nil
mcuadros marked this conversation as resolved.
Show resolved Hide resolved
func (c *Commit) PatchContext(ctx context.Context, to *Commit) (*Patch, error) {
fromTree, err := c.Tree()
Expand Down Expand Up @@ -291,25 +291,33 @@ func (b *Commit) encode(o plumbing.EncodedObject, includeSig bool) (err error) {
return err
}

// Stats shows the status of commit.
// Stats returns the stats of a commit.
func (c *Commit) Stats() (FileStats, error) {
// Get the previous commit.
ci := c.Parents()
parentCommit, err := ci.Next()
return c.StatsContext(context.Background())
}

// StatsContext returns the stats of a commit. Error will be return if context
// expires. Provided context must be non-nil
mcuadros marked this conversation as resolved.
Show resolved Hide resolved
func (c *Commit) StatsContext(ctx context.Context) (FileStats, error) {
fromTree, err := c.Tree()
if err != nil {
if err == io.EOF {
emptyNoder := treeNoder{}
parentCommit = &Commit{
Hash: emptyNoder.hash,
// TreeHash: emptyNoder.parent.Hash,
s: c.s,
}
} else {
return nil, err
}

toTree := &Tree{}
if c.NumParents() != 0 {
firstParent, err := c.Parents().Next()
if err != nil {
return nil, err
}

toTree, err = firstParent.Tree()
if err != nil {
return nil, err
}
}

patch, err := parentCommit.Patch(c)
patch, err := toTree.PatchContext(ctx, fromTree)
if err != nil {
return nil, err
}
Expand Down
17 changes: 17 additions & 0 deletions plumbing/object/commit_stats_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package object_test

import (
"context"
"time"

"gopkg.in/src-d/go-git.v4"
Expand All @@ -26,9 +27,25 @@ func (s *CommitStatsSuite) TestStats(c *C) {
aCommit, err := r.CommitObject(hash)
c.Assert(err, IsNil)

fileStats, err := aCommit.StatsContext(context.Background())
c.Assert(err, IsNil)

c.Assert(fileStats[0].Name, Equals, "foo")
c.Assert(fileStats[0].Addition, Equals, 1)
c.Assert(fileStats[0].Deletion, Equals, 0)
c.Assert(fileStats[0].String(), Equals, " foo | 1 +\n")
}

func (s *CommitStatsSuite) TestStats_RootCommit(c *C) {
r, hash := s.writeHisotry(c, []byte("foo\n"))

aCommit, err := r.CommitObject(hash)
c.Assert(err, IsNil)

fileStats, err := aCommit.Stats()
c.Assert(err, IsNil)

c.Assert(fileStats, HasLen, 1)
c.Assert(fileStats[0].Name, Equals, "foo")
c.Assert(fileStats[0].Addition, Equals, 1)
c.Assert(fileStats[0].Deletion, Equals, 0)
Expand Down