git-gui: Refactor git-config --list parsing

The parsing for the output of `git config --list` is the same for
both the global options and the current repository's options so we
can really just use the same parser between them.

I'm currently just refactoring the parser so we can use a different
one depending on the version of git available to us at runtime.  My
next change will add support for 1.5.3's --null option.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index 530fee866f07adc22f13c8d12d709fa903bf93ba..cfed62da440e420bae6088bf280c1834775874c1 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -748,40 +748,33 @@ unset -nocomplain idx fd
 ##
 ## config file parsing
 
 ##
 ## config file parsing
 

-proc load_config {include_global} {
-       global repo_config global_config default_config
-
-       array unset global_config
-       if {$include_global} {
+git-version proc _parse_config {arr_name args} {
+       default {
+               upvar $arr_name arr
+               array unset arr

                catch {
                catch {

-                       set fd_rc [git_read config --global --list]
+                       set fd_rc [eval [list git_read config --list] $args]

                        while {[gets $fd_rc line] >= 0} {
                                if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
                                        if {[is_many_config $name]} {
                        while {[gets $fd_rc line] >= 0} {
                                if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
                                        if {[is_many_config $name]} {

-                                               lappend global_config($name) $value
+                                               lappend arr($name) $value

                                        } else {
                                        } else {

-                                               set global_config($name) $value
+                                               set arr($name) $value

                                        }
                                }
                        }
                        close $fd_rc
                }
        }
                                        }
                                }
                        }
                        close $fd_rc
                }
        }

+}

 
 

-       array unset repo_config
-       catch {
-               set fd_rc [git_read config --list]
-               while {[gets $fd_rc line] >= 0} {
-                       if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
-                               if {[is_many_config $name]} {
-                                       lappend repo_config($name) $value
-                               } else {
-                                       set repo_config($name) $value
-                               }
-                       }
-               }
-               close $fd_rc
+proc load_config {include_global} {
+       global repo_config global_config default_config
+
+       if {$include_global} {
+               _parse_config global_config --global

        }
        }

+       _parse_config repo_config

 
        foreach name [array names default_config] {
                if {[catch {set v $global_config($name)}]} {
 
        foreach name [array names default_config] {
                if {[catch {set v $global_config($name)}]} {