kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  git-gui: Fix string escaping in po2msg.sh
  git gui: show diffs with a minimum of 1 context line

Conflicts:
	lib/option.tcl
maint
Shawn O. Pearce 2008-09-01 15:39:56 -07:00
parent f7078b4091 9dc3793166
commit 961a628fdd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui.sh
View File

@ -1947,7 +1947,7 @@ proc show_more_context {} {


proc show_less_context {} { proc show_less_context {} {
global repo_config global repo_config
if {$repo_config(gui.diffcontext) >= 1} { if {$repo_config(gui.diffcontext) > 1} {
incr repo_config(gui.diffcontext) -1 incr repo_config(gui.diffcontext) -1
reshow_diff reshow_diff
} }

2
lib/diff.tcl
View File

@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {


lappend cmd -p lappend cmd -p
lappend cmd --no-color lappend cmd --no-color
if {$repo_config(gui.diffcontext) >= 0} { if {$repo_config(gui.diffcontext) >= 1} {
lappend cmd "-U$repo_config(gui.diffcontext)" lappend cmd "-U$repo_config(gui.diffcontext)"
} }
if {$w eq $ui_index} { if {$w eq $ui_index} {

2
lib/option.tcl
View File

@ -126,7 +126,7 @@ proc do_options {} {
{b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}} {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
{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"}} {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
{t gui.newbranchtemplate {mc "New Branch Name Template"}} {t gui.newbranchtemplate {mc "New Branch Name Template"}}
} { } {

4
po/po2msg.sh
View File

@ -11,8 +11,8 @@ proc u2a {s} {
foreach i [split $s ""] { foreach i [split $s ""] {
scan $i %c c scan $i %c c
if {$c<128} { if {$c<128} {
# escape '[', '\' and ']' # escape '[', '\', '$' and ']'
if {$c == 0x5b || $c == 0x5d} { if {$c == 0x5b || $c == 0x5d || $c == 0x24} {
append res "\\" append res "\\"
} }
append res $i append res $i