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: Fix the search bar destruction handler.
  Update the po template
  git-gui: Implement automatic rescan after Tool execution.
  git-gui: Allow Tools request arguments from the user.
  git-gui: Add a Tools menu for arbitrary commands.
  git-gui: Fix the after callback execution in rescan.
  git-gui: Implement system-wide configuration handling.
  git-gui: try to provide a window icon under X
This commit is contained in:
Junio C Hamano
2008-11-16 15:51:11 -08:00
parent bf31115312 941930732f
commit 6e13921b4f
7 changed files with 1486 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-gui/lib/option.tcl
View File

@ -25,7 +25,7 @@ proc config_check_encodings {} {
proc save_config {} {
global default_config font_descs
global repo_config global_config
global repo_config global_config system_config
global repo_config_new global_config_new
global ui_comm_spell
@ -49,7 +49,7 @@ proc save_config {} {
foreach name [array names default_config] {
set value $global_config_new($name)
if {$value ne $global_config($name)} {
if {$value eq $default_config($name)} {
if {$value eq $system_config($name)} {
catch {git config --global --unset $name}
} else {
regsub -all "\[{}\]" $value {"} value
@ -284,17 +284,17 @@ proc do_options {} {
}
proc do_restore_defaults {} {
global font_descs default_config repo_config
global font_descs default_config repo_config system_config
global repo_config_new global_config_new
foreach name [array names default_config] {
set repo_config_new($name) $default_config($name)
set global_config_new($name) $default_config($name)
set repo_config_new($name) $system_config($name)
set global_config_new($name) $system_config($name)
}
foreach option $font_descs {
set name [lindex $option 0]
set repo_config(gui.$name) $default_config(gui.$name)
set repo_config(gui.$name) $system_config(gui.$name)
}
apply_config