cmd/dep: make out-of-sync ensure less strict (golang#1225)

* cmd/dep: make out-of-sync ensure less strict

* cmd/dep: fix broken integration test

Author: miguel250

cmd/dep/ensure.go

@@ -340,9 +340,8 @@ func (cmd *ensureCommand) runUpdate(ctx *dep.Ctx, args []string, p *dep.Project,
 	// user a bit, but the extra effort required is minimal, and it ensures the
 	// user is isolating variables in the event of solve problems (was it the
 	// "pending" changes, or the -update that caused the problem?).
-	// TODO(sdboyer) reduce this to a warning?
 	if !bytes.Equal(p.Lock.InputHash(), solver.HashInputs()) {
-		return errors.Errorf("%s is out of sync with %s or the project's imports. Run \"dep ensure\" to resync them first before running \"dep ensure -update\"", dep.LockName, dep.ManifestName)
+		ctx.Out.Printf("Warning: %s is out of sync with %s or the project's imports.", dep.LockName, dep.ManifestName)
 	}
 
 	// When -update is specified without args, allow every dependency to change
@@ -406,9 +405,8 @@ func (cmd *ensureCommand) runAdd(ctx *dep.Ctx, args []string, p *dep.Project, sm
 	// user a bit, but the extra effort required is minimal, and it ensures the
 	// user is isolating variables in the event of solve problems (was it the
 	// "pending" changes, or the -add that caused the problem?).
-	// TODO(sdboyer) reduce this to a warning?
 	if p.Lock != nil && !bytes.Equal(p.Lock.InputHash(), solver.HashInputs()) {
-		return errors.Errorf("%s is out of sync with %s or the project's imports. Run \"dep ensure\" to resync them first before running \"dep ensure -add\"", dep.LockName, dep.ManifestName)
+		ctx.Out.Printf("Warning: %s is out of sync with %s or the project's imports.", dep.LockName, dep.ManifestName)
 	}
 
 	rm, _ := params.RootPackageTree.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
@@ -479,7 +477,7 @@ func (cmd *ensureCommand) runAdd(ctx *dep.Ctx, args []string, p *dep.Project, sm
 
 	var wg sync.WaitGroup
 
-	fmt.Println("Fetching sources...")
+	ctx.Out.Println("Fetching sources...")
 
 	for i, arg := range args {
 		wg.Add(1)

cmd/dep/testdata/harness_tests/ensure/update/errs/desync/final/Gopkg.lock cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.lock

@@ -0,0 +1,6 @@
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "~0.8.0"
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"

cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.toml

@@ -7,6 +7,7 @@ package main
 import (
 	"github.com/sdboyer/deptest"
 	"github.com/sdboyer/deptestdos"
+	"github.com/sdboyer/deptesttres"
 )
 
 func main() {
@@ -15,4 +16,6 @@ func main() {
 		deptest.Map["yo yo!"]
 	}
 	deptestdos.diMeLo("whatev")
+
+	type a deptesttres.Bar
 }

cmd/dep/testdata/harness_tests/ensure/add/errs/desync/final/main.go cmd/dep/testdata/harness_tests/ensure/add/desync/final/main.go

@@ -0,0 +1,2 @@
+Warning: Gopkg.lock is out of sync with Gopkg.toml or the project's imports.
+Fetching sources...

cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.lock

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["ensure", "-add", "github.com/sdboyer/deptesttres@master"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptestdos",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/errs/desync/final/Gopkg.toml cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.toml

@@ -0,0 +1 @@
+Warning: Gopkg.lock is out of sync with Gopkg.toml or the project's imports.

cmd/dep/testdata/harness_tests/ensure/update/errs/desync/initial/main.go cmd/dep/testdata/harness_tests/ensure/add/desync/initial/main.go

@@ -0,0 +1,9 @@
+{
+  "commands": [
+    ["ensure", "-update"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptestdos"
+  ]
+}