pr fixes

internal/gps/maybe_source.go

@@ -11,6 +11,8 @@ import (
 	"net/url"
 	"path/filepath"
 	"strings"
+
+	"github.com/Masterminds/vcs"
 )
 
 // A maybeSource represents a set of information that, given some
@@ -82,7 +84,7 @@ func (m maybeGitSource) try(ctx context.Context, cachedir string, c singleSource
 	ustr := m.url.String()
 	path := filepath.Join(cachedir, "sources", sanitizer.Replace(ustr))
 
-	r, err := newGitRepo(ustr, path)
+	r, err := newCtxRepo(vcs.Git, ustr, path)
 
 	if err != nil {
 		return nil, 0, unwrapVcsErr(err)
@@ -138,7 +140,7 @@ func (m maybeGopkginSource) try(ctx context.Context, cachedir string, c singleSo
 	// So, it's OK to just dumb-join the scheme with the path.
 	path := filepath.Join(cachedir, "sources", sanitizer.Replace(m.url.Scheme+"/"+m.opath))
 	ustr := m.url.String()
-	r, err := newGitRepo(ustr, path)
+	r, err := newCtxRepo(vcs.Git, ustr, path)
 
 	if err != nil {
 		return nil, 0, unwrapVcsErr(err)
@@ -186,7 +188,7 @@ func (m maybeBzrSource) try(ctx context.Context, cachedir string, c singleSource
 	ustr := m.url.String()
 	path := filepath.Join(cachedir, "sources", sanitizer.Replace(ustr))
 
-	r, err := newBzrRepo(ustr, path)
+	r, err := newCtxRepo(vcs.Bzr, ustr, path)
 
 	if err != nil {
 		return nil, 0, unwrapVcsErr(err)
@@ -228,7 +230,7 @@ func (m maybeHgSource) try(ctx context.Context, cachedir string, c singleSourceC
 	ustr := m.url.String()
 	path := filepath.Join(cachedir, "sources", sanitizer.Replace(ustr))
 
-	r, err := newHgRepo(ustr, path)
+	r, err := newCtxRepo(vcs.Hg, ustr, path)
 
 	if err != nil {
 		return nil, 0, unwrapVcsErr(err)

internal/gps/vcs_repo.go

@@ -24,30 +24,45 @@ type ctxRepo interface {
 	//ping(context.Context) (bool, error)
 }
 
-// original implementation of these methods come from
-// https://github.com/Masterminds/vcs
+func newCtxRepo(s vcs.Type, ustr, path string) (r ctxRepo, err error) {
+	r, err = getVCSRepo(s, ustr, path)
+	if err != nil {
+		// if vcs could not initialize the repo due to a local error
+		// then the local repo is in an incorrect state. Remove and
+		// treat it as a new not-yet-cloned repo.
 
-type gitRepo struct {
-	*vcs.GitRepo
+		// TODO(marwan-at-work): pass a logger here to warn/give progress of the above comment.
+		os.RemoveAll(path)
+		r, err = getVCSRepo(s, ustr, path)
+	}
+
+	return
 }
 
-func newGitRepo(ustr, path string) (*gitRepo, error) {
-	r, err := vcs.NewGitRepo(ustr, path)
-	if err != nil {
-		if _, ok := err.(*vcs.LocalError); ok {
-			// if vcs could not initialize the repo due to a local error
-			// then the local repo is in an incorrect state. Remove and
-			// treat it as a new not-yet-cloned repo.
-			os.RemoveAll(path)
-			r, err = vcs.NewGitRepo(ustr, path)
-		}
-	}
+func getVCSRepo(s vcs.Type, ustr, path string) (r ctxRepo, err error) {
+	switch s {
+	case vcs.Git:
+		var repo *vcs.GitRepo
+		repo, err = vcs.NewGitRepo(ustr, path)
+		r = &gitRepo{repo}
+	case vcs.Bzr:
+		var repo *vcs.BzrRepo
+		repo, err = vcs.NewBzrRepo(ustr, path)
+		r = &bzrRepo{repo}
+	case vcs.Hg:
+		var repo *vcs.HgRepo
+		repo, err = vcs.NewHgRepo(ustr, path)
+		r = &hgRepo{repo}
+	}
+
+	return
+}
 
-	if err != nil {
-		return nil, err
-	}
+// original implementation of these methods come from
+// https://github.com/Masterminds/vcs
 
-	return &gitRepo{r}, nil
+type gitRepo struct {
+	*vcs.GitRepo
 }
 
 func newVcsRemoteErrorOr(msg string, err error, out string) error {
@@ -120,25 +135,6 @@ type bzrRepo struct {
 	*vcs.BzrRepo
 }
 
-func newBzrRepo(ustr, path string) (*bzrRepo, error) {
-	r, err := vcs.NewBzrRepo(ustr, path)
-	if err != nil {
-		// if vcs could not initialize the repo due to a local error
-		// then the local repo is in an incorrect state. Remove and
-		// treat it as a new not-yet-cloned repo.
-		if _, ok := err.(*vcs.LocalError); ok {
-			os.RemoveAll(path)
-			r, err = vcs.NewBzrRepo(ustr, path)
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &bzrRepo{r}, nil
-}
-
 func (r *bzrRepo) get(ctx context.Context) error {
 	basePath := filepath.Dir(filepath.FromSlash(r.LocalPath()))
 	if _, err := os.Stat(basePath); os.IsNotExist(err) {
@@ -176,25 +172,6 @@ type hgRepo struct {
 	*vcs.HgRepo
 }
 
-func newHgRepo(ustr, path string) (*hgRepo, error) {
-	r, err := vcs.NewHgRepo(ustr, path)
-	if err != nil {
-		// if vcs could not initialize the repo due to a local error
-		// then the local repo is in an incorrect state. Remove and
-		// treat it as a new not-yet-cloned repo.
-		if _, ok := err.(*vcs.LocalError); ok {
-			os.RemoveAll(path)
-			r, err = vcs.NewHgRepo(ustr, path)
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &hgRepo{r}, nil
-}
-
 func (r *hgRepo) get(ctx context.Context) error {
 	out, err := runFromCwd(ctx, "hg", "clone", r.Remote(), r.LocalPath())
 	if err != nil {