home-manager/profiles/jujutsu/jj/config.toml

   1 [aliases]
   2 a = ["absorb"]
   3 dlog = ["log", "-r"]
   4 l = ["log", "-r", "(trunk()..@):: | (trunk()..@)-"]
   5 #l = ["log", "-r", "more()"]
   6 fresh = ["new", "trunk()"]
   7 # Figures out the closest bookmark
   8 # and pulls it up to the latest change that can be pushed.
   9 tug = [
  10     "bookmark",
  11     "move",
  12     "--from",
  13     "closest_bookmark(@)",
  14     "--to",
  15     "closest_pushable(@)",
  16 ]
  17 bl = ["bookmark", "list"]
  18 blr = ["bookmark", "list", "--revisions", "recent()"]
  19 c = ["commit"]
  20 ci = ["commit", "--interactive"] # commit interactive
  21 m = ["describe"]
  22 mm = ["describe", "--message"]
  23 d = ["diff", "--stat", "--revisions"]
  24 dd = ["diff", "--revisions"]
  25 dp = ["describe", "@-"] # describe previous
  26 e = ["edit"]
  27 para = [ "parallelize", "closest_tip()..@-" ]
  28 pull = ["git", "fetch"]
  29 push = ["git", "push"]
  30 gf = ["git", "fetch"] # git fetchq
  31 gi = ["git", "init", "--colocate"]
  32 gp = ["git", "push"] # git push
  33 i = ["git", "init", "--colocate"]
  34 nb = ["bookmark", "create", "-r @-"] # new bookmark (for creating bookmark to push)
  35 nc = ["new", "-B", "@", "--no-edit"] # new change before
  36 r = ["rebase"]
  37 rm = ["rebase", "-d", "main"] # "re-main"
  38 s = ["show", "--stat"]
  39 ss = ["show"]
  40 sq = ["squash"]
  41 sqi = ["squash", "--interactive"]
  42 si = ["squash", "--interactive"]
  43 sp = ["show", "@-"]
  44 up = ["util", "exec", "--", "sh", "-c", """
  45 if [ $# == 0 ]; then
  46   jj bookmark move --from "closest_bookmark(@)" --to "closest_pushable(@)"
  47 else
  48   jj bookmark move --to "closest_pushable(@)" "$@"
  49 fi
  50 """, ""]
  51 upp = ["util", "exec", "--", "sh", "-c", "jj up && jj git push", ""]
  52
  53 track-github-PR = ["util", "exec", "--", 'sh', '-euxc', '''
  54   PR=$1
  55   gh pr view --json headRepository,headRefName,headRepositoryOwner $PR --jq '"
  56     set_remote() {
  57       jj 2>/dev/null git remote add \"$1\" \"$2\" ||
  58       jj git remote set-url \"$1\" \"$2\"
  59     }
  60     set_remote \(.headRepositoryOwner.login) git@github.com:\(.headRepositoryOwner.login)/\(.headRepository.name)
  61     jj git fetch --remote \(.headRepositoryOwner.login) --branch \(.headRefName)
  62     jj bookmark track \(.headRefName)@\(.headRepositoryOwner.login)
  63     origin=$(gh repo view --json owner,name --jq .owner.login)
  64     set_remote \"$origin\" \"$(gh repo view --json sshUrl --jq .sshUrl)\"
  65     git fetch --force --update-head-ok \"$origin\" \"refs/pull/'"$PR"'/head:refs/remotes/$origin/pull/'"$PR"'\"
  66   "' |
  67   sh -euxs
  68 ''', "jj-track-github-PR"]
  69
  70 untrack-github-PR = ["util", "exec", "--", 'sh', '-euxc', '''
  71   PR=$1
  72   gh pr view --json headRepository,headRefName,headRepositoryOwner $PR --jq '"
  73     jj bookmark forget \(.headRefName) || true
  74     origin=$(gh repo view --json owner,name --jq .owner.login)
  75     git for-each-ref --format \"delete %(refname)\" \\
  76       \"refs/remotes/\(.headRepositoryOwner.login)/\(.headRefName)\" \\
  77       \"refs/remotes/$origin/pull/'"$PR"'\" |
  78     tee /dev/stderr |
  79     git update-ref --stdin
  80   "' |
  81   sh -euxs
  82 ''', "jj-untrack-github-PR"]
  83
  84 # Get all open stacks of work.
  85 open = ["log", "-r", "open()"]
  86
  87 # Better name, IMO.
  88 credit = ["file", "annotate"]
  89
  90 # Retrunk a series. Typically used as `jj retrunk -s ...`, and notably can be
  91 # used with open:
  92 # - jj retrunk -s 'all:roots(open())'
  93 retrunk = ["rebase", "-d", "trunk()"]
  94
  95 # Retrunk the current stack of work.
  96 reheat = ["rebase", "-d", "trunk()", "-s", "all:roots(trunk()..stack(@))"]
  97
  98 # Take content from any change, and move it into @.
  99 # - jj consume xyz path/to/file`
 100 consume = ["squash", "--into", "@", "--from"]
 101
 102 # Eject content from @ into any other change.
 103 # - jj eject xyz --interactive
 104 eject = ["squash", "--from", "@", "--into"]
 105
 106
 107 # All operations
 108 o = ["op", "log"]
 109 # All operations, with more whitespace
 110 oo = ["op", "log", "-T", "builtin_op_log_comfortable"]
 111
 112 abandon-empties = ["abandon", "-r", "description(exact:'') ~ root()"]
 113
 114 # Move $commit just after the bookmark, and then move $bookmark on top of it.
 115 #
 116 # "$bookmark+" works, because after rebase -A, the only child of $bookmark is $commit.
 117 # I do not use $commit itself because it might point to a
 118 # different commit after the rebase (e.g. @-).
 119 #
 120 # My workflow uses mega-merge: I write a commit or two,
 121 # and then move them to relevant branches with jj to.
 122 # As a bonus, bookmarks are kept up-to-date for easy pushing.
 123 # https://github.com/jj-vcs/jj/discussions/5568#discussioncomment-14289564
 124 to = ['util', 'exec', '--', 'sh', '-c', '''
 125 set -eux
 126
 127 bookmark=$1
 128 commit=${2-}
 129
 130 # default to latest non-ephemeral commit
 131 if [ -z "$commit" ]; then
 132   commit=$(jj log --no-graph -T change_id -r '@ ~ ephemeral')
 133   if [ -n "$commit" ]; then
 134     # Moving current commit, create a new one to preserve
 135     # current position in the commit DAG
 136     jj new
 137   else
 138     commit=@-
 139   fi
 140 fi
 141
 142 jj rebase -r "$commit" -A "$bookmark"
 143 jj bookmark move -f "$bookmark" -t "$bookmark+"
 144 ''', 'jj-to']
 145
 146 [revsets]
 147 # Focus current commit, trunk(), on local work and remote work by removing ancestors of trunk()
 148 log = "@ | trunk() | ancestors_and_children(bookmarks() | tracked_remote_bookmarks()) ~ ..trunk()"
 149
 150 [revset-aliases]
 151 "active(rev)" = "(ancestors(rev) | descendants(rev)) ~ immutable()"
 152 "ancestors_and_children(x)" = "..x | x::"
 153
 154 # Remote commits not merged in trunk()
 155 "review(x)" = "ancestors_and_children(remote_bookmarks(x)) ~ ..trunk()"
 156
 157 # Authored or committed by specified user
 158 'user(x)' = 'author(x) | committer(x)'
 159
 160 'closest_tip()' = 'heads(::@ & remote_bookmarks())'
 161
 162 # Those who would be abandoned if you check out something else
 163 ephemeral = 'description(exact:"") & empty()'
 164
 165 # show everything in the current set of branches off of trunk():
 166 branch = '(coalesce(trunk(),root())..@)- | (coalesce(trunk(),root())..@)::'
 167
 168 # radicle
 169 'closest_bookmark(to)' = 'heads(::to & bookmarks())'
 170 'closest_pushable(to)' = 'heads(::to & mutable() & ~description(exact:"") & (~empty() | merges()))'
 171
 172 "desc(x)" = "description(x)"
 173 "pending()" = ".. ~ ::tags() ~ ::remote_bookmarks() ~ @ ~ private()"
 174 "private()" = "description(glob:'wip:*') | description(glob:'private:*') | description(glob:'WIP:*') | description(glob:'PRIVATE:*') | conflicts() | (empty() ~ merges()) | description('substring-i:\"DO NOT MAIL\"')"
 175 #"trunk()" = "main@rad"
 176 #"immutable_heads()" = "tags()"
 177 "immutable_heads()" = "present(trunk()) | tags() | ( untracked_remote_bookmarks() ~ untracked_remote_bookmarks(remote='rad') ~ untracked_remote_bookmarks(regex:'^patch(es)/',remote='rad'))"
 178 #'default()' = 'coalesce(trunk(), root())::present(@) | ancestors(visible_heads(), 2)'
 179
 180 # dev
 181 'bases' = 'present(main@rad) | present(master@origin) | present(main@origin)'
 182 'downstream(x,y)' = '(x::y) & y'
 183 'branches' = 'downstream(trunk(), bookmarks()) & mine()'
 184 'branchesandheads' = 'branches | (heads(trunk()::) & mine())'
 185 'curbranch' = 'latest(branches::@- & branches)'
 186 'nextbranch' = 'roots(@:: & branchesandheads)'
 187
 188 'more' = 'log | ancestors(visible_heads(), 2)'
 189 'unmerged()' = 'bookmarks() & ~(trunk():: | trunk())'
 190 'recent()' = 'committer_date(after:"1 months ago")'
 191 'recent(revset)' = 'revset & recent()'
 192
 193
 194 # stack(x, n) is the set of mutable commits reachable from 'x', with 'n'
 195 # parents. 'n' is often useful to customize the display and return set for
 196 # certain operations. 'x' can be used to target the set of 'roots' to traverse,
 197 # e.g. @ is the current stack.
 198 'stack()' = 'ancestors(reachable(@, mutable()), 2)'
 199 'stack(x)' = 'ancestors(reachable(x, mutable()), 2)'
 200 'stack(x, n)' = 'ancestors(reachable(x, mutable()), n)'
 201
 202 # The current set of "open" works. It is defined as:
 203 #
 204 # - given the set of commits not in trunk, that are written by me,
 205 # - calculate the given stack() for each of those commits
 206 #
 207 # n = 1, meaning that nothing from `trunk()` is included, so all resulting
 208 # commits are mutable by definition.
 209 'open()' = 'stack(trunk().. & mine(), 1)'
 210
 211 # the set of 'ready()' commits. defined as the set of open commits, but nothing
 212 # that is blacklisted or any of their children.
 213 #
 214 # often used with gerrit, which you can use to submit whole stacks at once:
 215 #
 216 # - jj gerrit send -r 'ready()' --dry-run
 217 'ready()' = 'open() ~ blacklist()::'
 218
 219 [template-aliases]
 220 # Hide unnecessary bits to make the jj log more concise
 221 #'format_short_change_id(id)' = 'id.shortest(4)'
 222 #'format_short_commit_id(id)' = 'id.shortest(4)'
 223 'format_timestamp(timestamp)' = 'timestamp.ago()'
 224
 225 #'format_short_signature(signature)' = 'signature.email()'
 226 # Both name and email address
 227 #'format_short_signature(signature)' = 'signature'
 228 # Username part of the email address
 229 #'format_short_signature(signature)' = 'signature.email().local()'
 230 'format_short_signature(signature)' = 'signature.name()'
 231
 232
 233 [git]
 234 write-change-id-header = true
 235 # Prevent pushing work in progress or anything explicitly labeled "private"
 236 private-commits = "description(glob:'wip:*') | description(glob:'private:*')"
 237 # Don't require --allow-new when pushing a new bookmark
 238 push-new-bookmarks = true
 239 fetch = ["origin", "rad"]
 240 push = "origin"
 241
 242
 243 [user]
 244 name = "Julien Moutinho"
 245 email = "julm@sourcephile.fr"
 246
 247 [ui]
 248 paginate = "auto"
 249 default-command = "log"
 250 diff-editor = ":builtin"
 251 # From https://github.com/julienvincent/hunk.nvim
 252 #diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
 253
 254 [merge-tools.diffconflicts]
 255 program = "nvim"
 256 merge-args = [
 257     "-c", "let g:jj_diffconflicts_marker_length=$marker_length",
 258     "-c", "JJDiffConflicts!", "$output", "$base", "$left", "$right",
 259 ]
 260 merge-tool-edits-conflict-markers = true
 261
 262 # # via @dubi steinkek in the jj discord
 263 # [merge-tools.gitpatch]
 264 # program = "sh"
 265 # edit-args = ["-c", '''
 266 #   set -eu
 267 #   rm -f "$right/JJ-INSTRUCTIONS"
 268 #   git -C "$left" init -q
 269 #   git -C "$left" add -A
 270 #   git -C "$left" commit -q -m baseline --allow-empty
 271 #   mv "$left/.git" "$right"
 272 #   git -C "$right" add --intent-to-add --ignore-removal . # tell git to include new files in interactive patch mode
 273 #   git -C "$right" add -p
 274 #   git -C "$right" diff-index --quiet --cached HEAD && { echo "No changes done, aborting split."; exit 1; }
 275 #   git -C "$right" commit -q -m split
 276 #   git -C "$right" reset -q --hard # undo changes in modified files, remove added files
 277 # ''',
 278 # ]
 279 # merge-args = ["-c", "echo gitpatch cannot be used as a diff tool"]
 280 # diff-args = ["-c", "echo gitpatch cannot be used as a diff tool"]