mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 14:57:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: add test for default branch after fetch

Browse source 
This adds tests I should have added in 48f237e33e.
This commit is contained in:
Martin von Zweigbergk 2021-09-22 09:14:56 -07:00
parent 880d469b5f
commit f56262ce85
1 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/tests/test_git.rs
View file

@ -288,22 +288,56 @@ fn test_fetch_success() {
let clone_git_repo = let clone_git_repo =
git2::Repository::clone(source_repo_dir.to_str().unwrap(), &clone_repo_dir).unwrap(); git2::Repository::clone(source_repo_dir.to_str().unwrap(), &clone_repo_dir).unwrap();
std::fs::create_dir(&jj_repo_dir).unwrap(); std::fs::create_dir(&jj_repo_dir).unwrap();
ReadonlyRepo::init_external_git(&settings, jj_repo_dir.clone(), clone_repo_dir).unwrap(); let jj_repo = ReadonlyRepo::init_external_git(&settings, jj_repo_dir, clone_repo_dir).unwrap();
let new_git_commit = let new_git_commit =
empty_git_commit(&source_git_repo, "refs/heads/main", &[&initial_git_commit]); empty_git_commit(&source_git_repo, "refs/heads/main", &[&initial_git_commit]);
// The new commit is not visible before git::fetch(). // The new commit is not visible before git::fetch() even if we reload the repo.
let jj_repo = ReadonlyRepo::load(&settings, jj_repo_dir).unwrap(); assert!(!jj_repo
assert!(!jj_repo.view().heads().contains(&commit_id(&new_git_commit))); .reload()
.view()
.heads()
.contains(&commit_id(&new_git_commit)));
// The new commit is visible after git::fetch().
let mut tx = jj_repo.start_transaction("test"); let mut tx = jj_repo.start_transaction("test");
git::fetch(tx.mut_repo(), &clone_git_repo, "origin").unwrap(); let default_branch = git::fetch(tx.mut_repo(), &clone_git_repo, "origin").unwrap();
// The default branch is "main"
assert_eq!(default_branch, Some("main".to_string()));
let repo = tx.commit(); let repo = tx.commit();
// The new commit is visible after git::fetch().
assert!(repo.view().heads().contains(&commit_id(&new_git_commit))); assert!(repo.view().heads().contains(&commit_id(&new_git_commit)));
} }
#[test]
fn test_fetch_no_default_branch() {
let settings = testutils::user_settings();
let temp_dir = tempfile::tempdir().unwrap();
let source_repo_dir = temp_dir.path().join("source");
let clone_repo_dir = temp_dir.path().join("clone");
let jj_repo_dir = temp_dir.path().join("jj");
let source_git_repo = git2::Repository::init_bare(&source_repo_dir).unwrap();
let initial_git_commit = empty_git_commit(&source_git_repo, "refs/heads/main", &[]);
let clone_git_repo =
git2::Repository::clone(source_repo_dir.to_str().unwrap(), &clone_repo_dir).unwrap();
std::fs::create_dir(&jj_repo_dir).unwrap();
let jj_repo = ReadonlyRepo::init_external_git(&settings, jj_repo_dir, clone_repo_dir).unwrap();
empty_git_commit(&source_git_repo, "refs/heads/main", &[&initial_git_commit]);
// It's actually not enough to have a detached HEAD, it also needs to point to a
// commit without a commit (that's possibly a bug in Git *and* libgit2), so
// we point it to initial_git_commit.
source_git_repo
.set_head_detached(initial_git_commit.id())
.unwrap();
let mut tx = jj_repo.start_transaction("test");
let default_branch = git::fetch(tx.mut_repo(), &clone_git_repo, "origin").unwrap();
// There is no default branch
assert_eq!(default_branch, None);
tx.discard();
}
#[test] #[test]
fn test_fetch_no_such_remote() { fn test_fetch_no_such_remote() {
let settings = testutils::user_settings(); let settings = testutils::user_settings();