aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/format
diff options
context:
space:
mode:
authorJavi Fontan <jfontan@gmail.com>2018-01-24 18:32:16 +0100
committerJavi Fontan <jfontan@gmail.com>2018-01-24 18:38:59 +0100
commit522327b572276fe94e76ff9bb5e41b1efdf69dee (patch)
treeed78c69b60e9c6cfb939a712077bd6f32776870c /plumbing/format
parent834cd6f46fa3a3f2b5423f717cc72769e27c915b (diff)
downloadgo-git-522327b572276fe94e76ff9bb5e41b1efdf69dee.tar.gz
plumbing: format/packfile, fix crash with cycle deltas
Resolving cycles relied on ObjectToPack objects having Original. This is no longer true with the changes from #720. This commit changes: * Save original type, hash and size in ObjectToPack * Use SetObject to set both Original and resolved type, hash and size * Restore original object before using BackToOriginal (cycle resolution) * Update encoder test to check this case Signed-off-by: Javi Fontan <jfontan@gmail.com>
Diffstat (limited to 'plumbing/format')
-rw-r--r--plumbing/format/packfile/delta_selector.go3
-rw-r--r--plumbing/format/packfile/encoder.go1
-rw-r--r--plumbing/format/packfile/encoder_test.go21
-rw-r--r--plumbing/format/packfile/object_pack.go27
4 files changed, 51 insertions, 1 deletions
diff --git a/plumbing/format/packfile/delta_selector.go b/plumbing/format/packfile/delta_selector.go
index cd38c16..1d9fb5f 100644
--- a/plumbing/format/packfile/delta_selector.go
+++ b/plumbing/format/packfile/delta_selector.go
@@ -196,7 +196,8 @@ func (dw *deltaSelector) restoreOriginal(otp *ObjectToPack) error {
return err
}
- otp.Original = obj
+ otp.SetOriginal(obj)
+
return nil
}
diff --git a/plumbing/format/packfile/encoder.go b/plumbing/format/packfile/encoder.go
index 6686dd5..b077918 100644
--- a/plumbing/format/packfile/encoder.go
+++ b/plumbing/format/packfile/encoder.go
@@ -87,6 +87,7 @@ func (e *Encoder) entry(o *ObjectToPack) error {
// (for example due to a concurrent repack) and a different base
// was chosen, forcing a cycle. Select something other than a
// delta, and write this object.
+ e.selector.restoreOriginal(o)
o.BackToOriginal()
}
diff --git a/plumbing/format/packfile/encoder_test.go b/plumbing/format/packfile/encoder_test.go
index 320036b..06cb1c6 100644
--- a/plumbing/format/packfile/encoder_test.go
+++ b/plumbing/format/packfile/encoder_test.go
@@ -202,6 +202,15 @@ func (s *EncoderSuite) deltaOverDeltaCyclicTest(c *C) {
o3 := newObject(plumbing.BlobObject, []byte("011111"))
o4 := newObject(plumbing.BlobObject, []byte("01111100000"))
+ _, err := s.store.SetEncodedObject(o1)
+ c.Assert(err, IsNil)
+ _, err = s.store.SetEncodedObject(o2)
+ c.Assert(err, IsNil)
+ _, err = s.store.SetEncodedObject(o3)
+ c.Assert(err, IsNil)
+ _, err = s.store.SetEncodedObject(o4)
+ c.Assert(err, IsNil)
+
d2, err := GetDelta(o1, o2)
c.Assert(err, IsNil)
@@ -219,6 +228,18 @@ func (s *EncoderSuite) deltaOverDeltaCyclicTest(c *C) {
pd3.SetDelta(pd4, d3)
pd4.SetDelta(pd3, d4)
+ // SetOriginal is used by delta selector when generating ObjectToPack.
+ // It also fills type, hash and size values to be used when Original
+ // is nil.
+ po1.SetOriginal(po1.Original)
+ pd2.SetOriginal(pd2.Original)
+ pd2.Original = nil
+
+ pd3.SetOriginal(pd3.Original)
+ pd3.Original = nil
+
+ pd4.SetOriginal(pd4.Original)
+
encHash, err := s.enc.encode([]*ObjectToPack{
po1,
pd2,
diff --git a/plumbing/format/packfile/object_pack.go b/plumbing/format/packfile/object_pack.go
index 1563517..284871f 100644
--- a/plumbing/format/packfile/object_pack.go
+++ b/plumbing/format/packfile/object_pack.go
@@ -23,6 +23,12 @@ type ObjectToPack struct {
// offset in pack when object has been already written, or 0 if it
// has not been written yet
Offset int64
+
+ // Information from the original object
+ resolvedOriginal bool
+ originalType plumbing.ObjectType
+ originalSize int64
+ originalHash plumbing.Hash
}
// newObjectToPack creates a correct ObjectToPack based on a non-delta object
@@ -71,11 +77,24 @@ func (o *ObjectToPack) WantWrite() bool {
return o.Offset == 1
}
+// SetOriginal sets both Original and saves size, type and hash
+func (o *ObjectToPack) SetOriginal(obj plumbing.EncodedObject) {
+ o.Original = obj
+ o.originalSize = obj.Size()
+ o.originalType = obj.Type()
+ o.originalHash = obj.Hash()
+ o.resolvedOriginal = true
+}
+
func (o *ObjectToPack) Type() plumbing.ObjectType {
if o.Original != nil {
return o.Original.Type()
}
+ if o.resolvedOriginal {
+ return o.originalType
+ }
+
if o.Base != nil {
return o.Base.Type()
}
@@ -92,6 +111,10 @@ func (o *ObjectToPack) Hash() plumbing.Hash {
return o.Original.Hash()
}
+ if o.resolvedOriginal {
+ return o.originalHash
+ }
+
do, ok := o.Object.(plumbing.DeltaObject)
if ok {
return do.ActualHash()
@@ -105,6 +128,10 @@ func (o *ObjectToPack) Size() int64 {
return o.Original.Size()
}
+ if o.resolvedOriginal {
+ return o.originalSize
+ }
+
do, ok := o.Object.(plumbing.DeltaObject)
if ok {
return do.ActualSize()