Fossil SCM

Added an option "--batch" with which the user can disable the feedback display standard to interactive use.

aku 2007-11-17 04:39 trunk

Commit 4e7dd05fc61d66c0d009eb19bdb6c4c26687c819

Parent 96b7bfb83401cc7…

2 files changed +4 -2 +9 -2

~ tools/cvs2fossil/lib/c2f_option.tcl ~ tools/cvs2fossil/lib/log.tcl

M tools/cvs2fossil/lib/c2f_option.tcl

+4 -2

		--- tools/cvs2fossil/lib/c2f_option.tcl
		+++ tools/cvs2fossil/lib/c2f_option.tcl
		@@ -44,15 +44,14 @@
44	44	# -v, --verbose
45	45	# -q, --quiet
46	46	# --state (conversion status, ala config.cache)
47	47	# --trunk-only
48	48	# --exclude, --force-tag, --force-branch
	49	+ # --batch
49	50
50	51	# -o, --output
51	52	# --dry-run
52		- # --force-branch RE
53		- # --force-tag RE
54	53	# --symbol-transform RE:XX
55	54
56	55	# # ## ### ##### ######## #############
57	56	## Public API, Methods
58	57
		@@ -77,10 +76,11 @@
77	76	--state { state use [Value arguments] }
78	77	--trunk-only { repository trunkonly! }
79	78	--exclude { project::sym exclude [Value arguments] }
80	79	--force-tag { project::sym forcetag [Value arguments] }
81	80	--force-branch { project::sym forcebranch [Value arguments] }
	81	+ --batch { log noprogress }
82	82	default {
83	83	Usage $badoption$option\n$gethelp
84	84	}
85	85	}
86	86	}
		@@ -105,10 +105,12 @@
105	105	trouble info " -h, --help Print this message and exit with success"
106	106	trouble info " --help-passes Print list of passes and exit with success"
107	107	trouble info " --version Print version number of $argv0"
108	108	trouble info " -v, --verbose Increase application's verbosity"
109	109	trouble info " -q, --quiet Decrease application's verbosity"
	110	+ trouble info " --batch Disable the progress feedback standard to"
	111	+ trouble info " interactive use."
110	112	trouble info ""
111	113	trouble info " Conversion control options"
112	114	trouble info ""
113	115	trouble info " -p, --pass PASS Run only the specified conversion pass"
114	116	trouble info " -p, --passes ?START?:?END? Run only the passes START through END,"
115	117

	--- tools/cvs2fossil/lib/c2f_option.tcl
	+++ tools/cvs2fossil/lib/c2f_option.tcl
	@@ -44,15 +44,14 @@
44	# -v, --verbose
45	# -q, --quiet
46	# --state (conversion status, ala config.cache)
47	# --trunk-only
48	# --exclude, --force-tag, --force-branch

49
50	# -o, --output
51	# --dry-run
52	# --force-branch RE
53	# --force-tag RE
54	# --symbol-transform RE:XX
55
56	# # ## ### ##### ######## #############
57	## Public API, Methods
58
	@@ -77,10 +76,11 @@
77	--state { state use [Value arguments] }
78	--trunk-only { repository trunkonly! }
79	--exclude { project::sym exclude [Value arguments] }
80	--force-tag { project::sym forcetag [Value arguments] }
81	--force-branch { project::sym forcebranch [Value arguments] }

82	default {
83	Usage $badoption$option\n$gethelp
84	}
85	}
86	}
	@@ -105,10 +105,12 @@
105	trouble info " -h, --help Print this message and exit with success"
106	trouble info " --help-passes Print list of passes and exit with success"
107	trouble info " --version Print version number of $argv0"
108	trouble info " -v, --verbose Increase application's verbosity"
109	trouble info " -q, --quiet Decrease application's verbosity"


110	trouble info ""
111	trouble info " Conversion control options"
112	trouble info ""
113	trouble info " -p, --pass PASS Run only the specified conversion pass"
114	trouble info " -p, --passes ?START?:?END? Run only the passes START through END,"
115

	--- tools/cvs2fossil/lib/c2f_option.tcl
	+++ tools/cvs2fossil/lib/c2f_option.tcl
	@@ -44,15 +44,14 @@
44	# -v, --verbose
45	# -q, --quiet
46	# --state (conversion status, ala config.cache)
47	# --trunk-only
48	# --exclude, --force-tag, --force-branch
49	# --batch
50
51	# -o, --output
52	# --dry-run


53	# --symbol-transform RE:XX
54
55	# # ## ### ##### ######## #############
56	## Public API, Methods
57
	@@ -77,10 +76,11 @@
76	--state { state use [Value arguments] }
77	--trunk-only { repository trunkonly! }
78	--exclude { project::sym exclude [Value arguments] }
79	--force-tag { project::sym forcetag [Value arguments] }
80	--force-branch { project::sym forcebranch [Value arguments] }
81	--batch { log noprogress }
82	default {
83	Usage $badoption$option\n$gethelp
84	}
85	}
86	}
	@@ -105,10 +105,12 @@
105	trouble info " -h, --help Print this message and exit with success"
106	trouble info " --help-passes Print list of passes and exit with success"
107	trouble info " --version Print version number of $argv0"
108	trouble info " -v, --verbose Increase application's verbosity"
109	trouble info " -q, --quiet Decrease application's verbosity"
110	trouble info " --batch Disable the progress feedback standard to"
111	trouble info " interactive use."
112	trouble info ""
113	trouble info " Conversion control options"
114	trouble info ""
115	trouble info " -p, --pass PASS Run only the specified conversion pass"
116	trouble info " -p, --passes ?START?:?END? Run only the passes START through END,"
117

M tools/cvs2fossil/lib/log.tcl

+9 -2

		--- tools/cvs2fossil/lib/log.tcl
		+++ tools/cvs2fossil/lib/log.tcl
		@@ -40,10 +40,11 @@
40	40	# to drive progress displays. It signals that for some long
41	41	# running operation we are at tick 'n' of at most 'max' ticks. An
42	42	# empty 'max' indicates an infinite progress display.
43	43
44	44	typemethod progress {verbosity system n max} {
	45	+ if {!$myprogress} return
45	46	if {$verbosity > $myloglevel} return
46	47	uplevel #0 [linsert $mylogcmd end progress [System $system] $n $max]
47	48	return
48	49	}
49	50
		@@ -65,10 +66,15 @@
65	66
66	67	typemethod verbose {} {
67	68	incr myloglevel
68	69	return
69	70	}
	71	+
	72	+ typemethod noprogress {} {
	73	+ set myprogress 0
	74	+ return
	75	+ }
70	76
71	77	typemethod quiet {} {
72	78	if {$myloglevel < 1} return
73	79	incr myloglevel -1
74	80	return
		@@ -104,12 +110,13 @@
104	110	# # ## ### ##### ######## #############
105	111	## Internal, state
106	112
107	113	typevariable myloglevel 2 ; # Some verbosity, not too much
108	114	typevariable mylogcmd ::vc::tools::log::OUT ; # Standard output to stdout.
109		- typevariable mysysfmt %s ; # Non-tabular formatting.
110		- typevariable mysyslen 0 ; # Ditto.
	115	+ typevariable mysysfmt %s ; # Non-tabular formatting.
	116	+ typevariable mysyslen 0 ; # Ditto.
	117	+ typevariable myprogress 1 ; # Progress output is standard.
111	118
112	119	# # ## ### ##### ######## #############
113	120	## Internal, helper methods (formatting, dispatch)
114	121
115	122	proc System {s} {
116	123

	--- tools/cvs2fossil/lib/log.tcl
	+++ tools/cvs2fossil/lib/log.tcl
	@@ -40,10 +40,11 @@
40	# to drive progress displays. It signals that for some long
41	# running operation we are at tick 'n' of at most 'max' ticks. An
42	# empty 'max' indicates an infinite progress display.
43
44	typemethod progress {verbosity system n max} {

45	if {$verbosity > $myloglevel} return
46	uplevel #0 [linsert $mylogcmd end progress [System $system] $n $max]
47	return
48	}
49
	@@ -65,10 +66,15 @@
65
66	typemethod verbose {} {
67	incr myloglevel
68	return
69	}





70
71	typemethod quiet {} {
72	if {$myloglevel < 1} return
73	incr myloglevel -1
74	return
	@@ -104,12 +110,13 @@
104	# # ## ### ##### ######## #############
105	## Internal, state
106
107	typevariable myloglevel 2 ; # Some verbosity, not too much
108	typevariable mylogcmd ::vc::tools::log::OUT ; # Standard output to stdout.
109	typevariable mysysfmt %s ; # Non-tabular formatting.
110	typevariable mysyslen 0 ; # Ditto.

111
112	# # ## ### ##### ######## #############
113	## Internal, helper methods (formatting, dispatch)
114
115	proc System {s} {
116

	--- tools/cvs2fossil/lib/log.tcl
	+++ tools/cvs2fossil/lib/log.tcl
	@@ -40,10 +40,11 @@
40	# to drive progress displays. It signals that for some long
41	# running operation we are at tick 'n' of at most 'max' ticks. An
42	# empty 'max' indicates an infinite progress display.
43
44	typemethod progress {verbosity system n max} {
45	if {!$myprogress} return
46	if {$verbosity > $myloglevel} return
47	uplevel #0 [linsert $mylogcmd end progress [System $system] $n $max]
48	return
49	}
50
	@@ -65,10 +66,15 @@
66
67	typemethod verbose {} {
68	incr myloglevel
69	return
70	}
71
72	typemethod noprogress {} {
73	set myprogress 0
74	return
75	}
76
77	typemethod quiet {} {
78	if {$myloglevel < 1} return
79	incr myloglevel -1
80	return
	@@ -104,12 +110,13 @@
110	# # ## ### ##### ######## #############
111	## Internal, state
112
113	typevariable myloglevel 2 ; # Some verbosity, not too much
114	typevariable mylogcmd ::vc::tools::log::OUT ; # Standard output to stdout.
115	typevariable mysysfmt %s ; # Non-tabular formatting.
116	typevariable mysyslen 0 ; # Ditto.
117	typevariable myprogress 1 ; # Progress output is standard.
118
119	# # ## ### ##### ######## #############
120	## Internal, helper methods (formatting, dispatch)
121
122	proc System {s} {
123

Fossil SCM

Keyboard Shortcuts