From 22fe81f342538ae51442a72356036768f7f1a2f9 Mon Sep 17 00:00:00 2001
From: Máximo Cuadros <mcuadros@gmail.com>
Date: Tue, 6 Dec 2016 15:46:09 +0100
Subject: protocol/packp: UploadPackResponse implementation (#161)

* plumbing/protocol: paktp avoid duplication of haves, wants and shallow

* protocol/pakp: UploadPackResponse implementation

* changes

* changes

* changes

* debug

* changes
---
 plumbing/transport/http/fetch_pack.go | 38 +++++++++++------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

(limited to 'plumbing/transport/http/fetch_pack.go')

diff --git a/plumbing/transport/http/fetch_pack.go b/plumbing/transport/http/fetch_pack.go
index f250667..20cdb55 100644
--- a/plumbing/transport/http/fetch_pack.go
+++ b/plumbing/transport/http/fetch_pack.go
@@ -11,6 +11,7 @@ import (
 	"gopkg.in/src-d/go-git.v4/plumbing/format/pktline"
 	"gopkg.in/src-d/go-git.v4/plumbing/protocol/packp"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
+	"gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common"
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
 )
 
@@ -74,12 +75,12 @@ func (s *fetchPackSession) AdvertisedReferences() (*packp.AdvRefs, error) {
 	return ar, nil
 }
 
-func (s *fetchPackSession) FetchPack(r *packp.UploadPackRequest) (io.ReadCloser, error) {
-	if r.IsEmpty() {
+func (s *fetchPackSession) FetchPack(req *packp.UploadPackRequest) (*packp.UploadPackResponse, error) {
+	if req.IsEmpty() {
 		return nil, transport.ErrEmptyUploadPackRequest
 	}
 
-	if err := r.Validate(); err != nil {
+	if err := req.Validate(); err != nil {
 		return nil, err
 	}
 
@@ -88,31 +89,27 @@ func (s *fetchPackSession) FetchPack(r *packp.UploadPackRequest) (io.ReadCloser,
 		s.endpoint.String(), transport.UploadPackServiceName,
 	)
 
-	content, err := uploadPackRequestToReader(r)
+	content, err := uploadPackRequestToReader(req)
 	if err != nil {
 		return nil, err
 	}
 
-	res, err := s.doRequest("POST", url, content)
+	res, err := s.doRequest(http.MethodPost, url, content)
 	if err != nil {
 		return nil, err
 	}
 
-	reader, err := ioutil.NonEmptyReader(res.Body)
-	if err == ioutil.ErrEmptyReader || err == io.ErrUnexpectedEOF {
-		return nil, transport.ErrEmptyUploadPackRequest
-	}
-
+	r, err := ioutil.NonEmptyReader(res.Body)
 	if err != nil {
-		return nil, err
-	}
+		if err == ioutil.ErrEmptyReader || err == io.ErrUnexpectedEOF {
+			return nil, transport.ErrEmptyUploadPackRequest
+		}
 
-	rc := ioutil.NewReadCloser(reader, res.Body)
-	if err := discardResponseInfo(rc); err != nil {
 		return nil, err
 	}
 
-	return rc, nil
+	rc := ioutil.NewReadCloser(r, res.Body)
+	return common.DecodeUploadPackResponse(rc, req)
 }
 
 // Close does nothing.
@@ -120,17 +117,6 @@ func (s *fetchPackSession) Close() error {
 	return nil
 }
 
-func discardResponseInfo(r io.Reader) error {
-	s := pktline.NewScanner(r)
-	for s.Scan() {
-		if bytes.Equal(s.Bytes(), []byte{'N', 'A', 'K', '\n'}) {
-			break
-		}
-	}
-
-	return s.Err()
-}
-
 func (s *fetchPackSession) doRequest(method, url string, content *strings.Reader) (*http.Response, error) {
 	var body io.Reader
 	if content != nil {
-- 
cgit