config.toml 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778
  1. [user]
  2. name = 'raylu'
  3. email = '90059+raylu@users.noreply.github.com'
  4. [ui]
  5. pager = 'delta'
  6. default-command = 'l'
  7. show-cryptographic-signatures = true
  8. diff-formatter = ':git' # https://jj-vcs.github.io/jj/latest/config/#processing-contents-to-be-paged
  9. [signing] # https://jj-vcs.github.io/jj/latest/config/#automatically-signing-commits
  10. behavior = 'drop'
  11. backend = 'ssh'
  12. key = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQyY8qhakFYLJY4kEXuWMclyBCIz0uzvMEEhB7o+czr'
  13. [signing.backends.ssh]
  14. program = '/Applications/1Password.app/Contents/MacOS/op-ssh-sign'
  15. [git]
  16. sign-on-push = true
  17. [merge-tools.mergiraf]
  18. program = 'mergiraf'
  19. merge-args = ['merge', '$base', '$left', '$right', '-o', '$output']
  20. merge-conflict-exit-codes = [1]
  21. conflict-marker-style = 'git'
  22. [aliases]
  23. d = ['diff']
  24. l = ['log', '-r', 'ancestors((trunk()..@):: | heads(mutable()), 2) | roots(immutable()..)- | bookmarks()', '-T', 'log_medium']
  25. ll = ['log', '-r', 'ancestors(present(@) | present(trunk()) | bookmarks() | tracked_remote_bookmarks() | visible_heads(), 2)']
  26. ls = ['log', '-r', '..(@ | present(trunk()))', '-T', 'builtin_log_compact_full_description']
  27. tug = ['bookmark', 'move', '--from', 'closest_bookmark(@)', '--to', 'closest_pushable(@)']
  28. [revset-aliases]
  29. 'closest_bookmark(to)' = 'heads(::to & bookmarks())'
  30. 'closest_pushable(to)' = 'heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))'
  31. [templates]
  32. draft_commit_description = '''
  33. concat(
  34. description,
  35. "\nJJ: This commit contains the following changes:\n",
  36. indent("JJ: ", diff.stat(72)),
  37. "JJ: ignore-rest\n",
  38. diff.git(),
  39. )
  40. '''
  41. [template-aliases]
  42. 'format_short_signature(signature)' = 'coalesce(signature.email().local(), email_placeholder)'
  43. log_medium = '''
  44. if(root,
  45. format_root_commit(self),
  46. label(if(current_working_copy, "working_copy"),
  47. concat(
  48. label(if(self.contained_in("remote_bookmarks().."), "unpushed"), format_short_commit_header(self)) ++ "\n",
  49. separate(" ",
  50. if(empty, label("empty", "(empty)")),
  51. if(description,
  52. description.first_line() ++ if(description.first_line().len() < description.trim_end().len(),
  53. label("rest", "\n\t" ++ description.substr(description.first_line().len() + 2, -1).first_line())
  54. ),
  55. label(if(empty, "empty"), description_placeholder),
  56. ),
  57. ) ++ "\n",
  58. ),
  59. )
  60. )
  61. '''
  62. [colors]
  63. 'bookmarks name' = '#d47ebe'
  64. 'commit author email' = '#f9e2af'
  65. 'commit change_id shortest prefix' = '#cba6f7'
  66. 'commit unpushed change_id shortest prefix' = '#fab387'
  67. 'commit working_copy unpushed change_id shortest prefix' = '#f38ba8'
  68. 'commit working_copy change_id shortest prefix' = '#f38ba8'
  69. timestamp = '#a6adc8'