SHA1 Hash:	4e7dd05fc61d66c0d009eb19bdb6c4c26687c819
Date:	2007-11-17 04:39:27
User:	aku
Comment:	Added an option "--batch" with which the user can disable the feedback display standard to interactive use.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified tools/cvs2fossil/lib/c2f_option.tcl from [d7008b5e1a] to [593517a591].

@@ -44,15 +44,14 @@
     # -v, --verbose
     # -q, --quiet
     # --state (conversion status, ala config.cache)
     # --trunk-only
     # --exclude, --force-tag, --force-branch
+    # --batch
 
     # -o, --output
     # --dry-run
-    # --force-branch RE
-    # --force-tag RE
     # --symbol-transform RE:XX
 
     # # ## ### ##### ######## #############
     ## Public API, Methods
 
@@ -77,10 +76,11 @@
 		--state                     { state use [Value arguments] }
 		--trunk-only                { repository trunkonly! }
 		--exclude                   { project::sym exclude     [Value arguments] }
 		--force-tag                 { project::sym forcetag    [Value arguments] }
 		--force-branch              { project::sym forcebranch [Value arguments] }
+		--batch                     { log noprogress }
 		default {
 		    Usage $badoption$option\n$gethelp
 		}
 	    }
 	}
@@ -105,10 +105,12 @@
 	trouble info "    -h, --help    Print this message and exit with success"
 	trouble info "    --help-passes Print list of passes and exit with success"
 	trouble info "    --version     Print version number of $argv0"
 	trouble info "    -v, --verbose Increase application's verbosity"
 	trouble info "    -q, --quiet   Decrease application's verbosity"
+	trouble info "    --batch       Disable the progress feedback standard to"
+	trouble info "                  interactive use."
 	trouble info ""
 	trouble info "  Conversion control options"
 	trouble info ""
 	trouble info "    -p, --pass PASS            Run only the specified conversion pass"
 	trouble info "    -p, --passes ?START?:?END? Run only the passes START through END,"

Modified tools/cvs2fossil/lib/log.tcl from [2d2937d11b] to [b0cf40fdc1].

@@ -40,10 +40,11 @@
     # to drive progress displays. It signals that for some long
     # running operation we are at tick 'n' of at most 'max' ticks. An
     # empty 'max' indicates an infinite progress display.
 
     typemethod progress {verbosity system n max} {
+	if {!$myprogress}             return
 	if {$verbosity > $myloglevel} return
 	uplevel #0 [linsert $mylogcmd end progress [System $system] $n $max]
 	return
     }
 
@@ -63,10 +64,15 @@
 	return
     }
 
     typemethod verbose {} {
 	incr myloglevel
+	return
+    }
+
+    typemethod noprogress {} {
+	set myprogress 0
 	return
     }
 
     typemethod quiet {} {
 	if {$myloglevel < 1} return
@@ -104,12 +110,13 @@
     # # ## ### ##### ######## #############
     ## Internal, state
 
     typevariable myloglevel 2                     ; # Some verbosity, not too much
     typevariable mylogcmd   ::vc::tools::log::OUT ; # Standard output to stdout.
-    typevariable mysysfmt %s                      ; # Non-tabular formatting.
-    typevariable mysyslen 0                       ; # Ditto.
+    typevariable mysysfmt   %s                    ; # Non-tabular formatting.
+    typevariable mysyslen   0                     ; # Ditto.
+    typevariable myprogress 1                     ; # Progress output is standard.
 
     # # ## ### ##### ######## #############
     ## Internal, helper methods (formatting, dispatch)
 
     proc System {s} {