From 35f0c173805ca7be5c283fa8823bd70daa923342 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Fri, 28 Jan 2022 19:47:38 -0800
Subject: [PATCH] workspace: rename some symbols related to `.jj/` to `jj_dir`
 (#13)

---
 lib/src/workspace.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/workspace.rs b/lib/src/workspace.rs
index 447770714..226713c6e 100644
--- a/lib/src/workspace.rs
+++ b/lib/src/workspace.rs
@@ -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;