Move to inline labeling and building a single label in log node templ…

…ate.
jj-vcs · Apr 15, 2024 · af18572 · af18572
1 parent 2af590e
commit af18572
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 43 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,64 +166,63 @@ 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", 
   coalesce(
-    if(!self, "~"),
-    if(current_working_copy, "@"),
-    if(immutable, "◆"),
-    if(conflict, "×"),
-    "○",
+    if(!self, label("elided", "~")),
+    label(
+      separate(" ",
+        if(current_working_copy, "working_copy"),
+        if(immutable, "immutable"),
+        if(conflict, "conflict"),
+      ),
+      coalesce(
+        if(!self, "~"),
+        if(current_working_copy, "@"),
+        if(immutable, "◆"),
+        if(conflict, "×"),
+        "○",
+      )
+    )
   )
 )
 '''
 
 builtin_log_node_ascii = '''
-label_log_node(
+label("node", 
   coalesce(
-    if(!self, "~"),
-    if(current_working_copy, "@"),
-    if(immutable, "#"),
-    if(conflict, "x"),
-    "o",
+    if(!self, label("elided", "~")),
+    label(
+      separate(" ",
+        if(current_working_copy, "working_copy"),
+        if(immutable, "immutable"),
+        if(conflict, "conflict"),
+      ),
+      coalesce(
+        if(!self, "~"),
+        if(current_working_copy, "@"),
+        if(immutable, "#"),
+        if(conflict, "x"),
+        "o",
+      )
+    )
   )
 )
 '''
 
 builtin_op_log_node = '''
-label_op_log_node(
+label("node",
   coalesce(
-    if(current_operation, "@"),
+    if(current_operation, label("current_operation", "@")),
     "○",
   )
 )
 '''
 
 builtin_op_log_node_ascii = '''
-label_op_log_node(
+label("node",
   coalesce(
-    if(current_operation, "@"),
+    if(current_operation, label("current_operation", "@")),
     "o",
   )
 )