mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-13 15:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

copy-tracking: move unit tests into backend specific file

Browse source
This commit is contained in:
Matt Kulukundis 2024-07-17 18:40:08 -04:00 committed by Matt Fowles Kulukundis
parent 5649ee4f45
commit 6ffe05290d
3 changed files with 104 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/tests/runner.rs
View file

@ -10,7 +10,6 @@ mod test_bad_locking;
mod test_commit_builder;
mod test_commit_concurrent;
mod test_conflicts;
mod test_copy_tracking;
mod test_default_revset_graph_iterator;
mod test_diff_summary;
mod test_git;

120
lib/tests/test_copy_tracking.rs
View file

@ -1,120 +0,0 @@
// Copyright 2024 The Jujutsu Authors
//
// 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 std::collections::HashMap;
use futures::executor::block_on_stream;
use jj_lib::backend::{CommitId, CopySource, CopySources};
use jj_lib::commit::Commit;
use jj_lib::repo::Repo;
use jj_lib::repo_path::{RepoPath, RepoPathBuf};
use jj_lib::settings::UserSettings;
use jj_lib::store::Store;
use jj_lib::transaction::Transaction;
use testutils::{create_tree, TestRepo, TestRepoBackend};
fn get_copy_records(
store: &Store,
paths: &[RepoPathBuf],
a: &Commit,
b: &Commit,
) -> HashMap<String, Vec<String>> {
let stream = store
.get_copy_records(paths, &[a.id().clone()], &[b.id().clone()])
.unwrap();
let mut res: HashMap<String, Vec<String>> = HashMap::new();
for copy_record in block_on_stream(stream).filter_map(|r| r.ok()) {
res.insert(
copy_record.target.as_internal_file_string().into(),
match copy_record.sources {
CopySources::Resolved(CopySource { path, .. }) => {
vec![path.as_internal_file_string().into()]
}
CopySources::Conflict(conflicting) => conflicting
.iter()
.map(|s| s.path.as_internal_file_string().into())
.collect(),
},
);
}
res
}
fn make_commit(
tx: &mut Transaction,
settings: &UserSettings,
parents: Vec<CommitId>,
content: &[(&RepoPath, &str)],
) -> Commit {
let tree = create_tree(tx.base_repo(), content);
tx.mut_repo()
.new_commit(settings, parents, tree.id())
.write()
.unwrap()
}
#[test]
fn test_git_detection() {
let settings = testutils::user_settings();
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
let repo = &test_repo.repo;
let paths = &[
RepoPathBuf::from_internal_string("file0"),
RepoPathBuf::from_internal_string("file1"),
RepoPathBuf::from_internal_string("file2"),
];
let mut tx = repo.start_transaction(&settings);
let commit_a = make_commit(
&mut tx,
&settings,
vec![repo.store().root_commit_id().clone()],
&[(&paths[0], "content")],
);
let commit_b = make_commit(
&mut tx,
&settings,
vec![commit_a.id().clone()],
&[(&paths[1], "content")],
);
let commit_c = make_commit(
&mut tx,
&settings,
vec![commit_b.id().clone()],
&[(&paths[2], "content")],
);
let store = repo.store();
assert_eq!(
get_copy_records(store, paths, &commit_a, &commit_b),
HashMap::from([("file1".to_string(), vec!["file0".to_string()])])
);
assert_eq!(
get_copy_records(store, paths, &commit_b, &commit_c),
HashMap::from([("file2".to_string(), vec!["file1".to_string()])])
);
assert_eq!(
get_copy_records(store, paths, &commit_a, &commit_c),
HashMap::from([("file2".to_string(), vec!["file0".to_string()])])
);
assert_eq!(
get_copy_records(store, &[], &commit_a, &commit_c),
HashMap::default(),
);
assert_eq!(
get_copy_records(store, paths, &commit_c, &commit_c),
HashMap::default(),
);
}

107
lib/tests/test_git_backend.rs
View file

@ -12,17 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use std::collections::HashSet;
use std::collections::{HashMap, HashSet};
use std::path::Path;
use std::process::Command;
use std::sync::Arc;
use std::time::{Duration, SystemTime};
use jj_lib::backend::CommitId;
use futures::executor::block_on_stream;
use jj_lib::backend::{CommitId, CopySource, CopySources};
use jj_lib::commit::Commit;
use jj_lib::git_backend::GitBackend;
use jj_lib::repo::{ReadonlyRepo, Repo};
use jj_lib::repo_path::{RepoPath, RepoPathBuf};
use jj_lib::settings::UserSettings;
use jj_lib::store::Store;
use jj_lib::transaction::Transaction;
use maplit::hashset;
use testutils::{create_random_commit, CommitGraphBuilder, TestRepo, TestRepoBackend};
use testutils::{create_random_commit, create_tree, CommitGraphBuilder, TestRepo, TestRepoBackend};
fn get_git_backend(repo: &Arc<ReadonlyRepo>) -> &GitBackend {
repo.store()
@ -43,6 +49,46 @@ fn collect_no_gc_refs(git_repo_path: &Path) -> HashSet<CommitId> {
.collect()
}
fn get_copy_records(
store: &Store,
paths: &[RepoPathBuf],
a: &Commit,
b: &Commit,
) -> HashMap<String, Vec<String>> {
let stream = store
.get_copy_records(paths, &[a.id().clone()], &[b.id().clone()])
.unwrap();
let mut res: HashMap<String, Vec<String>> = HashMap::new();
for copy_record in block_on_stream(stream).map(|r| r.unwrap()) {
res.insert(
copy_record.target.as_internal_file_string().into(),
match copy_record.sources {
CopySources::Resolved(CopySource { path, .. }) => {
vec![path.as_internal_file_string().into()]
}
CopySources::Conflict(conflicting) => conflicting
.iter()
.map(|s| s.path.as_internal_file_string().into())
.collect(),
},
);
}
res
}
fn make_commit(
tx: &mut Transaction,
settings: &UserSettings,
parents: Vec<CommitId>,
content: &[(&RepoPath, &str)],
) -> Commit {
let tree = create_tree(tx.base_repo(), content);
tx.mut_repo()
.new_commit(settings, parents, tree.id())
.write()
.unwrap()
}
#[test]
fn test_gc() {
// TODO: Better way to disable the test if git command couldn't be executed
@ -191,3 +237,58 @@ fn test_gc() {
repo.store().gc(base_index.as_index(), now()).unwrap();
assert_eq!(collect_no_gc_refs(git_repo_path), hashset! {});
}
#[test]
fn test_copy_detection() {
let settings = testutils::user_settings();
let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git);
let repo = &test_repo.repo;
let paths = &[
RepoPathBuf::from_internal_string("file0"),
RepoPathBuf::from_internal_string("file1"),
RepoPathBuf::from_internal_string("file2"),
];
let mut tx = repo.start_transaction(&settings);
let commit_a = make_commit(
&mut tx,
&settings,
vec![repo.store().root_commit_id().clone()],
&[(&paths[0], "content")],
);
let commit_b = make_commit(
&mut tx,
&settings,
vec![commit_a.id().clone()],
&[(&paths[1], "content")],
);
let commit_c = make_commit(
&mut tx,
&settings,
vec![commit_b.id().clone()],
&[(&paths[2], "content")],
);
let store = repo.store();
assert_eq!(
get_copy_records(store, paths, &commit_a, &commit_b),
HashMap::from([("file1".to_string(), vec!["file0".to_string()])])
);
assert_eq!(
get_copy_records(store, paths, &commit_b, &commit_c),
HashMap::from([("file2".to_string(), vec!["file1".to_string()])])
);
assert_eq!(
get_copy_records(store, paths, &commit_a, &commit_c),
HashMap::from([("file2".to_string(), vec!["file0".to_string()])])
);
assert_eq!(
get_copy_records(store, &[], &commit_a, &commit_c),
HashMap::default(),
);
assert_eq!(
get_copy_records(store, paths, &commit_c, &commit_c),
HashMap::default(),
);
}