Artifact 8476a3bcc6203de7b7692e76024c158fe26772a3:

File tools/lib/importcvs.tcl part of check-in [d8c18fc148] - Reworked the CVS handling code to have a simpler API, more like the reworked Fossil API. The API now has a form where adding the handling of branches should not require complex changes in the import controller any longer. Extended the system to allow the user to restrict the importing to a sub-directory of the chosen repository, via the new switch --project. This is required to pull a SF CVS repository apart into the various projects it may have. Example: Under Tcl we have 3 projects, namely Tcl itself, sampleextension, and Thread. by aku on 2007-09-17 00:56:40.

0000: 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  # --------------
0010: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0020: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0030: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0040: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a  ---------------.
0050: 23 20 54 6f 6f 6c 20 70 61 63 6b 61 67 65 73 2e  # Tool packages.
0060: 20 4d 61 69 6e 20 63 6f 6e 74 72 6f 6c 20 6d 6f   Main control mo
0070: 64 75 6c 65 20 66 6f 72 20 69 6d 70 6f 72 74 69  dule for importi
0080: 6e 67 20 66 72 6f 6d 20 61 20 43 56 53 20 72 65  ng from a CVS re
0090: 70 6f 73 69 74 6f 72 79 2e 0a 0a 23 20 2d 2d 2d  pository...# ---
00a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
00e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 20 52 65 71  ----------.# Req
00f0: 75 69 72 65 6d 65 6e 74 73 0a 0a 70 61 63 6b 61  uirements..packa
0100: 67 65 20 72 65 71 75 69 72 65 20 54 63 6c 20 38  ge require Tcl 8
0110: 2e 34 0a 70 61 63 6b 61 67 65 20 72 65 71 75 69  .4.package requi
0120: 72 65 20 76 63 3a 3a 63 76 73 3a 3a 77 73 20 20  re vc::cvs::ws  
0130: 20 20 20 20 20 20 20 20 20 20 20 20 20 3b 20 23               ; #
0140: 20 46 72 6f 6e 74 65 6e 64 2c 20 72 65 61 64 69   Frontend, readi
0150: 6e 67 20 66 72 6f 6d 20 73 6f 75 72 63 65 20 72  ng from source r
0160: 65 70 6f 73 69 74 6f 72 79 0a 70 61 63 6b 61 67  epository.packag
0170: 65 20 72 65 71 75 69 72 65 20 76 63 3a 3a 66 6f  e require vc::fo
0180: 73 73 69 6c 3a 3a 77 73 20 20 20 20 20 20 20 20  ssil::ws        
0190: 20 20 20 20 3b 20 23 20 42 61 63 6b 65 6e 64 2c      ; # Backend,
01a0: 20 20 77 72 69 74 69 6e 67 20 74 6f 20 64 65 73    writing to des
01b0: 74 69 6e 61 74 69 6f 6e 20 72 65 70 6f 73 69 74  tination reposit
01c0: 6f 72 79 2e 0a 70 61 63 6b 61 67 65 20 72 65 71  ory..package req
01d0: 75 69 72 65 20 76 63 3a 3a 74 6f 6f 6c 73 3a 3a  uire vc::tools::
01e0: 6c 6f 67 20 20 20 20 20 20 20 20 20 20 20 20 3b  log            ;
01f0: 20 23 20 55 73 65 72 20 66 65 65 64 62 61 63 6b   # User feedback
0200: 2e 0a 70 61 63 6b 61 67 65 20 72 65 71 75 69 72  ..package requir
0210: 65 20 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d  e vc::fossil::im
0220: 70 6f 72 74 3a 3a 73 74 61 74 73 20 3b 20 23 20  port::stats ; # 
0230: 4d 61 6e 61 67 65 6d 65 6e 74 20 66 6f 72 20 74  Management for t
0240: 68 65 20 49 6d 70 6f 72 74 20 53 74 61 74 69 73  he Import Statis
0250: 74 69 63 73 2e 0a 70 61 63 6b 61 67 65 20 72 65  tics..package re
0260: 71 75 69 72 65 20 76 63 3a 3a 66 6f 73 73 69 6c  quire vc::fossil
0270: 3a 3a 69 6d 70 6f 72 74 3a 3a 6d 61 70 20 20 20  ::import::map   
0280: 3b 20 23 20 4d 61 6e 61 67 65 6d 65 6e 74 20 6f  ; # Management o
0290: 66 20 74 68 65 20 63 73 65 74 20 3c 2d 3e 20 75  f the cset <-> u
02a0: 75 69 64 20 6d 61 70 70 69 6e 67 2e 0a 0a 6e 61  uid mapping...na
02b0: 6d 65 73 70 61 63 65 20 65 76 61 6c 20 3a 3a 76  mespace eval ::v
02c0: 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72  c::fossil::impor
02d0: 74 3a 3a 63 76 73 20 7b 0a 20 20 20 20 76 63 3a  t::cvs {.    vc:
02e0: 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 73 79 73  :tools::log::sys
02f0: 74 65 6d 20 69 6d 70 6f 72 74 0a 20 20 20 20 6e  tem import.    n
0300: 61 6d 65 73 70 61 63 65 20 69 6d 70 6f 72 74 20  amespace import 
0310: 3a 3a 76 63 3a 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67  ::vc::tools::log
0320: 3a 3a 77 72 69 74 65 0a 20 20 20 20 6e 61 6d 65  ::write.    name
0330: 73 70 61 63 65 20 65 76 61 6c 20 63 76 73 20 20  space eval cvs  
0340: 20 20 7b 20 6e 61 6d 65 73 70 61 63 65 20 69 6d    { namespace im
0350: 70 6f 72 74 20 3a 3a 76 63 3a 3a 63 76 73 3a 3a  port ::vc::cvs::
0360: 77 73 3a 3a 2a 20 7d 0a 20 20 20 20 6e 61 6d 65  ws::* }.    name
0370: 73 70 61 63 65 20 65 76 61 6c 20 66 6f 73 73 69  space eval fossi
0380: 6c 20 7b 20 6e 61 6d 65 73 70 61 63 65 20 69 6d  l { namespace im
0390: 70 6f 72 74 20 3a 3a 76 63 3a 3a 66 6f 73 73 69  port ::vc::fossi
03a0: 6c 3a 3a 77 73 3a 3a 2a 20 7d 0a 20 20 20 20 6e  l::ws::* }.    n
03b0: 61 6d 65 73 70 61 63 65 20 65 76 61 6c 20 73 74  amespace eval st
03c0: 61 74 73 20 20 7b 20 6e 61 6d 65 73 70 61 63 65  ats  { namespace
03d0: 20 69 6d 70 6f 72 74 20 3a 3a 76 63 3a 3a 66 6f   import ::vc::fo
03e0: 73 73 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 73 74  ssil::import::st
03f0: 61 74 73 3a 3a 2a 20 7d 0a 20 20 20 20 6e 61 6d  ats::* }.    nam
0400: 65 73 70 61 63 65 20 65 76 61 6c 20 6d 61 70 20  espace eval map 
0410: 20 20 20 7b 20 6e 61 6d 65 73 70 61 63 65 20 69     { namespace i
0420: 6d 70 6f 72 74 20 3a 3a 76 63 3a 3a 66 6f 73 73  mport ::vc::foss
0430: 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 6d 61 70 3a  il::import::map:
0440: 3a 2a 20 7d 0a 0a 20 20 20 20 66 6f 73 73 69 6c  :* }..    fossil
0450: 3a 3a 63 6f 6e 66 69 67 75 72 65 20 2d 61 70 70  ::configure -app
0460: 6e 61 6d 65 20 63 76 73 32 66 6f 73 73 69 6c 0a  name cvs2fossil.
0470: 20 20 20 20 66 6f 73 73 69 6c 3a 3a 63 6f 6e 66      fossil::conf
0480: 69 67 75 72 65 20 2d 69 67 6e 6f 72 65 20 20 3a  igure -ignore  :
0490: 3a 76 63 3a 3a 63 76 73 3a 3a 77 73 3a 3a 69 73  :vc::cvs::ws::is
04a0: 61 64 6d 69 6e 0a 7d 0a 0a 23 20 2d 2d 2d 2d 2d  admin.}..# -----
04b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04f0: 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 20 41 50 49 0a 0a  --------.# API..
0500: 23 20 43 6f 6e 66 69 67 75 72 61 74 69 6f 6e 0a  # Configuration.
0510: 23 0a 23 09 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a  #.#.vc::fossil::
0520: 69 6d 70 6f 72 74 3a 3a 63 76 73 3a 3a 63 6f 6e  import::cvs::con
0530: 66 69 67 75 72 65 20 6b 65 79 20 76 61 6c 75 65  figure key value
0540: 20 2d 20 53 65 74 20 63 6f 6e 66 69 67 75 72 61   - Set configura
0550: 74 69 6f 6e 0a 23 0a 23 20 20 20 20 20 20 20 4c  tion.#.#       L
0560: 65 67 61 6c 20 6b 65 79 73 3a 20 20 20 20 20 2d  egal keys:     -
0570: 6e 6f 73 69 67 6e 20 20 3c 62 6f 6f 6c 3e 2c 20  nosign  <bool>, 
0580: 64 65 66 61 75 6c 74 20 66 61 6c 73 65 0a 23 20  default false.# 
0590: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                  
05a0: 20 20 20 20 20 20 2d 62 72 65 61 6b 61 74 20 3c        -breakat <
05b0: 69 6e 74 3e 2c 20 20 64 65 66 61 75 6c 74 20 3a  int>,  default :
05c0: 6e 6f 6e 65 3a 0a 23 20 20 20 20 20 20 20 20 20  none:.#         
05d0: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 2d 73                -s
05e0: 61 76 65 74 6f 20 20 3c 70 61 74 68 3e 2c 20 64  aveto  <path>, d
05f0: 65 66 61 75 6c 74 20 3a 6e 6f 6e 65 3a 0a 23 20  efault :none:.# 
0600: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                  
0610: 20 20 20 20 20 20 2d 6c 69 6d 69 74 20 20 20 3c        -limit   <
0620: 70 61 74 68 3e 2c 20 64 65 66 61 75 6c 74 20 3a  path>, default :
0630: 6e 6f 6e 65 3a 0a 23 0a 23 20 46 75 6e 63 74 69  none:.#.# Functi
0640: 6f 6e 61 6c 69 74 79 0a 23 0a 23 09 76 63 3a 3a  onality.#.#.vc::
0650: 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a  fossil::import::
0660: 63 76 73 3a 3a 72 75 6e 20 73 72 63 20 64 73 74  cvs::run src dst
0670: 20 20 20 20 20 20 20 20 20 2d 20 50 65 72 66 6f           - Perfo
0680: 72 6d 20 61 6e 20 69 6d 70 6f 72 74 2e 0a 0a 23  rm an import...#
0690: 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d   ---------------
06a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
06b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
06c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
06d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23  --------------.#
06e0: 20 41 50 49 20 49 6d 70 6c 65 6d 65 6e 74 61 74   API Implementat
06f0: 69 6f 6e 20 2d 20 46 75 6e 63 74 69 6f 6e 61 6c  ion - Functional
0700: 69 74 79 0a 0a 70 72 6f 63 20 3a 3a 76 63 3a 3a  ity..proc ::vc::
0710: 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a  fossil::import::
0720: 63 76 73 3a 3a 63 6f 6e 66 69 67 75 72 65 20 7b  cvs::configure {
0730: 6b 65 79 20 76 61 6c 75 65 7d 20 7b 0a 20 20 20  key value} {.   
0740: 20 23 20 54 68 65 20 6f 70 74 69 6f 6e 73 20 61   # The options a
0750: 72 65 20 73 69 6d 70 6c 79 20 70 61 73 73 65 64  re simply passed
0760: 20 74 68 72 6f 75 67 68 20 74 6f 20 74 68 65 20   through to the 
0770: 66 6f 73 73 69 6c 20 69 6d 70 6f 72 74 65 72 0a  fossil importer.
0780: 20 20 20 20 23 20 62 61 63 6b 65 6e 64 2e 0a 20      # backend.. 
0790: 20 20 20 73 77 69 74 63 68 20 2d 65 78 61 63 74     switch -exact
07a0: 20 2d 2d 20 24 6b 65 79 20 7b 0a 09 2d 62 72 65   -- $key {..-bre
07b0: 61 6b 61 74 20 7b 20 66 6f 73 73 69 6c 3a 3a 63  akat { fossil::c
07c0: 6f 6e 66 69 67 75 72 65 20 2d 62 72 65 61 6b 61  onfigure -breaka
07d0: 74 20 24 76 61 6c 75 65 20 7d 0a 09 2d 6e 6f 73  t $value }..-nos
07e0: 69 67 6e 20 20 7b 20 66 6f 73 73 69 6c 3a 3a 63  ign  { fossil::c
07f0: 6f 6e 66 69 67 75 72 65 20 2d 6e 6f 73 69 67 6e  onfigure -nosign
0800: 20 20 24 76 61 6c 75 65 20 7d 0a 09 2d 70 72 6f    $value }..-pro
0810: 6a 65 63 74 20 7b 20 63 76 73 3a 3a 63 6f 6e 66  ject { cvs::conf
0820: 69 67 75 72 65 20 20 20 20 2d 70 72 6f 6a 65 63  igure    -projec
0830: 74 20 24 76 61 6c 75 65 20 7d 0a 09 2d 73 61 76  t $value }..-sav
0840: 65 74 6f 20 20 7b 20 66 6f 73 73 69 6c 3a 3a 63  eto  { fossil::c
0850: 6f 6e 66 69 67 75 72 65 20 2d 73 61 76 65 74 6f  onfigure -saveto
0860: 20 20 24 76 61 6c 75 65 20 7d 0a 09 64 65 66 61    $value }..defa
0870: 75 6c 74 20 7b 0a 09 20 20 20 20 72 65 74 75 72  ult {..    retur
0880: 6e 20 2d 63 6f 64 65 20 65 72 72 6f 72 20 22 55  n -code error "U
0890: 6e 6b 6e 6f 77 6e 20 73 77 69 74 63 68 20 24 6b  nknown switch $k
08a0: 65 79 2c 20 65 78 70 65 63 74 65 64 20 6f 6e 65  ey, expected one
08b0: 20 6f 66 20 5c 0a 20 20 20 20 20 20 20 20 20 20   of \.          
08c0: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                  
08d0: 20 20 20 20 20 20 20 20 20 2d 62 72 65 61 6b 61           -breaka
08e0: 74 2c 20 2d 6e 6f 73 69 67 6e 2c 20 6f 72 20 2d  t, -nosign, or -
08f0: 73 61 76 65 74 6f 22 0a 09 7d 0a 20 20 20 20 7d  saveto"..}.    }
0900: 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 23  .    return.}..#
0910: 20 49 6d 70 6f 72 74 20 74 68 65 20 43 56 53 20   Import the CVS 
0920: 72 65 70 6f 73 69 74 6f 72 79 20 66 6f 75 6e 64  repository found
0930: 20 61 74 20 64 69 72 65 63 74 6f 72 79 20 27 73   at directory 's
0940: 72 63 27 20 69 6e 74 6f 20 74 68 65 20 6e 65 77  rc' into the new
0950: 0a 23 20 66 6f 73 73 69 6c 20 72 65 70 6f 73 69  .# fossil reposi
0960: 74 6f 72 79 20 61 74 20 27 64 73 74 27 2e 0a 0a  tory at 'dst'...
0970: 70 72 6f 63 20 3a 3a 76 63 3a 3a 66 6f 73 73 69  proc ::vc::fossi
0980: 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 3a 3a  l::import::cvs::
0990: 72 75 6e 20 7b 73 72 63 20 64 73 74 7d 20 7b 0a  run {src dst} {.
09a0: 20 20 20 20 23 42 20 6d 61 70 3a 3a 73 65 74 20      #B map::set 
09b0: 7b 7d 20 7b 7d 0a 0a 20 20 20 20 73 65 74 20 73  {} {}..    set s
09c0: 72 63 20 5b 66 69 6c 65 20 6e 6f 72 6d 61 6c 69  rc [file normali
09d0: 7a 65 20 24 73 72 63 5d 0a 20 20 20 20 73 65 74  ze $src].    set
09e0: 20 64 73 74 20 5b 66 69 6c 65 20 6e 6f 72 6d 61   dst [file norma
09f0: 6c 69 7a 65 20 24 64 73 74 5d 0a 0a 20 20 20 20  lize $dst]..    
0a00: 73 65 74 20 77 73 20 5b 63 76 73 3a 3a 62 65 67  set ws [cvs::beg
0a10: 69 6e 20 24 73 72 63 5d 0a 20 20 20 20 66 6f 73  in $src].    fos
0a20: 73 69 6c 3a 3a 62 65 67 69 6e 20 24 77 73 0a 20  sil::begin $ws. 
0a30: 20 20 20 73 74 61 74 73 3a 3a 73 65 74 75 70 20     stats::setup 
0a40: 5b 63 76 73 3a 3a 6e 63 73 65 74 73 20 2d 69 6d  [cvs::ncsets -im
0a50: 70 6f 72 74 5d 20 5b 63 76 73 3a 3a 6e 63 73 65  port] [cvs::ncse
0a60: 74 73 5d 0a 0a 20 20 20 20 63 76 73 3a 3a 66 6f  ts]..    cvs::fo
0a70: 72 65 61 63 68 20 63 73 65 74 20 7b 0a 09 49 6d  reach cset {..Im
0a80: 70 6f 72 74 31 20 24 63 73 65 74 0a 20 20 20 20  port1 $cset.    
0a90: 7d 0a 0a 20 20 20 20 73 74 61 74 73 3a 3a 64 6f  }..    stats::do
0aa0: 6e 65 0a 20 20 20 20 66 6f 73 73 69 6c 3a 3a 64  ne.    fossil::d
0ab0: 6f 6e 65 20 24 64 73 74 0a 20 20 20 20 63 76 73  one $dst.    cvs
0ac0: 3a 3a 64 6f 6e 65 0a 0a 20 20 20 20 77 72 69 74  ::done..    writ
0ad0: 65 20 30 20 69 6d 70 6f 72 74 20 4f 6b 2e 0a 20  e 0 import Ok.. 
0ae0: 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 23 20 2d     return.}..# -
0af0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0b00: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0b10: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0b20: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0b30: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 20 49  ------------.# I
0b40: 6e 74 65 72 6e 61 6c 20 6f 70 65 72 61 74 69 6f  nternal operatio
0b50: 6e 73 20 2d 20 49 6d 70 6f 72 74 20 61 20 73 69  ns - Import a si
0b60: 6e 67 6c 65 20 63 68 61 6e 67 65 73 65 74 2e 0a  ngle changeset..
0b70: 0a 70 72 6f 63 20 3a 3a 76 63 3a 3a 66 6f 73 73  .proc ::vc::foss
0b80: 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 3a  il::import::cvs:
0b90: 3a 49 6d 70 6f 72 74 31 20 7b 63 73 65 74 7d 20  :Import1 {cset} 
0ba0: 7b 0a 20 20 20 20 73 74 61 74 73 3a 3a 63 73 62  {.    stats::csb
0bb0: 65 67 69 6e 20 24 63 73 65 74 0a 0a 20 20 20 20  egin $cset..    
0bc0: 73 65 74 20 6d 69 63 72 6f 73 65 63 6f 6e 64 73  set microseconds
0bd0: 20 5b 6c 69 6e 64 65 78 20 5b 74 69 6d 65 20 7b   [lindex [time {
0be0: 49 6d 70 6f 72 74 43 53 20 24 63 73 65 74 7d 20  ImportCS $cset} 
0bf0: 31 5d 20 30 5d 0a 20 20 20 20 73 65 74 20 73 65  1] 0].    set se
0c00: 63 6f 6e 64 73 20 20 20 20 20 20 5b 65 78 70 72  conds      [expr
0c10: 20 7b 24 6d 69 63 72 6f 73 65 63 6f 6e 64 73 2f   {$microseconds/
0c20: 31 65 36 7d 5d 0a 0a 20 20 20 20 73 74 61 74 73  1e6}]..    stats
0c30: 3a 3a 63 73 65 6e 64 20 24 73 65 63 6f 6e 64 73  ::csend $seconds
0c40: 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 70  .    return.}..p
0c50: 72 6f 63 20 3a 3a 76 63 3a 3a 66 6f 73 73 69 6c  roc ::vc::fossil
0c60: 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 3a 3a 49  ::import::cvs::I
0c70: 6d 70 6f 72 74 43 53 20 7b 63 73 65 74 7d 20 7b  mportCS {cset} {
0c80: 0a 20 20 20 20 23 42 20 66 6f 73 73 69 6c 3a 3a  .    #B fossil::
0c90: 73 65 74 75 70 20 5b 6d 61 70 3a 3a 67 65 74 20  setup [map::get 
0ca0: 5b 63 76 73 3a 3a 70 61 72 65 6e 74 4f 66 20 24  [cvs::parentOf $
0cb0: 63 73 65 74 5d 5d 0a 20 20 20 20 6c 61 73 73 69  cset]].    lassi
0cc0: 67 6e 20 5b 63 76 73 3a 3a 63 68 65 63 6b 6f 75  gn [cvs::checkou
0cd0: 74 20 20 24 63 73 65 74 5d 20 75 73 65 72 20 20  t  $cset] user  
0ce0: 74 69 6d 65 73 74 61 6d 70 20 20 6d 65 73 73 61  timestamp  messa
0cf0: 67 65 0a 20 20 20 20 6c 61 73 73 69 67 6e 20 5b  ge.    lassign [
0d00: 66 6f 73 73 69 6c 3a 3a 63 6f 6d 6d 69 74 20 24  fossil::commit $
0d10: 63 73 65 74 20 24 75 73 65 72 20 24 74 69 6d 65  cset $user $time
0d20: 73 74 61 6d 70 20 24 6d 65 73 73 61 67 65 5d 20  stamp $message] 
0d30: 75 75 69 64 20 61 64 20 72 6d 20 63 68 0a 20 20  uuid ad rm ch.  
0d40: 20 20 77 72 69 74 65 20 32 20 69 6d 70 6f 72 74    write 2 import
0d50: 20 22 3d 3d 20 2b 24 7b 61 64 7d 2d 24 7b 72 6d   "== +${ad}-${rm
0d60: 7d 2a 24 7b 63 68 7d 22 0a 20 20 20 20 6d 61 70  }*${ch}".    map
0d70: 3a 3a 73 65 74 20 24 63 73 65 74 20 24 75 75 69  ::set $cset $uui
0d80: 64 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a  d.    return.}..
0d90: 70 72 6f 63 20 3a 3a 76 63 3a 3a 66 6f 73 73 69  proc ::vc::fossi
0da0: 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 3a 3a  l::import::cvs::
0db0: 6c 61 73 73 69 67 6e 20 7b 6c 20 61 72 67 73 7d  lassign {l args}
0dc0: 20 7b 0a 20 20 20 20 66 6f 72 65 61 63 68 20 76   {.    foreach v
0dd0: 20 24 61 72 67 73 20 7b 75 70 76 61 72 20 31 20   $args {upvar 1 
0de0: 24 76 20 24 76 7d 20 0a 20 20 20 20 66 6f 72 65  $v $v} .    fore
0df0: 61 63 68 20 24 61 72 67 73 20 24 6c 20 62 72 65  ach $args $l bre
0e00: 61 6b 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a  ak.    return.}.
0e10: 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  .# -------------
0e20: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e30: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e40: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e50: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0e60: 0a 0a 6e 61 6d 65 73 70 61 63 65 20 65 76 61 6c  ..namespace eval
0e70: 20 3a 3a 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69   ::vc::fossil::i
0e80: 6d 70 6f 72 74 3a 3a 63 76 73 20 7b 0a 20 20 20  mport::cvs {.   
0e90: 20 6e 61 6d 65 73 70 61 63 65 20 65 78 70 6f 72   namespace expor
0ea0: 74 20 72 75 6e 20 63 6f 6e 66 69 67 75 72 65 0a  t run configure.
0eb0: 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  }..# -----------
0ec0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ed0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ee0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ef0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0f00: 2d 2d 0a 23 20 52 65 61 64 79 0a 0a 70 61 63 6b  --.# Ready..pack
0f10: 61 67 65 20 70 72 6f 76 69 64 65 20 76 63 3a 3a  age provide vc::
0f20: 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a  fossil::import::
0f30: 63 76 73 20 31 2e 30 0a 72 65 74 75 72 6e 0a     cvs 1.0.return.