Commit b53bdd49 authored by Andrew Gerrand's avatar Andrew Gerrand

undo CL 169000043 / 05b838013df9

This was a mistake. The cmd/api tool
depends on an old version of go/types.

««« original CL description
cmd/api: use golang.org/x/... import paths

LGTM=bradfitz, rsc
R=rsc, bradfitz
CC=golang-codereviews
https://golang.org/cl/169000043
»»»

TBR=rsc, bradfitz
R=bradfitz, rsc
CC=golang-codereviews
https://golang.org/cl/169320043
parent 9a571dee
......@@ -27,7 +27,7 @@ import (
"sort"
"strings"
"golang.org/x/tools/go/types"
"code.google.com/p/go.tools/go/types"
)
// Flags
......
......@@ -91,7 +91,7 @@ func file(s ...string) string {
// It tries to re-use a go.tools checkout from a previous run if possible,
// else it hg clones it.
func prepGoPath() string {
const tempBase = "tools.TMP"
const tempBase = "go.tools.TMP"
username := ""
u, err := user.Current()
......@@ -108,14 +108,14 @@ func prepGoPath() string {
gopath := filepath.Join(os.TempDir(), "gopath-api-"+cleanUsername(username), goToolsVersion)
// cloneDir is where we run "hg clone".
cloneDir := filepath.Join(gopath, "src", "golang.org", "x")
cloneDir := filepath.Join(gopath, "src", "code.google.com", "p")
// The dir we clone into. We only atomically rename it to finalDir on
// clone success.
tmpDir := filepath.Join(cloneDir, tempBase)
// finalDir is where the checkout will live once it's complete.
finalDir := filepath.Join(cloneDir, "tools")
finalDir := filepath.Join(cloneDir, "go.tools")
if goToolsCheckoutGood(finalDir) {
return gopath
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment