Index: fsl ================================================================== --- fsl +++ fsl @@ -388,11 +388,11 @@ incr i set line [lindex $records $i] set line [string trimright $line] } } - set record "[string trimright $record] \n" + set record "[string trimright $record]" # temporary patch (better strategy needed, probably). eliminate # a blank in the used `regsub' pattern, which is assumed(!) to be caused by # `fossil' treating `-' as word boundary (there might be other instances, # actually, in the commit message itself): @@ -406,11 +406,11 @@ proc reformTimeline {records revnums} { # -------------------------------------------------------- # expected input: list of timeline entries as provided by # `unwrapTimeline', i.e. either "date lines" or "commit" # lines containing the whole commit including the commit -# message. +# message possibly followed by file status lines (if `-showfiles' is used). # # output: a list of newline terminated lines where the user/tags # information is appended to the line containing the time and SHA1 # hash and the commit message is put on the following line(s) using an # indent string `indent' and a line length `maxlen'. @@ -427,16 +427,15 @@ set usertag "" set rgxdate {^=== [0-9-]+ ===$} set rgxtime {^\d\d:\d\d:\d\d} set rgxrev {\[([a-f\d]{10})([^\]]*)\]} set rgxuser {\(user: .*\)} + #set rgxstat { ( (MERGED_WITH|ADDED|EDITED|DELETED|MISSING) [[:alnum:]]+)} set maxrev [dict size $revnums] foreach record $records { - # temporarily get rid of the record/line terminating newline: - set record "[string trimright $record]" if {[regexp $rgxdate $record]} { # the `date' information is extracted and then prepended to the suitable checkins set date [regsub {(=== )(.*)( ===)} $record {\2}] } elseif {[regexp $rgxrev $record]} { @@ -480,16 +479,16 @@ if {$wrdcnt < $wrdnum} { set isAppended 1 } else {set isAppended 0} ;#since the loop stops _now_... } } - if {$isAppended == 0} {lappend out $line\n} + if {$isAppended == 0} {lappend out $line} } else { # should be a file status line as delivered by `-showfiles' (since - # it is neither matching `rgxdate' nor `rgxrev') and is passed - # through as is. - lappend out \n$record + # it is neither matching `rgxdate' nor `rgxrev'). append after + # stripping white space and separate by appending a full stop. + lappend out " [string trim $record]." } } return [lappend out \n] }