diff options
| -rw-r--r-- | doom/.config/doom/config.el | 13 | ||||
| -rw-r--r-- | doom/.config/doom/config.org | 13 | ||||
| -rw-r--r-- | tmp.txt | 1 |
3 files changed, 15 insertions, 12 deletions
diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el index d80b253..483b6c7 100644 --- a/doom/.config/doom/config.el +++ b/doom/.config/doom/config.el @@ -326,12 +326,13 @@ emms-cache-file (concat doom-cache-dir "emms-cache")) (defun my/vc-jj--advance-before-push (&rest _) (my/vc-jj-bookmark-advance)) (advice-add 'vc-jj-push :before #'my/vc-jj--advance-before-push) - - (defun my/vc-jj-checkin (files comment &optional _rev) - "Describe @, then push. FILES is ignored: jj has no partial checkin." - (let ((default-directory (vc-jj-root (car files)))) - (vc-jj-modify-change-comment nil "@" comment) - (vc-jj-push nil))) + (setq my/vc-jj-advance-to "@-") +(defun my/vc-jj-checkin (files comment &optional _rev) + "Describe @, start a fresh change, advance bookmarks, push." + (let ((default-directory (vc-jj-root (car files)))) + (vc-jj-modify-change-comment nil "@" comment) + (vc-jj--command-dispatched nil 0 nil "new" "--quiet") + (vc-jj-push nil))) (advice-add 'vc-jj-checkin :override #'my/vc-jj-checkin)) (setq org-directory "~/org/") diff --git a/doom/.config/doom/config.org b/doom/.config/doom/config.org index 96ef07d..95e35ab 100644 --- a/doom/.config/doom/config.org +++ b/doom/.config/doom/config.org @@ -610,12 +610,13 @@ Here we fix it! (defun my/vc-jj--advance-before-push (&rest _) (my/vc-jj-bookmark-advance)) (advice-add 'vc-jj-push :before #'my/vc-jj--advance-before-push) - - (defun my/vc-jj-checkin (files comment &optional _rev) - "Describe @, then push. FILES is ignored: jj has no partial checkin." - (let ((default-directory (vc-jj-root (car files)))) - (vc-jj-modify-change-comment nil "@" comment) - (vc-jj-push nil))) + (setq my/vc-jj-advance-to "@-") +(defun my/vc-jj-checkin (files comment &optional _rev) + "Describe @, start a fresh change, advance bookmarks, push." + (let ((default-directory (vc-jj-root (car files)))) + (vc-jj-modify-change-comment nil "@" comment) + (vc-jj--command-dispatched nil 0 nil "new" "--quiet") + (vc-jj-push nil))) (advice-add 'vc-jj-checkin :override #'my/vc-jj-checkin)) #+end_src @@ -0,0 +1 @@ +hii!! |