Split input components out in Gopkg.lock

cmd/dep/ensure.go

@@ -162,7 +162,7 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
 		writeV = dep.VendorAlways
 	}
 
-	newLock := dep.LockFromInterface(solution)
+	newLock := dep.LockFromSolution(solution)
 	sw, err := dep.NewSafeWriter(nil, p.Lock, newLock, writeV)
 	if err != nil {
 		return err

cmd/dep/init.go

@@ -178,7 +178,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		handleAllTheFailuresOfTheWorld(err)
 		return err
 	}
-	l = dep.LockFromInterface(soln)
+	l = dep.LockFromSolution(soln)
 
 	// Iterate through the new projects in solved lock and add them to manifest
 	// if direct deps and log feedback for all the new projects.
@@ -211,7 +211,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		return errors.Wrap(err, "prepare solver")
 	}
 
-	l.Memo = s.HashInputs()
+	l.SolveMeta.Memo = s.HashInputs()
 
 	// Pass timestamp (yyyyMMddHHmmss format) as suffix to backup name.
 	vendorbak, err := dep.BackupVendor(vpath, time.Now().Format("20060102150405"))

cmd/dep/prune.go

@@ -68,7 +68,7 @@ func (cmd *pruneCommand) Run(ctx *dep.Ctx, args []string) error {
 		return errors.Wrap(err, "could not set up solver for input hashing")
 	}
 
-	if !bytes.Equal(s.HashInputs(), p.Lock.Memo) {
+	if !bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.Memo) {
 		return fmt.Errorf("lock hash doesn't match")
 	}
 

cmd/dep/remove.go

@@ -176,7 +176,7 @@ func (cmd *removeCommand) Run(ctx *dep.Ctx, args []string) error {
 		return err
 	}
 
-	newLock := dep.LockFromInterface(soln)
+	newLock := dep.LockFromSolution(soln)
 
 	sw, err := dep.NewSafeWriter(nil, p.Lock, newLock, dep.VendorOnChanged)
 	if err != nil {

cmd/dep/status.go

@@ -277,7 +277,7 @@ func runStatusAll(loggers *dep.Loggers, out outputter, p *dep.Project, sm gps.So
 	slp := p.Lock.Projects()
 	sort.Sort(dep.SortedLockedProjects(slp))
 
-	if bytes.Equal(s.HashInputs(), p.Lock.Memo) {
+	if bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.Memo) {
 		// If these are equal, we're guaranteed that the lock is a transitively
 		// complete picture of all deps. That eliminates the need for at least
 		// some checks.

cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json

@@ -3,6 +3,7 @@
     ["init"],
     ["ensure", "-update"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest"
   ]

cmd/dep/testdata/harness_tests/ensure/empty/case2/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["ensure"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest"
   ]

cmd/dep/testdata/harness_tests/ensure/empty/case3/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["ensure"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest"
   ]

cmd/dep/testdata/harness_tests/ensure/override/case1/testcase.json

@@ -3,6 +3,7 @@
     ["init"],
     ["ensure", "-override", "github.com/sdboyer/[email protected]"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest"
   ]

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json

@@ -1,7 +1,8 @@
 {
-   "commands": [
-     ["init", "-no-examples"],
-     ["ensure", "-update"]
-   ],
-   "error-expected" : "all dirs lacked any go code"
- } 
+  "commands": [
+    ["init", "-no-examples"],
+    ["ensure", "-update"]
+  ],
+  "error-expected": "all dirs lacked any go code",
+  "vendor-final": []
+}

cmd/dep/testdata/harness_tests/ensure/update/case1/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["ensure", "-update", "github.com/sdboyer/deptest"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/ensure/update/case2/testcase.json

@@ -2,5 +2,6 @@
   "commands": [
     ["ensure", "-n", "-update", "github.com/sdboyer/deptest"]
   ],
+  "error-expected": "",
   "vendor-final": []
 }

cmd/dep/testdata/harness_tests/init/case1/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["init", "-no-examples"]
   ],
+  "error-expected": "",
   "gopath-initial": {
     "github.com/sdboyer/deptest": "v0.8.0",
     "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"

cmd/dep/testdata/harness_tests/init/case2/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["init", "-no-examples"]
   ],
+  "error-expected": "",
   "gopath-initial": {
     "github.com/sdboyer/deptest": "v0.8.0"
   },

cmd/dep/testdata/harness_tests/init/case3/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["init", "-no-examples"]
   ],
+  "error-expected": "",
   "gopath-initial": {
     "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"
   },

cmd/dep/testdata/harness_tests/init/manifest-exists/testcase.json

@@ -1,6 +1,7 @@
 {
-   "commands": [
-     ["init"]
-   ],
-   "error-expected" : "manifest already exists:"
- }
+  "commands": [
+    ["init"]
+  ],
+  "error-expected": "manifest already exists:",
+  "vendor-final": []
+}

cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["init", "-no-examples"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest"
   ]

cmd/dep/testdata/harness_tests/remove/force/case1/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["remove", "-force", "github.com/sdboyer/deptestdos", "github.com/not/used"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/remove/specific/case1/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["remove", "github.com/not/used"]
   ],
+  "error-expected": "",
   "vendor-final": [
     "github.com/sdboyer/deptest",
     "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/remove/specific/case2/testcase.json

@@ -2,6 +2,7 @@
   "commands": [
     ["remove", "github.com/not/used"]
   ],
+  "error-expected": "",
   "vendor-initial": {
     "github.com/sdboyer/deptest": "v0.8.0",
     "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"