From 55ba8a3474102eb8d638834d2b9bfe58d5014a40 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 30 Aug 2008 18:45:27 +0200 Subject: [PATCH 1/2] git gui: show diffs with a minimum of 1 context line Staging hunks without context does not work, because line number information would have to be recomputed for individual hunks. Since it is already possible to stage individual lines using 'Stage Line for Commit', zero context diffs are not really necessary for git gui. Signed-off-by: Clemens Buchacher Signed-off-by: Shawn O. Pearce --- git-gui.sh | 2 +- lib/diff.tcl | 2 +- lib/option.tcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index ad65aaad5a..86402d49f7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1932,7 +1932,7 @@ proc show_more_context {} { proc show_less_context {} { global repo_config - if {$repo_config(gui.diffcontext) >= 1} { + if {$repo_config(gui.diffcontext) > 1} { incr repo_config(gui.diffcontext) -1 reshow_diff } diff --git a/lib/diff.tcl b/lib/diff.tcl index 52b79e4a1f..4a7138be9c 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} { lappend cmd -p lappend cmd --no-color - if {$repo_config(gui.diffcontext) >= 0} { + if {$repo_config(gui.diffcontext) >= 1} { lappend cmd "-U$repo_config(gui.diffcontext)" } if {$w eq $ui_index} { diff --git a/lib/option.tcl b/lib/option.tcl index ffb3f00ff0..5e1346e601 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -125,7 +125,7 @@ proc do_options {} { {b gui.matchtrackingbranch {mc "Match Tracking Branches"}} {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} - {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}} + {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}} {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}} {t gui.newbranchtemplate {mc "New Branch Name Template"}} } { From 9dc3793166db8f3b80b909e2cb3ac3c5d0a611d5 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Sun, 31 Aug 2008 01:12:26 +0400 Subject: [PATCH 2/2] git-gui: Fix string escaping in po2msg.sh Escape '$', because otherwise git-gui crashes while trying to load malformed Japanese localization strings. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce --- po/po2msg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/po2msg.sh b/po/po2msg.sh index b7c4bf3fdf..1e9f992528 100644 --- a/po/po2msg.sh +++ b/po/po2msg.sh @@ -11,8 +11,8 @@ proc u2a {s} { foreach i [split $s ""] { scan $i %c c if {$c<128} { - # escape '[', '\' and ']' - if {$c == 0x5b || $c == 0x5d} { + # escape '[', '\', '$' and ']' + if {$c == 0x5b || $c == 0x5d || $c == 0x24} { append res "\\" } append res $i