config.toml 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  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. backends.ssh.allowed-signers = '~/.ssh/allowed-signers'
  13. key = '~/.ssh/id_ed25519.pub'
  14. [git]
  15. sign-on-push = true
  16. [merge-tools.mergiraf]
  17. program = 'mergiraf'
  18. merge-args = ['merge', '$base', '$left', '$right', '-o', '$output']
  19. merge-conflict-exit-codes = [1]
  20. conflict-marker-style = 'git'
  21. [aliases]
  22. d = ['diff']
  23. l = ['log', '-r', 'ancestors((trunk()..@)::, 2) | ancestors(builtin_immutable_heads().., 2) | bookmarks()', '-T', 'log_medium']
  24. ll = ['log', '-r', 'ancestors(present(@) | present(trunk()) | bookmarks() | tracked_remote_bookmarks() | visible_heads(), 2)']
  25. ls = ['log', '-r', '..(@ | present(trunk()))', '-T', 'builtin_log_compact_full_description']
  26. tug = ['bookmark', 'move', '--from', 'closest_bookmark(@)', '--to', 'closest_pushable(@)']
  27. [revset-aliases]
  28. 'closest_bookmark(to)' = 'heads(::to & bookmarks())'
  29. 'closest_pushable(to)' = 'heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))'
  30. [templates]
  31. draft_commit_description = '''
  32. concat(
  33. description,
  34. "\nJJ: This commit contains the following changes:\n",
  35. indent("JJ: ", diff.stat(72)),
  36. "JJ: ignore-rest\n",
  37. diff.git(),
  38. )
  39. '''
  40. [template-aliases]
  41. 'format_short_signature(signature)' = 'coalesce(signature.email().local(), email_placeholder)'
  42. log_medium = '''
  43. if(root,
  44. format_root_commit(self),
  45. label(if(current_working_copy, "working_copy"),
  46. concat(
  47. format_short_commit_header(self) ++ "\n",
  48. separate(" ",
  49. if(empty, label("empty", "(empty)")),
  50. if(description,
  51. description.first_line() ++ if(description.first_line().len() < description.trim_end().len(),
  52. label("rest", "\n\t" ++ description.substr(description.first_line().len() + 2, -1).first_line())
  53. ),
  54. label(if(empty, "empty"), description_placeholder),
  55. ),
  56. ) ++ "\n",
  57. ),
  58. )
  59. )
  60. '''