Fossil SCM
Report destination file for repository, and fix bug with the naming of the destination triggered when importing a repository in toto.
Commit
0d02fe6c7a8ed0f08e3eced93cc47a2235792c26
Parent
c1dc8701efc30ab…
2 files changed
+2
+7
-1
| --- tools/cvs2fossil/lib/c2f_fossil.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_fossil.tcl | ||
| @@ -140,10 +140,12 @@ | ||
| 140 | 140 | Do rebuild [::file nativename $myrepository] |
| 141 | 141 | |
| 142 | 142 | ::file rename -force $myrepository $destination |
| 143 | 143 | ::file delete -force $myworkspace |
| 144 | 144 | $self destroy |
| 145 | + | |
| 146 | + log write 2 fossil {destination $destination} | |
| 145 | 147 | return |
| 146 | 148 | } |
| 147 | 149 | |
| 148 | 150 | # # ## ### ##### ######## ############# |
| 149 | 151 | ## |
| 150 | 152 |
| --- tools/cvs2fossil/lib/c2f_fossil.tcl | |
| +++ tools/cvs2fossil/lib/c2f_fossil.tcl | |
| @@ -140,10 +140,12 @@ | |
| 140 | Do rebuild [::file nativename $myrepository] |
| 141 | |
| 142 | ::file rename -force $myrepository $destination |
| 143 | ::file delete -force $myworkspace |
| 144 | $self destroy |
| 145 | return |
| 146 | } |
| 147 | |
| 148 | # # ## ### ##### ######## ############# |
| 149 | ## |
| 150 |
| --- tools/cvs2fossil/lib/c2f_fossil.tcl | |
| +++ tools/cvs2fossil/lib/c2f_fossil.tcl | |
| @@ -140,10 +140,12 @@ | |
| 140 | Do rebuild [::file nativename $myrepository] |
| 141 | |
| 142 | ::file rename -force $myrepository $destination |
| 143 | ::file delete -force $myworkspace |
| 144 | $self destroy |
| 145 | |
| 146 | log write 2 fossil {destination $destination} |
| 147 | return |
| 148 | } |
| 149 | |
| 150 | # # ## ### ##### ######## ############# |
| 151 | ## |
| 152 |
| --- tools/cvs2fossil/lib/c2f_pimport.tcl | ||
| +++ tools/cvs2fossil/lib/c2f_pimport.tcl | ||
| @@ -103,11 +103,17 @@ | ||
| 103 | 103 | $rstate destroy |
| 104 | 104 | |
| 105 | 105 | # At last copy the temporary repository file to its final |
| 106 | 106 | # destination and release the associated memory. |
| 107 | 107 | |
| 108 | - $fossil finalize [$project base].fsl | |
| 108 | + set destination [$project base] | |
| 109 | + if {$destination eq ""} { | |
| 110 | + set destination [file tail [repository base?]] | |
| 111 | + } | |
| 112 | + append destination .fsl | |
| 113 | + | |
| 114 | + $fossil finalize $destination | |
| 109 | 115 | } |
| 110 | 116 | |
| 111 | 117 | # This does not live beyond the pass. We use the state for the |
| 112 | 118 | # data despite its transient nature to keep the memory |
| 113 | 119 | # requirements down. |
| 114 | 120 |
| --- tools/cvs2fossil/lib/c2f_pimport.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pimport.tcl | |
| @@ -103,11 +103,17 @@ | |
| 103 | $rstate destroy |
| 104 | |
| 105 | # At last copy the temporary repository file to its final |
| 106 | # destination and release the associated memory. |
| 107 | |
| 108 | $fossil finalize [$project base].fsl |
| 109 | } |
| 110 | |
| 111 | # This does not live beyond the pass. We use the state for the |
| 112 | # data despite its transient nature to keep the memory |
| 113 | # requirements down. |
| 114 |
| --- tools/cvs2fossil/lib/c2f_pimport.tcl | |
| +++ tools/cvs2fossil/lib/c2f_pimport.tcl | |
| @@ -103,11 +103,17 @@ | |
| 103 | $rstate destroy |
| 104 | |
| 105 | # At last copy the temporary repository file to its final |
| 106 | # destination and release the associated memory. |
| 107 | |
| 108 | set destination [$project base] |
| 109 | if {$destination eq ""} { |
| 110 | set destination [file tail [repository base?]] |
| 111 | } |
| 112 | append destination .fsl |
| 113 | |
| 114 | $fossil finalize $destination |
| 115 | } |
| 116 | |
| 117 | # This does not live beyond the pass. We use the state for the |
| 118 | # data despite its transient nature to keep the memory |
| 119 | # requirements down. |
| 120 |