Rewrite import paths to hard fork

This is an issue because this module is currently used via a replace directive in the
cli/cli go.mod, which prevents installation via go [email protected]/cli/cli/cmd/gh

cli/cli#9818

Author: williammartin

README.md

@@ -1,13 +1,15 @@
 # Why is this forked?
 
-This repo is forked into the `cli` org to allow the `gh` maintainers to explore the use of `testscript` in `gh`, while providing the flexibility for us to share modifications and extensions. It is not intended to be a long-term maintained fork and you should not rely on it.
+This is hard forked from github.com/rogpeppe/testscript to allow the `gh` maintainers to explore the use of `testscript` in `gh`, while providing the flexibility for us to share modifications and extensions. It is not intended to be a long-term maintained fork and you should not rely on it.
 
-## Original README
+If we determine it is a good fit for the project, we will decide what to do next based on how our needs align with the preferences of the maintainers of rogpeppe/testscript.
+
+## Original README with minor tweaks to indicate upstream/fork relationship
 
 This repository factors out an opinionated selection of internal packages and functionality from the Go standard
 library. Currently this consists mostly of packages and testing code from within the Go tool implementation.
 
-This repo is [primarily maintained](https://github.com/rogpeppe/go-internal/graphs/contributors) by long-time
+The upstream repo is [primarily maintained](https://github.com/rogpeppe/go-internal/graphs/contributors) by long-time
 [Go contributors](https://github.com/golang/go/contributors) who are also currently
 [maintaining CUE](https://github.com/cue-lang/cue/graphs/contributors) (which is primarily written in Go
 and which relies upon several of the packages here).
@@ -31,18 +33,18 @@ Our package will be replaced by it once https://github.com/golang/go/issues/5926
 
 ### testscript
 
-The most popular package here is the [testscript](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript) package:
+The most popular package here is the [testscript](https://pkg.go.dev/github.com/cli/go-internal/testscript) package:
  * Provides a shell-like test environment that is very nicely tuned for testing Go CLI commands.
  * Extracted from the core Go team's internal testscript package ([cmd/go/internal/script](https://github.com/golang/go/tree/master/src/cmd/go/internal/script)),
  which is [heavily used](https://github.com/golang/go/tree/master/src/cmd/go/testdata/script) to test the `go` command.
  * Supports patterns for checking stderr/stdout, command pass/fail assertions, and so on.
  * Integrates well with `go test`, including coverage support.
  * Inputs and sample output files can use the simple [txtar](https://pkg.go.dev/golang.org/x/tools/txtar)
  text archive format, also used by the Go playground.
- * Allows [automatically updating](https://pkg.go.dev/github.com/rogpeppe/go-internal/testscript#Params)
+ * Allows [automatically updating](https://pkg.go.dev/github.com/cli/go-internal/testscript#Params)
  golden files.
  * Built-in support for Go concepts like build tags.
- * Accompanied by a [testscript](https://github.com/rogpeppe/go-internal/tree/master/cmd/testscript) command
+ * Accompanied by a [testscript](https://github.com/cli/go-internal/tree/master/cmd/testscript) command
  for running standalone scripts with files embedded in txtar format.
 
  A nice introduction to using testscripts is this [blog post](https://bitfieldconsulting.com/golang/test-scripts) series.

cache/cache.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rogpeppe/go-internal/lockedfile"
+	"github.com/cli/go-internal/lockedfile"
 )
 
 // An ActionID is a cache action key, the hash of a complete description of a

cmd/testscript/README.md

@@ -1,5 +1,5 @@
 ```
-The testscript command runs github.com/rogpeppe/go-internal/testscript scripts
+The testscript command runs github.com/cli/go-internal/testscript scripts
 in a fresh temporary work directory tree.
 
 Usage:
@@ -9,15 +9,15 @@ The testscript command is designed to make it easy to create self-contained
 reproductions of command sequences.
 
 Each file is opened as a script and run as described in the documentation for
-github.com/rogpeppe/go-internal/testscript. The special filename "-" is
+github.com/cli/go-internal/testscript. The special filename "-" is
 interpreted as the standard input.
 
 As a special case, supporting files/directories in the .gomodproxy subdirectory
-will be served via a github.com/rogpeppe/go-internal/goproxytest server which
+will be served via a github.com/cli/go-internal/goproxytest server which
 is available to each script via the GOPROXY environment variable. The contents
 of the .gomodproxy subdirectory are not available to the script except via the
 proxy server. See the documentation for
-github.com/rogpeppe/go-internal/goproxytest for details on the format of these
+github.com/cli/go-internal/goproxytest for details on the format of these
 files/directories.
 
 Environment variables can be passed through to each script with the -e flag,

cmd/testscript/help.go

@@ -10,7 +10,7 @@ func mainUsage(f io.Writer) {
 }
 
 var mainHelp = `
-The testscript command runs github.com/rogpeppe/go-internal/testscript scripts
+The testscript command runs github.com/cli/go-internal/testscript scripts
 in a fresh temporary work directory tree.
 
 Usage:
@@ -20,15 +20,15 @@ The testscript command is designed to make it easy to create self-contained
 reproductions of command sequences.
 
 Each file is opened as a script and run as described in the documentation for
-github.com/rogpeppe/go-internal/testscript. The special filename "-" is
+github.com/cli/go-internal/testscript. The special filename "-" is
 interpreted as the standard input.
 
 As a special case, supporting files/directories in the .gomodproxy subdirectory
-will be served via a github.com/rogpeppe/go-internal/goproxytest server which
+will be served via a github.com/cli/go-internal/goproxytest server which
 is available to each script via the GOPROXY environment variable. The contents
 of the .gomodproxy subdirectory are not available to the script except via the
 proxy server. See the documentation for
-github.com/rogpeppe/go-internal/goproxytest for details on the format of these
+github.com/cli/go-internal/goproxytest for details on the format of these
 files/directories.
 
 Environment variables can be passed through to each script with the -e flag,

cmd/testscript/main.go

@@ -15,14 +15,14 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/rogpeppe/go-internal/goproxytest"
-	"github.com/rogpeppe/go-internal/gotooltest"
-	"github.com/rogpeppe/go-internal/testscript"
+	"github.com/cli/go-internal/goproxytest"
+	"github.com/cli/go-internal/gotooltest"
+	"github.com/cli/go-internal/testscript"
 )
 
 const (
 	// goModProxyDir is the special subdirectory in a txtar script's supporting files
-	// within which we expect to find github.com/rogpeppe/go-internal/goproxytest
+	// within which we expect to find github.com/cli/go-internal/goproxytest
 	// directories.
 	goModProxyDir = ".gomodproxy"
 )

cmd/testscript/main_test.go

@@ -13,9 +13,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/rogpeppe/go-internal/gotooltest"
-	"github.com/rogpeppe/go-internal/internal/os/execpath"
-	"github.com/rogpeppe/go-internal/testscript"
+	"github.com/cli/go-internal/gotooltest"
+	"github.com/cli/go-internal/internal/os/execpath"
+	"github.com/cli/go-internal/testscript"
 )
 
 func TestMain(m *testing.M) {

cmd/txtar-addmod/addmod.go

@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // The txtar-addmod command adds a module as a txtar archive to the a testdata module directory
-// as understood by the goproxytest package (see https://godoc.org/github.com/rogpeppe/go-internal/goproxytest).
+// as understood by the goproxytest package (see https://godoc.org/github.com/cli/go-internal/goproxytest).
 //
 // Usage:
 //
@@ -38,7 +38,7 @@ func usage() {
 	fmt.Fprintf(os.Stderr, `
 The txtar-addmod command adds a module as a txtar archive to the
 testdata module directory as understood by the goproxytest package
-(see https://godoc.org/github.com/rogpeppe/go-internal/goproxytest).
+(see https://godoc.org/github.com/cli/go-internal/goproxytest).
 
 The dir argument names to directory to add the module to. If dir is "-",
 the result will instead be written to the standard output in a form

cmd/txtar-addmod/script_test.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rogpeppe/go-internal/goproxytest"
-	"github.com/rogpeppe/go-internal/gotooltest"
-	"github.com/rogpeppe/go-internal/testscript"
+	"github.com/cli/go-internal/goproxytest"
+	"github.com/cli/go-internal/gotooltest"
+	"github.com/cli/go-internal/testscript"
 )
 
 var proxyURL string

cmd/txtar-c/savedir.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/rogpeppe/go-internal/txtar"
+	"github.com/cli/go-internal/txtar"
 )
 
 var flag = stdflag.NewFlagSet(os.Args[0], stdflag.ContinueOnError)

cmd/txtar-c/script_test.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rogpeppe/go-internal/testscript"
+	"github.com/cli/go-internal/testscript"
 )
 
 func TestMain(m *testing.M) {