From 45bdbcbe6fdab5a8a4ed4f1b16c191f400a0f6b6 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Wed, 26 Apr 2017 17:04:59 +0200 Subject: transport: make Endpoint an interface, fixes #362 * add internal *url.URL implementation for regular URLs. * add internal implementation for SCP-like URLs. --- plumbing/transport/server/loader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plumbing/transport/server') diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index cfe9f04..b51a795 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -34,7 +34,7 @@ func NewFilesystemLoader(base billy.Filesystem) Loader { // storer for it. Returns transport.ErrRepositoryNotFound if a repository does // not exist in the given path. func (l *fsLoader) Load(ep transport.Endpoint) (storer.Storer, error) { - fs := l.base.Dir(ep.Path) + fs := l.base.Dir(ep.Path()) if _, err := fs.Stat("config"); err != nil { return nil, transport.ErrRepositoryNotFound } -- cgit From 4a670e130804d630fa056e4a60101698dc7a9af1 Mon Sep 17 00:00:00 2001 From: "Santiago M. Mola" Date: Fri, 28 Apr 2017 15:20:51 +0200 Subject: do not convert local paths to URL * Do not convert local paths to URLs, just keep them as they are. * This way we add support for Windows without taking care of Windows path-to-URL conversion. --- plumbing/transport/server/loader_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plumbing/transport/server') diff --git a/plumbing/transport/server/loader_test.go b/plumbing/transport/server/loader_test.go index b4a8c37..5f32cb0 100644 --- a/plumbing/transport/server/loader_test.go +++ b/plumbing/transport/server/loader_test.go @@ -1,7 +1,6 @@ package server import ( - "fmt" "os/exec" "path/filepath" @@ -33,7 +32,7 @@ func (s *LoaderSuite) endpoint(c *C, url string) transport.Endpoint { } func (s *LoaderSuite) TestLoadNonExistent(c *C) { - sto, err := DefaultLoader.Load(s.endpoint(c, "file:///does-not-exist")) + sto, err := DefaultLoader.Load(s.endpoint(c, "does-not-exist")) c.Assert(err, Equals, transport.ErrRepositoryNotFound) c.Assert(sto, IsNil) } @@ -45,13 +44,13 @@ func (s *LoaderSuite) TestLoadNonExistentIgnoreHost(c *C) { } func (s *LoaderSuite) TestLoad(c *C) { - sto, err := DefaultLoader.Load(s.endpoint(c, fmt.Sprintf("file://%s", s.RepoPath))) + sto, err := DefaultLoader.Load(s.endpoint(c, s.RepoPath)) c.Assert(err, IsNil) c.Assert(sto, NotNil) } func (s *LoaderSuite) TestLoadIgnoreHost(c *C) { - sto, err := DefaultLoader.Load(s.endpoint(c, fmt.Sprintf("file://%s", s.RepoPath))) + sto, err := DefaultLoader.Load(s.endpoint(c, s.RepoPath)) c.Assert(err, IsNil) c.Assert(sto, NotNil) } -- cgit