From 8009cde25dda59ff13a97fabac9abb0b6ef57ef9 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Tue, 11 Jul 2017 14:51:12 +0200 Subject: transport/server: add NewClient server.NewClient returns a server that acts as a client. This makes it working seamlessly when registering a server directly with `client.InstallProtocol`. --- plumbing/transport/server/server.go | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'plumbing/transport/server/server.go') diff --git a/plumbing/transport/server/server.go b/plumbing/transport/server/server.go index 89fce5f..7b0e7a8 100644 --- a/plumbing/transport/server/server.go +++ b/plumbing/transport/server/server.go @@ -26,7 +26,19 @@ type server struct { // NewServer returns a transport.Transport implementing a git server, // independent of transport. Each transport must wrap this. func NewServer(loader Loader) transport.Transport { - return &server{loader, &handler{}} + return &server{ + loader, + &handler{asClient: false}, + } +} + +// NewClient returns a transport.Transport implementing a client with an +// embedded server. +func NewClient(loader Loader) transport.Transport { + return &server{ + loader, + &handler{asClient: true}, + } } func (s *server) NewUploadPackSession(ep transport.Endpoint, auth transport.AuthMethod) (transport.UploadPackSession, error) { @@ -47,24 +59,27 @@ func (s *server) NewReceivePackSession(ep transport.Endpoint, auth transport.Aut return s.handler.NewReceivePackSession(sto) } -type handler struct{} +type handler struct { + asClient bool +} func (h *handler) NewUploadPackSession(s storer.Storer) (transport.UploadPackSession, error) { return &upSession{ - session: session{storer: s}, + session: session{storer: s, asClient: h.asClient}, }, nil } func (h *handler) NewReceivePackSession(s storer.Storer) (transport.ReceivePackSession, error) { return &rpSession{ - session: session{storer: s}, + session: session{storer: s, asClient: h.asClient}, cmdStatus: map[plumbing.ReferenceName]error{}, }, nil } type session struct { - storer storer.Storer - caps *capability.List + storer storer.Storer + caps *capability.List + asClient bool } func (s *session) Close() error { @@ -107,6 +122,10 @@ func (s *upSession) AdvertisedReferences() (*packp.AdvRefs, error) { return nil, err } + if s.asClient && len(ar.References) == 0 { + return nil, transport.ErrEmptyRemoteRepository + } + return ar, nil } -- cgit