294
set cmit $r_commit
295
296
if {[regexp {^0{40}$} $cmit]} {
297
- set abbr work
297
+ set commit_abbr work
298
} else {
299
- set abbr [string range $cmit 0 4]
299
+ set commit_abbr [string range $cmit 0 4]
300
}
301
302
- if {![catch {set ncmit $line_commit([expr {$lno - 1}])}]} {
303
- if {$ncmit eq $cmit} {
304
- set abbr { |}
302
+ set author_abbr {}
303
+ set a_name {}
304
+ catch {set a_name $header($cmit,author)}
305
+ while {$a_name ne {}} {
306
+ if {![regexp {^([[:upper:]])} $a_name _a]} break
307
+ append author_abbr $_a
308
+ unset _a
309
+ if {![regsub \
310
+ {^[[:upper:]][^\s]*\s+} \
311
+ $a_name {} a_name ]} break
312
+ }
313
+ if {$author_abbr eq {}} {
314
+ set author_abbr { |}
315
+ } else {
316
+ set author_abbr [string range $author_abbr 0 3]
317
+ while {[string length $author_abbr] < 4} {
318
+ set author_abbr " $author_abbr"
319
}
320
}
321
+ unset a_name
322
+
323
+ set first_lno $lno
324
+ while {
325
+ ![catch {set ncmit $line_commit([expr {$first_lno - 1}])}]
326
+ && $ncmit eq $cmit
327
+ } {
328
+ incr first_lno -1
329
+ }
330
331
while {$n > 0} {
332
set lno_e "$lno.0 lineend + 1c"
346
set line_file($lno) $file
347
348
$w_cgrp delete $lno.0 "$lno.0 lineend"
326
- $w_cgrp insert $lno.0 $abbr
327
- set abbr { |}
349
+ if {$lno == $first_lno} {
350
+ $w_cgrp insert $lno.0 $commit_abbr
351
+ } elseif {$lno == [expr {$first_lno + 1}]} {
352
+ $w_cgrp insert $lno.0 $author_abbr
353
+ } else {
354
+ $w_cgrp insert $lno.0 { |}
355
+ }
356
357
$w_cgrp tag add g$cmit $lno.0 $lno_e
358
$w_line tag add g$cmit $lno.0 $lno_e
376
incr blame_lines
377
}
378
351
- if {![catch {set ncmit $line_commit($lno)}]} {
352
- if {$ncmit eq $cmit} {
353
- $w_cgrp delete $lno.0 "$lno.0 lineend + 1c"
354
- $w_cgrp insert $lno.0 " |\n"
379
+ while {![catch {set ncmit $line_commit($lno)}]
380
+ && $ncmit eq $cmit} {
381
+ $w_cgrp delete $lno.0 "$lno.0 lineend"
382
+
383
+ if {$lno == $first_lno} {
384
+ $w_cgrp insert $lno.0 $commit_abbr
385
+ } elseif {$lno == [expr {$first_lno + 1}]} {
386
+ $w_cgrp insert $lno.0 $author_abbr
387
+ } else {
388
+ $w_cgrp insert $lno.0 { |}
389
}
390
+ incr lno
391
}
392
+
393
} elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} {
394
set header($r_commit,$key) $data
395
}