2020-12-12 08:00:42 +00:00
|
|
|
// Copyright 2020 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 std::fs;
|
|
|
|
use std::fs::OpenOptions;
|
2021-10-21 05:09:09 +00:00
|
|
|
use std::io::{Read, Write};
|
2022-03-30 05:14:39 +00:00
|
|
|
use std::path::{Path, PathBuf};
|
2020-12-12 08:00:42 +00:00
|
|
|
use std::sync::Arc;
|
|
|
|
|
2021-06-09 20:57:48 +00:00
|
|
|
use itertools::Itertools;
|
2020-12-12 08:00:42 +00:00
|
|
|
use tempfile::TempDir;
|
|
|
|
|
2021-09-12 06:52:38 +00:00
|
|
|
use crate::backend::{FileId, TreeId, TreeValue};
|
2021-05-01 04:41:27 +00:00
|
|
|
use crate::commit::Commit;
|
2020-12-12 08:00:42 +00:00
|
|
|
use crate::commit_builder::CommitBuilder;
|
2022-07-13 05:04:04 +00:00
|
|
|
use crate::git_backend::GitBackend;
|
|
|
|
use crate::local_backend::LocalBackend;
|
2021-05-01 04:41:27 +00:00
|
|
|
use crate::repo::{MutableRepo, ReadonlyRepo};
|
2021-05-19 16:41:25 +00:00
|
|
|
use crate::repo_path::RepoPath;
|
2021-09-29 18:27:58 +00:00
|
|
|
use crate::rewrite::RebasedDescendant;
|
2020-12-12 08:00:42 +00:00
|
|
|
use crate::settings::UserSettings;
|
2021-09-12 06:52:38 +00:00
|
|
|
use crate::store::Store;
|
2020-12-12 08:00:42 +00:00
|
|
|
use crate::tree::Tree;
|
|
|
|
use crate::tree_builder::TreeBuilder;
|
2021-11-21 07:46:54 +00:00
|
|
|
use crate::workspace::Workspace;
|
2020-12-12 08:00:42 +00:00
|
|
|
|
2022-09-07 03:25:03 +00:00
|
|
|
pub fn new_temp_dir() -> TempDir {
|
|
|
|
tempfile::Builder::new()
|
|
|
|
.prefix("jj-test-")
|
|
|
|
.tempdir()
|
|
|
|
.unwrap()
|
|
|
|
}
|
|
|
|
|
2021-03-17 00:09:33 +00:00
|
|
|
pub fn new_user_home() -> TempDir {
|
|
|
|
// Set $HOME to some arbitrary place so libgit2 doesn't use ~/.gitignore
|
|
|
|
// of the person running the tests.
|
2022-09-07 03:25:03 +00:00
|
|
|
let home_dir = new_temp_dir();
|
2021-03-17 00:09:33 +00:00
|
|
|
std::env::set_var("HOME", home_dir.path());
|
|
|
|
home_dir
|
|
|
|
}
|
|
|
|
|
2020-12-12 08:00:42 +00:00
|
|
|
pub fn user_settings() -> UserSettings {
|
2022-03-10 02:04:19 +00:00
|
|
|
let config = config::Config::builder()
|
|
|
|
.set_override("user.name", "Test User")
|
|
|
|
.unwrap()
|
|
|
|
.set_override("user.email", "test.user@example.com")
|
|
|
|
.unwrap()
|
|
|
|
.build()
|
|
|
|
.unwrap();
|
2020-12-12 08:00:42 +00:00
|
|
|
UserSettings::from_config(config)
|
|
|
|
}
|
|
|
|
|
2022-02-05 21:04:30 +00:00
|
|
|
pub struct TestRepo {
|
2022-03-30 05:14:39 +00:00
|
|
|
_temp_dir: TempDir,
|
2022-02-05 21:04:30 +00:00
|
|
|
pub repo: Arc<ReadonlyRepo>,
|
|
|
|
}
|
|
|
|
|
2022-05-21 17:55:51 +00:00
|
|
|
impl TestRepo {
|
2022-05-21 18:20:51 +00:00
|
|
|
pub fn init(use_git: bool) -> Self {
|
|
|
|
let settings = user_settings();
|
2022-09-07 03:25:03 +00:00
|
|
|
let temp_dir = new_temp_dir();
|
2022-05-21 17:55:51 +00:00
|
|
|
|
|
|
|
let repo_dir = temp_dir.path().join("repo");
|
|
|
|
fs::create_dir(&repo_dir).unwrap();
|
|
|
|
|
|
|
|
let repo = if use_git {
|
|
|
|
let git_path = temp_dir.path().join("git-repo");
|
|
|
|
git2::Repository::init(&git_path).unwrap();
|
2022-07-13 05:04:04 +00:00
|
|
|
ReadonlyRepo::init(&settings, repo_dir, |store_path| {
|
|
|
|
Box::new(GitBackend::init_external(store_path, git_path.clone()))
|
|
|
|
})
|
2022-05-21 17:55:51 +00:00
|
|
|
} else {
|
2022-07-13 05:04:04 +00:00
|
|
|
ReadonlyRepo::init(&settings, repo_dir, |store_path| {
|
|
|
|
Box::new(LocalBackend::init(store_path))
|
|
|
|
})
|
2022-05-21 17:55:51 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Self {
|
|
|
|
_temp_dir: temp_dir,
|
|
|
|
repo,
|
|
|
|
}
|
2022-03-30 05:14:39 +00:00
|
|
|
}
|
2022-02-05 21:04:30 +00:00
|
|
|
}
|
|
|
|
|
2021-11-21 07:46:54 +00:00
|
|
|
pub struct TestWorkspace {
|
2022-03-30 05:14:39 +00:00
|
|
|
temp_dir: TempDir,
|
2021-11-21 07:46:54 +00:00
|
|
|
pub workspace: Workspace,
|
|
|
|
pub repo: Arc<ReadonlyRepo>,
|
|
|
|
}
|
|
|
|
|
2022-05-21 17:55:51 +00:00
|
|
|
impl TestWorkspace {
|
|
|
|
pub fn init(settings: &UserSettings, use_git: bool) -> Self {
|
2022-09-07 03:25:03 +00:00
|
|
|
let temp_dir = new_temp_dir();
|
2022-05-21 17:55:51 +00:00
|
|
|
|
|
|
|
let workspace_root = temp_dir.path().join("repo");
|
|
|
|
fs::create_dir(&workspace_root).unwrap();
|
|
|
|
|
|
|
|
let (workspace, repo) = if use_git {
|
|
|
|
let git_path = temp_dir.path().join("git-repo");
|
|
|
|
git2::Repository::init(&git_path).unwrap();
|
|
|
|
Workspace::init_external_git(settings, workspace_root, git_path).unwrap()
|
|
|
|
} else {
|
|
|
|
Workspace::init_local(settings, workspace_root).unwrap()
|
|
|
|
};
|
|
|
|
|
|
|
|
Self {
|
|
|
|
temp_dir,
|
|
|
|
workspace,
|
|
|
|
repo,
|
|
|
|
}
|
2021-11-21 07:46:54 +00:00
|
|
|
}
|
2020-12-12 08:00:42 +00:00
|
|
|
|
2022-03-30 05:14:39 +00:00
|
|
|
pub fn root_dir(&self) -> PathBuf {
|
|
|
|
self.temp_dir.path().join("repo").join("..")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-21 05:09:09 +00:00
|
|
|
pub fn read_file(store: &Store, path: &RepoPath, id: &FileId) -> Vec<u8> {
|
|
|
|
let mut reader = store.read_file(path, id).unwrap();
|
|
|
|
let mut content = vec![];
|
|
|
|
reader.read_to_end(&mut content).unwrap();
|
|
|
|
content
|
|
|
|
}
|
|
|
|
|
2021-09-12 06:52:38 +00:00
|
|
|
pub fn write_file(store: &Store, path: &RepoPath, contents: &str) -> FileId {
|
2020-12-12 08:00:42 +00:00
|
|
|
store.write_file(path, &mut contents.as_bytes()).unwrap()
|
|
|
|
}
|
|
|
|
|
2021-05-17 04:55:51 +00:00
|
|
|
pub fn write_normal_file(tree_builder: &mut TreeBuilder, path: &RepoPath, contents: &str) {
|
2021-10-30 05:13:35 +00:00
|
|
|
let id = write_file(tree_builder.store(), path, contents);
|
2020-12-12 08:00:42 +00:00
|
|
|
tree_builder.set(
|
2021-05-17 04:55:51 +00:00
|
|
|
path.clone(),
|
2020-12-12 08:00:42 +00:00
|
|
|
TreeValue::Normal {
|
|
|
|
id,
|
|
|
|
executable: false,
|
|
|
|
},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-05-17 04:55:51 +00:00
|
|
|
pub fn write_executable_file(tree_builder: &mut TreeBuilder, path: &RepoPath, contents: &str) {
|
2021-10-30 05:13:35 +00:00
|
|
|
let id = write_file(tree_builder.store(), path, contents);
|
2020-12-12 08:00:42 +00:00
|
|
|
tree_builder.set(
|
2021-05-17 04:55:51 +00:00
|
|
|
path.clone(),
|
2020-12-12 08:00:42 +00:00
|
|
|
TreeValue::Normal {
|
|
|
|
id,
|
|
|
|
executable: true,
|
|
|
|
},
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-05-17 04:55:51 +00:00
|
|
|
pub fn write_symlink(tree_builder: &mut TreeBuilder, path: &RepoPath, target: &str) {
|
2021-10-30 05:13:35 +00:00
|
|
|
let id = tree_builder.store().write_symlink(path, target).unwrap();
|
2021-05-17 04:55:51 +00:00
|
|
|
tree_builder.set(path.clone(), TreeValue::Symlink(id));
|
2020-12-12 08:00:42 +00:00
|
|
|
}
|
|
|
|
|
2021-05-17 04:55:51 +00:00
|
|
|
pub fn create_tree(repo: &ReadonlyRepo, path_contents: &[(&RepoPath, &str)]) -> Tree {
|
2020-12-12 08:00:42 +00:00
|
|
|
let store = repo.store();
|
|
|
|
let mut tree_builder = store.tree_builder(store.empty_tree_id().clone());
|
|
|
|
for (path, contents) in path_contents {
|
|
|
|
write_normal_file(&mut tree_builder, path, contents);
|
|
|
|
}
|
|
|
|
let id = tree_builder.write_tree();
|
2021-05-19 16:41:25 +00:00
|
|
|
store.get_tree(&RepoPath::root(), &id).unwrap()
|
2020-12-12 08:00:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[must_use]
|
|
|
|
pub fn create_random_tree(repo: &ReadonlyRepo) -> TreeId {
|
|
|
|
let mut tree_builder = repo
|
|
|
|
.store()
|
|
|
|
.tree_builder(repo.store().empty_tree_id().clone());
|
|
|
|
let number = rand::random::<u32>();
|
2021-05-17 05:47:31 +00:00
|
|
|
let path = RepoPath::from_internal_string(format!("file{}", number).as_str());
|
2020-12-12 08:00:42 +00:00
|
|
|
write_normal_file(&mut tree_builder, &path, "contents");
|
|
|
|
tree_builder.write_tree()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[must_use]
|
|
|
|
pub fn create_random_commit(settings: &UserSettings, repo: &ReadonlyRepo) -> CommitBuilder {
|
|
|
|
let tree_id = create_random_tree(repo);
|
|
|
|
let number = rand::random::<u32>();
|
2022-09-19 05:26:45 +00:00
|
|
|
CommitBuilder::for_new_commit(settings, vec![], tree_id)
|
2020-12-12 08:00:42 +00:00
|
|
|
.set_description(format!("random commit {}", number))
|
|
|
|
}
|
|
|
|
|
2021-11-21 22:31:44 +00:00
|
|
|
pub fn write_working_copy_file(workspace_root: &Path, path: &RepoPath, contents: &str) {
|
2020-12-12 08:00:42 +00:00
|
|
|
let mut file = OpenOptions::new()
|
|
|
|
.write(true)
|
|
|
|
.create(true)
|
|
|
|
.truncate(true)
|
2021-11-21 22:31:44 +00:00
|
|
|
.open(path.to_fs_path(workspace_root))
|
2020-12-12 08:00:42 +00:00
|
|
|
.unwrap();
|
|
|
|
file.write_all(contents.as_bytes()).unwrap();
|
|
|
|
}
|
2021-05-01 04:41:27 +00:00
|
|
|
|
|
|
|
pub struct CommitGraphBuilder<'settings, 'repo> {
|
|
|
|
settings: &'settings UserSettings,
|
|
|
|
mut_repo: &'repo mut MutableRepo,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'settings, 'repo> CommitGraphBuilder<'settings, 'repo> {
|
|
|
|
pub fn new(
|
|
|
|
settings: &'settings UserSettings,
|
|
|
|
mut_repo: &'repo mut MutableRepo,
|
|
|
|
) -> CommitGraphBuilder<'settings, 'repo> {
|
|
|
|
CommitGraphBuilder { settings, mut_repo }
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn initial_commit(&mut self) -> Commit {
|
|
|
|
create_random_commit(self.settings, self.mut_repo.base_repo().as_ref())
|
|
|
|
.write_to_repo(self.mut_repo)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn commit_with_parents(&mut self, parents: &[&Commit]) -> Commit {
|
2021-06-09 20:57:48 +00:00
|
|
|
let parent_ids = parents
|
|
|
|
.iter()
|
|
|
|
.map(|commit| commit.id().clone())
|
|
|
|
.collect_vec();
|
2021-05-01 04:41:27 +00:00
|
|
|
create_random_commit(self.settings, self.mut_repo.base_repo().as_ref())
|
|
|
|
.set_parents(parent_ids)
|
|
|
|
.write_to_repo(self.mut_repo)
|
|
|
|
}
|
|
|
|
}
|
2021-09-29 18:27:58 +00:00
|
|
|
|
|
|
|
pub fn assert_rebased(
|
|
|
|
rebased: Option<RebasedDescendant>,
|
|
|
|
expected_old_commit: &Commit,
|
|
|
|
expected_new_parents: &[&Commit],
|
|
|
|
) -> Commit {
|
|
|
|
if let Some(RebasedDescendant {
|
|
|
|
old_commit,
|
|
|
|
new_commit,
|
|
|
|
}) = rebased
|
|
|
|
{
|
|
|
|
assert_eq!(old_commit, *expected_old_commit);
|
|
|
|
assert_eq!(new_commit.change_id(), expected_old_commit.change_id());
|
|
|
|
assert_eq!(
|
|
|
|
new_commit.parent_ids(),
|
|
|
|
expected_new_parents
|
|
|
|
.iter()
|
|
|
|
.map(|commit| commit.id().clone())
|
|
|
|
.collect_vec()
|
|
|
|
);
|
|
|
|
new_commit
|
|
|
|
} else {
|
|
|
|
panic!("expected rebased commit: {:?}", rebased);
|
|
|
|
}
|
|
|
|
}
|