x/exp/cmd/gorelease: specify which incomplete requirements were missing

Fixes golang/go#38164

Change-Id: I71a3edeb4445c568ae7a94f7c30da68682104f02
Reviewed-on: https://go-review.googlesource.com/c/exp/+/253039
Run-TryBot: Jay Conrod <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Jay Conrod <[email protected]>
Trust: Jay Conrod <[email protected]>
Trust: Jean de Klerk <[email protected]>

Author: jeanbza

cmd/gorelease/gorelease.go

@@ -957,17 +957,17 @@ func loadPackages(modPath, modRoot, loadDir string, goModData, goSumData []byte)
 
 	// Report new requirements in go.mod.
 	goModPath := filepath.Join(loadDir, "go.mod")
-	loadReqs := func(data []byte) (string, error) {
+	loadReqs := func(data []byte) ([]string, error) {
 		modFile, err := modfile.ParseLax(goModPath, data, nil)
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 		lines := make([]string, len(modFile.Require))
 		for i, req := range modFile.Require {
 			lines[i] = req.Mod.String()
 		}
 		sort.Strings(lines)
-		return strings.Join(lines, "\n"), nil
+		return lines, nil
 	}
 
 	oldReqs, err := loadReqs(goModData)
@@ -983,21 +983,30 @@ func loadPackages(modPath, modRoot, loadDir string, goModData, goSumData []byte)
 		return nil, nil, err
 	}
 
-	goModChanged := oldReqs != newReqs
-	if goModChanged {
-		diagnostics = append(diagnostics, "go.mod: requirements are incomplete.\nRun 'go mod tidy' to add missing requirements.")
+	oldMap := make(map[string]bool)
+	for _, req := range oldReqs {
+		oldMap[req] = true
 	}
-
-	if !goModChanged {
-		newGoSumData, err := ioutil.ReadFile(filepath.Join(loadDir, "go.sum"))
-		if err != nil && !os.IsNotExist(err) {
-			return nil, nil, err
-		}
-		if !bytes.Equal(goSumData, newGoSumData) {
-			diagnostics = append(diagnostics, "go.sum: one or more sums are missing.\nRun 'go mod tidy' to add missing sums.")
+	var missing []string
+	for _, req := range newReqs {
+		if !oldMap[req] {
+			missing = append(missing, req)
 		}
 	}
 
+	if len(missing) > 0 {
+		diagnostics = append(diagnostics, fmt.Sprintf("go.mod: the following requirements are needed\n\t%s\nRun 'go mod tidy' to add missing requirements.", strings.Join(missing, "\n\t")))
+		return pkgs, diagnostics, nil
+	}
+
+	newGoSumData, err := ioutil.ReadFile(filepath.Join(loadDir, "go.sum"))
+	if err != nil && !os.IsNotExist(err) {
+		return nil, nil, err
+	}
+	if !bytes.Equal(goSumData, newGoSumData) {
+		diagnostics = append(diagnostics, "go.sum: one or more sums are missing.\nRun 'go mod tidy' to add missing sums.")
+	}
+
 	return pkgs, diagnostics, nil
 }
 

cmd/gorelease/testdata/tidy/misleading_req.test

@@ -22,5 +22,6 @@ package tidy
 import _ "example.com/tidy/a"
 import _ "example.com/tidy/b"
 -- want --
-go.mod: requirements are incomplete.
+go.mod: the following requirements are needed
+	example.com/tidy/[email protected]
 Run 'go mod tidy' to add missing requirements.

cmd/gorelease/testdata/tidy/missing_req.test

@@ -2,7 +2,8 @@ mod=example.com/tidy
 base=v0.0.1
 success=false
 -- want --
-go.mod: requirements are incomplete.
+go.mod: the following requirements are needed
+	example.com/[email protected]
 Run 'go mod tidy' to add missing requirements.
 -- go.mod --
 module example.com/tidy