Add incremental feedback for $GOPATH projects

- Adds incremental feedback for deps found in $GOPATH and separate
feedback for network solved deps.

Author: darkowlzz

cmd/dep/init.go

@@ -112,6 +112,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 	sm.UseDefaultSignalHandling()
 	defer sm.Release()
 
+	internal.Logf("Searching GOPATH for projects...")
 	pd, err := getProjectData(ctx, pkgT, cpr, sm)
 	if err != nil {
 		return err
@@ -144,6 +145,10 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		)
 	}
 
+	internal.Logf("Using network for remaining projects...")
+	// Copy lock before solving. Use this to separate new lock projects from soln
+	copyLock := *l
+
 	// Run solver with project versions found on disk
 	internal.Vlogf("Solving...")
 	params := gps.SolveParameters{
@@ -170,12 +175,26 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 	}
 	l = dep.LockFromInterface(soln)
 
-	// Pick notondisk project constraints from solution and add to manifest
-	for k, _ := range pd.notondisk {
-		for _, x := range l.Projects() {
-			if k == x.Ident().ProjectRoot {
-				m.Dependencies[k] = getProjectPropertiesFromVersion(x.Version())
-				break
+	// Iterate through the new projects in solved lock and add them to manifest
+	// if direct deps and log feedback for all the new projects.
+	for _, x := range l.Projects() {
+		pr := x.Ident().ProjectRoot
+		newProject := true
+		// Check if it's a new project, not in the old lock
+		for _, y := range copyLock.Projects() {
+			if pr == y.Ident().ProjectRoot {
+				newProject = false
+			}
+		}
+		if newProject {
+			// Check if it's in notondisk project map. These are direct deps, should
+			// be added to manifest.
+			if _, ok := pd.notondisk[pr]; ok {
+				m.Dependencies[pr] = getProjectPropertiesFromVersion(x.Version())
+				feedback(x.Version(), pr, internal.DepTypeDirect)
+			} else {
+				// Log feedback of transitive project
+				feedback(x.Version(), pr, internal.DepTypeTransitive)
 			}
 		}
 	}
@@ -189,9 +208,6 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 
 	l.Memo = s.HashInputs()
 
-	// Log itemized feedback about the resolved dependencies
-	itemizedFeedback(m, l, pkgT)
-
 	internal.Vlogf("Writing manifest and lock files.")
 
 	sw, err := dep.NewSafeWriter(m, nil, l, dep.VendorAlways)
@@ -242,73 +258,48 @@ func hasImportPathPrefix(s, prefix string) bool {
 	return strings.HasPrefix(s, prefix+"/")
 }
 
-// itemizedFeedback itemizes resolved dependencies and logs the solution as
-// feedback.
-func itemizedFeedback(m *dep.Manifest, l *dep.Lock, pkgT pkgtree.PackageTree) {
-	// Algo:
-	// 1. collect direct external deps from PackageTree
-	// 2. loop through lock projects
-	//   2.a. check if the projects exists in direct deps list
-	//   2.b. if it's a direct dep:
-	//     2.b.i. if it has a version attached, constraints dep
-	//     2.b.ii. if it has revision only, hint dep
-	//   2.c. else it's a transitive dep, goes into lock
-	//   2.d. log feedback
-
-	// Extract direct external deps
-	rm, errmap := pkgT.ToReachMap(true, true, false, nil)
-	for fail := range errmap {
-		internal.Logf("Warning: %s", fail)
-	}
-
-	directDeps := rm.Flatten(false)
-
-	for _, lock := range l.Projects() {
-		// Get locked revision, version and branch
-		r, v, b := gps.VersionComponentStrings(lock.Version())
-
-		// Check if it's a valid SHA1 digest and trim to 7 characters.
-		if len(r) == 40 {
-			if _, err := hex.DecodeString(r); err == nil {
-				// Valid SHA1 digest
-				r = r[0:7]
-			}
-		}
+// feedback logs project constraint as feedback to the user.
+func feedback(v gps.Version, pr gps.ProjectRoot, depType string) {
+	rev, version, branch := gps.VersionComponentStrings(v)
 
-		// Get LockedVersion
-		var ver string
-		if v != "" {
-			ver = v
-		} else if b != "" {
-			ver = b
+	// Check if it's a valid SHA1 digest and trim to 7 characters.
+	if len(rev) == 40 {
+		if _, err := hex.DecodeString(rev); err == nil {
+			// Valid SHA1 digest
+			rev = rev[0:7]
 		}
+	}
 
-		cf := &internal.ConstraintFeedback{
-			LockedVersion: ver,
-			Revision:      r,
-			ProjectPath:   string(lock.Ident().ProjectRoot),
-		}
+	// Get LockedVersion
+	var ver string
+	if version != "" {
+		ver = version
+	} else if branch != "" {
+		ver = branch
+	}
 
-		// Get manifest version if available
-		if pp, ok := m.Dependencies[lock.Ident().ProjectRoot]; ok && pp.Constraint != nil {
-			cf.Version = pp.Constraint.String()
-		}
+	cf := &internal.ConstraintFeedback{
+		LockedVersion:  ver,
+		Revision:       rev,
+		ProjectPath:    string(pr),
+		DependencyType: depType,
+	}
 
-		if contains(directDeps, cf.ProjectPath) {
-			// Direct dependency
-			cf.DependencyType = internal.DepTypeDirect
-			if cf.LockedVersion != "" {
-				cf.ConstraintType = internal.ConsTypeConstraint
-			} else {
-				cf.ConstraintType = internal.ConsTypeHint
-			}
+	// Get non-revision constraint if available
+	if c := getProjectPropertiesFromVersion(v).Constraint; c != nil {
+		cf.Version = c.String()
+	}
+
+	// Attach ConstraintType for direct dep based on locked version
+	if cf.DependencyType == internal.DepTypeDirect {
+		if cf.LockedVersion != "" {
+			cf.ConstraintType = internal.ConsTypeConstraint
 		} else {
-			// Transitive dependency
-			cf.DependencyType = internal.DepTypeTransitive
+			cf.ConstraintType = internal.ConsTypeHint
 		}
-
-		cf.LogFeedback()
 	}
+
+	cf.LogFeedback()
 }
 
 // getProjectPropertiesFromVersion takes a gps.Version and returns a proper
@@ -392,6 +383,8 @@ func getProjectData(ctx *dep.Ctx, pkgT pkgtree.PackageTree, cpr string, sm *gps.
 
 		ondisk[pr] = v
 		constraints[pr] = getProjectPropertiesFromVersion(v)
+
+		feedback(v, pr, internal.DepTypeDirect)
 	}
 
 	internal.Vlogf("Analyzing transitive imports...")
@@ -458,6 +451,7 @@ func getProjectData(ctx *dep.Ctx, pkgT pkgtree.PackageTree, cpr string, sm *gps.
 						return nil
 					}
 					ondisk[pr] = v
+					feedback(v, pr, internal.DepTypeTransitive)
 				}
 
 				ptree, err = pkgtree.ListPackages(r, string(pr))