mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-28 09:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

workspace: fail gracefully on non-Unicode paths

Browse source
This commit is contained in:
Benjamin Saunders 2022-10-27 21:33:19 -07:00
parent 3d1ac8b933
commit 01bb1e67da
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/workspace.rs
View file

@ -31,6 +31,8 @@ use crate::working_copy::WorkingCopy;
pub enum WorkspaceInitError {
#[error("The destination repo ({0}) already exists")]
DestinationExists(PathBuf),
#[error("Repo path could not be interpreted as Unicode text")]
NonUnicodePath,
#[error(transparent)]
Path(#[from] PathError),
}
@ -41,6 +43,8 @@ pub enum WorkspaceLoadError {
RepoDoesNotExist(PathBuf),
#[error("There is no Jujutsu repo in {0}")]
NoWorkspaceHere(PathBuf),
#[error("Repo path could not be interpreted as Unicode text")]
NonUnicodePath,
#[error(transparent)]
Path(#[from] PathError),
}
@ -173,7 +177,12 @@ impl Workspace {
let repo_file_path = jj_dir.join("repo");
let mut repo_file = File::create(&repo_file_path).context(&repo_file_path)?;
repo_file
.write_all(repo_dir.to_str().unwrap().as_bytes())
.write_all(
repo_dir
.to_str()
.ok_or(WorkspaceInitError::NonUnicodePath)?
.as_bytes(),
)
.context(&repo_file_path)?;
let (working_copy, repo) =
@ -189,7 +198,10 @@ impl Workspace {
) -> Result<Self, WorkspaceLoadError> {
let jj_dir = find_jj_dir(workspace_path)
.ok_or_else(|| WorkspaceLoadError::NoWorkspaceHere(workspace_path.to_owned()))?;
let workspace_root = jj_dir.parent().unwrap().to_owned();
let workspace_root = jj_dir
.parent()
.ok_or(WorkspaceLoadError::NonUnicodePath)?
.to_owned();
let mut repo_dir = jj_dir.join("repo");
// If .jj/repo is a file, then we interpret its contents as a relative path to
// the actual repo directory (typically in another workspace).
@ -197,7 +209,8 @@ impl Workspace {
let mut repo_file = File::open(&repo_dir).context(&repo_dir)?;
let mut buf = Vec::new();
repo_file.read_to_end(&mut buf).context(&repo_dir)?;
let repo_path_str = String::from_utf8(buf).unwrap();
let repo_path_str =
String::from_utf8(buf).map_err(|_| WorkspaceLoadError::NonUnicodePath)?;
repo_dir = jj_dir
.join(&repo_path_str)
.canonicalize()

3
src/cli_util.rs
View file

@ -233,6 +233,9 @@ jj init --git-repo=.";
Err(WorkspaceLoadError::Path(e)) => {
return Err(CommandError::UserError(format!("{}: {}", e, e.error)));
}
Err(e @ WorkspaceLoadError::NonUnicodePath) => {
return Err(CommandError::UserError(e.to_string()));
}
};
let repo_loader = workspace.repo_loader();
let op_heads = resolve_op_for_load(