ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/cli/tests/test_commit_template.rs

1073 lines
45 KiB
Rust
Raw Normal View History

tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
// 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 regex::Regex;
compile integration tests as a single binary this greatly speeds up the time to run all tests, at the cost of slightly larger recompile times for individual tests. this unfortunately adds the requirement that all tests are listed in `runner.rs` for the crate. to avoid forgetting, i've added a new test that ensures the directory is in sync with the file. ## benchmarks before this change, recompiling all tests took 32-50 seconds and running a single test took 3.5 seconds: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test test_working_copy' Time (mean ± σ): 3.543 s ± 0.168 s [User: 2.597 s, System: 1.262 s] Range (min … max): 3.400 s … 3.847 s 10 runs ``` after this change, recompiling all tests take 4 seconds: ``` ; hyperfine 'touch lib/src/lib.rs ; cargo t --test runner --no-run' Time (mean ± σ): 4.055 s ± 0.123 s [User: 3.591 s, System: 1.593 s] Range (min … max): 3.804 s … 4.159 s 10 runs ``` and running a single test takes about the same: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test runner -- test_working_copy' Time (mean ± σ): 4.129 s ± 0.120 s [User: 3.636 s, System: 1.593 s] Range (min … max): 3.933 s … 4.346 s 10 runs ``` about 1.4 seconds of that is the time for the runner, of which .4 is the time for the linker. so there may be room for further improving the times.
2024-02-02 07:55:24 +00:00
use crate::common::TestEnvironment;
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
#[test]
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
fn test_log_parents() {
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
let repo_path = test_env.env_root().join("repo");
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["new"]);
test_env.jj_cmd_ok(&repo_path, &["new", "@-"]);
test_env.jj_cmd_ok(&repo_path, &["new", "@", "@-"]);
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
templater: add string.len() and list.len() methods
2024-02-29 04:17:04 +00:00
let template =
r#"commit_id ++ "\nP: " ++ parents.len() ++ " " ++ parents.map(|c| c.commit_id()) ++ "\n""#;
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
insta::assert_snapshot!(stdout, @r###"
@ c067170d4ca1bc6162b64f7550617ec809647f84
templater: add string.len() and list.len() methods
2024-02-29 04:17:04 +00:00
├─╮ P: 2 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ │ 4db490c88528133d579540b6900b8098f0c17701
templater: add string.len() and list.len() methods
2024-02-29 04:17:04 +00:00
├─╯ P: 1 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
templater: add string.len() and list.len() methods
2024-02-29 04:17:04 +00:00
│ P: 1 0000000000000000000000000000000000000000
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ 0000000000000000000000000000000000000000
templater: add string.len() and list.len() methods
2024-02-29 04:17:04 +00:00
P: 0
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
"###);
templater: add list.map(|x| ...) operation This involves a little hack to insert a lambda parameter 'x' to be used at keyword position. If the template language were dynamically typed (and were interpreted), .map() implementation would be simpler. I considered that, but interpreter version has its own warts (late error reporting, uneasy to cache static object, etc.), and I don't think the current template engine is complex enough to rewrite from scratch. .map() returns template, which can't be join()-ed. This will be fixed later.
2023-03-07 10:55:28 +00:00
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
let template = r#"parents.map(|c| c.commit_id().shortest(4))"#;
templater: add list.map(|x| ...) operation This involves a little hack to insert a lambda parameter 'x' to be used at keyword position. If the template language were dynamically typed (and were interpreted), .map() implementation would be simpler. I considered that, but interpreter version has its own warts (late error reporting, uneasy to cache static object, etc.), and I don't think the current template engine is complex enough to rewrite from scratch. .map() returns template, which can't be join()-ed. This will be fixed later.
2023-03-07 10:55:28 +00:00
let stdout = test_env.jj_cmd_success(
&repo_path,
&["log", "-T", template, "-r@", "--color=always"],
);
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ 4db4 230d
templater: add list.map(|x| ...) operation This involves a little hack to insert a lambda parameter 'x' to be used at keyword position. If the template language were dynamically typed (and were interpreted), .map() implementation would be simpler. I considered that, but interpreter version has its own warts (late error reporting, uneasy to cache static object, etc.), and I don't think the current template engine is complex enough to rewrite from scratch. .map() returns template, which can't be join()-ed. This will be fixed later.
2023-03-07 10:55:28 +00:00
│
~
"###);
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
// Commit object isn't printable
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", "parents"]);
insta::assert_snapshot!(stderr, @r###"
templater: include actual type name in error messages
2024-04-24 11:02:50 +00:00
Error: Failed to parse template: Expected expression of type "Template", but actual type is "List<Commit>"
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
Caused by: --> 1:1
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
|
1 | parents
| ^-----^
|
templater: include actual type name in error messages
2024-04-24 11:02:50 +00:00
= Expected expression of type "Template", but actual type is "List<Commit>"
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
"###);
// Redundant argument passed to keyword method
let template = r#"parents.map(|c| c.commit_id(""))"#;
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", template]);
insta::assert_snapshot!(stderr, @r###"
revset, templater: include short parse error description in summary line This makes the summary line more informative. Even though it just duplicates the message printed later, I think it's easier to follow. This patch also adjusts some RevsetParseError messages because it seemed redundant to repeat "revset function", "argument", etc.
2024-03-26 11:28:50 +00:00
Error: Failed to parse template: Function "commit_id": Expected 0 arguments
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
Caused by: --> 1:29
templater: add "parents" keyword in place of "parent_commit_ids" All commit keywords are mapped to nullary methods. No matter if we'll introduce .field syntax and/or self. keyword, this implementation can be reused.
2023-03-19 12:13:47 +00:00
|
1 | parents.map(|c| c.commit_id(""))
| ^^
|
= Function "commit_id": Expected 0 arguments
"###);
templater: add "parent_commit_ids" keyword A list type isn't so useful without a map operation, but List<CommitId> is at least printable. Maybe we can experiment with it to craft a map operation. If a map operation is introduced, this keyword might be replaced with "parents.map(|commit| commit.commit_id)", where parents is of List<Commit> type, and the .map() method will probably return List<Template>.
2023-03-06 12:02:57 +00:00
}
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
#[test]
fn test_log_author_timestamp() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
let repo_path = test_env.env_root().join("repo");
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]);
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp()"]);
insta::assert_snapshot!(stdout, @r###"
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
@ 2001-02-03 04:05:09.000 +07:00
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ 2001-02-03 04:05:08.000 +07:00
◆ 1970-01-01 00:00:00.000 +00:00
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
"###);
}
#[test]
fn test_log_author_timestamp_ago() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
let repo_path = test_env.env_root().join("repo");
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-m", "second"]);
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
templater: require infix ++ operator to concatenate expressions This eliminates ambiguous parsing between "func()" and "expr ()". I chose "++" as template concatenation operator in case we want to add bit-wise negate operator. It's also easier to find/replace than "~".
2023-02-28 11:30:57 +00:00
let template = r#"author.timestamp().ago() ++ "\n""#;
tests: extract log template function/variable for code readability Also rewrites some lengthy templates. That's why the test output slightly changed.
2023-02-28 10:43:14 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]);
tests: make `timestamp().ago()` test independent of graph style
2023-02-09 10:53:59 +00:00
let line_re = Regex::new(r"[0-9]+ years ago").unwrap();
tests: create new file for tests of commit template An important part of the `jj log` output is the commit template. I suspect we'll have many more tests for that, so let's move it to a separate file. The main `test_log_command.rs` can focus on which commits to display.
2023-01-08 17:22:08 +00:00
assert!(
stdout.lines().all(|x| line_re.is_match(x)),
"expected every line to match regex"
);
}
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
Add UTC format for timestamp formats. Thanks to @rauljordan for these changes. Add tests for new UTC timestamp format Add documentation for timestamp utc Update CHANGELOG.md
2023-08-11 20:31:47 +00:00
#[test]
fn test_log_author_timestamp_utc() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
Add UTC format for timestamp formats. Thanks to @rauljordan for these changes. Add tests for new UTC timestamp format Add documentation for timestamp utc Update CHANGELOG.md
2023-08-11 20:31:47 +00:00
let repo_path = test_env.env_root().join("repo");
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().utc()"]);
insta::assert_snapshot!(stdout, @r###"
@ 2001-02-02 21:05:07.000 +00:00
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ 1970-01-01 00:00:00.000 +00:00
Add UTC format for timestamp formats. Thanks to @rauljordan for these changes. Add tests for new UTC timestamp format Add documentation for timestamp utc Update CHANGELOG.md
2023-08-11 20:31:47 +00:00
"###);
}
templater: add a local() method on Timestamps (#2900)
2024-02-12 07:09:33 +00:00
#[cfg(unix)]
#[test]
fn test_log_author_timestamp_local() {
let mut test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
templater: add a local() method on Timestamps (#2900)
2024-02-12 07:09:33 +00:00
let repo_path = test_env.env_root().join("repo");
test_env.add_env_var("TZ", "UTC-05:30");
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]);
insta::assert_snapshot!(stdout, @r###"
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
@ 2001-02-03 08:05:07.000 +11:00
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ 1970-01-01 11:00:00.000 +11:00
templater: add a local() method on Timestamps (#2900)
2024-02-12 07:09:33 +00:00
"###);
test_env.add_env_var("TZ", "UTC+10:00");
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp().local()"]);
insta::assert_snapshot!(stdout, @r###"
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
@ 2001-02-03 08:05:07.000 +11:00
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ 1970-01-01 11:00:00.000 +11:00
templater: add a local() method on Timestamps (#2900)
2024-02-12 07:09:33 +00:00
"###);
}
template: add method mine() to commit type
2024-04-04 15:43:59 +00:00
#[test]
fn test_mine_is_true_when_author_is_user() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
template: add method mine() to commit type
2024-04-04 15:43:59 +00:00
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_ok(
&repo_path,
&[
"--config-toml=user.email='johndoe@example.com'",
"--config-toml=user.name='John Doe'",
"new",
],
);
let stdout = test_env.jj_cmd_success(
&repo_path,
&[
"log",
"-T",
r#"coalesce(if(mine, "mine"), author.email(), email_placeholder)"#,
],
);
insta::assert_snapshot!(stdout, @r###"
@ johndoe@example.com
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ mine
◆ (no email set)
template: add method mine() to commit type
2024-04-04 15:43:59 +00:00
"###);
}
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
#[test]
Move a test from `test_log_command` to `test_commit_template`
2023-01-10 06:16:47 +00:00
fn test_log_default() {
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
let repo_path = test_env.env_root().join("repo");
Move a test from `test_log_command` to `test_commit_template`
2023-01-10 06:16:47 +00:00
std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "add a file"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-m", "description 1"]);
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "my-branch"]);
Move a test from `test_log_command` to `test_commit_template`
2023-01-10 06:16:47 +00:00
// Test default log output format
test_commit_template: break up long lines
2023-01-22 06:50:58 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-branch bac9ff9e
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ (empty) description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ add a file
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
Move a test from `test_log_command` to `test_commit_template`
2023-01-10 06:16:47 +00:00
"###);
// Color
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-branch bac9ff9e
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ (empty) description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ add a file
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
"###);
cli: fix highlighting of checkout commit in "log --no-graph"
2023-01-11 00:42:03 +00:00
// Color without graph
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always", "--no-graph"]);
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
kkmpptxz test.user@example.com 2001-02-03 08:05:09 my-branch bac9ff9e
cli: do not include separator in labeled log template fields
2023-02-03 06:11:25 +00:00
(empty) description 1
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
qpvuntsm test.user@example.com 2001-02-03 08:05:08 aa2015d7
cli: fix highlighting of checkout commit in "log --no-graph"
2023-01-11 00:42:03 +00:00
add a file
revset: convert root symbol to function The idea is that we can fully eliminate special symbols that would otherwise shadow user branches, tags, or change ID prefixes. Closes #2095
2023-09-03 03:47:23 +00:00
zzzzzzzz root() 00000000
cli: fix highlighting of checkout commit in "log --no-graph"
2023-01-11 00:42:03 +00:00
"###);
log: add test of colored output I'm about to make some changes to the templater, so let's have a test least a simple test of the current colored output.
2023-01-07 23:09:07 +00:00
}
Test commit template with divergence
2023-01-10 06:26:19 +00:00
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
#[test]
fn test_log_builtin_templates() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
let repo_path = test_env.env_root().join("repo");
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
// Render without graph and append "[EOF]" marker to test line ending
let render = |template| {
test_env.jj_cmd_success(&repo_path, &["log", "-T", template, "--no-graph"]) + "[EOF]\n"
};
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
tests: add more tests for empty signature As I'm going to change the Signature type to not fill out a placeholder message, we need to test the builtin templates as well.
2023-08-26 05:59:50 +00:00
test_env.jj_cmd_ok(
&repo_path,
&[
"--config-toml=user.email=''",
"--config-toml=user.name=''",
"new",
],
);
cli: include branches and tags in default "show" template The formatting is closer to hg than git just because it's easier to conditionalize the whole line per keyword. Our template language doesn't have infix logical operators. Unlike the other default templates, all remote branches are displayed because it's "detailed" output. Closes #2509
2024-01-11 02:04:15 +00:00
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "my-branch"]);
tests: add more tests for empty signature As I'm going to change the Signature type to not fill out a placeholder message, we need to test the builtin templates as well.
2023-08-26 05:59:50 +00:00
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###"
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397 (empty) (no description set)
qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
zzzzzzzz root() 00000000
[EOF]
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###"
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(empty) (no description set)
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(empty) (no description set)
zzzzzzzz root() 00000000
[EOF]
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###"
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(empty) (no description set)
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(empty) (no description set)
zzzzzzzz root() 00000000
[EOF]
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
"###);
templates: rename "show" template alias to "builtin_log_detailed" "jj show" is basically a "log" command with different defaults. We'll need to consider this kind of stuff if we want to introduce namespace to templates.
2023-04-22 03:28:02 +00:00
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###"
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
Branches: my-branch
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
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)
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(no description set)
Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
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)
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(no description set)
Commit ID: 0000000000000000000000000000000000000000
Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
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)
templates: rename "show" template alias to "builtin_log_detailed" "jj show" is basically a "log" command with different defaults. We'll need to consider this kind of stuff if we want to introduce namespace to templates.
2023-04-22 03:28:02 +00:00
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
(no description set)
templates: rename "show" template alias to "builtin_log_detailed" "jj show" is basically a "log" command with different defaults. We'll need to consider this kind of stuff if we want to introduce namespace to templates.
2023-04-22 03:28:02 +00:00
templates: add missing "\n" to builtin "root" output
2024-03-13 13:36:03 +00:00
[EOF]
templates: rename "show" template alias to "builtin_log_detailed" "jj show" is basically a "log" command with different defaults. We'll need to consider this kind of stuff if we want to introduce namespace to templates.
2023-04-22 03:28:02 +00:00
"###);
templates: extract default template to an alias This way you can do `jj log -T 'default_log_template + "\n"'` to add a blank line between commits.
2023-04-13 17:30:48 +00:00
}
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
#[test]
fn test_log_builtin_templates_colored() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
let repo_path = test_env.env_root().join("repo");
let render =
|template| test_env.jj_cmd_success(&repo_path, &["--color=always", "log", "-T", template]);
test_env.jj_cmd_ok(
&repo_path,
&[
"--config-toml=user.email=''",
"--config-toml=user.name=''",
"new",
],
);
cli: include branches and tags in default "show" template The formatting is closer to hg than git just because it's easier to conditionalize the whole line per keyword. Our template language doesn't have infix logical operators. Unlike the other default templates, all remote branches are displayed because it's "detailed" output. Closes #2509
2024-01-11 02:04:15 +00:00
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "my-branch"]);
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397 (empty) (no description set)
○ qpvuntsm test.user 2001-02-03 08:05:07 230dd059 (empty) (no description set)
◆ zzzzzzzz root() 00000000
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ rlvkpnrz (no email set) 2001-02-03 08:05:08 my-branch dc315397
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
│
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
│
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ Change ID: rlvkpnrzqnoowoytxnquwvuryrwnrmlp
cli: include branches and tags in default "show" template The formatting is closer to hg than git just because it's easier to conditionalize the whole line per keyword. Our template language doesn't have infix logical operators. Unlike the other default templates, all remote branches are displayed because it's "detailed" output. Closes #2509
2024-01-11 02:04:15 +00:00
│ Branches: my-branch
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
│ 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)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│
│  (no description set)
│
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
│ 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)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│
│  (no description set)
│
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ Commit ID: 0000000000000000000000000000000000000000
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
cli: show timestamp in local timezone and without millis and offset As discussed in #2900, the milliseconds are rarely useful, and it can be confusing with different timezones because it makes harder to compare timestamps. I added an environment variable to control the timestamp in a cross-platform way. I didn't document because it exists only for tests (like `JJ_RANDOMNESS_SEED`). Closes #2900
2024-02-12 07:26:19 +00:00
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)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
 (no description set)
"###);
}
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
#[test]
fn test_log_builtin_templates_colored_debug() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
let repo_path = test_env.env_root().join("repo");
let render =
|template| test_env.jj_cmd_success(&repo_path, &["--color=debug", "log", "-T", template]);
test_env.jj_cmd_ok(
&repo_path,
&[
"--config-toml=user.email=''",
"--config-toml=user.name=''",
"new",
],
);
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "my-branch"]);
insta::assert_snapshot!(render(r#"builtin_log_oneline"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<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 branches name::my-branch>><<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 username::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::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_compact"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<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 branches name::my-branch>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email::test.user@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::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<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::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
"###);
insta::assert_snapshot!(render(r#"builtin_log_comfortable"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<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 branches name::my-branch>><<log working_copy:: >><<log working_copy commit_id shortest prefix::d>><<log working_copy commit_id shortest rest::c315397>><<log working_copy::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log working_copy empty::(empty)>><<log working_copy:: >><<log working_copy empty description placeholder::(no description set)>><<log working_copy::>>
│ <<log::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<node::○>> <<log change_id shortest prefix::q>><<log change_id shortest rest::pvuntsm>><<log:: >><<log author email::test.user@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::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log empty::(empty)>><<log:: >><<log empty description placeholder::(no description set)>><<log::>>
│ <<log::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<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::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
<<log::>>
"###);
insta::assert_snapshot!(render(r#"builtin_log_detailed"#), @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<node working_copy::@>> <<log::Commit ID: >><<log commit_id::dc31539712c7294d1d712cec63cef4504b94ca74>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::Change ID: >><<log change_id::rlvkpnrzqnoowoytxnquwvuryrwnrmlp>><<log::>>
│ <<log::Branches: >><<log local_branches name::my-branch>><<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
│ <<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::)>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
│ <<log empty description placeholder:: (no description set)>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<node::○>> <<log::Commit ID: >><<log commit_id::230dd059e1b059aefc0da06a2e5a7dbf22362f22>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::Change ID: >><<log change_id::qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu>><<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
│ <<log::Author: >><<log author name::Test User>><<log:: <>><<log author email::test.user@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::test.user@example.com>><<log::> (>><<log committer timestamp local format::2001-02-03 08:05:07>><<log::)>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
│ <<log empty description placeholder:: (no description set)>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
│ <<log::>>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
<<node immutable::◆>> <<log::Commit ID: >><<log commit_id::0000000000000000000000000000000000000000>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
<<log::Change ID: >><<log change_id::zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz>><<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
<<log::Author: >><<log name placeholder::(no name set)>><<log:: <>><<log email placeholder::(no email set)>><<log::> (>><<log author timestamp local format::1970-01-01 11:00:00>><<log::)>>
<<log::Committer: >><<log name placeholder::(no name set)>><<log:: <>><<log email placeholder::(no email set)>><<log::> (>><<log committer timestamp local format::1970-01-01 11:00:00>><<log::)>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
<<log::>>
--color=debug: combine segments with same labels This not only makes the output easier to read, but also protects against implementation detail changes in `write!` when used with a format string (especially, how many times and with what strings it calls the underlying writer).
2024-07-10 21:38:22 +00:00
<<log empty description placeholder:: (no description set)>><<log::>>
cli: add `ui.color = "debug"` When using `ui.color = "debug"`, changes in the output style additionally include delimiters << and >>, as well as all active labels at this point separated by ::. The output is otherwise unformatted and the delimiters and labels inherit the style of the content they apply to.
2024-05-06 16:23:36 +00:00
<<log::>>
"###);
}
Test commit template with divergence
2023-01-10 06:26:19 +00:00
#[test]
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
fn test_log_obslog_divergence() {
Test commit template with divergence
2023-01-10 06:26:19 +00:00
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
Test commit template with divergence
2023-01-10 06:26:19 +00:00
let repo_path = test_env.env_root().join("repo");
std::fs::write(repo_path.join("file"), "foo\n").unwrap();
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 1"]);
Test commit template with divergence
2023-01-10 06:26:19 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
// No divergence
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 ff309c29
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
Test commit template with divergence
2023-01-10 06:26:19 +00:00
"###);
// Create divergence
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(
Test commit template with divergence
2023-01-10 06:26:19 +00:00
&repo_path,
&["describe", "-m", "description 2", "--at-operation", "@-"],
);
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["log"]);
Test commit template with divergence
2023-01-10 06:26:19 +00:00
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 6ba70e00
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ description 2
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
│ @ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
├─╯ description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
Test commit template with divergence
2023-01-10 06:26:19 +00:00
"###);
cli: send status messages to stderr, specify stdout/stderr explicitly Many of &mut UI can be changed to immutable borrows, but I'm not gonna update them in this patch.
2023-10-10 11:07:06 +00:00
insta::assert_snapshot!(stderr, @r###"
Concurrent modification detected, resolving automatically.
"###);
Test commit template with divergence
2023-01-10 06:26:19 +00:00
// Color
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm?? test.user@example.com 2001-02-03 08:05:10 6ba70e00
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ description 2
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ @ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
├─╯ description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
Test commit template with divergence
2023-01-10 06:26:19 +00:00
"###);
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
// Obslog and hidden divergent
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog"]);
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
│ description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 485d52a9
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
│ (no description set)
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
(empty) (no description set)
"###);
// Colored obslog
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--color=always"]);
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ qpvuntsm?? test.user@example.com 2001-02-03 08:05:08 ff309c29
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
│ description 1
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 485d52a9
templates: colorize description_placeholder Also, see https://github.com/martinvonz/jj/pull/2100.
2023-08-24 04:26:45 +00:00
│ (no description set)
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 230dd059
templates: colorize description_placeholder Also, see https://github.com/martinvonz/jj/pull/2100.
2023-08-24 04:26:45 +00:00
(empty) (no description set)
Templater: label hidden commits (aka abandoned commits) Looks like "change_id normal" + color. Picture for `jj obslog`: https://user-images.githubusercontent.com/4123047/230708271-4108cf5f-255d-419e-bd3e-fc97dc8b8660.png This should also be occasionally be useful for e.g. `jj log commit_id`. I also considered the wording `(Was change_id)` or `change_id (old)`, `change_id (obs)`.
2023-04-08 01:28:16 +00:00
"###);
Test commit template with divergence
2023-01-10 06:26:19 +00:00
}
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
#[test]
fn test_log_branches() {
let test_env = TestEnvironment::default();
tests: set git_settings.auto_local_branch where it matters
2023-12-16 10:00:14 +00:00
test_env.add_config("git.auto-local-branch = true");
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "origin"]);
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
let origin_path = test_env.env_root().join("origin");
let origin_git_repo_path = origin_path
.join(".jj")
.join("repo")
.join("store")
.join("git");
// Created some branches on the remote
test_env.jj_cmd_ok(&origin_path, &["describe", "-m=description 1"]);
test_env.jj_cmd_ok(&origin_path, &["branch", "create", "branch1"]);
test_env.jj_cmd_ok(&origin_path, &["new", "root()", "-m=description 2"]);
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
test_env.jj_cmd_ok(&origin_path, &["branch", "create", "branch2", "unchanged"]);
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
test_env.jj_cmd_ok(&origin_path, &["new", "root()", "-m=description 3"]);
test_env.jj_cmd_ok(&origin_path, &["branch", "create", "branch3"]);
test_env.jj_cmd_ok(&origin_path, &["git", "export"]);
test_env.jj_cmd_ok(
test_env.env_root(),
&[
"git",
"clone",
origin_git_repo_path.to_str().unwrap(),
"local",
],
);
let workspace_root = test_env.env_root().join("local");
// Rewrite branch1, move branch2 forward, create conflict in branch3, add
// new-branch
test_env.jj_cmd_ok(
&workspace_root,
&["describe", "branch1", "-m", "modified branch1 commit"],
);
test_env.jj_cmd_ok(&workspace_root, &["new", "branch2"]);
test_env.jj_cmd_ok(&workspace_root, &["branch", "set", "branch2"]);
test_env.jj_cmd_ok(&workspace_root, &["branch", "create", "new-branch"]);
test_env.jj_cmd_ok(&workspace_root, &["describe", "branch3", "-m=local"]);
test_env.jj_cmd_ok(&origin_path, &["describe", "branch3", "-m=origin"]);
test_env.jj_cmd_ok(&origin_path, &["git", "export"]);
test_env.jj_cmd_ok(&workspace_root, &["git", "fetch"]);
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
let template = r#"commit_id.short() ++ " " ++ if(branches, branches, "(no branches)")"#;
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
let output = test_env.jj_cmd_success(&workspace_root, &["log", "-T", template]);
insta::assert_snapshot!(output, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ fed794e2ba44 branch3?? branch3@origin
│ ○ b1bb3766d584 branch3??
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ 28ff13ce7195 branch1*
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
├─╯
│ @ a5b4d15489cc branch2* new-branch
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ 8476341eb395 branch2@origin unchanged
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ 000000000000 (no branches)
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
"###);
let template = r#"branches.map(|b| separate("/", b.remote(), b.name())).join(", ")"#;
let output = test_env.jj_cmd_success(&workspace_root, &["log", "-T", template]);
insta::assert_snapshot!(output, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ branch3, origin/branch3
│ ○ branch3
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ branch1
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
├─╯
│ @ branch2, new-branch
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ origin/branch2, unchanged
templater: make branches, tags, git_refs, and git_head return list type I'm not going to change the default output, but this allows us to highlight or dim only the @remote component.
2023-10-25 07:31:18 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
"###);
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
let template = r#"separate(" ", "L:", local_branches, "R:", remote_branches)"#;
let output = test_env.jj_cmd_success(&workspace_root, &["log", "-T", template]);
insta::assert_snapshot!(output, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ L: branch3?? R: branch3@origin
│ ○ L: branch3?? R:
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ L: branch1* R:
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
├─╯
│ @ L: branch2* new-branch R:
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ L: unchanged R: branch2@origin unchanged@origin
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ L: R:
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +00:00
"###);
templater: add tracking methods to remote RefName More tests will be added later as "branch list" templates. In "log" template, we might want to see the number of "local" commits ahead of any tracked remotes. It can be implemented later in a similar way (or as a nested remote_refs list.)
2024-04-30 04:51:32 +00:00
let template = r#"
remote_branches.map(|ref| concat(
ref,
if(ref.tracked(),
"(+" ++ ref.tracking_ahead_count().lower()
++ "/-" ++ ref.tracking_behind_count().lower() ++ ")"),
))
"#;
let output = test_env.jj_cmd_success(
&workspace_root,
&["log", "-r::remote_branches()", "-T", template],
);
insta::assert_snapshot!(output, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ branch3@origin(+0/-1)
│ ○ branch2@origin(+0/-1) unchanged@origin(+0/-0)
templater: add tracking methods to remote RefName More tests will be added later as "branch list" templates. In "log" template, we might want to see the number of "local" commits ahead of any tracked remotes. It can be implemented later in a similar way (or as a nested remote_refs list.)
2024-04-30 04:51:32 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ branch1@origin(+1/-1)
templater: add tracking methods to remote RefName More tests will be added later as "branch list" templates. In "log" template, we might want to see the number of "local" commits ahead of any tracked remotes. It can be implemented later in a similar way (or as a nested remote_refs list.)
2024-04-30 04:51:32 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆
templater: add tracking methods to remote RefName More tests will be added later as "branch list" templates. In "log" template, we might want to see the number of "local" commits ahead of any tracked remotes. It can be implemented later in a similar way (or as a nested remote_refs list.)
2024-04-30 04:51:32 +00:00
"###);
tests: move test_templater_branches() to test_commit_template.rs It's not testing the core templater functionality.
2023-10-26 01:09:27 +00:00
}
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
#[test]
fn test_log_git_head() {
let test_env = TestEnvironment::default();
let repo_path = test_env.env_root().join("repo");
git2::Repository::init(&repo_path).unwrap();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(&repo_path, &["git", "init", "--git-repo=."]);
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["new", "-m=initial"]);
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
std::fs::write(repo_path.join("file"), "foo\n").unwrap();
commit_templater: make git_head return Option<RefName> instead of Vec<_> Since we've introduced Option type, it no longer makes sense that git_head returns a Vec<RefName>.
2024-03-24 12:57:07 +00:00
let template = r#"
separate(", ",
if(git_head, "name: " ++ git_head.name()),
"remote: " ++ git_head.remote(),
) ++ "\n"
"#;
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
insta::assert_snapshot!(stdout, @r###"
@ remote: <Error: No RefName available>
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ name: HEAD, remote: git
◆ remote: <Error: No RefName available>
commit_templater: make git_head return Option<RefName> instead of Vec<_> Since we've introduced Option type, it no longer makes sense that git_head returns a Vec<RefName>.
2024-03-24 12:57:07 +00:00
"###);
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
insta::assert_snapshot!(stdout, @r###"
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:09 50aaf475
cli: switch default graph style to be Sapling's curved style We seem to quite unanimously prefer this style, so let's make the default.
2023-02-09 02:53:47 +00:00
│ initial
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 HEAD@git 230dd059
templates: colorize description_placeholder Also, see https://github.com/martinvonz/jj/pull/2100.
2023-08-24 04:26:45 +00:00
│ (empty) (no description set)
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ zzzzzzzz root() 00000000
log: add test of HEAD@git template
2023-01-10 07:43:27 +00:00
"###);
}
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
#[test]
fn test_log_customize_short_id() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
let repo_path = test_env.env_root().join("repo");
tests: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "first"]);
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
templater: Allow separate styling for change and commit ids
2023-02-21 04:38:52 +00:00
// Customize both the commit and the change id
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
let decl = "template-aliases.'format_short_id(id)'";
let stdout = test_env.jj_cmd_success(
&repo_path,
templater: Allow separate styling for change and commit ids
2023-02-21 04:38:52 +00:00
&[
"log",
"--config-toml",
templater: require infix ++ operator to concatenate expressions This eliminates ambiguous parsing between "func()" and "expr ()". I chose "++" as template concatenation operator in case we want to add bit-wise negate operator. It's also easier to find/replace than "~".
2023-02-28 11:30:57 +00:00
&format!(r#"{decl}='id.shortest(5).prefix().upper() ++ "_" ++ id.shortest(5).rest()'"#),
templater: Allow separate styling for change and commit ids
2023-02-21 04:38:52 +00:00
],
);
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
@ Q_pvun test.user@example.com 2001-02-03 08:05:08 F_a156
templater: Allow separate styling for change and commit ids
2023-02-21 04:38:52 +00:00
│ (empty) first
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ Z_zzzz root() 0_0000
templater: Allow separate styling for change and commit ids
2023-02-21 04:38:52 +00:00
"###);
// Customize only the change id
let stdout = test_env.jj_cmd_success(
&repo_path,
&[
"log",
"--config-toml",
r#"
[template-aliases]
'format_short_change_id(id)'='format_short_id(id).upper()'
"#,
],
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
);
insta::assert_snapshot!(stdout, @r###"
commit_builder: reset author timestamp on discardable commits It's common to create empty working-copy commits while using jj, and currently the author timestamp for a commit is only set when it is first created. If you create an empty commit, then don't work on a repo for a few days, and then start working on a new feature without abandoning the working-copy commit, the author timestamp will remain as the time the commit was created rather than being updated to the time that work began or finished. This commit changes the behavior so that discardable commits (empty commits with no description) by the current user have their author timestamps reset when they are rewritten, meaning that the author timestamp will become finalized whenever a commit is given a description or becomes non-empty.
2024-06-23 22:20:33 +00:00
@ QPVUNTSM test.user@example.com 2001-02-03 08:05:08 fa15625b
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
│ (empty) first
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ ZZZZZZZZ root() 00000000
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
"###);
}
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
#[test]
fn test_log_immutable() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_ok(&repo_path, &["new", "-mA", "root()"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mB"]);
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mC"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mD", "root()"]);
let template = r#"
separate(" ",
description.first_line(),
branches,
if(immutable, "[immutable]"),
) ++ "\n"
"#;
test_env.add_config("revset-aliases.'immutable_heads()' = 'main'");
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r::", "-T", template]);
insta::assert_snapshot!(stdout, @r###"
@ D
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ C
│ ◆ B main [immutable]
│ ◆ A [immutable]
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆ [immutable]
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
"###);
// Suppress error that could be detected earlier
test_env.add_config("revsets.short-prefixes = ''");
test_env.add_config("revset-aliases.'immutable_heads()' = 'unknown_fn()'");
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r::", "-T", template]);
insta::assert_snapshot!(stderr, @r###"
revset, templater: include short parse error description in summary line This makes the summary line more informative. Even though it just duplicates the message printed later, I think it's easier to follow. This patch also adjusts some RevsetParseError messages because it seemed redundant to repeat "revset function", "argument", etc.
2024-03-26 11:28:50 +00:00
Error: Failed to parse template: Failed to parse revset
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
Caused by:
1: --> 5:10
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
|
5 | if(immutable, "[immutable]"),
| ^-------^
|
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
= Failed to parse revset
2: --> 1:1
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
|
1 | unknown_fn()
| ^--------^
|
revset, templater: include short parse error description in summary line This makes the summary line more informative. Even though it just duplicates the message printed later, I think it's easier to follow. This patch also adjusts some RevsetParseError messages because it seemed redundant to repeat "revset function", "argument", etc.
2024-03-26 11:28:50 +00:00
= Function "unknown_fn" doesn't exist
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
"###);
test_env.add_config("revset-aliases.'immutable_heads()' = 'unknown_symbol'");
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r::", "-T", template]);
insta::assert_snapshot!(stderr, @r###"
revset, templater: include short parse error description in summary line This makes the summary line more informative. Even though it just duplicates the message printed later, I think it's easier to follow. This patch also adjusts some RevsetParseError messages because it seemed redundant to repeat "revset function", "argument", etc.
2024-03-26 11:28:50 +00:00
Error: Failed to parse template: Failed to evaluate revset
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
Caused by:
1: --> 5:10
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
|
5 | if(immutable, "[immutable]"),
| ^-------^
|
revset, templater: render parse error as usual error chain Because the CLI error handler now prints error sources in multi-line format, it doesn't make much sense to render Revset/TemplateParseError differently. This patch also fixes the source() of the SyntaxError kind. It should be self.pest_error.source() (= None), not self.pest_error.
2024-03-25 15:54:39 +00:00
= Failed to evaluate revset
2: Revision "unknown_symbol" doesn't exist
commit_templater: add self.immutable() method I don't know how immutable revisions should be labeled by default, but users can customize templates whatever they like.
2024-03-13 07:45:41 +00:00
"###);
}
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
#[test]
fn test_log_contained_in() {
let test_env = TestEnvironment::default();
tests: avoid deprecated `jj init --git/--git-repo` I left the instances in `test_init_command.rs` alone since they're about testing `jj init`.
2024-05-17 19:49:25 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_ok(&repo_path, &["new", "-mA", "root()"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mB"]);
test_env.jj_cmd_ok(&repo_path, &["branch", "create", "main"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mC"]);
test_env.jj_cmd_ok(&repo_path, &["new", "-mD", "root()"]);
let template_for_revset = |revset: &str| {
format!(
r#"
separate(" ",
description.first_line(),
branches,
if(self.contained_in("{revset}"), "[contained_in]"),
) ++ "\n"
"#
)
};
let stdout = test_env.jj_cmd_success(
&repo_path,
&[
"log",
"-r::",
"-T",
&template_for_revset(r#"description(A)::"#),
],
);
insta::assert_snapshot!(stdout, @r###"
@ D
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ C [contained_in]
│ ○ B main [contained_in]
│ ○ A [contained_in]
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
"###);
let stdout = test_env.jj_cmd_success(
&repo_path,
&[
"log",
"-r::",
"-T",
&template_for_revset(r#"visible_heads()"#),
],
);
insta::assert_snapshot!(stdout, @r###"
@ D [contained_in]
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
│ ○ C [contained_in]
│ ○ B main
│ ○ A
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
├─╯
Enable the new graph nodes by default. It's been tested in various places now, so this is probably mature enough to be the default.
2024-07-15 22:20:10 +00:00
◆
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
"###);
// Suppress error that could be detected earlier
let stderr = test_env.jj_cmd_failure(
&repo_path,
&["log", "-r::", "-T", &template_for_revset("unknown_fn()")],
);
insta::assert_snapshot!(stderr, @r###"
Error: Failed to parse template: Failed to parse revset
Caused by:
1: --> 5:28
|
5 | if(self.contained_in("unknown_fn()"), "[contained_in]"),
| ^------------^
|
= Failed to parse revset
2: --> 1:1
|
1 | unknown_fn()
| ^--------^
|
= Function "unknown_fn" doesn't exist
"###);
let stderr = test_env.jj_cmd_failure(
&repo_path,
cli: show hint for inner fileset/revset/template errors Note that find_source_parse_error_hint() has recursion, but it should terminate because err.source() shouldn't have a cycle.
2024-05-04 08:02:14 +00:00
&["log", "-r::", "-T", &template_for_revset("author(x:'y')")],
);
insta::assert_snapshot!(stderr, @r###"
Error: Failed to parse template: Failed to parse revset
Caused by:
1: --> 5:28
|
5 | if(self.contained_in("author(x:'y')"), "[contained_in]"),
| ^-------------^
|
= Failed to parse revset
2: --> 1:8
|
1 | author(x:'y')
| ^---^
|
revset: omit function name from type error messages This simplifies the interface of helper functions. While revset doesn't have top-level string pattern or integer literal, these parsing helpers could be used to parse array subscript or n-th parent operator if any.
2024-06-03 05:57:33 +00:00
= Invalid string pattern
cli: show hint for inner fileset/revset/template errors Note that find_source_parse_error_hint() has recursion, but it should terminate because err.source() shouldn't have a cycle.
2024-05-04 08:02:14 +00:00
3: Invalid string pattern kind "x:"
str_util: add regex pattern This patch adds minimal support for the regex pattern. We might have to add "regex-i:" for completeness, but it can be achieved by "regex:'(?i)..'".
2024-07-21 12:44:43 +00:00
Hint: Try prefixing with one of `exact:`, `glob:`, `regex:`, or `substring:`
cli: show hint for inner fileset/revset/template errors Note that find_source_parse_error_hint() has recursion, but it should terminate because err.source() shouldn't have a cycle.
2024-05-04 08:02:14 +00:00
"###);
let stderr = test_env.jj_cmd_failure(
&repo_path,
&["log", "-r::", "-T", &template_for_revset("maine")],
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
);
insta::assert_snapshot!(stderr, @r###"
Error: Failed to parse template: Failed to evaluate revset
Caused by:
1: --> 5:28
|
cli: show hint for inner fileset/revset/template errors Note that find_source_parse_error_hint() has recursion, but it should terminate because err.source() shouldn't have a cycle.
2024-05-04 08:02:14 +00:00
5 | if(self.contained_in("maine"), "[contained_in]"),
| ^-----^
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
|
= Failed to evaluate revset
cli: show hint for inner fileset/revset/template errors Note that find_source_parse_error_hint() has recursion, but it should terminate because err.source() shouldn't have a cycle.
2024-05-04 08:02:14 +00:00
2: Revision "maine" doesn't exist
Hint: Did you mean "main"?
template: add contained_in method to commit object in templates this allows to conditionally display or label elements depending on whether the given commit is contained within the revset
2024-04-26 14:56:40 +00:00
"###);
}
cli_util: short-prefixes for commit summary in transaction I've run into change ID prefixes being 4-5 characters instead of the usual 1-2 characters in commands like `jj duplicate` and `jj split` fairly often, and it seems like this should resolve that.
2024-06-30 01:38:48 +00:00
#[test]
fn test_short_prefix_in_transaction() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
let repo_path = test_env.env_root().join("repo");
test_env.add_config(r#"
[revsets]
log = '::description(test)'
[templates]
log = 'summary ++ "\n"'
commit_summary = 'summary'
[template-aliases]
'format_id(id)' = 'id.shortest(12).prefix() ++ "[" ++ id.shortest(12).rest() ++ "]"'
'summary' = 'separate(" ", format_id(change_id), format_id(commit_id), description.first_line())'
"#);
std::fs::write(repo_path.join("file"), "original file\n").unwrap();
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "initial"]);
// Create a chain of 5 commits
for i in 0..5 {
test_env.jj_cmd_ok(&repo_path, &["new", "-m", &format!("commit{i}")]);
std::fs::write(repo_path.join("file"), format!("file {i}\n")).unwrap();
}
// Create 2^4 duplicates of the chain
for _ in 0..4 {
test_env.jj_cmd_ok(&repo_path, &["duplicate", "description(commit)"]);
}
// Short prefix should be used for commit summary inside the transaction
cli_util: cache IdPrefixContext by transaction wrapper This addresses lifetime issue in the next patch, in which the context has to be borrowed from a known location.
2024-07-17 15:40:53 +00:00
let parent_id = "58731d"; // Force id lookup to build index before mutation.
// If the cached index wasn't invalidated, the
// newly created commit wouldn't be found in it.
let (stdout, stderr) =
test_env.jj_cmd_ok(&repo_path, &["new", parent_id, "--no-edit", "-m", "test"]);
cli_util: short-prefixes for commit summary in transaction I've run into change ID prefixes being 4-5 characters instead of the usual 1-2 characters in commands like `jj duplicate` and `jj split` fairly often, and it seems like this should resolve that.
2024-06-30 01:38:48 +00:00
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Created new commit km[kuslswpqwq] 7[4ac55dd119b] test
"###);
// Should match log's short prefixes
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph"]);
insta::assert_snapshot!(stdout, @r###"
km[kuslswpqwq] 7[4ac55dd119b] test
y[qosqzytrlsw] 5[8731db5875e] commit4
r[oyxmykxtrkr] 9[95cc897bca7] commit3
m[zvwutvlkqwt] 3[74534c54448] commit2
zs[uskulnrvyr] d[e304c281bed] commit1
kk[mpptxzrspx] 05[2755155952] commit0
q[pvuntsmwlqt] e[0e22b9fae75] initial
zz[zzzzzzzzzz] 00[0000000000]
"###);
test_env.add_config(r#"revsets.short-prefixes = """#);
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph"]);
insta::assert_snapshot!(stdout, @r###"
kmk[uslswpqwq] 74ac[55dd119b] test
yq[osqzytrlsw] 587[31db5875e] commit4
ro[yxmykxtrkr] 99[5cc897bca7] commit3
mz[vwutvlkqwt] 374[534c54448] commit2
zs[uskulnrvyr] de[304c281bed] commit1
kk[mpptxzrspx] 052[755155952] commit0
qp[vuntsmwlqt] e0[e22b9fae75] initial
zz[zzzzzzzzzz] 00[0000000000]
"###);
}
templater: add commit.diff().<format>() methods This patch adds TreeDiff template type to host formatting options. The main reason of this API design is that diff formats have various incompatible parameters, so a single .diff(files, format[, options..]) method would become messy pretty quickly. Another reason is that we can probably add custom summary templating support as diff.files().map(|file| file.path()..). RepoPathUiConverter is passed to templater explicitly because the one stored in RevsetParseContext is behind Option<_>.
2024-07-15 09:08:45 +00:00
#[test]
fn test_log_diff_predefined_formats() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
let repo_path = test_env.env_root().join("repo");
std::fs::write(repo_path.join("file1"), "a\nb\n").unwrap();
std::fs::write(repo_path.join("file2"), "a\n").unwrap();
test_env.jj_cmd_ok(&repo_path, &["new"]);
std::fs::write(repo_path.join("file1"), "a\nb\nc\n").unwrap();
std::fs::write(repo_path.join("file2"), "b\nc\n").unwrap();
let template = r#"
concat(
"=== color_words ===\n",
diff.color_words(),
"=== git ===\n",
diff.git(),
"=== stat ===\n",
diff.stat(80),
"=== summary ===\n",
diff.summary(),
)
"#;
// color, without paths
let stdout = test_env.jj_cmd_success(
&repo_path,
&["log", "--no-graph", "--color=always", "-r@", "-T", template],
);
insta::assert_snapshot!(stdout, @r###"
=== color_words ===
Modified regular file file1:
 1  1: a
 2  2: b
 3: c
Modified regular file file2:
 1  1: ab
 2: c
=== git ===
diff --git a/file1 b/file1
index 422c2b7ab3..de980441c3 100644
--- a/file1
+++ b/file1
@@ -1,2 +1,3 @@
a
b
+c
diff --git a/file2 b/file2
index 7898192261..9ddeb5c484 100644
--- a/file2
+++ b/file2
@@ -1,1 +1,2 @@
-a
+b
+c
=== stat ===
file1 | 1 +
file2 | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
=== summary ===
M file1
M file2
"###);
// cwd != workspace root
let stdout = test_env.jj_cmd_success(
test_env.env_root(),
&["log", "-Rrepo", "--no-graph", "-r@", "-T", template],
);
insta::assert_snapshot!(stdout.replace('\\', "/"), @r###"
=== color_words ===
Modified regular file repo/file1:
1 1: a
2 2: b
3: c
Modified regular file repo/file2:
1 1: ab
2: c
=== git ===
diff --git a/file1 b/file1
index 422c2b7ab3..de980441c3 100644
--- a/file1
+++ b/file1
@@ -1,2 +1,3 @@
a
b
+c
diff --git a/file2 b/file2
index 7898192261..9ddeb5c484 100644
--- a/file2
+++ b/file2
@@ -1,1 +1,2 @@
-a
+b
+c
=== stat ===
repo/file1 | 1 +
repo/file2 | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
=== summary ===
M repo/file1
M repo/file2
"###);
// color_words() with parameters
let template = "self.diff('file1').color_words(0)";
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-r@", "-T", template]);
insta::assert_snapshot!(stdout, @r###"
Modified regular file file1:
...
3: c
"###);
// git() with parameters
let template = "self.diff('file1').git(1)";
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-r@", "-T", template]);
insta::assert_snapshot!(stdout, @r###"
diff --git a/file1 b/file1
index 422c2b7ab3..de980441c3 100644
--- a/file1
+++ b/file1
@@ -2,1 +2,2 @@
b
+c
"###);
}
Copy permalink