mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-23 20:43:56 +00:00
0e2579ee6a
This follows up on 5c703aeb03.
The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy.
If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on.
I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you.
Compare after:
and before:
334 lines
11 KiB
Rust
334 lines
11 KiB
Rust
// Copyright 2023 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;
|
|
|
|
fn create_commit(test_env: &TestEnvironment, repo_path: &Path, name: &str, parents: &[&str]) {
|
|
if parents.is_empty() {
|
|
test_env.jj_cmd_success(repo_path, &["new", "root", "-m", name]);
|
|
} else {
|
|
let mut args = vec!["new", "-m", name];
|
|
args.extend(parents);
|
|
test_env.jj_cmd_success(repo_path, &args);
|
|
}
|
|
std::fs::write(repo_path.join(name), format!("{name}\n")).unwrap();
|
|
test_env.jj_cmd_success(repo_path, &["branch", "create", name]);
|
|
}
|
|
|
|
#[test]
|
|
fn test_duplicate() {
|
|
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");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &[]);
|
|
create_commit(&test_env, &repo_path, "c", &["a", "b"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 17a00fc21654 c
|
|
├─╮
|
|
◉ │ d370aee184ba b
|
|
│ ◉ 2443ea76b0b1 a
|
|
├─╯
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["duplicate", "root"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Cannot rewrite the root commit
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "a"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 2443ea76b0b1 as 2f6dc5a1ffc2 a
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 2f6dc5a1ffc2 a
|
|
│ @ 17a00fc21654 c
|
|
│ ├─╮
|
|
│ ◉ │ d370aee184ba b
|
|
├─╯ │
|
|
│ ◉ 2443ea76b0b1 a
|
|
├───╯
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["undo"]), @"");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate" /* duplicates `c` */]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 17a00fc21654 as 1dd099ea963c c
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 1dd099ea963c c
|
|
├─╮
|
|
│ │ @ 17a00fc21654 c
|
|
╭─┬─╯
|
|
◉ │ d370aee184ba b
|
|
│ ◉ 2443ea76b0b1 a
|
|
├─╯
|
|
◉ 000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_duplicate_many() {
|
|
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");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
create_commit(&test_env, &repo_path, "c", &["a"]);
|
|
create_commit(&test_env, &repo_path, "d", &["c"]);
|
|
create_commit(&test_env, &repo_path, "e", &["b", "d"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 921dde6e55c0 e
|
|
├─╮
|
|
◉ │ ebd06dba20ec d
|
|
◉ │ c0cb3a0b73e7 c
|
|
│ ◉ 1394f625cbbd b
|
|
├─╯
|
|
◉ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "b:"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 1394f625cbbd as 3b74d9691015 b
|
|
Duplicated 921dde6e55c0 as 8348ddcec733 e
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 8348ddcec733 e
|
|
├─╮
|
|
◉ │ 3b74d9691015 b
|
|
│ │ @ 921dde6e55c0 e
|
|
│ ╭─┤
|
|
│ ◉ │ ebd06dba20ec d
|
|
│ ◉ │ c0cb3a0b73e7 c
|
|
├─╯ │
|
|
│ ◉ 1394f625cbbd b
|
|
├───╯
|
|
◉ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
// Try specifying the same commit twice directly
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "b", "b"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 1394f625cbbd as 0276d3d7c24d b
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 0276d3d7c24d b
|
|
│ @ 921dde6e55c0 e
|
|
│ ├─╮
|
|
│ ◉ │ ebd06dba20ec d
|
|
│ ◉ │ c0cb3a0b73e7 c
|
|
├─╯ │
|
|
│ ◉ 1394f625cbbd b
|
|
├───╯
|
|
◉ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
// Try specifying the same commit twice indirectly
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "b:", "d:"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 1394f625cbbd as fa167d18a83a b
|
|
Duplicated ebd06dba20ec as 2181781b4f81 d
|
|
Duplicated 921dde6e55c0 as 0f7430f2727a e
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 0f7430f2727a e
|
|
├─╮
|
|
◉ │ 2181781b4f81 d
|
|
│ ◉ fa167d18a83a b
|
|
│ │ @ 921dde6e55c0 e
|
|
│ │ ├─╮
|
|
│ │ ◉ │ ebd06dba20ec d
|
|
├───╯ │
|
|
◉ │ │ c0cb3a0b73e7 c
|
|
├─╯ │
|
|
│ ◉ 1394f625cbbd b
|
|
├─────╯
|
|
◉ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
// Reminder of the setup
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 921dde6e55c0 e
|
|
├─╮
|
|
◉ │ ebd06dba20ec d
|
|
◉ │ c0cb3a0b73e7 c
|
|
│ ◉ 1394f625cbbd b
|
|
├─╯
|
|
◉ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "d:", "a"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 2443ea76b0b1 as c6f7f8c4512e a
|
|
Duplicated ebd06dba20ec as d94e4c55a68b d
|
|
Duplicated 921dde6e55c0 as 9bd4389f5d47 e
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ 9bd4389f5d47 e
|
|
├─╮
|
|
◉ │ d94e4c55a68b d
|
|
│ │ ◉ c6f7f8c4512e a
|
|
│ │ │ @ 921dde6e55c0 e
|
|
│ ╭───┤
|
|
│ │ │ ◉ ebd06dba20ec d
|
|
├─────╯
|
|
◉ │ │ c0cb3a0b73e7 c
|
|
│ ◉ │ 1394f625cbbd b
|
|
├─╯ │
|
|
◉ │ 2443ea76b0b1 a
|
|
├───╯
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
// Check for BUG -- makes too many 'a'-s, etc.
|
|
test_env.jj_cmd_success(&repo_path, &["undo"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "a:"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 2443ea76b0b1 as 0fe67a05989e a
|
|
Duplicated 1394f625cbbd as e13ac0adabdf b
|
|
Duplicated c0cb3a0b73e7 as df53fa589286 c
|
|
Duplicated ebd06dba20ec as 2f2442db08eb d
|
|
Duplicated 921dde6e55c0 as ee8fe64ed254 e
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ ee8fe64ed254 e
|
|
├─╮
|
|
◉ │ 2f2442db08eb d
|
|
◉ │ df53fa589286 c
|
|
│ ◉ e13ac0adabdf b
|
|
├─╯
|
|
◉ 0fe67a05989e a
|
|
│ @ 921dde6e55c0 e
|
|
│ ├─╮
|
|
│ ◉ │ ebd06dba20ec d
|
|
│ ◉ │ c0cb3a0b73e7 c
|
|
│ │ ◉ 1394f625cbbd b
|
|
│ ├─╯
|
|
│ ◉ 2443ea76b0b1 a
|
|
├─╯
|
|
◉ 000000000000
|
|
"###);
|
|
}
|
|
|
|
// https://github.com/martinvonz/jj/issues/1050
|
|
#[test]
|
|
fn test_undo_after_duplicate() {
|
|
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");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "a"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 2443ea76b0b1 as f5cefcbb65a4 a
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
◉ f5cefcbb65a4 a
|
|
│ @ 2443ea76b0b1 a
|
|
├─╯
|
|
◉ 000000000000
|
|
"###);
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["undo"]), @"");
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 2443ea76b0b1 a
|
|
◉ 000000000000
|
|
"###);
|
|
}
|
|
|
|
// https://github.com/martinvonz/jj/issues/694
|
|
#[test]
|
|
fn test_rebase_duplicates() {
|
|
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");
|
|
|
|
create_commit(&test_env, &repo_path, "a", &[]);
|
|
create_commit(&test_env, &repo_path, "b", &["a"]);
|
|
// Test the setup
|
|
insta::assert_snapshot!(get_log_output_with_ts(&test_env, &repo_path), @r###"
|
|
@ 1394f625cbbd b @ 2001-02-03 04:05:11.000 +07:00
|
|
◉ 2443ea76b0b1 a @ 2001-02-03 04:05:09.000 +07:00
|
|
◉ 000000000000 @ 1970-01-01 00:00:00.000 +00:00
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "b"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 1394f625cbbd as fdaaf3950f07 b
|
|
"###);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["duplicate", "b"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Duplicated 1394f625cbbd as 870cf438ccbb b
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output_with_ts(&test_env, &repo_path), @r###"
|
|
◉ 870cf438ccbb b @ 2001-02-03 04:05:14.000 +07:00
|
|
│ ◉ fdaaf3950f07 b @ 2001-02-03 04:05:13.000 +07:00
|
|
├─╯
|
|
│ @ 1394f625cbbd b @ 2001-02-03 04:05:11.000 +07:00
|
|
├─╯
|
|
◉ 2443ea76b0b1 a @ 2001-02-03 04:05:09.000 +07:00
|
|
◉ 000000000000 @ 1970-01-01 00:00:00.000 +00:00
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["rebase", "-s", "a", "-d", "a-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
Rebased 4 commits
|
|
Working copy now at: 29bd36b60e60 b
|
|
"###);
|
|
// Some of the duplicate commits' timestamps were changed a little to make them
|
|
// have distinct commit ids.
|
|
insta::assert_snapshot!(get_log_output_with_ts(&test_env, &repo_path), @r###"
|
|
◉ b43fe7354758 b @ 2001-02-03 04:05:14.000 +07:00
|
|
│ ◉ 08beb14c3ead b @ 2001-02-03 04:05:15.000 +07:00
|
|
├─╯
|
|
│ @ 29bd36b60e60 b @ 2001-02-03 04:05:16.000 +07:00
|
|
├─╯
|
|
◉ 2f6dc5a1ffc2 a @ 2001-02-03 04:05:16.000 +07:00
|
|
◉ 000000000000 @ 1970-01-01 00:00:00.000 +00:00
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
let template = r#"commit_id.short() ++ " " ++ description.first_line()"#;
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", template])
|
|
}
|
|
|
|
fn get_log_output_with_ts(test_env: &TestEnvironment, repo_path: &Path) -> String {
|
|
let template = r###"
|
|
commit_id.short() ++ " " ++ description.first_line() ++ " @ " ++ committer.timestamp()
|
|
"###;
|
|
test_env.jj_cmd_success(repo_path, &["log", "-T", template])
|
|
}
|