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

templates: remove implicit self dependency from description_placeholder alias

Browse source 
Spotted while experimenting with "jj tag list -T". The description_placeholder
alias could be changed to function taking a Commit object, but I feel it's odd.
Conceptually, the placeholder could also be used in "op log" templates.
This commit is contained in:
Yuya Nishihara 2024-04-25 18:47:12 +09:00
parent dbc7ad2d8e
commit c267f55809
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cli/src/config/templates.toml
View file

@ -34,7 +34,10 @@ if(root,
format_short_commit_id(commit_id),
if(conflict, label("conflict", "conflict")),
if(empty, label("empty", "(empty)")),
if(description, description.first_line(), description_placeholder),
if(description,
description.first_line(),
label(if(empty, "empty"), description_placeholder),
),
) ++ "\n",
),
)
@ -58,7 +61,10 @@ if(root,
) ++ "\n",
separate(" ",
if(empty, label("empty", "(empty)")),
if(description, description.first_line(), description_placeholder),
if(description,
description.first_line(),
label(if(empty, "empty"), description_placeholder),
),
) ++ "\n",
),
)
@ -74,7 +80,8 @@ concat(
"Author: " ++ format_detailed_signature(author) ++ "\n",
"Committer: " ++ format_detailed_signature(committer) ++ "\n",
"\n",
indent(" ", coalesce(description, description_placeholder ++ "\n")),
indent(" ",
coalesce(description, label(if(empty, "empty"), description_placeholder) ++ "\n")),
"\n",
)
'''
@ -90,9 +97,7 @@ label(if(current_operation, "current_operation"),
'''
builtin_op_log_comfortable = 'builtin_op_log_compact ++ "\n"'
description_placeholder = '''
label(if(empty, "empty ") ++ "description placeholder", "(no description set)")'''
description_placeholder = 'label("description placeholder", "(no description set)")'
email_placeholder = 'label("email placeholder", "(no email set)")'
name_placeholder = 'label("name placeholder", "(no name set)")'
commit_summary_separator = 'label("separator", " | ")'
@ -120,7 +125,10 @@ separate(" ",
separate(" ",
if(commit.conflict(), label("conflict", "(conflict)")),
if(commit.empty(), label("empty", "(empty)")),
if(commit.description(), commit.description().first_line(), description_placeholder),
if(commit.description(),
commit.description().first_line(),
label(if(commit.empty(), "empty"), description_placeholder),
),
),
),
)