/[meta-cvs]/meta-cvs/F-205A90D152A06EE04D552B256CDAF850
ViewVC logotype

Contents of /meta-cvs/F-205A90D152A06EE04D552B256CDAF850

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.26 - (show annotations)
Tue Nov 28 07:47:21 2006 UTC (7 years, 4 months ago) by kaz
Branch: MAIN
CVS Tags: asdf-import-branch~merged-to-HEAD-0, mcvs-1-1-98, asdf-import-branch~branch-point, HEAD
Branch point for: asdf-import-branch
Changes since 1.25: +2 -2 lines
More renaming to get rid of mcvs- prefix.

* code/chatter.lisp (*mcvs-debug*): Renamed to *chatter-debug*.
(*mcvs-info*, *mcvs-terse*, *mcvs-silent*): Similarly.
(*mcvs-chatter-level*): Renamed to *chatter-level*.

* code/unix.lisp (*mcvs-editor*): Renamed to *edit-program*.

* code/types.lisp (*mcvs-types-name*): Renamed to *types-file*.
(*mcvs-types*): Renamed to *types-path*.
(*mcvs-new-types*): Renamed to *types-new-path*.

* code/mapping.lisp (*mcvs-dir*): Renamed to *admin-dir*.
(*mcvs-map-name*): Renamed to *map-file*.
(*mcvs-map-local-name*): Renamed to *map-local-file*.
(*mcvs-displaced-name*): Renamed to *displaced-file*.
(*mcvs-map*): Renamed to *map-path*.
(*mcvs-map-local*): Renamed to *map-local-path*.
(*mcvs-displaced*): Renamed to *displaced-path*.
1 ;;; This source file is part of the Meta-CVS program,
2 ;;; which is distributed under the GNU license.
3 ;;; Copyright 2002 Kaz Kylheku
4
5 (in-package :meta-cvs)
6
7 (defun update (&optional cvs-options cvs-update-options files)
8 (let ((need-sync (not (find "p" cvs-update-options
9 :key #'first :test #'string=))))
10 (if (or files *metaonly-option* *nometa-option*)
11 (generic "update" cvs-options cvs-update-options nil
12 files :need-sync-after need-sync
13 :need-update-after t)
14 (in-sandbox-root-dir
15 (if need-sync
16 (progn
17 ;; Push changes in tree to CVS sandbox, so they can be merged
18 ;; with stuff coming from repository.
19 (chatter-debug "Synchronizing.~%")
20 (mapping-synchronize :direction :left)
21
22 (current-dir-restore
23 (chdir *admin-dir*)
24 (super-restart-case
25 (progn
26 (chatter-debug "Invoking CVS.~%")
27 (unless (execute-program `("cvs" ,@(format-opt cvs-options)
28 "up" ,@(format-opt
29 cvs-update-options)))
30 (error "CVS update failed.")))
31 (continue ()
32 :report "Update file structure and re-synchronize."
33 (unwind))
34 (retry ()
35 :report "Try invoking CVS again."
36 (retry))))
37
38 (chatter-debug "Updating file structure.~%")
39 (mapping-update)
40 (chatter-debug "Synchronizing again.~%")
41 (mapping-synchronize :direction :right))
42 (current-dir-restore
43 (chdir *admin-dir*)
44 (chatter-debug "Invoking CVS.~%")
45 (unless (execute-program `("cvs" ,@(format-opt cvs-options)
46 "up" ,@(format-opt cvs-update-options))))
47 (error "CVS update failed."))))))
48 (values))
49
50 (defun update-wrapper (cvs-options cvs-command-options mcvs-args)
51 (update cvs-options cvs-command-options mcvs-args))

  ViewVC Help
Powered by ViewVC 1.1.5