Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | `timeline' output is now strictly one line per checkin, even if `-showfiles' is specified. |
|---|---|
| Timelines: | family | ancestors | descendants | both | dresden |
| Files: | files | file ages | folders |
| SHA1: |
1626c88f0afa1b7d6731ccf941924154 |
| User & Date: | j 2013-07-24 16:43:41 |
Context
|
2013-07-24
| ||
| 17:04 | undo recently introduced bug and adjusted corrsponding comments a bit. check-in: 7e0ed090e2 user: j tags: dresden | |
| 16:43 | `timeline' output is now strictly one line per checkin, even if `-showfiles' is specified. check-in: 1626c88f0a user: j tags: dresden | |
| 14:27 | redefinition of some aliases. check-in: 7b6a25c3b1 user: j tags: dresden | |
Changes
Changes to fsl.
386 386 set record "[string trimright ${record}]${line}" 387 387 388 388 incr i 389 389 set line [lindex $records $i] 390 390 set line [string trimright $line] 391 391 } 392 392 } 393 - set record "[string trimright $record] \n" 393 + set record "[string trimright $record]" 394 394 395 395 # temporary patch (better strategy needed, probably). eliminate 396 396 # a blank in the used `regsub' pattern, which is assumed(!) to be caused by 397 397 # `fossil' treating `-' as word boundary (there might be other instances, 398 398 # actually, in the commit message itself): 399 399 regsub -all {([[:alnum:]])- ([[:alnum:]])} $record \\1-\\2 record 400 400 ................................................................................ 404 404 } 405 405 406 406 proc reformTimeline {records revnums} { 407 407 # -------------------------------------------------------- 408 408 # expected input: list of timeline entries as provided by 409 409 # `unwrapTimeline', i.e. either "date lines" or "commit" 410 410 # lines containing the whole commit including the commit 411 -# message. 411 +# message possibly followed by file status lines (if `-showfiles' is used). 412 412 # 413 413 # output: a list of newline terminated lines where the user/tags 414 414 # information is appended to the line containing the time and SHA1 415 415 # hash and the commit message is put on the following line(s) using an 416 416 # indent string `indent' and a line length `maxlen'. 417 417 # -------------------------------------------------------- 418 418 ................................................................................ 425 425 set out {} 426 426 set buf "" 427 427 set usertag "" 428 428 set rgxdate {^=== [0-9-]+ ===$} 429 429 set rgxtime {^\d\d:\d\d:\d\d} 430 430 set rgxrev {\[([a-f\d]{10})([^\]]*)\]} 431 431 set rgxuser {\(user: .*\)} 432 + #set rgxstat { ( (MERGED_WITH|ADDED|EDITED|DELETED|MISSING) [[:alnum:]]+)} 432 433 433 434 set maxrev [dict size $revnums] 434 435 435 436 foreach record $records { 436 - # temporarily get rid of the record/line terminating newline: 437 - set record "[string trimright $record]" 438 437 439 438 if {[regexp $rgxdate $record]} { 440 439 # the `date' information is extracted and then prepended to the suitable checkins 441 440 set date [regsub {(=== )(.*)( ===)} $record {\2}] 442 441 } elseif {[regexp $rgxrev $record]} { 443 442 # this line contains the checkin message: 444 443 regexp $rgxtime $record time ................................................................................ 478 477 set line $indent$word 479 478 set len [string length $line] 480 479 if {$wrdcnt < $wrdnum} { 481 480 set isAppended 1 482 481 } else {set isAppended 0} ;#since the loop stops _now_... 483 482 } 484 483 } 485 - if {$isAppended == 0} {lappend out $line\n} 484 + if {$isAppended == 0} {lappend out $line} 486 485 } else { 487 486 # should be a file status line as delivered by `-showfiles' (since 488 - # it is neither matching `rgxdate' nor `rgxrev') and is passed 489 - # through as is. 490 - lappend out \n$record 487 + # it is neither matching `rgxdate' nor `rgxrev'). append after 488 + # stripping white space and separate by appending a full stop. 489 + lappend out " [string trim $record]." 491 490 } 492 491 } 493 492 return [lappend out \n] 494 493 } 495 494 496 495 proc computeRevnums {params} { 497 496 #-----------------------------------------------------------------------