Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 75ac569

Browse files
committed
Incorporate solver name and version in Gopkg.lock
1 parent bf737b6 commit 75ac569

File tree

31 files changed

+194
-138
lines changed

31 files changed

+194
-138
lines changed

cmd/dep/init.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
211211
return errors.Wrap(err, "prepare solver")
212212
}
213213

214-
l.Inputs.Memo = s.HashInputs()
214+
l.SolveMeta.Memo = s.HashInputs()
215215

216216
// Pass timestamp (yyyyMMddHHmmss format) as suffix to backup name.
217217
vendorbak, err := dep.BackupVendor(vpath, time.Now().Format("20060102150405"))

cmd/dep/prune.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (cmd *pruneCommand) Run(ctx *dep.Ctx, args []string) error {
6868
return errors.Wrap(err, "could not set up solver for input hashing")
6969
}
7070

71-
if !bytes.Equal(s.HashInputs(), p.Lock.Inputs.Memo) {
71+
if !bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.Memo) {
7272
return fmt.Errorf("lock hash doesn't match")
7373
}
7474

cmd/dep/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func runStatusAll(loggers *dep.Loggers, out outputter, p *dep.Project, sm gps.So
277277
slp := p.Lock.Projects()
278278
sort.Sort(dep.SortedLockedProjects(slp))
279279

280-
if bytes.Equal(s.HashInputs(), p.Lock.Inputs.Memo) {
280+
if bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.Memo) {
281281
// If these are equal, we're guaranteed that the lock is a transitively
282282
// complete picture of all deps. That eliminates the need for at least
283283
// some checks.

cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.lock

+6-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)