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

cli: propagate WorkspaceLoadError::Path error transparently

Browse source 
The inner error message is now printed by default.
This commit is contained in:
Yuya Nishihara 2024-02-01 17:39:54 +09:00
parent 9adf6e1303
commit 28dd0180ad
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/src/cli_util.rs
View file

@ -1901,9 +1901,6 @@ jj init --git-repo=.",
"The repository directory at {} is missing. Was it moved?", "The repository directory at {} is missing. Was it moved?",
repo_dir.display(), repo_dir.display(),
)), )),
// TODO: Record the error as a chained cause
WorkspaceLoadError::Path(e) => user_error(format!("{}: {}", e, e.error)),
WorkspaceLoadError::NonUnicodePath => user_error(err),
WorkspaceLoadError::StoreLoadError(err @ StoreLoadError::UnsupportedType { .. }) => { WorkspaceLoadError::StoreLoadError(err @ StoreLoadError::UnsupportedType { .. }) => {
internal_error_with_message( internal_error_with_message(
"This version of the jj binary doesn't support this type of repo", "This version of the jj binary doesn't support this type of repo",
@ -1917,6 +1914,7 @@ jj init --git-repo=.",
err @ SignInitError::UnknownBackend(_), err @ SignInitError::UnknownBackend(_),
)) => user_error(err), )) => user_error(err),
WorkspaceLoadError::StoreLoadError(err) => internal_error(err), WorkspaceLoadError::StoreLoadError(err) => internal_error(err),
WorkspaceLoadError::NonUnicodePath | WorkspaceLoadError::Path(_) => user_error(err),
} }
} }