git-gui: Save remote urls obtained from config/remotes setup

diff --git a/lib/choose_rev.tcl b/lib/choose_rev.tcl
index e6af07359551abe1b585326137e987cc73fdab43..6c4c3188f0eab7bf81f35c9eabea6cf77f078f63 100644 (file)
--- a/lib/choose_rev.tcl
+++ b/lib/choose_rev.tcl
@@ -18,7 +18,7 @@ field spec_trck       ; # list of all tracking branch specs
 field spec_tag        ; # list of all tag specs
 
 constructor new {path {title {}}} {
-       global all_heads current_branch
+       global current_branch is_detached
 
        set w $path
 
@@ -29,6 +29,15 @@ constructor new {path {title {}}} {
        }
        bind $w <Destroy> [cb _delete %W]
 
+       if {$is_detached} {
+               radiobutton $w.detachedhead_r \
+                       -anchor w \
+                       -text {This Detached Checkout} \
+                       -value HEAD \
+                       -variable @revtype
+               grid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2
+       }
+
        radiobutton $w.expr_r \
                -text {Revision Expression:} \
                -value expr \
@@ -77,7 +86,7 @@ constructor new {path {title {}}} {
        listbox $w_list \
                -font font_diff \
                -width 50 \
-               -height 5 \
+               -height 10 \
                -selectmode browse \
                -exportselection false \
                -xscrollcommand [cb _sb_set $w.list.sbx h] \
@@ -86,14 +95,18 @@ constructor new {path {title {}}} {
        grid $w.list -sticky nswe -padx {20 5} -columnspan 2
 
        grid columnconfigure $w 1 -weight 1
-       grid rowconfigure    $w 2 -weight 1
+       if {$is_detached} {
+               grid rowconfigure $w 3 -weight 1
+       } else {
+               grid rowconfigure $w 2 -weight 1
+       }
 
        trace add variable @revtype write [cb _select]
        bind $w_filter <Key-Return> [list focus $w_list]\;break
        bind $w_filter <Key-Down>   [list focus $w_list]
 
        set spec_head [list]
-       foreach name $all_heads {
+       foreach name [load_all_heads] {
                lappend spec_head [list $name refs/heads/$name]
        }
 
@@ -109,7 +122,8 @@ constructor new {path {title {}}} {
                lappend spec_tag [list $name refs/tags/$name]
        }
 
-             if {[llength $spec_head] > 0} { set revtype head
+                 if {$is_detached}             { set revtype HEAD
+       } elseif {[llength $spec_head] > 0} { set revtype head
        } elseif {[llength $spec_trck] > 0} { set revtype trck
        } elseif {[llength $spec_tag ] > 0} { set revtype tag
        } else {                              set revtype expr
@@ -119,6 +133,7 @@ constructor new {path {title {}}} {
                set i 0
                foreach spec $spec_head {
                        if {[lindex $spec 0] eq $current_branch} {
+                               $w_list selection clear 0 end
                                $w_list selection set $i
                                break
                        }
@@ -153,6 +168,7 @@ method get {} {
                }
        }
 
+       HEAD { return HEAD                     }
        expr { return $c_expr                  }
        none { return {}                       }
        default { error "unknown type of revision" }
@@ -163,6 +179,24 @@ method pick_tracking_branch {} {
        set revtype trck
 }
 
+method focus_filter {} {
+       if {[$w_filter cget -state] eq {normal}} {
+               focus $w_filter
+       }
+}
+
+method bind_listbox {event script}  {
+       bind $w_list $event $script
+}
+
+method get_local_branch {} {
+       if {$revtype eq {head}} {
+               return [_expr $this]
+       } else {
+               return {}
+       }
+}
+
 method get_tracking_branch {} {
        set i [$w_list curselection]
        if {$i eq {} || $revtype ne {trck}} {
@@ -222,6 +256,7 @@ method _expr {} {
                        error "Revision expression is empty."
                }
        }
+       HEAD { return HEAD                     }
        none { return {}                       }
        default { error "unknown type of revision"      }
        }
@@ -249,9 +284,7 @@ method _filter {P} {
 
 method _select {args} {
        _rebuild $this $filter
-       if {[$w_filter cget -state] eq {normal}} {
-               focus $w_filter
-       }
+       focus_filter $this
 }
 
 method _rebuild {pat} {
@@ -261,6 +294,7 @@ method _rebuild {pat} {
        trck { set new $spec_trck }
        tag  { set new $spec_tag  }
        expr -
+       HEAD -
        none {
                set new [list]
                set ste disabled
@@ -283,6 +317,10 @@ method _rebuild {pat} {
                        $w_list insert end $txt
                }
        }
+       if {$cur_specs ne {}} {
+               $w_list selection clear 0 end
+               $w_list selection set 0
+       }
 
        if {[$w_filter cget -state] ne $ste} {
                $w_list   configure -state $ste