Fossil SCM

Continued work on pass 3, added code to determine the type of symbols based on the tag-, branch-, and commit-counts. Hook for handling data coming from the option processoris present (UserConfig), but only as a placeholder.

aku 2007-11-02 06:06 trunk

Commit f888f06fe35bc379d20ea71303e88d205a5106e9

Parent 6d4eb24738e9908…

6 files changed +20 -11 +21 -10 +7 +175 -9 +2 +7

~ tools/cvs2fossil/lib/c2f_pcollrev.tcl ~ tools/cvs2fossil/lib/c2f_pcollsym.tcl ~ tools/cvs2fossil/lib/c2f_project.tcl ~ tools/cvs2fossil/lib/c2f_psym.tcl ~ tools/cvs2fossil/lib/c2f_ptrunk.tcl ~ tools/cvs2fossil/lib/c2f_repository.tcl

M tools/cvs2fossil/lib/c2f_pcollrev.tcl

+20 -11

		--- tools/cvs2fossil/lib/c2f_pcollrev.tcl
		+++ tools/cvs2fossil/lib/c2f_pcollrev.tcl
		@@ -14,18 +14,19 @@
14	14	## all the information they contain (revisions, and symbols).
15	15
16	16	# # ## ### ##### ######## ############# #####################
17	17	## Requirements
18	18
19		-package require Tcl 8.4 ; # Required runtime.
20		-package require snit ; # OO system.
21		-package require vc::tools::trouble ; # Error reporting.
22		-package require vc::tools::log ; # User feedback.
23		-package require vc::fossil::import::cvs::pass ; # Pass management.
24		-package require vc::fossil::import::cvs::repository ; # Repository management.
25		-package require vc::fossil::import::cvs::state ; # State storage.
26		-package require vc::rcs::parser ; # Rcs archive data extraction.
	19	+package require Tcl 8.4 ; # Required runtime.
	20	+package require snit ; # OO system.
	21	+package require vc::tools::trouble ; # Error reporting.
	22	+package require vc::tools::log ; # User feedback.
	23	+package require vc::fossil::import::cvs::pass ; # Pass management.
	24	+package require vc::fossil::import::cvs::repository ; # Repository management.
	25	+package require vc::fossil::import::cvs::state ; # State storage.
	26	+package require vc::fossil::import::cvs::project::sym ; # Project level symbols
	27	+package require vc::rcs::parser ; # Rcs archive data extraction.
27	28
28	29	# # ## ### ##### ######## ############# #####################
29	30	## Register the pass with the management
30	31
31	32	vc::fossil::import::cvs::pass define \
		@@ -203,13 +204,15 @@
203	204	n INTEGER NOT NULL, -- How often pid can act as parent.
204	205	UNIQUE (sid, pid)
205	206	}
206	207
207	208	state writing symtype {
208		- tid INTEGER NOT NULL PRIMARY KEY,
209		- name TEXT NOT NULL,
	209	+ tid INTEGER NOT NULL PRIMARY KEY,
	210	+ name TEXT NOT NULL,
	211	+ plural TEXT NOT NULL,
210	212	UNIQUE (name)
	213	+ UNIQUE (plural)
211	214	}
212	215	state run {
213	216	INSERT INTO symtype VALUES (0,'excluded');
214	217	INSERT INTO symtype VALUES (1,'tag');
215	218	INSERT INTO symtype VALUES (2,'branch');
		@@ -255,17 +258,20 @@
255	258	state writing cmessage {
256	259	cid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
257	260	text TEXT NOT NULL UNIQUE
258	261	}
259	262
	263	+ project::sym getsymtypes
260	264	return
261	265	}
262	266
263	267	typemethod load {} {
264	268	state reading symbol
	269	+ state reading symtype
265	270
266		- repository loadsymbols
	271	+ project::sym getsymtypes
	272	+ repository loadsymbols
267	273	return
268	274	}
269	275
270	276	typemethod run {} {
271	277	# Pass manager interface. Executed to perform the
		@@ -589,10 +595,13 @@
589	595	namespace export collrev
590	596	namespace eval collrev {
591	597	namespace import ::vc::rcs::parser
592	598	namespace import ::vc::fossil::import::cvs::repository
593	599	namespace import ::vc::fossil::import::cvs::state
	600	+ namespace eval project {
	601	+ namespace import ::vc::fossil::import::cvs::project::sym
	602	+ }
594	603	namespace import ::vc::tools::trouble
595	604	namespace import ::vc::tools::log
596	605	log register collrev
597	606	}
598	607	}
599	608

	--- tools/cvs2fossil/lib/c2f_pcollrev.tcl
	+++ tools/cvs2fossil/lib/c2f_pcollrev.tcl
	@@ -14,18 +14,19 @@
14	## all the information they contain (revisions, and symbols).
15
16	# # ## ### ##### ######## ############# #####################
17	## Requirements
18
19	package require Tcl 8.4 ; # Required runtime.
20	package require snit ; # OO system.
21	package require vc::tools::trouble ; # Error reporting.
22	package require vc::tools::log ; # User feedback.
23	package require vc::fossil::import::cvs::pass ; # Pass management.
24	package require vc::fossil::import::cvs::repository ; # Repository management.
25	package require vc::fossil::import::cvs::state ; # State storage.
26	package require vc::rcs::parser ; # Rcs archive data extraction.

27
28	# # ## ### ##### ######## ############# #####################
29	## Register the pass with the management
30
31	vc::fossil::import::cvs::pass define \
	@@ -203,13 +204,15 @@
203	n INTEGER NOT NULL, -- How often pid can act as parent.
204	UNIQUE (sid, pid)
205	}
206
207	state writing symtype {
208	tid INTEGER NOT NULL PRIMARY KEY,
209	name TEXT NOT NULL,

210	UNIQUE (name)

211	}
212	state run {
213	INSERT INTO symtype VALUES (0,'excluded');
214	INSERT INTO symtype VALUES (1,'tag');
215	INSERT INTO symtype VALUES (2,'branch');
	@@ -255,17 +258,20 @@
255	state writing cmessage {
256	cid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
257	text TEXT NOT NULL UNIQUE
258	}
259

260	return
261	}
262
263	typemethod load {} {
264	state reading symbol

265
266	repository loadsymbols

267	return
268	}
269
270	typemethod run {} {
271	# Pass manager interface. Executed to perform the
	@@ -589,10 +595,13 @@
589	namespace export collrev
590	namespace eval collrev {
591	namespace import ::vc::rcs::parser
592	namespace import ::vc::fossil::import::cvs::repository
593	namespace import ::vc::fossil::import::cvs::state



594	namespace import ::vc::tools::trouble
595	namespace import ::vc::tools::log
596	log register collrev
597	}
598	}
599

	--- tools/cvs2fossil/lib/c2f_pcollrev.tcl
	+++ tools/cvs2fossil/lib/c2f_pcollrev.tcl
	@@ -14,18 +14,19 @@
14	## all the information they contain (revisions, and symbols).
15
16	# # ## ### ##### ######## ############# #####################
17	## Requirements
18
19	package require Tcl 8.4 ; # Required runtime.
20	package require snit ; # OO system.
21	package require vc::tools::trouble ; # Error reporting.
22	package require vc::tools::log ; # User feedback.
23	package require vc::fossil::import::cvs::pass ; # Pass management.
24	package require vc::fossil::import::cvs::repository ; # Repository management.
25	package require vc::fossil::import::cvs::state ; # State storage.
26	package require vc::fossil::import::cvs::project::sym ; # Project level symbols
27	package require vc::rcs::parser ; # Rcs archive data extraction.
28
29	# # ## ### ##### ######## ############# #####################
30	## Register the pass with the management
31
32	vc::fossil::import::cvs::pass define \
	@@ -203,13 +204,15 @@
204	n INTEGER NOT NULL, -- How often pid can act as parent.
205	UNIQUE (sid, pid)
206	}
207
208	state writing symtype {
209	tid INTEGER NOT NULL PRIMARY KEY,
210	name TEXT NOT NULL,
211	plural TEXT NOT NULL,
212	UNIQUE (name)
213	UNIQUE (plural)
214	}
215	state run {
216	INSERT INTO symtype VALUES (0,'excluded');
217	INSERT INTO symtype VALUES (1,'tag');
218	INSERT INTO symtype VALUES (2,'branch');
	@@ -255,17 +258,20 @@
258	state writing cmessage {
259	cid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
260	text TEXT NOT NULL UNIQUE
261	}
262
263	project::sym getsymtypes
264	return
265	}
266
267	typemethod load {} {
268	state reading symbol
269	state reading symtype
270
271	project::sym getsymtypes
272	repository loadsymbols
273	return
274	}
275
276	typemethod run {} {
277	# Pass manager interface. Executed to perform the
	@@ -589,10 +595,13 @@
595	namespace export collrev
596	namespace eval collrev {
597	namespace import ::vc::rcs::parser
598	namespace import ::vc::fossil::import::cvs::repository
599	namespace import ::vc::fossil::import::cvs::state
600	namespace eval project {
601	namespace import ::vc::fossil::import::cvs::project::sym
602	}
603	namespace import ::vc::tools::trouble
604	namespace import ::vc::tools::log
605	log register collrev
606	}
607	}
608

M tools/cvs2fossil/lib/c2f_pcollsym.tcl

+21 -10

		--- tools/cvs2fossil/lib/c2f_pcollsym.tcl
		+++ tools/cvs2fossil/lib/c2f_pcollsym.tcl
		@@ -16,19 +16,20 @@
16	16	## 'FilterSym', which performs the actual deletion.
17	17
18	18	# # ## ### ##### ######## ############# #####################
19	19	## Requirements
20	20
21		-package require Tcl 8.4 ; # Required runtime.
22		-package require snit ; # OO system.
23		-#package require fileutil::traverse ; # Directory traversal.
24		-#package require fileutil ; # File & path utilities.
25		-#package require vc::tools::trouble ; # Error reporting.
26		-package require vc::tools::log ; # User feedback.
27		-#package require vc::fossil::import::cvs::pass ; # Pass management.
28		-#package require vc::fossil::import::cvs::repository ; # Repository management.
29		-package require vc::fossil::import::cvs::state ; # State storage.
	21	+package require Tcl 8.4 ; # Required runtime.
	22	+package require snit ; # OO system.
	23	+#package require fileutil::traverse ; # Directory traversal.
	24	+#package require fileutil ; # File & path utilities.
	25	+#package require vc::tools::trouble ; # Error reporting.
	26	+package require vc::tools::log ; # User feedback.
	27	+#package require vc::fossil::import::cvs::pass ; # Pass management.
	28	+package require vc::fossil::import::cvs::repository ; # Repository management.
	29	+package require vc::fossil::import::cvs::state ; # State storage.
	30	+package require vc::fossil::import::cvs::project::sym ; # Project level symbols
30	31
31	32	# # ## ### ##### ######## ############# #####################
32	33	## Register the pass with the management
33	34
34	35	vc::fossil::import::cvs::pass define \
		@@ -60,10 +61,17 @@
60	61	}
61	62
62	63	typemethod run {} {
63	64	# Pass manager interface. Executed to perform the
64	65	# functionality of the pass.
	66	+
	67	+ state transaction {
	68	+ repository determinesymboltypes
	69	+
	70	+ project::sym printrulestatistics
	71	+ project::sym printtypestatistics
	72	+ }
65	73
66	74	log write 1 collsym "Collation completed"
67	75	return
68	76	}
69	77
		@@ -89,12 +97,15 @@
89	97	}
90	98
91	99	namespace eval ::vc::fossil::import::cvs::pass {
92	100	namespace export collsym
93	101	namespace eval collsym {
94		- #namespace import ::vc::fossil::import::cvs::repository
	102	+ namespace import ::vc::fossil::import::cvs::repository
95	103	namespace import ::vc::fossil::import::cvs::state
	104	+ namespace eval project {
	105	+ namespace import ::vc::fossil::import::cvs::project::sym
	106	+ }
96	107	#namespace import ::vc::tools::trouble
97	108	namespace import ::vc::tools::log
98	109	log register collsym
99	110	}
100	111	}
101	112

	--- tools/cvs2fossil/lib/c2f_pcollsym.tcl
	+++ tools/cvs2fossil/lib/c2f_pcollsym.tcl
	@@ -16,19 +16,20 @@
16	## 'FilterSym', which performs the actual deletion.
17
18	# # ## ### ##### ######## ############# #####################
19	## Requirements
20
21	package require Tcl 8.4 ; # Required runtime.
22	package require snit ; # OO system.
23	#package require fileutil::traverse ; # Directory traversal.
24	#package require fileutil ; # File & path utilities.
25	#package require vc::tools::trouble ; # Error reporting.
26	package require vc::tools::log ; # User feedback.
27	#package require vc::fossil::import::cvs::pass ; # Pass management.
28	#package require vc::fossil::import::cvs::repository ; # Repository management.
29	package require vc::fossil::import::cvs::state ; # State storage.

30
31	# # ## ### ##### ######## ############# #####################
32	## Register the pass with the management
33
34	vc::fossil::import::cvs::pass define \
	@@ -60,10 +61,17 @@
60	}
61
62	typemethod run {} {
63	# Pass manager interface. Executed to perform the
64	# functionality of the pass.







65
66	log write 1 collsym "Collation completed"
67	return
68	}
69
	@@ -89,12 +97,15 @@
89	}
90
91	namespace eval ::vc::fossil::import::cvs::pass {
92	namespace export collsym
93	namespace eval collsym {
94	#namespace import ::vc::fossil::import::cvs::repository
95	namespace import ::vc::fossil::import::cvs::state



96	#namespace import ::vc::tools::trouble
97	namespace import ::vc::tools::log
98	log register collsym
99	}
100	}
101

	--- tools/cvs2fossil/lib/c2f_pcollsym.tcl
	+++ tools/cvs2fossil/lib/c2f_pcollsym.tcl
	@@ -16,19 +16,20 @@
16	## 'FilterSym', which performs the actual deletion.
17
18	# # ## ### ##### ######## ############# #####################
19	## Requirements
20
21	package require Tcl 8.4 ; # Required runtime.
22	package require snit ; # OO system.
23	#package require fileutil::traverse ; # Directory traversal.
24	#package require fileutil ; # File & path utilities.
25	#package require vc::tools::trouble ; # Error reporting.
26	package require vc::tools::log ; # User feedback.
27	#package require vc::fossil::import::cvs::pass ; # Pass management.
28	package require vc::fossil::import::cvs::repository ; # Repository management.
29	package require vc::fossil::import::cvs::state ; # State storage.
30	package require vc::fossil::import::cvs::project::sym ; # Project level symbols
31
32	# # ## ### ##### ######## ############# #####################
33	## Register the pass with the management
34
35	vc::fossil::import::cvs::pass define \
	@@ -60,10 +61,17 @@
61	}
62
63	typemethod run {} {
64	# Pass manager interface. Executed to perform the
65	# functionality of the pass.
66
67	state transaction {
68	repository determinesymboltypes
69
70	project::sym printrulestatistics
71	project::sym printtypestatistics
72	}
73
74	log write 1 collsym "Collation completed"
75	return
76	}
77
	@@ -89,12 +97,15 @@
97	}
98
99	namespace eval ::vc::fossil::import::cvs::pass {
100	namespace export collsym
101	namespace eval collsym {
102	namespace import ::vc::fossil::import::cvs::repository
103	namespace import ::vc::fossil::import::cvs::state
104	namespace eval project {
105	namespace import ::vc::fossil::import::cvs::project::sym
106	}
107	#namespace import ::vc::tools::trouble
108	namespace import ::vc::tools::log
109	log register collsym
110	}
111	}
112

M tools/cvs2fossil/lib/c2f_project.tcl

		--- tools/cvs2fossil/lib/c2f_project.tcl
		+++ tools/cvs2fossil/lib/c2f_project.tcl
		@@ -94,10 +94,17 @@
94	94	$symbol destroy
95	95	unset mysymbol($name)
96	96	set changes 1
97	97	}
98	98	}
	99	+ return
	100	+ }
	101	+
	102	+ method determinesymboltypes {} {
	103	+ foreach {name symbol} [array get mysymbol] {
	104	+ $symbol determinetype
	105	+ }
99	106	return
100	107	}
101	108
102	109	# pass I persistence
103	110	method persist {} {
104	111

	--- tools/cvs2fossil/lib/c2f_project.tcl
	+++ tools/cvs2fossil/lib/c2f_project.tcl
	@@ -94,10 +94,17 @@
94	$symbol destroy
95	unset mysymbol($name)
96	set changes 1
97	}
98	}







99	return
100	}
101
102	# pass I persistence
103	method persist {} {
104

	--- tools/cvs2fossil/lib/c2f_project.tcl
	+++ tools/cvs2fossil/lib/c2f_project.tcl
	@@ -94,10 +94,17 @@
94	$symbol destroy
95	unset mysymbol($name)
96	set changes 1
97	}
98	}
99	return
100	}
101
102	method determinesymboltypes {} {
103	foreach {name symbol} [array get mysymbol] {
104	$symbol determinetype
105	}
106	return
107	}
108
109	# pass I persistence
110	method persist {} {
111

M tools/cvs2fossil/lib/c2f_psym.tcl

+175 -9

		--- tools/cvs2fossil/lib/c2f_psym.tcl
		+++ tools/cvs2fossil/lib/c2f_psym.tcl
		@@ -13,14 +13,17 @@
13	13	## Symbols (Tags, Branches) per project.
14	14
15	15	# # ## ### ##### ######## ############# #####################
16	16	## Requirements
17	17
18		-package require Tcl 8.4 ; # Required runtime.
19		-package require snit ; # OO system.
20		-package require struct::set ; # Set handling.
21		-package require vc::fossil::import::cvs::state ; # State storage.
	18	+package require Tcl 8.4 ; # Required runtime.
	19	+package require snit ; # OO system.
	20	+package require vc::tools::trouble ; # Error reporting.
	21	+package require vc::tools::log ; # User feedback.
	22	+package require vc::tools::misc ; # Text formatting.
	23	+package require vc::fossil::import::cvs::state ; # State storage.
	24	+package require struct::set ; # Set handling.
22	25
23	26	# # ## ### ##### ######## ############# #####################
24	27	##
25	28
26	29	snit::type ::vc::fossil::import::cvs::project::sym {
		@@ -29,16 +32,59 @@
29	32
30	33	constructor {name id project} {
31	34	set myname $name
32	35	set myid $id
33	36	set myproject $project
	37	+
	38	+ # Count total number of symbols.
	39	+ incr mynum
34	40	return
35	41	}
36	42
37	43	method name {} { return $myname }
38	44	method id {} { return $myid }
39	45
	46	+ # # ## ### ##### ######## #############
	47	+ ## Symbol type
	48	+
	49	+ method determinetype {} {
	50	+ # This is done by a fixed heuristics, with guidance by the
	51	+ # user in edge-cases. Contrary to cvs2svn which uses a big
	52	+ # honking streagy class and rule objects. Keep it simple, we
	53	+ # can expand later when we actually need all the complexity
	54	+ # for configurability.
	55	+
	56	+ # The following guidelines are applied:
	57	+ # - Is usage unambigous ?
	58	+ # - Was there ever a commit on the symbol ?
	59	+ # - More used as tag, or more used as branch ?
	60	+ # - At last, what has the user told us about it ?
	61	+ # - Fail
	62	+
	63	+ foreach rule {
	64	+ UserConfig
	65	+ Unambigous
	66	+ HasCommits
	67	+ VoteCounts
	68	+ } {
	69	+ set chosen [$self $rule]
	70	+ if {$chosen eq $myundef} continue
	71	+ $self MarkAs $rule $chosen
	72	+ return
	73	+ }
	74	+
	75	+ # None of the above was able to decide which type to assign to
	76	+ # the symbol. This is a fatal error preventing the execution
	77	+ # of the passes after 'CollateSymbols'.
	78	+
	79	+ incr myrulecount(Undecided_)
	80	+ trouble fatal "Unable to decide how to convert symbol '$myname'"
	81	+ return
	82	+ }
	83	+
	84	+ method markthetrunk {} { $self MarkAs IsTheTrunk $mybranch ; return }
	85	+
40	86	# # ## ### ##### ######## #############
41	87	## Symbol statistics
42	88
43	89	method defcounts {tc bc cc} {
44	90	set mybranchcount $tc
		@@ -126,38 +172,158 @@
126	172	# the exclusion of this symbol.
127	173
128	174	variable mypparent -array {} ; # Maps from symbols to the number
129	175	# of files in which it could have
130	176	# been a parent of this symbol.
	177	+
	178	+ variable mytype {} ; # The type chosen for the symbol to use in
	179	+ # the conversion.
	180	+
	181	+ # # ## ### ##### ######## #############
	182	+
	183	+ typemethod getsymtypes {} {
	184	+ foreach {tid name} [state run {
	185	+ SELECT tid, name FROM symtype;
	186	+ }] { set mysymtype($tid) $name }
	187	+ return
	188	+ }
131	189
132	190	# Keep the codes below in sync with 'pass::collrev/setup('symtype').
133		- typevariable myexcluded 0 ; # Code for symbols which are excluded.
134		- typevariable mytag 1 ; # Code for symbols which are tags.
135		- typevariable mybranch 2 ; # Code for symbols which are branches.
136		- typevariable myundef 3 ; # Code for symbols of unknown type.
	191	+ typevariable myexcluded 0 ; # Code for symbols which are excluded.
	192	+ typevariable mytag 1 ; # Code for symbols which are tags.
	193	+ typevariable mybranch 2 ; # Code for symbols which are branches.
	194	+ typevariable myundef 3 ; # Code for symbols of unknown type.
	195	+ typevariable mysymtype -array {} ; # Map from type code to label for the log.
	196	+
	197	+ typemethod printrulestatistics {} {
	198	+ log write 2 symbol "Rule usage statistics:"
	199	+
	200	+ set fmt %[string length $mynum]s
	201	+ set all 0
	202	+
	203	+ foreach key [lsort [array names myrulecount]] {
	204	+ log write 2 symbol "* [format $fmt $myrulecount($key)] $key"
	205	+ incr all $myrulecount($key)
	206	+ }
	207	+
	208	+ log write 2 symbol "= [format $fmt $all] total"
	209	+ return
	210	+ }
	211	+
	212	+ # Statistics on how often each 'rule' was used to decide on the
	213	+ # type of a symbol.
	214	+ typevariable myrulecount -array {
	215	+ HasCommits 0
	216	+ IsTheTrunk 0
	217	+ Unambigous 0
	218	+ Undecided_ 0
	219	+ UserConfig 0
	220	+ VoteCounts 0
	221	+ }
	222	+
	223	+ typemethod printtypestatistics {} {
	224	+ log write 2 symbol "Symbol type statistics:"
	225	+
	226	+ set fmt %[string length $mynum]s
	227	+ set all 0
	228	+
	229	+ foreach {stype splural n} [state run {
	230	+ SELECT T.name, T.plural, COUNT (s.sid)
	231	+ FROM symbol S, symtype T
	232	+ WHERE S.type = T.tid
	233	+ GROUP BY T.name
	234	+ ORDER BY T.name
	235	+ ;
	236	+ }] {
	237	+ log write 2 symbol "* [format $fmt $n] [sp $n $stype $splural]"
	238	+ incr all $n
	239	+ }
	240	+
	241	+ log write 2 symbol "= [format $fmt $all] total"
	242	+ return
	243	+ }
	244	+
	245	+ typevariable mynum 0
137	246
138	247	# # ## ### ##### ######## #############
139	248	## Internal methods
	249	+
	250	+ method UserConfig {} {
	251	+ # No user based guidance yet.
	252	+ return $myundef
	253	+ }
	254	+
	255	+ method Unambigous {} {
	256	+ # If a symbol is used unambiguously as a tag/branch, convert
	257	+ # it as such.
	258	+
	259	+ set istag [expr {$mytagcount > 0}]
	260	+ set isbranch [expr {$mybranchcount > 0 \|\| $mycommitcount > 0}]
	261	+
	262	+ if {$istag && $isbranch} { return $myundef }
	263	+ if {$istag} { return $mytag }
	264	+ if {$isbranch} { return $mybranch }
	265	+
	266	+ # Symbol was not used at all.
	267	+ return $myundef
	268	+ }
	269	+
	270	+ method HasCommits {} {
	271	+ # If there was ever a commit on the symbol, convert it as a
	272	+ # branch.
	273	+
	274	+ if {$mycommitcount > 0} { return $mybranch }
	275	+ return $myundef
	276	+ }
	277	+
	278	+ method VoteCounts {} {
	279	+ # Convert the symbol based on how often it was used as a
	280	+ # branch/tag. Whichever happened more often determines how the
	281	+ # symbol is converted.
	282	+
	283	+ if {$mytagcount > $mybranchcount} { return $mytag }
	284	+ if {$mytagcount < $mybranchcount} { return $mybranch }
	285	+ return $myundef
	286	+ }
	287	+
	288	+ method MarkAs {label chosen} {
	289	+ log write 3 symbol "\[$label\] Converting symbol '$myname' as $mysymtype($chosen)"
	290	+
	291	+ set mytype $chosen
	292	+ incr myrulecount($label)
	293	+
	294	+ # This is stored directly into the database.
	295	+ state run {
	296	+ UPDATE symbol
	297	+ SET type = $chosen
	298	+ WHERE sid = $myid
	299	+ ;
	300	+ }
	301	+ return
	302	+ }
140	303
141	304	# # ## ### ##### ######## #############
142	305	## Configuration
143	306
144	307	pragma -hastypeinfo no ; # no type introspection
145	308	pragma -hasinfo no ; # no object introspection
146		- pragma -hastypemethods no ; # type is not relevant.
147	309	pragma -simpledispatch yes ; # simple fast dispatch
148	310
149	311	# # ## ### ##### ######## #############
150	312	}
151	313
152	314	namespace eval ::vc::fossil::import::cvs::project {
153	315	namespace export sym
154	316	namespace eval sym {
155	317	namespace import ::vc::fossil::import::cvs::state
	318	+ namespace import ::vc::tools::misc::*
	319	+ namespace import ::vc::tools::trouble
	320	+ namespace import ::vc::tools::log
	321	+ log register symbol
156	322	}
157	323	}
158	324
159	325	# # ## ### ##### ######## ############# #####################
160	326	## Ready
161	327
162	328	package provide vc::fossil::import::cvs::project::sym 1.0
163	329	return
164	330

	--- tools/cvs2fossil/lib/c2f_psym.tcl
	+++ tools/cvs2fossil/lib/c2f_psym.tcl
	@@ -13,14 +13,17 @@
13	## Symbols (Tags, Branches) per project.
14
15	# # ## ### ##### ######## ############# #####################
16	## Requirements
17
18	package require Tcl 8.4 ; # Required runtime.
19	package require snit ; # OO system.
20	package require struct::set ; # Set handling.
21	package require vc::fossil::import::cvs::state ; # State storage.



22
23	# # ## ### ##### ######## ############# #####################
24	##
25
26	snit::type ::vc::fossil::import::cvs::project::sym {
	@@ -29,16 +32,59 @@
29
30	constructor {name id project} {
31	set myname $name
32	set myid $id
33	set myproject $project



34	return
35	}
36
37	method name {} { return $myname }
38	method id {} { return $myid }
39








































40	# # ## ### ##### ######## #############
41	## Symbol statistics
42
43	method defcounts {tc bc cc} {
44	set mybranchcount $tc
	@@ -126,38 +172,158 @@
126	# the exclusion of this symbol.
127
128	variable mypparent -array {} ; # Maps from symbols to the number
129	# of files in which it could have
130	# been a parent of this symbol.












131
132	# Keep the codes below in sync with 'pass::collrev/setup('symtype').
133	typevariable myexcluded 0 ; # Code for symbols which are excluded.
134	typevariable mytag 1 ; # Code for symbols which are tags.
135	typevariable mybranch 2 ; # Code for symbols which are branches.
136	typevariable myundef 3 ; # Code for symbols of unknown type.



















































137
138	# # ## ### ##### ######## #############
139	## Internal methods






















































140
141	# # ## ### ##### ######## #############
142	## Configuration
143
144	pragma -hastypeinfo no ; # no type introspection
145	pragma -hasinfo no ; # no object introspection
146	pragma -hastypemethods no ; # type is not relevant.
147	pragma -simpledispatch yes ; # simple fast dispatch
148
149	# # ## ### ##### ######## #############
150	}
151
152	namespace eval ::vc::fossil::import::cvs::project {
153	namespace export sym
154	namespace eval sym {
155	namespace import ::vc::fossil::import::cvs::state




156	}
157	}
158
159	# # ## ### ##### ######## ############# #####################
160	## Ready
161
162	package provide vc::fossil::import::cvs::project::sym 1.0
163	return
164

	--- tools/cvs2fossil/lib/c2f_psym.tcl
	+++ tools/cvs2fossil/lib/c2f_psym.tcl
	@@ -13,14 +13,17 @@
13	## Symbols (Tags, Branches) per project.
14
15	# # ## ### ##### ######## ############# #####################
16	## Requirements
17
18	package require Tcl 8.4 ; # Required runtime.
19	package require snit ; # OO system.
20	package require vc::tools::trouble ; # Error reporting.
21	package require vc::tools::log ; # User feedback.
22	package require vc::tools::misc ; # Text formatting.
23	package require vc::fossil::import::cvs::state ; # State storage.
24	package require struct::set ; # Set handling.
25
26	# # ## ### ##### ######## ############# #####################
27	##
28
29	snit::type ::vc::fossil::import::cvs::project::sym {
	@@ -29,16 +32,59 @@
32
33	constructor {name id project} {
34	set myname $name
35	set myid $id
36	set myproject $project
37
38	# Count total number of symbols.
39	incr mynum
40	return
41	}
42
43	method name {} { return $myname }
44	method id {} { return $myid }
45
46	# # ## ### ##### ######## #############
47	## Symbol type
48
49	method determinetype {} {
50	# This is done by a fixed heuristics, with guidance by the
51	# user in edge-cases. Contrary to cvs2svn which uses a big
52	# honking streagy class and rule objects. Keep it simple, we
53	# can expand later when we actually need all the complexity
54	# for configurability.
55
56	# The following guidelines are applied:
57	# - Is usage unambigous ?
58	# - Was there ever a commit on the symbol ?
59	# - More used as tag, or more used as branch ?
60	# - At last, what has the user told us about it ?
61	# - Fail
62
63	foreach rule {
64	UserConfig
65	Unambigous
66	HasCommits
67	VoteCounts
68	} {
69	set chosen [$self $rule]
70	if {$chosen eq $myundef} continue
71	$self MarkAs $rule $chosen
72	return
73	}
74
75	# None of the above was able to decide which type to assign to
76	# the symbol. This is a fatal error preventing the execution
77	# of the passes after 'CollateSymbols'.
78
79	incr myrulecount(Undecided_)
80	trouble fatal "Unable to decide how to convert symbol '$myname'"
81	return
82	}
83
84	method markthetrunk {} { $self MarkAs IsTheTrunk $mybranch ; return }
85
86	# # ## ### ##### ######## #############
87	## Symbol statistics
88
89	method defcounts {tc bc cc} {
90	set mybranchcount $tc
	@@ -126,38 +172,158 @@
172	# the exclusion of this symbol.
173
174	variable mypparent -array {} ; # Maps from symbols to the number
175	# of files in which it could have
176	# been a parent of this symbol.
177
178	variable mytype {} ; # The type chosen for the symbol to use in
179	# the conversion.
180
181	# # ## ### ##### ######## #############
182
183	typemethod getsymtypes {} {
184	foreach {tid name} [state run {
185	SELECT tid, name FROM symtype;
186	}] { set mysymtype($tid) $name }
187	return
188	}
189
190	# Keep the codes below in sync with 'pass::collrev/setup('symtype').
191	typevariable myexcluded 0 ; # Code for symbols which are excluded.
192	typevariable mytag 1 ; # Code for symbols which are tags.
193	typevariable mybranch 2 ; # Code for symbols which are branches.
194	typevariable myundef 3 ; # Code for symbols of unknown type.
195	typevariable mysymtype -array {} ; # Map from type code to label for the log.
196
197	typemethod printrulestatistics {} {
198	log write 2 symbol "Rule usage statistics:"
199
200	set fmt %[string length $mynum]s
201	set all 0
202
203	foreach key [lsort [array names myrulecount]] {
204	log write 2 symbol "* [format $fmt $myrulecount($key)] $key"
205	incr all $myrulecount($key)
206	}
207
208	log write 2 symbol "= [format $fmt $all] total"
209	return
210	}
211
212	# Statistics on how often each 'rule' was used to decide on the
213	# type of a symbol.
214	typevariable myrulecount -array {
215	HasCommits 0
216	IsTheTrunk 0
217	Unambigous 0
218	Undecided_ 0
219	UserConfig 0
220	VoteCounts 0
221	}
222
223	typemethod printtypestatistics {} {
224	log write 2 symbol "Symbol type statistics:"
225
226	set fmt %[string length $mynum]s
227	set all 0
228
229	foreach {stype splural n} [state run {
230	SELECT T.name, T.plural, COUNT (s.sid)
231	FROM symbol S, symtype T
232	WHERE S.type = T.tid
233	GROUP BY T.name
234	ORDER BY T.name
235	;
236	}] {
237	log write 2 symbol "* [format $fmt $n] [sp $n $stype $splural]"
238	incr all $n
239	}
240
241	log write 2 symbol "= [format $fmt $all] total"
242	return
243	}
244
245	typevariable mynum 0
246
247	# # ## ### ##### ######## #############
248	## Internal methods
249
250	method UserConfig {} {
251	# No user based guidance yet.
252	return $myundef
253	}
254
255	method Unambigous {} {
256	# If a symbol is used unambiguously as a tag/branch, convert
257	# it as such.
258
259	set istag [expr {$mytagcount > 0}]
260	set isbranch [expr {$mybranchcount > 0 \|\| $mycommitcount > 0}]
261
262	if {$istag && $isbranch} { return $myundef }
263	if {$istag} { return $mytag }
264	if {$isbranch} { return $mybranch }
265
266	# Symbol was not used at all.
267	return $myundef
268	}
269
270	method HasCommits {} {
271	# If there was ever a commit on the symbol, convert it as a
272	# branch.
273
274	if {$mycommitcount > 0} { return $mybranch }
275	return $myundef
276	}
277
278	method VoteCounts {} {
279	# Convert the symbol based on how often it was used as a
280	# branch/tag. Whichever happened more often determines how the
281	# symbol is converted.
282
283	if {$mytagcount > $mybranchcount} { return $mytag }
284	if {$mytagcount < $mybranchcount} { return $mybranch }
285	return $myundef
286	}
287
288	method MarkAs {label chosen} {
289	log write 3 symbol "\[$label\] Converting symbol '$myname' as $mysymtype($chosen)"
290
291	set mytype $chosen
292	incr myrulecount($label)
293
294	# This is stored directly into the database.
295	state run {
296	UPDATE symbol
297	SET type = $chosen
298	WHERE sid = $myid
299	;
300	}
301	return
302	}
303
304	# # ## ### ##### ######## #############
305	## Configuration
306
307	pragma -hastypeinfo no ; # no type introspection
308	pragma -hasinfo no ; # no object introspection

309	pragma -simpledispatch yes ; # simple fast dispatch
310
311	# # ## ### ##### ######## #############
312	}
313
314	namespace eval ::vc::fossil::import::cvs::project {
315	namespace export sym
316	namespace eval sym {
317	namespace import ::vc::fossil::import::cvs::state
318	namespace import ::vc::tools::misc::*
319	namespace import ::vc::tools::trouble
320	namespace import ::vc::tools::log
321	log register symbol
322	}
323	}
324
325	# # ## ### ##### ######## ############# #####################
326	## Ready
327
328	package provide vc::fossil::import::cvs::project::sym 1.0
329	return
330

M tools/cvs2fossil/lib/c2f_ptrunk.tcl

		--- tools/cvs2fossil/lib/c2f_ptrunk.tcl
		+++ tools/cvs2fossil/lib/c2f_ptrunk.tcl
		@@ -52,10 +52,12 @@
52	52	method possibleparent {symbol} {}
53	53
54	54	method isghost {} { return 0 }
55	55
56	56	delegate method persistrev to mysymbol
	57	+
	58	+ method determinetype {} { $mysymbol markthetrunk }
57	59
58	60	# # ## ### ##### ######## #############
59	61	## State
60	62
61	63	typevariable myname :trunk: ; # Name shared by all trunk symbols.
62	64

	--- tools/cvs2fossil/lib/c2f_ptrunk.tcl
	+++ tools/cvs2fossil/lib/c2f_ptrunk.tcl
	@@ -52,10 +52,12 @@
52	method possibleparent {symbol} {}
53
54	method isghost {} { return 0 }
55
56	delegate method persistrev to mysymbol


57
58	# # ## ### ##### ######## #############
59	## State
60
61	typevariable myname :trunk: ; # Name shared by all trunk symbols.
62

	--- tools/cvs2fossil/lib/c2f_ptrunk.tcl
	+++ tools/cvs2fossil/lib/c2f_ptrunk.tcl
	@@ -52,10 +52,12 @@
52	method possibleparent {symbol} {}
53
54	method isghost {} { return 0 }
55
56	delegate method persistrev to mysymbol
57
58	method determinetype {} { $mysymbol markthetrunk }
59
60	# # ## ### ##### ######## #############
61	## State
62
63	typevariable myname :trunk: ; # Name shared by all trunk symbols.
64

M tools/cvs2fossil/lib/c2f_repository.tcl

		--- tools/cvs2fossil/lib/c2f_repository.tcl
		+++ tools/cvs2fossil/lib/c2f_repository.tcl
		@@ -208,10 +208,17 @@
208	208	# that everything is 'undefined' at this point anyway.
209	209
210	210	# future: $symbol load (blockers, and parents)
211	211	}
212	212	}
	213	+ return
	214	+ }
	215	+
	216	+ typemethod determinesymboltypes {} {
	217	+ foreach project [TheProjects] {
	218	+ $project determinesymboltypes
	219	+ }
213	220	return
214	221	}
215	222
216	223	# # ## ### ##### ######## #############
217	224	## State
218	225

	--- tools/cvs2fossil/lib/c2f_repository.tcl
	+++ tools/cvs2fossil/lib/c2f_repository.tcl
	@@ -208,10 +208,17 @@
208	# that everything is 'undefined' at this point anyway.
209
210	# future: $symbol load (blockers, and parents)
211	}
212	}







213	return
214	}
215
216	# # ## ### ##### ######## #############
217	## State
218

	--- tools/cvs2fossil/lib/c2f_repository.tcl
	+++ tools/cvs2fossil/lib/c2f_repository.tcl
	@@ -208,10 +208,17 @@
208	# that everything is 'undefined' at this point anyway.
209
210	# future: $symbol load (blockers, and parents)
211	}
212	}
213	return
214	}
215
216	typemethod determinesymboltypes {} {
217	foreach project [TheProjects] {
218	$project determinesymboltypes
219	}
220	return
221	}
222
223	# # ## ### ##### ######## #############
224	## State
225

Fossil SCM

Keyboard Shortcuts