remove old types from transport and use packp (#142)

* protocol: move UploadPackRequest to protocol.
* UploadPackRequest is now defined as an embedding of UploadRequest and
  UploadHaves.
* Move http encoding specific code from UploadPackRequest to transport/http.
* rename UlReq to UploadRequest
* packp: move AdvRefs Encoder/Decoder to Encode/Decode methods.
* packp: move UploadRequest Encoder/Decoder to Encode/Decode methods.
* packp: Remove transport.UploadPackInfo in favor of packp. AdvRefs.

1 files changed, 237 insertions, 0 deletions

diff --git a/plumbing/protocol/packp/advrefs_encode_test.go b/plumbing/protocol/packp/advrefs_encode_test.go
new file mode 100644
index 0000000..207ce58
--- /dev/null
+++ b/plumbing/protocol/packp/advrefs_encode_test.go
@@ -0,0 +1,237 @@
+package packp
+
+import (
+	"bytes"
+	"strings"
+
+	"gopkg.in/src-d/go-git.v4/plumbing"
+	"gopkg.in/src-d/go-git.v4/plumbing/format/pktline"
+
+	. "gopkg.in/check.v1"
+)
+
+type AdvRefsEncodeSuite struct{}
+
+var _ = Suite(&AdvRefsEncodeSuite{})
+
+func testEncode(c *C, input *AdvRefs, expected []byte) {
+	var buf bytes.Buffer
+	e := newAdvRefsEncoder(&buf)
+	err := e.Encode(input)
+	c.Assert(err, IsNil)
+	obtained := buf.Bytes()
+
+	comment := Commentf("\nobtained = %s\nexpected = %s\n", string(obtained), string(expected))
+
+	c.Assert(obtained, DeepEquals, expected, comment)
+}
+
+func (s *AdvRefsEncodeSuite) TestZeroValue(c *C) {
+	ar := &AdvRefs{}
+
+	expected := pktlines(c,
+		"0000000000000000000000000000000000000000 capabilities^{}\x00\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestHead(c *C) {
+	hash := plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5")
+	ar := &AdvRefs{
+		Head: &hash,
+	}
+
+	expected := pktlines(c,
+		"6ecf0ef2c2dffb796033e5a02219af86ec6584e5 HEAD\x00\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestCapsNoHead(c *C) {
+	capabilities := NewCapabilities()
+	capabilities.Add("symref", "HEAD:/refs/heads/master")
+	capabilities.Add("ofs-delta")
+	capabilities.Add("multi_ack")
+	ar := &AdvRefs{
+		Capabilities: capabilities,
+	}
+
+	expected := pktlines(c,
+		"0000000000000000000000000000000000000000 capabilities^{}\x00multi_ack ofs-delta symref=HEAD:/refs/heads/master\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestCapsWithHead(c *C) {
+	hash := plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5")
+	capabilities := NewCapabilities()
+	capabilities.Add("symref", "HEAD:/refs/heads/master")
+	capabilities.Add("ofs-delta")
+	capabilities.Add("multi_ack")
+	ar := &AdvRefs{
+		Head:         &hash,
+		Capabilities: capabilities,
+	}
+
+	expected := pktlines(c,
+		"6ecf0ef2c2dffb796033e5a02219af86ec6584e5 HEAD\x00multi_ack ofs-delta symref=HEAD:/refs/heads/master\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestRefs(c *C) {
+	references := map[string]plumbing.Hash{
+		"refs/heads/master":      plumbing.NewHash("a6930aaee06755d1bdcfd943fbf614e4d92bb0c7"),
+		"refs/tags/v2.6.12-tree": plumbing.NewHash("1111111111111111111111111111111111111111"),
+		"refs/tags/v2.7.13-tree": plumbing.NewHash("3333333333333333333333333333333333333333"),
+		"refs/tags/v2.6.13-tree": plumbing.NewHash("2222222222222222222222222222222222222222"),
+		"refs/tags/v2.6.11-tree": plumbing.NewHash("5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c"),
+	}
+	ar := &AdvRefs{
+		References: references,
+	}
+
+	expected := pktlines(c,
+		"0000000000000000000000000000000000000000 capabilities^{}\x00\n",
+		"a6930aaee06755d1bdcfd943fbf614e4d92bb0c7 refs/heads/master\n",
+		"5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11-tree\n",
+		"1111111111111111111111111111111111111111 refs/tags/v2.6.12-tree\n",
+		"2222222222222222222222222222222222222222 refs/tags/v2.6.13-tree\n",
+		"3333333333333333333333333333333333333333 refs/tags/v2.7.13-tree\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestPeeled(c *C) {
+	references := map[string]plumbing.Hash{
+		"refs/heads/master":      plumbing.NewHash("a6930aaee06755d1bdcfd943fbf614e4d92bb0c7"),
+		"refs/tags/v2.6.12-tree": plumbing.NewHash("1111111111111111111111111111111111111111"),
+		"refs/tags/v2.7.13-tree": plumbing.NewHash("3333333333333333333333333333333333333333"),
+		"refs/tags/v2.6.13-tree": plumbing.NewHash("2222222222222222222222222222222222222222"),
+		"refs/tags/v2.6.11-tree": plumbing.NewHash("5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c"),
+	}
+	peeled := map[string]plumbing.Hash{
+		"refs/tags/v2.7.13-tree": plumbing.NewHash("4444444444444444444444444444444444444444"),
+		"refs/tags/v2.6.12-tree": plumbing.NewHash("5555555555555555555555555555555555555555"),
+	}
+	ar := &AdvRefs{
+		References: references,
+		Peeled:     peeled,
+	}
+
+	expected := pktlines(c,
+		"0000000000000000000000000000000000000000 capabilities^{}\x00\n",
+		"a6930aaee06755d1bdcfd943fbf614e4d92bb0c7 refs/heads/master\n",
+		"5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11-tree\n",
+		"1111111111111111111111111111111111111111 refs/tags/v2.6.12-tree\n",
+		"5555555555555555555555555555555555555555 refs/tags/v2.6.12-tree^{}\n",
+		"2222222222222222222222222222222222222222 refs/tags/v2.6.13-tree\n",
+		"3333333333333333333333333333333333333333 refs/tags/v2.7.13-tree\n",
+		"4444444444444444444444444444444444444444 refs/tags/v2.7.13-tree^{}\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestShallow(c *C) {
+	shallows := []plumbing.Hash{
+		plumbing.NewHash("1111111111111111111111111111111111111111"),
+		plumbing.NewHash("4444444444444444444444444444444444444444"),
+		plumbing.NewHash("3333333333333333333333333333333333333333"),
+		plumbing.NewHash("2222222222222222222222222222222222222222"),
+	}
+	ar := &AdvRefs{
+		Shallows: shallows,
+	}
+
+	expected := pktlines(c,
+		"0000000000000000000000000000000000000000 capabilities^{}\x00\n",
+		"shallow 1111111111111111111111111111111111111111\n",
+		"shallow 2222222222222222222222222222222222222222\n",
+		"shallow 3333333333333333333333333333333333333333\n",
+		"shallow 4444444444444444444444444444444444444444\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestAll(c *C) {
+	hash := plumbing.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5")
+
+	capabilities := NewCapabilities()
+	capabilities.Add("symref", "HEAD:/refs/heads/master")
+	capabilities.Add("ofs-delta")
+	capabilities.Add("multi_ack")
+
+	references := map[string]plumbing.Hash{
+		"refs/heads/master":      plumbing.NewHash("a6930aaee06755d1bdcfd943fbf614e4d92bb0c7"),
+		"refs/tags/v2.6.12-tree": plumbing.NewHash("1111111111111111111111111111111111111111"),
+		"refs/tags/v2.7.13-tree": plumbing.NewHash("3333333333333333333333333333333333333333"),
+		"refs/tags/v2.6.13-tree": plumbing.NewHash("2222222222222222222222222222222222222222"),
+		"refs/tags/v2.6.11-tree": plumbing.NewHash("5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c"),
+	}
+
+	peeled := map[string]plumbing.Hash{
+		"refs/tags/v2.7.13-tree": plumbing.NewHash("4444444444444444444444444444444444444444"),
+		"refs/tags/v2.6.12-tree": plumbing.NewHash("5555555555555555555555555555555555555555"),
+	}
+
+	shallows := []plumbing.Hash{
+		plumbing.NewHash("1111111111111111111111111111111111111111"),
+		plumbing.NewHash("4444444444444444444444444444444444444444"),
+		plumbing.NewHash("3333333333333333333333333333333333333333"),
+		plumbing.NewHash("2222222222222222222222222222222222222222"),
+	}
+
+	ar := &AdvRefs{
+		Head:         &hash,
+		Capabilities: capabilities,
+		References:   references,
+		Peeled:       peeled,
+		Shallows:     shallows,
+	}
+
+	expected := pktlines(c,
+		"6ecf0ef2c2dffb796033e5a02219af86ec6584e5 HEAD\x00multi_ack ofs-delta symref=HEAD:/refs/heads/master\n",
+		"a6930aaee06755d1bdcfd943fbf614e4d92bb0c7 refs/heads/master\n",
+		"5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c refs/tags/v2.6.11-tree\n",
+		"1111111111111111111111111111111111111111 refs/tags/v2.6.12-tree\n",
+		"5555555555555555555555555555555555555555 refs/tags/v2.6.12-tree^{}\n",
+		"2222222222222222222222222222222222222222 refs/tags/v2.6.13-tree\n",
+		"3333333333333333333333333333333333333333 refs/tags/v2.7.13-tree\n",
+		"4444444444444444444444444444444444444444 refs/tags/v2.7.13-tree^{}\n",
+		"shallow 1111111111111111111111111111111111111111\n",
+		"shallow 2222222222222222222222222222222222222222\n",
+		"shallow 3333333333333333333333333333333333333333\n",
+		"shallow 4444444444444444444444444444444444444444\n",
+		pktline.FlushString,
+	)
+
+	testEncode(c, ar, expected)
+}
+
+func (s *AdvRefsEncodeSuite) TestErrorTooLong(c *C) {
+	references := map[string]plumbing.Hash{
+		strings.Repeat("a", pktline.MaxPayloadSize): plumbing.NewHash("a6930aaee06755d1bdcfd943fbf614e4d92bb0c7"),
+	}
+	ar := &AdvRefs{
+		References: references,
+	}
+
+	var buf bytes.Buffer
+	e := newAdvRefsEncoder(&buf)
+	err := e.Encode(ar)
+	c.Assert(err, ErrorMatches, ".*payload is too long.*")
+}