diff --git a/jj/config.toml b/jj/config.toml --- a/jj/config.toml +++ b/jj/config.toml @@ -19,17 +19,23 @@ [templates] log_node = ''' coalesce( + if(!self, label("elided", "▪")), if(current_working_copy, "●"), if(immutable, "⊗", "○"), ) ''' - [template-aliases] "format_short_id(id)" = 'id.shortest(12).prefix() ++ "[" ++ id.shortest(12).rest() ++ "]"' 'format_timestamp(timestamp)' = "timestamp.ago()" 'format_short_signature(signature)' = "signature.email().local()" 'format_detailed_signature(signature)' = "signature.email().local()" - +'commit_timestamp()' = 'self.author().timestamp()' +'format_detailed_cryptographic_signature(sig)' = ''' + if(sig, + concat(sig.status() ++ " signature, key "++ sig.key()), + "(no sig)", + ) +''' builtin_log_detailed = ''' "\n\n\n" ++ concat( @@ -41,6 +47,7 @@ "Signature: " ++ format_detailed_cryptographic_signature(signature)), "\n", "Author : " ++ format_detailed_signature(author) ++ "\n", + "TimeStamp : " ++ format_timestamp(commit_timestamp()) ++ "\n", "Committer: " ++ format_detailed_signature(committer) ++ "\n", indent(" ", coalesce(description, label(if(empty, "empty"), description_placeholder) ++ "\n")), @@ -65,8 +72,9 @@ key = "redacted" [git] -#auto-local-bookmark = true +# auto-local-bookmark = true push-bookmark-prefix = "troy0820/feat-" [remotes.origin] auto-track-bookmarks = 'true' +