Gaëtan Lehmanntemplates: add self.trailers().contains_key(key)2c4a0321 year agoHistory
1730 lines · 65.1 KB · RustRawDownload
// 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 indoc::indoc;use regex::Regex;use testutils::git; use crate::common::TestEnvironment; #[test]fn test_log_parents() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["new"]).success();    work_dir.run_jj(["new", "@-"]).success();    work_dir.run_jj(["new", "@", "@-"]).success();     let template =        r#"commit_id ++ "\nP: " ++ parents.len() ++ " " ++ parents.map(|c| c.commit_id()) ++ "\n""#;    let output = work_dir.run_jj(["log", "-T", template]);    insta::assert_snapshot!(output, @r"    @    c067170d4ca1bc6162b64f7550617ec809647f84    ├─╮  P: 2 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22    ○ │  4db490c88528133d579540b6900b8098f0c17701    ├─╯  P: 1 230dd059e1b059aefc0da06a2e5a7dbf22362f22    ○  230dd059e1b059aefc0da06a2e5a7dbf22362f22    │  P: 1 0000000000000000000000000000000000000000    ◆  0000000000000000000000000000000000000000       P: 0    [EOF]    ");     // List<Commit> can be filtered    let template =        r#""P: " ++ parents.filter(|c| !c.root()).map(|c| c.commit_id().short()) ++ "\n""#;    let output = work_dir.run_jj(["log", "-T", template]);    insta::assert_snapshot!(output, @r"    @    P: 4db490c88528 230dd059e1b0    ├─╮    ○ │  P: 230dd059e1b0    ├─╯    ○  P:    ◆  P:    [EOF]    ");     let template = r#"parents.map(|c| c.commit_id().shortest(4))"#;    let output = work_dir.run_jj(["log", "-T", template, "-r@", "--color=always"]);    insta::assert_snapshot!(output, @r"    @  4db4 230d    │    ~    [EOF]    ");     // Commit object isn't printable    let output = work_dir.run_jj(["log", "-T", "parents"]);    insta::assert_snapshot!(output, @r"    ------- stderr -------    Error: Failed to parse template: Expected expression of type `Template`, but actual type is `List<Commit>`    Caused by:  --> 1:1      |    1 | parents      | ^-----^      |      = Expected expression of type `Template`, but actual type is `List<Commit>`    [EOF]    [exit status: 1]    ");     // Redundant argument passed to keyword method    let template = r#"parents.map(|c| c.commit_id(""))"#;    let output = work_dir.run_jj(["log", "-T", template]);    insta::assert_snapshot!(output, @r#"    ------- stderr -------    Error: Failed to parse template: Function `commit_id`: Expected 0 arguments    Caused by:  --> 1:29      |    1 | parents.map(|c| c.commit_id(""))      |                             ^^      |      = Function `commit_id`: Expected 0 arguments    [EOF]    [exit status: 1]    "#);} #[test]fn test_log_author_timestamp() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["describe", "-m", "first"]).success();    work_dir.run_jj(["new", "-m", "second"]).success();     let output = work_dir.run_jj(["log", "-T", "author.timestamp()"]);    insta::assert_snapshot!(output, @r"    @  2001-02-03 04:05:09.000 +07:00    ○  2001-02-03 04:05:08.000 +07:00    ◆  1970-01-01 00:00:00.000 +00:00    [EOF]    ");} #[test]fn test_log_author_timestamp_ago() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["describe", "-m", "first"]).success();    work_dir.run_jj(["new", "-m", "second"]).success();     let template = r#"author.timestamp().ago() ++ "\n""#;    let output = work_dir        .run_jj(&["log", "--no-graph", "-T", template])        .success();    let line_re = Regex::new(r"[0-9]+ years ago").unwrap();    assert!(        output.stdout.raw().lines().all(|x| line_re.is_match(x)),        "expected every line to match regex"    );} #[test]fn test_log_author_timestamp_utc() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     let output = work_dir.run_jj(["log", "-T", "author.timestamp().utc()"]);    insta::assert_snapshot!(output, @r"    @  2001-02-02 21:05:07.000 +00:00    ◆  1970-01-01 00:00:00.000 +00:00    [EOF]    ");} #[cfg(unix)]#[test]fn test_log_author_timestamp_local() {    let mut test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();     test_env.add_env_var("TZ", "UTC-05:30");    let work_dir = test_env.work_dir("repo");    let output = work_dir.run_jj(["log", "-T", "author.timestamp().local()"]);    insta::assert_snapshot!(output, @r"    @  2001-02-03 08:05:07.000 +11:00    ◆  1970-01-01 11:00:00.000 +11:00    [EOF]    ");    test_env.add_env_var("TZ", "UTC+10:00");    let work_dir = test_env.work_dir("repo");    let output = work_dir.run_jj(["log", "-T", "author.timestamp().local()"]);    insta::assert_snapshot!(output, @r"    @  2001-02-03 08:05:07.000 +11:00    ◆  1970-01-01 11:00:00.000 +11:00    [EOF]    ");} #[test]fn test_log_author_timestamp_after_before() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["describe", "-m", "first"]).success();     let template = r#"    separate(" ",      author.timestamp(),      ":",      if(author.timestamp().after("1969"), "(after 1969)", "(before 1969)"),      if(author.timestamp().before("1975"), "(before 1975)", "(after 1975)"),      if(author.timestamp().before("now"), "(before now)", "(after now)")    ) ++ "\n""#;    let output = work_dir.run_jj(["log", "--no-graph", "-T", template]);    insta::assert_snapshot!(output, @r"    2001-02-03 04:05:08.000 +07:00 : (after 1969) (after 1975) (before now)    1970-01-01 00:00:00.000 +00:00 : (after 1969) (before 1975) (before now)    [EOF]    ");     // Should display error with invalid date.    let template = r#"author.timestamp().after("invalid date")"#;    let output = work_dir.run_jj(["log", "-r@", "--no-graph", "-T", template]);    insta::assert_snapshot!(output, @r#"    ------- stderr -------    Error: Failed to parse template: Invalid date pattern    Caused by:    1:  --> 1:26      |    1 | author.timestamp().after("invalid date")      |                          ^------------^      |      = Invalid date pattern    2: expected unsupported identifier as position 0..7    [EOF]    [exit status: 1]    "#);} #[test]fn test_mine_is_true_when_author_is_user() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");    work_dir        .run_jj([            "--config=user.email=johndoe@example.com",            "--config=user.name=John Doe",            "new",        ])        .success();     let output = work_dir.run_jj([        "log",        "-T",        r#"coalesce(if(mine, "mine"), author.email(), email_placeholder)"#,    ]);    insta::assert_snapshot!(output, @r"    @  johndoe@example.com    ○  mine    ◆  (no email set)    [EOF]    ");} #[test]fn test_log_default() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.write_file("file1", "foo\n");    work_dir.run_jj(["describe", "-m", "add a file"]).success();    work_dir.run_jj(["new", "-m", "description 1"]).success();    work_dir        .run_jj(["bookmark", "create", "-r@", "my-bookmark"])        .success();     // Test default log output format    let output = work_dir.run_jj(["log"]);    insta::assert_snapshot!(output, @r"    @  kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e    │  (empty) description 1    ○  qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7    │  add a file    ◆  zzzzzzzz root() 00000000    [EOF]    ");     // Color    let output = work_dir.run_jj(["log", "--color=always"]);    insta::assert_snapshot!(output, @r"    @  kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e    │  (empty) description 1    ○  qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7    │  add a file    ◆  zzzzzzzz root() 00000000    [EOF]    ");     // Color without graph    let output = work_dir.run_jj(["log", "--color=always", "--no-graph"]);    insta::assert_snapshot!(output, @r"    kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-bookmark bac9ff9e    (empty) description 1    qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7    add a file    zzzzzzzz root() 00000000    [EOF]    ");} #[test]fn test_log_default_without_working_copy() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");     work_dir.run_jj(["workspace", "forget"]).success();    let output = work_dir.run_jj(["log"]);    insta::assert_snapshot!(output, @r"    ◆  zzzzzzzz root() 00000000    [EOF]    ");} #[test]fn test_log_builtin_templates() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");    // Render without graph to test line ending    let render = |template| work_dir.run_jj(["log", "-T", template, "--no-graph"]);     work_dir        .run_jj(["--config=user.email=''", "--config=user.name=''", "new"])        .success();    work_dir        .run_jj(["bookmark", "create", "-r@", "my-bookmark"])        .success();     insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"    rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set)    qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)    zzzzzzzz root() 00000000    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"    rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397    (empty) (no description set)    qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059    (empty) (no description set)    zzzzzzzz root() 00000000    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"    rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397    (empty) (no description set)     qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059    (empty) (no description set)     zzzzzzzz root() 00000000     [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"    Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74    Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp    Bookmarks: my-bookmark    Author   : (no name set) <(no email set)> (2001-02-03 08:05:08)    Committer: (no name set) <(no email set)> (2001-02-03 08:05:08)         (no description set)     Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22    Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu    Author   : Test User <test.user@example.com> (2001-02-03 08:05:07)    Committer: Test User <test.user@example.com> (2001-02-03 08:05:07)         (no description set)     Commit ID: 0000000000000000000000000000000000000000    Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz    Author   : (no name set) <(no email set)> (1970-01-01 11:00:00)    Committer: (no name set) <(no email set)> (1970-01-01 11:00:00)         (no description set)     [EOF]    ");} #[test]fn test_log_builtin_templates_colored() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");    let render = |template| work_dir.run_jj(["--color=always", "log", "-T", template]);     work_dir        .run_jj(["--config=user.email=''", "--config=user.name=''", "new"])        .success();    work_dir        .run_jj(["bookmark", "create", "-r@", "my-bookmark"])        .success();     insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"    @  rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397 (empty) (no description set)    ○  qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)    ◆  zzzzzzzz root() 00000000    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"    @  rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397    │  (empty) (no description set)    ○  qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059    │  (empty) (no description set)    ◆  zzzzzzzz root() 00000000    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"    @  rlvkpnrz (no email set) 2001-02-03 08:05:08 my-bookmark dc315397    │  (empty) (no description set)    │    ○  qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059    │  (empty) (no description set)    │    ◆  zzzzzzzz root() 00000000     [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"    @  Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74    │  Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp    │  Bookmarks: my-bookmark    │  Author   : (no name set) <(no email set)> (2001-02-03 08:05:08)    │  Committer: (no name set) <(no email set)> (2001-02-03 08:05:08)    │    │      (no description set)    │    ○  Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22    │  Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu    │  Author   : Test User <test.user@example.com> (2001-02-03 08:05:07)    │  Committer: Test User <test.user@example.com> (2001-02-03 08:05:07)    │    │      (no description set)    │    ◆  Commit ID: 0000000000000000000000000000000000000000       Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz       Author   : (no name set) <(no email set)> (1970-01-01 11:00:00)       Committer: (no name set) <(no email set)> (1970-01-01 11:00:00)            (no description set)     [EOF]    ");} #[test]fn test_log_builtin_templates_colored_debug() {    let test_env = TestEnvironment::default();    test_env.run_jj_in(".", ["git", "init", "repo"]).success();    let work_dir = test_env.work_dir("repo");    let render = |template| work_dir.run_jj(["--color=debug", "log", "-T", template]);     work_dir        .run_jj(["--config=user.email=''", "--config=user.name=''", "new"])        .success();    work_dir        .run_jj(["bookmark", "create", "-r@", "my-bookmark"])        .success();     insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r"    <<node working_copy::@>>  <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy:: >><<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>    <<node::○>>  <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log:: >><<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>    <<node immutable::◆>>  <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r"    <<node working_copy::@>>  <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>    │  <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>    <<node::○>>  <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log::>>    │  <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>    <<node immutable::◆>>  <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r"    <<node working_copy::@>>  <<log working_copy change_id shortest prefix::r>><<log working_copy change_id shortest rest::lvkpnrz>><<log working_copy:: >><<log working_copy email placeholder::(no email set)>><<log working_copy:: >><<log working_copy committer timestamp local format::2001-02-03 08:05:08>><<log working_copy:: >><<log working_copy bookmarks name::my-bookmark>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>    │  <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>    │  <<log::>>    <<node::○>>  <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log:: >><<log committer timestamp local format::2001-02-03 08:05:07>><<log:: >><<log commit_id shortest prefix::2>><<log commit_id shortest rest::30dd059>><<log::>>    │  <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>    │  <<log::>>    <<node immutable::◆>>  <<log change_id shortest prefix::z>><<log change_id shortest rest::zzzzzzz>><<log:: >><<log root::root()>><<log:: >><<log commit_id shortest prefix::0>><<log commit_id shortest rest::0000000>><<log::>>       <<log::>>    [EOF]    ");     insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r"    <<node working_copy::@>>  <<log::Commit ID: >><<log commit_id::dc31539712c7294d1d712cec63cef4504b94ca74>><<log::>>    │  <<log::Change ID: >><<log change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>><<log::>>    │  <<log::Bookmarks: >><<log local_bookmarks name::my-bookmark>><<log::>>    │  <<log::Author   : >><<log name placeholder::(no name set)>><<log:: <>><<log email placeholder::(no email set)>><<log::> (>><<log author timestamp local format::2001-02-03 08:05:08>><<log::)>>    │  <<log::Committer: >><<log name placeholder::(no name set)>><<log:: <>><<log email placeholder::(no email set)>><<log::> (>><<log committer timestamp local format::2001-02-03 08:05:08>><<log::)>>    │  <<log::>>    │  <<log empty description placeholder::    (no description set)>><<log::>>    │  <<log::>>    <<node::○>>  <<log::Commit ID: >><<log commit_id::230dd059e1b059aefc0da06a2e5a7dbf22362f22>><<log::>>    │  <<log::Change ID: >><<log change_id::qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu>><<log::>>    │  <<log::Author   : >><<log author name::Test User>><<log:: <>><<log author email local::test.user>><<log author email::@>><<log author email domain::example.com>><<log::> (>><<log author timestamp local format::2001-02-03 08:05:07>><<log::)>>    │  <<log::Committer: >><<log committer name::Test User>><<log:: <>><<log committer email local::test.user>><<log committer email::@>><<log committer email domain::example.com>><<log::> (>><<log committer timestamp local format::2001-02-03 08:05:07>><<log::)>>    │  <<log::>>

Lines 1–500 of 1730.