Fossil SCM

Better formatting for --help-passes, align codes.

aku 2007-10-06 03:53 trunk

Commit 43d72c62467108c09a8ed87fc0c30620033020cf

Parent 042d54bae54539a…

2 files changed +8 -1 +1 -1

M tools/cvs2fossil/lib/c2f_pass.tcl

+8 -1

		--- tools/cvs2fossil/lib/c2f_pass.tcl
		+++ tools/cvs2fossil/lib/c2f_pass.tcl
		@@ -18,10 +18,11 @@
18	18	## Requirements
19	19
20	20	package require Tcl 8.4 ; # Required runtime.
21	21	package require snit ; # OO system.
22	22	package require vc::fossil::import::cvs::state ; # State storage
	23	+package require vc::tools::misc ; # Text formatting
23	24	package require vc::tools::trouble ; # Error reporting.
24	25	package require vc::tools::log ; # User feedback.
25	26	package require struct::list ; # Portable lassign
26	27
27	28	# # ## ### ##### ######## ############# #####################
		@@ -44,12 +45,17 @@
44	45	typemethod help {} {
45	46	trouble info ""
46	47	trouble info "Conversion passes:"
47	48	trouble info ""
48	49	set n 0
	50	+
	51	+ set clen [max [struct::list map $mypasses {string length}]]
	52	+ set cfmt %-${clen}s
	53	+ set nfmt %[string length [llength $mypasses]]s
	54	+
49	55	foreach code $mypasses {
50		- trouble info " [format %2d $n]: $code $mydesc($code)"
	56	+ trouble info " [format $nfmt $n]: [format $cfmt $code] : $mydesc($code)"
51	57	incr n
52	58	}
53	59	trouble info ""
54	60	return
55	61	}
		@@ -167,10 +173,11 @@
167	173
168	174	namespace eval ::vc::fossil::import::cvs {
169	175	namespace export pass
170	176	namespace eval pass {
171	177	namespace import ::vc::fossil::import::cvs::state
	178	+ namespace import ::vc::tools::misc::*
172	179	namespace import ::vc::tools::trouble
173	180	namespace import ::vc::tools::log
174	181	log register pass
175	182	}
176	183	}
177	184

	--- tools/cvs2fossil/lib/c2f_pass.tcl
	+++ tools/cvs2fossil/lib/c2f_pass.tcl
	@@ -18,10 +18,11 @@
18	## Requirements
19
20	package require Tcl 8.4 ; # Required runtime.
21	package require snit ; # OO system.
22	package require vc::fossil::import::cvs::state ; # State storage

23	package require vc::tools::trouble ; # Error reporting.
24	package require vc::tools::log ; # User feedback.
25	package require struct::list ; # Portable lassign
26
27	# # ## ### ##### ######## ############# #####################
	@@ -44,12 +45,17 @@
44	typemethod help {} {
45	trouble info ""
46	trouble info "Conversion passes:"
47	trouble info ""
48	set n 0





49	foreach code $mypasses {
50	trouble info " [format %2d $n]: $code $mydesc($code)"
51	incr n
52	}
53	trouble info ""
54	return
55	}
	@@ -167,10 +173,11 @@
167
168	namespace eval ::vc::fossil::import::cvs {
169	namespace export pass
170	namespace eval pass {
171	namespace import ::vc::fossil::import::cvs::state

172	namespace import ::vc::tools::trouble
173	namespace import ::vc::tools::log
174	log register pass
175	}
176	}
177

	--- tools/cvs2fossil/lib/c2f_pass.tcl
	+++ tools/cvs2fossil/lib/c2f_pass.tcl
	@@ -18,10 +18,11 @@
18	## Requirements
19
20	package require Tcl 8.4 ; # Required runtime.
21	package require snit ; # OO system.
22	package require vc::fossil::import::cvs::state ; # State storage
23	package require vc::tools::misc ; # Text formatting
24	package require vc::tools::trouble ; # Error reporting.
25	package require vc::tools::log ; # User feedback.
26	package require struct::list ; # Portable lassign
27
28	# # ## ### ##### ######## ############# #####################
	@@ -44,12 +45,17 @@
45	typemethod help {} {
46	trouble info ""
47	trouble info "Conversion passes:"
48	trouble info ""
49	set n 0
50
51	set clen [max [struct::list map $mypasses {string length}]]
52	set cfmt %-${clen}s
53	set nfmt %[string length [llength $mypasses]]s
54
55	foreach code $mypasses {
56	trouble info " [format $nfmt $n]: [format $cfmt $code] : $mydesc($code)"
57	incr n
58	}
59	trouble info ""
60	return
61	}
	@@ -167,10 +173,11 @@
173
174	namespace eval ::vc::fossil::import::cvs {
175	namespace export pass
176	namespace eval pass {
177	namespace import ::vc::fossil::import::cvs::state
178	namespace import ::vc::tools::misc::*
179	namespace import ::vc::tools::trouble
180	namespace import ::vc::tools::log
181	log register pass
182	}
183	}
184

M tools/cvs2fossil/lib/c2f_repository.tcl

+1 -1

		--- tools/cvs2fossil/lib/c2f_repository.tcl
		+++ tools/cvs2fossil/lib/c2f_repository.tcl
		@@ -198,13 +198,13 @@
198	198	namespace eval ::vc::fossil::import::cvs {
199	199	namespace export repository
200	200	namespace eval repository {
201	201	namespace import ::vc::fossil::import::cvs::project
202	202	namespace import ::vc::fossil::import::cvs::state
	203	+ namespace import ::vc::tools::misc::*
203	204	namespace import ::vc::tools::trouble
204	205	namespace import ::vc::tools::log
205		- namespace import ::vc::tools::misc::*
206	206	log register repository
207	207	}
208	208	}
209	209
210	210	# # ## ### ##### ######## ############# #####################
211	211

	--- tools/cvs2fossil/lib/c2f_repository.tcl
	+++ tools/cvs2fossil/lib/c2f_repository.tcl
	@@ -198,13 +198,13 @@
198	namespace eval ::vc::fossil::import::cvs {
199	namespace export repository
200	namespace eval repository {
201	namespace import ::vc::fossil::import::cvs::project
202	namespace import ::vc::fossil::import::cvs::state

203	namespace import ::vc::tools::trouble
204	namespace import ::vc::tools::log
205	namespace import ::vc::tools::misc::*
206	log register repository
207	}
208	}
209
210	# # ## ### ##### ######## ############# #####################
211

	--- tools/cvs2fossil/lib/c2f_repository.tcl
	+++ tools/cvs2fossil/lib/c2f_repository.tcl
	@@ -198,13 +198,13 @@
198	namespace eval ::vc::fossil::import::cvs {
199	namespace export repository
200	namespace eval repository {
201	namespace import ::vc::fossil::import::cvs::project
202	namespace import ::vc::fossil::import::cvs::state
203	namespace import ::vc::tools::misc::*
204	namespace import ::vc::tools::trouble
205	namespace import ::vc::tools::log

206	log register repository
207	}
208	}
209
210	# # ## ### ##### ######## ############# #####################
211