/[meta-cvs]/meta-cvs/F-255EFD9E99EDDE6614CF2CD912CA4E5C
ViewVC logotype

Diff of /meta-cvs/F-255EFD9E99EDDE6614CF2CD912CA4E5C

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.19 by kaz, Thu Mar 28 22:54:31 2002 UTC revision 1.19.4.1 by kaz, Fri Jul 5 16:39:23 2002 UTC
# Line 11  Line 11 
11    (when (path-prefix-equal *mcvs-dir* source)    (when (path-prefix-equal *mcvs-dir* source)
12       (error "mcvs-move: source path ~a is in a reserved Meta-CVS area." source))       (error "mcvs-move: source path ~a is in a reserved Meta-CVS area." source))
13    (when (not expansion)    (when (not expansion)
14      (if (exists source)      (let ((real (abstract-to-real-path source)))
15        (error "mcvs-move: ~a is local, not versioned under Meta-CVS." source)        (if (exists real)
16        (error "mcvs-move: ~a does not exist." source))))          (error "mcvs-move: ~a is local, not versioned under Meta-CVS." real)
17            (error "mcvs-move: ~a does not exist." real)))))
18    
19  (defun simple-rename (filemap source dest-file)  (defun simple-rename (filemap source dest-file)
20    (let ((dir-expansion (mapping-extract-paths    (let ((dir-expansion (mapping-extract-paths
# Line 38  Line 39 
39           (destination-trailing-slash (string= (char destination           (destination-trailing-slash (string= (char destination
40                                                      (1- (length destination)))                                                      (1- (length destination)))
41                                                *path-sep*))                                                *path-sep*))
42           (destination-file-object (no-existence-error (stat destination)))           (dest-real-path (abstract-to-real-path (canonicalize-path destination)))
43             (destination-file-object (no-existence-error (stat dest-real-path)))
44           (destination-file-exists (or (mapping-lookup filemap destination)           (destination-file-exists (or (mapping-lookup filemap destination)
45                                        (and destination-file-object                                        (and destination-file-object
46                                             (not (directory-p                                             (not (directory-p
# Line 63  Line 65 
65    (in-sandbox-root-dir    (in-sandbox-root-dir
66      (chatter-debug "Renaming.~%")      (chatter-debug "Renaming.~%")
67      (let ((filemap (mapping-read *mcvs-map*))      (let ((filemap (mapping-read *mcvs-map*))
68            (sources (mapcar #'sandbox-translate-path (butlast args)))            (sources (mapcar #'real-to-abstract-path
69            (destination (sandbox-translate-path (first (last args)))))                             (mapcar #'sandbox-translate-path (butlast args))))
70              (destination (real-to-abstract-path
71                             (sandbox-translate-path (first (last args))))))
72    
73        (when (path-prefix-equal *mcvs-dir* destination)        (when (path-prefix-equal *mcvs-dir* destination)
74          (error "mcvs-move: destination path ~a is in a reserved Meta-CVS area."          (error "mcvs-move: destination path ~a is in a reserved Meta-CVS area."

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.19.4.1

  ViewVC Help
Powered by ViewVC 1.1.5