@matheusbsbs / matheus-bagliano / commits / 7618e6b1c1
Fork 0

git-gui: Enhance choose_rev to handle hundreds of branches

One of my production repositories has hundreds of remote tracking branches. Trying to navigate these through a popup menu is just not possible. The list is far larger than the screen and it does not scroll fast enough to efficiently select a branch name when trying to create a branch or delete a branch. This is major rewrite of the revision chooser mega-widget. We now use a single listbox for all three major types of named refs (heads, tracking branches, tags) and a radio button group to pick which of those namespaces should be shown in the listbox. A filter field is shown to the right allowing the end-user to key in a glob specification to filter the list they are viewing. The filter is always taken as substring, so we assume * both starts and ends the pattern the user wanted but otherwise treat it as a glob pattern. This new picker works out really nicely. What used to take me at least a minute to find and select a branch now takes mere seconds. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jul 4, 2007 at 16:38 UTC 7618e6b1c1676dfdc2cc4c8af9e259c3e885825f
3 files changed +249 -114
lib/branch_create.tcl
+2 -8
@@ -63,7 +63,7 @@ constructor dialog {} {
63 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
64
65 set w_rev [::choose_rev::new $w.rev {Starting Revision}]
66 - pack $w.rev -anchor nw -fill x -pady 5 -padx 5
66 + pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
67
68 labelframe $w.options -text {Options}
69
@@ -170,13 +170,7 @@ method _create {} {
170 return
171 }
172
173 - if {[catch {set new [$w_rev get_commit]}]} {
174 - tk_messageBox \
175 - -icon error \
176 - -type ok \
177 - -title [wm title $w] \
178 - -parent $w \
179 - -message "Invalid revision: [$w_rev get]"
173 + if {[catch {set new [$w_rev commit_or_die]}]} {
174 return
175 }
176
lib/branch_delete.tcl
+2 -7
@@ -40,6 +40,7 @@ constructor dialog {} {
40 -height 10 \
41 -width 70 \
42 -selectmode extended \
43 + -exportselection false \
44 -yscrollcommand [list $w.list.sby set]
45 scrollbar $w.list.sby -command [list $w.list.l yview]
46 pack $w.list.sby -side right -fill y
@@ -80,13 +81,7 @@ method _select {} {
81 method _delete {} {
82 global all_heads
83
83 - if {[catch {set check_cmt [$w_check get_commit]} err]} {
84 - tk_messageBox \
85 - -icon error \
86 - -type ok \
87 - -title [wm title $w] \
88 - -parent $w \
89 - -message "Invalid revision: [$w_check get]"
84 + if {[catch {set check_cmt [$w_check commit_or_die]}]} {
85 return
86 }
87
lib/choose_rev.tcl
+245 -99
@@ -3,15 +3,19 @@
3
4 class choose_rev {
5
6 +image create photo ::choose_rev::img_find -data {R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
7 +
8 field w ; # our megawidget path
7 -field revtype {}; # type of revision chosen
9 +field w_list ; # list of currently filtered specs
10 +field w_filter ; # filter entry for $w_list
11
9 -field c_head {}; # selected local branch head
10 -field c_trck {}; # selected tracking branch
11 -field c_tag {}; # selected tag
12 field c_expr {}; # current revision expression
13 -
14 -field trck_spec ; # array of specifications
13 +field filter ; # current filter string
14 +field revtype head; # type of revision chosen
15 +field cur_specs [list]; # list of specs for $revtype
16 +field spec_head ; # list of all head specs
17 +field spec_trck ; # list of all tracking branch specs
18 +field spec_tag ; # list of all tag specs
19
20 constructor new {path {title {}}} {
21 global all_heads current_branch
@@ -25,61 +29,6 @@ constructor new {path {title {}}} {
29 }
30 bind $w <Destroy> [cb _delete %W]
31
28 - if {$all_heads ne {}} {
29 - set c_head $current_branch
30 - radiobutton $w.head_r \
31 - -text {Local Branch:} \
32 - -value head \
33 - -variable @revtype
34 - eval tk_optionMenu $w.head_m @c_head $all_heads
35 - grid $w.head_r $w.head_m -sticky w
36 - if {$revtype eq {}} {
37 - set revtype head
38 - }
39 - trace add variable @c_head write [cb _select head]
40 - }
41 -
42 - set trck_list [all_tracking_branches]
43 - if {$trck_list ne {}} {
44 - set nam [list]
45 - foreach spec $trck_list {
46 - set txt [lindex $spec 0]
47 - regsub ^refs/(heads/|remotes/)? $txt {} txt
48 - set trck_spec($txt) $spec
49 - lappend nam $txt
50 - }
51 - set nam [lsort -unique $nam]
52 -
53 - radiobutton $w.trck_r \
54 - -text {Tracking Branch:} \
55 - -value trck \
56 - -variable @revtype
57 - eval tk_optionMenu $w.trck_m @c_trck $nam
58 - grid $w.trck_r $w.trck_m -sticky w
59 -
60 - set c_trck [lindex $nam 0]
61 - if {$revtype eq {}} {
62 - set revtype trck
63 - }
64 - trace add variable @c_trck write [cb _select trck]
65 - unset nam spec txt
66 - }
67 -
68 - set all_tags [load_all_tags]
69 - if {$all_tags ne {}} {
70 - set c_tag [lindex $all_tags 0]
71 - radiobutton $w.tag_r \
72 - -text {Tag:} \
73 - -value tag \
74 - -variable @revtype
75 - eval tk_optionMenu $w.tag_m @c_tag $all_tags
76 - grid $w.tag_r $w.tag_m -sticky w
77 - if {$revtype eq {}} {
78 - set revtype tag
79 - }
80 - trace add variable @c_tag write [cb _select tag]
81 - }
82 -
32 radiobutton $w.expr_r \
33 -text {Revision Expression:} \
34 -value expr \
@@ -92,66 +41,186 @@ constructor new {path {title {}}} {
41 -validate key \
42 -validatecommand [cb _validate %d %S]
43 grid $w.expr_r $w.expr_t -sticky we -padx {0 5}
95 - if {$revtype eq {}} {
96 - set revtype expr
97 - }
44 +
45 + frame $w.types
46 + radiobutton $w.types.head_r \
47 + -text {Local Branch} \
48 + -value head \
49 + -variable @revtype
50 + pack $w.types.head_r -side left
51 + radiobutton $w.types.trck_r \
52 + -text {Tracking Branch} \
53 + -value trck \
54 + -variable @revtype
55 + pack $w.types.trck_r -side left
56 + radiobutton $w.types.tag_r \
57 + -text {Tag} \
58 + -value tag \
59 + -variable @revtype
60 + pack $w.types.tag_r -side left
61 + set w_filter $w.types.filter
62 + entry $w_filter \
63 + -borderwidth 1 \
64 + -relief sunken \
65 + -width 12 \
66 + -textvariable @filter \
67 + -validate key \
68 + -validatecommand [cb _filter %P]
69 + pack $w_filter -side right
70 + pack [label $w.types.filter_icon \
71 + -image ::choose_rev::img_find \
72 + ] -side right
73 + grid $w.types -sticky we -padx {0 5} -columnspan 2
74 +
75 + frame $w.list
76 + set w_list $w.list.l
77 + listbox $w_list \
78 + -font font_diff \
79 + -width 50 \
80 + -height 5 \
81 + -selectmode browse \
82 + -exportselection false \
83 + -xscrollcommand [cb _sb_set $w.list.sbx h] \
84 + -yscrollcommand [cb _sb_set $w.list.sby v]
85 + pack $w_list -fill both -expand 1
86 + grid $w.list -sticky nswe -padx {20 5} -columnspan 2
87
88 grid columnconfigure $w 1 -weight 1
89 + grid rowconfigure $w 2 -weight 1
90 +
91 + trace add variable @revtype write [cb _select]
92 + bind $w_filter <Key-Return> [list focus $w_list]\;break
93 + bind $w_filter <Key-Down> [list focus $w_list]
94 +
95 + set spec_head [list]
96 + foreach name $all_heads {
97 + lappend spec_head [list $name refs/heads/$name]
98 + }
99 +
100 + set spec_trck [list]
101 + foreach spec [all_tracking_branches] {
102 + set name [lindex $spec 0]
103 + regsub ^refs/(heads|remotes)/ $name {} name
104 + lappend spec_trck [concat $name $spec]
105 + }
106 +
107 + set spec_tag [list]
108 + foreach name [load_all_tags] {
109 + lappend spec_tag [list $name refs/tags/$name]
110 + }
111 +
112 + if {[llength $spec_head] > 0} { set revtype head
113 + } elseif {[llength $spec_trck] > 0} { set revtype trck
114 + } elseif {[llength $spec_tag ] > 0} { set revtype tag
115 + } else { set revtype expr
116 + }
117 +
118 + if {$revtype eq {head} && $current_branch ne {}} {
119 + set i 0
120 + foreach spec $spec_head {
121 + if {[lindex $spec 0] eq $current_branch} {
122 + $w_list selection set $i
123 + break
124 + }
125 + incr i
126 + }
127 + }
128 +
129 return $this
130 }
131
132 method none {text} {
104 - if {[winfo exists $w.none_r]} {
105 - $w.none_r configure -text $text
106 - return
107 - }
108 -
109 - radiobutton $w.none_r \
110 - -anchor w \
111 - -text $text \
112 - -value none \
113 - -variable @revtype
114 - grid $w.none_r -sticky we -padx {0 5} -columnspan 2
115 - if {$revtype eq {}} {
116 - set revtype none
133 + if {![winfo exists $w.none_r]} {
134 + radiobutton $w.none_r \
135 + -anchor w \
136 + -value none \
137 + -variable @revtype
138 + grid $w.none_r -sticky we -padx {0 5} -columnspan 2
139 }
140 + $w.none_r configure -text $text
141 }
142
143 method get {} {
144 switch -- $revtype {
122 - head { return $c_head }
123 - trck { return $c_trck }
124 - tag { return $c_tag }
125 - expr { return $c_expr }
126 - none { return {} }
145 + head -
146 + trck -
147 + tag {
148 + set i [$w_list curselection]
149 + if {$i ne {}} {
150 + return [lindex $cur_specs $i 0]
151 + } else {
152 + return {}
153 + }
154 + }
155 +
156 + expr { return $c_expr }
157 + none { return {} }
158 default { error "unknown type of revision" }
159 }
160 }
161
162 method get_tracking_branch {} {
132 - if {$revtype eq {trck}} {
133 - return $trck_spec($c_trck)
134 - } else {
163 + set i [$w_list curselection]
164 + if {$i eq {} || $revtype ne {trck}} {
165 return {}
166 }
167 + return [lrange [lindex $cur_specs $i] 1 end]
168 }
169
139 -method get_expr {} {
140 - switch -- $revtype {
141 - head { return refs/heads/$c_head }
142 - trck { return [lindex $trck_spec($c_trck) 0] }
143 - tag { return refs/tags/$c_tag }
144 - expr { return $c_expr }
145 - none { return {} }
146 - default { error "unknown type of revision" }
170 +method get_commit {} {
171 + set e [_expr $this]
172 + if {$e eq {}} {
173 + return {}
174 }
175 + return [git rev-parse --verify "$e^0"]
176 }
177
150 -method get_commit {} {
151 - if {$revtype eq {none}} {
152 - return {}
178 +method commit_or_die {} {
179 + if {[catch {set new [get_commit $this]} err]} {
180 +
181 + # Cleanup the not-so-friendly error from rev-parse.
182 + #
183 + regsub {^fatal:\s*} $err {} err
184 + if {$err eq {Needed a single revision}} {
185 + set err {}
186 + }
187 +
188 + set top [winfo toplevel $w]
189 + set msg "Invalid revision: [get $this]\n\n$err"
190 + tk_messageBox \
191 + -icon error \
192 + -type ok \
193 + -title [wm title $top] \
194 + -parent $top \
195 + -message $msg
196 + error $msg
197 + }
198 + return $new
199 +}
200 +
201 +method _expr {} {
202 + switch -- $revtype {
203 + head -
204 + trck -
205 + tag {
206 + set i [$w_list curselection]
207 + if {$i ne {}} {
208 + return [lindex $cur_specs $i 1]
209 + } else {
210 + error "No revision selected."
211 + }
212 + }
213 +
214 + expr {
215 + if {$c_expr ne {}} {
216 + return $c_expr
217 + } else {
218 + error "Revision expression is empty."
219 + }
220 + }
221 + none { return {} }
222 + default { error "unknown type of revision" }
223 }
154 - return [git rev-parse --verify "[get_expr $this]^0"]
224 }
225
226 method _validate {d S} {
@@ -166,8 +235,55 @@ method _validate {d S} {
235 return 1
236 }
237
169 -method _select {value args} {
170 - set revtype $value
238 +method _filter {P} {
239 + if {[regexp {\s} $P]} {
240 + return 0
241 + }
242 + _rebuild $this $P
243 + return 1
244 +}
245 +
246 +method _select {args} {
247 + _rebuild $this $filter
248 + if {[$w_filter cget -state] eq {normal}} {
249 + focus $w_filter
250 + }
251 +}
252 +
253 +method _rebuild {pat} {
254 + set ste normal
255 + switch -- $revtype {
256 + head { set new $spec_head }
257 + trck { set new $spec_trck }
258 + tag { set new $spec_tag }
259 + expr -
260 + none {
261 + set new [list]
262 + set ste disabled
263 + }
264 + }
265 +
266 + if {[$w_list cget -state] eq {disabled}} {
267 + $w_list configure -state normal
268 + }
269 + $w_list delete 0 end
270 +
271 + if {$pat ne {}} {
272 + set pat *${pat}*
273 + }
274 + set cur_specs [list]
275 + foreach spec $new {
276 + set txt [lindex $spec 0]
277 + if {$pat eq {} || [string match $pat $txt]} {
278 + lappend cur_specs $spec
279 + $w_list insert end $txt
280 + }
281 + }
282 +
283 + if {[$w_filter cget -state] ne $ste} {
284 + $w_list configure -state $ste
285 + $w_filter configure -state $ste
286 + }
287 }
288
289 method _delete {current} {
@@ -176,4 +292,34 @@ method _delete {current} {
292 }
293 }
294
295 +method _sb_set {sb orient first last} {
296 + set old_focus [focus -lastfor $w]
297 +
298 + if {$first == 0 && $last == 1} {
299 + if {[winfo exists $sb]} {
300 + destroy $sb
301 + if {$old_focus ne {}} {
302 + update
303 + focus $old_focus
304 + }
305 + }
306 + return
307 + }
308 +
309 + if {![winfo exists $sb]} {
310 + if {$orient eq {h}} {
311 + scrollbar $sb -orient h -command [list $w_list xview]
312 + pack $sb -fill x -side bottom -before $w_list
313 + } else {
314 + scrollbar $sb -orient v -command [list $w_list yview]
315 + pack $sb -fill y -side right -before $w_list
316 + }
317 + if {$old_focus ne {}} {
318 + update
319 + focus $old_focus
320 + }
321 + }
322 + $sb set $first $last
323 +}
324 +
325 }