mirror of
https://github.com/martinvonz/jj.git
synced 2024-09-22 03:07:11 +03:00
a9d1b16937
We depend on comparing the workspace root with the Git repo's path to know if we're sharing the working copy with it. For that to work reliably, we need the paths to be canonicalized, so that's what this patch tries to do.
90 lines
3.4 KiB
Rust
90 lines
3.4 KiB
Rust
// Copyright 2021 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use jujutsu_lib::op_store::WorkspaceId;
|
|
use jujutsu_lib::testutils;
|
|
use jujutsu_lib::workspace::{Workspace, WorkspaceLoadError};
|
|
use test_case::test_case;
|
|
|
|
#[test]
|
|
fn test_load_bad_path() {
|
|
let settings = testutils::user_settings();
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
let workspace_root = temp_dir.path().to_owned();
|
|
// We haven't created a repo in the workspace_root, so it should fail to load.
|
|
let result = Workspace::load(&settings, workspace_root.clone());
|
|
assert_eq!(
|
|
result.err(),
|
|
Some(WorkspaceLoadError::NoWorkspaceHere(workspace_root))
|
|
);
|
|
}
|
|
|
|
#[test_case(false ; "local backend")]
|
|
#[test_case(true ; "git backend")]
|
|
fn test_load_from_subdir(use_git: bool) {
|
|
let settings = testutils::user_settings();
|
|
let test_workspace = testutils::init_workspace(&settings, use_git);
|
|
let workspace = &test_workspace.workspace;
|
|
|
|
let subdir = workspace.workspace_root().join("dir").join("subdir");
|
|
std::fs::create_dir_all(subdir.clone()).unwrap();
|
|
let same_workspace = Workspace::load(&settings, subdir);
|
|
assert!(same_workspace.is_ok());
|
|
let same_workspace = same_workspace.unwrap();
|
|
assert_eq!(same_workspace.repo_path(), workspace.repo_path());
|
|
assert_eq!(same_workspace.workspace_root(), workspace.workspace_root());
|
|
}
|
|
|
|
#[test_case(false ; "local backend")]
|
|
// #[test_case(true ; "git backend")]
|
|
fn test_init_additional_workspace(use_git: bool) {
|
|
let settings = testutils::user_settings();
|
|
let test_workspace = testutils::init_workspace(&settings, use_git);
|
|
let workspace = &test_workspace.workspace;
|
|
|
|
let ws2_id = WorkspaceId::new("ws2".to_string());
|
|
let ws2_root = test_workspace.root_dir().join("ws2_root");
|
|
std::fs::create_dir(&ws2_root).unwrap();
|
|
let (ws2, repo) = Workspace::init_workspace_with_existing_repo(
|
|
&settings,
|
|
ws2_root.clone(),
|
|
&test_workspace.repo,
|
|
ws2_id.clone(),
|
|
)
|
|
.unwrap();
|
|
let checkout_id = repo.view().get_checkout(&ws2_id);
|
|
assert_ne!(checkout_id, None);
|
|
let checkout_id = checkout_id.unwrap();
|
|
let checkout_commit = repo.store().get_commit(checkout_id).unwrap();
|
|
assert_eq!(
|
|
checkout_commit.parent_ids(),
|
|
vec![repo.store().root_commit_id().clone()]
|
|
);
|
|
assert_eq!(ws2.workspace_id(), ws2_id);
|
|
assert_eq!(
|
|
*ws2.repo_path(),
|
|
workspace.repo_path().canonicalize().unwrap()
|
|
);
|
|
assert_eq!(*ws2.workspace_root(), ws2_root.canonicalize().unwrap());
|
|
let same_workspace = Workspace::load(&settings, ws2_root);
|
|
assert!(same_workspace.is_ok());
|
|
let same_workspace = same_workspace.unwrap();
|
|
assert_eq!(same_workspace.workspace_id(), ws2_id);
|
|
assert_eq!(
|
|
*same_workspace.repo_path(),
|
|
workspace.repo_path().canonicalize().unwrap()
|
|
);
|
|
assert_eq!(same_workspace.workspace_root(), ws2.workspace_root());
|
|
}
|