mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-27 14:57:14 +00:00
fb33620f9e
The original idea was similar to Mercurial's "topo" sorting, but it was bad at handling merge-heavy history. In order to render merges of topic branches nicely, we need to prioritize branches at merge point, not at fork point. OTOH, we do also want to place unmerged branches as close to the fork point as possible. This commit implements the former requirement, and the latter will be addressed by the next commit. I think this is similar to Git's sorting logic described in the following blog post. In our case, the in-degree walk can be dumb since topological order is guaranteed by the index. We keep HashSet<CommitId> instead of an in-degree integer value, which will be used in the next commit to resolve new heads as late as possible. https://github.blog/2022-08-30-gits-database-internals-ii-commit-history-queries/#topological-sorting Compared to Sapling's beautify_graph(), this is lazy, and can roughly preserve the index (or chronological) order. I tried beautify_graph() with prioritizing the @ commit, but the result seemed too aggressively reordered. Perhaps, for more complex history, beautify_graph() would produce a better result. For my wip branches (~30 branches, a couple of commits per branch), this works pretty well. #242
423 lines
13 KiB
Rust
423 lines
13 KiB
Rust
// Copyright 2022 The Jujutsu Authors
|
|
//
|
|
// 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 std::path::Path;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_new() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "add a file"]);
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "a new commit"]);
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 4f2d6e0a3482a6a34e4856a4a63869c0df109e79 a new commit
|
|
◉ 5d5c60b2aa96b8dbf55710656c50285c66cdcd74 add a file
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// Start a new change off of a specific commit (the root commit in this case).
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "off of root", "root"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 026537ddb96b801b9cb909985d5443aab44616c1 off of root
|
|
│ ◉ 4f2d6e0a3482a6a34e4856a4a63869c0df109e79 a new commit
|
|
│ ◉ 5d5c60b2aa96b8dbf55710656c50285c66cdcd74 add a file
|
|
├─╯
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_merge() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "main"]);
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "add file1"]);
|
|
std::fs::write(repo_path.join("file1"), "a").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new", "root", "-m", "add file2"]);
|
|
std::fs::write(repo_path.join("file2"), "b").unwrap();
|
|
|
|
// Create a merge commit
|
|
test_env.jj_cmd_success(&repo_path, &["new", "main", "@"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 0c4e5b9b68ae0cbe7ce3c61042619513d09005bf
|
|
├─╮
|
|
│ ◉ 38e8e2f6c92ffb954961fc391b515ff551b41636 add file1
|
|
◉ │ f399209d9dda06e8a25a0c8e9a0cde9f421ff35d add file2
|
|
├─╯
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
|
|
insta::assert_snapshot!(stdout, @"a");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file2"]);
|
|
insta::assert_snapshot!(stdout, @"b");
|
|
|
|
// Same test with `jj merge`
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
test_env.jj_cmd_success(&repo_path, &["merge", "main", "@"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 200ed1a14c8acf09783dafefe5bebf2ff58f12fd
|
|
├─╮
|
|
│ ◉ 38e8e2f6c92ffb954961fc391b515ff551b41636 add file1
|
|
◉ │ f399209d9dda06e8a25a0c8e9a0cde9f421ff35d add file2
|
|
├─╯
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// `jj merge` with less than two arguments is an error
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["merge"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Merge requires at least two revisions
|
|
"###);
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["merge", "main"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Merge requires at least two revisions
|
|
"###);
|
|
|
|
// merge with non-unique revisions
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["new", "@", "200e"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: More than one revset resolved to revision 200ed1a14c8a
|
|
"###);
|
|
|
|
// merge with root
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["new", "@", "root"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot merge with root revision
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_after() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["new", "--insert-after", "-m", "G", "B", "D"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 2 descendant commits
|
|
Working copy now at: ca7c6481a8dd G
|
|
Parent commit : 6041917ceeb5 B
|
|
Parent commit : c9257eff5bf9 D
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
◉ C
|
|
│ ◉ F
|
|
╭─┤
|
|
│ ◉ E
|
|
@ │ G
|
|
├───╮
|
|
│ │ ◉ B
|
|
│ │ ◉ A
|
|
│ ├─╯
|
|
◉ │ D
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["new", "--insert-after", "-m", "H", "D"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 3 descendant commits
|
|
Working copy now at: fcf8281b4135 H
|
|
Parent commit : c9257eff5bf9 D
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
◉ C
|
|
│ ◉ F
|
|
╭─┤
|
|
│ ◉ E
|
|
◉ │ G
|
|
├───╮
|
|
│ │ ◉ B
|
|
│ │ ◉ A
|
|
│ ├─╯
|
|
@ │ H
|
|
◉ │ D
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_after_children() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
// Check that inserting G after A and C doesn't try to rebase B (which is
|
|
// initially a child of A) onto G as that would create a cycle since B is
|
|
// a parent of C which is a parent G.
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["new", "--insert-after", "-m", "G", "A", "C"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Working copy now at: b48d4d73a39c G
|
|
Parent commit : 65b1ef43c737 A
|
|
Parent commit : ec18c57d72d8 C
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ G
|
|
├─╮
|
|
◉ │ C
|
|
◉ │ B
|
|
├─╯
|
|
◉ A
|
|
│ ◉ F
|
|
│ ├─╮
|
|
│ │ ◉ D
|
|
├───╯
|
|
│ ◉ E
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_before() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["new", "--insert-before", "-m", "G", "C", "F"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 2 descendant commits
|
|
Working copy now at: ff6bbbc7b8df G
|
|
Parent commit : 41a89ffcbba2 E
|
|
Parent commit : c9257eff5bf9 D
|
|
Parent commit : 6041917ceeb5 B
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
◉ F
|
|
│ ◉ C
|
|
├─╯
|
|
@ G
|
|
├─┬─╮
|
|
│ │ ◉ B
|
|
│ │ ◉ A
|
|
│ ◉ │ D
|
|
│ ├─╯
|
|
◉ │ E
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_before_root_successors() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["new", "--insert-before", "-m", "G", "A", "D"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 5 descendant commits
|
|
Working copy now at: 3654197754f8 G
|
|
Parent commit : 000000000000 (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
◉ F
|
|
├─╮
|
|
│ ◉ E
|
|
◉ │ D
|
|
│ │ ◉ C
|
|
│ │ ◉ B
|
|
│ │ ◉ A
|
|
├───╯
|
|
@ │ G
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_before_no_loop() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
let template = r#"commit_id.short() ++ " " ++ if(description, description, "root")"#;
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ 7705d353bf5d F
|
|
├─╮
|
|
│ ◉ c9257eff5bf9 D
|
|
◉ │ 41a89ffcbba2 E
|
|
├─╯
|
|
│ ◉ ec18c57d72d8 C
|
|
│ ◉ 6041917ceeb5 B
|
|
│ ◉ 65b1ef43c737 A
|
|
├─╯
|
|
◉ 000000000000 root
|
|
"###);
|
|
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&repo_path, &["new", "--insert-before", "-m", "G", "A", "C"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Refusing to create a loop: commit 6041917ceeb5 would be both an ancestor and a descendant of the new commit
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_before_no_root_merge() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["new", "--insert-before", "-m", "G", "B", "D"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 4 descendant commits
|
|
Working copy now at: bf9fc49331de G
|
|
Parent commit : 65b1ef43c737 A
|
|
"###);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
◉ F
|
|
├─╮
|
|
│ ◉ E
|
|
◉ │ D
|
|
│ │ ◉ C
|
|
│ │ ◉ B
|
|
├───╯
|
|
@ │ G
|
|
◉ │ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_new_insert_before_root() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
setup_before_insertion(&test_env, &repo_path);
|
|
insta::assert_snapshot!(get_short_log_output(&test_env, &repo_path), @r###"
|
|
@ F
|
|
├─╮
|
|
│ ◉ D
|
|
◉ │ E
|
|
├─╯
|
|
│ ◉ C
|
|
│ ◉ B
|
|
│ ◉ A
|
|
├─╯
|
|
◉ root
|
|
"###);
|
|
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&repo_path, &["new", "--insert-before", "-m", "G", "root"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot insert a commit before the root commit
|
|
"###);
|
|
}
|
|
|
|
fn setup_before_insertion(test_env: &TestEnvironment, repo_path: &Path) {
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "A"]);
|
|
test_env.jj_cmd_success(repo_path, &["commit", "-m", "A"]);
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "B"]);
|
|
test_env.jj_cmd_success(repo_path, &["commit", "-m", "B"]);
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "C"]);
|
|
test_env.jj_cmd_success(repo_path, &["describe", "-m", "C"]);
|
|
test_env.jj_cmd_success(repo_path, &["new", "-m", "D", "root"]);
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "D"]);
|
|
test_env.jj_cmd_success(repo_path, &["new", "-m", "E", "root"]);
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "E"]);
|
|
test_env.jj_cmd_success(repo_path, &["new", "-m", "F", "D", "E"]);
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", "F"]);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
let template = r#"commit_id ++ " " ++ description"#;
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", template])
|
|
}
|
|
|
|
fn get_short_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
let template = r#"if(description, description, "root")"#;
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", template])
|
|
}
|