code review 5708054: cmd/go: fixes

src/cmd/go/vcs.go

 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
         "bytes"
         "encoding/json"
         "fmt"
@@ skipping 258 matching lines @@
 
         regexp *regexp.Regexp // cached compiled form of re
 }
 
 // vcsForDir inspects dir and its parents to determine the
 // version control system and code repository to use.
 // On return, root is the import path
 // corresponding to the root of the repository
 // (thus root is a prefix of importPath).
 func vcsForDir(p *Package) (vcs *vcsCmd, root string, err error) {
-        // Clean and double-check that dir is in srcRoot.
+        // Clean and double-check that dir is in (a subdirectory of) srcRoot.
         dir := filepath.Clean(p.Dir)
         srcRoot := filepath.Clean(p.build.SrcRoot)
         if len(dir) <= len(srcRoot) || dir[len(srcRoot)] != filepath.Separator {

[r, 2012/03/01 04:55:37]

doesn't this reject "a" for "a/"? must path be a a strict prefix?

                 return nil, "", fmt.Errorf("directory %q is outside source root %q", dir, srcRoot)
         }
 
         for len(dir) > len(srcRoot) {
                 for _, vcs := range vcsList {
                         if fi, err := os.Stat(filepath.Join(dir, "."+vcs.cmd)); err == nil && fi.IsDir() {
                                 return vcs, dir[len(srcRoot)+1:], nil
                         }
                 }
 
@@ skipping 221 matching lines @@
         if match["project"] == "" || match["series"] == "" {
                 return nil
         }
         _, err := httpGET(expand(match, "https://code.launchpad.net/{project}{series}/.bzr/branch-format"))
         if err != nil {
                 match["root"] = expand(match, "launchpad.net/{project}")
                 match["repo"] = expand(match, "https://{root}")
         }
         return nil
 }