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

Move to inline labeling and building a single label in log node template.

Browse source
This commit is contained in:
Anton Älgmyr 2024-04-14 23:20:26 +02:00
parent 2af590eb54
commit af185725a1
2 changed files with 40 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/src/config/colors.toml
View file

@ -88,10 +88,8 @@
"op_log current_operation user" = "yellow" # No bright yellow, see comment above "op_log current_operation user" = "yellow" # No bright yellow, see comment above
"op_log current_operation time" = "bright cyan" "op_log current_operation time" = "bright cyan"
"node" = { bold = true }
"node elided" = { fg = "bright black" } "node elided" = { fg = "bright black" }
"node working_copy" = { fg = "green" } "node working_copy" = { fg = "green", bold = true }
"node current_operation" = { fg = "green" } "node current_operation" = { fg = "green", bold = true }
"node immutable" = { fg = "bright cyan" } "node immutable" = { fg = "bright cyan", bold = true }
"node conflict" = { fg = "red" } "node conflict" = { fg = "red", bold = true }
"node normal" = { bold = false }

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

@ -166,29 +166,16 @@ if(hidden,
) )
''' '''
'label_log_node(content)' = '''
label("node",
coalesce(
if(!self, label("elided", content)),
if(immutable, label("immutable", content)),
if(conflict, label("conflict", content)),
if(current_working_copy, label("working_copy", content)),
label("normal", content),
)
)
'''
'label_op_log_node(content)' = '''
label("node",
coalesce(
if(current_operation, label("current_operation", content)),
label("normal", content),
)
)
'''
builtin_log_node = ''' builtin_log_node = '''
label_log_node( label("node",
coalesce(
if(!self, label("elided", "~")),
label(
separate(" ",
if(current_working_copy, "working_copy"),
if(immutable, "immutable"),
if(conflict, "conflict"),
),
coalesce( coalesce(
if(!self, "~"), if(!self, "~"),
if(current_working_copy, "@"), if(current_working_copy, "@"),
@ -196,11 +183,21 @@ label_log_node(
if(conflict, "×"), if(conflict, "×"),
"○", "○",
) )
)
)
) )
''' '''
builtin_log_node_ascii = ''' builtin_log_node_ascii = '''
label_log_node( label("node",
coalesce(
if(!self, label("elided", "~")),
label(
separate(" ",
if(current_working_copy, "working_copy"),
if(immutable, "immutable"),
if(conflict, "conflict"),
),
coalesce( coalesce(
if(!self, "~"), if(!self, "~"),
if(current_working_copy, "@"), if(current_working_copy, "@"),
@ -208,22 +205,24 @@ label_log_node(
if(conflict, "x"), if(conflict, "x"),
"o", "o",
) )
)
)
) )
''' '''
builtin_op_log_node = ''' builtin_op_log_node = '''
label_op_log_node( label("node",
coalesce( coalesce(
if(current_operation, "@"), if(current_operation, label("current_operation", "@")),
"○", "○",
) )
) )
''' '''
builtin_op_log_node_ascii = ''' builtin_op_log_node_ascii = '''
label_op_log_node( label("node",
coalesce( coalesce(
if(current_operation, "@"), if(current_operation, label("current_operation", "@")),
"o", "o",
) )
) )