Inline labeling and build a single label.

jj-vcs · Apr 14, 2024 · 5ee0e77 · 5ee0e77
1 parent e129fb3
commit 5ee0e77
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 31 deletions.
diff --git a/cli/src/config/colors.toml b/cli/src/config/colors.toml
@@ -88,10 +88,8 @@
 "op_log current_operation user" = "yellow"                    # No bright yellow, see comment above
 "op_log current_operation time" = "bright cyan"
 
-"node" = { bold = true }
 "node elided" = { fg = "bright black" }
-"node working_copy" = { fg = "green" }
-"node current_operation" = { fg = "green" }
-"node immutable" = { fg = "bright cyan" }
-"node conflict" = { fg = "red" }
-"node normal" = { bold = false }
+"node working_copy" = { fg = "green", bold = true }
+"node current_operation" = { fg = "green", bold = true }
+"node immutable" = { fg = "bright cyan", bold = true }
+"node conflict" = { fg = "red", bold = true }
diff --git a/cli/src/config/templates.toml b/cli/src/config/templates.toml
@@ -166,29 +166,15 @@ 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 = '''
-label_log_node(
+label("node" ++
+  if(
+    self,
+    if(current_working_copy, " working_copy")
+    ++ if(immutable, " immutable")
+    ++ if(conflict, " conflict"),
+    " elided"
+  ),
   coalesce(
     if(!self, "~"),
     if(current_working_copy, "@"),
@@ -200,7 +186,14 @@ label_log_node(
 '''
 
 builtin_log_node_ascii = '''
-label_log_node(
+label("node" ++
+  if(
+    self,
+    if(current_working_copy, " working_copy")
+    ++ if(immutable, " immutable")
+    ++ if(conflict, " conflict"),
+    " elided"
+  ),
   coalesce(
     if(!self, "~"),
     if(current_working_copy, "@"),
@@ -212,7 +205,7 @@ label_log_node(
 '''
 
 builtin_op_log_node = '''
-label_op_log_node(
+label("node" ++ if(current_operation, " current_operation"),
   coalesce(
     if(current_operation, "@"),
     "○",
@@ -221,7 +214,7 @@ label_op_log_node(
 '''
 
 builtin_op_log_node_ascii = '''
-label_op_log_node(
+label("node" ++ if(current_operation, " current_operation"),
   coalesce(
     if(current_operation, "@"),
     "o",