mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://repo.or.cz/git-gui

Browse Source 
* git://repo.or.cz/git-gui:
  git-gui: Reenable staging unmerged files by clicking the icon.
  git-gui: Support the encoding menu in gui blame.
  git-gui: Optimize encoding name resolution using a lookup table.
  git-gui: Allow forcing display encoding for diffs using a submenu.
  git-gui: Add a menu of available encodings.
  git-gui: Cleanup handling of the default encoding.
  git-gui: Assume `blame --incremental` output is in UTF-8
  git-gui: Use gitattribute "encoding" for file content display
  git-gui: Add support for calling out to the prepare-commit-msg hook
  git-gui: Hide commit related UI during citool --nocommit
  git-gui: Add more integration options to citool.
  git-gui: Updated German translation.
  git-gui: I18n fix sentence parts into full sentences for translation again.
  git-gui: Restore ability to Stage Working Copy for conflicts.
  git-gui: Fix Blame Parent & Context for working copy lines.
This commit is contained in:
Shawn O. Pearce
2008-09-25 08:41:07 -07:00
parent c9c6cc8d7d 3e34838caf
commit 1500f7bc13
9 changed files with 797 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
git-gui/lib/diff.tcl
View File

@ -40,6 +40,15 @@ proc reshow_diff {} {
}
}
proc force_diff_encoding {enc} {
global current_diff_path
if {$current_diff_path ne {}} {
force_path_encoding $current_diff_path $enc
reshow_diff
}
}
proc handle_empty_diff {} {
global current_diff_path file_states file_lists
@ -60,9 +69,9 @@ A rescan will be automatically started to find other files which may have the sa
rescan ui_ready 0
}
proc show_diff {path w {lno {}} {scroll_pos {}}} {
proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
global file_states file_lists
global is_3way_diff diff_active repo_config
global is_3way_diff is_conflict_diff diff_active repo_config
global ui_diff ui_index ui_workdir
global current_diff_path current_diff_side current_diff_header
global current_diff_queue
@ -83,36 +92,42 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
set s $file_states($path)
set m [lindex $s 0]
set is_conflict_diff 0
set current_diff_path $path
set current_diff_side $w
set current_diff_queue {}
ui_status [mc "Loading diff of %s..." [escape_path $path]]
set cont_info [list $scroll_pos $callback]
if {[string first {U} $m] >= 0} {
merge_load_stages $path [list show_unmerged_diff $scroll_pos]
merge_load_stages $path [list show_unmerged_diff $cont_info]
} elseif {$m eq {_O}} {
show_other_diff $path $w $m $scroll_pos
show_other_diff $path $w $m $cont_info
} else {
start_show_diff $scroll_pos
start_show_diff $cont_info
}
}
proc show_unmerged_diff {scroll_pos} {
proc show_unmerged_diff {cont_info} {
global current_diff_path current_diff_side
global merge_stages ui_diff
global merge_stages ui_diff is_conflict_diff
global current_diff_queue
if {$merge_stages(2) eq {}} {
set is_conflict_diff 1
lappend current_diff_queue \
[list "LOCAL: deleted\nREMOTE:\n" d======= \
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
} elseif {$merge_stages(3) eq {}} {
set is_conflict_diff 1
lappend current_diff_queue \
[list "REMOTE: deleted\nLOCAL:\n" d======= \
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
} elseif {[lindex $merge_stages(1) 0] eq {120000}
|| [lindex $merge_stages(2) 0] eq {120000}
|| [lindex $merge_stages(3) 0] eq {120000}} {
set is_conflict_diff 1
lappend current_diff_queue \
[list "LOCAL:\n" d======= \
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
@ -120,14 +135,14 @@ proc show_unmerged_diff {scroll_pos} {
[list "REMOTE:\n" d======= \
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
} else {
start_show_diff $scroll_pos
start_show_diff $cont_info
return
}
advance_diff_queue $scroll_pos
advance_diff_queue $cont_info
}
proc advance_diff_queue {scroll_pos} {
proc advance_diff_queue {cont_info} {
global current_diff_queue ui_diff
set item [lindex $current_diff_queue 0]
@ -137,10 +152,10 @@ proc advance_diff_queue {scroll_pos} {
$ui_diff insert end [lindex $item 0] [lindex $item 1]
$ui_diff conf -state disabled
start_show_diff $scroll_pos [lindex $item 2]
start_show_diff $cont_info [lindex $item 2]
}
proc show_other_diff {path w m scroll_pos} {
proc show_other_diff {path w m cont_info} {
global file_states file_lists
global is_3way_diff diff_active repo_config
global ui_diff ui_index ui_workdir
@ -165,7 +180,9 @@ proc show_other_diff {path w m scroll_pos} {
}
file {
set fd [open $path r]
fconfigure $fd -eofchar {}
fconfigure $fd \
-eofchar {} \
-encoding [get_path_encoding $path]
set content [read $fd $max_sz]
close $fd
set sz [file size $path]
@ -217,16 +234,21 @@ proc show_other_diff {path w m scroll_pos} {
$ui_diff conf -state disabled
set diff_active 0
unlock_index
set scroll_pos [lindex $cont_info 0]
if {$scroll_pos ne {}} {
update
$ui_diff yview moveto $scroll_pos
}
ui_ready
set callback [lindex $cont_info 1]
if {$callback ne {}} {
eval $callback
}
return
}
}
proc start_show_diff {scroll_pos {add_opts {}}} {
proc start_show_diff {cont_info {add_opts {}}} {
global file_states file_lists
global is_3way_diff diff_active repo_config
global ui_diff ui_index ui_workdir
@ -279,14 +301,14 @@ proc start_show_diff {scroll_pos {add_opts {}}} {
set ::current_diff_inheader 1
fconfigure $fd \
-blocking 0 \
-encoding binary \
-translation binary
fileevent $fd readable [list read_diff $fd $scroll_pos]
-encoding [get_path_encoding $path] \
-translation lf
fileevent $fd readable [list read_diff $fd $cont_info]
}
proc read_diff {fd scroll_pos} {
proc read_diff {fd cont_info} {
global ui_diff diff_active
global is_3way_diff current_diff_header
global is_3way_diff is_conflict_diff current_diff_header
global current_diff_queue
$ui_diff conf -state normal
@ -334,6 +356,7 @@ proc read_diff {fd scroll_pos} {
{--} {set tags d_--}
{++} {
if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
set is_conflict_diff 1
set line [string replace $line 0 1 { }]
set tags d$op
} else {
@ -353,6 +376,7 @@ proc read_diff {fd scroll_pos} {
{-} {set tags d_-}
{+} {
if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
set is_conflict_diff 1
set line [string replace $line 0 0 { }]
set tags d$op
} else {
@ -377,12 +401,13 @@ proc read_diff {fd scroll_pos} {
close $fd
if {$current_diff_queue ne {}} {
advance_diff_queue $scroll_pos
advance_diff_queue $cont_info
return
}
set diff_active 0
unlock_index
set scroll_pos [lindex $cont_info 0]
if {$scroll_pos ne {}} {
update
$ui_diff yview moveto $scroll_pos
@ -392,6 +417,10 @@ proc read_diff {fd scroll_pos} {
if {[$ui_diff index end] eq {2.0}} {
handle_empty_diff
}
set callback [lindex $cont_info 1]
if {$callback ne {}} {
eval $callback
}
}
}
@ -432,8 +461,9 @@ proc apply_hunk {x y} {
}
if {[catch {
set enc [get_path_encoding $current_diff_path]
set p [eval git_write $apply_cmd]
fconfigure $p -translation binary -encoding binary
fconfigure $p -translation binary -encoding $enc
puts -nonewline $p $current_diff_header
puts -nonewline $p [$ui_diff get $s_lno $e_lno]
close $p} err]} {
@ -601,8 +631,9 @@ proc apply_line {x y} {
set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
if {[catch {
set enc [get_path_encoding $current_diff_path]
set p [eval git_write $apply_cmd]
fconfigure $p -translation binary -encoding binary
fconfigure $p -translation binary -encoding $enc
puts -nonewline $p $current_diff_header
puts -nonewline $p $patch
close $p} err]} {