Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: git-gui: Fix diff parsing for lines starting with "--" or "++" git-gui: Fix string escaping in po2msg.sh git gui: show diffs with a minimum of 1 context line git-gui: update all remaining translations to French. git-gui: Update french translation
This commit is contained in:
commit
1b118da8bd
@ -1932,7 +1932,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
|
||||||
}
|
}
|
||||||
|
@ -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} {
|
||||||
@ -192,6 +192,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set ::current_diff_inheader 1
|
||||||
fconfigure $fd \
|
fconfigure $fd \
|
||||||
-blocking 0 \
|
-blocking 0 \
|
||||||
-encoding binary \
|
-encoding binary \
|
||||||
@ -207,18 +208,21 @@ proc read_diff {fd scroll_pos} {
|
|||||||
while {[gets $fd line] >= 0} {
|
while {[gets $fd line] >= 0} {
|
||||||
# -- Cleanup uninteresting diff header lines.
|
# -- Cleanup uninteresting diff header lines.
|
||||||
#
|
#
|
||||||
if { [string match {diff --git *} $line]
|
if {$::current_diff_inheader} {
|
||||||
|| [string match {diff --cc *} $line]
|
if { [string match {diff --git *} $line]
|
||||||
|| [string match {diff --combined *} $line]
|
|| [string match {diff --cc *} $line]
|
||||||
|| [string match {--- *} $line]
|
|| [string match {diff --combined *} $line]
|
||||||
|| [string match {+++ *} $line]} {
|
|| [string match {--- *} $line]
|
||||||
append current_diff_header $line "\n"
|
|| [string match {+++ *} $line]} {
|
||||||
continue
|
append current_diff_header $line "\n"
|
||||||
|
continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if {[string match {index *} $line]} continue
|
if {[string match {index *} $line]} continue
|
||||||
if {$line eq {deleted file mode 120000}} {
|
if {$line eq {deleted file mode 120000}} {
|
||||||
set line "deleted symlink"
|
set line "deleted symlink"
|
||||||
}
|
}
|
||||||
|
set ::current_diff_inheader 0
|
||||||
|
|
||||||
# -- Automatically detect if this is a 3 way diff.
|
# -- Automatically detect if this is a 3 way diff.
|
||||||
#
|
#
|
||||||
|
@ -125,7 +125,7 @@ proc do_options {} {
|
|||||||
{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
|
{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
|
||||||
{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..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"}}
|
||||||
} {
|
} {
|
||||||
|
918
git-gui/po/fr.po
918
git-gui/po/fr.po
File diff suppressed because it is too large
Load Diff
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user