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

Diff of /meta-cvs/F-AFC09F145399B1273F4BF98702F5BE8C

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

revision 1.12 by kaz, Sun Feb 3 18:12:10 2002 UTC revision 1.13 by kaz, Mon Feb 4 06:10:53 2002 UTC
# Line 6  Line 6 
6  (require "mapping")  (require "mapping")
7  (require "chatter")  (require "chatter")
8  (require "options")  (require "options")
9  (provide "diff")  (provide "generic")
10    
11  (defun mcvs-diff (cvs-options diff-options files)  (defun mcvs-generic (cvs-command cvs-options command-options command-args files)
12    (in-sandbox-root-dir    (in-sandbox-root-dir
13      (let (files-to-diff      (let (files-to-process
14            (filemap (mapping-read *mcvs-map-local*)))            (filemap (mapping-read *mcvs-map-local*)))
15    
16        (chatter-info "Preparing diff list.~%")        (chatter-info "Preparing file list.~%")
17        (when (null files)        (when (null files)
18          (setf files '(".")))          (setf files '(".")))
19        (dolist (file files)        (dolist (file files)
20          (can-restart-here ("Continue preparing diff list.")          (can-restart-here ("Continue preparing file list.")
21            (let* ((full-name (sandbox-translate-path file))            (let* ((full-name (sandbox-translate-path file))
22                   (entries (mapping-prefix-matches filemap full-name)))                   (entries (mapping-prefix-matches filemap full-name)))
23              (if (not entries)              (if (not entries)
24                (error "mcvs-diff: ~a is not known to Meta-CVS." full-name)                (error "mcvs: ~a is not known to Meta-CVS." full-name)
25                (setf files-to-diff (nconc files-to-diff entries))))))                (setf files-to-process (nconc files-to-process entries))))))
26    
27        (when files-to-diff        (when files-to-process
28          (chatter-info "Synchronizing.~%")          (chatter-info "Synchronizing.~%")
29          (mapping-synchronize)          (mapping-synchronize)
30    
# Line 32  Line 32 
32            (chdir *mcvs-dir*)            (chdir *mcvs-dir*)
33            (chatter-info "Invoking CVS.~%")            (chatter-info "Invoking CVS.~%")
34            (execute-program-xargs `("cvs" ,@(format-opt cvs-options)            (execute-program-xargs `("cvs" ,@(format-opt cvs-options)
35                                     "diff" ,@(format-opt diff-options))                                     ,cvs-command ,@(format-opt command-options)
36                                       ,@command-args)
37                                   `("MAP"                                   `("MAP"
38                                     ,@(mapcar #'(lambda (x)                                     ,@(mapcar #'(lambda (x)
39                                                   (basename (first x)))                                                   (basename (first x)))
40                                               files-to-diff))))))                                               files-to-process))))))
41    (values)))    (values)))
42    
43  (defun mcvs-diff-wrapper (cvs-options cvs-command-options mcvs-args)  (defun mcvs-diff-wrapper (cvs-options cvs-command-options mcvs-args)
44    (mcvs-diff cvs-options cvs-command-options mcvs-args))    (mcvs-generic "diff" cvs-options cvs-command-options nil mcvs-args))
45    
46    (defun mcvs-tag-wrapper (cvs-options cvs-command-options mcvs-args)
47      (if (null mcvs-args)
48        (error "mcvs-tag: specify tag optionally followed by files."))
49      (mcvs-generic "tag" cvs-options
50        cvs-command-options (first mcvs-args) (rest mcvs-args)))

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

  ViewVC Help
Powered by ViewVC 1.1.5