Fossil SCM
Extended option processing, added handling of verbosity/quietness.
Commit
2929a438ef9d030b6f421b652c1544da2d25d5d4
Parent
47740cc1f6e14ac…
1 file changed
+19
-17
+19
-17
| --- tools/cvs2fossil/lib/c2f_option.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_option.tcl | ||
| @@ -19,10 +19,11 @@ | ||
| 19 | 19 | ## Requirements |
| 20 | 20 | |
| 21 | 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | 22 | package require snit ; # OO system. |
| 23 | 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | +package require vc::tools::log ; # User feedback. | |
| 24 | 25 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 25 | 26 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 26 | 27 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 27 | 28 | |
| 28 | 29 | # # ## ### ##### ######## ############# ##################### |
| @@ -34,23 +35,23 @@ | ||
| 34 | 35 | |
| 35 | 36 | # --help, --help-passes, -h |
| 36 | 37 | # --version |
| 37 | 38 | # -p, --pass, --passes |
| 38 | 39 | # --ignore-conflicting-attics |
| 39 | - | |
| 40 | 40 | # --project |
| 41 | + # -v, --verbose | |
| 42 | + # -q, --quiet | |
| 43 | + | |
| 41 | 44 | # --cache (conversion status, ala config.cache) |
| 42 | 45 | # -o, --output |
| 43 | 46 | # --dry-run |
| 44 | 47 | # --trunk-only |
| 45 | 48 | # --force-branch RE |
| 46 | 49 | # --force-tag RE |
| 47 | 50 | # --symbol-transform RE:XX |
| 48 | 51 | # --exclude |
| 49 | 52 | # -p, --passes |
| 50 | - # -v, --verbose | |
| 51 | - # -q, --quiet | |
| 52 | 53 | |
| 53 | 54 | # # ## ### ##### ######## ############# |
| 54 | 55 | ## Public API, Methods |
| 55 | 56 | |
| 56 | 57 | typemethod process {arguments} { |
| @@ -60,27 +61,27 @@ | ||
| 60 | 61 | switch -exact -- $option { |
| 61 | 62 | -h - |
| 62 | 63 | --help { PrintHelp ; exit 0 } |
| 63 | 64 | --help-passes { pass help ; exit 0 } |
| 64 | 65 | --version { PrintVersion ; exit 0 } |
| 65 | - -p - | |
| 66 | - --pass - | |
| 67 | - --passes { | |
| 68 | - pass select [Value arguments] | |
| 69 | - } | |
| 70 | - --ignore-conflicting-attics { | |
| 71 | - collar ignore_conflicting_attics | |
| 72 | - } | |
| 73 | - --project { | |
| 74 | - repository add [Value arguments] | |
| 75 | - } | |
| 66 | + | |
| 67 | + -p - | |
| 68 | + --pass - | |
| 69 | + --passes { pass select [Value arguments] } | |
| 70 | + | |
| 71 | + --ignore-conflicting-attics { collar ignore_conflicting_attics } | |
| 72 | + | |
| 73 | + --project { repository add [Value arguments] } | |
| 74 | + -v - | |
| 75 | + --verbose { log verbose } | |
| 76 | + -q - | |
| 77 | + --quiet { log quiet } | |
| 78 | + | |
| 76 | 79 | --cache { |
| 77 | 80 | # [Value arguments] |
| 78 | 81 | } |
| 79 | - default { | |
| 80 | - Usage $badoption$option\n$gethelp | |
| 81 | - } | |
| 82 | + default { Usage $badoption$option\n$gethelp } | |
| 82 | 83 | } |
| 83 | 84 | } |
| 84 | 85 | |
| 85 | 86 | if {[llength $arguments] > 1} Usage |
| 86 | 87 | if {[llength $arguments] < 1} { Usage $nocvs } |
| @@ -184,10 +185,11 @@ | ||
| 184 | 185 | |
| 185 | 186 | namespace eval ::vc::fossil::import::cvs { |
| 186 | 187 | namespace export option |
| 187 | 188 | namespace eval option { |
| 188 | 189 | namespace import ::vc::tools::trouble |
| 190 | + namespace import ::vc::tools::log | |
| 189 | 191 | namespace import ::vc::fossil::import::cvs::pass |
| 190 | 192 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 191 | 193 | namespace import ::vc::fossil::import::cvs::repository |
| 192 | 194 | } |
| 193 | 195 | } |
| 194 | 196 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -19,10 +19,11 @@ | |
| 19 | ## Requirements |
| 20 | |
| 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | package require snit ; # OO system. |
| 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 25 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 26 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 27 | |
| 28 | # # ## ### ##### ######## ############# ##################### |
| @@ -34,23 +35,23 @@ | |
| 34 | |
| 35 | # --help, --help-passes, -h |
| 36 | # --version |
| 37 | # -p, --pass, --passes |
| 38 | # --ignore-conflicting-attics |
| 39 | |
| 40 | # --project |
| 41 | # --cache (conversion status, ala config.cache) |
| 42 | # -o, --output |
| 43 | # --dry-run |
| 44 | # --trunk-only |
| 45 | # --force-branch RE |
| 46 | # --force-tag RE |
| 47 | # --symbol-transform RE:XX |
| 48 | # --exclude |
| 49 | # -p, --passes |
| 50 | # -v, --verbose |
| 51 | # -q, --quiet |
| 52 | |
| 53 | # # ## ### ##### ######## ############# |
| 54 | ## Public API, Methods |
| 55 | |
| 56 | typemethod process {arguments} { |
| @@ -60,27 +61,27 @@ | |
| 60 | switch -exact -- $option { |
| 61 | -h - |
| 62 | --help { PrintHelp ; exit 0 } |
| 63 | --help-passes { pass help ; exit 0 } |
| 64 | --version { PrintVersion ; exit 0 } |
| 65 | -p - |
| 66 | --pass - |
| 67 | --passes { |
| 68 | pass select [Value arguments] |
| 69 | } |
| 70 | --ignore-conflicting-attics { |
| 71 | collar ignore_conflicting_attics |
| 72 | } |
| 73 | --project { |
| 74 | repository add [Value arguments] |
| 75 | } |
| 76 | --cache { |
| 77 | # [Value arguments] |
| 78 | } |
| 79 | default { |
| 80 | Usage $badoption$option\n$gethelp |
| 81 | } |
| 82 | } |
| 83 | } |
| 84 | |
| 85 | if {[llength $arguments] > 1} Usage |
| 86 | if {[llength $arguments] < 1} { Usage $nocvs } |
| @@ -184,10 +185,11 @@ | |
| 184 | |
| 185 | namespace eval ::vc::fossil::import::cvs { |
| 186 | namespace export option |
| 187 | namespace eval option { |
| 188 | namespace import ::vc::tools::trouble |
| 189 | namespace import ::vc::fossil::import::cvs::pass |
| 190 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 191 | namespace import ::vc::fossil::import::cvs::repository |
| 192 | } |
| 193 | } |
| 194 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -19,10 +19,11 @@ | |
| 19 | ## Requirements |
| 20 | |
| 21 | package require Tcl 8.4 ; # Required runtime. |
| 22 | package require snit ; # OO system. |
| 23 | package require vc::tools::trouble ; # Error reporting. |
| 24 | package require vc::tools::log ; # User feedback. |
| 25 | package require vc::fossil::import::cvs::pass ; # Pass management |
| 26 | package require vc::fossil::import::cvs::pass::collar ; # Pass I. |
| 27 | package require vc::fossil::import::cvs::repository ; # Repository management |
| 28 | |
| 29 | # # ## ### ##### ######## ############# ##################### |
| @@ -34,23 +35,23 @@ | |
| 35 | |
| 36 | # --help, --help-passes, -h |
| 37 | # --version |
| 38 | # -p, --pass, --passes |
| 39 | # --ignore-conflicting-attics |
| 40 | # --project |
| 41 | # -v, --verbose |
| 42 | # -q, --quiet |
| 43 | |
| 44 | # --cache (conversion status, ala config.cache) |
| 45 | # -o, --output |
| 46 | # --dry-run |
| 47 | # --trunk-only |
| 48 | # --force-branch RE |
| 49 | # --force-tag RE |
| 50 | # --symbol-transform RE:XX |
| 51 | # --exclude |
| 52 | # -p, --passes |
| 53 | |
| 54 | # # ## ### ##### ######## ############# |
| 55 | ## Public API, Methods |
| 56 | |
| 57 | typemethod process {arguments} { |
| @@ -60,27 +61,27 @@ | |
| 61 | switch -exact -- $option { |
| 62 | -h - |
| 63 | --help { PrintHelp ; exit 0 } |
| 64 | --help-passes { pass help ; exit 0 } |
| 65 | --version { PrintVersion ; exit 0 } |
| 66 | |
| 67 | -p - |
| 68 | --pass - |
| 69 | --passes { pass select [Value arguments] } |
| 70 | |
| 71 | --ignore-conflicting-attics { collar ignore_conflicting_attics } |
| 72 | |
| 73 | --project { repository add [Value arguments] } |
| 74 | -v - |
| 75 | --verbose { log verbose } |
| 76 | -q - |
| 77 | --quiet { log quiet } |
| 78 | |
| 79 | --cache { |
| 80 | # [Value arguments] |
| 81 | } |
| 82 | default { Usage $badoption$option\n$gethelp } |
| 83 | } |
| 84 | } |
| 85 | |
| 86 | if {[llength $arguments] > 1} Usage |
| 87 | if {[llength $arguments] < 1} { Usage $nocvs } |
| @@ -184,10 +185,11 @@ | |
| 185 | |
| 186 | namespace eval ::vc::fossil::import::cvs { |
| 187 | namespace export option |
| 188 | namespace eval option { |
| 189 | namespace import ::vc::tools::trouble |
| 190 | namespace import ::vc::tools::log |
| 191 | namespace import ::vc::fossil::import::cvs::pass |
| 192 | namespace import ::vc::fossil::import::cvs::pass::collar |
| 193 | namespace import ::vc::fossil::import::cvs::repository |
| 194 | } |
| 195 | } |
| 196 |