undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Fix bug in unmerged file display.

Browse Source 
We were not correctly setting the old state of an index display to
_ if the index was previously unmerged.   This caused us to try and
update a U->M when resolving a merge conflict but we were unable to
do so as the icon did not exist in the index viewer.  Tk did not
like being asked to modify an icon which was undefined.

Now we always transform both the old and the new states for both
sides (index and working directory) prior to updating the UI.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-01-21 13:18:11 -05:00
parent fec4a78590
commit 079d0d5057
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
git-gui.sh
View File

@ -1320,20 +1320,27 @@ proc display_file {path state} {
set new_m [lindex $s 0]
set icon_name [lindex $s 1]
set s [string index $new_m 0]
if {$s eq {U}} {
set s _
set o [string index $old_m 0]
set n [string index $new_m 0]
if {$o eq {U}} {
set o _
}
display_file_helper $ui_index $path $icon_name \
[string index $old_m 0] $s
if {$n eq {U}} {
set n _
}
display_file_helper $ui_index $path $icon_name $o $n
if {[string index $new_m 0] eq {U}} {
set s U
if {[string index $old_m 0] eq {U}} {
set o U
} else {
set s [string index $new_m 1]
set o [string index $old_m 0]
}
display_file_helper $ui_workdir $path $icon_name \
[string index $old_m 1] $s
if {[string index $new_m 0] eq {U}} {
set n U
} else {
set n [string index $new_m 1]
}
display_file_helper $ui_workdir $path $icon_name $o $n
if {$new_m eq {__}} {
unset file_states($path)