/[meta-cvs]/meta-cvs/F-FFF16CA4956A36F19290AC9E1EBAFFD8
ViewVC logotype

Diff of /meta-cvs/F-FFF16CA4956A36F19290AC9E1EBAFFD8

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

revision 1.49.2.13 by kaz, Tue Apr 22 05:53:42 2003 UTC revision 1.49.2.14 by kaz, Thu Apr 24 04:02:55 2003 UTC
# Line 384  whether they came from the CVS repositor Line 384  whether they came from the CVS repositor
384  *mcvs-map-local* *mcvs-map*)  *mcvs-map-local* *mcvs-map*)
385    (let ((old-filemap (mapping-read *mcvs-map-local*))    (let ((old-filemap (mapping-read *mcvs-map-local*))
386          (new-filemap (mapping-read *mcvs-map* :sanity-check t))          (new-filemap (mapping-read *mcvs-map* :sanity-check t))
387            (rollback-needed t)
388          rollback-remove-items rollback-restore-items)          rollback-remove-items rollback-restore-items)
389      (restart-case      (unwind-protect
390        (multiple-value-bind (added-items removed-items moved-pairs)        (multiple-value-bind (added-items removed-items moved-pairs)
391                             (mapping-difference old-filemap new-filemap)                             (mapping-difference old-filemap new-filemap)
392          ;; First remove what has to be removed. This way when we          ;; First remove what has to be removed. This way when we
# Line 507  whether they came from the CVS repositor Line 508  whether they came from the CVS repositor
508                         (honor-dry-run (real)                         (honor-dry-run (real)
509                           (ensure-directories-exist real)                           (ensure-directories-exist real)
510                           (symlink target real))))                           (symlink target real))))
511                    (push item rollback-remove-items)))))))                    (push item rollback-remove-items))))))
512        (bail ()          (setf rollback-needed nil))
513          :report "Restore all restructuring done so far."        (when rollback-needed
514          (chatter-debug "Restoring.~%")          (chatter-debug "Undoing directory structure changes.~%")
515          (dolist (item rollback-remove-items)          (dolist (item rollback-remove-items)
516            (let ((real (abstract-to-real-path (mapping-entry-path item))))            (let ((real (abstract-to-real-path (mapping-entry-path item))))
517              (chatter-terse "removing ~a~%" real)              (chatter-terse "removing ~a~%" real)
# Line 526  whether they came from the CVS repositor Line 527  whether they came from the CVS repositor
527                  ((:symlink)                  ((:symlink)
528                     (honor-dry-run (real)                     (honor-dry-run (real)
529                       (ensure-directories-exist real)                       (ensure-directories-exist real)
530                       (symlink target real)))))))                       (symlink target real)))))))))
         (return-from mapping-update nil)))  
   
531      (mapping-write new-filemap *mcvs-map-local*))      (mapping-write new-filemap *mcvs-map-local*))
532    t)    t)
533    

Legend:
Removed from v.1.49.2.13  
changed lines
  Added in v.1.49.2.14

  ViewVC Help
Powered by ViewVC 1.1.5