Fossil SCM
Disabled check for control characters in the log message. Allowing this for the moment, lets see if we run into trouble later on. Further reworked the check of symbol names, disallow forward slashs only at end. Found legal tags containing forward slashs in the middle.
Commit
fa643aa91d93c6c3ffeb44dd14e267db8c8139cf
Parent
e94b52b6f2fd7a5…
1 file changed
+6
-3
| --- tools/cvs2fossil/lib/rcsparser.tcl | ||
| +++ tools/cvs2fossil/lib/rcsparser.tcl | ||
| @@ -76,11 +76,14 @@ | ||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | proc Symbols {} { |
| 79 | 79 | RequiredLiteral symbols |
| 80 | 80 | while {[Ident -> symbol]} { |
| 81 | - if {*$} $symbol]} { | |
| 81 | + if { | |
| 82 | + *$} $symbol] || | |
| 83 | + [string match */ $symbol] | |
| 84 | + } { | |
| 82 | 85 | Rewind |
| 83 | 86 | Bad {symbol name} |
| 84 | 87 | } |
| 85 | 88 | RequiredNumber -> rev |
| 86 | 89 | Call deftag $symbol $rev |
| @@ -220,12 +223,12 @@ | ||
| 220 | 223 | proc DeltaTexts {} { |
| 221 | 224 | while {[OptionalNumber -> rev]} { |
| 222 | 225 | RequiredLiteral log |
| 223 | 226 | RequiredString -> cmsg |
| 224 | 227 | if {[regexp {[\000-\010\013\014\016-\037]} $cmsg]} { |
| 225 | - Rewind | |
| 226 | - Bad "log message for $rev contains at least one control character" | |
| 228 | + #Rewind | |
| 229 | + #Bad "log message for $rev contains at least one control character" | |
| 227 | 230 | } |
| 228 | 231 | |
| 229 | 232 | RequiredLiteral text |
| 230 | 233 | RequiredStringRange -> delta |
| 231 | 234 | Call extend $rev $cmsg $delta |
| 232 | 235 |
| --- tools/cvs2fossil/lib/rcsparser.tcl | |
| +++ tools/cvs2fossil/lib/rcsparser.tcl | |
| @@ -76,11 +76,14 @@ | |
| 76 | } |
| 77 | |
| 78 | proc Symbols {} { |
| 79 | RequiredLiteral symbols |
| 80 | while {[Ident -> symbol]} { |
| 81 | if {*$} $symbol]} { |
| 82 | Rewind |
| 83 | Bad {symbol name} |
| 84 | } |
| 85 | RequiredNumber -> rev |
| 86 | Call deftag $symbol $rev |
| @@ -220,12 +223,12 @@ | |
| 220 | proc DeltaTexts {} { |
| 221 | while {[OptionalNumber -> rev]} { |
| 222 | RequiredLiteral log |
| 223 | RequiredString -> cmsg |
| 224 | if {[regexp {[\000-\010\013\014\016-\037]} $cmsg]} { |
| 225 | Rewind |
| 226 | Bad "log message for $rev contains at least one control character" |
| 227 | } |
| 228 | |
| 229 | RequiredLiteral text |
| 230 | RequiredStringRange -> delta |
| 231 | Call extend $rev $cmsg $delta |
| 232 |
| --- tools/cvs2fossil/lib/rcsparser.tcl | |
| +++ tools/cvs2fossil/lib/rcsparser.tcl | |
| @@ -76,11 +76,14 @@ | |
| 76 | } |
| 77 | |
| 78 | proc Symbols {} { |
| 79 | RequiredLiteral symbols |
| 80 | while {[Ident -> symbol]} { |
| 81 | if { |
| 82 | *$} $symbol] || |
| 83 | [string match */ $symbol] |
| 84 | } { |
| 85 | Rewind |
| 86 | Bad {symbol name} |
| 87 | } |
| 88 | RequiredNumber -> rev |
| 89 | Call deftag $symbol $rev |
| @@ -220,12 +223,12 @@ | |
| 223 | proc DeltaTexts {} { |
| 224 | while {[OptionalNumber -> rev]} { |
| 225 | RequiredLiteral log |
| 226 | RequiredString -> cmsg |
| 227 | if {[regexp {[\000-\010\013\014\016-\037]} $cmsg]} { |
| 228 | #Rewind |
| 229 | #Bad "log message for $rev contains at least one control character" |
| 230 | } |
| 231 | |
| 232 | RequiredLiteral text |
| 233 | RequiredStringRange -> delta |
| 234 | Call extend $rev $cmsg $delta |
| 235 |