ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

MutableRepo: add test of updating away from empty merge commit

Browse source 
Merge commits are very similar to non-merge commits in jj. An empty
merge commit with no description is not really different from an empty
non-merge commit with no description. As we discussed on
https://github.com/martinvonz/jj/issues/2859, we should not treat
merge commits differently when updating away from them. This patch
adds test for the current behavior (which is to leave the merge commit
in place).
This commit is contained in:
Martin von Zweigbergk 2024-05-28 10:35:22 -07:00 committed by Martin von Zweigbergk
parent 28050e9da1
commit 5d2c0347a2
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/tests/test_mut_repo.rs
View file

@ -115,6 +115,46 @@ fn test_edit_previous_empty() {
assert!(!mut_repo.view().heads().contains(old_wc_commit.id()));
}
#[test]
fn test_edit_previous_empty_merge() {
// Test that MutableRepo::edit() abandons the previous commit if it was
// an empty merge commit.
let settings = testutils::user_settings();
let test_repo = TestRepo::init();
let repo = &test_repo.repo;
let mut tx = repo.start_transaction(&settings);
let mut_repo = tx.mut_repo();
let old_parent1 = write_random_commit(mut_repo, &settings);
let old_parent2 = write_random_commit(mut_repo, &settings);
let empty_tree = repo.store().root_commit().tree().unwrap();
let old_parent_tree = old_parent1
.tree()
.unwrap()
.merge(&empty_tree, &old_parent2.tree().unwrap())
.unwrap();
let old_wc_commit = mut_repo
.new_commit(
&settings,
vec![old_parent1.id().clone(), old_parent2.id().clone()],
repo.store().empty_merged_tree_id(),
)
.set_tree_id(old_parent_tree.id())
.write()
.unwrap();
let ws_id = WorkspaceId::default();
mut_repo.edit(ws_id.clone(), &old_wc_commit).unwrap();
let repo = tx.commit("test");
let mut tx = repo.start_transaction(&settings);
let mut_repo = tx.mut_repo();
let new_wc_commit = write_random_commit(mut_repo, &settings);
mut_repo.edit(ws_id, &new_wc_commit).unwrap();
mut_repo.rebase_descendants(&settings).unwrap();
// TODO: The old commit should no longer be visible
assert!(mut_repo.view().heads().contains(old_wc_commit.id()));
}
#[test]
fn test_edit_previous_empty_with_description() {
// Test that MutableRepo::edit() does not abandon the previous commit if it