Print instructions after patches written to file (#216)

cmd/src/actions_exec.go

@@ -295,9 +295,24 @@ Format of the action JSON files:
  os.Exit(1)
  }
 
- logger.ActionSuccess(patches, true)
+ err = json.NewEncoder(outputWriter).Encode(patches)
+ if err != nil {
+ return errors.Wrap(err, "writing patches")
+ }
+
+ logger.ActionSuccess(patches)
+
+ if out, ok := outputWriter.(*os.File); ok && out == os.Stdout {
+ // Don't print instructions when piping
+ return nil
+ }
+
+ // Print instructions when we've written patches to a file, even when not in verbose mode
+ fmt.Fprintf(os.Stderr, "\n\nPatches saved to %s, to create a patch set on your Sourcegraph instance please do the following:\n", *outputFlag)
+ fmt.Fprintln(os.Stderr, "\n ", color.HiCyanString("▶"), fmt.Sprintf("src campaign patchset create-from-patches < %s", *outputFlag))
+ fmt.Fprintln(os.Stderr)
 
- return json.NewEncoder(outputWriter).Encode(patches)
+ return nil
  }
 
  if err != nil {
@@ -319,7 +334,7 @@ Format of the action JSON files:
  }
  }
  } else {
- logger.ActionSuccess(patches, false)
+ logger.ActionSuccess(patches)
  }
 
  tmpl, err := parseTemplate("{{friendlyPatchSetCreatedMessage .}}")

cmd/src/actions_exec_logger.go

@@ -105,16 +105,13 @@ func (a *actionLogger) ActionFailed(err error, patches []PatchInput) {
  }
 }
 
-func (a *actionLogger) ActionSuccess(patches []PatchInput, newLines bool) {
+func (a *actionLogger) ActionSuccess(patches []PatchInput) {
  if !a.verbose {
  return
  }
  a.out.Close()
  fmt.Fprintln(os.Stderr)
  format := "✔ Action produced %d patches."
- if newLines {
- format = format + "\n\n"
- }
  hiGreen.Fprintf(os.Stderr, format, len(patches))
 }