jj alias tweaks

Author: david-crespo

jjconfig.toml

@@ -32,14 +32,22 @@ merge-editor = "vscode"
 [ui.diff]
 format = "git"
 
+[revset-aliases]
+'closest_bookmark(to)' = 'heads(::to & bookmarks())'
+# Treat commits not authored by me as immutable. The `trunk().. &` bit is an
+# optimization to scan for non-`mine()` commits only among commits that are not
+# in `trunk()`.
+# https://jj-vcs.github.io/jj/v0.26.0/config/#set-of-immutable-commits
+"immutable_heads()" = "builtin_immutable_heads() | (trunk().. & ~mine())"
+
 [aliases]
 d = ["diff"]
 dm = ["describe", "-m"]
 dt = ["diff", "--tool", "difft"]
 rp = ["log", "--no-graph", "-T", "commit_id"]
 ds = ["diff", "--stat"]
-r = ["log"]
 cm = ["commit", "-m"]
+tug = ["bookmark", "move", "--from", "closest_bookmark(@)", "--to", "@-"]
 
 [merge-tools.difft]
 diff-args = ["--color=always", "$left", "$right"]

zprofile

@@ -16,7 +16,7 @@ alias gss='git show --stat'
 
 alias js="jj st"
 alias jd="jj d"
-alias jr="jj r -n 10"
+alias jr="jj log -n 10"
 alias jds="jj ds"
 alias jf="jj git fetch"
 alias jp="jj git push"
@@ -36,8 +36,18 @@ function curr_bookmark {
 }
 
 alias jdr='jj diff -f "$(curr_bookmark)@origin"'
-# set current bookmark (will default to -r @)
-alias jbs='jj bookmark set "$(curr_bookmark)"'
+alias jbs='jj tug'
+
+# when you accidentally edit a revision with a pushed bookmark, this puts the
+# changes in a new commit and resets the bookmark to the origin version
+function jsr() {
+  local b=$(curr_bookmark)
+  jj new "$b"@origin
+  jj restore -f "$b"
+  jj abandon "$b"
+  jj bookmark set "$b" -r "$b"@origin
+}
+
 # jj abandon branch
 function jab() {
   jj abandon -r "trunk()..$1" && jj bookmark forget "$1"