This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8871

rhg: handle broken pipe error for stderr
ClosedPublic

Authored by acezar on Aug 3 2020, 10:26 AM.

Details

Reviewers
Alphare
indygreg
Group Reviewers
hg-reviewers
Commits
rHG53af26aa5951: rhg: handle broken pipe error for stderr

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

acezar created this revision.Aug 3 2020, 10:26 AM
Alphare accepted this revision.Aug 3 2020, 11:24 AM
acezar updated this revision to Diff 22254.Aug 4 2020, 4:58 AM
indygreg accepted this revision.Aug 8 2020, 4:12 PM
This revision is now accepted and ready to land.Aug 8 2020, 4:12 PM
acezar added a commit: rHG53af26aa5951: rhg: handle broken pipe error for stderr.Aug 8 2020, 4:32 PM
Closed by commit rHG53af26aa5951: rhg: handle broken pipe error for stderr (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/ui.rs (12 lines)

Diff 22366

rust/rhg/src/ui.rs

/// Write bytes to stderr /// Write bytes to stderr
pub fn write_stderr(&self, bytes: &[u8]) -> Result<(), UiError> { pub fn write_stderr(&self, bytes: &[u8]) -> Result<(), UiError> {
let mut stderr = self.stderr.lock(); let mut stderr = self.stderr.lock();
stderr stderr
.write_all(bytes) .write_all(bytes)
.or_else(|e| handle_stderr_error(e))?; .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))
} }
} }
/// A buffered stdout writer for faster batch printing operations. /// A buffered stdout writer for faster batch printing operations.
pub struct StdoutBuffer<W: Write> { pub struct StdoutBuffer<W: Write> {
buf: io::BufWriter<W>, buf: io::BufWriter<W>,
} }
stderr stderr
.write_all(&[b"abort: ", error.to_string().as_bytes(), b"\n"].concat()) .write_all(&[b"abort: ", error.to_string().as_bytes(), b"\n"].concat())
.map_err(|e| UiError::StderrError(e))?; .map_err(|e| UiError::StderrError(e))?;
stderr.flush().map_err(|e| UiError::StderrError(e))?; stderr.flush().map_err(|e| UiError::StderrError(e))?;
Err(UiError::StdoutError(error)) 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))
}