Artifact d9f32d3964921faf296f08b2fbda4069e65a1a2c:
File
tools/lib/importcvs.tcl
part of check-in
[86a7f249c1]
- Started to restructure the namespace hierarchy, beginning at the bottom, with the log module.
by
aku on
2007-09-09 00:58:18.
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 63 76 73 20 20 20 20 20 20 20 20 20 20 re cvs
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: 66 6f 73 73 69 6c 20 20 20 20 20 20 20 20 20 20 fossil
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 69 6d 70 6f 72 74 3a 3a 63 76 73 al ::import::cvs
0200: 20 7b 0a 20 20 20 20 76 63 3a 3a 74 6f 6f 6c 73 {. vc::tools
0210: 3a 3a 6c 6f 67 3a 3a 73 79 73 74 65 6d 20 69 6d ::log::system im
0220: 70 6f 72 74 0a 20 20 20 20 6e 61 6d 65 73 70 61 port. namespa
0230: 63 65 20 69 6d 70 6f 72 74 20 3a 3a 76 63 3a 3a ce import ::vc::
0240: 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 77 72 69 74 tools::log::writ
0250: 65 0a 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d e.}..# ---------
0260: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0270: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0280: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0290: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
02a0: 2d 2d 2d 2d 0a 23 20 41 50 49 0a 0a 23 20 43 6f ----.# API..# Co
02b0: 6e 66 69 67 75 72 61 74 69 6f 6e 0a 23 0a 23 09 nfiguration.#.#.
02c0: 69 6d 70 6f 72 74 3a 3a 63 76 73 3a 3a 63 6f 6e import::cvs::con
02d0: 66 69 67 75 72 65 20 6b 65 79 20 76 61 6c 75 65 figure key value
02e0: 20 2d 20 53 65 74 20 63 6f 6e 66 69 67 75 72 61 - Set configura
02f0: 74 69 6f 6e 0a 23 0a 23 09 4c 65 67 61 6c 20 6b tion.#.#.Legal k
0300: 65 79 73 3a 09 2d 6e 6f 73 69 67 6e 09 09 3c 62 eys:.-nosign..<b
0310: 6f 6f 6c 3e 2c 20 64 65 66 61 75 6c 74 20 66 61 ool>, default fa
0320: 6c 73 65 0a 23 09 09 09 2d 64 65 62 75 67 63 6f lse.#...-debugco
0330: 6d 6d 69 74 09 3c 62 6f 6f 6c 3e 2c 20 64 65 66 mmit.<bool>, def
0340: 61 75 6c 74 20 66 61 6c 73 65 0a 23 09 09 09 2d ault false.#...-
0350: 73 74 6f 70 61 74 09 09 3c 69 6e 74 3e 2c 20 20 stopat..<int>,
0360: 64 65 66 61 75 6c 74 20 3a 6e 6f 6e 65 3a 0a 23 default :none:.#
0370: 0a 23 20 46 75 6e 63 74 69 6f 6e 61 6c 69 74 79 .# Functionality
0380: 0a 23 0a 23 09 69 6d 70 6f 72 74 3a 3a 63 76 73 .#.#.import::cvs
0390: 3a 3a 72 75 6e 20 73 72 63 20 64 73 74 20 20 20 ::run src dst
03a0: 20 20 20 20 20 20 2d 20 50 65 72 66 6f 72 6d 20 - Perform
03b0: 61 6e 20 69 6d 70 6f 72 74 2e 0a 0a 23 20 2d 2d an import...# --
03c0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
03d0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
03e0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
03f0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0400: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 20 41 50 -----------.# AP
0410: 49 20 49 6d 70 6c 65 6d 65 6e 74 61 74 69 6f 6e I Implementation
0420: 20 2d 20 46 75 6e 63 74 69 6f 6e 61 6c 69 74 79 - Functionality
0430: 0a 0a 70 72 6f 63 20 3a 3a 69 6d 70 6f 72 74 3a ..proc ::import:
0440: 3a 63 76 73 3a 3a 63 6f 6e 66 69 67 75 72 65 20 :cvs::configure
0450: 7b 6b 65 79 20 76 61 6c 75 65 7d 20 7b 0a 20 20 {key value} {.
0460: 20 20 76 61 72 69 61 62 6c 65 20 6e 6f 73 69 67 variable nosig
0470: 6e 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20 73 n. variable s
0480: 74 6f 70 61 74 0a 0a 20 20 20 20 73 77 69 74 63 topat.. switc
0490: 68 20 2d 65 78 61 63 74 20 2d 2d 20 24 6b 65 79 h -exact -- $key
04a0: 20 7b 0a 09 2d 64 65 62 75 67 63 6f 6d 6d 69 74 {..-debugcommit
04b0: 20 7b 0a 09 20 20 20 20 69 66 20 7b 21 5b 73 74 {.. if {![st
04c0: 72 69 6e 67 20 69 73 20 62 6f 6f 6c 65 61 6e 20 ring is boolean
04d0: 2d 73 74 72 69 63 74 20 24 76 61 6c 75 65 5d 7d -strict $value]}
04e0: 20 7b 0a 09 09 72 65 74 75 72 6e 20 2d 63 6f 64 {...return -cod
04f0: 65 20 65 72 72 6f 72 20 22 45 78 70 65 63 74 65 e error "Expecte
0500: 64 20 62 6f 6f 6c 65 61 6e 2c 20 67 6f 74 20 5c d boolean, got \
0510: 22 24 76 61 6c 75 65 5c 22 22 0a 09 20 20 20 20 "$value\""..
0520: 7d 0a 09 20 20 20 20 66 6f 73 73 69 6c 3a 3a 64 }.. fossil::d
0530: 65 62 75 67 63 6f 6d 6d 69 74 20 24 76 61 6c 75 ebugcommit $valu
0540: 65 0a 09 7d 0a 09 2d 6e 6f 73 69 67 6e 20 7b 0a e..}..-nosign {.
0550: 09 20 20 20 20 69 66 20 7b 21 5b 73 74 72 69 6e . if {![strin
0560: 67 20 69 73 20 62 6f 6f 6c 65 61 6e 20 2d 73 74 g is boolean -st
0570: 72 69 63 74 20 24 76 61 6c 75 65 5d 7d 20 7b 0a rict $value]} {.
0580: 09 09 72 65 74 75 72 6e 20 2d 63 6f 64 65 20 65 ..return -code e
0590: 72 72 6f 72 20 22 45 78 70 65 63 74 65 64 20 62 rror "Expected b
05a0: 6f 6f 6c 65 61 6e 2c 20 67 6f 74 20 5c 22 24 76 oolean, got \"$v
05b0: 61 6c 75 65 5c 22 22 0a 09 20 20 20 20 7d 0a 09 alue\"".. }..
05c0: 20 20 20 20 73 65 74 20 6e 6f 73 69 67 6e 20 24 set nosign $
05d0: 76 61 6c 75 65 0a 09 7d 0a 09 2d 73 74 6f 70 61 value..}..-stopa
05e0: 74 20 7b 0a 09 20 20 20 20 73 65 74 20 73 74 6f t {.. set sto
05f0: 70 61 74 20 24 76 61 6c 75 65 0a 09 7d 0a 09 64 pat $value..}..d
0600: 65 66 61 75 6c 74 20 7b 0a 09 20 20 20 20 72 65 efault {.. re
0610: 74 75 72 6e 20 2d 63 6f 64 65 20 65 72 72 6f 72 turn -code error
0620: 20 22 55 6e 6b 6e 6f 77 6e 20 73 77 69 74 63 68 "Unknown switch
0630: 20 24 6b 65 79 2c 20 65 78 70 65 63 74 65 64 20 $key, expected
0640: 6f 6e 65 20 6f 66 20 5c 0a 20 20 20 20 20 20 20 one of \.
0650: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
0660: 20 20 20 20 20 20 20 20 20 20 20 20 2d 64 65 62 -deb
0670: 75 67 63 6f 6d 6d 69 74 2c 20 2d 6e 6f 73 69 67 ugcommit, -nosig
0680: 6e 2c 20 6f 72 20 2d 73 74 6f 70 61 74 22 0a 09 n, or -stopat"..
0690: 7d 0a 20 20 20 20 7d 0a 20 20 20 20 72 65 74 75 }. }. retu
06a0: 72 6e 0a 7d 0a 0a 23 20 49 6d 70 6f 72 74 20 74 rn.}..# Import t
06b0: 68 65 20 43 56 53 20 72 65 70 6f 73 69 74 6f 72 he CVS repositor
06c0: 79 20 66 6f 75 6e 64 20 61 74 20 64 69 72 65 63 y found at direc
06d0: 74 6f 72 79 20 27 73 72 63 27 20 69 6e 74 6f 20 tory 'src' into
06e0: 74 68 65 20 6e 65 77 0a 23 20 66 6f 73 73 69 6c the new.# fossil
06f0: 20 72 65 70 6f 73 69 74 6f 72 79 20 61 74 20 27 repository at '
0700: 64 73 74 27 2e 0a 0a 70 72 6f 63 20 3a 3a 69 6d dst'...proc ::im
0710: 70 6f 72 74 3a 3a 63 76 73 3a 3a 72 75 6e 20 7b port::cvs::run {
0720: 73 72 63 20 64 73 74 7d 20 7b 0a 20 20 20 20 76 src dst} {. v
0730: 61 72 69 61 62 6c 65 20 73 74 6f 70 61 74 0a 0a ariable stopat..
0740: 20 20 20 20 63 76 73 3a 3a 61 74 20 20 20 20 20 cvs::at
0750: 20 20 24 73 72 63 20 20 3b 20 23 20 44 65 66 69 $src ; # Defi
0760: 6e 65 20 6c 6f 63 61 74 69 6f 6e 20 6f 66 20 43 ne location of C
0770: 56 53 20 72 65 70 6f 73 69 74 6f 72 79 0a 0a 20 VS repository..
0780: 20 20 20 63 76 73 3a 3a 73 63 61 6e 20 20 20 20 cvs::scan
0790: 20 20 20 20 20 20 20 3b 20 23 20 47 61 74 68 65 ; # Gathe
07a0: 72 20 72 65 76 69 73 69 6f 6e 20 64 61 74 61 20 r revision data
07b0: 66 72 6f 6d 20 74 68 65 20 61 72 63 68 69 76 65 from the archive
07c0: 73 0a 20 20 20 20 63 76 73 3a 3a 63 73 65 74 73 s. cvs::csets
07d0: 20 20 20 20 20 20 20 20 20 20 3b 20 23 20 47 72 ; # Gr
07e0: 6f 75 70 20 63 68 61 6e 67 65 73 20 69 6e 74 6f oup changes into
07f0: 20 73 65 74 73 0a 20 20 20 20 63 76 73 3a 3a 72 sets. cvs::r
0800: 74 72 65 65 20 20 20 20 20 20 20 20 20 20 3b 20 tree ;
0810: 23 20 42 75 69 6c 64 20 72 65 76 69 73 69 6f 6e # Build revision
0820: 20 74 72 65 65 20 28 74 72 75 6e 6b 20 6f 6e 6c tree (trunk onl
0830: 79 20 72 69 67 68 74 20 6e 6f 77 29 2e 0a 0a 20 y right now)...
0840: 20 20 20 73 65 74 20 74 6f 74 20 30 2e 30 0a 20 set tot 0.0.
0850: 20 20 20 73 65 74 20 6e 74 6f 20 30 0a 0a 20 20 set nto 0..
0860: 20 20 77 72 69 74 65 20 30 20 69 6d 70 6f 72 74 write 0 import
0870: 20 7b 42 65 67 69 6e 20 63 6f 6e 76 65 72 73 69 {Begin conversi
0880: 6f 6e 7d 0a 20 20 20 20 77 72 69 74 65 20 30 20 on}. write 0
0890: 69 6d 70 6f 72 74 20 7b 53 65 74 74 69 6e 67 20 import {Setting
08a0: 75 70 20 77 6f 72 6b 73 70 61 63 65 73 7d 0a 0a up workspaces}..
08b0: 20 20 20 20 63 76 73 3a 3a 77 6f 72 6b 73 70 61 cvs::workspa
08c0: 63 65 20 3b 20 23 20 63 64 27 73 20 74 6f 20 77 ce ; # cd's to w
08d0: 6f 72 6b 73 70 61 63 65 0a 20 20 20 20 66 6f 73 orkspace. fos
08e0: 73 69 6c 3a 3a 6e 65 77 20 20 20 20 3b 20 23 20 sil::new ; #
08f0: 55 73 65 73 20 63 77 64 20 61 73 20 77 6f 72 6b Uses cwd as work
0900: 73 70 61 63 65 20 74 6f 20 63 6f 6e 6e 65 63 74 space to connect
0910: 20 74 6f 2e 0a 0a 20 20 20 20 73 65 74 20 6e 74 to... set nt
0920: 72 75 6e 6b 20 5b 63 76 73 3a 3a 6e 74 72 75 6e runk [cvs::ntrun
0930: 6b 5d 20 3b 20 73 65 74 20 6e 74 66 6d 74 20 25 k] ; set ntfmt %
0940: 5b 73 74 72 69 6e 67 20 6c 65 6e 67 74 68 20 24 [string length $
0950: 6e 74 72 75 6e 6b 5d 73 0a 20 20 20 20 73 65 74 ntrunk]s. set
0960: 20 6e 6d 61 78 20 20 20 5b 63 76 73 3a 3a 6e 63 nmax [cvs::nc
0970: 73 65 74 73 5d 20 3b 20 73 65 74 20 6e 6d 66 6d sets] ; set nmfm
0980: 74 20 25 5b 73 74 72 69 6e 67 20 6c 65 6e 67 74 t %[string lengt
0990: 68 20 24 6e 6d 61 78 5d 73 0a 0a 20 20 20 20 63 h $nmax]s.. c
09a0: 76 73 3a 3a 66 6f 72 65 61 63 68 5f 63 73 65 74 vs::foreach_cset
09b0: 20 63 73 65 74 20 5b 63 76 73 3a 3a 72 6f 6f 74 cset [cvs::root
09c0: 5d 20 7b 0a 09 3a 3a 76 63 3a 3a 74 6f 6f 6c 73 ] {..::vc::tools
09d0: 3a 3a 6c 6f 67 3a 3a 77 72 69 74 65 20 30 20 69 ::log::write 0 i
09e0: 6d 70 6f 72 74 20 22 43 68 61 6e 67 65 53 65 74 mport "ChangeSet
09f0: 20 5b 66 6f 72 6d 61 74 20 24 6e 6d 66 6d 74 20 [format $nmfmt
0a00: 24 63 73 65 74 5d 20 40 20 5b 66 6f 72 6d 61 74 $cset] @ [format
0a10: 20 24 6e 74 66 6d 74 20 24 6e 74 6f 5d 2f 24 6e $ntfmt $nto]/$n
0a20: 74 72 75 6e 6b 20 28 5b 66 6f 72 6d 61 74 20 25 trunk ([format %
0a30: 36 2e 32 66 20 5b 65 78 70 72 20 7b 24 6e 74 6f 6.2f [expr {$nto
0a40: 2a 31 30 30 2e 30 2f 24 6e 74 72 75 6e 6b 7d 5d *100.0/$ntrunk}]
0a50: 5d 25 29 22 0a 09 53 74 61 74 69 73 74 69 63 73 ]%)"..Statistics
0a60: 20 5b 4f 6e 65 43 68 61 6e 67 65 53 65 74 20 24 [OneChangeSet $
0a70: 63 73 65 74 5d 0a 20 20 20 20 7d 0a 0a 20 20 20 cset]. }..
0a80: 20 77 72 69 74 65 20 30 20 69 6d 70 6f 72 74 20 write 0 import
0a90: 22 3d 3d 3d 3d 3d 3d 3d 3d 3d 20 5b 73 74 72 69 "========= [stri
0aa0: 6e 67 20 72 65 70 65 61 74 20 3d 20 36 31 5d 22 ng repeat = 61]"
0ab0: 0a 20 20 20 20 77 72 69 74 65 20 30 20 69 6d 70 . write 0 imp
0ac0: 6f 72 74 20 22 49 6d 70 6f 72 74 65 64 20 24 6e ort "Imported $n
0ad0: 74 6f 20 5b 65 78 70 72 20 7b 28 24 6e 74 6f 20 to [expr {($nto
0ae0: 3d 3d 20 31 29 20 3f 20 22 63 68 61 6e 67 65 73 == 1) ? "changes
0af0: 65 74 22 20 3a 20 22 63 68 61 6e 67 65 73 65 74 et" : "changeset
0b00: 73 22 7d 5d 22 0a 20 20 20 20 77 72 69 74 65 20 s"}]". write
0b10: 30 20 69 6d 70 6f 72 74 20 22 57 69 74 68 69 6e 0 import "Within
0b20: 20 5b 66 6f 72 6d 61 74 20 25 2e 32 66 20 24 74 [format %.2f $t
0b30: 6f 74 5d 20 73 65 63 6f 6e 64 73 20 28 61 76 67 ot] seconds (avg
0b40: 20 5b 66 6f 72 6d 61 74 20 25 2e 32 66 20 5b 65 [format %.2f [e
0b50: 78 70 72 20 7b 24 74 6f 74 2f 24 6e 74 6f 7d 5d xpr {$tot/$nto}]
0b60: 5d 20 73 65 63 6f 6e 64 73 2f 63 68 61 6e 67 65 ] seconds/change
0b70: 73 65 74 29 22 0a 0a 20 20 20 20 69 66 20 7b 24 set)".. if {$
0b80: 73 74 6f 70 61 74 20 3d 3d 20 24 63 73 65 74 7d stopat == $cset}
0b90: 20 72 65 74 75 72 6e 0a 0a 20 20 20 20 63 76 73 return.. cvs
0ba0: 3a 3a 77 73 63 6c 65 61 72 0a 20 20 20 20 66 6f ::wsclear. fo
0bb0: 73 73 69 6c 3a 3a 64 65 73 74 69 6e 61 74 69 6f ssil::destinatio
0bc0: 6e 20 24 64 73 74 0a 20 20 20 20 77 72 69 74 65 n $dst. write
0bd0: 20 30 20 69 6d 70 6f 72 74 20 4f 6b 2e 0a 20 20 0 import Ok..
0be0: 20 20 72 65 74 75 72 6e 0a 7d 0a 0a 23 20 2d 2d return.}..# --
0bf0: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0c00: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0c10: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0c20: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
0c30: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 20 49 6e -----------.# In
0c40: 74 65 72 6e 61 6c 20 6f 70 65 72 61 74 69 6f 6e ternal operation
0c50: 73 20 2d 20 49 6d 70 6f 72 74 20 61 20 73 69 6e s - Import a sin
0c60: 67 6c 65 20 63 68 61 6e 67 65 73 65 74 2e 0a 0a gle changeset...
0c70: 70 72 6f 63 20 3a 3a 69 6d 70 6f 72 74 3a 3a 63 proc ::import::c
0c80: 76 73 3a 3a 53 74 61 74 69 73 74 69 63 73 20 7b vs::Statistics {
0c90: 73 65 63 7d 20 7b 0a 20 20 20 20 75 70 76 61 72 sec} {. upvar
0ca0: 20 31 20 74 6f 74 20 74 6f 74 20 6e 74 6f 20 6e 1 tot tot nto n
0cb0: 74 6f 20 6e 74 72 75 6e 6b 20 6e 74 72 75 6e 6b to ntrunk ntrunk
0cc0: 0a 0a 20 20 20 20 23 20 4e 6f 20 73 74 61 74 69 .. # No stati
0cd0: 73 74 69 63 73 20 69 66 20 74 68 65 20 63 6f 6d stics if the com
0ce0: 6d 69 74 20 77 61 73 20 73 74 6f 70 70 65 64 20 mit was stopped
0cf0: 62 65 66 6f 72 65 20 69 74 20 77 61 73 20 72 75 before it was ru
0d00: 6e 0a 20 20 20 20 69 66 20 7b 24 73 65 63 20 65 n. if {$sec e
0d10: 71 20 22 22 7d 20 72 65 74 75 72 6e 0a 0a 20 20 q ""} return..
0d20: 20 20 69 6e 63 72 20 6e 74 6f 0a 0a 20 20 20 20 incr nto..
0d30: 73 65 74 20 74 6f 74 20 5b 65 78 70 72 20 7b 24 set tot [expr {$
0d40: 74 6f 74 20 2b 20 24 73 65 63 7d 5d 0a 20 20 20 tot + $sec}].
0d50: 20 73 65 74 20 61 76 67 20 5b 65 78 70 72 20 7b set avg [expr {
0d60: 24 74 6f 74 2f 24 6e 74 6f 7d 5d 0a 20 20 20 20 $tot/$nto}].
0d70: 73 65 74 20 6d 61 78 20 5b 65 78 70 72 20 7b 24 set max [expr {$
0d80: 6e 74 72 75 6e 6b 20 2a 20 24 61 76 67 7d 5d 0a ntrunk * $avg}].
0d90: 20 20 20 20 73 65 74 20 72 65 6d 20 5b 65 78 70 set rem [exp
0da0: 72 20 7b 24 6d 61 78 20 2d 20 24 74 6f 74 7d 5d r {$max - $tot}]
0db0: 0a 0a 20 20 20 20 3a 3a 76 63 3a 3a 74 6f 6f 6c .. ::vc::tool
0dc0: 73 3a 3a 6c 6f 67 3a 3a 77 72 69 74 65 20 33 20 s::log::write 3
0dd0: 69 6d 70 6f 72 74 20 22 73 74 20 61 76 67 20 5b import "st avg [
0de0: 66 6f 72 6d 61 74 20 25 2e 32 66 20 24 61 76 67 format %.2f $avg
0df0: 5d 20 73 65 63 22 0a 20 20 20 20 3a 3a 76 63 3a ] sec". ::vc:
0e00: 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 77 72 69 :tools::log::wri
0e10: 74 65 20 33 20 69 6d 70 6f 72 74 20 22 73 74 20 te 3 import "st
0e20: 72 75 6e 20 5b 66 6f 72 6d 61 74 20 25 37 2e 32 run [format %7.2
0e30: 66 20 24 74 6f 74 5d 20 73 65 63 20 5b 66 6f 72 f $tot] sec [for
0e40: 6d 61 74 20 25 36 2e 32 66 20 5b 65 78 70 72 20 mat %6.2f [expr
0e50: 7b 24 74 6f 74 2f 36 30 7d 5d 5d 20 6d 69 6e 20 {$tot/60}]] min
0e60: 5b 66 6f 72 6d 61 74 20 25 35 2e 32 66 20 5b 65 [format %5.2f [e
0e70: 78 70 72 20 7b 24 74 6f 74 2f 33 36 30 30 7d 5d xpr {$tot/3600}]
0e80: 5d 20 68 72 22 0a 20 20 20 20 3a 3a 76 63 3a 3a ] hr". ::vc::
0e90: 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 77 72 69 74 tools::log::writ
0ea0: 65 20 33 20 69 6d 70 6f 72 74 20 22 73 74 20 65 e 3 import "st e
0eb0: 6e 64 20 5b 66 6f 72 6d 61 74 20 25 37 2e 32 66 nd [format %7.2f
0ec0: 20 24 6d 61 78 5d 20 73 65 63 20 5b 66 6f 72 6d $max] sec [form
0ed0: 61 74 20 25 36 2e 32 66 20 5b 65 78 70 72 20 7b at %6.2f [expr {
0ee0: 24 6d 61 78 2f 36 30 7d 5d 5d 20 6d 69 6e 20 5b $max/60}]] min [
0ef0: 66 6f 72 6d 61 74 20 25 35 2e 32 66 20 5b 65 78 format %5.2f [ex
0f00: 70 72 20 7b 24 6d 61 78 2f 33 36 30 30 7d 5d 5d pr {$max/3600}]]
0f10: 20 68 72 22 0a 20 20 20 20 3a 3a 76 63 3a 3a 74 hr". ::vc::t
0f20: 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 77 72 69 74 65 ools::log::write
0f30: 20 33 20 69 6d 70 6f 72 74 20 22 73 74 20 72 65 3 import "st re
0f40: 6d 20 5b 66 6f 72 6d 61 74 20 25 37 2e 32 66 20 m [format %7.2f
0f50: 24 72 65 6d 5d 20 73 65 63 20 5b 66 6f 72 6d 61 $rem] sec [forma
0f60: 74 20 25 36 2e 32 66 20 5b 65 78 70 72 20 7b 24 t %6.2f [expr {$
0f70: 72 65 6d 2f 36 30 7d 5d 5d 20 6d 69 6e 20 5b 66 rem/60}]] min [f
0f80: 6f 72 6d 61 74 20 25 35 2e 32 66 20 5b 65 78 70 ormat %5.2f [exp
0f90: 72 20 7b 24 72 65 6d 2f 33 36 30 30 7d 5d 5d 20 r {$rem/3600}]]
0fa0: 68 72 22 0a 20 20 20 20 72 65 74 75 72 6e 0a 7d hr". return.}
0fb0: 0a 0a 70 72 6f 63 20 3a 3a 69 6d 70 6f 72 74 3a ..proc ::import:
0fc0: 3a 63 76 73 3a 3a 4f 6e 65 43 68 61 6e 67 65 53 :cvs::OneChangeS
0fd0: 65 74 20 7b 63 73 65 74 7d 20 7b 0a 20 20 20 20 et {cset} {.
0fe0: 76 61 72 69 61 62 6c 65 20 6e 6f 73 69 67 6e 0a variable nosign.
0ff0: 20 20 20 20 76 61 72 69 61 62 6c 65 20 73 74 6f variable sto
1000: 70 61 74 0a 0a 20 20 20 20 69 66 20 7b 24 73 74 pat.. if {$st
1010: 6f 70 61 74 20 3d 3d 20 24 63 73 65 74 7d 20 7b opat == $cset} {
1020: 0a 09 66 6f 73 73 69 6c 3a 3a 63 6f 6d 6d 69 74 ..fossil::commit
1030: 20 31 20 63 76 73 32 66 6f 73 73 69 6c 20 24 6e 1 cvs2fossil $n
1040: 6f 73 69 67 6e 20 5c 0a 09 20 20 20 20 5b 63 76 osign \.. [cv
1050: 73 3a 3a 77 73 73 65 74 75 70 20 24 63 73 65 74 s::wssetup $cset
1060: 5d 20 3a 3a 63 76 73 3a 3a 77 73 69 67 6e 6f 72 ] ::cvs::wsignor
1070: 65 0a 09 77 72 69 74 65 20 30 20 69 6d 70 6f 72 e..write 0 impor
1080: 74 20 53 74 6f 70 70 65 64 2e 0a 09 72 65 74 75 t Stopped...retu
1090: 72 6e 20 2d 63 6f 64 65 20 62 72 65 61 6b 0a 20 rn -code break.
10a0: 20 20 20 7d 0a 0a 20 20 20 20 73 65 74 20 75 73 }.. set us
10b0: 65 63 20 5b 6c 69 6e 64 65 78 20 5b 74 69 6d 65 ec [lindex [time
10c0: 20 7b 0a 09 66 6f 72 65 61 63 68 20 7b 75 75 69 {..foreach {uui
10d0: 64 20 61 64 20 72 6d 20 63 68 7d 20 5c 0a 09 20 d ad rm ch} \..
10e0: 20 20 20 5b 66 6f 73 73 69 6c 3a 3a 63 6f 6d 6d [fossil::comm
10f0: 69 74 20 30 20 63 76 73 32 66 6f 73 73 69 6c 20 it 0 cvs2fossil
1100: 24 6e 6f 73 69 67 6e 20 5c 0a 09 09 20 5b 63 76 $nosign \... [cv
1110: 73 3a 3a 77 73 73 65 74 75 70 20 24 63 73 65 74 s::wssetup $cset
1120: 5d 20 3a 3a 63 76 73 3a 3a 77 73 69 67 6e 6f 72 ] ::cvs::wsignor
1130: 65 5d 20 5c 0a 09 20 20 20 20 62 72 65 61 6b 0a e] \.. break.
1140: 20 20 20 20 7d 20 31 5d 20 30 5d 0a 20 20 20 20 } 1] 0].
1150: 63 76 73 3a 3a 75 75 69 64 20 24 63 73 65 74 20 cvs::uuid $cset
1160: 24 75 75 69 64 0a 0a 20 20 20 20 73 65 74 20 73 $uuid.. set s
1170: 65 63 20 5b 65 78 70 72 20 7b 24 75 73 65 63 2f ec [expr {$usec/
1180: 31 65 36 7d 5d 0a 0a 20 20 20 20 3a 3a 76 63 3a 1e6}].. ::vc:
1190: 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a 77 72 69 :tools::log::wri
11a0: 74 65 20 32 20 69 6d 70 6f 72 74 20 22 3d 3d 20 te 2 import "==
11b0: 24 75 75 69 64 20 2b 24 7b 61 64 7d 2d 24 7b 72 $uuid +${ad}-${r
11c0: 6d 7d 2a 24 7b 63 68 7d 22 0a 20 20 20 20 3a 3a m}*${ch}". ::
11d0: 76 63 3a 3a 74 6f 6f 6c 73 3a 3a 6c 6f 67 3a 3a vc::tools::log::
11e0: 77 72 69 74 65 20 32 20 69 6d 70 6f 72 74 20 22 write 2 import "
11f0: 73 74 20 69 6e 20 20 5b 66 6f 72 6d 61 74 20 25 st in [format %
1200: 2e 32 66 20 24 73 65 63 5d 20 73 65 63 22 0a 0a .2f $sec] sec"..
1210: 20 20 20 20 72 65 74 75 72 6e 20 24 73 65 63 0a return $sec.
1220: 7d 0a 0a 23 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d }..# -----------
1230: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1240: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1250: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1260: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1270: 2d 2d 0a 0a 6e 61 6d 65 73 70 61 63 65 20 65 76 --..namespace ev
1280: 61 6c 20 3a 3a 69 6d 70 6f 72 74 3a 3a 63 76 73 al ::import::cvs
1290: 20 7b 0a 20 20 20 20 76 61 72 69 61 62 6c 65 20 {. variable
12a0: 64 65 62 75 67 63 6f 6d 6d 69 74 20 30 20 20 3b debugcommit 0 ;
12b0: 20 23 20 44 65 62 75 67 20 74 68 65 20 63 6f 6d # Debug the com
12c0: 6d 69 74 20 6f 70 65 72 61 74 69 6f 6e 2e 0a 20 mit operation..
12d0: 20 20 20 76 61 72 69 61 62 6c 65 20 6e 6f 73 69 variable nosi
12e0: 67 6e 20 20 20 20 20 20 30 20 20 3b 20 23 20 52 gn 0 ; # R
12f0: 65 71 75 69 72 65 20 73 69 67 6e 69 6e 67 0a 20 equire signing.
1300: 20 20 20 76 61 72 69 61 62 6c 65 20 73 74 6f 70 variable stop
1310: 61 74 20 20 20 20 20 20 7b 7d 20 3b 20 23 20 53 at {} ; # S
1320: 74 6f 70 20 6e 6f 77 68 65 72 65 0a 7d 0a 0a 23 top nowhere.}..#
1330: 20 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ---------------
1340: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1350: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1360: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d ----------------
1370: 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 2d 0a 23 --------------.#
1380: 20 52 65 61 64 79 0a 0a 70 61 63 6b 61 67 65 20 Ready..package
1390: 70 72 6f 76 69 64 65 20 69 6d 70 6f 72 74 3a 3a provide import::
13a0: 63 76 73 20 31 2e 30 0a 72 65 74 75 72 6e 0a cvs 1.0.return.