summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d1536c4)
raw | patch | inline | side by side (parent: d1536c4)
author | Shawn O. Pearce <spearce@spearce.org> | |
Wed, 8 Nov 2006 02:27:29 +0000 (21:27 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Wed, 8 Nov 2006 04:48:21 +0000 (23:48 -0500) |
On very large projects (~1000 files) on Windows systems the update-index
--refresh stage of the rescan process takes a nontrival amount of time.
If the user is generally very careful with their file modification such
that the modification timestamp of the file differs only when the content
also differs then we can skip this somewhat expensive step and go right
to the diff-index and diff-files processes.
We save the user's prefernce in the current repository if they modify the
setting during a git-gui session, but we also load it through our dump of
repo-config --list so the user could move it to their ~/.gitconfig file
if they wanted it globally disabled.
We still keep update-index --refresh enabled by default however, as most
users will probably want it.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
--refresh stage of the rescan process takes a nontrival amount of time.
If the user is generally very careful with their file modification such
that the modification timestamp of the file differs only when the content
also differs then we can skip this somewhat expensive step and go right
to the diff-index and diff-files processes.
We save the user's prefernce in the current repository if they modify the
setting during a git-gui session, but we also load it through our dump of
repo-config --list so the user could move it to their ~/.gitconfig file
if they wanted it globally disabled.
We still keep update-index --refresh enabled by default however, as most
users will probably want it.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui | patch | blob | history |
index eb7329c218e9411beb0c5a57f6dd1014e5b1e1e5..8562983d36717f60061a0cae14e1c92fce422a25 100755 (executable)
--- a/git-gui
+++ b/git-gui
global HEAD PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
global status_active file_states
+ global cfg_trust_mtime
if {$status_active || ![lock_index read]} return
$ui_comm edit modified false
}
- set status_active 1
- set ui_status_value {Refreshing file status...}
- set fd_rf [open "| git update-index -q --unmerged --refresh" r]
- fconfigure $fd_rf -blocking 0 -translation binary
- fileevent $fd_rf readable [list read_refresh $fd_rf $final]
+ if {$cfg_trust_mtime == {true}} {
+ update_status_stage2 {} $final
+ } else {
+ set status_active 1
+ set ui_status_value {Refreshing file status...}
+ set fd_rf [open "| git update-index -q --unmerged --refresh" r]
+ fconfigure $fd_rf -blocking 0 -translation binary
+ fileevent $fd_rf readable [list update_status_stage2 $fd_rf $final]
+ }
}
-proc read_refresh {fd final} {
+proc update_status_stage2 {fd final} {
global gitdir PARENT commit_type
global ui_index ui_other ui_status_value ui_comm
global status_active file_states
global buf_rdi buf_rdf buf_rlo
- read $fd
- if {![eof $fd]} return
- close $fd
+ if {$fd != {}} {
+ read $fd
+ if {![eof $fd]} return
+ close $fd
+ }
set ls_others [list | git ls-files --others -z \
--exclude-per-directory=.gitignore]
proc load_repo_config {} {
global repo_config
+ global cfg_trust_mtime
array unset repo_config
catch {
}
close $fd_rc
}
+
+ if {[catch {set cfg_trust_mtime $repo_config(gui.trustmtime)}]} {
+ set cfg_trust_mtime false
+ }
+}
+
+proc save_my_config {} {
+ global repo_config
+ global cfg_trust_mtime
+
+ if {[catch {set rc_trustMTime $repo_config(gui.trustmtime)}]} {
+ set rc_trustMTime false
+ }
+ if {$cfg_trust_mtime != $rc_trustMTime} {
+ exec git repo-config gui.trustMTime $cfg_trust_mtime
+ }
}
proc load_all_remotes {} {
file delete $save
}
+ save_my_config
destroy .
}
.mbar add cascade -label Fetch -menu .mbar.fetch
.mbar add cascade -label Pull -menu .mbar.pull
.mbar add cascade -label Push -menu .mbar.push
+.mbar add cascade -label Options -menu .mbar.options
. configure -menu .mbar
# -- Project Menu
# -- Push Menu
menu .mbar.push
+# -- Options Menu
+menu .mbar.options
+.mbar.options add checkbutton -label {Trust File Modification Timestamp} \
+ -offvalue false \
+ -onvalue true \
+ -variable cfg_trust_mtime
+
# -- Main Window Layout
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal