diff options
| author | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-03 09:58:40 +0200 |
|---|---|---|
| committer | Magdalena Szweda <hi@roughlynamed.net> | 2026-10-03 10:05:23 +0200 |
| commit | ce5d2f97a87ae281030de893e5375d9d01410873 (patch) | |
| tree | ab258db8663ccf6f7e723d72ca1c0d5a4703cc43 | |
| parent | 947367333fb9a263e145545d1e0aebdfaee29ac2 (diff) | |
test2
| -rw-r--r-- | config.el | 13 | ||||
| -rw-r--r-- | config.org | 13 |
2 files changed, 14 insertions, 12 deletions
@@ -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/") @@ -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 |