ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: use fs::read_to_string() to read edited description file

Browse source 
Also removes panic on io::Error. It's unlikely, but could occur if the
edited description contained non-UTF-8 character.
This commit is contained in:
Yuya Nishihara 2022-12-21 10:44:34 +09:00
parent cc2091aad6
commit a850c488f9
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/commands.rs
View file

@ -14,7 +14,6 @@
use std::collections::{BTreeSet, HashSet};
use std::fmt::Debug;
use std::fs::OpenOptions;
use std::io::{Read, Seek, SeekFrom, Write};
use std::ops::Deref;
use std::path::{Path, PathBuf};
@ -1829,18 +1828,12 @@ fn edit_description(
)));
}
let mut description_file = OpenOptions::new()
.read(true)
.open(&description_file_path)
.unwrap_or_else(|_| {
panic!(
"failed to open {} for read",
description_file_path.display()
)
});
let mut buf = vec![];
description_file.read_to_end(&mut buf).unwrap();
let description = String::from_utf8(buf).unwrap();
let description = fs::read_to_string(&description_file_path).map_err(|e| {
user_error(format!(
r#"Failed to read description file "{path}": {e}"#,
path = description_file_path.display()
))
})?;
// Delete the file only if everything went well.
// TODO: Tell the user the name of the file we left behind.
std::fs::remove_file(description_file_path).ok();