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

Merge branch 'js/no-rescan-on-empty-diff'

Browse Source 
* js/no-rescan-on-empty-diff:
  git-gui: Remove forced rescan of stat-dirty files.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
Johannes Sixt
2024-12-21 14:05:43 +01:00
parent 0668f0470d f823de75a1
commit 5c95773eac
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-gui.sh
View File

@ -1357,7 +1357,6 @@ set current_diff_path {}
set is_3way_diff 0 set is_3way_diff 0
set is_submodule_diff 0 set is_submodule_diff 0
set is_conflict_diff 0 set is_conflict_diff 0
set diff_empty_count 0
set last_revert {} set last_revert {}
set last_revert_enc {} set last_revert_enc {}
@ -3594,6 +3593,8 @@ $ui_diff tag configure clr1 -font font_diffbold
$ui_diff tag configure clr4 -underline 1 $ui_diff tag configure clr4 -underline 1
$ui_diff tag conf d_info -foreground blue -font font_diffbold $ui_diff tag conf d_info -foreground blue -font font_diffbold
$ui_diff tag conf d_rescan -foreground blue -underline 1 -font font_diffbold
$ui_diff tag bind d_rescan <Button-1> { clear_diff; rescan ui_ready 0 }
$ui_diff tag conf d_cr -elide true $ui_diff tag conf d_cr -elide true
$ui_diff tag conf d_@ -font font_diffbold $ui_diff tag conf d_@ -font font_diffbold

26
lib/diff.tcl
View File

@ -63,28 +63,17 @@ proc force_diff_encoding {enc} {
} }
proc handle_empty_diff {} { proc handle_empty_diff {} {
global current_diff_path file_states file_lists global current_diff_path file_states
global diff_empty_count global ui_diff
set path $current_diff_path set path $current_diff_path
set s $file_states($path) set s $file_states($path)
if {[lindex $s 0] ne {_M} || [has_textconv $path]} return if {[lindex $s 0] ne {_M} || [has_textconv $path]} return
# Prevent infinite rescan loops $ui_diff conf -state normal
incr diff_empty_count $ui_diff insert end [mc "* No differences detected; stage the file to de-list it from Unstaged Changes.\n"] d_info
if {$diff_empty_count > 1} return $ui_diff insert end [mc "* Click to find other files that may have the same state.\n"] d_rescan
$ui_diff conf -state disabled
info_popup [mc "No differences detected.
%s has no changes.
The modification date of this file was updated by another application, but the content within the file was not changed.
A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
clear_diff
display_file $path __
rescan ui_ready 0
} }
proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} { proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
@ -387,7 +376,6 @@ proc read_diff {fd conflict_size cont_info} {
global ui_diff diff_active is_submodule_diff global ui_diff diff_active is_submodule_diff
global is_3way_diff is_conflict_diff current_diff_header global is_3way_diff is_conflict_diff current_diff_header
global current_diff_queue global current_diff_queue
global diff_empty_count
$ui_diff conf -state normal $ui_diff conf -state normal
while {[gets $fd line] >= 0} { while {[gets $fd line] >= 0} {
@ -559,8 +547,6 @@ proc read_diff {fd conflict_size cont_info} {
if {[$ui_diff index end] eq {2.0}} { if {[$ui_diff index end] eq {2.0}} {
handle_empty_diff handle_empty_diff
} else {
set diff_empty_count 0
} }
set callback [lindex $cont_info 1] set callback [lindex $cont_info 1]