| | @@ -16,14 +16,16 @@ |
| 16 | 16 | ## delegation |
| 17 | 17 | |
| 18 | 18 | # # ## ### ##### ######## ############# ##################### |
| 19 | 19 | ## Requirements |
| 20 | 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 |
| 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 |
| 25 | 27 | |
| 26 | 28 | # # ## ### ##### ######## ############# ##################### |
| 27 | 29 | ## |
| 28 | 30 | |
| 29 | 31 | snit::type ::vc::fossil::import::cvs::option { |
| | @@ -31,10 +33,11 @@ |
| 31 | 33 | ## Public API, Options. |
| 32 | 34 | |
| 33 | 35 | # --help, --help-passes, -h |
| 34 | 36 | # --version |
| 35 | 37 | # -p, --pass, --passes |
| 38 | + # --ignore-conflicting-attics |
| 36 | 39 | |
| 37 | 40 | # --project |
| 38 | 41 | # --cache (conversion status, ala config.cache) |
| 39 | 42 | # -o, --output |
| 40 | 43 | # --dry-run |
| | @@ -62,12 +65,15 @@ |
| 62 | 65 | -p - |
| 63 | 66 | --pass - |
| 64 | 67 | --passes { |
| 65 | 68 | pass select [Value arguments] |
| 66 | 69 | } |
| 70 | + --ignore-conflicting-attics { |
| 71 | + collar ignore_conflicting_attics |
| 72 | + } |
| 67 | 73 | --project { |
| 68 | | - #cvs::repository addproject [Value arguments] |
| 74 | + repository add [Value arguments] |
| 69 | 75 | } |
| 70 | 76 | --cache { |
| 71 | 77 | # [Value arguments] |
| 72 | 78 | } |
| 73 | 79 | default { |
| | @@ -76,11 +82,11 @@ |
| 76 | 82 | } |
| 77 | 83 | } |
| 78 | 84 | |
| 79 | 85 | if {[llength $arguments] > 1} Usage |
| 80 | 86 | if {[llength $arguments] < 1} { Usage $nocvs } |
| 81 | | - #cvs::repository setbase [lindex $arguments 0] |
| 87 | + repository base [lindex $arguments 0] |
| 82 | 88 | |
| 83 | 89 | Validate |
| 84 | 90 | return |
| 85 | 91 | } |
| 86 | 92 | |
| | @@ -103,10 +109,15 @@ |
| 103 | 109 | trouble info " -p, --passes ?START?:?END? Run only the passes START through END," |
| 104 | 110 | trouble info " inclusive." |
| 105 | 111 | trouble info "" |
| 106 | 112 | trouble info " Passes are specified by name." |
| 107 | 113 | trouble info "" |
| 114 | + trouble info " --ignore-conflicting-attics" |
| 115 | + trouble info " Prevent abort when conflicting archives" |
| 116 | + trouble info " were found in both regular and Attic." |
| 117 | + trouble info "" |
| 118 | + |
| 108 | 119 | # --project, --cache |
| 109 | 120 | # ... |
| 110 | 121 | return |
| 111 | 122 | } |
| 112 | 123 | |
| | @@ -153,10 +164,11 @@ |
| 153 | 164 | |
| 154 | 165 | proc Validate {} { |
| 155 | 166 | # Prevent in-depth validation if the options were already bad. |
| 156 | 167 | trouble abort? |
| 157 | 168 | |
| 169 | + repository validate |
| 158 | 170 | |
| 159 | 171 | trouble abort? |
| 160 | 172 | return |
| 161 | 173 | } |
| 162 | 174 | |
| | @@ -168,15 +180,20 @@ |
| 168 | 180 | pragma -hastypedestroy no ; # immortal |
| 169 | 181 | |
| 170 | 182 | # # ## ### ##### ######## ############# |
| 171 | 183 | } |
| 172 | 184 | |
| 173 | | -namespace eval ::vc::fossil::import::cvs::option { |
| 174 | | - namespace import ::vc::tools::trouble |
| 175 | | - namespace import ::vc::fossil::import::cvs::pass |
| 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 | + } |
| 176 | 193 | } |
| 177 | 194 | |
| 178 | 195 | # # ## ### ##### ######## ############# ##################### |
| 179 | 196 | ## Ready |
| 180 | 197 | |
| 181 | 198 | package provide vc::fossil::import::cvs::option 1.0 |
| 182 | 199 | return |
| 183 | 200 | |