Fossil SCM

Integrated the new fossil management class with the option processor. New option --fossil to specify the fossil executable if it was not found in the PATH, or to overide the PATH.

aku 2007-12-05 07:53 trunk
Commit 1a20a81f33681c6a06a36e149567b80b350ad9c9
Parent b6bf21e2a81ce24…
1 file changed +11
~ tools/cvs2fossil/lib/c2f_option.tcl
M tools/cvs2fossil/lib/c2f_option.tcl
+11
--- tools/cvs2fossil/lib/c2f_option.tcl
+++ tools/cvs2fossil/lib/c2f_option.tcl
@@ -21,10 +21,11 @@
2121
 package require Tcl 8.4 ; # Required runtime.
2222
 package require snit ; # OO system.
2323
 package require vc::tools::trouble ; # Error reporting.
2424
 package require vc::tools::log ; # User feedback.
2525
 package require vc::tools::misc ; # Misc. path reformatting.
26
+package require vc::fossil::import::cvs::fossil ; # Fossil repository access
2627
 package require vc::fossil::import::cvs::pass ; # Pass management
2728
 package require vc::fossil::import::cvs::pass::collar ; # Pass I.
2829
 package require vc::fossil::import::cvs::repository ; # Repository management
2930
 package require vc::fossil::import::cvs::state ; # State storage
3031
 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
@@ -47,10 +48,11 @@
4748
 # -q, --quiet
4849
 # --state (conversion status, ala config.cache)
4950
 # --trunk-only
5051
 # --exclude, --force-tag, --force-branch
5152
 # --batch
53
+ # --fossil PATH
5254
5355
 # -o, --output
5456
 # --dry-run
5557
 # --symbol-transform RE:XX
5658
@@ -82,10 +84,11 @@
8284
 --force-branch { project::sym forcebranch [Value arguments] }
8385
 --batch { log noprogress }
8486
 --dots { cyclebreaker dotsto [Value arguments] }
8587
 --watch { cyclebreaker watch [Value arguments] }
8688
 --statesavequeriesto { state savequeriesto [Value arguments] }
89
+ --fossil { fossil setlocation [Value arguments] }
8790
 default {
8891
 Usage $badoption$option\n$gethelp
8992
 }
9093
 }
9194
 }
@@ -144,10 +147,16 @@
144147
 trouble info " Force the named symbol from all or just"
145148
 trouble info " the specified project to be converted as"
146149
 trouble info " branch. Both project and symbol names"
147150
 trouble info " are glob patterns."
148151
 trouble info ""
152
+ trouble info " Output control options"
153
+ trouble info ""
154
+ trouble info " --fossil PATH Specify where to find the fossil execu-"
155
+ trouble info " table if cv2fossil could not find it in"
156
+ trouble info " the PATH."
157
+ trouble info ""
149158
 trouble info " Debug options"
150159
 trouble info ""
151160
 trouble info " --dots PATH Write the changeset graphs before, after,"
152161
 trouble info " and during breaking the of cycles to the"
153162
 trouble info " direcotry PATH, using GraphViz's dot format"
@@ -201,10 +210,11 @@
201210
202211
 proc Validate {} {
203212
 # Prevent in-depth validation if the options were already bad.
204213
 trouble abort?
205214
215
+ fossil validate
206216
 repository validate
207217
 state setup
208218
209219
 trouble abort?
210220
 return
@@ -222,10 +232,11 @@
222232
223233
 namespace eval ::vc::fossil::import::cvs {
224234
 namespace export option
225235
 namespace eval option {
226236
 namespace import ::vc::tools::misc::striptrailingslash
237
+ namespace import ::vc::fossil::import::cvs::fossil
227238
 namespace import ::vc::fossil::import::cvs::pass
228239
 namespace import ::vc::fossil::import::cvs::pass::collar
229240
 namespace import ::vc::fossil::import::cvs::cyclebreaker
230241
 namespace import ::vc::fossil::import::cvs::repository
231242
 namespace import ::vc::fossil::import::cvs::state
232243
--- tools/cvs2fossil/lib/c2f_option.tcl
+++ tools/cvs2fossil/lib/c2f_option.tcl
@@ -21,10 +21,11 @@
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::tools::misc ; # Misc. path reformatting.
 
26 package require vc::fossil::import::cvs::pass ; # Pass management
27 package require vc::fossil::import::cvs::pass::collar ; # Pass I.
28 package require vc::fossil::import::cvs::repository ; # Repository management
29 package require vc::fossil::import::cvs::state ; # State storage
30 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
@@ -47,10 +48,11 @@
47 # -q, --quiet
48 # --state (conversion status, ala config.cache)
49 # --trunk-only
50 # --exclude, --force-tag, --force-branch
51 # --batch
 
52
53 # -o, --output
54 # --dry-run
55 # --symbol-transform RE:XX
56
@@ -82,10 +84,11 @@
82 --force-branch { project::sym forcebranch [Value arguments] }
83 --batch { log noprogress }
84 --dots { cyclebreaker dotsto [Value arguments] }
85 --watch { cyclebreaker watch [Value arguments] }
86 --statesavequeriesto { state savequeriesto [Value arguments] }
 
87 default {
88 Usage $badoption$option\n$gethelp
89 }
90 }
91 }
@@ -144,10 +147,16 @@
144 trouble info " Force the named symbol from all or just"
145 trouble info " the specified project to be converted as"
146 trouble info " branch. Both project and symbol names"
147 trouble info " are glob patterns."
148 trouble info ""
 
 
 
 
 
 
149 trouble info " Debug options"
150 trouble info ""
151 trouble info " --dots PATH Write the changeset graphs before, after,"
152 trouble info " and during breaking the of cycles to the"
153 trouble info " direcotry PATH, using GraphViz's dot format"
@@ -201,10 +210,11 @@
201
202 proc Validate {} {
203 # Prevent in-depth validation if the options were already bad.
204 trouble abort?
205
 
206 repository validate
207 state setup
208
209 trouble abort?
210 return
@@ -222,10 +232,11 @@
222
223 namespace eval ::vc::fossil::import::cvs {
224 namespace export option
225 namespace eval option {
226 namespace import ::vc::tools::misc::striptrailingslash
 
227 namespace import ::vc::fossil::import::cvs::pass
228 namespace import ::vc::fossil::import::cvs::pass::collar
229 namespace import ::vc::fossil::import::cvs::cyclebreaker
230 namespace import ::vc::fossil::import::cvs::repository
231 namespace import ::vc::fossil::import::cvs::state
232
--- tools/cvs2fossil/lib/c2f_option.tcl
+++ tools/cvs2fossil/lib/c2f_option.tcl
@@ -21,10 +21,11 @@
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::tools::misc ; # Misc. path reformatting.
26 package require vc::fossil::import::cvs::fossil ; # Fossil repository access
27 package require vc::fossil::import::cvs::pass ; # Pass management
28 package require vc::fossil::import::cvs::pass::collar ; # Pass I.
29 package require vc::fossil::import::cvs::repository ; # Repository management
30 package require vc::fossil::import::cvs::state ; # State storage
31 package require vc::fossil::import::cvs::integrity ; # State integrity checks.
@@ -47,10 +48,11 @@
48 # -q, --quiet
49 # --state (conversion status, ala config.cache)
50 # --trunk-only
51 # --exclude, --force-tag, --force-branch
52 # --batch
53 # --fossil PATH
54
55 # -o, --output
56 # --dry-run
57 # --symbol-transform RE:XX
58
@@ -82,10 +84,11 @@
84 --force-branch { project::sym forcebranch [Value arguments] }
85 --batch { log noprogress }
86 --dots { cyclebreaker dotsto [Value arguments] }
87 --watch { cyclebreaker watch [Value arguments] }
88 --statesavequeriesto { state savequeriesto [Value arguments] }
89 --fossil { fossil setlocation [Value arguments] }
90 default {
91 Usage $badoption$option\n$gethelp
92 }
93 }
94 }
@@ -144,10 +147,16 @@
147 trouble info " Force the named symbol from all or just"
148 trouble info " the specified project to be converted as"
149 trouble info " branch. Both project and symbol names"
150 trouble info " are glob patterns."
151 trouble info ""
152 trouble info " Output control options"
153 trouble info ""
154 trouble info " --fossil PATH Specify where to find the fossil execu-"
155 trouble info " table if cv2fossil could not find it in"
156 trouble info " the PATH."
157 trouble info ""
158 trouble info " Debug options"
159 trouble info ""
160 trouble info " --dots PATH Write the changeset graphs before, after,"
161 trouble info " and during breaking the of cycles to the"
162 trouble info " direcotry PATH, using GraphViz's dot format"
@@ -201,10 +210,11 @@
210
211 proc Validate {} {
212 # Prevent in-depth validation if the options were already bad.
213 trouble abort?
214
215 fossil validate
216 repository validate
217 state setup
218
219 trouble abort?
220 return
@@ -222,10 +232,11 @@
232
233 namespace eval ::vc::fossil::import::cvs {
234 namespace export option
235 namespace eval option {
236 namespace import ::vc::tools::misc::striptrailingslash
237 namespace import ::vc::fossil::import::cvs::fossil
238 namespace import ::vc::fossil::import::cvs::pass
239 namespace import ::vc::fossil::import::cvs::pass::collar
240 namespace import ::vc::fossil::import::cvs::cyclebreaker
241 namespace import ::vc::fossil::import::cvs::repository
242 namespace import ::vc::fossil::import::cvs::state
243

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button