mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
jj/cli/tests/test_commit_template.rs

519 lines
22 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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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 "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#"commit_id ++ "\nP: " ++ 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
├─╮ P: 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ │ 4db490c88528133d579540b6900b8098f0c17701
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
├─╯ P: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
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
│ P: 0000000000000000000000000000000000000000
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ 0000000000000000000000000000000000000000
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
P:
"###);
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###"
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
@ 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###"
Error: Failed to parse template: --> 1:1
|
1 | parents
| ^-----^
|
= Expected expression of type "Template"
"###);
// 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###"
Error: Failed to parse template: --> 1:29
|
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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
Switch graph node to use `◉` for commit instead of `●` This follows up on 5c703aeb0397b560a383bdd57a87235834074b64. The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy. If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on. I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you. Compare after: ![image](https://user-images.githubusercontent.com/4123047/229251383-563b889d-7233-42e2-a3c5-bf9368a4d1fd.png) and before: ![image](https://user-images.githubusercontent.com/4123047/229251695-7fd0ff2c-2832-4262-ade5-5120288cccdf.png)
2023-03-15 03:37:56 +00:00
◉ 2001-02-03 04:05:07.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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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
◉ 1970-01-01 00:00:00.000 +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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ kkmpptxz test.user@example.com 2001-02-03 04:05:09.000 +07:00 my-branch 9de54178
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
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264
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
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
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ kkmpptxz test.user@example.com 2001-02-03 04:05:09.000 +07:00 my-branch 9de54178
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
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264
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
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
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
kkmpptxz test.user@example.com 2001-02-03 04:05:09.000 +07:00 my-branch 9de54178
cli: do not include separator in labeled log template fields
2023-02-03 06:11:25 +00:00
(empty) description 1
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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");
let render = |template| test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
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: 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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397 (empty) (no description set)
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
◉ qpvuntsm test.user 2001-02-03 04:05:07.000 +07:00 230dd059 (empty) (no description set)
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
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: 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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397
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
│ (empty) (no description set)
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
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
│ (empty) (no description set)
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
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: 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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397
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
│ (empty) (no description set)
│
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
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
│ (empty) (no description set)
│
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
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###"
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
@ Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
│ 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
templates: reword signature placeholders to match description
2023-08-26 23:52:29 +00:00
│ Author: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00)
│ Committer: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07: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
│
│ (no description set)
│
◉ Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
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
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
│ Author: Test User <test.user@example.com> (2001-02-03 04:05:07.000 +07:00)
│ Committer: Test User <test.user@example.com> (2001-02-03 04:05:07.000 +07:00)
│
│ (no description set)
│
◉ Commit ID: 0000000000000000000000000000000000000000
Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
templates: reword signature placeholders to match description
2023-08-26 23:52:29 +00:00
Author: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00)
Committer: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +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
(no description set)
"###);
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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###"
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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397 (empty) (no description set)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
◉ qpvuntsm test.user 2001-02-03 04:05:07.000 +07:00 230dd059 (empty) (no description set)
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
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###"
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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
│ (empty) (no description set)
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
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###"
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
@ rlvkpnrz (no email set) 2001-02-03 04:05:08.000 +07:00 my-branch dc315397
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│ (empty) (no description set)
│
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
│ (empty) (no description set)
│
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
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###"
@ Commit ID: dc31539712c7294d1d712cec63cef4504b94ca74
│ 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
templates: default placeholders to red With the idea that less severe placeholders (like description) could (and should) explicitly "opt out". (Both email and name placeholders will be red with this change.)
2023-08-24 04:40:33 +00:00
│ Author: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00)
│ Committer: (no name set) <(no email set)> (2001-02-03 04:05:08.000 +07:00)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
│
│  (no description set)
│
◉ Commit ID: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
│ Change ID: qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu
│ Author: Test User <test.user@example.com> (2001-02-03 04:05:07.000 +07:00)
│ Committer: Test User <test.user@example.com> (2001-02-03 04:05:07.000 +07:00)
│
│  (no description set)
│
◉ Commit ID: 0000000000000000000000000000000000000000
Change ID: zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
templates: default placeholders to red With the idea that less severe placeholders (like description) could (and should) explicitly "opt out". (Both email and name placeholders will be red with this change.)
2023-08-24 04:40:33 +00:00
Author: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00)
Committer: (no name set) <(no email set)> (1970-01-01 00:00:00.000 +00:00)
tests: add test for log builtin templates with colors
2023-08-30 04:30:20 +00:00
 (no description set)
"###);
}
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ qpvuntsm test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
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
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
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
◉ qpvuntsm?? test.user@example.com 2001-02-03 04:05:10.000 +07:00 8979953d
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
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
│ @ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
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
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
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
◉ qpvuntsm?? test.user@example.com 2001-02-03 04:05:10.000 +07:00 8979953d
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
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
│ @ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
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
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
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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
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
cli change id templates: make "hidden" override "divergent" See the test changes in `test_undo.rs` for motivation. This matters rarely, but seems to be better.
2023-10-26 04:18:58 +00:00
◉ qpvuntsm hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 3b68ce25
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)
cli change id templates: make "hidden" override "divergent" See the test changes in `test_undo.rs` for motivation. This matters rarely, but seems to be better.
2023-10-26 04:18:58 +00:00
◉ qpvuntsm hidden test.user@example.com 2001-02-03 04:05:07.000 +07:00 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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ qpvuntsm?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e
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
cli change id templates: make "hidden" override "divergent" See the test changes in `test_undo.rs` for motivation. This matters rarely, but seems to be better.
2023-10-26 04:18:58 +00:00
◉ qpvuntsm hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 3b68ce25
templates: colorize description_placeholder Also, see https://github.com/martinvonz/jj/pull/2100.
2023-08-24 04:26:45 +00:00
│ (no description set)
cli change id templates: make "hidden" override "divergent" See the test changes in `test_undo.rs` for motivation. This matters rarely, but seems to be better.
2023-10-26 04:18:58 +00:00
◉ qpvuntsm hidden test.user@example.com 2001-02-03 04:05:07.000 +07:00 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()""#);
test_env.jj_cmd_ok(test_env.env_root(), &["init", "--git", "origin"]);
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###"
◉ fed794e2ba44 branch3?? branch3@origin
│ ◉ b1bb3766d584 branch3??
├─╯
│ ◉ 21c33875443e branch1*
├─╯
│ @ a5b4d15489cc branch2* new-branch
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +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
├─╯
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
◉ 000000000000 (no branches)
"###);
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###"
◉ branch3, origin/branch3
│ ◉ branch3
├─╯
│ ◉ branch1
├─╯
│ @ branch2, new-branch
templater: add local/remote_branches keywords
2023-10-25 08:50:52 +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
├─╯
◉
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###"
◉ L: branch3?? R: branch3@origin
│ ◉ L: branch3?? R:
├─╯
│ ◉ L: branch1* R:
├─╯
│ @ L: branch2* new-branch R:
│ ◉ L: unchanged R: branch2@origin unchanged@origin
├─╯
◉ L: R:
"###);
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: 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, &["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();
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
insta::assert_snapshot!(stdout, @r###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ rlvkpnrz test.user@example.com 2001-02-03 04:05:09.000 +07:00 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
cli: ensure first new HEAD is detached The problem is that the first non-working-copy commit moves the unborn current branch to that commit, but jj doesn't "export" the moved branch. Therefore, the next jj invocation notices the "external" ref change, which was actually made by jj. I'm not sure why we play nice by setting the "current" HEAD, but I *think* it's okay to set the "new" HEAD and reset to the same commit to clear Git index.
2023-10-02 11:56:51 +00:00
◉ qpvuntsm test.user@example.com 2001-02-03 04:05:07.000 +07:00 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)
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
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: replace jj_cmd_success() involving mutation to allow stderr output
2023-10-10 11:59:18 +00:00
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
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###"
@ Q_pvun test.user@example.com 2001-02-03 04:05:08.000 +07:00 6_9542
│ (empty) first
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
◉ 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###"
cli templates: change default short id length from 12 to 8 This makes including the change id into the short commit description in the following commit look less noisy.
2023-07-30 05:24:34 +00:00
@ QPVUNTSM test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c19
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
│ (empty) first
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
config: remove ui.unique-prefixes/log-id-preferred-length in favor of alias
2023-02-14 14:35:40 +00:00
"###);
}
Reference in a new issue Copy permalink