From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Mike Kupfer Newsgroups: gmane.emacs.bugs Subject: bug#58721: 28.2; dired with delete-by-moving-to-trash can't trash directory twice Date: Sat, 29 Oct 2022 17:09:06 -0700 Message-ID: <32829.1667088546@alto> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1655"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 58721@debbugs.gnu.org, gusbrs.2016@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Oct 30 02:10:23 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oovuB-0000H8-0H for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 30 Oct 2022 02:10:23 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oovts-0000LM-Mk; Sat, 29 Oct 2022 20:10:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oovtq-0000LC-T1 for bug-gnu-emacs@gnu.org; Sat, 29 Oct 2022 20:10:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oovtq-0003cf-Kr for bug-gnu-emacs@gnu.org; Sat, 29 Oct 2022 20:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oovtq-00062m-7Q for bug-gnu-emacs@gnu.org; Sat, 29 Oct 2022 20:10:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Mike Kupfer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 30 Oct 2022 00:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58721 X-GNU-PR-Package: emacs Original-Received: via spool by 58721-submit@debbugs.gnu.org id=B58721.166708855923176 (code B ref 58721); Sun, 30 Oct 2022 00:10:02 +0000 Original-Received: (at 58721) by debbugs.gnu.org; 30 Oct 2022 00:09:19 +0000 Original-Received: from localhost ([127.0.0.1]:36901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oovt9-00061k-EL for submit@debbugs.gnu.org; Sat, 29 Oct 2022 20:09:19 -0400 Original-Received: from shell1.rawbw.com ([198.144.192.42]:21401 ident=root) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oovt4-00061Y-Bw for 58721@debbugs.gnu.org; Sat, 29 Oct 2022 20:09:18 -0400 Original-Received: from alto (135-180-174-133.dsl.dynamic.sonic.net [135.180.174.133] (may be forged)) (authenticated bits=0) by shell1.rawbw.com (8.15.1/8.15.1) with ESMTPSA id 29U096sl088392 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 29 Oct 2022 17:09:12 -0700 (PDT) (envelope-from mkupfer@alum.berkeley.edu) X-Authentication-Warning: shell1.rawbw.com: Host 135-180-174-133.dsl.dynamic.sonic.net [135.180.174.133] (may be forged) claimed to be alto In-Reply-To: Your message of "Sat, 29 Oct 2022 19:56:35 +0300." <83eduqh8l8.fsf@gnu.org> X-Mailer: MH-E 8.6+git; nmh 1.7.1; Emacs 29.0.50 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "bug-gnu-emacs" Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:246578 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii wrote: > Yet another possibility is to refrain from calling rename-file when > the moved file is a directory, and instead to do what rename-file > does, with a twist, "by hand". That is what I actually prefer, as > nothing is really wrong with rename-file. I'm afraid I don't understand your suggestion. I've attached the proof-of-concept patch that I came up with, which just modifies move-file-to-trash. I've tested it with files and directories, both same-filesystem and crossing filesystems. Did you have in mind something similar? cheers, mike --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=bug58721.diffs Content-Description: proof-of-concept for fix diff --git a/lisp/files.el b/lisp/files.el index 1e1ec6127d..63786ec103 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -8565,10 +8565,29 @@ move-file-to-trash (setq files-base (substring (file-name-nondirectory info-fn) 0 (- (length ".trashinfo")))) (write-region nil nil info-fn nil 'quiet info-fn))) - ;; Finally, try to move the file to the trashcan. + ;; Finally, try to move the item to the trashcan. If + ;; it's a file, just move it. If it's a directory, + ;; there's no way to invoke rename-file to replace + ;; new-fn with fn, so move everything in fn and then + ;; delete it. (let ((delete-by-moving-to-trash nil) (new-fn (file-name-concat trash-files-dir files-base))) - (rename-file fn new-fn overwrite))))))))) + (if (not (file-directory-p fn)) + (rename-file fn new-fn overwrite) + (make-directory new-fn) + (mapc + (lambda (f1) + (let ((src (file-name-concat fn f1)) + (targ (file-name-concat new-fn f1))) + (cond + ((or (string= f1 ".") + (string= f1 "..")) + t) + (t + (rename-file src targ))))) + (directory-files fn)) + (delete-directory fn)))))))))) + (defsubst file-attribute-type (attributes) --=-=-=--