bug#36895: Patch in dired-guess-shell-alist-default

bug#36895: Patch in dired-guess-shell-alist-default

[Juri Linkov]

[-- Attachment #1: Type: text/plain, Size: 106 bytes --]

Tags: patch

Isn't "git apply" used more often nowadays than "patch"?
If yes, then I propose this patch:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: dired-guess-shell-alist-default.patch --]
[-- Type: text/x-diff, Size: 860 bytes --]

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 462fa4ee15..3b3c0aeaf3 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -909,11 +909,11 @@ dired-guess-shell-alist-default
 	 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
 		  " " dired-guess-shell-znew-switches))
 
-   '("\\.patch\\'" "cat * | patch")
-   (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
+   '("\\.patch\\'" "cat * | patch" "cat * | git apply")
+   (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch" "gunzip -qc * | git apply"
 	 ;; Optional decompression.
 	 '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.patch\\.Z\\'" "zcat * | patch"
+   (list "\\.patch\\.Z\\'" "zcat * | patch" "zcat * | git apply"
 	 ;; Optional conversion to gzip format.
 	 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
 		  " " dired-guess-shell-znew-switches))

bug#36895: Patch in dired-guess-shell-alist-default

[Eli Zaretskii]

> From: Juri Linkov <juri@linkov.net>
> Date: Fri, 02 Aug 2019 00:42:32 +0300
> 
> Isn't "git apply" used more often nowadays than "patch"?

No, not here.  "git apply" is only relevant for when working in a Git
repository.

We could perhaps make this customizable, or maybe even make Emacs
intuit the right command looking at the current buffer, though.

bug#36895: Patch in dired-guess-shell-alist-default

[Juri Linkov]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

>> Isn't "git apply" used more often nowadays than "patch"?
>
> No, not here.  "git apply" is only relevant for when working in a Git
> repository.
>
> We could perhaps make this customizable, or maybe even make Emacs
> intuit the right command looking at the current buffer, though.

Yes, this would be more appropriate:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: dired-guess-shell-alist-default.2.patch --]
[-- Type: text/x-diff, Size: 870 bytes --]

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 462fa4ee15..313a22725c 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -827,6 +827,7 @@ dired-shell-command-history
 ;; install GNU zip's version of zcat.
 
 (autoload 'Man-support-local-filenames "man")
+(autoload 'vc-responsible-backend "vc")
 
 (defvar dired-guess-shell-alist-default
   (list
@@ -909,7 +910,10 @@ dired-guess-shell-alist-default
 	 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
 		  " " dired-guess-shell-znew-switches))
 
-   '("\\.patch\\'" "cat * | patch")
+   (list "\\.patch\\'"
+         '(if (eq (ignore-errors (vc-responsible-backend default-directory)) 'Git)
+              "cat * | git apply"
+            "cat * | patch"))
    (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
 	 ;; Optional decompression.
 	 '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))

bug#36895: Patch in dired-guess-shell-alist-default

[Eli Zaretskii]

> From: Juri Linkov <juri@linkov.net>
> Cc: 36895@debbugs.gnu.org
> Date: Sun, 04 Aug 2019 01:16:06 +0300
> 
> >> Isn't "git apply" used more often nowadays than "patch"?
> >
> > No, not here.  "git apply" is only relevant for when working in a Git
> > repository.
> >
> > We could perhaps make this customizable, or maybe even make Emacs
> > intuit the right command looking at the current buffer, though.
> 
> Yes, this would be more appropriate:

Thanks, LGTM.

bug#36895: Patch in dired-guess-shell-alist-default

[Juri Linkov]

>> >> Isn't "git apply" used more often nowadays than "patch"?
>> >
>> > No, not here.  "git apply" is only relevant for when working in a Git
>> > repository.
>> >
>> > We could perhaps make this customizable, or maybe even make Emacs
>> > intuit the right command looking at the current buffer, though.
>> 
>> Yes, this would be more appropriate:
>
> Thanks, LGTM.

Pushed to master and closed.