[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bug in copy-directory
From: |
Thierry Volpiatto |
Subject: |
Re: bug in copy-directory |
Date: |
Mon, 07 Feb 2011 21:00:06 +0100 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.2.93 (gnu/linux) |
Stefan Monnier <address@hidden> writes:
>> If you have only one function copy-directory that work fine in case 2,
>> it will fail in dired because dired already does a part of the job of
>> this function (maybe because long time ago dired-create-files has been
>> wrote on this bug), and if you make it work in dired it will fail in
>> directs calls to copy-directory.
>
> Right, part of the problem seems to be that dired tried to work around
> some lack of support in files.el. Maybe we should revisit dired's code
> to clean it up in this respect.
Yes it would be great, i don't think it's a lot of work, but need
attention to not break other actions (many) handled by dired-create-files.
May if the NAME-CONSTRUCTOR return a cons like:
(filename_for_message . real_filename)
we could test with consp and use the car for message and the cdr for
action otherwise only use the string filename.
That's just an idea untested.
> Yes, it seems like the best course for now (tho we usually use foo-bar-1
> rather than foo-bar1). Your patch has copy-directory's docstring
> mention the non-existent argument `copy-as-subdir', tho.
Sorry, i didn't polish that, i just move code in a "foo-bar whatever
name" for the moment.
> Also, shouldn't we do the find-file-name-handler dance in copy-directory
> rather than in copy-directory1?
I am not sure of that, what happen when we copy from dired something like:
/foo/bar to /scpc:host:/foo
(Let keep copy-directory1 as name for the moment)
with the patch i sent you we have
dired-do-copy ==> dired-create-files ==> dired-copy-file ==>
dired-copy-file-recursive ==> copy-directory1
So what happen if copy-directory1 is not aware of handler to use?
Michael?
> Finally, shouldn't the copy-as-subdir dance be done within
> copy-directory (sole place where the arg is non-nil), which then lets us
> get rid of the argument altogether?
Yes, i think it's a good idea, it should work.
> I.e. something like the untested patch below?
>
>
> Stefan
>
>
> === modified file 'lisp/files.el'
> --- lisp/files.el 2011-02-06 04:59:06 +0000
> +++ lisp/files.el 2011-02-07 18:54:15 +0000
> @@ -4723,8 +4723,7 @@
> directory 'full directory-files-no-dot-files-regexp)))
> (delete-directory-internal directory)))))
>
> -(defun copy-directory (directory newname &optional keep-time
> - parents copy-as-subdir)
> +(defun copy-directory (directory newname &optional keep-time parents)
> "Copy DIRECTORY to NEWNAME. Both args must be strings.
> This function always sets the file modes of the output files to match
> the corresponding input file.
> @@ -4737,9 +4736,7 @@
> they don't exist. When called interactively, PARENTS is t.
>
> When NEWNAME is an existing directory, copy DIRECTORY into a
> -subdirectory of NEWNAME if optional arg COPY-AS-SUBDIR is
> -non-nil, otherwise copy the contents of DIRECTORY into NEWNAME.
> -When called interactively, copy into a subdirectory by default."
> +subdirectory of NEWNAME."
> (interactive
> (let ((dir (read-directory-name
> "Copy directory: " default-directory default-directory t nil)))
> @@ -4762,12 +4759,7 @@
> (unless (file-directory-p directory)
> (error "%s is not a directory" directory))
>
> - (cond
> - ((not (file-directory-p newname))
> - ;; If NEWNAME is not an existing directory, create it;
> - ;; that is where we will copy the files of DIRECTORY.
> - (make-directory newname parents))
> - (copy-as-subdir
> + (when (file-directory-p newname)
> ;; If NEWNAME is an existing directory, and we are copying as
> ;; a subdirectory, the target is NEWNAME/[DIRECTORY-BASENAME].
> (setq newname (expand-file-name
> @@ -4777,8 +4769,15 @@
> (and (file-exists-p newname)
> (not (file-directory-p newname))
> (error "Cannot overwrite non-directory %s with a directory"
> - newname))
> - (make-directory newname t)))
> + newname)))
> +
> + (copy-directory-1 directory newname keep-time parents))))
> +
> +(defun copy-directory-1 (directory newname &optional keep-time parents)
> + (if (not (file-directory-p newname))
> + ;; If NEWNAME is not an existing directory, create it;
> + ;; that is where we will copy the files of DIRECTORY.
> + (make-directory newname parents))
>
> ;; Copy recursively.
> (dolist (file
> @@ -4789,11 +4788,11 @@
> (file-name-nondirectory file) newname))
> (attrs (file-attributes file)))
> (cond ((file-directory-p file)
> - (copy-directory file target keep-time parents nil))
> + (copy-directory-1 file target keep-time parents nil))
> ((stringp (car attrs)) ; Symbolic link
> (make-symbolic-link (car attrs) target t))
> (t
> - (copy-file file target t keep-time)))))
> + (copy-file file target t keep-time))))))
>
> ;; Set directory attributes.
> (set-file-modes newname (file-modes directory))
>
--
A+ Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997
- Re: bug in copy-directory, (continued)
- Re: bug in copy-directory, Michael Albinus, 2011/02/04
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/04
- Re: bug in copy-directory, Chong Yidong, 2011/02/06
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/06
- Re: bug in copy-directory, Michael Albinus, 2011/02/06
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/06
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/06
- Re: bug in copy-directory, Stefan Monnier, 2011/02/07
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/07
- Re: bug in copy-directory, Stefan Monnier, 2011/02/07
- Re: bug in copy-directory,
Thierry Volpiatto <=
- Re: bug in copy-directory, Stefan Monnier, 2011/02/07
- Re: bug in copy-directory, Chong Yidong, 2011/02/09
- Re: bug in copy-directory, Stefan Monnier, 2011/02/09
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/11
- Re: bug in copy-directory, Michael Albinus, 2011/02/11
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/11
- Re: bug in copy-directory, Michael Albinus, 2011/02/11
- Re: bug in copy-directory, Chong Yidong, 2011/02/11
- Re: bug in copy-directory, Thierry Volpiatto, 2011/02/12
- Re: bug in copy-directory, Michael Albinus, 2011/02/12