From 5584412695aa31b1efa8322a2d869a3ebfa5a250 Mon Sep 17 00:00:00 2001
From: RGBCube <git@rgbcu.be>
Date: Wed, 14 May 2025 22:11:07 +0300
Subject: [PATCH] feat: update jj tug alias

---
 modules/common/jujutsu.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix
index 900037a..a631d68 100644
--- a/modules/common/jujutsu.nix
+++ b/modules/common/jujutsu.nix
@@ -49,9 +49,10 @@ in {
         aliases.d  = [ "diff" ];
         aliases.l  = [ "log" ];
 
-        aliases.tug = [ "bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-" ];
+        aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ];
 
-        revset-aliases."closest_bookmark(to)" = "heads(::to & bookmarks())";
+        revset-aliases."closest(to)" = "heads(::to & bookmarks())";
+        revset-aliases."closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:\"\") & (~empty() | merges()))";
 
         revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().., 2) | reachable(@, all())";