Address PR comments

samcoe · samcoe · commit 3e81780367e4 · 2020-10-07T14:03:47.000+02:00
diff --git a/git/git.go b/git/git.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"io"
 	"net/url"
 	"os"
 	"os/exec"
@@ -12,7 +13,6 @@ import (
 	"strings"
 
 	"github.com/cli/cli/internal/run"
-	"github.com/cli/cli/pkg/iostreams"
 )
 
 // ErrNotOnAnyBranch indicates that the user is in detached HEAD state
@@ -163,12 +163,10 @@ func CommitBody(sha string) (string, error) {
 }
 
 // Push publishes a git ref to a remote and sets up upstream configuration
-func Push(remote string, ref string) error {
+func Push(remote string, ref string, cmdOut, cmdErr io.Writer) error {
 	pushCmd := GitCommand("push", "--set-upstream", remote, ref)
-	regexp := regexp.MustCompile("^remote:.*$")
-	filterErr := iostreams.NewRegexFilterWriter(os.Stderr, regexp, "")
-	pushCmd.Stdout = os.Stdout
-	pushCmd.Stderr = filterErr
+	pushCmd.Stdout = cmdOut
+	pushCmd.Stderr = cmdErr
 	return run.PrepareCmd(pushCmd).Run()
 }
 
diff --git a/pkg/cmd/pr/create/create.go b/pkg/cmd/pr/create/create.go
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"os"
+	"regexp"
 	"strings"
 	"time"
 
@@ -428,7 +430,10 @@ func createRun(opts *CreateOptions) error {
 		pushTries := 0
 		maxPushTries := 3
 		for {
-			if err := git.Push(headRemote.Name, fmt.Sprintf("HEAD:%s", headBranch)); err != nil {
+			regexp := regexp.MustCompile("^remote: (|Create a pull request for '.*' on GitHub by visiting:.*|.*https://github.com/.*/pull/new/.*)$")
+			cmdErr := NewRegexWriter(os.Stderr, regexp, "")
+			cmdOut := os.Stdout
+			if err := git.Push(headRemote.Name, fmt.Sprintf("HEAD:%s", headBranch), cmdOut, cmdErr); err != nil {
 				if didForkRepo && pushTries < maxPushTries {
 					pushTries++
 					// first wait 2 seconds after forking, then 4s, then 6s
diff --git a/pkg/cmd/pr/create/regex_writer.go b/pkg/cmd/pr/create/regex_writer.go
@@ -1,4 +1,4 @@
-package iostreams
+package create
 
 import (
 	"bufio"
@@ -7,17 +7,17 @@ import (
 	"regexp"
 )
 
-func NewRegexFilterWriter(out io.Writer, regexp *regexp.Regexp, repl string) io.Writer {
-	return &RegexFilterWriter{out: out, regexp: *regexp, repl: repl}
+func NewRegexWriter(out io.Writer, regexp *regexp.Regexp, repl string) io.Writer {
+	return &RegexWriter{out: out, regexp: *regexp, repl: repl}
 }
 
-type RegexFilterWriter struct {
+type RegexWriter struct {
 	out    io.Writer
 	regexp regexp.Regexp
 	repl   string
 }
 
-func (s RegexFilterWriter) Write(data []byte) (int, error) {
+func (s RegexWriter) Write(data []byte) (int, error) {
 	filtered := []byte{}
 	repl := []byte(s.repl)
 	scanner := bufio.NewScanner(bytes.NewReader(data))
diff --git a/pkg/cmd/pr/create/regex_writer_test.go b/pkg/cmd/pr/create/regex_writer_test.go
@@ -1,4 +1,4 @@
-package iostreams
+package create
 
 import (
 	"bytes"
@@ -108,26 +108,26 @@ func Test_Write(t *testing.T) {
 			input: input{
 				in: heredoc.Doc(`
 					output: some information
-					remote:
-					remote: Create a pull request for 'regex' on GitHub by visiting:
+					remote: 
+					remote: Create a pull request for 'regex' on GitHub by visiting: 
 					remote:      https://github.com/owner/repo/pull/new/regex
-					remote:
+					remote: 
 					output: more information
 			 `),
-				regexp: regexp.MustCompile("^remote.*$"),
+				regexp: regexp.MustCompile("^remote: (|Create a pull request for '.*' on GitHub by visiting:.*|.*https://github.com/.*/pull/new/.*)$"),
 				repl:   "",
 			},
 			output: output{
 				wantsErr: false,
 				out:      "output: some information\noutput: more information\n",
-				length:   189,
+				length:   192,
 			},
 		},
 	}
 
 	for _, tt := range tests {
 		out := &bytes.Buffer{}
-		writer := NewRegexFilterWriter(out, tt.input.regexp, tt.input.repl)
+		writer := NewRegexWriter(out, tt.input.regexp, tt.input.repl)
 		t.Run(tt.name, func(t *testing.T) {
 			length, err := writer.Write([]byte(tt.input.in))
 
