Hex Artifact Content
Not logged in

Artifact ab3e3cfde79c3cf234a17a5519a78fc45bbb8800:

File tools/lib/importcvs.tcl part of check-in [00228d1547] - Continuing namespace changes, cvs frontend. by aku on 2007-09-13 06:22:29.

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 3b 20 23 20 46 72 6f 6e 74 65 6e 64 2c     ; # Frontend,
0140: 20 72 65 61 64 69 6e 67 20 66 72 6f 6d 20 73 6f   reading from so
0150: 75 72 63 65 20 72 65 70 6f 73 69 74 6f 72 79 0a  urce repository.
0160: 70 61 63 6b 61 67 65 20 72 65 71 75 69 72 65 20  package require 
0170: 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 77 73 20 20  vc::fossil::ws  
0180: 3b 20 23 20 42 61 63 6b 65 6e 64 2c 20 20 77 72  ; # Backend,  wr
0190: 69 74 69 6e 67 20 74 6f 20 64 65 73 74 69 6e 61  iting to destina
01a0: 74 69 6f 6e 20 72 65 70 6f 73 69 74 6f 72 79 2e  tion repository.
01b0: 0a 70 61 63 6b 61 67 65 20 72 65 71 75 69 72 65  .package require
01c0: 20 76 63 3a 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67 20   vc::tools::log 
01d0: 20 3b 20 23 20 55 73 65 72 20 66 65 65 64 62 61   ; # User feedba
01e0: 63 6b 0a 0a 6e 61 6d 65 73 70 61 63 65 20 65 76  ck..namespace ev
01f0: 61 6c 20 3a 3a 76 63 3a 3a 66 6f 73 73 69 6c 3a  al ::vc::fossil:
0200: 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 20 7b 0a 20  :import::cvs {. 
0210: 20 20 20 76 63 3a 3a 74 6f 6f 6c 73 3a 3a 6c 6f     vc::tools::lo
0220: 67 3a 3a 73 79 73 74 65 6d 20 69 6d 70 6f 72 74  g::system import
0230: 0a 20 20 20 20 6e 61 6d 65 73 70 61 63 65 20 69  .    namespace i
0240: 6d 70 6f 72 74 20 3a 3a 76 63 3a 3a 74 6f 6f 6c  mport ::vc::tool
0250: 73 3a 3a 6c 6f 67 3a 3a 77 72 69 74 65 0a 20 20  s::log::write.  
0260: 20 20 6e 61 6d 65 73 70 61 63 65 20 65 76 61 6c    namespace eval
0270: 20 63 76 73 20 20 20 20 7b 20 6e 61 6d 65 73 70   cvs    { namesp
0280: 61 63 65 20 69 6d 70 6f 72 74 20 3a 3a 76 63 3a  ace import ::vc:
0290: 3a 63 76 73 3a 3a 77 73 3a 3a 2a 20 7d 0a 20 20  :cvs::ws::* }.  
02a0: 20 20 6e 61 6d 65 73 70 61 63 65 20 65 76 61 6c    namespace eval
02b0: 20 66 6f 73 73 69 6c 20 7b 20 6e 61 6d 65 73 70   fossil { namesp
02c0: 61 63 65 20 69 6d 70 6f 72 74 20 3a 3a 76 63 3a  ace import ::vc:
02d0: 3a 66 6f 73 73 69 6c 3a 3a 77 73 3a 3a 2a 20 7d  :fossil::ws::* }
02e0: 0a 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  .}..# ----------
02f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0300: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0310: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0320: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0330: 2d 2d 2d 0a 23 20 41 50 49 0a 0a 23 20 43 6f 6e  ---.# API..# Con
0340: 66 69 67 75 72 61 74 69 6f 6e 0a 23 0a 23 09 76  figuration.#.#.v
0350: 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72  c::fossil::impor
0360: 74 3a 3a 63 76 73 3a 3a 63 6f 6e 66 69 67 75 72  t::cvs::configur
0370: 65 20 6b 65 79 20 76 61 6c 75 65 20 2d 20 53 65  e key value - Se
0380: 74 20 63 6f 6e 66 69 67 75 72 61 74 69 6f 6e 0a  t configuration.
0390: 23 0a 23 09 4c 65 67 61 6c 20 6b 65 79 73 3a 09  #.#.Legal keys:.
03a0: 2d 6e 6f 73 69 67 6e 09 09 3c 62 6f 6f 6c 3e 2c  -nosign..<bool>,
03b0: 20 64 65 66 61 75 6c 74 20 66 61 6c 73 65 0a 23   default false.#
03c0: 09 09 09 2d 64 65 62 75 67 63 6f 6d 6d 69 74 09  ...-debugcommit.
03d0: 3c 62 6f 6f 6c 3e 2c 20 64 65 66 61 75 6c 74 20  <bool>, default 
03e0: 66 61 6c 73 65 0a 23 09 09 09 2d 73 74 6f 70 61  false.#...-stopa
03f0: 74 09 09 3c 69 6e 74 3e 2c 20 20 64 65 66 61 75  t..<int>,  defau
0400: 6c 74 20 3a 6e 6f 6e 65 3a 0a 23 0a 23 20 46 75  lt :none:.#.# Fu
0410: 6e 63 74 69 6f 6e 61 6c 69 74 79 0a 23 0a 23 09  nctionality.#.#.
0420: 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f  vc::fossil::impo
0430: 72 74 3a 3a 63 76 73 3a 3a 72 75 6e 20 73 72 63  rt::cvs::run src
0440: 20 64 73 74 20 20 20 20 20 20 20 20 20 2d 20 50   dst         - P
0450: 65 72 66 6f 72 6d 20 61 6e 20 69 6d 70 6f 72 74  erform an import
0460: 2e 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ...# -----------
0470: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0480: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0490: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
04b0: 2d 2d 0a 23 20 41 50 49 20 49 6d 70 6c 65 6d 65  --.# API Impleme
04c0: 6e 74 61 74 69 6f 6e 20 2d 20 46 75 6e 63 74 69  ntation - Functi
04d0: 6f 6e 61 6c 69 74 79 0a 0a 70 72 6f 63 20 3a 3a  onality..proc ::
04e0: 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70 6f  vc::fossil::impo
04f0: 72 74 3a 3a 63 76 73 3a 3a 63 6f 6e 66 69 67 75  rt::cvs::configu
0500: 72 65 20 7b 6b 65 79 20 76 61 6c 75 65 7d 20 7b  re {key value} {
0510: 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20 6e 6f  .    variable no
0520: 73 69 67 6e 0a 20 20 20 20 76 61 72 69 61 62 6c  sign.    variabl
0530: 65 20 73 74 6f 70 61 74 0a 0a 20 20 20 20 73 77  e stopat..    sw
0540: 69 74 63 68 20 2d 65 78 61 63 74 20 2d 2d 20 24  itch -exact -- $
0550: 6b 65 79 20 7b 0a 09 2d 64 65 62 75 67 63 6f 6d  key {..-debugcom
0560: 6d 69 74 20 7b 0a 09 20 20 20 20 69 66 20 7b 21  mit {..    if {!
0570: 5b 73 74 72 69 6e 67 20 69 73 20 62 6f 6f 6c 65  [string is boole
0580: 61 6e 20 2d 73 74 72 69 63 74 20 24 76 61 6c 75  an -strict $valu
0590: 65 5d 7d 20 7b 0a 09 09 72 65 74 75 72 6e 20 2d  e]} {...return -
05a0: 63 6f 64 65 20 65 72 72 6f 72 20 22 45 78 70 65  code error "Expe
05b0: 63 74 65 64 20 62 6f 6f 6c 65 61 6e 2c 20 67 6f  cted boolean, go
05c0: 74 20 5c 22 24 76 61 6c 75 65 5c 22 22 0a 09 20  t \"$value\"".. 
05d0: 20 20 20 7d 0a 09 20 20 20 20 66 6f 73 73 69 6c     }..    fossil
05e0: 3a 3a 64 65 62 75 67 63 6f 6d 6d 69 74 20 24 76  ::debugcommit $v
05f0: 61 6c 75 65 0a 09 7d 0a 09 2d 6e 6f 73 69 67 6e  alue..}..-nosign
0600: 20 7b 0a 09 20 20 20 20 69 66 20 7b 21 5b 73 74   {..    if {![st
0610: 72 69 6e 67 20 69 73 20 62 6f 6f 6c 65 61 6e 20  ring is boolean 
0620: 2d 73 74 72 69 63 74 20 24 76 61 6c 75 65 5d 7d  -strict $value]}
0630: 20 7b 0a 09 09 72 65 74 75 72 6e 20 2d 63 6f 64   {...return -cod
0640: 65 20 65 72 72 6f 72 20 22 45 78 70 65 63 74 65  e error "Expecte
0650: 64 20 62 6f 6f 6c 65 61 6e 2c 20 67 6f 74 20 5c  d boolean, got \
0660: 22 24 76 61 6c 75 65 5c 22 22 0a 09 20 20 20 20  "$value\""..    
0670: 7d 0a 09 20 20 20 20 73 65 74 20 6e 6f 73 69 67  }..    set nosig
0680: 6e 20 24 76 61 6c 75 65 0a 09 7d 0a 09 2d 73 74  n $value..}..-st
0690: 6f 70 61 74 20 7b 0a 09 20 20 20 20 73 65 74 20  opat {..    set 
06a0: 73 74 6f 70 61 74 20 24 76 61 6c 75 65 0a 09 7d  stopat $value..}
06b0: 0a 09 64 65 66 61 75 6c 74 20 7b 0a 09 20 20 20  ..default {..   
06c0: 20 72 65 74 75 72 6e 20 2d 63 6f 64 65 20 65 72   return -code er
06d0: 72 6f 72 20 22 55 6e 6b 6e 6f 77 6e 20 73 77 69  ror "Unknown swi
06e0: 74 63 68 20 24 6b 65 79 2c 20 65 78 70 65 63 74  tch $key, expect
06f0: 65 64 20 6f 6e 65 20 6f 66 20 5c 0a 20 20 20 20  ed one of \.    
0700: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20                  
0710: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 2d                 -
0720: 64 65 62 75 67 63 6f 6d 6d 69 74 2c 20 2d 6e 6f  debugcommit, -no
0730: 73 69 67 6e 2c 20 6f 72 20 2d 73 74 6f 70 61 74  sign, or -stopat
0740: 22 0a 09 7d 0a 20 20 20 20 7d 0a 20 20 20 20 72  "..}.    }.    r
0750: 65 74 75 72 6e 0a 7d 0a 0a 23 20 49 6d 70 6f 72  eturn.}..# Impor
0760: 74 20 74 68 65 20 43 56 53 20 72 65 70 6f 73 69  t the CVS reposi
0770: 74 6f 72 79 20 66 6f 75 6e 64 20 61 74 20 64 69  tory found at di
0780: 72 65 63 74 6f 72 79 20 27 73 72 63 27 20 69 6e  rectory 'src' in
0790: 74 6f 20 74 68 65 20 6e 65 77 0a 23 20 66 6f 73  to the new.# fos
07a0: 73 69 6c 20 72 65 70 6f 73 69 74 6f 72 79 20 61  sil repository a
07b0: 74 20 27 64 73 74 27 2e 0a 0a 70 72 6f 63 20 3a  t 'dst'...proc :
07c0: 3a 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70  :vc::fossil::imp
07d0: 6f 72 74 3a 3a 63 76 73 3a 3a 72 75 6e 20 7b 73  ort::cvs::run {s
07e0: 72 63 20 64 73 74 7d 20 7b 0a 20 20 20 20 76 61  rc dst} {.    va
07f0: 72 69 61 62 6c 65 20 73 74 6f 70 61 74 0a 0a 20  riable stopat.. 
0800: 20 20 20 63 76 73 3a 3a 61 74 20 24 73 72 63 20     cvs::at $src 
0810: 20 3b 20 23 20 44 65 66 69 6e 65 20 6c 6f 63 61   ; # Define loca
0820: 74 69 6f 6e 20 6f 66 20 43 56 53 20 72 65 70 6f  tion of CVS repo
0830: 73 69 74 6f 72 79 0a 20 20 20 20 63 76 73 3a 3a  sitory.    cvs::
0840: 73 63 61 6e 20 20 20 20 20 3b 20 23 20 47 61 74  scan     ; # Gat
0850: 68 65 72 20 72 65 76 69 73 69 6f 6e 20 64 61 74  her revision dat
0860: 61 20 66 72 6f 6d 20 74 68 65 20 61 72 63 68 69  a from the archi
0870: 76 65 73 0a 20 20 20 20 63 76 73 3a 3a 63 73 65  ves.    cvs::cse
0880: 74 73 20 20 20 20 3b 20 23 20 47 72 6f 75 70 20  ts    ; # Group 
0890: 63 68 61 6e 67 65 73 20 69 6e 74 6f 20 73 65 74  changes into set
08a0: 73 0a 20 20 20 20 63 76 73 3a 3a 72 74 72 65 65  s.    cvs::rtree
08b0: 20 20 20 20 3b 20 23 20 42 75 69 6c 64 20 72 65      ; # Build re
08c0: 76 69 73 69 6f 6e 20 74 72 65 65 20 28 74 72 75  vision tree (tru
08d0: 6e 6b 20 6f 6e 6c 79 20 72 69 67 68 74 20 6e 6f  nk only right no
08e0: 77 29 2e 0a 0a 20 20 20 20 73 65 74 20 74 6f 74  w)...    set tot
08f0: 20 30 2e 30 0a 20 20 20 20 73 65 74 20 6e 74 6f   0.0.    set nto
0900: 20 30 0a 0a 20 20 20 20 77 72 69 74 65 20 30 20   0..    write 0 
0910: 69 6d 70 6f 72 74 20 7b 42 65 67 69 6e 20 63 6f  import {Begin co
0920: 6e 76 65 72 73 69 6f 6e 7d 0a 20 20 20 20 77 72  nversion}.    wr
0930: 69 74 65 20 30 20 69 6d 70 6f 72 74 20 7b 53 65  ite 0 import {Se
0940: 74 74 69 6e 67 20 75 70 20 77 6f 72 6b 73 70 61  tting up workspa
0950: 63 65 73 7d 0a 0a 20 20 20 20 63 76 73 3a 3a 77  ces}..    cvs::w
0960: 6f 72 6b 73 70 61 63 65 20 3b 20 23 20 63 64 27  orkspace ; # cd'
0970: 73 20 74 6f 20 77 6f 72 6b 73 70 61 63 65 0a 20  s to workspace. 
0980: 20 20 20 66 6f 73 73 69 6c 3a 3a 6e 65 77 20 20     fossil::new  
0990: 20 20 3b 20 23 20 55 73 65 73 20 63 77 64 20 61    ; # Uses cwd a
09a0: 73 20 77 6f 72 6b 73 70 61 63 65 20 74 6f 20 63  s workspace to c
09b0: 6f 6e 6e 65 63 74 20 74 6f 2e 0a 0a 20 20 20 20  onnect to...    
09c0: 73 65 74 20 6e 74 72 75 6e 6b 20 5b 63 76 73 3a  set ntrunk [cvs:
09d0: 3a 6e 74 72 75 6e 6b 5d 20 3b 20 73 65 74 20 6e  :ntrunk] ; set n
09e0: 74 66 6d 74 20 25 5b 73 74 72 69 6e 67 20 6c 65  tfmt %[string le
09f0: 6e 67 74 68 20 24 6e 74 72 75 6e 6b 5d 73 0a 20  ngth $ntrunk]s. 
0a00: 20 20 20 73 65 74 20 6e 6d 61 78 20 20 20 5b 63     set nmax   [c
0a10: 76 73 3a 3a 6e 63 73 65 74 73 5d 20 3b 20 73 65  vs::ncsets] ; se
0a20: 74 20 6e 6d 66 6d 74 20 25 5b 73 74 72 69 6e 67  t nmfmt %[string
0a30: 20 6c 65 6e 67 74 68 20 24 6e 6d 61 78 5d 73 0a   length $nmax]s.
0a40: 0a 20 20 20 20 63 76 73 3a 3a 66 6f 72 65 61 63  .    cvs::foreac
0a50: 68 5f 63 73 65 74 20 63 73 65 74 20 5b 63 76 73  h_cset cset [cvs
0a60: 3a 3a 72 6f 6f 74 5d 20 7b 0a 09 77 72 69 74 65  ::root] {..write
0a70: 20 30 20 69 6d 70 6f 72 74 20 22 43 68 61 6e 67   0 import "Chang
0a80: 65 53 65 74 20 5b 66 6f 72 6d 61 74 20 24 6e 6d  eSet [format $nm
0a90: 66 6d 74 20 24 63 73 65 74 5d 20 40 20 5b 66 6f  fmt $cset] @ [fo
0aa0: 72 6d 61 74 20 24 6e 74 66 6d 74 20 24 6e 74 6f  rmat $ntfmt $nto
0ab0: 5d 2f 24 6e 74 72 75 6e 6b 20 28 5b 66 6f 72 6d  ]/$ntrunk ([form
0ac0: 61 74 20 25 36 2e 32 66 20 5b 65 78 70 72 20 7b  at %6.2f [expr {
0ad0: 24 6e 74 6f 2a 31 30 30 2e 30 2f 24 6e 74 72 75  $nto*100.0/$ntru
0ae0: 6e 6b 7d 5d 5d 25 29 22 0a 09 53 74 61 74 69 73  nk}]]%)"..Statis
0af0: 74 69 63 73 20 5b 4f 6e 65 43 68 61 6e 67 65 53  tics [OneChangeS
0b00: 65 74 20 24 63 73 65 74 5d 0a 20 20 20 20 7d 0a  et $cset].    }.
0b10: 0a 20 20 20 20 77 72 69 74 65 20 30 20 69 6d 70  .    write 0 imp
0b20: 6f 72 74 20 22 3d 3d 3d 3d 3d 3d 3d 3d 3d 20 5b  ort "========= [
0b30: 73 74 72 69 6e 67 20 72 65 70 65 61 74 20 3d 20  string repeat = 
0b40: 36 31 5d 22 0a 20 20 20 20 77 72 69 74 65 20 30  61]".    write 0
0b50: 20 69 6d 70 6f 72 74 20 22 49 6d 70 6f 72 74 65   import "Importe
0b60: 64 20 24 6e 74 6f 20 5b 65 78 70 72 20 7b 28 24  d $nto [expr {($
0b70: 6e 74 6f 20 3d 3d 20 31 29 20 3f 20 22 63 68 61  nto == 1) ? "cha
0b80: 6e 67 65 73 65 74 22 20 3a 20 22 63 68 61 6e 67  ngeset" : "chang
0b90: 65 73 65 74 73 22 7d 5d 22 0a 20 20 20 20 77 72  esets"}]".    wr
0ba0: 69 74 65 20 30 20 69 6d 70 6f 72 74 20 22 57 69  ite 0 import "Wi
0bb0: 74 68 69 6e 20 5b 66 6f 72 6d 61 74 20 25 2e 32  thin [format %.2
0bc0: 66 20 24 74 6f 74 5d 20 73 65 63 6f 6e 64 73 20  f $tot] seconds 
0bd0: 28 61 76 67 20 5b 66 6f 72 6d 61 74 20 25 2e 32  (avg [format %.2
0be0: 66 20 5b 65 78 70 72 20 7b 24 74 6f 74 2f 24 6e  f [expr {$tot/$n
0bf0: 74 6f 7d 5d 5d 20 73 65 63 6f 6e 64 73 2f 63 68  to}]] seconds/ch
0c00: 61 6e 67 65 73 65 74 29 22 0a 0a 20 20 20 20 69  angeset)"..    i
0c10: 66 20 7b 24 73 74 6f 70 61 74 20 3d 3d 20 24 63  f {$stopat == $c
0c20: 73 65 74 7d 20 72 65 74 75 72 6e 0a 0a 20 20 20  set} return..   
0c30: 20 63 76 73 3a 3a 77 73 63 6c 65 61 72 0a 20 20   cvs::wsclear.  
0c40: 20 20 66 6f 73 73 69 6c 3a 3a 64 65 73 74 69 6e    fossil::destin
0c50: 61 74 69 6f 6e 20 24 64 73 74 0a 20 20 20 20 77  ation $dst.    w
0c60: 72 69 74 65 20 30 20 69 6d 70 6f 72 74 20 4f 6b  rite 0 import Ok
0c70: 2e 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d 0a 0a  ..    return.}..
0c80: 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  # --------------
0c90: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0ca0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0cb0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
0cc0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a  ---------------.
0cd0: 23 20 49 6e 74 65 72 6e 61 6c 20 6f 70 65 72 61  # Internal opera
0ce0: 74 69 6f 6e 73 20 2d 20 49 6d 70 6f 72 74 20 61  tions - Import a
0cf0: 20 73 69 6e 67 6c 65 20 63 68 61 6e 67 65 73 65   single changese
0d00: 74 2e 0a 0a 70 72 6f 63 20 3a 3a 76 63 3a 3a 66  t...proc ::vc::f
0d10: 6f 73 73 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 63  ossil::import::c
0d20: 76 73 3a 3a 53 74 61 74 69 73 74 69 63 73 20 7b  vs::Statistics {
0d30: 73 65 63 7d 20 7b 0a 20 20 20 20 75 70 76 61 72  sec} {.    upvar
0d40: 20 31 20 74 6f 74 20 74 6f 74 20 6e 74 6f 20 6e   1 tot tot nto n
0d50: 74 6f 20 6e 74 72 75 6e 6b 20 6e 74 72 75 6e 6b  to ntrunk ntrunk
0d60: 0a 0a 20 20 20 20 23 20 4e 6f 20 73 74 61 74 69  ..    # No stati
0d70: 73 74 69 63 73 20 69 66 20 74 68 65 20 63 6f 6d  stics if the com
0d80: 6d 69 74 20 77 61 73 20 73 74 6f 70 70 65 64 20  mit was stopped 
0d90: 62 65 66 6f 72 65 20 69 74 20 77 61 73 20 72 75  before it was ru
0da0: 6e 0a 20 20 20 20 69 66 20 7b 24 73 65 63 20 65  n.    if {$sec e
0db0: 71 20 22 22 7d 20 72 65 74 75 72 6e 0a 0a 20 20  q ""} return..  
0dc0: 20 20 69 6e 63 72 20 6e 74 6f 0a 0a 20 20 20 20    incr nto..    
0dd0: 73 65 74 20 74 6f 74 20 5b 65 78 70 72 20 7b 24  set tot [expr {$
0de0: 74 6f 74 20 2b 20 24 73 65 63 7d 5d 0a 20 20 20  tot + $sec}].   
0df0: 20 73 65 74 20 61 76 67 20 5b 65 78 70 72 20 7b   set avg [expr {
0e00: 24 74 6f 74 2f 24 6e 74 6f 7d 5d 0a 20 20 20 20  $tot/$nto}].    
0e10: 73 65 74 20 6d 61 78 20 5b 65 78 70 72 20 7b 24  set max [expr {$
0e20: 6e 74 72 75 6e 6b 20 2a 20 24 61 76 67 7d 5d 0a  ntrunk * $avg}].
0e30: 20 20 20 20 73 65 74 20 72 65 6d 20 5b 65 78 70      set rem [exp
0e40: 72 20 7b 24 6d 61 78 20 2d 20 24 74 6f 74 7d 5d  r {$max - $tot}]
0e50: 0a 0a 20 20 20 20 77 72 69 74 65 20 33 20 69 6d  ..    write 3 im
0e60: 70 6f 72 74 20 22 73 74 20 61 76 67 20 5b 66 6f  port "st avg [fo
0e70: 72 6d 61 74 20 25 2e 32 66 20 24 61 76 67 5d 20  rmat %.2f $avg] 
0e80: 73 65 63 22 0a 20 20 20 20 77 72 69 74 65 20 33  sec".    write 3
0e90: 20 69 6d 70 6f 72 74 20 22 73 74 20 72 75 6e 20   import "st run 
0ea0: 5b 66 6f 72 6d 61 74 20 25 37 2e 32 66 20 24 74  [format %7.2f $t
0eb0: 6f 74 5d 20 73 65 63 20 5b 66 6f 72 6d 61 74 20  ot] sec [format 
0ec0: 25 36 2e 32 66 20 5b 65 78 70 72 20 7b 24 74 6f  %6.2f [expr {$to
0ed0: 74 2f 36 30 7d 5d 5d 20 6d 69 6e 20 5b 66 6f 72  t/60}]] min [for
0ee0: 6d 61 74 20 25 35 2e 32 66 20 5b 65 78 70 72 20  mat %5.2f [expr 
0ef0: 7b 24 74 6f 74 2f 33 36 30 30 7d 5d 5d 20 68 72  {$tot/3600}]] hr
0f00: 22 0a 20 20 20 20 77 72 69 74 65 20 33 20 69 6d  ".    write 3 im
0f10: 70 6f 72 74 20 22 73 74 20 65 6e 64 20 5b 66 6f  port "st end [fo
0f20: 72 6d 61 74 20 25 37 2e 32 66 20 24 6d 61 78 5d  rmat %7.2f $max]
0f30: 20 73 65 63 20 5b 66 6f 72 6d 61 74 20 25 36 2e   sec [format %6.
0f40: 32 66 20 5b 65 78 70 72 20 7b 24 6d 61 78 2f 36  2f [expr {$max/6
0f50: 30 7d 5d 5d 20 6d 69 6e 20 5b 66 6f 72 6d 61 74  0}]] min [format
0f60: 20 25 35 2e 32 66 20 5b 65 78 70 72 20 7b 24 6d   %5.2f [expr {$m
0f70: 61 78 2f 33 36 30 30 7d 5d 5d 20 68 72 22 0a 20  ax/3600}]] hr". 
0f80: 20 20 20 77 72 69 74 65 20 33 20 69 6d 70 6f 72     write 3 impor
0f90: 74 20 22 73 74 20 72 65 6d 20 5b 66 6f 72 6d 61  t "st rem [forma
0fa0: 74 20 25 37 2e 32 66 20 24 72 65 6d 5d 20 73 65  t %7.2f $rem] se
0fb0: 63 20 5b 66 6f 72 6d 61 74 20 25 36 2e 32 66 20  c [format %6.2f 
0fc0: 5b 65 78 70 72 20 7b 24 72 65 6d 2f 36 30 7d 5d  [expr {$rem/60}]
0fd0: 5d 20 6d 69 6e 20 5b 66 6f 72 6d 61 74 20 25 35  ] min [format %5
0fe0: 2e 32 66 20 5b 65 78 70 72 20 7b 24 72 65 6d 2f  .2f [expr {$rem/
0ff0: 33 36 30 30 7d 5d 5d 20 68 72 22 0a 20 20 20 20  3600}]] hr".    
1000: 72 65 74 75 72 6e 0a 7d 0a 0a 70 72 6f 63 20 3a  return.}..proc :
1010: 3a 76 63 3a 3a 66 6f 73 73 69 6c 3a 3a 69 6d 70  :vc::fossil::imp
1020: 6f 72 74 3a 3a 63 76 73 3a 3a 4f 6e 65 43 68 61  ort::cvs::OneCha
1030: 6e 67 65 53 65 74 20 7b 63 73 65 74 7d 20 7b 0a  ngeSet {cset} {.
1040: 20 20 20 20 76 61 72 69 61 62 6c 65 20 6e 6f 73      variable nos
1050: 69 67 6e 0a 20 20 20 20 76 61 72 69 61 62 6c 65  ign.    variable
1060: 20 73 74 6f 70 61 74 0a 0a 20 20 20 20 69 66 20   stopat..    if 
1070: 7b 24 73 74 6f 70 61 74 20 3d 3d 20 24 63 73 65  {$stopat == $cse
1080: 74 7d 20 7b 0a 09 66 6f 73 73 69 6c 3a 3a 63 6f  t} {..fossil::co
1090: 6d 6d 69 74 20 31 20 63 76 73 32 66 6f 73 73 69  mmit 1 cvs2fossi
10a0: 6c 20 24 6e 6f 73 69 67 6e 20 5c 0a 09 20 20 20  l $nosign \..   
10b0: 20 5b 63 76 73 3a 3a 77 73 73 65 74 75 70 20 24   [cvs::wssetup $
10c0: 63 73 65 74 5d 20 3a 3a 76 63 3a 3a 63 76 73 3a  cset] ::vc::cvs:
10d0: 3a 77 73 3a 3a 77 73 69 67 6e 6f 72 65 0a 09 77  :ws::wsignore..w
10e0: 72 69 74 65 20 30 20 69 6d 70 6f 72 74 20 53 74  rite 0 import St
10f0: 6f 70 70 65 64 2e 0a 09 72 65 74 75 72 6e 20 2d  opped...return -
1100: 63 6f 64 65 20 62 72 65 61 6b 0a 20 20 20 20 7d  code break.    }
1110: 0a 0a 20 20 20 20 73 65 74 20 75 73 65 63 20 5b  ..    set usec [
1120: 6c 69 6e 64 65 78 20 5b 74 69 6d 65 20 7b 0a 09  lindex [time {..
1130: 66 6f 72 65 61 63 68 20 7b 75 75 69 64 20 61 64  foreach {uuid ad
1140: 20 72 6d 20 63 68 7d 20 5c 0a 09 20 20 20 20 5b   rm ch} \..    [
1150: 66 6f 73 73 69 6c 3a 3a 63 6f 6d 6d 69 74 20 30  fossil::commit 0
1160: 20 63 76 73 32 66 6f 73 73 69 6c 20 24 6e 6f 73   cvs2fossil $nos
1170: 69 67 6e 20 5c 0a 09 09 20 5b 63 76 73 3a 3a 77  ign \... [cvs::w
1180: 73 73 65 74 75 70 20 24 63 73 65 74 5d 20 3a 3a  ssetup $cset] ::
1190: 76 63 3a 3a 63 76 73 3a 3a 77 73 3a 3a 77 73 69  vc::cvs::ws::wsi
11a0: 67 6e 6f 72 65 5d 20 5c 0a 09 20 20 20 20 62 72  gnore] \..    br
11b0: 65 61 6b 0a 20 20 20 20 7d 20 31 5d 20 30 5d 0a  eak.    } 1] 0].
11c0: 20 20 20 20 63 76 73 3a 3a 75 75 69 64 20 24 63      cvs::uuid $c
11d0: 73 65 74 20 24 75 75 69 64 0a 0a 20 20 20 20 73  set $uuid..    s
11e0: 65 74 20 73 65 63 20 5b 65 78 70 72 20 7b 24 75  et sec [expr {$u
11f0: 73 65 63 2f 31 65 36 7d 5d 0a 0a 20 20 20 20 77  sec/1e6}]..    w
1200: 72 69 74 65 20 32 20 69 6d 70 6f 72 74 20 22 3d  rite 2 import "=
1210: 3d 20 24 75 75 69 64 20 2b 24 7b 61 64 7d 2d 24  = $uuid +${ad}-$
1220: 7b 72 6d 7d 2a 24 7b 63 68 7d 22 0a 20 20 20 20  {rm}*${ch}".    
1230: 77 72 69 74 65 20 32 20 69 6d 70 6f 72 74 20 22  write 2 import "
1240: 73 74 20 69 6e 20 20 5b 66 6f 72 6d 61 74 20 25  st in  [format %
1250: 2e 32 66 20 24 73 65 63 5d 20 73 65 63 22 0a 0a  .2f $sec] sec"..
1260: 20 20 20 20 72 65 74 75 72 6e 20 24 73 65 63 0a      return $sec.
1270: 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  }..# -----------
1280: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
1290: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
12a0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
12b0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
12c0: 2d 2d 0a 0a 6e 61 6d 65 73 70 61 63 65 20 65 76  --..namespace ev
12d0: 61 6c 20 3a 3a 76 63 3a 3a 66 6f 73 73 69 6c 3a  al ::vc::fossil:
12e0: 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 20 7b 0a 20  :import::cvs {. 
12f0: 20 20 20 76 61 72 69 61 62 6c 65 20 64 65 62 75     variable debu
1300: 67 63 6f 6d 6d 69 74 20 30 20 20 3b 20 23 20 44  gcommit 0  ; # D
1310: 65 62 75 67 20 74 68 65 20 63 6f 6d 6d 69 74 20  ebug the commit 
1320: 6f 70 65 72 61 74 69 6f 6e 2e 0a 20 20 20 20 76  operation..    v
1330: 61 72 69 61 62 6c 65 20 6e 6f 73 69 67 6e 20 20  ariable nosign  
1340: 20 20 20 20 30 20 20 3b 20 23 20 52 65 71 75 69      0  ; # Requi
1350: 72 65 20 73 69 67 6e 69 6e 67 0a 20 20 20 20 76  re signing.    v
1360: 61 72 69 61 62 6c 65 20 73 74 6f 70 61 74 20 20  ariable stopat  
1370: 20 20 20 20 7b 7d 20 3b 20 23 20 53 74 6f 70 20      {} ; # Stop 
1380: 6e 6f 77 68 65 72 65 0a 0a 20 20 20 20 6e 61 6d  nowhere..    nam
1390: 65 73 70 61 63 65 20 65 78 70 6f 72 74 20 72 75  espace export ru
13a0: 6e 20 63 6f 6e 66 69 67 75 72 65 0a 7d 0a 0a 23  n configure.}..#
13b0: 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d   ---------------
13c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d  ----------------
13f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23  --------------.#
1400: 20 52 65 61 64 79 0a 0a 70 61 63 6b 61 67 65 20   Ready..package 
1410: 70 72 6f 76 69 64 65 20 76 63 3a 3a 66 6f 73 73  provide vc::foss
1420: 69 6c 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 20  il::import::cvs 
1430: 31 2e 30 0a 72 65 74 75 72 6e 0a                 1.0.return.