Re: PR: dired-do-create-files now checks for trailing slashes in the target

[Rudi C <rudiwillalwaysloveyou@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 678 bytes --]

Well, there are two commits, the first one adds the new behavior, and the
second one moves the new behavior behind a new option. I can't find any way
to merge the patch files without the original repo, and I no longer have
the emacs git source on my computer.


On Tue, Nov 2, 2021 at 6:14 PM Lars Ingebrigtsen <larsi@gnus.org> wrote:

> Rudi C <rudiwillalwaysloveyou@gmail.com> writes:
>
> > My copyright assignment is now done, so we can merge this in.
>
> Can you re-send the current version of the patch (there were several
> versions, if I remember correctly)?
>
> --
> (domestic pets only, the antidote for overdose, milk.)
>    bloggy blog: http://lars.ingebrigtsen.no
>

[-- Attachment #1.2: Type: text/html, Size: 1180 bytes --]

[-- Attachment #2: 0001-dired-do-create-files-now-checks-for-trailing-slashe.patch --]
[-- Type: application/octet-stream, Size: 986 bytes --]

From 951e12f352b783b15edbabb4623a5c721425bd25 Mon Sep 17 00:00:00 2001
From: NightMachinary <rudiwillalwaysloveyou@gmail.com>
Date: Tue, 28 Sep 2021 21:14:05 +0330
Subject: [PATCH 1/2] dired-do-create-files now checks for trailing slashes in
 the target

---
 lisp/dired-aux.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 397c5c67cb..fcaa8dd008 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2157,7 +2157,9 @@ Optional arg HOW-TO determines how to treat the target.
 		     target-dir op-symbol arg rfn-list default))))
 	 (into-dir
           (progn
-            (unless dired-one-file (dired-maybe-create-dirs target))
+            (when (or (not dired-one-file)
+                      (directory-name-p target))
+              (dired-maybe-create-dirs target))
             (cond ((null how-to)
 		   ;; Allow users to change the letter case of
 		   ;; a directory on a case-insensitive
-- 
2.32.0


[-- Attachment #3: 0002-Added-option-dired-create-destination-dirs-trailing-.patch --]
[-- Type: application/octet-stream, Size: 2312 bytes --]

From 7a680d06e4b6ecf9e88e1c309f214d4e1a7f8700 Mon Sep 17 00:00:00 2001
From: NightMachinary <rudiwillalwaysloveyou@gmail.com>
Date: Wed, 29 Sep 2021 17:54:29 +0330
Subject: [PATCH 2/2] Added option
 dired-create-destination-dirs-trailing-separator-special

---
 lisp/dired-aux.el | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index fcaa8dd008..ee727ec5cc 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1789,6 +1789,17 @@ If `ask', ask for user confirmation."
   :group 'dired
   :version "27.1")
 
+(defcustom dired-create-destination-dirs-trailing-separator-special nil
+  "If t, when selecting a single destination in Dired, paths that end in a path separator will be treated as a non-existent directory, and acted on according to `dired-create-destination-dirs'.
+
+This option is only relevant if `dired-create-destination-dirs' is not `nil', and you are moving/copying a single directory.
+
+For example, when renaming a directory named `old_name' to `new_name/' (note the trailing path separator), `new_name' might be created depending on `dired-create-destination-dirs' and `old_name' will be moved into it if it is created; Otherwise `old_name' will be directly renamed to `new_name'."
+  :type '(choice (const :tag "Do not treat paths with a trailing path separator specially" nil)
+                 (const :tag "Treat paths with a trailing path separator specially" t))
+  :group 'dired
+  :version "28.1")
+
 (defun dired-maybe-create-dirs (dir)
   "Create DIR if doesn't exist according to `dired-create-destination-dirs'."
   (when (and dired-create-destination-dirs (not (file-exists-p dir)))
@@ -2157,8 +2168,11 @@ Optional arg HOW-TO determines how to treat the target.
 		     target-dir op-symbol arg rfn-list default))))
 	 (into-dir
           (progn
-            (when (or (not dired-one-file)
-                      (directory-name-p target))
+            (when
+                (or
+                 (not dired-one-file)
+                 (and dired-create-destination-dirs-trailing-separator-special
+                      (directory-name-p target)))
               (dired-maybe-create-dirs target))
             (cond ((null how-to)
 		   ;; Allow users to change the letter case of
-- 
2.32.0