From bff7ab0a43f8897c9c944d9854d6960e6d454777 Mon Sep 17 00:00:00 2001 From: Dean Lindqvist Todevski Date: Thu, 4 Jan 2024 12:45:43 +0100 Subject: [PATCH] Make git-timemachine.el compatible with yadm --- .config/doom/modules/tools/yadm/autoload.el | 16 ++++++++++++++++ .config/doom/modules/tools/yadm/config.el | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/.config/doom/modules/tools/yadm/autoload.el b/.config/doom/modules/tools/yadm/autoload.el index dce1988..230be25 100644 --- a/.config/doom/modules/tools/yadm/autoload.el +++ b/.config/doom/modules/tools/yadm/autoload.el @@ -30,6 +30,22 @@ (push (concat "GIT_DIR=" +yadm-git-dir) env)) env) +;;;###autload +(defun +yadm/git-timemachine-validate (oldfun &rest args) + "" + (if (+yadm--tracked-file-p) + t + (apply oldfun args))) + +;;;###autload +(defun +yadm/git-timemachine--process-file (&rest args) + "" + ;; (when (+yadm--tracked-file-p) + ;; (push (concat "--work-tree=" +yadm-work-tree) args) + ;; (push (concat "--git-dir=" +yadm-git-dir) args)) + (print args) + args) + ;;;###autoload (defun +yadm/find-file () "Edit yadm managed file." diff --git a/.config/doom/modules/tools/yadm/config.el b/.config/doom/modules/tools/yadm/config.el index 78fdc0c..0b742e2 100644 --- a/.config/doom/modules/tools/yadm/config.el +++ b/.config/doom/modules/tools/yadm/config.el @@ -12,6 +12,12 @@ (advice-add 'magit-process-environment :filter-return #'+yadm/magit-process-environment)) +(after! git-timemachine + (advice-add 'git-timemachine-validate + :around #'+yadm/git-timemachine-validate) + (advice-add 'git-timemachine--process-file + :filter-args #'+yadm/git-timemachine--process-file)) + (map! :leader :prefix ("y" . "yadm")