mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: terminate gracefully on broken pipe while drawing graph

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-04-06 22:53:04 -07:00
parent 659393bec2
commit f22514f7bb
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/commands.rs
View file

@ -60,9 +60,21 @@ use crate::ui::Ui;
enum CommandError { enum CommandError {
UserError(String), UserError(String),
BrokenPipe,
InternalError(String), InternalError(String),
} }
impl From<std::io::Error> for CommandError {
fn from(err: std::io::Error) -> Self {
if err.kind() == std::io::ErrorKind::BrokenPipe {
CommandError::BrokenPipe
} else {
// TODO: Record the error as a chained cause
CommandError::InternalError(format!("I/O error: {}", err))
}
}
}
impl From<DiffEditError> for CommandError { impl From<DiffEditError> for CommandError {
fn from(err: DiffEditError) -> Self { fn from(err: DiffEditError) -> Self {
CommandError::UserError(format!("Failed to edit diff: {}", err)) CommandError::UserError(format!("Failed to edit diff: {}", err))
@ -1092,7 +1104,7 @@ fn cmd_log(
if !buffer.ends_with(b"\n") { if !buffer.ends_with(b"\n") {
buffer.push(b'\n'); buffer.push(b'\n');
} }
graph.add_node(commit.id(), &edges, b"o", &buffer).unwrap(); graph.add_node(commit.id(), &edges, b"o", &buffer)?;
} }
} else { } else {
for index_entry in index_entries { for index_entry in index_entries {
@ -1154,7 +1166,7 @@ fn cmd_obslog(
if !buffer.ends_with(b"\n") { if !buffer.ends_with(b"\n") {
buffer.push(b'\n'); buffer.push(b'\n');
} }
graph.add_node(commit.id(), &edges, b"o", &buffer).unwrap(); graph.add_node(commit.id(), &edges, b"o", &buffer)?;
} }
} else { } else {
for commit in commits { for commit in commits {
@ -2049,7 +2061,7 @@ fn cmd_op_log(
if !buffer.ends_with(b"\n") { if !buffer.ends_with(b"\n") {
buffer.push(b'\n'); buffer.push(b'\n');
} }
graph.add_node(op.id(), &edges, b"o", &buffer).unwrap(); graph.add_node(op.id(), &edges, b"o", &buffer)?;
} }
Ok(()) Ok(())
@ -2314,6 +2326,7 @@ where
ui.write_error(format!("Error: {}\n", message).as_str()); ui.write_error(format!("Error: {}\n", message).as_str());
1 1
} }
Err(CommandError::BrokenPipe) => 2,
Err(CommandError::InternalError(message)) => { Err(CommandError::InternalError(message)) => {
ui.write_error(format!("Internal error: {}\n", message).as_str()); ui.write_error(format!("Internal error: {}\n", message).as_str());
255 255