forked from mirrors/jj
0865b1ccff
It can be confusing that some commits (typically the working copy) don't have a description. Let's show a placeholder text in such cases. I chose the format to match the "(no email configured)" message we already have.
82 lines
3.5 KiB
Rust
82 lines
3.5 KiB
Rust
// Copyright 2022 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 crate::common::TestEnvironment;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_git_colocated() {
|
|
let test_env = TestEnvironment::default();
|
|
let workspace_root = test_env.env_root().join("repo");
|
|
let git_repo = git2::Repository::init(&workspace_root).unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["init", "--git-repo", "."]);
|
|
|
|
// Create a commit from jj and check that it's reflected in git
|
|
std::fs::write(workspace_root.join("new-file"), "contents").unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["close", "-m", "add a file"]);
|
|
test_env.jj_cmd_success(&workspace_root, &["git", "import"]);
|
|
let stdout =
|
|
test_env.jj_cmd_success(&workspace_root, &["log", "-T", "commit_id \" \" branches"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ 2588800a4ee68926773f1e9c44dcc50ada923650
|
|
o 172b1cbfe88c97cbd1b1c8a98a48e729a4540e85 master
|
|
o 0000000000000000000000000000000000000000
|
|
"###);
|
|
assert_eq!(
|
|
git_repo.head().unwrap().target().unwrap().to_string(),
|
|
"172b1cbfe88c97cbd1b1c8a98a48e729a4540e85".to_string()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_git_colocated_rebase_on_import() {
|
|
let test_env = TestEnvironment::default();
|
|
let workspace_root = test_env.env_root().join("repo");
|
|
let git_repo = git2::Repository::init(&workspace_root).unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["init", "--git-repo", "."]);
|
|
|
|
// Make some changes in jj and check that they're reflected in git
|
|
std::fs::write(workspace_root.join("file"), "contents").unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["close", "-m", "add a file"]);
|
|
std::fs::write(workspace_root.join("file"), "modified").unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["branch", "master"]);
|
|
test_env.jj_cmd_success(&workspace_root, &["close", "-m", "modify a file"]);
|
|
// TODO: We shouldn't need this command here to trigger an import of the
|
|
// refs/heads/master we just exported
|
|
test_env.jj_cmd_success(&workspace_root, &["st"]);
|
|
|
|
// Move `master` backwards, which should cause the working copy to be rebased
|
|
// off of the old position.
|
|
let commit2_oid = git_repo
|
|
.find_branch("master", git2::BranchType::Local)
|
|
.unwrap()
|
|
.get()
|
|
.target()
|
|
.unwrap();
|
|
let commit2 = git_repo.find_commit(commit2_oid).unwrap();
|
|
let commit1 = commit2.parents().next().unwrap();
|
|
git_repo.branch("master", &commit1, true).unwrap();
|
|
let stdout =
|
|
test_env.jj_cmd_success(&workspace_root, &["log", "-T", "commit_id \" \" branches"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 1 descendant commits off of commits rewritten from git
|
|
Working copy now at: a64f325e0516 (no description set)
|
|
Added 0 files, modified 1 files, removed 0 files
|
|
@ a64f325e05167129f3488f85a570f22a8940634f
|
|
o f0f3ab56bfa927e3a65c2ac9a513693d438e271b master
|
|
o 0000000000000000000000000000000000000000
|
|
"###);
|
|
}
|