Fossil SCM
Remember #commits to a workspace (= lod), and also their parental relationship. This will be used to control branch tagging (add/cancel), and provides us with the proper names for the tags as well.
Commit
011fb38dda2194b63ac19adcfd5c5c8a3d2a9d2c
Parent
99004d57a316634…
2 files changed
+3
-2
+16
-2
| --- tools/cvs2fossil/lib/c2f_ristate.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_ristate.tcl | ||
| @@ -57,12 +57,13 @@ | ||
| 57 | 57 | [info exists mystate($parentlod)] |
| 58 | 58 | } {Trying to inherit from undefined lod "$parentlod"} |
| 59 | 59 | |
| 60 | 60 | set pwss $mystate($parentlod) |
| 61 | 61 | |
| 62 | - $wss defstate [$pwss getstate] | |
| 63 | - $wss defid [$pwss getid] | |
| 62 | + $wss defstate [$pwss getstate] | |
| 63 | + $wss defid [$pwss getid] | |
| 64 | + $wss defparent $pwss | |
| 64 | 65 | } |
| 65 | 66 | |
| 66 | 67 | return $wss |
| 67 | 68 | } |
| 68 | 69 | |
| 69 | 70 |
| --- tools/cvs2fossil/lib/c2f_ristate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_ristate.tcl | |
| @@ -57,12 +57,13 @@ | |
| 57 | [info exists mystate($parentlod)] |
| 58 | } {Trying to inherit from undefined lod "$parentlod"} |
| 59 | |
| 60 | set pwss $mystate($parentlod) |
| 61 | |
| 62 | $wss defstate [$pwss getstate] |
| 63 | $wss defid [$pwss getid] |
| 64 | } |
| 65 | |
| 66 | return $wss |
| 67 | } |
| 68 | |
| 69 |
| --- tools/cvs2fossil/lib/c2f_ristate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_ristate.tcl | |
| @@ -57,12 +57,13 @@ | |
| 57 | [info exists mystate($parentlod)] |
| 58 | } {Trying to inherit from undefined lod "$parentlod"} |
| 59 | |
| 60 | set pwss $mystate($parentlod) |
| 61 | |
| 62 | $wss defstate [$pwss getstate] |
| 63 | $wss defid [$pwss getid] |
| 64 | $wss defparent $pwss |
| 65 | } |
| 66 | |
| 67 | return $wss |
| 68 | } |
| 69 | |
| 70 |
+16
-2
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | ||
| @@ -29,15 +29,18 @@ | ||
| 29 | 29 | # # ## ### ##### ######## ############# |
| 30 | 30 | ## Public API |
| 31 | 31 | |
| 32 | 32 | constructor {lod} { |
| 33 | 33 | # Start with an empty state |
| 34 | - set myname $lod | |
| 34 | + set myname $lod | |
| 35 | + set myticks 0 | |
| 36 | + set myparent {} | |
| 35 | 37 | return |
| 36 | 38 | } |
| 37 | 39 | |
| 38 | - method name {} { return $myname } | |
| 40 | + method name {} { return $myname } | |
| 41 | + method ticks {} { return $myticks } | |
| 39 | 42 | |
| 40 | 43 | method add {oprevisioninfo} { |
| 41 | 44 | # oprevisioninfo = list (rid path label op ...) /quadruples |
| 42 | 45 | |
| 43 | 46 | # Overwrite all changed files (identified by path) with the |
| @@ -55,10 +58,12 @@ | ||
| 55 | 58 | } |
| 56 | 59 | } else { |
| 57 | 60 | set mystate($path) [list $rid $label] |
| 58 | 61 | } |
| 59 | 62 | } |
| 63 | + | |
| 64 | + incr myticks | |
| 60 | 65 | return |
| 61 | 66 | } |
| 62 | 67 | |
| 63 | 68 | method get {} { |
| 64 | 69 | set res {} |
| @@ -76,10 +81,16 @@ | ||
| 76 | 81 | |
| 77 | 82 | method getid {} { return $myid } |
| 78 | 83 | |
| 79 | 84 | method defstate {s} { array set mystate $s ; return } |
| 80 | 85 | method getstate {} { return [array get mystate] } |
| 86 | + | |
| 87 | + method parent {} { return $myparent } | |
| 88 | + method defparent {parent} { | |
| 89 | + set myparent $parent | |
| 90 | + return | |
| 91 | + } | |
| 81 | 92 | |
| 82 | 93 | # # ## ### ##### ######## ############# |
| 83 | 94 | ## State |
| 84 | 95 | |
| 85 | 96 | variable myname {} ; # Name of the LOD the workspace is |
| @@ -87,10 +98,13 @@ | ||
| 87 | 98 | variable myid {} ; # Record id of the fossil manifest |
| 88 | 99 | # associated with the current state. |
| 89 | 100 | variable mystate -array {} ; # Map from paths to the recordid of |
| 90 | 101 | # the file revision behind it, and |
| 91 | 102 | # the associated label for logging. |
| 103 | + variable myticks 0 ; # Number of 'add' operations | |
| 104 | + # performed on the state. | |
| 105 | + variable myparent {} ; # Reference to the parent workspace. | |
| 92 | 106 | |
| 93 | 107 | typevariable myop -array { |
| 94 | 108 | -1 REM |
| 95 | 109 | 0 --- |
| 96 | 110 | 1 ADD |
| 97 | 111 |
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| @@ -29,15 +29,18 @@ | |
| 29 | # # ## ### ##### ######## ############# |
| 30 | ## Public API |
| 31 | |
| 32 | constructor {lod} { |
| 33 | # Start with an empty state |
| 34 | set myname $lod |
| 35 | return |
| 36 | } |
| 37 | |
| 38 | method name {} { return $myname } |
| 39 | |
| 40 | method add {oprevisioninfo} { |
| 41 | # oprevisioninfo = list (rid path label op ...) /quadruples |
| 42 | |
| 43 | # Overwrite all changed files (identified by path) with the |
| @@ -55,10 +58,12 @@ | |
| 55 | } |
| 56 | } else { |
| 57 | set mystate($path) [list $rid $label] |
| 58 | } |
| 59 | } |
| 60 | return |
| 61 | } |
| 62 | |
| 63 | method get {} { |
| 64 | set res {} |
| @@ -76,10 +81,16 @@ | |
| 76 | |
| 77 | method getid {} { return $myid } |
| 78 | |
| 79 | method defstate {s} { array set mystate $s ; return } |
| 80 | method getstate {} { return [array get mystate] } |
| 81 | |
| 82 | # # ## ### ##### ######## ############# |
| 83 | ## State |
| 84 | |
| 85 | variable myname {} ; # Name of the LOD the workspace is |
| @@ -87,10 +98,13 @@ | |
| 87 | variable myid {} ; # Record id of the fossil manifest |
| 88 | # associated with the current state. |
| 89 | variable mystate -array {} ; # Map from paths to the recordid of |
| 90 | # the file revision behind it, and |
| 91 | # the associated label for logging. |
| 92 | |
| 93 | typevariable myop -array { |
| 94 | -1 REM |
| 95 | 0 --- |
| 96 | 1 ADD |
| 97 |
| --- tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| +++ tools/cvs2fossil/lib/c2f_wsstate.tcl | |
| @@ -29,15 +29,18 @@ | |
| 29 | # # ## ### ##### ######## ############# |
| 30 | ## Public API |
| 31 | |
| 32 | constructor {lod} { |
| 33 | # Start with an empty state |
| 34 | set myname $lod |
| 35 | set myticks 0 |
| 36 | set myparent {} |
| 37 | return |
| 38 | } |
| 39 | |
| 40 | method name {} { return $myname } |
| 41 | method ticks {} { return $myticks } |
| 42 | |
| 43 | method add {oprevisioninfo} { |
| 44 | # oprevisioninfo = list (rid path label op ...) /quadruples |
| 45 | |
| 46 | # Overwrite all changed files (identified by path) with the |
| @@ -55,10 +58,12 @@ | |
| 58 | } |
| 59 | } else { |
| 60 | set mystate($path) [list $rid $label] |
| 61 | } |
| 62 | } |
| 63 | |
| 64 | incr myticks |
| 65 | return |
| 66 | } |
| 67 | |
| 68 | method get {} { |
| 69 | set res {} |
| @@ -76,10 +81,16 @@ | |
| 81 | |
| 82 | method getid {} { return $myid } |
| 83 | |
| 84 | method defstate {s} { array set mystate $s ; return } |
| 85 | method getstate {} { return [array get mystate] } |
| 86 | |
| 87 | method parent {} { return $myparent } |
| 88 | method defparent {parent} { |
| 89 | set myparent $parent |
| 90 | return |
| 91 | } |
| 92 | |
| 93 | # # ## ### ##### ######## ############# |
| 94 | ## State |
| 95 | |
| 96 | variable myname {} ; # Name of the LOD the workspace is |
| @@ -87,10 +98,13 @@ | |
| 98 | variable myid {} ; # Record id of the fossil manifest |
| 99 | # associated with the current state. |
| 100 | variable mystate -array {} ; # Map from paths to the recordid of |
| 101 | # the file revision behind it, and |
| 102 | # the associated label for logging. |
| 103 | variable myticks 0 ; # Number of 'add' operations |
| 104 | # performed on the state. |
| 105 | variable myparent {} ; # Reference to the parent workspace. |
| 106 | |
| 107 | typevariable myop -array { |
| 108 | -1 REM |
| 109 | 0 --- |
| 110 | 1 ADD |
| 111 |