ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

jj log: Change conflicted branches from br? to br??

Browse source 
The divergent changes are marked with ?? (I found a single ? a bit easy to
overlook), and this should be consistent.

Ideally, the conflicted branches would also be red, but this takes a bit
larger changes to `templater.rs`: another `Property` as well as changes to
https://github.com/martinvonz/jj/blob/7f9a0a28/src/template_parser.rs#L385-L395
This commit is contained in:
Ilya Grigoriev 2023-01-06 17:59:57 -08:00
parent 8093bc0614
commit 65de7cb0eb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/templater.rs
View file

@ -236,7 +236,7 @@ impl TemplateProperty<Commit, String> for BranchProperty<'_> {
if let Some(local_target) = local_target {
if local_target.has_add(context.id()) {
if local_target.is_conflict() {
names.push(format!("{branch_name}?"));
names.push(format!("{branch_name}??"));
} else if branch_target
.remote_targets
.values()

2
tests/test_templater.rs
View file

@ -66,7 +66,7 @@ fn test_templater_branches() {
&["log", "-T", r#"commit_id.short() " " branches"#],
);
insta::assert_snapshot!(output, @r###"
o b1bb3766d584 branch3?
o b1bb3766d584 branch3??
| @ a5b4d15489cc branch2* new-branch
| | o 21c33875443e branch1*
| |/

4
tests/test_unsquash_command.rs
View file

@ -110,8 +110,8 @@ fn test_unsquash() {
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
@ 3217340cb761
|\
o | 5658521e0f8b d e?
| o 90fe0a96fc90 c e?
o | 5658521e0f8b d e??
| o 90fe0a96fc90 c e??
|/
o fa5efbdf533c b
o 90aeefd03044 a