#:schema https://docs.jj-vcs.dev/latest/config-schema.json

[ui]
default-command = ["status"]
#conflict-marker-style = "git"
#conflict-marker-style = "snapshot"
conflict-marker-style = "diff"
#diff-formatter = ":git"
diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"] 
merge-editor = "diffconflicts"

[colors]
# Highlight hunks with background
#"diff removed token" = { underline = false }
#"diff added token" = { underline = false }
# Alternatively, swap colors
"diff token" = { underline = false }

[templates]
commit_trailers = '''
format_signed_off_by_trailer(self)
++ if(!trailers.contains_key("Change-Id"), format_gerrit_change_id_trailer(self))'''
git_push_bookmark = '"sjb/push-" ++ change_id.short()'

[merge-tools.nvimdiff]
program = "nvim"
merge-args = ["-d", "$left", "$right", "$base", "$output"]

[merge-tools.diffconflicts]
program = "nvim"
merge-args = [
    "-c", "let g:jj_diffconflicts_marker_length=$marker_length",
    "-c", "JJDiffConflicts!", "$output", "$base", "$left", "$right",
]
merge-tool-edits-conflict-markers = true

[signing]
#behavior = "own"
behavior = "drop"
backend = "gpg"
## You can set `key` to anything accepted by `gpg -u`
## If not set then defaults to the key associated with `user.email`
# key = "4ED556E9729E000F"
key = "8E887C55"
#key = "steve@sagacity.ca"
# Configure signing backend as before, but lazily signing only on push.

[git]
sign-on-push = true
# Prevent pushing work in progress or anything explicitly labeled "private"
private-commits = "description('wip:*') | description('private:*')"

[snapshot]
max-new-file-size = "10MiB"

[aliases]
# `jj l` shows commits on the working-copy commit's (anonymous) bookmark
# compared to the `main` bookmark
l = ["log", "-r", "::"]
lt = ["log", "-r", "(trunk()..@):: | (trunk()..@)-"]
fetch = ["git", "fetch"]
init = ["git", "init", "--colocate"]
mark = ["bookmark", "set", "-r", "@"]
push = ["git", "push", "--allow-new"]
track = ["bookmark", "track"]
wip = ["log", "-r", "bookmarks(wip*)"]

[revset-aliases]
wip = "heads(::@ ~ description(''))::"

[[--scope]]
--when.repositories = ["~/Projects/personal"]

[--scope.user]
email = "steve@sagacity.ca"