dep: update calculatePrune to not assume "/" as separtor

dep.calculatePrune assumes "/" is the file separtor. This change fixes
an issue caused by that on Windows.

Fixes golang#775

Signed-off-by: Ibrahim AshShohail <[email protected]>

Author: ibrasho

semver.go

@@ -0,0 +1,158 @@
+package dep
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"encoding/hex"
+	"github.com/golang/dep/internal/gps"
+	"github.com/pkg/errors"
+)
+
+func main() {
+	args := os.Args
+	if len(args) != 2 {
+		fmt.Println("Usage: semver pkg[:source]@constraint")
+		os.Exit(1)
+	}
+
+	GOPATH := "/Users/ibrahim/Code/go"
+	sm, err := gps.NewSourceManager(filepath.Join(GOPATH, "pkg", "dep"))
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	sm.UseDefaultSignalHandling()
+	defer sm.Release()
+
+	arg := args[1]
+
+	// try to split on '@'
+	// When there is no `@`, use any version
+	versionStr := "*"
+	atIndex := strings.Index(arg, "@")
+	if atIndex > 0 {
+		parts := strings.SplitN(arg, "@", 2)
+		arg = parts[0]
+		versionStr = parts[1]
+	}
+
+	// TODO: if we decide to keep equals.....
+
+	// split on colon if there is a network location
+	var source string
+	colonIndex := strings.Index(arg, ":")
+	if colonIndex > 0 {
+		parts := strings.SplitN(arg, ":", 2)
+		arg = parts[0]
+		source = parts[1]
+	}
+
+	pr, err := sm.DeduceProjectRoot(arg)
+	if err != nil {
+		fmt.Println(errors.Wrapf(err, "could not infer project root from dependency path: %s", arg))
+		os.Exit(1)
+	}
+
+	if string(pr) != arg {
+		fmt.Println(errors.Errorf("dependency path %s is not a project root, try %s instead", arg, pr))
+		os.Exit(1)
+	}
+
+	pi := gps.ProjectIdentifier{ProjectRoot: pr, Source: source}
+
+	c, err := deduceTheConstraint(versionStr, pi, sm)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	//pc := gps.ProjectConstraint{Ident: pi, Constraint: c}
+
+	versions, err := sm.ListVersions(pi)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	gps.SortPairedForUpgrade(versions)
+	fmt.Printf("%v\n", versions)
+
+	//var matchingVersions []gps.PairedVersion
+	for _, v := range versions {
+		if c.Matches(v) {
+			//matchingVersions := append(matchingVersions, v)
+			fmt.Printf("%v\n", v)
+		}
+	}
+
+	os.Exit(0)
+}
+
+// deduceConstraint tries to puzzle out what kind of version is given in a string -
+// semver, a revision, or as a fallback, a plain tag
+func deduceTheConstraint(s string, pi gps.ProjectIdentifier, sm gps.SourceManager) (gps.Constraint, error) {
+	if s == "" {
+		// Find the default branch
+		versions, err := sm.ListVersions(pi)
+		if err != nil {
+			return nil, errors.Wrapf(err, "list versions for %s(%s)", pi.ProjectRoot, pi.Source) // means repo does not exist
+		}
+
+		gps.SortPairedForUpgrade(versions)
+		for _, v := range versions {
+			if v.Type() == gps.IsBranch {
+				return v.Unpair(), nil
+			}
+		}
+	}
+
+	// always semver if we can
+	c, err := gps.NewSemverConstraintIC(s)
+	if err == nil {
+		return c, nil
+	}
+
+	slen := len(s)
+	if slen == 40 {
+		if _, err = hex.DecodeString(s); err == nil {
+			// Whether or not it's intended to be a SHA1 digest, this is a
+			// valid byte sequence for that, so go with Revision. This
+			// covers git and hg
+			return gps.Revision(s), nil
+		}
+	}
+	// Next, try for bzr, which has a three-component GUID separated by
+	// dashes. There should be two, but the email part could contain
+	// internal dashes
+	if strings.Count(s, "-") >= 2 {
+		// Work from the back to avoid potential confusion from the email
+		i3 := strings.LastIndex(s, "-")
+		// Skip if - is last char, otherwise this would panic on bounds err
+		if slen == i3+1 {
+			return gps.NewVersion(s), nil
+		}
+
+		i2 := strings.LastIndex(s[:i3], "-")
+		if _, err = strconv.ParseUint(s[i2+1:i3], 10, 64); err == nil {
+			// Getting this far means it'd pretty much be nuts if it's not a
+			// bzr rev, so don't bother parsing the email.
+			return gps.Revision(s), nil
+		}
+	}
+
+	// call out to network and get the package's versions
+	versions, err := sm.ListVersions(pi)
+	if err != nil {
+		return nil, errors.Wrapf(err, "list versions for %s(%s)", pi.ProjectRoot, pi.Source) // means repo does not exist
+	}
+
+	for _, version := range versions {
+		if s == version.String() {
+			return version.Unpair(), nil
+		}
+	}
+	return nil, errors.Errorf("%s is not a valid version for the package %s(%s)", s, pi.ProjectRoot, pi.Source)
+}

txn_writer.go

@@ -530,6 +530,7 @@ fail:
 	return failerr
 }
 
+// calculatePrune returns the paths of the packages to be deleted from vendorDir.
 func calculatePrune(vendorDir string, keep []string, logger *log.Logger) ([]string, error) {
 	if logger != nil {
 		logger.Println("Calculating prune. Checking the following packages:")
@@ -547,7 +548,7 @@ func calculatePrune(vendorDir string, keep []string, logger *log.Logger) ([]stri
 			return nil
 		}
 
-		name := strings.TrimPrefix(path, vendorDir+"/")
+		name := filepath.ToSlash(strings.TrimPrefix(path, vendorDir+string(filepath.Separator)))
 		if logger != nil {
 			logger.Printf("  %s", name)
 		}