mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

workspace: rename some symbols related to .jj/ to jj_dir (#13)

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-01-28 19:47:38 -08:00
parent 0725d4326d
commit 35f0c17380
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/workspace.rs
View file

@ -123,10 +123,10 @@ impl Workspace {
user_settings: &UserSettings,
workspace_path: PathBuf,
) -> Result<Self, WorkspaceLoadError> {
let repo_path = find_repo_dir(&workspace_path)
let jj_dir = find_jj_dir(&workspace_path)
.ok_or(WorkspaceLoadError::NoWorkspaceHere(workspace_path))?;
let workspace_root = repo_path.parent().unwrap().to_owned();
let repo_loader = RepoLoader::init(user_settings, repo_path);
let workspace_root = jj_dir.parent().unwrap().to_owned();
let repo_loader = RepoLoader::init(user_settings, jj_dir);
let working_copy_state_path = repo_loader.repo_path().join("working_copy");
let working_copy = WorkingCopy::load(
repo_loader.store().clone(),
@ -161,11 +161,11 @@ impl Workspace {
}
}
fn find_repo_dir(mut workspace_root: &Path) -> Option<PathBuf> {
fn find_jj_dir(mut workspace_root: &Path) -> Option<PathBuf> {
loop {
let repo_path = workspace_root.join(".jj");
if repo_path.is_dir() {
return Some(repo_path);
let jj_path = workspace_root.join(".jj");
if jj_path.is_dir() {
return Some(jj_path);
}
if let Some(wc_dir_parent) = workspace_root.parent() {
workspace_root = wc_dir_parent;