Fossil SCM
Simplified the code for excluding non-trunk revisions a bit, using higher-level methods for some changes. Added missing revision destruction.
Commit
436f17a5f0a396584f9caffff3b92061b777b891
Parent
886b6f257bc784a…
2 files changed
+3
-7
+3
| --- tools/cvs2fossil/lib/c2f_file.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_file.tcl | ||
| @@ -662,10 +662,11 @@ | ||
| 662 | 662 | # Change the type of first (typically from Change to Add): |
| 663 | 663 | $first retype add |
| 664 | 664 | |
| 665 | 665 | # Move any tags and branches from the old to the new root. |
| 666 | 666 | $rev11 movesymbolsto $first |
| 667 | + $rev11 destroy | |
| 667 | 668 | } |
| 668 | 669 | |
| 669 | 670 | # Mark all the special revisions as such |
| 670 | 671 | foreach rev $revlist { |
| 671 | 672 | log write 3 file "Revision on default branch: [$rev revnr]" |
| @@ -941,17 +942,12 @@ | ||
| 941 | 942 | |
| 942 | 943 | set rev12 [$last defaultbranchchild] |
| 943 | 944 | $rev12 cutdefaultbranchparent |
| 944 | 945 | $last cutdefaultbranchchild |
| 945 | 946 | |
| 946 | - # TODO :: Combine into one method 'changeparent', or | |
| 947 | - # 'moveparent', etc. | |
| 948 | - $rev12 cutfromparent | |
| 949 | - $rev12 setparent $last | |
| 950 | - | |
| 951 | - $last cutfromchild | |
| 952 | - $last setchild $rev12 | |
| 947 | + $rev12 changeparent $last | |
| 948 | + $last changechild $rev12 | |
| 953 | 949 | |
| 954 | 950 | ldelete myroots $rev12 |
| 955 | 951 | |
| 956 | 952 | # Note and remember that the type of rev12 was already |
| 957 | 953 | # adjusted by AdjustNonTrunkDefaultBranch, so we don't |
| 958 | 954 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -662,10 +662,11 @@ | |
| 662 | # Change the type of first (typically from Change to Add): |
| 663 | $first retype add |
| 664 | |
| 665 | # Move any tags and branches from the old to the new root. |
| 666 | $rev11 movesymbolsto $first |
| 667 | } |
| 668 | |
| 669 | # Mark all the special revisions as such |
| 670 | foreach rev $revlist { |
| 671 | log write 3 file "Revision on default branch: [$rev revnr]" |
| @@ -941,17 +942,12 @@ | |
| 941 | |
| 942 | set rev12 [$last defaultbranchchild] |
| 943 | $rev12 cutdefaultbranchparent |
| 944 | $last cutdefaultbranchchild |
| 945 | |
| 946 | # TODO :: Combine into one method 'changeparent', or |
| 947 | # 'moveparent', etc. |
| 948 | $rev12 cutfromparent |
| 949 | $rev12 setparent $last |
| 950 | |
| 951 | $last cutfromchild |
| 952 | $last setchild $rev12 |
| 953 | |
| 954 | ldelete myroots $rev12 |
| 955 | |
| 956 | # Note and remember that the type of rev12 was already |
| 957 | # adjusted by AdjustNonTrunkDefaultBranch, so we don't |
| 958 |
| --- tools/cvs2fossil/lib/c2f_file.tcl | |
| +++ tools/cvs2fossil/lib/c2f_file.tcl | |
| @@ -662,10 +662,11 @@ | |
| 662 | # Change the type of first (typically from Change to Add): |
| 663 | $first retype add |
| 664 | |
| 665 | # Move any tags and branches from the old to the new root. |
| 666 | $rev11 movesymbolsto $first |
| 667 | $rev11 destroy |
| 668 | } |
| 669 | |
| 670 | # Mark all the special revisions as such |
| 671 | foreach rev $revlist { |
| 672 | log write 3 file "Revision on default branch: [$rev revnr]" |
| @@ -941,17 +942,12 @@ | |
| 942 | |
| 943 | set rev12 [$last defaultbranchchild] |
| 944 | $rev12 cutdefaultbranchparent |
| 945 | $last cutdefaultbranchchild |
| 946 | |
| 947 | $rev12 changeparent $last |
| 948 | $last changechild $rev12 |
| 949 | |
| 950 | ldelete myroots $rev12 |
| 951 | |
| 952 | # Note and remember that the type of rev12 was already |
| 953 | # adjusted by AdjustNonTrunkDefaultBranch, so we don't |
| 954 |
| --- tools/cvs2fossil/lib/c2f_frev.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_frev.tcl | ||
| @@ -124,10 +124,13 @@ | ||
| 124 | 124 | method setchild {child} { |
| 125 | 125 | if {$mychild ne ""} { trouble internal "Child already defined" } |
| 126 | 126 | set mychild $child |
| 127 | 127 | return |
| 128 | 128 | } |
| 129 | + | |
| 130 | + method changeparent {parent} { set myparent $parent ; return } | |
| 131 | + method changechild {child} { set mychild $child ; return } | |
| 129 | 132 | |
| 130 | 133 | method parent {} { return $myparent } |
| 131 | 134 | method child {} { return $mychild } |
| 132 | 135 | |
| 133 | 136 | # Branch linkage ______________________ |
| 134 | 137 |
| --- tools/cvs2fossil/lib/c2f_frev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_frev.tcl | |
| @@ -124,10 +124,13 @@ | |
| 124 | method setchild {child} { |
| 125 | if {$mychild ne ""} { trouble internal "Child already defined" } |
| 126 | set mychild $child |
| 127 | return |
| 128 | } |
| 129 | |
| 130 | method parent {} { return $myparent } |
| 131 | method child {} { return $mychild } |
| 132 | |
| 133 | # Branch linkage ______________________ |
| 134 |
| --- tools/cvs2fossil/lib/c2f_frev.tcl | |
| +++ tools/cvs2fossil/lib/c2f_frev.tcl | |
| @@ -124,10 +124,13 @@ | |
| 124 | method setchild {child} { |
| 125 | if {$mychild ne ""} { trouble internal "Child already defined" } |
| 126 | set mychild $child |
| 127 | return |
| 128 | } |
| 129 | |
| 130 | method changeparent {parent} { set myparent $parent ; return } |
| 131 | method changechild {child} { set mychild $child ; return } |
| 132 | |
| 133 | method parent {} { return $myparent } |
| 134 | method child {} { return $mychild } |
| 135 | |
| 136 | # Branch linkage ______________________ |
| 137 |