gvt importer imports gb-vendor too

golang · Sep 16, 2017 · a7eff3c · a7eff3c
1 parent 5a0c5f9
commit a7eff3c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 10 deletions.
diff --git a/cmd/dep/init.go b/cmd/dep/init.go
@@ -29,7 +29,7 @@ specified, use the current directory.
 When configuration for another dependency management tool is detected, it is
 imported into the initial manifest and lock. Use the -skip-tools flag to
 disable this behavior. The following external tools are supported:
-glide, godep, vndr, govend, gvt.
+glide, godep, vndr, govend, gb, gvt.
 
 Any dependencies that are not constrained by external configuration use the
 GOPATH analysis below.

diff --git a/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest b/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest
@@ -5,7 +5,7 @@
       "importpath": "github.com/sdboyer/deptest",
       "repository": "https://github.com/sdboyer/deptest",
       "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-      "branch": "master"
+      "branch": "HEAD"
     },
     {
       "importpath": "github.com/sdboyer/deptestdos",

diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -209,7 +209,7 @@ about what's going on.
 During `dep init` configuration from other dependency managers is detected
 and imported, unless `-skip-tools` is specified.
 
-The following tools are supported: `glide`, `godep`, `vndr`, `govend` and `gvt`.
+The following tools are supported: `glide`, `godep`, `vndr`, `govend`, `gb` and `gvt`.
 
 See [#186](https://github.com/golang/dep/issues/186#issuecomment-306363441) for
 how to add support for another tool.

diff --git a/internal/importers/gvt/importer.go b/internal/importers/gvt/importer.go
@@ -67,7 +67,7 @@ func (g *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.L
 }
 
 func (g *Importer) load(projectDir string) error {
-	g.Logger.Println("Detected gvt configuration files...")
+	g.Logger.Println("Detected gb/gvt configuration files...")
 	j := filepath.Join(projectDir, gvtPath)
 	if g.Verbose {
 		g.Logger.Printf("  Loading %s", j)
@@ -101,7 +101,13 @@ func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error)
 		}
 
 		var contstraintHint = ""
-		if pkg.Branch != "master" {
+		if pkg.Branch == "HEAD" {
+			// gb-vendor sets "branch" to "HEAD", if the package was feteched via -tag or -revision,
+			// we we pass the revision as the constraint hint
+			contstraintHint = pkg.Revision
+		} else if pkg.Branch != "master" {
+			// both gvt & gb-vendor set "branch" to "master" unless a different branch was requested.
+			// so it's not realy a constraint unless it's a different branch
 			contstraintHint = pkg.Branch
 		}
 

diff --git a/internal/importers/gvt/importer_test.go b/internal/importers/gvt/importer_test.go
@@ -54,6 +54,22 @@ func TestGvtConfig_Convert(t *testing.T) {
 				},
 			},
 		},
+		"package with HEAD branch": {
+			importertest.TestCase{
+				WantConstraint: "*",
+				WantRevision:   importertest.V1Rev,
+				WantVersion:    importertest.V1Tag,
+			},
+			gvtManifest{
+				Deps: []gvtPkg{
+					{
+						ImportPath: importertest.Project,
+						Revision:   importertest.V1Rev,
+						Branch:     "HEAD",
+					},
+				},
+			},
+		},
 		"missing package name": {
 			importertest.TestCase{
 				WantConvertErr: true,
@@ -151,7 +167,7 @@ func TestGvtConfig_JsonLoad(t *testing.T) {
 			{
 				ImportPath: "github.com/sdboyer/deptest",
 				Revision:   "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-				Branch:     "master",
+				Branch:     "HEAD",
 			},
 			{
 				ImportPath: "github.com/sdboyer/deptestdos",

diff --git a/internal/importers/gvt/testdata/golden.txt b/internal/importers/gvt/testdata/golden.txt
@@ -1,6 +1,6 @@
-Detected gvt configuration files...
+Detected gb/gvt configuration files...
 Converting from vendor/manifest ...
-  Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
+  Using * as initial constraint for imported dep github.com/sdboyer/deptest
   Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
   Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
   Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos

diff --git a/internal/importers/gvt/testdata/manifest b/internal/importers/gvt/testdata/manifest
@@ -2,11 +2,13 @@
   "dependencies": [
     {
       "importpath": "github.com/sdboyer/deptest",
-      "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
+      "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
+      "branch": "HEAD"
     },
     {
       "importpath": "github.com/sdboyer/deptestdos",
-      "revision": "5c607206be5decd28e6263ffffdcee067266015e"
+      "revision": "5c607206be5decd28e6263ffffdcee067266015e",
+      "branch": "master"
     },
     {
       "importpath": "github.com/carolynvs/deptest-importers",