code review 5794064: cmd/go: make net/... match net too

cmd/go: make net/... match net too

Otherwise there's no good way to get both, and it comes up often.

[rsc, 2012-03-12 19:39:59]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2012-03-12 19:57:44]

LGTM

matching tests would be nicer.

On Mon, Mar 12, 2012 at 12:39 PM, <rsc@golang.org> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> cmd/go: make net/... match net too
>
> Otherwise there's no good way to get both, and it comes up often.
>
> Please review this at
http://codereview.appspot.com/**5794064/<http://codereview.appspot.com/5794064/>
>
> Affected files:
>  M src/cmd/go/doc.go
>  M src/cmd/go/help.go
>  M src/cmd/go/main.go
>
>
> Index: src/cmd/go/doc.go
> ==============================**==============================**=======
> --- a/src/cmd/go/doc.go
> +++ b/src/cmd/go/doc.go
> @@ -508,9 +508,8 @@
>  each of which can match any string, including the empty string and
>  strings containing slashes.  Such a pattern expands to all package
>  directories found in the GOPATH trees with names matching the
> -patterns.  For example, encoding/... expands to all packages
> -in subdirectories of the encoding tree, while net... expands to
> -net and all its subdirectories.
> +patterns.  As a special case, x/... matches x as well as x's
> subdirectories.
> +For example, net/... expands to net and packages in its subdirectories.
>
>  An import path can also name a package to be downloaded from
>  a remote repository.  Run 'go help remote' for details.
> Index: src/cmd/go/help.go
> ==============================**==============================**=======
> --- a/src/cmd/go/help.go
> +++ b/src/cmd/go/help.go
> @@ -36,9 +36,8 @@
>  each of which can match any string, including the empty string and
>  strings containing slashes.  Such a pattern expands to all package
>  directories found in the GOPATH trees with names matching the
> -patterns.  For example, encoding/... expands to all packages
> -in subdirectories of the encoding tree, while net... expands to
> -net and all its subdirectories.
> +patterns.  As a special case, x/... matches x as well as x's
> subdirectories.
> +For example, net/... expands to net and packages in its subdirectories.
>
>  An import path can also name a package to be downloaded from
>  a remote repository.  Run 'go help remote' for details.
> Index: src/cmd/go/main.go
> ==============================**==============================**=======
> --- a/src/cmd/go/main.go
> +++ b/src/cmd/go/main.go
> @@ -345,6 +345,10 @@
>  func matchPattern(pattern string) func(name string) bool {
>        re := regexp.QuoteMeta(pattern)
>        re = strings.Replace(re, `\.\.\.`, `.*`, -1)
> +       // Special case: foo/... matches foo too.
> +       if strings.HasSuffix(re, `/.*`) {
> +               re = re[:len(re)-len(`/.*`)] + `(/.*)?`
> +       }
>        reg := regexp.MustCompile(`^` + re + `$`)
>        return func(name string) bool {
>                return reg.MatchString(name)
> @@ -356,6 +360,14 @@
>  // The pattern is either "all" (all packages), "std" (standard packages)
>  // or a path including "...".
>  func allPackages(pattern string) []string {
> +       pkgs := matchPackages(pattern)
> +       if len(pkgs) == 0 {
> +               fmt.Fprintf(os.Stderr, "warning: %q matched no
> packages\n", pattern)
> +       }
> +       return pkgs
> +}
> +
> +func matchPackages(pattern string) []string {
>        match := func(string) bool { return true }
>        if pattern != "all" && pattern != "std" {
>                match = matchPattern(pattern)
> @@ -432,10 +444,6 @@
>                        return nil
>                })
>        }
> -
> -       if len(pkgs) == 0 {
> -               fmt.Fprintf(os.Stderr, "warning: %q matched no
> packages\n", pattern)
> -       }
>        return pkgs
>  }
>
> @@ -443,6 +451,14 @@
>  // beginning ./ or ../, meaning it should scan the tree rooted
>  // at the given directory.  There are ... in the pattern too.
>  func allPackagesInFS(pattern string) []string {
> +       pkgs := matchPackagesInFS(pattern)
> +       if len(pkgs) == 0 {
> +               fmt.Fprintf(os.Stderr, "warning: %q matched no
> packages\n", pattern)
> +       }
> +       return pkgs
> +}
> +
> +func matchPackagesInFS(pattern string) []string {
>        // Find directory to begin the scan.
>        // Could be smarter but this one optimization
>        // is enough for now, since ... is usually at the
> @@ -482,10 +498,6 @@
>                pkgs = append(pkgs, name)
>                return nil
>        })
> -
> -       if len(pkgs) == 0 {
> -               fmt.Fprintf(os.Stderr, "warning: %q matched no
> packages\n", pattern)
> -       }
>        return pkgs
>  }
>
>
>
>

[rsc, 2012-03-12 20:28:51]

Hello golang-dev@googlegroups.com, bradfitz@golang.org (cc:
golang-dev@googlegroups.com),

Please take another look.

[bradfitz, 2012-03-12 20:31:01]

LGTM

On Mon, Mar 12, 2012 at 1:28 PM, <rsc@golang.org> wrote:

> Hello golang-dev@googlegroups.com, bradfitz@golang.org (cc:
> golang-dev@googlegroups.com),
>
> Please take another look.
>
>
>
http://codereview.appspot.com/**5794064/<http://codereview.appspot.com/5794064/>
>

[rsc, 2012-03-12 20:34:27]

*** Submitted as http://code.google.com/p/go/source/detail?r=034bdb9a5757 ***

cmd/go: make net/... match net too

Otherwise there's no good way to get both, and it comes up often.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/5794064