Merge remote-tracking branch 'upstream/master'

Author: actions-user

doc/next/6-stdlib/99-minor/net/56025.md

@@ -1,4 +1,4 @@
-[LookupMX] and [(*Resolver).LookupMX] now return DNS names that look
+[LookupMX] and [*Resolver.LookupMX] now return DNS names that look
 like valid IP address, as well as valid domain names.
 Previously if a name server returned an IP address as a DNS name,
 LookupMX would discard it, as required by the RFCs.

doc/next/7-ports.md

@@ -1,5 +1,10 @@
 ## Ports {#ports}
 
+### Darwin
+
+<!-- go.dev/issue/69839 -->
+As [announced](/doc/go1.24#darwin) in the Go 1.24 release notes, Go 1.25 requires macOS 12 Monterey or later; support for previous versions has been discontinued.
+
 ### Windows
 
 <!-- go.dev/issue/71671 -->

src/cmd/go/alldocs.go

@@ -142,14 +142,18 @@ func runGoAuth(client *http.Client, res *http.Response, url string) {
 // them to the request headers.
 func loadCredential(req *http.Request, url string) bool {
 	currentPrefix := strings.TrimPrefix(url, "https://")
+	currentPrefix = strings.TrimSuffix(currentPrefix, "/")
+
 	// Iteratively try prefixes, moving up the path hierarchy.
+	// E.g. example.com/foo/bar, example.com/foo, example.com
 	for {
 		headers, ok := credentialCache.Load(currentPrefix)
 		if !ok {
-			currentPrefix, _, ok = strings.Cut(currentPrefix, "/")
-			if !ok {
+			lastSlash := strings.LastIndexByte(currentPrefix, '/')
+			if lastSlash == -1 {
 				return false
 			}
+			currentPrefix = currentPrefix[:lastSlash]
 			continue
 		}
 		for key, values := range headers.(http.Header) {
@@ -166,6 +170,7 @@ func loadCredential(req *http.Request, url string) bool {
 func storeCredential(prefix string, header http.Header) {
 	// Trim "https://" prefix to match the format used in .netrc files.
 	prefix = strings.TrimPrefix(prefix, "https://")
+	prefix = strings.TrimSuffix(prefix, "/")
 	if len(header) == 0 {
 		credentialCache.Delete(prefix)
 	} else {

src/cmd/go/internal/auth/auth.go

@@ -71,3 +71,20 @@ func TestCredentialCacheDelete(t *testing.T) {
 		t.Errorf("loadCredential:\nhave %q\nwant %q", got.Header, want.Header)
 	}
 }
+
+func TestCredentialCacheTrailingSlash(t *testing.T) {
+	// Store a credential for api.github.com/foo/bar
+	want := http.Request{Header: make(http.Header)}
+	want.SetBasicAuth("user", "pwd")
+	storeCredential("api.github.com/foo", want.Header)
+	got := &http.Request{Header: make(http.Header)}
+	ok := loadCredential(got, "api.github.com/foo/bar")
+	if !ok || !reflect.DeepEqual(got.Header, want.Header) {
+		t.Errorf("parseNetrc:\nhave %q\nwant %q", got.Header, want.Header)
+	}
+	got2 := &http.Request{Header: make(http.Header)}
+	ok = loadCredential(got2, "https://api.github.com/foo/bar/")
+	if !ok || !reflect.DeepEqual(got2.Header, want.Header) {
+		t.Errorf("parseNetrc:\nhave %q\nwant %q", got2.Header, want.Header)
+	}
+}

src/cmd/go/internal/auth/auth_test.go

@@ -1027,7 +1027,7 @@ command
 		BlankLine     = '\n' .
 
 	Example:
-		https://example.com/
+		https://example.com
 		https://example.net/api/
 
 		Authorization: Basic <token>

src/cmd/go/internal/help/helpdoc.go

@@ -2577,15 +2577,29 @@ func (p *Package) setBuildInfo(ctx context.Context, autoVCS bool) {
 		}
 		appendSetting("vcs.modified", strconv.FormatBool(st.Uncommitted))
 		// Determine the correct version of this module at the current revision and update the build metadata accordingly.
-		repo := modfetch.LookupLocal(ctx, repoDir)
+		rootModPath := goModPath(repoDir)
+		// If no root module is found, skip embedding VCS data since we cannot determine the module path of the root.
+		if rootModPath == "" {
+			goto omitVCS
+		}
+		codeRoot, _, ok := module.SplitPathVersion(rootModPath)
+		if !ok {
+			goto omitVCS
+		}
+		repo := modfetch.LookupLocal(ctx, codeRoot, p.Module.Path, repoDir)
 		revInfo, err := repo.Stat(ctx, st.Revision)
 		if err != nil {
 			goto omitVCS
 		}
 		vers := revInfo.Version
 		if vers != "" {
 			if st.Uncommitted {
-				vers += "+dirty"
+				// SemVer build metadata is dot-separated https://semver.org/#spec-item-10
+				if strings.HasSuffix(vers, "+incompatible") {
+					vers += ".dirty"
+				} else {
+					vers += "+dirty"
+				}
 			}
 			info.Main.Version = vers
 		}

src/cmd/go/internal/load/pkg.go

@@ -222,23 +222,27 @@ func Lookup(ctx context.Context, proxy, path string) Repo {
 
 var lookupLocalCache par.Cache[string, Repo] // path, Repo
 
-// LookupLocal will only use local VCS information to fetch the Repo.
-func LookupLocal(ctx context.Context, path string) Repo {
+// LookupLocal returns a Repo that accesses local VCS information.
+//
+// codeRoot is the module path of the root module in the repository.
+// path is the module path of the module being looked up.
+// dir is the file system path of the repository containing the module.
+func LookupLocal(ctx context.Context, codeRoot string, path string, dir string) Repo {
 	if traceRepo {
 		defer logCall("LookupLocal(%q)", path)()
 	}
 
 	return lookupLocalCache.Do(path, func() Repo {
 		return newCachingRepo(ctx, path, func(ctx context.Context) (Repo, error) {
-			repoDir, vcsCmd, err := vcs.FromDir(path, "", true)
+			repoDir, vcsCmd, err := vcs.FromDir(dir, "", true)
 			if err != nil {
 				return nil, err
 			}
 			code, err := lookupCodeRepo(ctx, &vcs.RepoRoot{Repo: repoDir, Root: repoDir, VCS: vcsCmd}, true)
 			if err != nil {
 				return nil, err
 			}
-			r, err := newCodeRepo(code, repoDir, path)
+			r, err := newCodeRepo(code, codeRoot, path)
 			if err == nil && traceRepo {
 				r = newLoggingRepo(r)
 			}

src/cmd/go/internal/modfetch/repo.go

@@ -34,14 +34,14 @@ exec git branch -m main
 # Use a 0.0.0 pseudo-version when no tags are present.
 go build
 go version -m example$GOEXE
-stdout '\s+mod\s+example\s+v0.0.0-20220719150700-b52f952448d2\s+'
+stdout '\s+mod\s+example\s+v0.0.0-20220719150700-e7537ba8fd6d\s+'
 rm example$GOEXE
 
 # Use a 0.0.0 pseudo-version if the current tag is not a valid semantic version.
 exec git tag 1.0.1
 go build
 go version -m example$GOEXE
-stdout '\s+mod\s+example\s+v0.0.0-20220719150700-b52f952448d2\s+'
+stdout '\s+mod\s+example\s+v0.0.0-20220719150700-e7537ba8fd6d\s+'
 rm example$GOEXE
 
 # Use the current tag which has a valid semantic version to stamp the version.
@@ -79,14 +79,14 @@ exec git commit -m 'commit 3'
 # Use a pseudo-version when current commit doesn't match a tagged version.
 go build
 go version -m example$GOEXE
-stdout '\s+mod\s+example\s+v1.0.3-0.20220719150702-deaeab06f7fe\s+'
+stdout '\s+mod\s+example\s+v1.0.3-0.20220719150702-b0226f18a7ae\s+'
 rm example$GOEXE
 
 # Use pseudo+dirty when uncommitted changes are present.
 mv README2 README3
 go build
 go version -m example$GOEXE
-stdout '\s+mod\s+example\s+v1.0.3-0.20220719150702-deaeab06f7fe\+dirty\s+'
+stdout '\s+mod\s+example\s+v1.0.3-0.20220719150702-b0226f18a7ae\+dirty\s+'
 rm example$GOEXE
 
 # Make sure we always use the previously tagged version to generate the pseudo-version at a untagged revision.
@@ -105,9 +105,83 @@ exec git tag v1.0.4
 exec git checkout ':/commit 4'
 go build
 go version -m example$GOEXE
-stdout '\s+mod\s+example\s+v1.0.3-0.20220719150703-2e239bf29c13\s+'
+stdout '\s+mod\s+example\s+v1.0.3-0.20220719150703-2ebc76937b49\s+'
 rm example$GOEXE
 
+# Create +incompatible module
+exec git checkout v1.0.4
+exec git rm go.mod
+exec git commit -m 'commit 6'
+exec git tag v2.0.0
+exec git checkout HEAD^ go.mod
+# And make the tree +dirty
+mv README4 README5
+go build
+go version -m example$GOEXE
+stdout '\s+mod\s+example\s+v2.0.0\+incompatible.dirty\s+'
+rm example$GOEXE
+
+# Make sure v2 works as expected.
+exec git checkout v1.0.4
+go mod edit -module example/v2
+exec git add .
+exec git commit -m 'commit 7'
+exec git tag v2.1.1
+go build
+go version -m example$GOEXE
+stdout '\s+mod\s+example/v2\s+v2.1.1\s+'
+rm example$GOEXE
+
+# v2+dirty
+mv README5 README6
+go build
+go version -m example$GOEXE
+stdout '\s+mod\s+example/v2\s+v2.1.1\+dirty\s+'
+rm example$GOEXE
+
+# v2+pseudo
+exec git add .
+exec git commit -m 'commit 8'
+go build
+go version -m example$GOEXE
+stdout '\s+mod\s+example/v2\s+v2.1.2-0.20220719150704-0ebeb94ecde2\s+'
+rm example$GOEXE
+
+# v2+pseudo+dirty
+mv README6 README7
+go build
+go version -m example$GOEXE
+stdout '\s+mod\s+example/v2\s+v2.1.2-0.20220719150704-0ebeb94ecde2\+dirty\s+'
+rm example$GOEXE
+
+# modules in subdirectories should be stamped with the correct tag
+exec git add .
+cd subdir
+exec git commit -m 'commit 9'
+go build
+go version -m subdir$GOEXE
+# missing tag creates a pseudo version with v2.0.0
+stdout '\s+mod\s+example/subdir/v2\s+v2.0.0-20220719150704-fbef6799938f\s+'
+rm subdir$GOEXE
+# tag with subdir
+exec git tag subdir/v2.1.0
+go build
+go version -m subdir$GOEXE
+stdout '\s+mod\s+example/subdir/v2\s+v2.1.0\s+'
+# v2+dirty
+mv ../README7 README8
+go build
+go version -m subdir$GOEXE
+stdout '\s+mod\s+example/subdir/v2\s+v2.1.0\+dirty\s+'
+rm subdir$GOEXE
+
+# modules in a subdirectory without a go.mod in the root should result in (devel)
+rm ../go.mod
+go build
+go version -m subdir$GOEXE
+stdout '\s+mod\s+example/subdir/v2\s+\(devel\)\s+'
+rm subdir$GOEXE
+
 -- $WORK/repo/go.mod --
 module example
 
@@ -120,6 +194,17 @@ func main() {
 -- $WORK/copy/README --
 hello
 
+-- $WORK/repo/subdir/go.mod --
+module example/subdir/v2
+
+go 1.18
+
+-- $WORK/repo/subdir/main.go --
+package main
+
+func main() {
+}
+
 -- $WORK/home/gopher/.gitconfig --
 [user]
     name = Go Gopher

src/cmd/go/testdata/script/build_version_stamping_git.txt

@@ -44,7 +44,7 @@ stdout '^\tbuild\tvcs.modified=true$'
 cd ..
 
 # Revision and commit time are tagged for repositories with commits.
-exec bzr add a README
+exec bzr add a README go.mod
 exec bzr commit -m 'initial commit'
 cd a
 go install
@@ -61,7 +61,7 @@ cd ..
 cp README README2
 exec bzr add a README2
 exec bzr commit -m 'second commit'
-exec bzr tag v1.2.3
+exec bzr tag a/v1.2.3
 cd a
 go install
 go version -m $GOBIN/a$GOEXE
@@ -114,6 +114,10 @@ exit 1
 -- repo/README --
 Far out in the uncharted backwaters of the unfashionable end of the western
 spiral arm of the Galaxy lies a small, unregarded yellow sun.
+-- repo/go.mod --
+module example.com
+
+go 1.18
 -- repo/a/go.mod --
 module example.com/a