Fix file name in CLI error messages (#14)

bluekeyes · web-flow · commit 5e5167181e3d · 2021-08-19T18:33:52.000-07:00
diff --git a/cmd/patch2pr/main.go b/cmd/patch2pr/main.go
@@ -183,8 +183,11 @@ func execute(ctx context.Context, client *github.Client, patchFile string, opts
 	applier := patch2pr.NewApplier(client, repo, commit)
 	for _, file := range files {
 		if _, err := applier.Apply(ctx, file); err != nil {
-			// TODO(bkeyes): NewName is probably /dev/null for deletes...
-			return nil, fmt.Errorf("apply failed: %s: %w", file.NewName, err)
+			name := file.NewName
+			if name == "" {
+				name = file.OldName
+			}
+			return nil, fmt.Errorf("apply failed: %s: %w", name, err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,11 @@ func execute(ctx context.Context, client *github.Client, patchFile string, opts`
`183`	`183`	`applier := patch2pr.NewApplier(client, repo, commit)`
`184`	`184`	`for _, file := range files {`
`185`	`185`	`if _, err := applier.Apply(ctx, file); err != nil {`
`186`		`- // TODO(bkeyes): NewName is probably /dev/null for deletes...`
`187`		`- return nil, fmt.Errorf("apply failed: %s: %w", file.NewName, err)`
	`186`	`+ name := file.NewName`
	`187`	`+ if name == "" {`
	`188`	`+ name = file.OldName`
	`189`	`+ }`
	`190`	`+ return nil, fmt.Errorf("apply failed: %s: %w", name, err)`
`188`	`191`	`}`
`189`	`192`	`}`
`190`	`193`