{"thread":{"id":"25867","subject":"[PATCH] Fix use of hunk tag for non-hunk content.","startedAt":"2010-11-29T11:41:52Z","lastAt":"2010-12-06T21:25:43Z","messageCount":2,"participants":["Bert Wesarg","Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156798","messageId":"02730a5b5e904409da58c7f5ebe40e16e7adc1f1.1291019649.git.bert.wesarg@googlemail.com","threadId":"25867","inReplyTo":null,"subject":"[PATCH] Fix use of hunk tag for non-hunk content.","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-11-29T11:41:52Z","receivedAt":"2010-11-29T11:41:52Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"The hunk tag d_@ lost its blue forground color in \"apply color information\nfrom git diff output\" (2010-10-22, 8f85599). But this tag was also used\nfor non-hunk content like untracked file mime types or git submodules.\n\nIntroduce a new tag for this type of content which has the blue forground\nagain.\n\nSigned-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n---\n git-gui.sh   |    2 ++\n lib/diff.tcl |   14 +++++++-------\n 2 files changed, 9 insertions(+), 7 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 38362fa..c85a53c 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -3331,6 +3331,8 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr\n }\n $ui_diff tag configure clr1 -font font_diffbold\n \n+$ui_diff tag conf d_info -foreground blue -font font_diffbold\n+\n $ui_diff tag conf d_cr -elide true\n $ui_diff tag conf d_@ -font font_diffbold\n $ui_diff tag conf d_+ -foreground {#00a000}\ndiff --git a/lib/diff.tcl b/lib/diff.tcl\nindex 8fea947..8435635 100644\n--- a/lib/diff.tcl\n+++ b/lib/diff.tcl\n@@ -208,32 +208,32 @@ proc show_other_diff {path w m cont_info} {\n \t\t\t$ui_diff insert end [append \\\n \t\t\t\t\"* \" \\\n \t\t\t\t[mc \"Git Repository (subproject)\"] \\\n-\t\t\t\t\"\\n\"] d_@\n+\t\t\t\t\"\\n\"] d_info\n \t\t} elseif {![catch {set type [exec file $path]}]} {\n \t\t\tset n [string length $path]\n \t\t\tif {[string equal -length $n $path $type]} {\n \t\t\t\tset type [string range $type $n end]\n \t\t\t\tregsub {^:?\\s*} $type {} type\n \t\t\t}\n-\t\t\t$ui_diff insert end \"* $type\\n\" d_@\n+\t\t\t$ui_diff insert end \"* $type\\n\" d_info\n \t\t}\n \t\tif {[string first \"\\0\" $content] != -1} {\n \t\t\t$ui_diff insert end \\\n \t\t\t\t[mc \"* Binary file (not showing content).\"] \\\n-\t\t\t\td_@\n+\t\t\t\td_info\n \t\t} else {\n \t\t\tif {$sz > $max_sz} {\n \t\t\t\t$ui_diff insert end [mc \\\n \"* Untracked file is %d bytes.\n * Showing only first %d bytes.\n-\" $sz $max_sz] d_@\n+\" $sz $max_sz] d_info\n \t\t\t}\n \t\t\t$ui_diff insert end $content\n \t\t\tif {$sz > $max_sz} {\n \t\t\t\t$ui_diff insert end [mc \"\n * Untracked file clipped here by %s.\n * To see the entire file, use an external editor.\n-\" [appname]] d_@\n+\" [appname]] d_info\n \t\t\t}\n \t\t}\n \t\t$ui_diff conf -state disabled\n@@ -442,10 +442,10 @@ proc read_diff {fd conflict_size cont_info} {\n \t\t} elseif {$is_submodule_diff} {\n \t\t\tif {$line == \"\"} continue\n \t\t\tif {[regexp {^Submodule } $line]} {\n-\t\t\t\tset tags d_@\n+\t\t\t\tset tags d_info\n \t\t\t} elseif {[regexp {^\\* } $line]} {\n \t\t\t\tset line [string replace $line 0 1 {Submodule }]\n-\t\t\t\tset tags d_@\n+\t\t\t\tset tags d_info\n \t\t\t} else {\n \t\t\t\tset op [string range $line 0 2]\n \t\t\t\tswitch -- $op {\n-- \n1.7.3.2.1200.ge4bf6\n"},{"id":"157433","messageId":"87ei9uy4o8.fsf@fox.patthoyts.tk","threadId":"25867","inReplyTo":"02730a5b5e904409da58c7f5ebe40e16e7adc1f1.1291019649.git.bert.wesarg@googlemail.com","subject":"Re: [PATCH] Fix use of hunk tag for non-hunk content.","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2010-12-06T21:25:43Z","receivedAt":"2010-12-06T21:25:43Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Bert Wesarg <bert.wesarg@googlemail.com> writes:\n\n>The hunk tag d_@ lost its blue forground color in \"apply color information\n>from git diff output\" (2010-10-22, 8f85599). But this tag was also used\n>for non-hunk content like untracked file mime types or git submodules.\n>\n>Introduce a new tag for this type of content which has the blue forground\n>again.\n>\n>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>\n>---\n> git-gui.sh   |    2 ++\n> lib/diff.tcl |   14 +++++++-------\n> 2 files changed, 9 insertions(+), 7 deletions(-)\n>\n>diff --git a/git-gui.sh b/git-gui.sh\n>index 38362fa..c85a53c 100755\n>--- a/git-gui.sh\n>+++ b/git-gui.sh\n>@@ -3331,6 +3331,8 @@ foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 gr\n> }\n> $ui_diff tag configure clr1 -font font_diffbold\n> \n>+$ui_diff tag conf d_info -foreground blue -font font_diffbold\n>+\n> $ui_diff tag conf d_cr -elide true\n> $ui_diff tag conf d_@ -font font_diffbold\n> $ui_diff tag conf d_+ -foreground {#00a000}\n>diff --git a/lib/diff.tcl b/lib/diff.tcl\n>index 8fea947..8435635 100644\n>--- a/lib/diff.tcl\n>+++ b/lib/diff.tcl\n>@@ -208,32 +208,32 @@ proc show_other_diff {path w m cont_info} {\n> \t\t\t$ui_diff insert end [append \\\n> \t\t\t\t\"* \" \\\n> \t\t\t\t[mc \"Git Repository (subproject)\"] \\\n>-\t\t\t\t\"\\n\"] d_@\n>+\t\t\t\t\"\\n\"] d_info\n> \t\t} elseif {![catch {set type [exec file $path]}]} {\n> \t\t\tset n [string length $path]\n> \t\t\tif {[string equal -length $n $path $type]} {\n> \t\t\t\tset type [string range $type $n end]\n> \t\t\t\tregsub {^:?\\s*} $type {} type\n> \t\t\t}\n>-\t\t\t$ui_diff insert end \"* $type\\n\" d_@\n>+\t\t\t$ui_diff insert end \"* $type\\n\" d_info\n> \t\t}\n> \t\tif {[string first \"\\0\" $content] != -1} {\n> \t\t\t$ui_diff insert end \\\n> \t\t\t\t[mc \"* Binary file (not showing content).\"] \\\n>-\t\t\t\td_@\n>+\t\t\t\td_info\n> \t\t} else {\n> \t\t\tif {$sz > $max_sz} {\n> \t\t\t\t$ui_diff insert end [mc \\\n> \"* Untracked file is %d bytes.\n> * Showing only first %d bytes.\n>-\" $sz $max_sz] d_@\n>+\" $sz $max_sz] d_info\n> \t\t\t}\n> \t\t\t$ui_diff insert end $content\n> \t\t\tif {$sz > $max_sz} {\n> \t\t\t\t$ui_diff insert end [mc \"\n> * Untracked file clipped here by %s.\n> * To see the entire file, use an external editor.\n>-\" [appname]] d_@\n>+\" [appname]] d_info\n> \t\t\t}\n> \t\t}\n> \t\t$ui_diff conf -state disabled\n>@@ -442,10 +442,10 @@ proc read_diff {fd conflict_size cont_info} {\n> \t\t} elseif {$is_submodule_diff} {\n> \t\t\tif {$line == \"\"} continue\n> \t\t\tif {[regexp {^Submodule } $line]} {\n>-\t\t\t\tset tags d_@\n>+\t\t\t\tset tags d_info\n> \t\t\t} elseif {[regexp {^\\* } $line]} {\n> \t\t\t\tset line [string replace $line 0 1 {Submodule }]\n>-\t\t\t\tset tags d_@\n>+\t\t\t\tset tags d_info\n> \t\t\t} else {\n> \t\t\t\tset op [string range $line 0 2]\n> \t\t\t\tswitch -- $op {\n\nLooks great. Thank you.\n\n-- \nPat Thoyts                            http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD\n"}]}