diff options
Diffstat (limited to 'plumbing/transport')
-rw-r--r-- | plumbing/transport/http/upload_pack.go | 7 | ||||
-rw-r--r-- | plumbing/transport/http/upload_pack_test.go | 2 | ||||
-rw-r--r-- | plumbing/transport/internal/common/common.go | 2 | ||||
-rw-r--r-- | plumbing/transport/server/upload_pack_test.go | 5 | ||||
-rw-r--r-- | plumbing/transport/test/upload_pack.go | 15 |
5 files changed, 27 insertions, 4 deletions
diff --git a/plumbing/transport/http/upload_pack.go b/plumbing/transport/http/upload_pack.go index e828857..fd1787c 100644 --- a/plumbing/transport/http/upload_pack.go +++ b/plumbing/transport/http/upload_pack.go @@ -171,10 +171,13 @@ func uploadPackRequestToReader(req *packp.UploadPackRequest) (*bytes.Buffer, err return nil, fmt.Errorf("sending upload-req message: %s", err) } - if err := req.UploadHaves.Encode(buf); err != nil { + if err := req.UploadHaves.Encode(buf, false); err != nil { return nil, fmt.Errorf("sending haves message: %s", err) } - _ = e.EncodeString("done\n") + if err := e.EncodeString("done\n"); err != nil { + return nil, err + } + return buf, nil } diff --git a/plumbing/transport/http/upload_pack_test.go b/plumbing/transport/http/upload_pack_test.go index 13b7f75..a793efb 100644 --- a/plumbing/transport/http/upload_pack_test.go +++ b/plumbing/transport/http/upload_pack_test.go @@ -54,7 +54,7 @@ func (s *UploadPackSuite) TestuploadPackRequestToReader(c *C) { c.Assert(string(b), Equals, "0032want 2b41ef280fdb67a9b250678686a0c3e03b0a9989\n"+ "0032want d82f291cde9987322c8a0c81a325e1ba6159684c\n0000"+ - "0032have 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n0000"+ + "0032have 6ecf0ef2c2dffb796033e5a02219af86ec6584e5\n"+ "0009done\n", ) } diff --git a/plumbing/transport/internal/common/common.go b/plumbing/transport/internal/common/common.go index 2285e26..b459198 100644 --- a/plumbing/transport/internal/common/common.go +++ b/plumbing/transport/internal/common/common.go @@ -371,7 +371,7 @@ func uploadPack(w io.WriteCloser, r io.Reader, req *packp.UploadPackRequest) err return fmt.Errorf("sending upload-req message: %s", err) } - if err := req.UploadHaves.Encode(w); err != nil { + if err := req.UploadHaves.Encode(w, true); err != nil { return fmt.Errorf("sending haves message: %s", err) } diff --git a/plumbing/transport/server/upload_pack_test.go b/plumbing/transport/server/upload_pack_test.go index 137f887..7ba1e74 100644 --- a/plumbing/transport/server/upload_pack_test.go +++ b/plumbing/transport/server/upload_pack_test.go @@ -38,3 +38,8 @@ func (s *UploadPackSuite) TestAdvertisedReferencesNotExists(c *C) { c.Assert(err, Equals, transport.ErrRepositoryNotFound) c.Assert(r, IsNil) } + +// TODO revList implementation is returning more objects than expected. +func (s *UploadPackSuite) TestUploadPackPartial(c *C) { + c.Skip("Fix revList implementation") +} diff --git a/plumbing/transport/test/upload_pack.go b/plumbing/transport/test/upload_pack.go index c1a9050..06ae893 100644 --- a/plumbing/transport/test/upload_pack.go +++ b/plumbing/transport/test/upload_pack.go @@ -168,6 +168,21 @@ func (s *UploadPackSuite) TestUploadPackMulti(c *C) { s.checkObjectNumber(c, reader, 31) } +func (s *UploadPackSuite) TestUploadPackPartial(c *C) { + r, err := s.Client.NewUploadPackSession(s.Endpoint, s.EmptyAuth) + c.Assert(err, IsNil) + defer func() { c.Assert(r.Close(), IsNil) }() + + req := packp.NewUploadPackRequest() + req.Wants = append(req.Wants, plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5")) + req.Haves = append(req.Haves, plumbing.NewHash("918c48b83bd081e863dbe1b80f8998f058cd8294")) + + reader, err := r.UploadPack(req) + c.Assert(err, IsNil) + + s.checkObjectNumber(c, reader, 4) +} + func (s *UploadPackSuite) TestFetchError(c *C) { r, err := s.Client.NewUploadPackSession(s.Endpoint, s.EmptyAuth) c.Assert(err, IsNil) |