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

next/prev: Fetch descendants with more correctness.

Browse source 
See context in [this discussion](https://github.com/martinvonz/jj/pull/3935#discussion_r1649520967)

Fixes #3947
This commit is contained in:
Essien Ita Essien 2024-08-16 01:10:44 +01:00 committed by Essien Ita Essien
parent 6d0a092410
commit e25ec536ed
2 changed files with 91 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cli/src/movement_util.rs
View file

@ -121,27 +121,27 @@ impl Direction {
start_revset: &Rc<RevsetExpression>,
args: &MovementArgsInternal,
) -> Result<Rc<RevsetExpression>, CommandError> {
let target_revset = match (self, args.conflict) {
(Direction::Next, true) => start_revset
let nth = match (self, args.should_edit) {
(Direction::Next, true) => start_revset.descendants_at(args.offset),
(Direction::Next, false) => start_revset
.children()
.minus(working_revset)
.descendants_at(args.offset - 1),
(Direction::Prev, _) => start_revset.ancestors_at(args.offset),
};
let target_revset = match (self, args.conflict) {
(_, false) => nth,
(Direction::Next, true) => nth
.descendants()
.filtered(RevsetFilterPredicate::HasConflict)
.roots()
.minus(working_revset),
(Direction::Next, false) => start_revset
.descendants_at(args.offset)
.minus(working_revset),
(Direction::Prev, true) =>
.roots(),
// If people desire to move to the root conflict, replace the `heads()` below
// with `roots(). But let's wait for feedback.
{
start_revset
.parents()
.ancestors()
.filtered(RevsetFilterPredicate::HasConflict)
.heads()
}
(Direction::Prev, false) => start_revset.ancestors_at(args.offset),
(Direction::Prev, true) => nth
.ancestors()
.filtered(RevsetFilterPredicate::HasConflict)
.heads(),
};
Ok(target_revset)

75
cli/tests/test_next_prev_commands.rs
View file

@ -1112,6 +1112,81 @@ fn test_movement_edit_mode_false() {
"###);
}
#[test]
fn test_next_offset_when_wc_has_descendants() {
let test_env = TestEnvironment::default();
test_env.add_config(r#"ui.movement.edit = false"#);
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "base"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "right-wc"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "right-1"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "right-2"]);
test_env.jj_cmd_ok(&repo_path, &["new", "description(base)"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "left-wc"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "left-1"]);
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "left-2"]);
test_env.jj_cmd_ok(&repo_path, &["edit", "description(right-wc)"]);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
○ vruxwmqvtpmx left-2
○ yqosqzytrlsw left-1
○ royxmykxtrkr left-wc
│ ○ zsuskulnrvyr right-2
│ ○ kkmpptxzrspx right-1
│ @ rlvkpnrzqnoo right-wc
├─╯
○ qpvuntsmwlqt base
◆ zzzzzzzzzzzz
"###);
test_env.jj_cmd_ok(&repo_path, &["next", "2"]);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ kmkuslswpqwq
│ ○ vruxwmqvtpmx left-2
├─╯
○ yqosqzytrlsw left-1
○ royxmykxtrkr left-wc
│ ○ zsuskulnrvyr right-2
│ ○ kkmpptxzrspx right-1
│ ○ rlvkpnrzqnoo right-wc
├─╯
○ qpvuntsmwlqt base
◆ zzzzzzzzzzzz
"###);
test_env.jj_cmd_ok(&repo_path, &["edit", "description(left-wc)"]);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
○ vruxwmqvtpmx left-2
○ yqosqzytrlsw left-1
@ royxmykxtrkr left-wc
│ ○ zsuskulnrvyr right-2
│ ○ kkmpptxzrspx right-1
│ ○ rlvkpnrzqnoo right-wc
├─╯
○ qpvuntsmwlqt base
◆ zzzzzzzzzzzz
"###);
test_env.jj_cmd_ok(&repo_path, &["next"]);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ nkmrtpmomlro
│ ○ zsuskulnrvyr right-2
│ ○ kkmpptxzrspx right-1
├─╯
○ rlvkpnrzqnoo right-wc
│ ○ vruxwmqvtpmx left-2
│ ○ yqosqzytrlsw left-1
│ ○ royxmykxtrkr left-wc
├─╯
○ qpvuntsmwlqt base
◆ zzzzzzzzzzzz
"###);
}
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
let template = r#"separate(" ", change_id.short(), local_bookmarks, if(conflict, "conflict"), description)"#;
test_env.jj_cmd_success(cwd, &["log", "-T", template])