Patchwork D8871: rhg: handle broken pipe error for stderr

login
register
mail settings
Submitter phabricator
Date Aug. 3, 2020, 2:27 p.m.
Message ID <differential-rev-PHID-DREV-2e4dn653mjxqmtjtsho2-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46968/
State Superseded
Headers show

Comments

phabricator - Aug. 3, 2020, 2:27 p.m.
acezar created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8871

AFFECTED FILES
  rust/rhg/src/ui.rs

CHANGE DETAILS




To: acezar, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/rust/rhg/src/ui.rs b/rust/rhg/src/ui.rs
--- a/rust/rhg/src/ui.rs
+++ b/rust/rhg/src/ui.rs
@@ -49,7 +49,7 @@ 
             .write_all(bytes)
             .or_else(|e| handle_stderr_error(e))?;
 
-        stderr.flush().or_else(|e| Err(UiError::StderrError(e)))
+        stderr.flush().or_else(|e| handle_stderr_error(e))
     }
 }
 
@@ -94,3 +94,13 @@ 
 
     Err(UiError::StdoutError(error))
 }
+
+/// Sometimes writing to stderr is not possible.
+fn handle_stderr_error(error: io::Error) -> Result<(), UiError> {
+    // A broken pipe should not result in a error
+    // like with `| head` for example
+    if let ErrorKind::BrokenPipe = error.kind() {
+        return Ok(());
+    }
+    Err(UiError::StdoutError(error))
+}