New filenames: Gopkg.toml and Gopkg.lock

cmd/dep/testdata/harness_tests/README.md

@@ -14,11 +14,11 @@ The directory structure is as follows:
                         testcase.json
                         initial/
                             file1.go
-                            manifest.toml
+                            Gopkg.toml
                             ...
                         final/
-                            manifest.toml
-                            lock.toml
+                            Gopkg.toml
+                            Gopkg.lock
                     case2/
                     ...
 

context.go

@@ -48,7 +48,7 @@ func (c *Ctx) SourceManager() (*gps.SourceMgr, error) {
 // a project root.  If an absolute path is given, the search begins in that
 // directory.  If a relative or empty path is given, the search start is computed
 // from the current working directory.  The search stops when a file with the
-// name ManifestName (manifest.toml, by default) is located.
+// name ManifestName (Gopkg.toml, by default) is located.
 //
 // The Project contains the parsed manifest as well as a parsed lock file, if
 // present.  The import path is calculated as the remaining path segment

hack/validate-vendor.bash

@@ -21,7 +21,7 @@ fi
 VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
 
 IFS=$'\n'
-files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'manifest.toml' 'lock.toml' 'vendor/' || true) )
+files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'Gopkg.toml' 'Gopkg.lock' 'vendor/' || true) )
 unset IFS
 
 if [ ${#files[@]} -gt 0 ]; then
@@ -29,7 +29,7 @@ if [ ${#files[@]} -gt 0 ]; then
 	go build
 	./dep ensure
 	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- vendor manifest.toml lock.toml 2>/dev/null)"
+	diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
 			echo 'The result of ensure differs'

lock.go

@@ -15,7 +15,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const LockName = "lock.toml"
+const LockName = "Gopkg.lock"
 
 type Lock struct {
 	Memo []byte

manifest.go

@@ -14,7 +14,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const ManifestName = "manifest.toml"
+const ManifestName = "Gopkg.toml"
 
 type Manifest struct {
 	Dependencies gps.ProjectConstraints

test/test.go

@@ -30,8 +30,8 @@ var (
 )
 
 const (
-	manifestName string = "manifest.toml"
-	lockName     string = "lock.toml"
+	manifestName string = "Gopkg.toml"
+	lockName     string = "Gopkg.lock"
 )
 
 func init() {