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

Contents of /meta-cvs/F-205A90D152A06EE04D552B256CDAF850

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.15.6.6 - (hide annotations)
Wed Jul 16 15:44:11 2003 UTC (10 years, 9 months ago) by kaz
Branch: mcvs-1-0-branch
CVS Tags: mcvs-1-0-branch~merged-to-HEAD-1, mcvs-1-0-branch~merged-to-HEAD-0, mcvs-1-0-11, mcvs-1-0-10, mcvs-1-0-13, mcvs-1-0-12, mcvs-1-0-9
Changes since 1.15.6.5: +1 -2 lines
* code/mcvs-generic.lisp (mcvs-generic): Removed
the default-include-meta-files keyword parameter.
(mcvs-tag, mcvs-commit): Remove use of keyword parameter.
This fixes the silly behavior of including meta files
even when the command line specifies a file list.
Also, bugfix: *nometa-option* now works when
global-if-empty-file-list is true, and there are no files.

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

  ViewVC Help
Powered by ViewVC 1.1.5