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

238 lines
9.5 KiB
Rust
Raw Normal View History

copyright: change from "Google LLC" to "The Jujutsu Authors" Let's acknowledge everyone's contributions by replacing "Google LLC" in the copyright header by "The Jujutsu Authors". If I understand correctly, it won't have any legal effect, but maybe it still helps reduce concerns from contributors (though I haven't heard any concerns). Google employees can read about Google's policy at go/releasing/contributions#copyright.
2022-11-26 23:57:50 +00:00
// Copyright 2022 The Jujutsu Authors
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
//
// 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.
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
use common::{get_stdout_string, TestEnvironment};
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
pub mod common;
#[test]
fn test_obslog_with_or_without_diff() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
let repo_path = test_env.env_root().join("repo");
std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
test_env.jj_cmd_success(&repo_path, &["new", "-m", "my description"]);
std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap();
std::fs::write(repo_path.join("file2"), "foo\n").unwrap();
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
test_env.jj_cmd_success(&repo_path, &["rebase", "-r", "@", "-d", "root()"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
std::fs::write(repo_path.join("file1"), "resolved\n").unwrap();
test_obslog_command.rs: stop removing change ids The regex no longer works and the change ids are no longer random since a few weeks ago.
2023-01-26 05:42:13 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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
@ rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bc
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0da
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) my description
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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
// Color
let stdout = test_env.jj_cmd_success(&repo_path, &["--color=always", "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
@ rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bc
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0da
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) my description
"###);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
// There should be no diff caused by the rebase because it was a pure rebase
// (even even though it resulted in a conflict).
test_obslog_command.rs: stop removing change ids The regex no longer works and the change ids are no longer random since a few weeks ago.
2023-01-26 05:42:13 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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
@ rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
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
│ my description
│ Resolved conflict in file1:
│ 1 1: <<<<<<<resolved
│ 2 : %%%%%%%
conflicts: replace missing files by empty in materialized conflict When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: https://github.com/martinvonz/jj/blob/3dfedf581458f88982289f58db884bc65f1e635b/lib/src/files.rs#L228-L230). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.
2023-02-17 18:05:47 +00:00
│ 3 : foo
│ 4 : +bar
│ 5 : +++++++
│ 6 : >>>>>>>
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
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
│ my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bc
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
│ my description
│ Modified regular file file1:
│ 1 1: foo
│ 2: bar
│ Added regular file file2:
│ 1: foo
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0da
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) my description
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
"###);
cli: add "--limit N" option to log-like commands Copied from Mercurial. This isn't a revset predicate since our revset is conceptually unordered.
2023-08-10 09:14:54 +00:00
// Test `--limit`
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--limit=2"]);
insta::assert_snapshot!(stdout, @r###"
@ rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
│ my description
◉ rlvkpnrz hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
│ my description
"###);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
// Test `--no-graph`
test_obslog_command.rs: stop removing change ids The regex no longer works and the change ids are no longer random since a few weeks ago.
2023-01-26 05:42:13 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--no-graph"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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
rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bc
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0da
log: add (empty) in front of an empty commit description
2023-01-14 10:43:23 +00:00
(empty) my description
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
"###);
// Test `--git` format, and that it implies `-p`
test_obslog_command.rs: stop removing change ids The regex no longer works and the change ids are no longer random since a few weeks ago.
2023-01-26 05:42:13 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--no-graph", "--git"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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
rlvkpnrz test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad3
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
diff --git a/file1 b/file1
diff_util: use `MergedTree` throughout This switches the whole `diff_util` module to working with `MergedTree`, `Merge<Option<TreeValue>>` etc., so it can support tree-level conflicts. Since we want to avoid using `ConflictId`s, I switched the hash we use for conflicts in `--git` style diffs to use an all-'0' id instead of using the conflict id.
2023-08-26 20:19:31 +00:00
index 0000000000...2ab19ae607 100644
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
--- a/file1
+++ b/file1
conflicts: replace missing files by empty in materialized conflict When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: https://github.com/martinvonz/jj/blob/3dfedf581458f88982289f58db884bc65f1e635b/lib/src/files.rs#L228-L230). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.
2023-02-17 18:05:47 +00:00
@@ -1,6 +1,1 @@
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
-<<<<<<<
conflicts: change diff line marker to %%%%%%% I feel the original -------/+++++++ pair is slightly confusing because each half can be a separator by itself. I don't know what character other than '-'/'+' is preferred, but let's pick '%' (for "mod") per @martinvonz suggestion.
2022-09-20 03:31:20 +00:00
-%%%%%%%
conflicts: replace missing files by empty in materialized conflict When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: https://github.com/martinvonz/jj/blob/3dfedf581458f88982289f58db884bc65f1e635b/lib/src/files.rs#L228-L230). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.
2023-02-17 18:05:47 +00:00
- foo
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
-+bar
conflicts: replace missing files by empty in materialized conflict When we materialize modify/delete conflicts, we currently don't include any context lines. That's because modify/delete conflicts have only two sides, so there's no common base to compare to. Hunks that are unchanged on the "modify" side are therefore not considered conflicting, and since they they don't contribute new changes, they're simply skipped (here: https://github.com/martinvonz/jj/blob/3dfedf581458f88982289f58db884bc65f1e635b/lib/src/files.rs#L228-L230). It seems more useful to instead pretend that the missing side is an empty file. That way we'll get a conflict in the entire file. We can still decide later to make e.g. `jj resolve` prompt the user on modify/delete conflicts just like `hg resolve` does (or maybe it actually happens earlier there, I don't remember). Closes #1244.
2023-02-17 18:05:47 +00:00
-+++++++
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
->>>>>>>
+resolved
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5a conflict
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bc
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
my description
diff --git a/file1 b/file1
index 257cc5642c...3bd1f0e297 100644
--- a/file1
+++ b/file1
@@ -1,1 +1,2 @@
foo
+bar
diff --git a/file2 b/file2
new file mode 100644
index 0000000000..257cc5642c
--- /dev/null
+++ b/file2
@@ -1,0 +1,1 @@
+foo
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0da
log: add (empty) in front of an empty commit description
2023-01-14 10:43:23 +00:00
(empty) my description
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
"###);
}
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
#[test]
fn test_obslog_word_wrap() {
let test_env = TestEnvironment::default();
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
let repo_path = test_env.env_root().join("repo");
let render = |args: &[&str], columns: u32, word_wrap: bool| {
let mut args = args.to_vec();
if word_wrap {
args.push("--config-toml=ui.log-word-wrap=true");
}
let assert = test_env
.jj_cmd(&repo_path, &args)
.env("COLUMNS", columns.to_string())
.assert()
.success()
.stderr("");
get_stdout_string(&assert)
};
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
// ui.log-word-wrap option applies to both graph/no-graph outputs
insta::assert_snapshot!(render(&["obslog"], 40, false), @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
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
│ (empty) first
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 hidden test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) (no description set)
"###);
insta::assert_snapshot!(render(&["obslog"], 40, true), @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
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
│ 2001-02-03 04:05:08.000 +07:00
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
│ 69542c19
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
│ (empty) first
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 hidden test.user@example.com
2001-02-03 04:05:07.000 +07:00
230dd059
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) (no description set)
"###);
insta::assert_snapshot!(render(&["obslog", "--no-graph"], 40, false), @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
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) first
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 hidden test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) (no description set)
"###);
insta::assert_snapshot!(render(&["obslog", "--no-graph"], 40, true), @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
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) first
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 hidden test.user@example.com
2001-02-03 04:05:07.000 +07:00 230dd059
cli: add ui.log-word-wrap option Unlike Mercurial, this isn't a template keyword/function, but a config knob. Exposing graph_width to templater wouldn't be easy, and I don't think it's better to handle terminal wrapping in template. I'm not sure if patch content should be wrapped, so this option only applies to the template output for now. Closes #1043
2023-03-05 04:10:02 +00:00
(empty) (no description set)
"###);
}
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
#[test]
fn test_obslog_squash() {
cli: make `jj move/squash/unsquash` ask for combined description In 8ae9540f2cc7, I made `jj move/squash/unsquash` not abandon the working copy if it became empty because that would lose any description associated with it. It turned out that the new behavior was also confusing because it made it unclear if the working-copy commit was actually abandoned. Let's roll back that change and instead ask the user for a combined description when both the source and destination commits have non-empty descriptions. Not discarding a non-empty description seems like a good improvement regardless of the behavior related to working-copy commits. It's also how `hg fold` behaves (though hg doesn't allow the description to be empty).
2022-08-28 17:28:53 +00:00
let mut test_env = TestEnvironment::default();
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
let repo_path = test_env.env_root().join("repo");
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
test_env.jj_cmd_success(&repo_path, &["new", "-m", "second"]);
std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap();
cli: make `jj move/squash/unsquash` ask for combined description In 8ae9540f2cc7, I made `jj move/squash/unsquash` not abandon the working copy if it became empty because that would lose any description associated with it. It turned out that the new behavior was also confusing because it made it unclear if the working-copy commit was actually abandoned. Let's roll back that change and instead ask the user for a combined description when both the source and destination commits have non-empty descriptions. Not discarding a non-empty description seems like a good improvement regardless of the behavior related to working-copy commits. It's also how `hg fold` behaves (though hg doesn't allow the description to be empty).
2022-08-28 17:28:53 +00:00
let edit_script = test_env.set_up_fake_editor();
Fixes suggested by new version of Clippy
2022-11-04 04:14:41 +00:00
std::fs::write(edit_script, "write\nsquashed").unwrap();
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
test_env.jj_cmd_success(&repo_path, &["squash"]);
test_obslog_command.rs: stop removing change ids The regex no longer works and the change ids are no longer random since a few weeks ago.
2023-01-26 05:42:13 +00:00
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p", "-r", "@-"]);
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +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 27e721a5
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
├─╮ squashed
│ │ Modified regular file file1:
│ │ 1 1: foo
│ │ 2: bar
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 9764e503
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
│ │ first
│ │ Added regular file file1:
│ │ 1: foo
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 hidden test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c19
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) first
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 hidden test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059
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) (no description set)
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 hidden test.user@example.com 2001-02-03 04:05:10.000 +07:00 f09a3889
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
│ second
│ Modified regular file file1:
│ 1 1: foo
│ 2: bar
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 hidden test.user@example.com 2001-02-03 04:05:09.000 +07:00 57996536
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) second
cli: teach `obslog` an option to show diff This patch adds `jj obslog -p` for including the diff compared to the predecessor (the first predecessor if there are several). If the predecessor's parents are different, then we create a temporary tree by rebasing the predecessor to have the same parents and we use the result as base for the diff. That way, we avoid polluting the diff with the changes caused by the rebase. (I don't think we currently have any commands that can change both parents and content, so the diff should always be empty for rewrites caused by a rebase.) Working on this also reminded me that it'll be really nice when we replace `jj obslog` by something based on the operation log - I really miss seeing information about the operation in the output (like `hg obslog` gets from its obsmarkers).
2022-06-03 22:25:56 +00:00
"###);
}
Copy permalink