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

test_rebase_abandoning_empty: add children of an empty @ to the test case

Browse source 
This demonstrates the minor bug discussed in
https://github.com/martinvonz/jj/pull/2766#discussion_r1442365389
AKA https://github.com/martinvonz/jj/issues/2869.

It's also interesting whether changing the definition of "discardable" commit
would affect this test, see
https://github.com/martinvonz/jj/issues/2859#issuecomment-1903275884

(I think it won't, but still)
This commit is contained in:
Ilya Grigoriev 2024-01-22 15:09:06 -08:00
parent 2839922e57
commit d168fd2b09
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/tests/test_rewrite.rs
View file

@ -1622,16 +1622,24 @@ fn test_rebase_abandoning_empty() {
// Rebase B onto B2, where B2 and B have the same tree, abandoning all empty // Rebase B onto B2, where B2 and B have the same tree, abandoning all empty
// commits. // commits.
// //
// We expect B and D to be skipped because they're empty, but not E because it's // We expect B, D, and G to be skipped because they're empty, but not E because
// the working commit. // it's the working commit. F also remains as it's not empty.
// //
// D (empty) E (WC, empty) E' (WC, empty) // F G (empty) F'
// |/ | // |/ |
// C--------- C' // E (WC, empty) D (empty) E' (WC, empty)
// | / |
// C------------- C'
// | => | // | => |
// B B2 B2 // B B2 B2
// |/ | // |/ |
// A A // A A
//
// TODO(#2869): There is a minor bug here. We'd like the result to be
// equivalent to rebasing and then `jj abandon`-ing all the empty commits.
// In case of the working copy, this would mean that F' would be a direct
// child of C', and the working copy would be a new commit that's also a
// direct child of C'.
let mut tx = repo.start_transaction(&settings); let mut tx = repo.start_transaction(&settings);
let commit_a = write_random_commit(tx.mut_repo(), &settings); let commit_a = write_random_commit(tx.mut_repo(), &settings);
@ -1658,6 +1666,15 @@ fn test_rebase_abandoning_empty() {
.set_tree_id(commit_b.tree_id().clone()) .set_tree_id(commit_b.tree_id().clone())
.write() .write()
.unwrap(); .unwrap();
let commit_f = create_random_commit(tx.mut_repo(), &settings)
.set_parents(vec![commit_e.id().clone()])
.write()
.unwrap();
let commit_g = create_random_commit(tx.mut_repo(), &settings)
.set_parents(vec![commit_e.id().clone()])
.set_tree_id(commit_e.tree_id().clone())
.write()
.unwrap();
let workspace = WorkspaceId::new("ws".to_string()); let workspace = WorkspaceId::new("ws".to_string());
tx.mut_repo() tx.mut_repo()
@ -1679,16 +1696,19 @@ fn test_rebase_abandoning_empty() {
.mut_repo() .mut_repo()
.rebase_descendants_with_options_return_map(&settings, rebase_options) .rebase_descendants_with_options_return_map(&settings, rebase_options)
.unwrap(); .unwrap();
assert_eq!(rebase_map.len(), 3); assert_eq!(rebase_map.len(), 5);
let new_commit_c = let new_commit_c =
assert_rebased_onto(tx.mut_repo(), &rebase_map, &commit_c, &[&commit_b2.id()]); assert_rebased_onto(tx.mut_repo(), &rebase_map, &commit_c, &[&commit_b2.id()]);
assert_abandoned_with_parent(tx.mut_repo(), &rebase_map, &commit_d, new_commit_c.id()); assert_abandoned_with_parent(tx.mut_repo(), &rebase_map, &commit_d, new_commit_c.id());
let new_commit_e = let new_commit_e =
assert_rebased_onto(tx.mut_repo(), &rebase_map, &commit_e, &[&new_commit_c.id()]); assert_rebased_onto(tx.mut_repo(), &rebase_map, &commit_e, &[&new_commit_c.id()]);
let new_commit_f =
assert_rebased_onto(tx.mut_repo(), &rebase_map, &commit_f, &[&new_commit_e.id()]);
assert_abandoned_with_parent(tx.mut_repo(), &rebase_map, &commit_g, new_commit_e.id());
assert_eq!( assert_eq!(
*tx.mut_repo().view().heads(), *tx.mut_repo().view().heads(),
hashset! {new_commit_e.id().clone()} hashset! {new_commit_f.id().clone()}
); );
assert_eq!( assert_eq!(