GNU bug report logs - #36895
Patch in dired-guess-shell-alist-default

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 36895 in the body.
You can then email your comments to 36895 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: bug-gnu-emacs <at> gnu.org
Subject: Patch in dired-guess-shell-alist-default
Date: Fri, 02 Aug 2019 00:42:32 +0300

[Message part 1 (text/plain, inline)]

Tags: patch

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

[dired-guess-shell-alist-default.patch (text/x-diff, inline)]

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))

Message #8 received at 36895 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Juri Linkov <juri <at> linkov.net>
Cc: 36895 <at> debbugs.gnu.org
Subject: Re: bug#36895: Patch in dired-guess-shell-alist-default
Date: Fri, 02 Aug 2019 09:59:26 +0300

> From: Juri Linkov <juri <at> 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.

Message #11 received at 36895 <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 36895 <at> debbugs.gnu.org
Subject: Re: bug#36895: Patch in dired-guess-shell-alist-default
Date: Sun, 04 Aug 2019 01:16:06 +0300

[Message part 1 (text/plain, inline)]

>> 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:

[dired-guess-shell-alist-default.2.patch (text/x-diff, inline)]

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")))

Message #14 received at 36895 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Juri Linkov <juri <at> linkov.net>
Cc: 36895 <at> debbugs.gnu.org
Subject: Re: bug#36895: Patch in dired-guess-shell-alist-default
Date: Sun, 04 Aug 2019 19:47:19 +0300

> From: Juri Linkov <juri <at> linkov.net>
> Cc: 36895 <at> 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.

Message #19 received at 36895-done <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 36895-done <at> debbugs.gnu.org
Subject: Re: bug#36895: Patch in dired-guess-shell-alist-default
Date: Tue, 06 Aug 2019 00:04:40 +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.

Pushed to master and closed.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.