@matheusbsbs / matheus-bagliano / commits / c74b6c66f0
Fork 0

git-gui: Convert browser, console to "class" format

Now that we have a slightly easier method of working with per-widget data we should make use of that technique in our browser and console meta-widgets, as both have a decent amount of information that they store on a per-widget basis and our current approach of handling it is difficult to follow. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed May 8, 2007 at 20:33 UTC c74b6c66f00ce51b2c01d20fc5ef0e6429811124
6 files changed +139 -185
git-gui.sh
+2 -2
@@ -1288,7 +1288,7 @@ menu .mbar.repository
1288
1289 .mbar.repository add command \
1290 -label {Browse Current Branch} \
1291 - -command {new_browser $current_branch}
1291 + -command {browser::new $current_branch}
1292 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1293 .mbar.repository add separator
1294
@@ -1581,7 +1581,7 @@ browser {
1581 exit 1
1582 }
1583 set current_branch [lindex $argv 0]
1584 - new_browser $current_branch
1584 + browser::new $current_branch
1585 return
1586 }
1587 blame {
lib/blame.tcl
+2
@@ -1,6 +1,8 @@
1 # git-gui blame viewer
2 # Copyright (C) 2006, 2007 Shawn Pearce
3
4 +set next_browser_id 0
5 +
6 proc show_blame {commit path} {
7 global next_browser_id blame_status blame_data
8
lib/browser.tcl
+89 -113
@@ -1,28 +1,26 @@
1 # git-gui tree browser
2 # Copyright (C) 2006, 2007 Shawn Pearce
3
4 -set next_browser_id 0
5 -
6 -proc new_browser {commit} {
7 - global next_browser_id cursor_ptr M1B
8 - global browser_commit browser_status browser_stack browser_path browser_busy
9 -
10 - if {[winfo ismapped .]} {
11 - set w .browser[incr next_browser_id]
12 - set tl $w
13 - toplevel $w
14 - } else {
15 - set w {}
16 - set tl .
17 - }
18 - set w_list $w.list.l
19 - set browser_commit($w_list) $commit
20 - set browser_status($w_list) {Starting...}
21 - set browser_stack($w_list) {}
22 - set browser_path($w_list) $browser_commit($w_list):
23 - set browser_busy($w_list) 1
24 -
25 - label $w.path -textvariable browser_path($w_list) \
4 +class browser {
5 +
6 +field w
7 +field browser_commit
8 +field browser_path
9 +field browser_files {}
10 +field browser_status {Starting...}
11 +field browser_stack {}
12 +field browser_busy 1
13 +
14 +constructor new {commit} {
15 + global cursor_ptr M1B
16 + make_toplevel top w
17 + wm title $top "[appname] ([reponame]): File Browser"
18 +
19 + set browser_commit $commit
20 + set browser_path $browser_commit:
21 +
22 + label $w.path \
23 + -textvariable @browser_path \
24 -anchor w \
25 -justify left \
26 -borderwidth 1 \
@@ -31,6 +29,7 @@ proc new_browser {commit} {
29 pack $w.path -anchor w -side top -fill x
30
31 frame $w.list
32 + set w_list $w.list.l
33 text $w_list -background white -borderwidth 0 \
34 -cursor $cursor_ptr \
35 -state disabled \
@@ -49,176 +48,149 @@ proc new_browser {commit} {
48 pack $w_list -side left -fill both -expand 1
49 pack $w.list -side top -fill both -expand 1
50
52 - label $w.status -textvariable browser_status($w_list) \
51 + label $w.status \
52 + -textvariable @browser_status \
53 -anchor w \
54 -justify left \
55 -borderwidth 1 \
56 -relief sunken
57 pack $w.status -anchor w -side bottom -fill x
58
59 - bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
60 - bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
61 - bind $w_list <$M1B-Up> "browser_parent $w_list;break"
62 - bind $w_list <$M1B-Left> "browser_parent $w_list;break"
63 - bind $w_list <Up> "browser_move -1 $w_list;break"
64 - bind $w_list <Down> "browser_move 1 $w_list;break"
65 - bind $w_list <$M1B-Right> "browser_enter $w_list;break"
66 - bind $w_list <Return> "browser_enter $w_list;break"
67 - bind $w_list <Prior> "browser_page -1 $w_list;break"
68 - bind $w_list <Next> "browser_page 1 $w_list;break"
59 + bind $w_list <Button-1> "[cb _click 0 @%x,%y];break"
60 + bind $w_list <Double-Button-1> "[cb _click 1 @%x,%y];break"
61 + bind $w_list <$M1B-Up> "[cb _parent] ;break"
62 + bind $w_list <$M1B-Left> "[cb _parent] ;break"
63 + bind $w_list <Up> "[cb _move -1] ;break"
64 + bind $w_list <Down> "[cb _move 1] ;break"
65 + bind $w_list <$M1B-Right> "[cb _enter] ;break"
66 + bind $w_list <Return> "[cb _enter] ;break"
67 + bind $w_list <Prior> "[cb _page -1] ;break"
68 + bind $w_list <Next> "[cb _page 1] ;break"
69 bind $w_list <Left> break
70 bind $w_list <Right> break
71
72 - bind $tl <Visibility> "focus $w"
73 - bind $tl <Destroy> "
74 - array unset browser_buffer $w_list
75 - array unset browser_files $w_list
76 - array unset browser_status $w_list
77 - array unset browser_stack $w_list
78 - array unset browser_path $w_list
79 - array unset browser_commit $w_list
80 - array unset browser_busy $w_list
81 - "
82 - wm title $tl "[appname] ([reponame]): File Browser"
83 - ls_tree $w_list $browser_commit($w_list) {}
72 + bind $w_list <Visibility> [list focus $w_list]
73 + bind $w_list <Destroy> [list delete_this $this]
74 + set w $w_list
75 + _ls $this $browser_commit
76 + return $this
77 }
78
86 -proc browser_move {dir w} {
87 - global browser_files browser_busy
88 -
89 - if {$browser_busy($w)} return
79 +method _move {dir} {
80 + if {$browser_busy} return
81 set lno [lindex [split [$w index in_sel.first] .] 0]
82 incr lno $dir
92 - if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
83 + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
84 $w tag remove in_sel 0.0 end
85 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
86 $w see $lno.0
87 }
88 }
89
99 -proc browser_page {dir w} {
100 - global browser_files browser_busy
101 -
102 - if {$browser_busy($w)} return
90 +method _page {dir} {
91 + if {$browser_busy} return
92 $w yview scroll $dir pages
93 set lno [expr {int(
94 [lindex [$w yview] 0]
106 - * [llength $browser_files($w)]
95 + * [llength $browser_files]
96 + 1)}]
108 - if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
97 + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
98 $w tag remove in_sel 0.0 end
99 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
100 $w see $lno.0
101 }
102 }
103
115 -proc browser_parent {w} {
116 - global browser_files browser_status browser_path
117 - global browser_stack browser_busy
118 -
119 - if {$browser_busy($w)} return
120 - set info [lindex $browser_files($w) 0]
104 +method _parent {} {
105 + if {$browser_busy} return
106 + set info [lindex $browser_files 0]
107 if {[lindex $info 0] eq {parent}} {
122 - set parent [lindex $browser_stack($w) end-1]
123 - set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
124 - if {$browser_stack($w) eq {}} {
125 - regsub {:.*$} $browser_path($w) {:} browser_path($w)
108 + set parent [lindex $browser_stack end-1]
109 + set browser_stack [lrange $browser_stack 0 end-2]
110 + if {$browser_stack eq {}} {
111 + regsub {:.*$} $browser_path {:} browser_path
112 } else {
127 - regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
113 + regsub {/[^/]+$} $browser_path {} browser_path
114 }
129 - set browser_status($w) "Loading $browser_path($w)..."
130 - ls_tree $w [lindex $parent 0] [lindex $parent 1]
115 + set browser_status "Loading $browser_path..."
116 + _ls $this [lindex $parent 0] [lindex $parent 1]
117 }
118 }
119
134 -proc browser_enter {w} {
135 - global browser_files browser_status browser_path
136 - global browser_commit browser_stack browser_busy
137 -
138 - if {$browser_busy($w)} return
120 +method _enter {} {
121 + if {$browser_busy} return
122 set lno [lindex [split [$w index in_sel.first] .] 0]
140 - set info [lindex $browser_files($w) [expr {$lno - 1}]]
123 + set info [lindex $browser_files [expr {$lno - 1}]]
124 if {$info ne {}} {
125 switch -- [lindex $info 0] {
126 parent {
144 - browser_parent $w
127 + _parent $this
128 }
129 tree {
130 set name [lindex $info 2]
131 set escn [escape_path $name]
149 - set browser_status($w) "Loading $escn..."
150 - append browser_path($w) $escn
151 - ls_tree $w [lindex $info 1] $name
132 + set browser_status "Loading $escn..."
133 + append browser_path $escn
134 + _ls $this [lindex $info 1] $name
135 }
136 blob {
137 set name [lindex $info 2]
138 set p {}
156 - foreach n $browser_stack($w) {
139 + foreach n $browser_stack {
140 append p [lindex $n 1]
141 }
142 append p $name
160 - show_blame $browser_commit($w) $p
143 + show_blame $browser_commit $p
144 }
145 }
146 }
147 }
148
166 -proc browser_click {was_double_click w pos} {
167 - global browser_files browser_busy
168 -
169 - if {$browser_busy($w)} return
149 +method _click {was_double_click pos} {
150 + if {$browser_busy} return
151 set lno [lindex [split [$w index $pos] .] 0]
152 focus $w
153
173 - if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
154 + if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
155 $w tag remove in_sel 0.0 end
156 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
157 if {$was_double_click} {
177 - browser_enter $w
158 + _enter $this
159 }
160 }
161 }
162
182 -proc ls_tree {w tree_id name} {
183 - global browser_buffer browser_files browser_stack browser_busy
184 -
185 - set browser_buffer($w) {}
186 - set browser_files($w) {}
187 - set browser_busy($w) 1
163 +method _ls {tree_id {name {}}} {
164 + set browser_buffer {}
165 + set browser_files {}
166 + set browser_busy 1
167
168 $w conf -state normal
169 $w tag remove in_sel 0.0 end
170 $w delete 0.0 end
192 - if {$browser_stack($w) ne {}} {
171 + if {$browser_stack ne {}} {
172 $w image create end \
173 -align center -padx 5 -pady 1 \
174 -name icon0 \
175 -image file_uplevel
176 $w insert end {[Up To Parent]}
198 - lappend browser_files($w) parent
177 + lappend browser_files parent
178 }
200 - lappend browser_stack($w) [list $tree_id $name]
179 + lappend browser_stack [list $tree_id $name]
180 $w conf -state disabled
181
182 set cmd [list git ls-tree -z $tree_id]
183 set fd [open "| $cmd" r]
184 fconfigure $fd -blocking 0 -translation binary -encoding binary
206 - fileevent $fd readable [list read_ls_tree $fd $w]
185 + fileevent $fd readable [cb _read $fd]
186 }
187
209 -proc read_ls_tree {fd w} {
210 - global browser_buffer browser_files browser_status browser_busy
211 -
212 - if {![winfo exists $w]} {
213 - catch {close $fd}
214 - return
215 - }
216 -
217 - append browser_buffer($w) [read $fd]
218 - set pck [split $browser_buffer($w) "\0"]
219 - set browser_buffer($w) [lindex $pck end]
188 +method _read {fd} {
189 + append browser_buffer [read $fd]
190 + set pck [split $browser_buffer "\0"]
191 + set browser_buffer [lindex $pck end]
192
221 - set n [llength $browser_files($w)]
193 + set n [llength $browser_files]
194 $w conf -state normal
195 foreach p [lrange $pck 0 end-1] {
196 set info [split $p "\t"]
@@ -246,18 +218,22 @@ proc read_ls_tree {fd w} {
218 -name icon[incr n] \
219 -image $image
220 $w insert end [escape_path $path]
249 - lappend browser_files($w) [list $type $object $path]
221 + lappend browser_files [list $type $object $path]
222 }
223 $w conf -state disabled
224
225 if {[eof $fd]} {
226 close $fd
255 - set browser_status($w) Ready.
256 - set browser_busy($w) 0
257 - array unset browser_buffer $w
227 + set browser_status Ready.
228 + set browser_busy 0
229 + unset browser_buffer
230 if {$n > 0} {
231 $w tag add in_sel 1.0 2.0
232 focus -force $w
233 }
234 }
235 +} ifdeleted {
236 + catch {close $fd}
237 +}
238 +
239 }
lib/console.tcl
+38 -63
@@ -1,30 +1,29 @@
1 # git-gui console support
2 # Copyright (C) 2006, 2007 Shawn Pearce
3
4 -namespace eval console {
5 -
6 -variable next_console_id 0
7 -variable console_data
8 -variable console_cr
9 -
10 -proc new {short_title long_title} {
11 - variable next_console_id
12 - variable console_data
13 -
14 - set w .console[incr next_console_id]
15 - set console_data($w) [list $short_title $long_title]
16 - return [_init $w]
4 +class console {
5 +
6 +field t_short
7 +field t_long
8 +field w
9 +field console_cr
10 +
11 +constructor new {short_title long_title} {
12 + set t_short $short_title
13 + set t_long $long_title
14 + _init $this
15 + return $this
16 }
17
19 -proc _init {w} {
18 +method _init {} {
19 global M1B
21 - variable console_cr
22 - variable console_data
20 + make_toplevel top w
21 + wm title $top "[appname] ([reponame]): $t_short"
22 + set console_cr 1.0
23
24 - set console_cr($w) 1.0
25 - toplevel $w
24 frame $w.m
27 - label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
25 + label $w.m.l1 \
26 + -textvariable @t_long \
27 -anchor w \
28 -justify left \
29 -font font_uibold
@@ -67,11 +66,9 @@ proc _init {w} {
66 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
67 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
68 bind $w <Visibility> "focus $w"
70 - wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
71 - return $w
69 }
70
74 -proc exec {w cmd {after {}}} {
71 +method exec {cmd {after {}}} {
72 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
73 # But most users need that so we have to relogin. :-(
74 #
@@ -86,16 +83,13 @@ proc exec {w cmd {after {}}} {
83
84 set fd_f [open $cmd r]
85 fconfigure $fd_f -blocking 0 -translation binary
89 - fileevent $fd_f readable \
90 - [namespace code [list _read $w $fd_f $after]]
86 + fileevent $fd_f readable [cb _read $fd_f $after]
87 }
88
93 -proc _read {w fd after} {
94 - variable console_cr
95 -
89 +method _read {fd after} {
90 set buf [read $fd]
91 if {$buf ne {}} {
98 - if {![winfo exists $w]} {_init $w}
92 + if {![winfo exists $w.m.t]} {_init $this}
93 $w.m.t conf -state normal
94 set c 0
95 set n [string length $buf]
@@ -107,11 +101,11 @@ proc _read {w fd after} {
101
102 if {$lf < $cr} {
103 $w.m.t insert end [string range $buf $c $lf]
110 - set console_cr($w) [$w.m.t index {end -1c}]
104 + set console_cr [$w.m.t index {end -1c}]
105 set c $lf
106 incr c
107 } else {
114 - $w.m.t delete $console_cr($w) end
108 + $w.m.t delete $console_cr end
109 $w.m.t insert end "\n"
110 $w.m.t insert end [string range $buf $c $cr]
111 set c $cr
@@ -130,19 +124,19 @@ proc _read {w fd after} {
124 set ok 1
125 }
126 if {$after ne {}} {
133 - uplevel #0 $after $w $ok
127 + uplevel #0 $after $ok
128 } else {
135 - done $w $ok
129 + done $this $ok
130 }
131 return
132 }
133 fconfigure $fd -blocking 0
134 }
135
142 -proc chain {cmdlist w {ok 1}} {
136 +method chain {cmdlist {ok 1}} {
137 if {$ok} {
138 if {[llength $cmdlist] == 0} {
145 - done $w $ok
139 + done $this $ok
140 return
141 }
142
@@ -150,52 +144,33 @@ proc chain {cmdlist w {ok 1}} {
144 set cmdlist [lrange $cmdlist 1 end]
145
146 if {[lindex $cmd 0] eq {exec}} {
153 - exec $w \
154 - [lindex $cmd 1] \
155 - [namespace code [list chain $cmdlist]]
147 + exec $this \
148 + [lrange $cmd 1 end] \
149 + [cb chain $cmdlist]
150 } else {
157 - uplevel #0 $cmd $cmdlist $w $ok
151 + uplevel #0 $cmd [cb chain $cmdlist]
152 }
153 } else {
160 - done $w $ok
154 + done $this $ok
155 }
156 }
157
164 -proc done {args} {
165 - variable console_cr
166 - variable console_data
167 -
168 - switch -- [llength $args] {
169 - 2 {
170 - set w [lindex $args 0]
171 - set ok [lindex $args 1]
172 - }
173 - 3 {
174 - set w [lindex $args 1]
175 - set ok [lindex $args 2]
176 - }
177 - default {
178 - error "wrong number of args: done ?ignored? w ok"
179 - }
180 - }
181 -
158 +method done {ok} {
159 if {$ok} {
183 - if {[winfo exists $w]} {
160 + if {[winfo exists $w.m.s]} {
161 $w.m.s conf -background green -text {Success}
162 $w.ok conf -state normal
163 focus $w.ok
164 }
165 } else {
189 - if {![winfo exists $w]} {
190 - _init $w
166 + if {![winfo exists $w.m.s]} {
167 + _init $this
168 }
169 $w.m.s conf -background red -text {Error: Command Failed}
170 $w.ok conf -state normal
171 focus $w.ok
172 }
196 -
197 - array unset console_cr $w
198 - array unset console_data $w
173 + delete_this
174 }
175
176 }
lib/database.tcl
+6 -6
@@ -70,12 +70,12 @@ proc do_stats {} {
70
71 proc do_gc {} {
72 set w [console::new {gc} {Compressing the object database}]
73 - console::chain {
74 - {exec {git pack-refs --prune}}
75 - {exec {git reflog expire --all}}
76 - {exec {git repack -a -d -l}}
77 - {exec {git rerere gc}}
78 - } $w
73 + console::chain $w {
74 + {exec git pack-refs --prune}
75 + {exec git reflog expire --all}
76 + {exec git repack -a -d -l}
77 + {exec git rerere gc}
78 + }
79 }
80
81 proc do_fsck_objects {} {
lib/merge.tcl
+2 -1
@@ -123,7 +123,8 @@ Please select fewer branches. To merge more than 15 branches, merge the branche
123 set msg "Merging $current_branch, [join $names {, }]"
124 set ui_status_value "$msg..."
125 set cons [console::new "Merge" $msg]
126 - console::exec $cons $cmd [namespace code [list _finish $revcnt]]
126 + console::exec $cons $cmd \
127 + [namespace code [list _finish $revcnt $cons]]
128 bind $w <Destroy> {}
129 destroy $w
130 }