mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 05:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: Clean up template to use coalesce where relevant.

Browse source 
Basically, clean up instances of `if\(([^,]+), \1,`.
Also fix one annoying comma without a following space.
This commit is contained in:
Anton Älgmyr 2024-04-21 18:42:45 +02:00
parent a2c49abbbe
commit 484097c873
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,10 +124,10 @@ commit_summary_separator = 'label("separator", " | ")'
'format_short_change_id(id)' = 'format_short_id(id)'
'format_short_commit_id(id)' = 'format_short_id(id)'
'format_short_signature(signature)' = '''
if(signature.email(), signature.email(), email_placeholder)'''
coalesce(signature.email(), email_placeholder)'''
'format_detailed_signature(signature)' = '''
if(signature.name(), signature.name(), name_placeholder)
++ " <" ++ if(signature.email(), signature.email(), email_placeholder) ++ ">"
coalesce(signature.name(), name_placeholder)
++ " <" ++ coalesce(signature.email(), email_placeholder) ++ ">"
++ " (" ++ format_timestamp(signature.timestamp()) ++ ")"'''
'format_time_range(time_range)' = '''
time_range.start().ago() ++ label("time", ", lasted ") ++ time_range.duration()'''
@ -161,7 +161,7 @@ if(hidden,
format_short_change_id(change_id) ++ " hidden"
),
label(if(divergent, "divergent"),
format_short_change_id(change_id) ++ if(divergent,"??")
format_short_change_id(change_id) ++ if(divergent, "??")
)
)
'''