Fossil SCM
Added new option --trunk-only, state and processing.
Commit
3bde1a2e2ff4d72354c1729f9681711b83e38d26
Parent
4e49cbf03bb46ac…
2 files changed
+2
-1
+7
| --- tools/cvs2fossil/lib/c2f_option.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_option.tcl | ||
| @@ -40,14 +40,14 @@ | ||
| 40 | 40 | # --ignore-conflicting-attics |
| 41 | 41 | # --project |
| 42 | 42 | # -v, --verbose |
| 43 | 43 | # -q, --quiet |
| 44 | 44 | # --state (conversion status, ala config.cache) |
| 45 | + # --trunk-only | |
| 45 | 46 | |
| 46 | 47 | # -o, --output |
| 47 | 48 | # --dry-run |
| 48 | - # --trunk-only | |
| 49 | 49 | # --force-branch RE |
| 50 | 50 | # --force-tag RE |
| 51 | 51 | # --symbol-transform RE:XX |
| 52 | 52 | # --exclude |
| 53 | 53 | |
| @@ -71,10 +71,11 @@ | ||
| 71 | 71 | -v - |
| 72 | 72 | --verbose { log verbose } |
| 73 | 73 | -q - |
| 74 | 74 | --quiet { log quiet } |
| 75 | 75 | --state { state use [Value arguments] } |
| 76 | + --trunk-only { repository trunkonly! } | |
| 76 | 77 | default { |
| 77 | 78 | Usage $badoption$option\n$gethelp |
| 78 | 79 | } |
| 79 | 80 | } |
| 80 | 81 | } |
| 81 | 82 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -40,14 +40,14 @@ | |
| 40 | # --ignore-conflicting-attics |
| 41 | # --project |
| 42 | # -v, --verbose |
| 43 | # -q, --quiet |
| 44 | # --state (conversion status, ala config.cache) |
| 45 | |
| 46 | # -o, --output |
| 47 | # --dry-run |
| 48 | # --trunk-only |
| 49 | # --force-branch RE |
| 50 | # --force-tag RE |
| 51 | # --symbol-transform RE:XX |
| 52 | # --exclude |
| 53 | |
| @@ -71,10 +71,11 @@ | |
| 71 | -v - |
| 72 | --verbose { log verbose } |
| 73 | -q - |
| 74 | --quiet { log quiet } |
| 75 | --state { state use [Value arguments] } |
| 76 | default { |
| 77 | Usage $badoption$option\n$gethelp |
| 78 | } |
| 79 | } |
| 80 | } |
| 81 |
| --- tools/cvs2fossil/lib/c2f_option.tcl | |
| +++ tools/cvs2fossil/lib/c2f_option.tcl | |
| @@ -40,14 +40,14 @@ | |
| 40 | # --ignore-conflicting-attics |
| 41 | # --project |
| 42 | # -v, --verbose |
| 43 | # -q, --quiet |
| 44 | # --state (conversion status, ala config.cache) |
| 45 | # --trunk-only |
| 46 | |
| 47 | # -o, --output |
| 48 | # --dry-run |
| 49 | # --force-branch RE |
| 50 | # --force-tag RE |
| 51 | # --symbol-transform RE:XX |
| 52 | # --exclude |
| 53 | |
| @@ -71,10 +71,11 @@ | |
| 71 | -v - |
| 72 | --verbose { log verbose } |
| 73 | -q - |
| 74 | --quiet { log quiet } |
| 75 | --state { state use [Value arguments] } |
| 76 | --trunk-only { repository trunkonly! } |
| 77 | default { |
| 78 | Usage $badoption$option\n$gethelp |
| 79 | } |
| 80 | } |
| 81 | } |
| 82 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | ||
| @@ -49,10 +49,13 @@ | ||
| 49 | 49 | if {[lsearch -exact $myprojpaths $path] >= 0} return |
| 50 | 50 | lappend myprojpaths $path |
| 51 | 51 | return |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | + typemethod trunkonly! {} { set mytrunkonly 1 ; return } | |
| 55 | + typemethod trunkonly {} { return $mytrunkonly } | |
| 56 | + | |
| 54 | 57 | typemethod projects {} { |
| 55 | 58 | return [TheProjects] |
| 56 | 59 | } |
| 57 | 60 | |
| 58 | 61 | typemethod base? {} { return $mybase } |
| @@ -220,10 +223,14 @@ | ||
| 220 | 223 | typevariable mysymbol -array {} ; # Map symbols identified by |
| 221 | 224 | # project and name to their |
| 222 | 225 | # id. This information is not |
| 223 | 226 | # saved directly. |
| 224 | 227 | typevariable mysymbolcnt 0 ; # Counter for symbol ids. |
| 228 | + | |
| 229 | + typevariable mytrunkonly 0 ; # Boolean flag. Set by option | |
| 230 | + # processing when the user | |
| 231 | + # requested a trunk-only import | |
| 225 | 232 | |
| 226 | 233 | # # ## ### ##### ######## ############# |
| 227 | 234 | ## Internal methods |
| 228 | 235 | |
| 229 | 236 | proc .BaseLength {p} { |
| 230 | 237 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -49,10 +49,13 @@ | |
| 49 | if {[lsearch -exact $myprojpaths $path] >= 0} return |
| 50 | lappend myprojpaths $path |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | typemethod projects {} { |
| 55 | return [TheProjects] |
| 56 | } |
| 57 | |
| 58 | typemethod base? {} { return $mybase } |
| @@ -220,10 +223,14 @@ | |
| 220 | typevariable mysymbol -array {} ; # Map symbols identified by |
| 221 | # project and name to their |
| 222 | # id. This information is not |
| 223 | # saved directly. |
| 224 | typevariable mysymbolcnt 0 ; # Counter for symbol ids. |
| 225 | |
| 226 | # # ## ### ##### ######## ############# |
| 227 | ## Internal methods |
| 228 | |
| 229 | proc .BaseLength {p} { |
| 230 |
| --- tools/cvs2fossil/lib/c2f_repository.tcl | |
| +++ tools/cvs2fossil/lib/c2f_repository.tcl | |
| @@ -49,10 +49,13 @@ | |
| 49 | if {[lsearch -exact $myprojpaths $path] >= 0} return |
| 50 | lappend myprojpaths $path |
| 51 | return |
| 52 | } |
| 53 | |
| 54 | typemethod trunkonly! {} { set mytrunkonly 1 ; return } |
| 55 | typemethod trunkonly {} { return $mytrunkonly } |
| 56 | |
| 57 | typemethod projects {} { |
| 58 | return [TheProjects] |
| 59 | } |
| 60 | |
| 61 | typemethod base? {} { return $mybase } |
| @@ -220,10 +223,14 @@ | |
| 223 | typevariable mysymbol -array {} ; # Map symbols identified by |
| 224 | # project and name to their |
| 225 | # id. This information is not |
| 226 | # saved directly. |
| 227 | typevariable mysymbolcnt 0 ; # Counter for symbol ids. |
| 228 | |
| 229 | typevariable mytrunkonly 0 ; # Boolean flag. Set by option |
| 230 | # processing when the user |
| 231 | # requested a trunk-only import |
| 232 | |
| 233 | # # ## ### ##### ######## ############# |
| 234 | ## Internal methods |
| 235 | |
| 236 | proc .BaseLength {p} { |
| 237 |