sjs/config
1
0
Fork 0
mirror of https://github.com/samsonjs/config.git synced 2026-06-24 04:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make tug skip empty @ and target @- instead

Browse source 
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.
This commit is contained in:
Sami Samhuri 2026-05-31 14:51:16 -07:00
parent 8d9909688b
commit f094a00623
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jj/config.toml
View file

@ -27,6 +27,10 @@ fetch = "github"
# 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()"]
@ -38,5 +42,5 @@ tips = ["log", "-r", "unbookmarked()"]
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 @.
tug = ["bookmark", "move", "--from", "closest_bookmark(@)", "--to", "@"]
# Drag the closest bookmark up to @ (or @- when @ is an empty change).
tug = ["bookmark", "move", "--from", "closest_bookmark(tug_target())", "--to", "tug_target()"]