dotfiles/config/jj/config.toml

[user]
name = 'raylu'
email = '90059+raylu@users.noreply.github.com'

[ui]
pager = 'delta'
default-command = 'l'
show-cryptographic-signatures = true
diff-formatter = ':git' # https://jj-vcs.github.io/jj/latest/config/#processing-contents-to-be-paged

[signing] # https://jj-vcs.github.io/jj/latest/config/#automatically-signing-commits
behavior = 'drop'
backend = 'ssh'
key = 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQyY8qhakFYLJY4kEXuWMclyBCIz0uzvMEEhB7o+czr'
[signing.backends.ssh]
program = '/Applications/1Password.app/Contents/MacOS/op-ssh-sign'
allowed-signers = '~/.ssh/allowed_signers'

[git]
sign-on-push = true

[merge-tools.mergiraf]
program = 'mergiraf'
merge-args = ['merge', '$base', '$left', '$right', '-o', '$output']
merge-conflict-exit-codes = [1]
conflict-marker-style = 'git'

[aliases]
d = ['diff']
l = ['log', '-r', 'ancestors((trunk()..@):: | heads(mutable()), 2) | roots(immutable()..)- | bookmarks()', '-T', 'log_medium']
ll = ['log', '-r', 'ancestors(present(@) | present(trunk()) | bookmarks() | tracked_remote_bookmarks() | visible_heads(), 2)']
ls = ['log', '-r', '..(@ | present(trunk()))', '-T', 'builtin_log_compact_full_description']
s = ['show', '@-']
tug = ['bookmark', 'move', '--from', 'closest_bookmark(@)', '--to', 'closest_pushable(@)']

[revset-aliases]
'closest_bookmark(to)' = 'heads(::to & bookmarks())'
'closest_pushable(to)' = 'heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))'

[templates]
draft_commit_description = '''
concat(
  description,
  "\nJJ: This commit contains the following changes:\n",
  indent("JJ:     ", diff.stat(72)),
  "JJ: ignore-rest\n",
  diff.git(),
)
'''

[template-aliases]
'format_short_signature(signature)' = 'coalesce(signature.email().local(), email_placeholder)'
log_medium = '''
if(root,
  format_root_commit(self),
  label(if(current_working_copy, "working_copy"),
    concat(
	  label(if(self.contained_in("remote_bookmarks().."), "unpushed"), format_short_commit_header(self)) ++ "\n",
      separate(" ",
        if(empty, label("empty", "(empty)")),
        if(description,
          description.first_line() ++ if(description.lines().len() > 1,
            label("rest", "\n\t" ++ description.substr(description.first_line().len() + 2, -1).first_line())
          ),
          label(if(empty, "empty"), description_placeholder),
        ),
      ) ++ "\n",
    ),
  )
)
'''

[colors]
'bookmarks name' = '#d47ebe'
'commit author email' = '#f9e2af'
'commit change_id shortest prefix' = '#cba6f7'
'commit unpushed change_id shortest prefix' = '#fab387'
'commit working_copy unpushed change_id shortest prefix' = '#f38ba8'
'commit working_copy change_id shortest prefix' = '#f38ba8'
timestamp = '#a6adc8'