plumbing: transport, move server stuff into transport

plumbing/transport/common.go

@@ -37,6 +37,9 @@ var (
 	ErrInvalidResponse = errors.New("invalid response")
 	// ErrTimeoutExceeded is returned when the timeout is exceeded.
 	ErrTimeoutExceeded = errors.New("timeout exceeded")
+	// ErrPackedObjectsNotSupported is returned when the server does not support
+	// packed objects.
+	ErrPackedObjectsNotSupported = errors.New("packed objects not supported")
 	// stdErrSkipPattern is used for skipping lines from a command's stderr output.
 	// Any line matching this pattern will be skipped from further
 	// processing and not be returned to calling code.

plumbing/transport/file/client.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"strings"
 
-	"github.com/go-git/go-git/v5/plumbing/server"
 	"github.com/go-git/go-git/v5/plumbing/transport"
 )
 
@@ -19,14 +18,14 @@ func init() {
 var DefaultTransport = NewTransport(nil)
 
 type runner struct {
-	loader server.Loader
+	loader transport.Loader
 }
 
 // NewTransport returns a new file transport that users go-git built-in server
 // implementation to serve repositories.
-func NewTransport(loader server.Loader) transport.Transport {
+func NewTransport(loader transport.Loader) transport.Transport {
 	if loader == nil {
-		loader = server.DefaultLoader
+		loader = transport.DefaultLoader
 	}
 	return transport.NewPackTransport(&runner{loader})
 }
@@ -47,7 +46,7 @@ func (r *runner) Command(ctx context.Context, cmd string, ep *transport.Endpoint
 type command struct {
 	ctx         context.Context
 	ep          *transport.Endpoint
-	loader      server.Loader
+	loader      transport.Loader
 	service     string
 	gitProtocol string
 
@@ -71,11 +70,11 @@ func (c *command) Start() error {
 
 	switch c.service {
 	case transport.UploadPackServiceName:
-		opts := &server.UploadPackOptions{
+		opts := &transport.UploadPackOptions{
 			GitProtocol: c.gitProtocol,
 		}
 		go func() {
-			if err := server.UploadPack(
+			if err := transport.UploadPack(
 				c.ctx,
 				st,
 				io.NopCloser(c.stdin),
@@ -89,11 +88,11 @@ func (c *command) Start() error {
 		}()
 		return nil
 	case transport.ReceivePackServiceName:
-		opts := &server.ReceivePackOptions{
+		opts := &transport.ReceivePackOptions{
 			GitProtocol: c.gitProtocol,
 		}
 		go func() {
-			if err := server.ReceivePack(
+			if err := transport.ReceivePack(
 				c.ctx,
 				st,
 				io.NopCloser(c.stdin),

plumbing/server/loader.go → plumbing/transport/loader.go

@@ -1,11 +1,10 @@
-package server
+package transport
 
 import (
 	"path/filepath"
 
 	"github.com/go-git/go-git/v5/plumbing/cache"
 	"github.com/go-git/go-git/v5/plumbing/storer"
-	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/storage"
 	"github.com/go-git/go-git/v5/storage/filesystem"
 
@@ -21,7 +20,7 @@ type Loader interface {
 	// Load loads a storer.Storer given a transport.Endpoint.
 	// Returns transport.ErrRepositoryNotFound if the repository does not
 	// exist.
-	Load(ep *transport.Endpoint) (storage.Storer, error)
+	Load(ep *Endpoint) (storage.Storer, error)
 }
 
 type fsLoader struct {
@@ -38,11 +37,11 @@ func NewFilesystemLoader(base billy.Filesystem, strict bool) Loader {
 // Load looks up the endpoint's path in the base file system and returns a
 // storer for it. Returns transport.ErrRepositoryNotFound if a repository does
 // not exist in the given path.
-func (l *fsLoader) Load(ep *transport.Endpoint) (storage.Storer, error) {
+func (l *fsLoader) Load(ep *Endpoint) (storage.Storer, error) {
 	return l.load(ep, false)
 }
 
-func (l *fsLoader) load(ep *transport.Endpoint, tried bool) (storage.Storer, error) {
+func (l *fsLoader) load(ep *Endpoint, tried bool) (storage.Storer, error) {
 	fs, err := l.base.Chroot(ep.Path)
 	if err != nil {
 		return nil, err
@@ -57,7 +56,7 @@ func (l *fsLoader) load(ep *transport.Endpoint, tried bool) (storage.Storer, err
 			}
 			return l.load(ep, true)
 		}
-		return nil, transport.ErrRepositoryNotFound
+		return nil, ErrRepositoryNotFound
 	}
 
 	return filesystem.NewStorage(fs, cache.NewObjectLRUDefault()), nil
@@ -70,10 +69,10 @@ type MapLoader map[string]storer.Storer
 // Load returns a storer.Storer for given a transport.Endpoint by looking it up
 // in the map. Returns transport.ErrRepositoryNotFound if the endpoint does not
 // exist.
-func (l MapLoader) Load(ep *transport.Endpoint) (storer.Storer, error) {
+func (l MapLoader) Load(ep *Endpoint) (storer.Storer, error) {
 	s, ok := l[ep.String()]
 	if !ok {
-		return nil, transport.ErrRepositoryNotFound
+		return nil, ErrRepositoryNotFound
 	}
 
 	return s, nil

plumbing/server/loader_test.go → plumbing/transport/loader_test.go

@@ -1,10 +1,9 @@
-package server
+package transport
 
 import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/storage/memory"
 
 	. "gopkg.in/check.v1"
@@ -26,21 +25,21 @@ func (s *LoaderSuite) SetUpSuite(c *C) {
 	c.Assert(exec.Command("git", "init", "--bare", s.RepoPath).Run(), IsNil)
 }
 
-func (s *LoaderSuite) endpoint(c *C, url string) *transport.Endpoint {
-	ep, err := transport.NewEndpoint(url)
+func (s *LoaderSuite) endpoint(c *C, url string) *Endpoint {
+	ep, err := NewEndpoint(url)
 	c.Assert(err, IsNil)
 	return ep
 }
 
 func (s *LoaderSuite) TestLoadNonExistent(c *C) {
 	sto, err := DefaultLoader.Load(s.endpoint(c, "does-not-exist"))
-	c.Assert(err, Equals, transport.ErrRepositoryNotFound)
+	c.Assert(err, Equals, ErrRepositoryNotFound)
 	c.Assert(sto, IsNil)
 }
 
 func (s *LoaderSuite) TestLoadNonExistentIgnoreHost(c *C) {
 	sto, err := DefaultLoader.Load(s.endpoint(c, "https://github.com/does-not-exist"))
-	c.Assert(err, Equals, transport.ErrRepositoryNotFound)
+	c.Assert(err, Equals, ErrRepositoryNotFound)
 	c.Assert(sto, IsNil)
 }
 
@@ -57,13 +56,13 @@ func (s *LoaderSuite) TestLoadIgnoreHost(c *C) {
 }
 
 func (s *LoaderSuite) TestMapLoader(c *C) {
-	ep, err := transport.NewEndpoint("file://test")
+	ep, err := NewEndpoint("file://test")
 	sto := memory.NewStorage()
 	c.Assert(err, IsNil)
 
 	loader := MapLoader{ep.String(): sto}
 
-	ep, err = transport.NewEndpoint("file://test")
+	ep, err = NewEndpoint("file://test")
 	c.Assert(err, IsNil)
 
 	loaderSto, err := loader.Load(ep)

plumbing/server/receive_pack.go → plumbing/transport/receive_pack.go

@@ -1,4 +1,4 @@
-package server
+package transport
 
 import (
 	"bufio"
@@ -13,7 +13,6 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/protocol/packp"
 	"github.com/go-git/go-git/v5/plumbing/protocol/packp/capability"
 	"github.com/go-git/go-git/v5/plumbing/storer"
-	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/storage"
 )
 
@@ -55,7 +54,7 @@ func ReceivePack(
 	}
 
 	if opts.AdvertiseRefs || !opts.StatelessRPC {
-		if err := AdvertiseReferences(ctx, st, w, transport.ReceivePackServiceName, opts.StatelessRPC); err != nil {
+		if err := AdvertiseReferences(ctx, st, w, ReceivePackServiceName, opts.StatelessRPC); err != nil {
 			return err
 		}
 	}

plumbing/server/serve.go → plumbing/transport/serve.go

@@ -1,4 +1,4 @@
-package server
+package transport
 
 import (
 	"context"
@@ -14,7 +14,6 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/protocol/packp"
 	"github.com/go-git/go-git/v5/plumbing/protocol/packp/capability"
 	"github.com/go-git/go-git/v5/plumbing/storer"
-	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/storage"
 )
 
@@ -23,7 +22,7 @@ var ErrUpdateReference = errors.New("failed to update ref")
 // AdvertiseReferences is a server command that implements the reference
 // discovery phase of the Git transfer protocol.
 func AdvertiseReferences(ctx context.Context, st storage.Storer, w io.Writer, service string, stateless bool) error {
-	forPush := service == transport.ReceivePackServiceName
+	forPush := service == ReceivePackServiceName
 	ar := packp.NewAdvRefs()
 
 	// Set server default capabilities

plumbing/serverinfo/serverinfo.go → plumbing/transport/serverinfo.go

@@ -1,10 +1,9 @@
-package serverinfo
+package transport
 
 import (
 	"fmt"
 
 	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/internal/reference"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
@@ -20,7 +19,7 @@ import (
 func UpdateServerInfo(s storage.Storer, fs billy.Filesystem) error {
 	pos, ok := s.(storer.PackedObjectStorer)
 	if !ok {
-		return git.ErrPackedObjectsNotSupported
+		return ErrPackedObjectsNotSupported
 	}
 
 	infoRefs, err := fs.Create("info/refs")