mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-31 00:12:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

tests: pass around &RepoPath instead of &str in working copy test

Browse source 
This is a leftover from when there were separate `RepoPath` types for
directories and files.
This commit is contained in:
Martin von Zweigbergk 2022-03-31 09:32:03 -07:00 committed by Martin von Zweigbergk
parent 034fbb47e3
commit fd5bc7966c
1 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/tests/test_working_copy.rs
View file

@ -23,7 +23,7 @@ use jujutsu_lib::backend::{Conflict, ConflictPart, TreeValue};
use jujutsu_lib::gitignore::GitIgnoreFile; use jujutsu_lib::gitignore::GitIgnoreFile;
use jujutsu_lib::op_store::WorkspaceId; use jujutsu_lib::op_store::WorkspaceId;
use jujutsu_lib::repo::ReadonlyRepo; use jujutsu_lib::repo::ReadonlyRepo;
use jujutsu_lib::repo_path::{RepoPath, RepoPathComponent}; use jujutsu_lib::repo_path::{RepoPath, RepoPathComponent, RepoPathJoin};
use jujutsu_lib::settings::UserSettings; use jujutsu_lib::settings::UserSettings;
use jujutsu_lib::testutils; use jujutsu_lib::testutils;
use jujutsu_lib::tree_builder::TreeBuilder; use jujutsu_lib::tree_builder::TreeBuilder;
@ -78,7 +78,7 @@ fn test_checkout_file_transitions(use_git: bool) {
repo: &Arc<ReadonlyRepo>, repo: &Arc<ReadonlyRepo>,
tree_builder: &mut TreeBuilder, tree_builder: &mut TreeBuilder,
kind: Kind, kind: Kind,
path: &str, path: &RepoPath,
) { ) {
let store = repo.store(); let store = repo.store();
let value = match kind { let value = match kind {
@ -86,43 +86,23 @@ fn test_checkout_file_transitions(use_git: bool) {
return; return;
} }
Kind::Normal => { Kind::Normal => {
let id = testutils::write_file( let id = testutils::write_file(store, path, "normal file contents");
store,
&RepoPath::from_internal_string(path),
"normal file contents",
);
TreeValue::Normal { TreeValue::Normal {
id, id,
executable: false, executable: false,
} }
} }
Kind::Executable => { Kind::Executable => {
let id = testutils::write_file( let id = testutils::write_file(store, path, "executable file contents");
store,
&RepoPath::from_internal_string(path),
"executable file contents",
);
TreeValue::Normal { TreeValue::Normal {
id, id,
executable: true, executable: true,
} }
} }
Kind::Conflict => { Kind::Conflict => {
let base_file_id = testutils::write_file( let base_file_id = testutils::write_file(store, path, "base file contents");
store, let left_file_id = testutils::write_file(store, path, "left file contents");
&RepoPath::from_internal_string(path), let right_file_id = testutils::write_file(store, path, "right file contents");
"base file contents",
);
let left_file_id = testutils::write_file(
store,
&RepoPath::from_internal_string(path),
"left file contents",
);
let right_file_id = testutils::write_file(
store,
&RepoPath::from_internal_string(path),
"right file contents",
);
let conflict = Conflict { let conflict = Conflict {
removes: vec![ConflictPart { removes: vec![ConflictPart {
value: TreeValue::Normal { value: TreeValue::Normal {
@ -149,14 +129,12 @@ fn test_checkout_file_transitions(use_git: bool) {
TreeValue::Conflict(conflict_id) TreeValue::Conflict(conflict_id)
} }
Kind::Symlink => { Kind::Symlink => {
let id = store let id = store.write_symlink(path, "target").unwrap();
.write_symlink(&RepoPath::from_internal_string(path), "target")
.unwrap();
TreeValue::Symlink(id) TreeValue::Symlink(id)
} }
Kind::Tree => { Kind::Tree => {
let mut sub_tree_builder = store.tree_builder(store.empty_tree_id().clone()); let mut sub_tree_builder = store.tree_builder(store.empty_tree_id().clone());
let file_path = path.to_owned() + "/file"; let file_path = path.join(&RepoPathComponent::from("file"));
write_path( write_path(
settings, settings,
repo, repo,
@ -177,7 +155,7 @@ fn test_checkout_file_transitions(use_git: bool) {
TreeValue::GitSubmodule(id) TreeValue::GitSubmodule(id)
} }
}; };
tree_builder.set(RepoPath::from_internal_string(path), value); tree_builder.set(path.clone(), value);
} }
let mut kinds = vec![ let mut kinds = vec![
@ -197,7 +175,7 @@ fn test_checkout_file_transitions(use_git: bool) {
let mut files = vec![]; let mut files = vec![];
for left_kind in &kinds { for left_kind in &kinds {
for right_kind in &kinds { for right_kind in &kinds {
let path = format!("{:?}_{:?}", left_kind, right_kind); let path = RepoPath::from_internal_string(&format!("{:?}_{:?}", left_kind, right_kind));
write_path(&settings, repo, &mut left_tree_builder, *left_kind, &path); write_path(&settings, repo, &mut left_tree_builder, *left_kind, &path);
write_path(&settings, repo, &mut right_tree_builder, *right_kind, &path); write_path(&settings, repo, &mut right_tree_builder, *right_kind, &path);
files.push((*left_kind, *right_kind, path)); files.push((*left_kind, *right_kind, path));
@ -221,7 +199,7 @@ fn test_checkout_file_transitions(use_git: bool) {
assert_eq!(new_tree_id, right_tree_id); assert_eq!(new_tree_id, right_tree_id);
for (_left_kind, right_kind, path) in &files { for (_left_kind, right_kind, path) in &files {
let wc_path = workspace_root.join(path); let wc_path = workspace_root.join(path.to_internal_file_string());
let maybe_metadata = wc_path.symlink_metadata(); let maybe_metadata = wc_path.symlink_metadata();
match right_kind { match right_kind {
Kind::Missing => { Kind::Missing => {