diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-06 22:01:01 +0000 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-12-06 22:01:01 +0000 |
| commit | 88b21c2a407833a66f9aeb650f5b96c672691ecf (patch) | |
| tree | ce7b370c945be0ced6022c6e91ad5c375a7772bd | |
| parent | git-gui: Fix use of renamed tag. (diff) | |
| download | git-88b21c2a407833a66f9aeb650f5b96c672691ecf.tar.gz git-88b21c2a407833a66f9aeb650f5b96c672691ecf.zip | |
git-gui: Fix use of hunk tag for non-hunk content.
The hunk tag d_@ lost its blue forground color in "apply color information
from git diff output" (2010-10-22, 8f85599). But this tag was also used
for non-hunk content like untracked file mime types or git submodules.
Introduce a new tag for this type of content which has the blue forground
again.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to '')
| -rwxr-xr-x | git-gui.sh | 2 | ||||
| -rw-r--r-- | lib/diff.tcl | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/git-gui.sh b/git-gui.sh index 38362fa940..c85a53c065 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3331,6 +3331,8 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr } $ui_diff tag configure clr1 -font font_diffbold +$ui_diff tag conf d_info -foreground blue -font font_diffbold + $ui_diff tag conf d_cr -elide true $ui_diff tag conf d_@ -font font_diffbold $ui_diff tag conf d_+ -foreground {#00a000} diff --git a/lib/diff.tcl b/lib/diff.tcl index 7b1fddf490..9d0dc07d7b 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -208,32 +208,32 @@ proc show_other_diff {path w m cont_info} { $ui_diff insert end [append \ "* " \ [mc "Git Repository (subproject)"] \ - "\n"] d_@ + "\n"] d_info } elseif {![catch {set type [exec file $path]}]} { set n [string length $path] if {[string equal -length $n $path $type]} { set type [string range $type $n end] regsub {^:?\s*} $type {} type } - $ui_diff insert end "* $type\n" d_@ + $ui_diff insert end "* $type\n" d_info } if {[string first "\0" $content] != -1} { $ui_diff insert end \ [mc "* Binary file (not showing content)."] \ - d_@ + d_info } else { if {$sz > $max_sz} { $ui_diff insert end [mc \ "* Untracked file is %d bytes. * Showing only first %d bytes. -" $sz $max_sz] d_@ +" $sz $max_sz] d_info } $ui_diff insert end $content if {$sz > $max_sz} { $ui_diff insert end [mc " * Untracked file clipped here by %s. * To see the entire file, use an external editor. -" [appname]] d_@ +" [appname]] d_info } } $ui_diff conf -state disabled @@ -442,10 +442,10 @@ proc read_diff {fd conflict_size cont_info} { } elseif {$is_submodule_diff} { if {$line == ""} continue if {[regexp {^Submodule } $line]} { - set tags d_@ + set tags d_info } elseif {[regexp {^\* } $line]} { set line [string replace $line 0 1 {Submodule }] - set tags d_@ + set tags d_info } else { set op [string range $line 0 2] switch -- $op { |