diff options
Diffstat (limited to 'formats')
-rw-r--r-- | formats/packfile/delta.go | 17 | ||||
-rw-r--r-- | formats/packfile/parser_test.go | 15 |
2 files changed, 27 insertions, 5 deletions
diff --git a/formats/packfile/delta.go b/formats/packfile/delta.go index 95c13d5..d08f969 100644 --- a/formats/packfile/delta.go +++ b/formats/packfile/delta.go @@ -1,6 +1,10 @@ package packfile -import "gopkg.in/src-d/go-git.v4/core" +import ( + "io/ioutil" + + "gopkg.in/src-d/go-git.v4/core" +) // See https://github.com/git/git/blob/49fa3dc76179e04b0833542fa52d0f287a4955ac/delta.h // https://github.com/git/git/blob/c2c5f6b1e479f2c38e0e01345350620944e3527f/patch-delta.c, @@ -11,12 +15,21 @@ const deltaSizeMin = 4 // ApplyDelta writes to taget the result of applying the modification deltas in delta to base. func ApplyDelta(target, base core.Object, delta []byte) error { - src := base.Content() + r, err := base.Reader() + if err != nil { + return err + } + w, err := target.Writer() if err != nil { return err } + src, err := ioutil.ReadAll(r) + if err != nil { + return err + } + dst := PatchDelta(src, delta) target.SetSize(int64(len(dst))) diff --git a/formats/packfile/parser_test.go b/formats/packfile/parser_test.go index 5d41d69..f4aff83 100644 --- a/formats/packfile/parser_test.go +++ b/formats/packfile/parser_test.go @@ -240,7 +240,10 @@ func (s *ParserSuite) TestReadNonDeltaObjectContent(c *C) { obj := &core.MemoryObject{} err = p.FillFromNonDeltaContent(obj) c.Assert(err, IsNil, com) - c.Assert(obj.Content(), DeepEquals, test.expected, com) + + r, _ := obj.Reader() + bytes, _ := ioutil.ReadAll(r) + c.Assert(bytes, DeepEquals, test.expected, com) } } @@ -297,7 +300,10 @@ func (s *ParserSuite) TestFillOFSDeltaObjectContent(c *C) { err = p.FillOFSDeltaObjectContent(obj, test.offset) c.Assert(err, IsNil, com) c.Assert(obj.Type(), Equals, test.expType, com) - c.Assert(obj.Content(), DeepEquals, test.expContent, com) + + r, _ := obj.Reader() + bytes, _ := ioutil.ReadAll(r) + c.Assert(bytes, DeepEquals, test.expContent, com) } } @@ -361,7 +367,10 @@ func (s *ParserSuite) TestFillREFDeltaObjectContent(c *C) { err = p.FillREFDeltaObjectContent(obj) c.Assert(err, IsNil, com) c.Assert(obj.Type(), Equals, test.expType, com) - c.Assert(obj.Content(), DeepEquals, test.expContent, com) + + r, _ := obj.Reader() + bytes, _ := ioutil.ReadAll(r) + c.Assert(bytes, DeepEquals, test.expContent, com) p.ForgetAll() } |