mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 23:13:58 +01:00
Code

git-gui: Reshow diff if we sent the file to update-index.

Browse Source 
We can't ask the diff viewer to recompute the diff until after our
update-index child process terminates, as the diff programs need to
be able to read the updated index in order to generate the correct
diff.  This is actually why we prevent diffs from being generated
while there is an update lock on the index, which is why we ignored
our own show_diff invocation in the middle of the write_update_index
event handler.

So now we mark a flag if we identify that the file currently in the
diff viewer was also sent to update-index; then later when the
update-index process has terminated we update the diff viewer if
the flag is true.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2006-11-12 18:22:59 -05:00
parent 043f701116
commit 2cbe5577a0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git-gui
View File

@ -1143,11 +1143,12 @@ proc display_all_files {} {
}
proc update_index {pathList} {
global update_index_cp ui_status_value
global update_index_cp update_index_rsd ui_status_value
if {![lock_index update]} return
set update_index_cp 0
set update_index_rsd 0
set totalCnt [llength $pathList]
set batch [expr {int($totalCnt * .01) + 1}]
if {$batch > 25} {set batch 25}
@ -1170,13 +1171,17 @@ proc update_index {pathList} {
}
proc write_update_index {fd pathList totalCnt batch} {
global update_index_cp ui_status_value
global update_index_cp update_index_rsd ui_status_value
global file_states ui_fname_value
if {$update_index_cp >= $totalCnt} {
close $fd
unlock_index
set ui_status_value {Ready.}
if {$update_index_rsd} {
show_diff $ui_fname_value
} else {
set ui_status_value {Ready.}
}
return
}
@ -1200,7 +1205,7 @@ proc write_update_index {fd pathList totalCnt batch} {
puts -nonewline $fd "\0"
display_file $path $new
if {$ui_fname_value eq $path} {
show_diff $path
set update_index_rsd 1
}
}