Fossil SCM

API tweak rcs parser, definition of symbols, call through the callback once per symbol instead of once for the whole set.

aku 2007-10-10 04:23 trunk

Commit 338854a61ad1f3b9e69d722b3d487cd07461bd0f

Parent 84de38d73fe6032…

2 files changed +5 -7 +1 -5

M tools/cvs2fossil/lib/c2f_file.tcl

+5 -7

		--- tools/cvs2fossil/lib/c2f_file.tcl
		+++ tools/cvs2fossil/lib/c2f_file.tcl
		@@ -42,21 +42,21 @@
42	42	method admindone {} {}
43	43
44	44	method sethead {h} {}
45	45	method setprincipalbranch {b} {}
46	46
47		- method setsymbols {dict} {}
48		- method setcomment {c} {}
49		- method setdesc {d} {}
	47	+ method deftag {s r} {}
	48	+ method setcomment {c} {}
	49	+ method setdesc {d} {}
50	50
51	51	method def {rev date author state next branches} {}
52	52	method extend {rev commitmsg deltarange} {}
53	53
54	54	#method begin {} {puts begin}
55	55	#method sethead {h} {puts head=$h}
56	56	#method setprincipalbranch {b} {puts pb=$b}
57		- #method setsymbols {dict} {puts symbols=$dict}
	57	+ #method deftag {s r} {puts $s=$r }
58	58	#method setcomment {c} {puts comment=$c}
59	59	#method admindone {} {puts admindone}
60	60	#method def {rev date author state next branches} {puts "def $rev $date $author $state $next $branches"}
61	61	#method setdesc {d} {puts desc=$d}
62	62	#method extend {rev commitmsg deltarange} {puts "extend $commitmsg $deltarange"}
		@@ -83,14 +83,12 @@
83	83	method setprincipalbranch {b} {
84	84	set myprincipal $b
85	85	return
86	86	}
87	87
88		- method setsymbols {dict} {
	88	+ method deftag {symbol rev} {
89	89	# Slice symbols into branches and tags, canonical numbers ...
90		-array set _ $dict
91		-parray _
92	90	}
93	91
94	92	method setcomment {c} {# ignore}
95	93	method setdesc {d} {# ignore}
96	94
97	95

	--- tools/cvs2fossil/lib/c2f_file.tcl
	+++ tools/cvs2fossil/lib/c2f_file.tcl
	@@ -42,21 +42,21 @@
42	method admindone {} {}
43
44	method sethead {h} {}
45	method setprincipalbranch {b} {}
46
47	method setsymbols {dict} {}
48	method setcomment {c} {}
49	method setdesc {d} {}
50
51	method def {rev date author state next branches} {}
52	method extend {rev commitmsg deltarange} {}
53
54	#method begin {} {puts begin}
55	#method sethead {h} {puts head=$h}
56	#method setprincipalbranch {b} {puts pb=$b}
57	#method setsymbols {dict} {puts symbols=$dict}
58	#method setcomment {c} {puts comment=$c}
59	#method admindone {} {puts admindone}
60	#method def {rev date author state next branches} {puts "def $rev $date $author $state $next $branches"}
61	#method setdesc {d} {puts desc=$d}
62	#method extend {rev commitmsg deltarange} {puts "extend $commitmsg $deltarange"}
	@@ -83,14 +83,12 @@
83	method setprincipalbranch {b} {
84	set myprincipal $b
85	return
86	}
87
88	method setsymbols {dict} {
89	# Slice symbols into branches and tags, canonical numbers ...
90	array set _ $dict
91	parray _
92	}
93
94	method setcomment {c} {# ignore}
95	method setdesc {d} {# ignore}
96
97

	--- tools/cvs2fossil/lib/c2f_file.tcl
	+++ tools/cvs2fossil/lib/c2f_file.tcl
	@@ -42,21 +42,21 @@
42	method admindone {} {}
43
44	method sethead {h} {}
45	method setprincipalbranch {b} {}
46
47	method deftag {s r} {}
48	method setcomment {c} {}
49	method setdesc {d} {}
50
51	method def {rev date author state next branches} {}
52	method extend {rev commitmsg deltarange} {}
53
54	#method begin {} {puts begin}
55	#method sethead {h} {puts head=$h}
56	#method setprincipalbranch {b} {puts pb=$b}
57	#method deftag {s r} {puts $s=$r }
58	#method setcomment {c} {puts comment=$c}
59	#method admindone {} {puts admindone}
60	#method def {rev date author state next branches} {puts "def $rev $date $author $state $next $branches"}
61	#method setdesc {d} {puts desc=$d}
62	#method extend {rev commitmsg deltarange} {puts "extend $commitmsg $deltarange"}
	@@ -83,14 +83,12 @@
83	method setprincipalbranch {b} {
84	set myprincipal $b
85	return
86	}
87
88	method deftag {symbol rev} {
89	# Slice symbols into branches and tags, canonical numbers ...


90	}
91
92	method setcomment {c} {# ignore}
93	method setdesc {d} {# ignore}
94
95

M tools/cvs2fossil/lib/rcsparser.tcl

+1 -5

		--- tools/cvs2fossil/lib/rcsparser.tcl
		+++ tools/cvs2fossil/lib/rcsparser.tcl
		@@ -74,20 +74,16 @@
74	74	Semicolon
75	75	return
76	76	}
77	77
78	78	proc Symbols {} {
79		- set d {}
80	79	RequiredLiteral symbols
81	80	while {[Ident -> symbol]} {
82	81	RequiredNumber -> rev
83		- # TODO: distinguish branch/tag symbols, transform revision
84		- # numbers into canonical form.
85		- lappend d $symbol $rev
	82	+ Call deftag $symbol $rev
86	83	}
87	84	Semicolon
88		- Call setsymbols $d
89	85	return
90	86	}
91	87
92	88	proc Locks {} {
93	89	# Not saving locks.
94	90

	--- tools/cvs2fossil/lib/rcsparser.tcl
	+++ tools/cvs2fossil/lib/rcsparser.tcl
	@@ -74,20 +74,16 @@
74	Semicolon
75	return
76	}
77
78	proc Symbols {} {
79	set d {}
80	RequiredLiteral symbols
81	while {[Ident -> symbol]} {
82	RequiredNumber -> rev
83	# TODO: distinguish branch/tag symbols, transform revision
84	# numbers into canonical form.
85	lappend d $symbol $rev
86	}
87	Semicolon
88	Call setsymbols $d
89	return
90	}
91
92	proc Locks {} {
93	# Not saving locks.
94

	--- tools/cvs2fossil/lib/rcsparser.tcl
	+++ tools/cvs2fossil/lib/rcsparser.tcl
	@@ -74,20 +74,16 @@
74	Semicolon
75	return
76	}
77
78	proc Symbols {} {

79	RequiredLiteral symbols
80	while {[Ident -> symbol]} {
81	RequiredNumber -> rev
82	Call deftag $symbol $rev


83	}
84	Semicolon

85	return
86	}
87
88	proc Locks {} {
89	# Not saving locks.
90