diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2016-11-08 23:46:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 23:46:38 +0100 |
| commit | ac095bb12c4d29722b60ba9f20590fa7cfa6bc7d (patch) | |
| tree | 223f36f336ba3414b1e45cac8af6c4744a5d7ef6 /tree_diff_test.go | |
| parent | e523701393598f4fa241dd407af9ff8925507a1a (diff) | |
| download | go-git-ac095bb12c4d29722b60ba9f20590fa7cfa6bc7d.tar.gz | |
new plumbing package (#118)
* plumbing: now core was renamed to core, and formats and clients moved inside
Diffstat (limited to 'tree_diff_test.go')
| -rw-r--r-- | tree_diff_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tree_diff_test.go b/tree_diff_test.go index 58f0a29..81fee5d 100644 --- a/tree_diff_test.go +++ b/tree_diff_test.go @@ -3,8 +3,8 @@ package git import ( "sort" - "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" ) @@ -42,13 +42,13 @@ func (s *DiffTreeSuite) TestActionString(c *C) { } func (s *DiffTreeSuite) TestChangeFilesInsert(c *C) { - tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) + tree, err := s.Repository.Tree(plumbing.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) c.Assert(err, IsNil) change := &Change{Action: Insert} change.To.Name = "json/long.json" change.To.Tree = tree - change.To.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") + change.To.TreeEntry.Hash = plumbing.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") from, to, err := change.Files() c.Assert(err, IsNil) @@ -57,13 +57,13 @@ func (s *DiffTreeSuite) TestChangeFilesInsert(c *C) { } func (s *DiffTreeSuite) TestChangeFilesDelete(c *C) { - tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) + tree, err := s.Repository.Tree(plumbing.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) c.Assert(err, IsNil) change := &Change{Action: Delete} change.From.Name = "json/long.json" change.From.Tree = tree - change.From.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") + change.From.TreeEntry.Hash = plumbing.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") from, to, err := change.Files() c.Assert(err, IsNil) @@ -72,16 +72,16 @@ func (s *DiffTreeSuite) TestChangeFilesDelete(c *C) { } func (s *DiffTreeSuite) TestChangeFilesModify(c *C) { - tree, err := s.Repository.Tree(core.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) + tree, err := s.Repository.Tree(plumbing.NewHash("a8d315b2b1c615d43042c3a62402b8a54288cf5c")) c.Assert(err, IsNil) change := &Change{Action: Modify} change.To.Name = "json/long.json" change.To.Tree = tree - change.To.TreeEntry.Hash = core.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") + change.To.TreeEntry.Hash = plumbing.NewHash("49c6bb89b17060d7b4deacb7b338fcc6ea2352a9") change.From.Name = "json/long.json" change.From.Tree = tree - change.From.TreeEntry.Hash = core.NewHash("9a48f23120e880dfbe41f7c9b7b708e9ee62a492") + change.From.TreeEntry.Hash = plumbing.NewHash("9a48f23120e880dfbe41f7c9b7b708e9ee62a492") from, to, err := change.Files() c.Assert(err, IsNil) @@ -410,7 +410,7 @@ func tree(repo *Repository, commitHashStr string) (*Tree, error) { return nil, nil } - commit, err := repo.Commit(core.NewHash(commitHashStr)) + commit, err := repo.Commit(plumbing.NewHash(commitHashStr)) if err != nil { return nil, err } |