howard/hamacs
howard/hamacs
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turning on difftastic

Browse source
This commit is contained in:
Howard Abrams 2022-09-12 21:46:53 -07:00
parent aaa8633d4a
commit 5ff184c0ec
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ha-config.org
View file

@ -1649,7 +1649,7 @@ Next, we can do this, to use this as a diff tool for everything.
(setenv "GIT_EXTERNAL_DIFF" "difft") (setenv "GIT_EXTERNAL_DIFF" "difft")
#+end_src #+end_src
But perhaps integrating it into Magit and selectively calling it (as it is slow). Tassilo suggests making the call to =difft= optional by first creating a helper function to set the =GIT_EXTERNAL_DIFF= to =difft=: But perhaps integrating it into Magit and selectively calling it (as it is slow). Tassilo suggests making the call to =difft= optional by first creating a helper function to set the =GIT_EXTERNAL_DIFF= to =difft=:
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp
(defun th/magit--with-difftastic (buffer command) (defun th/magit--with-difftastic (buffer command)
"Run COMMAND with GIT_EXTERNAL_DIFF=difft then show result in BUFFER." "Run COMMAND with GIT_EXTERNAL_DIFF=difft then show result in BUFFER."
(let ((process-environment (let ((process-environment
@ -1708,7 +1708,7 @@ The functions below depend on [[help:magit-thing-at-point][magit-thing-at-point]
:commands magit-thing-at-point) :commands magit-thing-at-point)
#+end_src #+end_src
Next, let's define our first command basically doing a =git show= for some revision which defaults to the commit or branch at point or queries the user if there's none. Next, let's define our first command basically doing a =git show= for some revision which defaults to the commit or branch at point or queries the user if there's none.
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp
(defun th/magit-show-with-difftastic (rev) (defun th/magit-show-with-difftastic (rev)
"Show the result of \"git show REV\" with GIT_EXTERNAL_DIFF=difft." "Show the result of \"git show REV\" with GIT_EXTERNAL_DIFF=difft."
(interactive (interactive
@ -1729,7 +1729,7 @@ Next, let's define our first command basically doing a =git show= for some revis
(list "git" "--no-pager" "show" "--ext-diff" rev)))) (list "git" "--no-pager" "show" "--ext-diff" rev))))
#+end_src #+end_src
And here the second command which basically does a =git diff=. It tries to guess what one wants to diff, e.g., when point is on the Staged changes section in a magit buffer, it will run =git diff --cached= to show a diff of all staged changes. If it can not guess the context, it'll query the user for a range or commit for diffing. And here the second command which basically does a =git diff=. It tries to guess what one wants to diff, e.g., when point is on the Staged changes section in a magit buffer, it will run =git diff --cached= to show a diff of all staged changes. If it can not guess the context, it'll query the user for a range or commit for diffing.
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp
(defun th/magit-diff-with-difftastic (arg) (defun th/magit-diff-with-difftastic (arg)
"Show the result of \"git diff ARG\" with GIT_EXTERNAL_DIFF=difft." "Show the result of \"git diff ARG\" with GIT_EXTERNAL_DIFF=difft."
(interactive (interactive
@ -1758,7 +1758,7 @@ And here the second command which basically does a =git diff=. It tries to guess
#+end_src #+end_src
What's left is integrating the new show and diff commands in Magit. For that purpose, Tasillo created a new transient prefix for all personal commands. Intriguing, but I have a hack that I can use on a leader: What's left is integrating the new show and diff commands in Magit. For that purpose, Tasillo created a new transient prefix for all personal commands. Intriguing, but I have a hack that I can use on a leader:
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp
(defun ha-difftastic-here () (defun ha-difftastic-here ()
(interactive) (interactive)
(call-interactively (call-interactively