summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-01 05:04:46 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-06-06 05:26:44 (GMT)
commitc9e6bfd8a9a18c12d01e0d96c74ca0a7f64a2846 (patch)
tree5f0de16489a7c1ab123d100c0f4d8a43b687e7e3 /lib
parentf96cd7b6c9e9664d2fd6ec50bbade126355ad4f4 (diff)
downloadgit-c9e6bfd8a9a18c12d01e0d96c74ca0a7f64a2846.zip
git-c9e6bfd8a9a18c12d01e0d96c74ca0a7f64a2846.tar.gz
git-c9e6bfd8a9a18c12d01e0d96c74ca0a7f64a2846.tar.bz2
git-gui: Simplify consecutive lines that come from the same commit
If two consecutive lines in the final file came from the same commit then we store a "|" in the first column rather than the commit id, for the second and subsequent lines in that block. This cleans up the interface so runs associated with the same commit can be more easily seen visually. We also now use the abbreviation "work" for the uncommitted stuff in your working directory, rather than "0000". This looks nicer to the eyes and explains pretty quickly what is going on. There was also a minor bug in the commit abbreviation column for the last line of the file. This is now also fixed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/blame.tcl25
1 files changed, 22 insertions, 3 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index f48624a..8616009 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -267,7 +267,18 @@ method _read_blame {fd} {
set n $r_line_count
set lno $r_final_line
set cmit $r_commit
- set abbr [string range $cmit 0 4]
+
+ if {[regexp {^0{40}$} $cmit]} {
+ set abbr work
+ } else {
+ set abbr [string range $cmit 0 4]
+ }
+
+ if {![catch {set ncmit $line_commit([expr {$lno - 1}])}]} {
+ if {$ncmit eq $cmit} {
+ set abbr |
+ }
+ }
while {$n > 0} {
set lno_e "$lno.0 lineend + 1c"
@@ -286,8 +297,9 @@ method _read_blame {fd} {
set line_commit($lno) $cmit
set line_file($lno) $file
- $w_cgrp delete $lno.0 $lno_e
- $w_cgrp insert $lno.0 "$abbr\n"
+ $w_cgrp delete $lno.0 "$lno.0 lineend"
+ $w_cgrp insert $lno.0 $abbr
+ set abbr |
$w_cgrp tag add g$cmit $lno.0 $lno_e
$w_line tag add g$cmit $lno.0 $lno_e
@@ -311,6 +323,13 @@ method _read_blame {fd} {
incr blame_lines
}
+ if {![catch {set ncmit $line_commit($lno)}]} {
+ if {$ncmit eq $cmit} {
+ $w_cgrp delete $lno.0 "$lno.0 lineend + 1c"
+ $w_cgrp insert $lno.0 "|\n"
+ }
+ }
+
set hc $highlight_commit
if {$hc ne {}
&& [expr {$order($hc) + 1}] == $order($cmit)} {