mirror of
https://github.com/samsonjs/config.git
synced 2026-06-25 05:09:09 +00:00
Sami Samhuri
f094a00623
When @ is a fresh empty scratchpad, tug now moves the closest bookmark to @- so it lands on the actual work instead of the empty change. Driven by a new tug_target() revset.
46 lines
1.9 KiB
TOML
46 lines
1.9 KiB
TOML
#:schema https://docs.jj-vcs.dev/latest/config-schema.json
|
|
|
|
# Symlinked to ~/.config/jj/config.toml by init.sh. To override anything on a
|
|
# specific machine/account, drop any *.toml into ~/.config/jj/conf.d/ — jj loads
|
|
# that directory and it wins over this file.
|
|
|
|
[user]
|
|
name = "Sami Samhuri"
|
|
email = "sami@samhuri.net"
|
|
|
|
[git]
|
|
push = "github"
|
|
fetch = "github"
|
|
|
|
[revset-aliases]
|
|
# Prefer the github remote, and treat a `dev` integration branch as trunk when
|
|
# it exists (hobby repos where dev is worked on and merged to main to release).
|
|
# latest() picks the most recently-committed of whichever are present.
|
|
"trunk()" = "latest(present(dev@github) | present(dev@origin) | present(main@github) | present(master@github) | present(main@origin) | present(master@origin) | root())"
|
|
|
|
# Tip changes (heads) you own that carry no bookmark and aren't in trunk.
|
|
"unbookmarked()" = "(visible_heads() & mine()) ~ bookmarks() ~ ::trunk()"
|
|
|
|
# Your mutable work-in-progress: everything you own that isn't in trunk yet.
|
|
"open()" = "mine() & ~::trunk()"
|
|
|
|
# The bookmark nearest below a given rev — powers `tug`.
|
|
"closest_bookmark(to)" = "heads(::to & bookmarks())"
|
|
|
|
# Where `tug` should land the bookmark: @ normally, but @- when @ is an
|
|
# empty change (so a fresh scratchpad doesn't drag the bookmark off the work).
|
|
"tug_target()" = "(@ ~ empty()) | (@ & empty())-"
|
|
|
|
[aliases]
|
|
# Compact log of your open work.
|
|
wip = ["log", "-r", "open()"]
|
|
|
|
# Your unbookmarked tip changes.
|
|
tips = ["log", "-r", "unbookmarked()"]
|
|
|
|
# Bookmarks (local + remote) with date + name.
|
|
bks = ["log", "--no-graph", "-r", "bookmarks() | remote_bookmarks()",
|
|
"-T", "separate(\" \", committer.timestamp().local().format(\"%Y-%m-%d %H:%M\"), separate(\" \", bookmarks, remote_bookmarks)) ++ \"\\n\""]
|
|
|
|
# Drag the closest bookmark up to @ (or @- when @ is an empty change).
|
|
tug = ["bookmark", "move", "--from", "closest_bookmark(tug_target())", "--to", "tug_target()"]
|