Fossil SCM
Fix extraction of memory data from the log, pipe symbol is special.
Commit
cff018520068b2243fc4a335743f455d824e70af
Parent
efec424a194ee41…
1 file changed
+3
-3
| --- tools/cvs2fossil/getmemoryseries.tcl | ||
| +++ tools/cvs2fossil/getmemoryseries.tcl | ||
| @@ -13,23 +13,23 @@ | ||
| 13 | 13 | puts $mr "\# Time Memory" |
| 14 | 14 | |
| 15 | 15 | set k 0 |
| 16 | 16 | while {![eof $in]} { |
| 17 | 17 | gets $in line |
| 18 | - puts -nonewline \r[incr k] | |
| 18 | + #puts -nonewline \r[incr k] | |
| 19 | 19 | |
| 20 | 20 | if {[string match *|=|* $line]} { |
| 21 | 21 | # Basic series |
| 22 | - regexp {^(.*)|=|} $line -> line | |
| 22 | + regexp {^(.*)\|=\|} $line -> line | |
| 23 | 23 | foreach {x _ cba _ _ _ mba} $line break |
| 24 | 24 | puts $ba [join [list $x $cba $mba] \t] |
| 25 | 25 | continue |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | if {[string match *|@|* $line]} { |
| 29 | 29 | # Marker series |
| 30 | - regexp {^(.*)|@|} $line -> line | |
| 30 | + regexp {^(.*)\|@\|} $line -> line | |
| 31 | 31 | foreach {x _ cba} $line break |
| 32 | 32 | puts $mr [join [list $x $cba] \t] |
| 33 | 33 | continue |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 |
| --- tools/cvs2fossil/getmemoryseries.tcl | |
| +++ tools/cvs2fossil/getmemoryseries.tcl | |
| @@ -13,23 +13,23 @@ | |
| 13 | puts $mr "\# Time Memory" |
| 14 | |
| 15 | set k 0 |
| 16 | while {![eof $in]} { |
| 17 | gets $in line |
| 18 | puts -nonewline \r[incr k] |
| 19 | |
| 20 | if {[string match *|=|* $line]} { |
| 21 | # Basic series |
| 22 | regexp {^(.*)|=|} $line -> line |
| 23 | foreach {x _ cba _ _ _ mba} $line break |
| 24 | puts $ba [join [list $x $cba $mba] \t] |
| 25 | continue |
| 26 | } |
| 27 | |
| 28 | if {[string match *|@|* $line]} { |
| 29 | # Marker series |
| 30 | regexp {^(.*)|@|} $line -> line |
| 31 | foreach {x _ cba} $line break |
| 32 | puts $mr [join [list $x $cba] \t] |
| 33 | continue |
| 34 | } |
| 35 | } |
| 36 |
| --- tools/cvs2fossil/getmemoryseries.tcl | |
| +++ tools/cvs2fossil/getmemoryseries.tcl | |
| @@ -13,23 +13,23 @@ | |
| 13 | puts $mr "\# Time Memory" |
| 14 | |
| 15 | set k 0 |
| 16 | while {![eof $in]} { |
| 17 | gets $in line |
| 18 | #puts -nonewline \r[incr k] |
| 19 | |
| 20 | if {[string match *|=|* $line]} { |
| 21 | # Basic series |
| 22 | regexp {^(.*)\|=\|} $line -> line |
| 23 | foreach {x _ cba _ _ _ mba} $line break |
| 24 | puts $ba [join [list $x $cba $mba] \t] |
| 25 | continue |
| 26 | } |
| 27 | |
| 28 | if {[string match *|@|* $line]} { |
| 29 | # Marker series |
| 30 | regexp {^(.*)\|@\|} $line -> line |
| 31 | foreach {x _ cba} $line break |
| 32 | puts $mr [join [list $x $cba] \t] |
| 33 | continue |
| 34 | } |
| 35 | } |
| 36 |