mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-28 01:16:57 +00:00
a8a9f7dedd
It's annoying to have to have the Git repo and Jujube repo in separate directories. This commit adds `jj init --git`, which creates a new Jujube repo with an empty, bare git repo in `.jj/git/`. Hopefully the `jj git` subcommands will eventually provide enough functionality for working with the Git repo that the user won't have to use Git commands directly. If they still do, they can run them from inside `.jj/git/`, or create a new worktree based on that bare repo. The implementation is quite straight-forward. One thing to note is that I made `.jj/store` support relative paths to the Git repo. That's mostly so the Jujube repo can be moved around freely.
124 lines
4.1 KiB
Rust
124 lines
4.1 KiB
Rust
// 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;
|
|
use std::io::Write;
|
|
use std::sync::Arc;
|
|
|
|
use tempfile::TempDir;
|
|
|
|
use crate::commit_builder::CommitBuilder;
|
|
use crate::repo::ReadonlyRepo;
|
|
use crate::repo_path::{DirRepoPath, FileRepoPath};
|
|
use crate::settings::UserSettings;
|
|
use crate::store::{FileId, TreeId, TreeValue};
|
|
use crate::store_wrapper::StoreWrapper;
|
|
use crate::tree::Tree;
|
|
use crate::tree_builder::TreeBuilder;
|
|
|
|
pub fn user_settings() -> UserSettings {
|
|
let mut config = config::Config::new();
|
|
config.set("user.name", "Test User").unwrap();
|
|
config.set("user.email", "test.user@example.com").unwrap();
|
|
UserSettings::from_config(config)
|
|
}
|
|
|
|
pub fn init_repo(settings: &UserSettings, use_git: bool) -> (TempDir, Arc<ReadonlyRepo>) {
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
|
|
let wc_path = temp_dir.path().join("repo");
|
|
fs::create_dir(&wc_path).unwrap();
|
|
|
|
let repo = if use_git {
|
|
let git_path = temp_dir.path().join("git-repo");
|
|
git2::Repository::init(&git_path).unwrap();
|
|
ReadonlyRepo::init_external_git(&settings, wc_path, git_path)
|
|
} else {
|
|
ReadonlyRepo::init_local(&settings, wc_path)
|
|
};
|
|
|
|
(temp_dir, repo)
|
|
}
|
|
|
|
pub fn write_file(store: &StoreWrapper, path: &FileRepoPath, contents: &str) -> FileId {
|
|
store.write_file(path, &mut contents.as_bytes()).unwrap()
|
|
}
|
|
|
|
pub fn write_normal_file(tree_builder: &mut TreeBuilder, path: &FileRepoPath, contents: &str) {
|
|
let id = write_file(tree_builder.repo(), path, contents);
|
|
tree_builder.set(
|
|
path.to_repo_path(),
|
|
TreeValue::Normal {
|
|
id,
|
|
executable: false,
|
|
},
|
|
);
|
|
}
|
|
|
|
pub fn write_executable_file(tree_builder: &mut TreeBuilder, path: &FileRepoPath, contents: &str) {
|
|
let id = write_file(tree_builder.repo(), path, contents);
|
|
tree_builder.set(
|
|
path.to_repo_path(),
|
|
TreeValue::Normal {
|
|
id,
|
|
executable: true,
|
|
},
|
|
);
|
|
}
|
|
|
|
pub fn write_symlink(tree_builder: &mut TreeBuilder, path: &FileRepoPath, target: &str) {
|
|
let id = tree_builder.repo().write_symlink(path, target).unwrap();
|
|
tree_builder.set(path.to_repo_path(), TreeValue::Symlink(id));
|
|
}
|
|
|
|
pub fn create_tree(repo: &ReadonlyRepo, path_contents: &[(&FileRepoPath, &str)]) -> Tree {
|
|
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();
|
|
store.get_tree(&DirRepoPath::root(), &id).unwrap()
|
|
}
|
|
|
|
#[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>();
|
|
let path = FileRepoPath::from(format!("file{}", number).as_str());
|
|
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>();
|
|
CommitBuilder::for_new_commit(settings, repo.store(), tree_id)
|
|
.set_description(format!("random commit {}", number))
|
|
}
|
|
|
|
pub fn write_working_copy_file(repo: &ReadonlyRepo, path: &FileRepoPath, contents: &str) {
|
|
let mut file = OpenOptions::new()
|
|
.write(true)
|
|
.create(true)
|
|
.truncate(true)
|
|
.open(repo.working_copy_path().join(path.to_internal_string()))
|
|
.unwrap();
|
|
file.write_all(contents.as_bytes()).unwrap();
|
|
}
|