blob: 4fbc408c4d0a1f950c7d32768ed55cbd91005023 [file] [log] [blame]
Shawn O. Pearcebd11b822006-11-19 02:57:58 -05001#!/bin/sh
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002# Tcl ignores the next line -*- tcl -*- \
Shawn O. Pearce4e817d12007-06-22 01:10:12 -04003 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
5 then \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
7 exit; \
8 fi; \
9 exec wish "$0" -- "$@"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -050010
Shawn O. Pearce7e81d4e2007-02-12 16:12:04 -050011set appvers {@@GITGUI_VERSION@@}
Shawn O. Pearcebdc9ea22006-11-21 02:36:55 -050012set copyright {
Shawn O. Pearce871f4c92007-02-18 21:06:48 -050013Copyright © 2006, 2007 Shawn Pearce, et. al.
Shawn O. Pearcebdc9ea22006-11-21 02:36:55 -050014
Shawn O. Pearce0499b242007-01-20 20:08:20 -050015This program is free software; you can redistribute it and/or modify
16it under the terms of the GNU General Public License as published by
17the Free Software Foundation; either version 2 of the License, or
18(at your option) any later version.
Shawn O. Pearcebdc9ea22006-11-21 02:36:55 -050019
Shawn O. Pearce0499b242007-01-20 20:08:20 -050020This program is distributed in the hope that it will be useful,
21but WITHOUT ANY WARRANTY; without even the implied warranty of
22MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23GNU General Public License for more details.
24
25You should have received a copy of the GNU General Public License
26along with this program; if not, write to the Free Software
27Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -050028
Shawn O. Pearcec950c662007-01-20 21:48:56 -050029######################################################################
30##
Shawn O. Pearcecfb07cc2007-06-02 16:11:26 -040031## Tcl/Tk sanity check
32
33if {[catch {package require Tcl 8.4} err]
34 || [catch {package require Tk 8.4} err]
35} {
36 catch {wm withdraw .}
37 tk_messageBox \
38 -icon error \
39 -type ok \
40 -title "git-gui: fatal error" \
41 -message $err
42 exit 1
43}
44
45######################################################################
46##
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -040047## configure our library
48
49set oguilib {@@GITGUI_LIBDIR@@}
Shawn O. Pearceea75ee32007-05-27 00:03:37 -040050set oguirel {@@GITGUI_RELATIVE@@}
51if {$oguirel eq {1}} {
52 set oguilib [file dirname [file dirname [file normalize $argv0]]]
53 set oguilib [file join $oguilib share git-gui lib]
54} elseif {[string match @@* $oguirel]} {
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -040055 set oguilib [file join [file dirname [file normalize $argv0]] lib]
56}
Shawn O. Pearceb9e7efb2007-05-17 18:01:50 -040057set idx [file join $oguilib tclIndex]
58catch {
59 set fd [open $idx r]
60 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
61 set idx [list]
62 while {[gets $fd n] >= 0} {
63 if {$n ne {} && ![string match #* $n]} {
64 lappend idx $n
65 }
66 }
67 } else {
68 set idx {}
69 }
70 close $fd
71}
72if {$idx ne {}} {
73 set loaded [list]
74 foreach p $idx {
75 if {[lsearch -exact $loaded $p] >= 0} continue
76 puts $p
77 source [file join $oguilib $p]
78 lappend loaded $p
79 }
80 unset loaded p
81} else {
82 set auto_path [concat [list $oguilib] $auto_path]
83}
Shawn O. Pearceea75ee32007-05-27 00:03:37 -040084unset -nocomplain oguilib oguirel idx fd
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -040085
86if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
87 unset _verbose
88 rename auto_load real__auto_load
89 proc auto_load {name args} {
90 puts stderr "auto_load $name"
91 return [uplevel 1 real__auto_load $name $args]
92 }
93 rename source real__source
94 proc source {name} {
95 puts stderr "source $name"
96 uplevel 1 real__source $name
97 }
98}
99
100######################################################################
101##
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500102## read only globals
103
104set _appname [lindex [file split $argv0] end]
105set _gitdir {}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500106set _gitexec {}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500107set _reponame {}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500108set _iscygwin {}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500109
110proc appname {} {
111 global _appname
112 return $_appname
113}
114
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500115proc gitdir {args} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500116 global _gitdir
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500117 if {$args eq {}} {
118 return $_gitdir
119 }
120 return [eval [concat [list file join $_gitdir] $args]]
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500121}
122
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500123proc gitexec {args} {
124 global _gitexec
125 if {$_gitexec eq {}} {
Shawn O. Pearce81347222007-02-12 22:48:56 -0500126 if {[catch {set _gitexec [git --exec-path]} err]} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500127 error "Git not installed?\n\n$err"
128 }
129 }
130 if {$args eq {}} {
131 return $_gitexec
132 }
133 return [eval [concat [list file join $_gitexec] $args]]
134}
135
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500136proc reponame {} {
137 global _reponame
138 return $_reponame
139}
Shawn O. Pearceda5239d2006-11-11 19:03:06 -0500140
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500141proc is_MacOSX {} {
142 global tcl_platform tk_library
143 if {[tk windowingsystem] eq {aqua}} {
144 return 1
145 }
146 return 0
147}
148
149proc is_Windows {} {
150 global tcl_platform
151 if {$tcl_platform(platform) eq {windows}} {
152 return 1
153 }
154 return 0
155}
156
157proc is_Cygwin {} {
158 global tcl_platform _iscygwin
159 if {$_iscygwin eq {}} {
160 if {$tcl_platform(platform) eq {windows}} {
161 if {[catch {set p [exec cygpath --windir]} err]} {
162 set _iscygwin 0
163 } else {
164 set _iscygwin 1
165 }
166 } else {
167 set _iscygwin 0
168 }
169 }
170 return $_iscygwin
171}
172
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -0500173proc is_enabled {option} {
174 global enabled_options
175 if {[catch {set on $enabled_options($option)}]} {return 0}
176 return $on
177}
178
179proc enable_option {option} {
180 global enabled_options
181 set enabled_options($option) 1
182}
183
184proc disable_option {option} {
185 global enabled_options
186 set enabled_options($option) 0
187}
188
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500189######################################################################
190##
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500191## config
192
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500193proc is_many_config {name} {
194 switch -glob -- $name {
195 remote.*.fetch -
196 remote.*.push
197 {return 1}
198 *
199 {return 0}
200 }
201}
202
Shawn O. Pearcec5394492007-01-26 04:43:43 -0500203proc is_config_true {name} {
204 global repo_config
205 if {[catch {set v $repo_config($name)}]} {
206 return 0
207 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
208 return 1
209 } else {
210 return 0
211 }
212}
213
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -0500214proc load_config {include_global} {
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500215 global repo_config global_config default_config
216
217 array unset global_config
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -0500218 if {$include_global} {
219 catch {
Shawn O. Pearcedf6287e2007-02-08 19:53:36 -0500220 set fd_rc [open "| git config --global --list" r]
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -0500221 while {[gets $fd_rc line] >= 0} {
222 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
223 if {[is_many_config $name]} {
224 lappend global_config($name) $value
225 } else {
226 set global_config($name) $value
227 }
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500228 }
229 }
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -0500230 close $fd_rc
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500231 }
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500232 }
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -0500233
234 array unset repo_config
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500235 catch {
Shawn O. Pearcedf6287e2007-02-08 19:53:36 -0500236 set fd_rc [open "| git config --list" r]
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500237 while {[gets $fd_rc line] >= 0} {
238 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500239 if {[is_many_config $name]} {
240 lappend repo_config($name) $value
241 } else {
242 set repo_config($name) $value
243 }
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500244 }
245 }
246 close $fd_rc
247 }
248
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500249 foreach name [array names default_config] {
250 if {[catch {set v $global_config($name)}]} {
251 set global_config($name) $default_config($name)
252 }
253 if {[catch {set v $repo_config($name)}]} {
254 set repo_config($name) $default_config($name)
255 }
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500256 }
257}
258
Shawn O. Pearce81347222007-02-12 22:48:56 -0500259######################################################################
260##
261## handy utils
262
263proc git {args} {
264 return [eval exec git $args]
265}
266
Shawn O. Pearce27392912007-04-28 22:00:02 -0400267auto_load tk_optionMenu
268rename tk_optionMenu real__tkOptionMenu
269proc tk_optionMenu {w varName args} {
270 set m [eval real__tkOptionMenu $w $varName $args]
271 $m configure -font font_ui
272 $w configure -font font_ui
273 return $m
274}
275
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500276######################################################################
277##
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500278## version check
279
280set req_maj 1
281set req_min 5
282
283if {[catch {set v [git --version]} err]} {
284 catch {wm withdraw .}
285 error_popup "Cannot determine Git version:
286
287$err
288
289[appname] requires Git $req_maj.$req_min or later."
290 exit 1
291}
292if {[regexp {^git version (\d+)\.(\d+)} $v _junk act_maj act_min]} {
293 if {$act_maj < $req_maj
294 || ($act_maj == $req_maj && $act_min < $req_min)} {
295 catch {wm withdraw .}
296 error_popup "[appname] requires Git $req_maj.$req_min or later.
297
298You are using $v."
299 exit 1
300 }
301} else {
302 catch {wm withdraw .}
303 error_popup "Cannot parse Git version string:\n\n$v"
304 exit 1
305}
306unset -nocomplain v _junk act_maj act_min req_maj req_min
307
308######################################################################
309##
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500310## repository setup
311
Shawn O. Pearcec6127852007-05-08 21:58:25 -0400312if {[catch {
313 set _gitdir $env(GIT_DIR)
314 set _prefix {}
315 }]
316 && [catch {
317 set _gitdir [git rev-parse --git-dir]
318 set _prefix [git rev-parse --show-prefix]
319 } err]} {
Shawn O. Pearce44be3402006-11-11 19:10:10 -0500320 catch {wm withdraw .}
321 error_popup "Cannot find the git directory:\n\n$err"
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500322 exit 1
323}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500324if {![file isdirectory $_gitdir] && [is_Cygwin]} {
325 catch {set _gitdir [exec cygpath --unix $_gitdir]}
326}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500327if {![file isdirectory $_gitdir]} {
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500328 catch {wm withdraw .}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500329 error_popup "Git directory not found:\n\n$_gitdir"
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500330 exit 1
331}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500332if {[lindex [file split $_gitdir] end] ne {.git}} {
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500333 catch {wm withdraw .}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500334 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500335 exit 1
336}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500337if {[catch {cd [file dirname $_gitdir]} err]} {
Shawn O. Pearcefbee8502006-11-15 22:13:45 -0500338 catch {wm withdraw .}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500339 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
Shawn O. Pearcefbee8502006-11-15 22:13:45 -0500340 exit 1
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500341}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500342set _reponame [lindex [file split \
343 [file normalize [file dirname $_gitdir]]] \
Shawn O. Pearce16d18b82007-01-20 21:36:21 -0500344 end]
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500345
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500346######################################################################
347##
Shawn O. Pearce372ef952007-02-18 02:12:32 -0500348## global init
349
350set current_diff_path {}
351set current_diff_side {}
352set diff_actions [list]
353set ui_status_value {Initializing...}
354
355set HEAD {}
356set PARENT {}
357set MERGE_HEAD [list]
358set commit_type {}
359set empty_tree {}
360set current_branch {}
361set current_diff_path {}
362set selected_commit_type new
363
364######################################################################
365##
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500366## task management
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500367
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500368set rescan_active 0
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500369set diff_active 0
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500370set last_clicked {}
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500371
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500372set disable_on_lock [list]
373set index_lock_type none
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500374
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500375proc lock_index {type} {
376 global index_lock_type disable_on_lock
377
Shawn O. Pearce043f7012006-11-12 18:16:45 -0500378 if {$index_lock_type eq {none}} {
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500379 set index_lock_type $type
380 foreach w $disable_on_lock {
381 uplevel #0 $w disabled
382 }
383 return 1
Shawn O. Pearce53716a72006-11-18 03:31:25 -0500384 } elseif {$index_lock_type eq "begin-$type"} {
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500385 set index_lock_type $type
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500386 return 1
387 }
388 return 0
389}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500390
Shawn O. Pearcee210e672006-11-06 19:12:58 -0500391proc unlock_index {} {
392 global index_lock_type disable_on_lock
393
394 set index_lock_type none
395 foreach w $disable_on_lock {
396 uplevel #0 $w normal
397 }
398}
399
400######################################################################
401##
402## status
403
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500404proc repository_state {ctvar hdvar mhvar} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500405 global current_branch
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500406 upvar $ctvar ct $hdvar hd $mhvar mh
407
408 set mh [list]
Shawn O. Pearceec6b4242006-11-06 20:50:59 -0500409
Shawn O. Pearce81347222007-02-12 22:48:56 -0500410 if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
Shawn O. Pearce8553b772006-11-24 15:38:18 -0500411 set current_branch {}
412 } else {
Shawn O. Pearced90d83a2006-11-25 02:45:19 -0500413 regsub ^refs/((heads|tags|remotes)/)? \
Shawn O. Pearce8553b772006-11-24 15:38:18 -0500414 $current_branch \
415 {} \
416 current_branch
417 }
418
Shawn O. Pearce81347222007-02-12 22:48:56 -0500419 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500420 set hd {}
Shawn O. Pearceec6b4242006-11-06 20:50:59 -0500421 set ct initial
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500422 return
Shawn O. Pearceec6b4242006-11-06 20:50:59 -0500423 }
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500424
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500425 set merge_head [gitdir MERGE_HEAD]
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500426 if {[file exists $merge_head]} {
427 set ct merge
428 set fd_mh [open $merge_head r]
429 while {[gets $fd_mh line] >= 0} {
430 lappend mh $line
431 }
432 close $fd_mh
433 return
434 }
435
436 set ct normal
Shawn O. Pearceec6b4242006-11-06 20:50:59 -0500437}
438
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500439proc PARENT {} {
440 global PARENT empty_tree
441
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500442 set p [lindex $PARENT 0]
443 if {$p ne {}} {
444 return $p
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500445 }
446 if {$empty_tree eq {}} {
Shawn O. Pearce81347222007-02-12 22:48:56 -0500447 set empty_tree [git mktree << {}]
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500448 }
449 return $empty_tree
450}
451
Shawn O. Pearce46aaf902007-01-22 17:10:38 -0500452proc rescan {after {honor_trustmtime 1}} {
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500453 global HEAD PARENT MERGE_HEAD commit_type
Shawn O. Pearce08126652007-01-20 22:06:51 -0500454 global ui_index ui_workdir ui_status_value ui_comm
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500455 global rescan_active file_states
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -0500456 global repo_config
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500457
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500458 if {$rescan_active > 0 || ![lock_index read]} return
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500459
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500460 repository_state newType newHEAD newMERGE_HEAD
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500461 if {[string match amend* $commit_type]
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500462 && $newType eq {normal}
463 && $newHEAD eq $HEAD} {
Shawn O. Pearcee57ca852006-11-06 21:34:10 -0500464 } else {
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -0500465 set HEAD $newHEAD
466 set PARENT $newHEAD
467 set MERGE_HEAD $newMERGE_HEAD
468 set commit_type $newType
Shawn O. Pearcee57ca852006-11-06 21:34:10 -0500469 }
470
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500471 array unset file_states
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500472
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500473 if {![$ui_comm edit modified]
Shawn O. Pearce043f7012006-11-12 18:16:45 -0500474 || [string trim [$ui_comm get 0.0 end]] eq {}} {
Shawn O. Pearceb2f3bb12007-06-11 19:39:55 -0400475 if {[string match amend* $commit_type]} {
476 } elseif {[load_message GITGUI_MSG]} {
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500477 } elseif {[load_message MERGE_MSG]} {
478 } elseif {[load_message SQUASH_MSG]} {
479 }
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -0500480 $ui_comm edit reset
Shawn O. Pearce21d77442006-11-20 21:59:19 -0500481 $ui_comm edit modified false
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500482 }
483
Shawn O. Pearce64a906f2007-02-08 18:10:05 -0500484 if {[is_enabled branch]} {
Shawn O. Pearce63faf4d2007-02-08 15:59:39 -0500485 load_all_heads
486 populate_branch_menu
487 }
488
Shawn O. Pearce46aaf902007-01-22 17:10:38 -0500489 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500490 rescan_stage2 {} $after
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -0500491 } else {
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500492 set rescan_active 1
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -0500493 set ui_status_value {Refreshing file status...}
Shawn O. Pearce16403d02006-11-11 21:52:06 -0500494 set cmd [list git update-index]
495 lappend cmd -q
496 lappend cmd --unmerged
497 lappend cmd --ignore-missing
498 lappend cmd --refresh
499 set fd_rf [open "| $cmd" r]
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -0500500 fconfigure $fd_rf -blocking 0 -translation binary
Shawn O. Pearce390adae2006-11-11 19:40:33 -0500501 fileevent $fd_rf readable \
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500502 [list rescan_stage2 $fd_rf $after]
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -0500503 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500504}
505
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500506proc rescan_stage2 {fd after} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500507 global ui_status_value
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500508 global rescan_active buf_rdi buf_rdf buf_rlo
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500509
Shawn O. Pearce043f7012006-11-12 18:16:45 -0500510 if {$fd ne {}} {
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -0500511 read $fd
512 if {![eof $fd]} return
513 close $fd
514 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500515
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500516 set ls_others [list | git ls-files --others -z \
517 --exclude-per-directory=.gitignore]
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500518 set info_exclude [gitdir info exclude]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500519 if {[file readable $info_exclude]} {
520 lappend ls_others "--exclude-from=$info_exclude"
521 }
522
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500523 set buf_rdi {}
524 set buf_rdf {}
525 set buf_rlo {}
526
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500527 set rescan_active 3
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500528 set ui_status_value {Scanning for modified files ...}
Shawn O. Pearce4539eac2006-11-18 02:50:58 -0500529 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500530 set fd_df [open "| git diff-files -z" r]
531 set fd_lo [open $ls_others r]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500532
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500533 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
534 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
535 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500536 fileevent $fd_di readable [list read_diff_index $fd_di $after]
537 fileevent $fd_df readable [list read_diff_files $fd_df $after]
538 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500539}
540
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500541proc load_message {file} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500542 global ui_comm
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500543
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500544 set f [gitdir $file]
Shawn O. Pearcee57ca852006-11-06 21:34:10 -0500545 if {[file isfile $f]} {
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500546 if {[catch {set fd [open $f r]}]} {
547 return 0
548 }
Shawn O. Pearcee57ca852006-11-06 21:34:10 -0500549 set content [string trim [read $fd]]
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500550 close $fd
Shawn O. Pearce4e55d192007-01-25 12:54:59 -0500551 regsub -all -line {[ \r\t]+$} $content {} content
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500552 $ui_comm delete 0.0 end
553 $ui_comm insert end $content
554 return 1
555 }
556 return 0
557}
558
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500559proc read_diff_index {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500560 global buf_rdi
561
562 append buf_rdi [read $fd]
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500563 set c 0
564 set n [string length $buf_rdi]
565 while {$c < $n} {
566 set z1 [string first "\0" $buf_rdi $c]
567 if {$z1 == -1} break
568 incr z1
569 set z2 [string first "\0" $buf_rdi $z1]
570 if {$z2 == -1} break
571
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500572 incr c
Shawn O. Pearce86291552006-11-19 01:00:48 -0500573 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500574 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500575 merge_state \
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500576 [encoding convertfrom $p] \
Shawn O. Pearce86291552006-11-19 01:00:48 -0500577 [lindex $i 4]? \
578 [list [lindex $i 0] [lindex $i 2]] \
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500579 [list]
580 set c $z2
Shawn O. Pearce86291552006-11-19 01:00:48 -0500581 incr c
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500582 }
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500583 if {$c < $n} {
584 set buf_rdi [string range $buf_rdi $c end]
585 } else {
586 set buf_rdi {}
587 }
588
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500589 rescan_done $fd buf_rdi $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500590}
591
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500592proc read_diff_files {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500593 global buf_rdf
594
595 append buf_rdf [read $fd]
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500596 set c 0
597 set n [string length $buf_rdf]
598 while {$c < $n} {
599 set z1 [string first "\0" $buf_rdf $c]
600 if {$z1 == -1} break
601 incr z1
602 set z2 [string first "\0" $buf_rdf $z1]
603 if {$z2 == -1} break
604
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500605 incr c
Shawn O. Pearce86291552006-11-19 01:00:48 -0500606 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500607 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500608 merge_state \
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500609 [encoding convertfrom $p] \
Shawn O. Pearce86291552006-11-19 01:00:48 -0500610 ?[lindex $i 4] \
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500611 [list] \
Shawn O. Pearce86291552006-11-19 01:00:48 -0500612 [list [lindex $i 0] [lindex $i 2]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500613 set c $z2
Shawn O. Pearce86291552006-11-19 01:00:48 -0500614 incr c
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500615 }
Shawn O. Pearce868c8752006-11-07 18:34:09 -0500616 if {$c < $n} {
617 set buf_rdf [string range $buf_rdf $c end]
618 } else {
619 set buf_rdf {}
620 }
621
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500622 rescan_done $fd buf_rdf $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500623}
624
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500625proc read_ls_others {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500626 global buf_rlo
627
628 append buf_rlo [read $fd]
629 set pck [split $buf_rlo "\0"]
630 set buf_rlo [lindex $pck end]
631 foreach p [lrange $pck 0 end-1] {
Shawn O. Pearce51a989b2007-01-23 04:07:18 -0500632 merge_state [encoding convertfrom $p] ?O
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500633 }
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500634 rescan_done $fd buf_rlo $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500635}
636
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500637proc rescan_done {fd buf after} {
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -0400638 global rescan_active current_diff_path
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -0500639 global file_states repo_config
Shawn O. Pearce7f1df792006-11-11 18:38:00 -0500640 upvar $buf to_clear
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500641
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -0500642 if {![eof $fd]} return
643 set to_clear {}
644 close $fd
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500645 if {[incr rescan_active -1] > 0} return
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500646
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500647 prune_selection
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -0500648 unlock_index
649 display_all_files
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -0400650 if {$current_diff_path ne {}} reshow_diff
Shawn O. Pearce8f525482006-11-14 01:29:32 -0500651 uplevel #0 $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500652}
653
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500654proc prune_selection {} {
655 global file_states selected_paths
656
657 foreach path [array names selected_paths] {
658 if {[catch {set still_here $file_states($path)}]} {
659 unset selected_paths($path)
660 }
661 }
662}
663
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500664######################################################################
665##
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500666## ui helpers
667
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500668proc mapicon {w state path} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500669 global all_icons
670
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500671 if {[catch {set r $all_icons($state$w)}]} {
672 puts "error: no icon for $w state={$state} $path"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500673 return file_plain
674 }
675 return $r
676}
677
678proc mapdesc {state path} {
679 global all_descs
680
681 if {[catch {set r $all_descs($state)}]} {
682 puts "error: no desc for state={$state} $path"
683 return $state
684 }
685 return $r
686}
687
Shawn O. Pearce68e009d2006-11-11 17:59:34 -0500688proc escape_path {path} {
Shawn O. Pearce42b922f2007-02-08 17:13:51 -0500689 regsub -all {\\} $path "\\\\" path
Shawn O. Pearce68e009d2006-11-11 17:59:34 -0500690 regsub -all "\n" $path "\\n" path
691 return $path
692}
693
Shawn O. Pearce16403d02006-11-11 21:52:06 -0500694proc short_path {path} {
695 return [escape_path [lindex [file split $path] end]]
696}
697
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500698set next_icon_id 0
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -0500699set null_sha1 [string repeat 0 40]
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500700
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500701proc merge_state {path new_state {head_info {}} {index_info {}}} {
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -0500702 global file_states next_icon_id null_sha1
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500703
Shawn O. Pearce6b292672006-11-07 19:58:37 -0500704 set s0 [string index $new_state 0]
705 set s1 [string index $new_state 1]
706
707 if {[catch {set info $file_states($path)}]} {
708 set state __
709 set icon n[incr next_icon_id]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500710 } else {
Shawn O. Pearce6b292672006-11-07 19:58:37 -0500711 set state [lindex $info 0]
712 set icon [lindex $info 1]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500713 if {$head_info eq {}} {set head_info [lindex $info 2]}
714 if {$index_info eq {}} {set index_info [lindex $info 3]}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500715 }
716
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500717 if {$s0 eq {?}} {set s0 [string index $state 0]} \
718 elseif {$s0 eq {_}} {set s0 _}
719
720 if {$s1 eq {?}} {set s1 [string index $state 1]} \
721 elseif {$s1 eq {_}} {set s1 _}
722
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -0500723 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
724 set head_info [list 0 $null_sha1]
725 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500726 && $head_info eq {}} {
727 set head_info $index_info
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500728 }
729
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -0500730 set file_states($path) [list $s0$s1 $icon \
731 $head_info $index_info \
732 ]
Shawn O. Pearce6b292672006-11-07 19:58:37 -0500733 return $state
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500734}
735
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500736proc display_file_helper {w path icon_name old_m new_m} {
737 global file_lists
738
739 if {$new_m eq {_}} {
Shawn O. Pearce156b2922007-01-25 22:38:59 -0500740 set lno [lsearch -sorted -exact $file_lists($w) $path]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500741 if {$lno >= 0} {
742 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
743 incr lno
744 $w conf -state normal
745 $w delete $lno.0 [expr {$lno + 1}].0
746 $w conf -state disabled
747 }
748 } elseif {$old_m eq {_} && $new_m ne {_}} {
749 lappend file_lists($w) $path
750 set file_lists($w) [lsort -unique $file_lists($w)]
Shawn O. Pearce156b2922007-01-25 22:38:59 -0500751 set lno [lsearch -sorted -exact $file_lists($w) $path]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500752 incr lno
753 $w conf -state normal
754 $w image create $lno.0 \
755 -align center -padx 5 -pady 1 \
756 -name $icon_name \
757 -image [mapicon $w $new_m $path]
758 $w insert $lno.1 "[escape_path $path]\n"
759 $w conf -state disabled
760 } elseif {$old_m ne $new_m} {
761 $w conf -state normal
762 $w image conf $icon_name -image [mapicon $w $new_m $path]
763 $w conf -state disabled
764 }
765}
766
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500767proc display_file {path state} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500768 global file_states selected_paths
769 global ui_index ui_workdir
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500770
771 set old_m [merge_state $path $state]
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500772 set s $file_states($path)
773 set new_m [lindex $s 0]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500774 set icon_name [lindex $s 1]
775
Shawn O. Pearce079d0d52007-01-21 13:18:11 -0500776 set o [string index $old_m 0]
777 set n [string index $new_m 0]
778 if {$o eq {U}} {
779 set o _
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500780 }
Shawn O. Pearce079d0d52007-01-21 13:18:11 -0500781 if {$n eq {U}} {
782 set n _
783 }
784 display_file_helper $ui_index $path $icon_name $o $n
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500785
Shawn O. Pearce079d0d52007-01-21 13:18:11 -0500786 if {[string index $old_m 0] eq {U}} {
787 set o U
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500788 } else {
Shawn O. Pearcea4b17862007-01-21 13:25:06 -0500789 set o [string index $old_m 1]
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500790 }
Shawn O. Pearce079d0d52007-01-21 13:18:11 -0500791 if {[string index $new_m 0] eq {U}} {
792 set n U
793 } else {
794 set n [string index $new_m 1]
795 }
796 display_file_helper $ui_workdir $path $icon_name $o $n
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500797
Shawn O. Pearcee7348172006-11-23 21:40:45 -0500798 if {$new_m eq {__}} {
Shawn O. Pearcee7348172006-11-23 21:40:45 -0500799 unset file_states($path)
800 catch {unset selected_paths($path)}
Shawn O. Pearcee7348172006-11-23 21:40:45 -0500801 }
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500802}
Shawn O. Pearcee7348172006-11-23 21:40:45 -0500803
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500804proc display_all_files_helper {w path icon_name m} {
805 global file_lists
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500806
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500807 lappend file_lists($w) $path
808 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
809 $w image create end \
810 -align center -padx 5 -pady 1 \
811 -name $icon_name \
812 -image [mapicon $w $m $path]
813 $w insert end "[escape_path $path]\n"
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500814}
815
816proc display_all_files {} {
Shawn O. Pearce08126652007-01-20 22:06:51 -0500817 global ui_index ui_workdir
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500818 global file_states file_lists
Shawn O. Pearce833eda72007-01-20 23:46:53 -0500819 global last_clicked
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500820
821 $ui_index conf -state normal
Shawn O. Pearce08126652007-01-20 22:06:51 -0500822 $ui_workdir conf -state normal
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500823
Shawn O. Pearce7f1df792006-11-11 18:38:00 -0500824 $ui_index delete 0.0 end
Shawn O. Pearce08126652007-01-20 22:06:51 -0500825 $ui_workdir delete 0.0 end
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500826 set last_clicked {}
Shawn O. Pearce7f1df792006-11-11 18:38:00 -0500827
Shawn O. Pearce62aac802006-11-11 20:00:35 -0500828 set file_lists($ui_index) [list]
Shawn O. Pearce08126652007-01-20 22:06:51 -0500829 set file_lists($ui_workdir) [list]
Shawn O. Pearce62aac802006-11-11 20:00:35 -0500830
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500831 foreach path [lsort [array names file_states]] {
832 set s $file_states($path)
833 set m [lindex $s 0]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500834 set icon_name [lindex $s 1]
835
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500836 set s [string index $m 0]
837 if {$s ne {U} && $s ne {_}} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500838 display_all_files_helper $ui_index $path \
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500839 $icon_name $s
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500840 }
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500841
842 if {[string index $m 0] eq {U}} {
843 set s U
844 } else {
845 set s [string index $m 1]
846 }
847 if {$s ne {_}} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500848 display_all_files_helper $ui_workdir $path \
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500849 $icon_name $s
Shawn O. Pearce24263b72006-11-13 16:06:38 -0500850 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500851 }
852
Shawn O. Pearce93f654d2006-11-07 19:30:54 -0500853 $ui_index conf -state disabled
Shawn O. Pearce08126652007-01-20 22:06:51 -0500854 $ui_workdir conf -state disabled
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500855}
856
Shawn O. Pearce35874c12007-01-29 00:50:41 -0500857######################################################################
858##
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500859## icons
860
861set filemask {
862#define mask_width 14
863#define mask_height 15
864static unsigned char mask_bits[] = {
865 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
866 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
867 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
868}
869
870image create bitmap file_plain -background white -foreground black -data {
871#define plain_width 14
872#define plain_height 15
873static unsigned char plain_bits[] = {
874 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
875 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
876 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
877} -maskdata $filemask
878
879image create bitmap file_mod -background white -foreground blue -data {
880#define mod_width 14
881#define mod_height 15
882static unsigned char mod_bits[] = {
883 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
884 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
885 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
886} -maskdata $filemask
887
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500888image create bitmap file_fulltick -background white -foreground "#007000" -data {
889#define file_fulltick_width 14
890#define file_fulltick_height 15
891static unsigned char file_fulltick_bits[] = {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500892 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
893 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
894 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
895} -maskdata $filemask
896
897image create bitmap file_parttick -background white -foreground "#005050" -data {
898#define parttick_width 14
899#define parttick_height 15
900static unsigned char parttick_bits[] = {
901 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
902 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
903 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
904} -maskdata $filemask
905
906image create bitmap file_question -background white -foreground black -data {
907#define file_question_width 14
908#define file_question_height 15
909static unsigned char file_question_bits[] = {
910 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
911 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
912 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
913} -maskdata $filemask
914
915image create bitmap file_removed -background white -foreground red -data {
916#define file_removed_width 14
917#define file_removed_height 15
918static unsigned char file_removed_bits[] = {
919 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
920 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
921 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
922} -maskdata $filemask
923
924image create bitmap file_merge -background white -foreground blue -data {
925#define file_merge_width 14
926#define file_merge_height 15
927static unsigned char file_merge_bits[] = {
928 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
929 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
930 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
931} -maskdata $filemask
932
Shawn O. Pearce3eddda92007-01-29 02:50:10 -0500933set file_dir_data {
934#define file_width 18
935#define file_height 18
936static unsigned char file_bits[] = {
937 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
938 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
939 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
940 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
941 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
942}
943image create bitmap file_dir -background white -foreground blue \
944 -data $file_dir_data -maskdata $file_dir_data
945unset file_dir_data
Shawn O. Pearce35874c12007-01-29 00:50:41 -0500946
Shawn O. Pearce3eddda92007-01-29 02:50:10 -0500947set file_uplevel_data {
948#define up_width 15
949#define up_height 15
950static unsigned char up_bits[] = {
951 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
952 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
953 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
954}
955image create bitmap file_uplevel -background white -foreground red \
956 -data $file_uplevel_data -maskdata $file_uplevel_data
957unset file_uplevel_data
Shawn O. Pearce35874c12007-01-29 00:50:41 -0500958
Shawn O. Pearce6b292672006-11-07 19:58:37 -0500959set ui_index .vpane.files.index.list
Shawn O. Pearce08126652007-01-20 22:06:51 -0500960set ui_workdir .vpane.files.workdir.list
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500961
962set all_icons(_$ui_index) file_plain
963set all_icons(A$ui_index) file_fulltick
964set all_icons(M$ui_index) file_fulltick
965set all_icons(D$ui_index) file_removed
966set all_icons(U$ui_index) file_merge
967
968set all_icons(_$ui_workdir) file_plain
969set all_icons(M$ui_workdir) file_mod
970set all_icons(D$ui_workdir) file_question
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500971set all_icons(U$ui_workdir) file_merge
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500972set all_icons(O$ui_workdir) file_plain
973
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500974set max_status_desc 0
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500975foreach i {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500976 {__ "Unmodified"}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500977
Shawn O. Pearceac391602007-01-20 23:00:28 -0500978 {_M "Modified, not staged"}
979 {M_ "Staged for commit"}
980 {MM "Portions staged for commit"}
981 {MD "Staged for commit, missing"}
982
983 {_O "Untracked, not staged"}
984 {A_ "Staged for commit"}
985 {AM "Portions staged for commit"}
986 {AD "Staged for commit, missing"}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500987
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500988 {_D "Missing"}
Shawn O. Pearceac391602007-01-20 23:00:28 -0500989 {D_ "Staged for removal"}
990 {DO "Staged for removal, still present"}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500991
Shawn O. Pearceac391602007-01-20 23:00:28 -0500992 {U_ "Requires merge resolution"}
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -0500993 {UU "Requires merge resolution"}
Shawn O. Pearceac391602007-01-20 23:00:28 -0500994 {UM "Requires merge resolution"}
995 {UD "Requires merge resolution"}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500996 } {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -0500997 if {$max_status_desc < [string length [lindex $i 1]]} {
998 set max_status_desc [string length [lindex $i 1]]
Shawn O. Pearce131f5032006-11-06 16:07:32 -0500999 }
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001000 set all_descs([lindex $i 0]) [lindex $i 1]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001001}
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001002unset i
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001003
1004######################################################################
1005##
1006## util
1007
Shawn O. Pearce16fccd72006-11-12 02:22:21 -05001008proc bind_button3 {w cmd} {
1009 bind $w <Any-Button-3> $cmd
1010 if {[is_MacOSX]} {
1011 bind $w <Control-Button-1> $cmd
1012 }
1013}
1014
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001015proc scrollbar2many {list mode args} {
1016 foreach w $list {eval $w $mode $args}
1017}
1018
1019proc many2scrollbar {list mode sb top bottom} {
1020 $sb set $top $bottom
1021 foreach w $list {$w $mode moveto $top}
1022}
1023
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001024proc incr_font_size {font {amt 1}} {
1025 set sz [font configure $font -size]
1026 incr sz $amt
1027 font configure $font -size $sz
1028 font configure ${font}bold -size $sz
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001029 font configure ${font}italic -size $sz
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001030}
1031
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001032######################################################################
1033##
1034## ui commands
1035
Shawn O. Pearcedccfa672007-01-20 21:56:25 -05001036set starting_gitk_msg {Starting gitk... please wait...}
Shawn O. Pearcecc4b1c02006-11-06 23:47:05 -05001037
Shawn O. Pearced0752422006-11-21 20:33:09 -05001038proc do_gitk {revs} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001039 global env ui_status_value starting_gitk_msg
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001040
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001041 # -- Always start gitk through whatever we were loaded with. This
1042 # lets us bypass using shell process on Windows systems.
1043 #
Shawn O. Pearce681bfd52007-05-02 12:44:44 -04001044 set cmd [list [info nameofexecutable]]
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001045 lappend cmd [gitexec gitk]
Shawn O. Pearced0752422006-11-21 20:33:09 -05001046 if {$revs ne {}} {
1047 append cmd { }
1048 append cmd $revs
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001049 }
Shawn O. Pearced0752422006-11-21 20:33:09 -05001050
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001051 if {[catch {eval exec $cmd &} err]} {
Shawn O. Pearced0752422006-11-21 20:33:09 -05001052 error_popup "Failed to start gitk:\n\n$err"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001053 } else {
Shawn O. Pearced0752422006-11-21 20:33:09 -05001054 set ui_status_value $starting_gitk_msg
1055 after 10000 {
1056 if {$ui_status_value eq $starting_gitk_msg} {
1057 set ui_status_value {Ready.}
1058 }
1059 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001060 }
1061}
1062
Shawn O. Pearceb5834d72006-11-12 02:27:28 -05001063set is_quitting 0
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05001064
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001065proc do_quit {} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001066 global ui_comm is_quitting repo_config commit_type
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05001067
Shawn O. Pearceb5834d72006-11-12 02:27:28 -05001068 if {$is_quitting} return
1069 set is_quitting 1
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001070
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001071 if {[winfo exists $ui_comm]} {
1072 # -- Stash our current commit buffer.
1073 #
1074 set save [gitdir GITGUI_MSG]
1075 set msg [string trim [$ui_comm get 0.0 end]]
1076 regsub -all -line {[ \r\t]+$} $msg {} msg
1077 if {(![string match amend* $commit_type]
1078 || [$ui_comm edit modified])
1079 && $msg ne {}} {
1080 catch {
1081 set fd [open $save w]
1082 puts -nonewline $fd $msg
1083 close $fd
1084 }
1085 } else {
1086 catch {file delete $save}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001087 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001088
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001089 # -- Stash our current window geometry into this repository.
1090 #
1091 set cfg_geometry [list]
1092 lappend cfg_geometry [wm geometry .]
1093 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1094 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1095 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1096 set rc_geometry {}
1097 }
1098 if {$cfg_geometry ne $rc_geometry} {
Shawn O. Pearce81347222007-02-12 22:48:56 -05001099 catch {git config gui.geometry $cfg_geometry}
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001100 }
Shawn O. Pearce51f4d162006-11-12 03:47:00 -05001101 }
1102
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001103 destroy .
1104}
1105
1106proc do_rescan {} {
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001107 rescan {set ui_status_value {Ready.}}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001108}
1109
Shawn O. Pearce6e27d822006-11-06 20:03:36 -05001110proc do_commit {} {
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001111 commit_tree
Shawn O. Pearce6e27d822006-11-06 20:03:36 -05001112}
1113
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001114proc toggle_or_diff {w x y} {
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001115 global file_states file_lists current_diff_path ui_index ui_workdir
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001116 global last_clicked selected_paths
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001117
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001118 set pos [split [$w index @$x,$y] .]
1119 set lno [lindex $pos 0]
1120 set col [lindex $pos 1]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001121 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1122 if {$path eq {}} {
1123 set last_clicked {}
1124 return
1125 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001126
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001127 set last_clicked [list $w $lno]
1128 array unset selected_paths
1129 $ui_index tag remove in_sel 0.0 end
Shawn O. Pearce08126652007-01-20 22:06:51 -05001130 $ui_workdir tag remove in_sel 0.0 end
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001131
1132 if {$col == 0} {
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001133 if {$current_diff_path eq $path} {
Shawn O. Pearce32e0bca2006-11-18 03:03:16 -05001134 set after {reshow_diff;}
1135 } else {
1136 set after {}
1137 }
Shawn O. Pearcede5f6d52007-01-20 23:10:30 -05001138 if {$w eq $ui_index} {
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001139 update_indexinfo \
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05001140 "Unstaging [short_path $path] from commit" \
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001141 [list $path] \
1142 [concat $after {set ui_status_value {Ready.}}]
Shawn O. Pearcede5f6d52007-01-20 23:10:30 -05001143 } elseif {$w eq $ui_workdir} {
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001144 update_index \
Shawn O. Pearce4d583c82007-01-20 19:07:46 -05001145 "Adding [short_path $path]" \
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001146 [list $path] \
1147 [concat $after {set ui_status_value {Ready.}}]
1148 }
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001149 } else {
Shawn O. Pearce03e4ec52006-11-11 17:52:16 -05001150 show_diff $path $w $lno
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001151 }
1152}
1153
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001154proc add_one_to_selection {w x y} {
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001155 global file_lists last_clicked selected_paths
Shawn O. Pearce7f1df792006-11-11 18:38:00 -05001156
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001157 set lno [lindex [split [$w index @$x,$y] .] 0]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001158 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1159 if {$path eq {}} {
1160 set last_clicked {}
1161 return
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001162 }
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001163
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001164 if {$last_clicked ne {}
1165 && [lindex $last_clicked 0] ne $w} {
1166 array unset selected_paths
1167 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1168 }
1169
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001170 set last_clicked [list $w $lno]
1171 if {[catch {set in_sel $selected_paths($path)}]} {
1172 set in_sel 0
1173 }
1174 if {$in_sel} {
1175 unset selected_paths($path)
1176 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1177 } else {
1178 set selected_paths($path) 1
1179 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1180 }
1181}
1182
1183proc add_range_to_selection {w x y} {
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001184 global file_lists last_clicked selected_paths
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001185
1186 if {[lindex $last_clicked 0] ne $w} {
1187 toggle_or_diff $w $x $y
1188 return
1189 }
1190
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001191 set lno [lindex [split [$w index @$x,$y] .] 0]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001192 set lc [lindex $last_clicked 1]
1193 if {$lc < $lno} {
1194 set begin $lc
1195 set end $lno
1196 } else {
1197 set begin $lno
1198 set end $lc
1199 }
1200
1201 foreach path [lrange $file_lists($w) \
1202 [expr {$begin - 1}] \
1203 [expr {$end - 1}]] {
1204 set selected_paths($path) 1
1205 }
1206 $w tag add in_sel $begin.0 [expr {$end + 1}].0
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001207}
1208
1209######################################################################
1210##
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001211## config defaults
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001212
Shawn O. Pearce00f949f2006-11-12 02:30:02 -05001213set cursor_ptr arrow
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001214font create font_diff -family Courier -size 10
1215font create font_ui
1216catch {
1217 label .dummy
1218 eval font configure font_ui [font actual [.dummy cget -font]]
1219 destroy .dummy
1220}
1221
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001222font create font_uiitalic
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001223font create font_uibold
1224font create font_diffbold
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001225font create font_diffitalic
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001226
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001227foreach class {Button Checkbutton Entry Label
1228 Labelframe Listbox Menu Message
Shawn O. Pearce63091722007-06-02 17:18:46 -04001229 Radiobutton Spinbox Text} {
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001230 option add *$class.font font_ui
1231}
1232unset class
1233
Shawn O. Pearce3d5793b2007-05-24 02:33:13 -04001234if {[is_MacOSX]} {
Shawn O. Pearce16fccd72006-11-12 02:22:21 -05001235 set M1B M1
1236 set M1T Cmd
Shawn O. Pearceb673bbc2006-11-21 20:21:11 -05001237} else {
Shawn O. Pearce3d5793b2007-05-24 02:33:13 -04001238 set M1B Control
1239 set M1T Ctrl
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001240}
1241
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001242proc apply_config {} {
1243 global repo_config font_descs
1244
1245 foreach option $font_descs {
1246 set name [lindex $option 0]
1247 set font [lindex $option 1]
1248 if {[catch {
1249 foreach {cn cv} $repo_config(gui.$name) {
1250 font configure $font $cn $cv
1251 }
1252 } err]} {
1253 error_popup "Invalid font specified in gui.$name:\n\n$err"
1254 }
1255 foreach {cn cv} [font configure $font] {
1256 font configure ${font}bold $cn $cv
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001257 font configure ${font}italic $cn $cv
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001258 }
1259 font configure ${font}bold -weight bold
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001260 font configure ${font}italic -slant italic
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001261 }
1262}
1263
Shawn O. Pearce6b90d392007-01-27 02:31:01 -05001264set default_config(merge.summary) false
Shawn O. Pearcec5394492007-01-26 04:43:43 -05001265set default_config(merge.verbosity) 2
Shawn O. Pearcedb453782007-01-29 02:56:07 -05001266set default_config(user.name) {}
1267set default_config(user.email) {}
1268
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001269set default_config(gui.trustmtime) false
Shawn O. Pearce358d8de2006-11-12 19:20:02 -05001270set default_config(gui.diffcontext) 5
Shawn O. Pearcec8456922007-01-21 16:28:59 -05001271set default_config(gui.newbranchtemplate) {}
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001272set default_config(gui.fontui) [font configure font_ui]
1273set default_config(gui.fontdiff) [font configure font_diff]
1274set font_descs {
1275 {fontui font_ui {Main Font}}
1276 {fontdiff font_diff {Diff/Console Font}}
1277}
Shawn O. Pearce6bbd1cb2006-11-12 16:24:52 -05001278load_config 0
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001279apply_config
1280
1281######################################################################
1282##
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001283## feature option selection
1284
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001285if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
1286 unset _junk
1287} else {
1288 set subcommand gui
1289}
1290if {$subcommand eq {gui.sh}} {
1291 set subcommand gui
1292}
1293if {$subcommand eq {gui} && [llength $argv] > 0} {
1294 set subcommand [lindex $argv 0]
1295 set argv [lrange $argv 1 end]
1296}
1297
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001298enable_option multicommit
1299enable_option branch
1300enable_option transport
1301
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001302switch -- $subcommand {
Shawn O. Pearceb90d4792007-02-16 00:24:03 -05001303browser -
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001304blame {
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001305 disable_option multicommit
1306 disable_option branch
1307 disable_option transport
1308}
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001309citool {
1310 enable_option singlecommit
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001311
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001312 disable_option multicommit
1313 disable_option branch
1314 disable_option transport
1315}
1316}
1317
1318######################################################################
1319##
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001320## ui construction
1321
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001322set ui_comm {}
1323
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001324# -- Menu Bar
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001325#
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001326menu .mbar -tearoff 0
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001327.mbar add cascade -label Repository -menu .mbar.repository
1328.mbar add cascade -label Edit -menu .mbar.edit
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05001329if {[is_enabled branch]} {
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001330 .mbar add cascade -label Branch -menu .mbar.branch
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001331}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001332if {[is_enabled multicommit] || [is_enabled singlecommit]} {
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001333 .mbar add cascade -label Commit -menu .mbar.commit
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001334}
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05001335if {[is_enabled transport]} {
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001336 .mbar add cascade -label Merge -menu .mbar.merge
1337 .mbar add cascade -label Fetch -menu .mbar.fetch
1338 .mbar add cascade -label Push -menu .mbar.push
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05001339}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001340. configure -menu .mbar
1341
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001342# -- Repository Menu
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001343#
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001344menu .mbar.repository
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001345
1346.mbar.repository add command \
1347 -label {Browse Current Branch} \
Shawn O. Pearcec74b6c62007-05-08 20:33:47 -04001348 -command {browser::new $current_branch}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001349trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001350.mbar.repository add separator
1351
Shawn O. Pearced0752422006-11-21 20:33:09 -05001352.mbar.repository add command \
1353 -label {Visualize Current Branch} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001354 -command {do_gitk $current_branch}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001355trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
Shawn O. Pearce5753ef12007-01-25 13:01:16 -05001356.mbar.repository add command \
1357 -label {Visualize All Branches} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001358 -command {do_gitk --all}
Shawn O. Pearced0752422006-11-21 20:33:09 -05001359.mbar.repository add separator
Shawn O. Pearce75e355d2006-11-20 22:22:10 -05001360
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -05001361if {[is_enabled multicommit]} {
Shawn O. Pearce0fd49d02007-01-24 15:21:01 -05001362 .mbar.repository add command -label {Database Statistics} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001363 -command do_stats
Shawn O. Pearce0fd49d02007-01-24 15:21:01 -05001364
Shawn O. Pearce81c0f292007-01-20 18:38:12 -05001365 .mbar.repository add command -label {Compress Database} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001366 -command do_gc
Shawn O. Pearce4aca7402006-11-15 22:35:26 -05001367
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001368 .mbar.repository add command -label {Verify Database} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001369 -command do_fsck_objects
Shawn O. Pearce444f92d2006-11-20 21:43:41 -05001370
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001371 .mbar.repository add separator
Shawn O. Pearce75e355d2006-11-20 22:22:10 -05001372
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001373 if {[is_Cygwin]} {
1374 .mbar.repository add command \
1375 -label {Create Desktop Icon} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001376 -command do_cygwin_shortcut
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001377 } elseif {[is_Windows]} {
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001378 .mbar.repository add command \
Shawn O. Pearce4aca7402006-11-15 22:35:26 -05001379 -label {Create Desktop Icon} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001380 -command do_windows_shortcut
Shawn O. Pearce06c31112006-11-18 00:31:00 -05001381 } elseif {[is_MacOSX]} {
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001382 .mbar.repository add command \
Shawn O. Pearce06c31112006-11-18 00:31:00 -05001383 -label {Create Desktop Icon} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001384 -command do_macosx_app
Shawn O. Pearce4aca7402006-11-15 22:35:26 -05001385 }
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05001386}
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05001387
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001388.mbar.repository add command -label Quit \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001389 -command do_quit \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001390 -accelerator $M1T-Q
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001391
Shawn O. Pearce98616712006-11-11 15:51:41 -05001392# -- Edit Menu
1393#
1394menu .mbar.edit
1395.mbar.edit add command -label Undo \
1396 -command {catch {[focus] edit undo}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001397 -accelerator $M1T-Z
Shawn O. Pearce98616712006-11-11 15:51:41 -05001398.mbar.edit add command -label Redo \
1399 -command {catch {[focus] edit redo}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001400 -accelerator $M1T-Y
Shawn O. Pearce98616712006-11-11 15:51:41 -05001401.mbar.edit add separator
1402.mbar.edit add command -label Cut \
1403 -command {catch {tk_textCut [focus]}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001404 -accelerator $M1T-X
Shawn O. Pearce98616712006-11-11 15:51:41 -05001405.mbar.edit add command -label Copy \
1406 -command {catch {tk_textCopy [focus]}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001407 -accelerator $M1T-C
Shawn O. Pearce98616712006-11-11 15:51:41 -05001408.mbar.edit add command -label Paste \
1409 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001410 -accelerator $M1T-V
Shawn O. Pearce98616712006-11-11 15:51:41 -05001411.mbar.edit add command -label Delete \
1412 -command {catch {[focus] delete sel.first sel.last}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001413 -accelerator Del
Shawn O. Pearce98616712006-11-11 15:51:41 -05001414.mbar.edit add separator
1415.mbar.edit add command -label {Select All} \
1416 -command {catch {[focus] tag add sel 0.0 end}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001417 -accelerator $M1T-A
Shawn O. Pearce98616712006-11-11 15:51:41 -05001418
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05001419# -- Branch Menu
1420#
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05001421if {[is_enabled branch]} {
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001422 menu .mbar.branch
1423
1424 .mbar.branch add command -label {Create...} \
1425 -command do_create_branch \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001426 -accelerator $M1T-N
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001427 lappend disable_on_lock [list .mbar.branch entryconf \
1428 [.mbar.branch index last] -state]
1429
1430 .mbar.branch add command -label {Delete...} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001431 -command do_delete_branch
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001432 lappend disable_on_lock [list .mbar.branch entryconf \
1433 [.mbar.branch index last] -state]
Shawn O. Pearcefd234df2007-02-26 11:22:10 -05001434
1435 .mbar.branch add command -label {Reset...} \
Shawn O. Pearcea6c9b082007-05-02 13:56:27 -04001436 -command merge::reset_hard
Shawn O. Pearcefd234df2007-02-26 11:22:10 -05001437 lappend disable_on_lock [list .mbar.branch entryconf \
1438 [.mbar.branch index last] -state]
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001439}
1440
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001441# -- Commit Menu
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001442#
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001443if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1444 menu .mbar.commit
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001445
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001446 .mbar.commit add radiobutton \
1447 -label {New Commit} \
1448 -command do_select_commit_type \
1449 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001450 -value new
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001451 lappend disable_on_lock \
1452 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001453
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001454 .mbar.commit add radiobutton \
1455 -label {Amend Last Commit} \
1456 -command do_select_commit_type \
1457 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001458 -value amend
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001459 lappend disable_on_lock \
1460 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001461
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001462 .mbar.commit add separator
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001463
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001464 .mbar.commit add command -label Rescan \
1465 -command do_rescan \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001466 -accelerator F5
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001467 lappend disable_on_lock \
1468 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001469
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001470 .mbar.commit add command -label {Add To Commit} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001471 -command do_add_selection
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001472 lappend disable_on_lock \
1473 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001474
Shawn O. Pearce24d2bf22007-02-08 19:44:49 -05001475 .mbar.commit add command -label {Add Existing To Commit} \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001476 -command do_add_all \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001477 -accelerator $M1T-I
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001478 lappend disable_on_lock \
1479 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001480
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001481 .mbar.commit add command -label {Unstage From Commit} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001482 -command do_unstage_selection
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001483 lappend disable_on_lock \
1484 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001485
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001486 .mbar.commit add command -label {Revert Changes} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001487 -command do_revert_selection
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001488 lappend disable_on_lock \
1489 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001490
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001491 .mbar.commit add separator
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001492
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001493 .mbar.commit add command -label {Sign Off} \
1494 -command do_signoff \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001495 -accelerator $M1T-S
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001496
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001497 .mbar.commit add command -label Commit \
1498 -command do_commit \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001499 -accelerator $M1T-Return
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001500 lappend disable_on_lock \
1501 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1502}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001503
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05001504# -- Merge Menu
1505#
1506if {[is_enabled branch]} {
1507 menu .mbar.merge
1508 .mbar.merge add command -label {Local Merge...} \
Shawn O. Pearcea6c9b082007-05-02 13:56:27 -04001509 -command merge::dialog
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05001510 lappend disable_on_lock \
1511 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1512 .mbar.merge add command -label {Abort Merge...} \
Shawn O. Pearcea6c9b082007-05-02 13:56:27 -04001513 -command merge::reset_hard
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05001514 lappend disable_on_lock \
1515 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1516
1517}
1518
1519# -- Transport Menu
1520#
1521if {[is_enabled transport]} {
1522 menu .mbar.fetch
1523
1524 menu .mbar.push
1525 .mbar.push add command -label {Push...} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001526 -command do_push_anywhere
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05001527}
1528
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05001529if {[is_MacOSX]} {
1530 # -- Apple Menu (Mac OS X only)
1531 #
1532 .mbar add cascade -label Apple -menu .mbar.apple
1533 menu .mbar.apple
Shawn O. Pearce82aa2352006-11-20 23:55:51 -05001534
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001535 .mbar.apple add command -label "About [appname]" \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001536 -command do_about
Shawn O. Pearce5ac58f52007-02-14 00:10:20 -05001537 .mbar.apple add command -label "Options..." \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001538 -command do_options
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05001539} else {
1540 # -- Edit Menu
1541 #
1542 .mbar.edit add separator
1543 .mbar.edit add command -label {Options...} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001544 -command do_options
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05001545
Shawn O. Pearce557afe82006-12-07 22:07:38 -05001546 # -- Tools Menu
1547 #
Shawn O. Pearce7e508eb2007-06-26 15:27:35 -04001548 if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
Shawn O. Pearce557afe82006-12-07 22:07:38 -05001549 proc do_miga {} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001550 global ui_status_value
Shawn O. Pearce557afe82006-12-07 22:07:38 -05001551 if {![lock_index update]} return
1552 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
1553 set miga_fd [open "|$cmd" r]
1554 fconfigure $miga_fd -blocking 0
1555 fileevent $miga_fd readable [list miga_done $miga_fd]
1556 set ui_status_value {Running miga...}
1557 }
1558 proc miga_done {fd} {
1559 read $fd 512
1560 if {[eof $fd]} {
1561 close $fd
1562 unlock_index
1563 rescan [list set ui_status_value {Ready.}]
1564 }
1565 }
1566 .mbar add cascade -label Tools -menu .mbar.tools
1567 menu .mbar.tools
1568 .mbar.tools add command -label "Migrate" \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001569 -command do_miga
Shawn O. Pearce557afe82006-12-07 22:07:38 -05001570 lappend disable_on_lock \
1571 [list .mbar.tools entryconf [.mbar.tools index last] -state]
1572 }
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001573}
Shawn O. Pearce557afe82006-12-07 22:07:38 -05001574
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001575# -- Help Menu
1576#
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001577.mbar add cascade -label Help -menu .mbar.help
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001578menu .mbar.help
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05001579
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001580if {![is_MacOSX]} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001581 .mbar.help add command -label "About [appname]" \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001582 -command do_about
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05001583}
1584
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001585set browser {}
1586catch {set browser $repo_config(instaweb.browser)}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001587set doc_path [file dirname [gitexec]]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001588set doc_path [file join $doc_path Documentation index.html]
1589
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001590if {[is_Cygwin]} {
Shawn O. Pearceee405992007-02-18 19:06:09 -05001591 set doc_path [exec cygpath --mixed $doc_path]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001592}
1593
1594if {$browser eq {}} {
1595 if {[is_MacOSX]} {
1596 set browser open
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001597 } elseif {[is_Cygwin]} {
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001598 set program_files [file dirname [exec cygpath --windir]]
1599 set program_files [file join $program_files {Program Files}]
1600 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
1601 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
1602 if {[file exists $firefox]} {
1603 set browser $firefox
1604 } elseif {[file exists $ie]} {
1605 set browser $ie
1606 }
1607 unset program_files firefox ie
1608 }
1609}
1610
1611if {[file isfile $doc_path]} {
1612 set doc_url "file:$doc_path"
1613} else {
1614 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
1615}
1616
1617if {$browser ne {}} {
1618 .mbar.help add command -label {Online Documentation} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001619 -command [list exec $browser $doc_url &]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05001620}
1621unset browser doc_path doc_url
Shawn O. Pearce82aa2352006-11-20 23:55:51 -05001622
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001623# -- Standard bindings
1624#
Shawn O. Pearce39fa2a92007-06-11 23:52:43 -04001625wm protocol . WM_DELETE_WINDOW do_quit
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001626bind all <$M1B-Key-q> do_quit
1627bind all <$M1B-Key-Q> do_quit
1628bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
1629bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
1630
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001631set subcommand_args {}
1632proc usage {} {
1633 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
1634 exit 1
1635}
1636
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001637# -- Not a normal commit type invocation? Do that instead!
1638#
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001639switch -- $subcommand {
Shawn O. Pearceb90d4792007-02-16 00:24:03 -05001640browser {
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001641 set subcommand_args {rev?}
1642 switch [llength $argv] {
1643 0 {
1644 set current_branch [git symbolic-ref HEAD]
1645 regsub ^refs/((heads|tags|remotes)/)? \
1646 $current_branch {} current_branch
Shawn O. Pearceb90d4792007-02-16 00:24:03 -05001647 }
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001648 1 {
1649 set current_branch [lindex $argv 0]
1650 }
1651 default usage
1652 }
Shawn O. Pearcec74b6c62007-05-08 20:33:47 -04001653 browser::new $current_branch
Shawn O. Pearceb90d4792007-02-16 00:24:03 -05001654 return
1655}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001656blame {
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001657 set subcommand_args {rev? path?}
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001658 set head {}
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001659 set path {}
1660 set is_path 0
1661 foreach a $argv {
1662 if {$is_path || [file exists $_prefix$a]} {
1663 if {$path ne {}} usage
Shawn O. Pearce6b3d8b92007-05-09 18:35:04 -04001664 set path $_prefix$a
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001665 break
1666 } elseif {$a eq {--}} {
1667 if {$path ne {}} {
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001668 if {$head ne {}} usage
1669 set head $path
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001670 set path {}
1671 }
1672 set is_path 1
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001673 } elseif {$head eq {}} {
1674 if {$head ne {}} usage
1675 set head $a
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001676 } else {
1677 usage
1678 }
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001679 }
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001680 unset is_path
1681
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001682 if {$head eq {}} {
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001683 set current_branch [git symbolic-ref HEAD]
1684 regsub ^refs/((heads|tags|remotes)/)? \
1685 $current_branch {} current_branch
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001686 } else {
1687 set current_branch $head
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04001688 }
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04001689
1690 if {$path eq {}} usage
1691 blame::new $head $path
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001692 return
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001693}
Shawn O. Pearce258871d2007-02-08 19:41:32 -05001694citool -
1695gui {
1696 if {[llength $argv] != 0} {
1697 puts -nonewline stderr "usage: $argv0"
1698 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
1699 puts -nonewline stderr " $subcommand"
1700 }
1701 puts stderr {}
1702 exit 1
1703 }
1704 # fall through to setup UI for commits
1705}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001706default {
Shawn O. Pearcec0f7a6c2007-02-21 01:24:57 -05001707 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001708 exit 1
1709}
1710}
1711
Shawn O. Pearce8553b772006-11-24 15:38:18 -05001712# -- Branch Control
1713#
1714frame .branch \
1715 -borderwidth 1 \
1716 -relief sunken
1717label .branch.l1 \
1718 -text {Current Branch:} \
1719 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001720 -justify left
Shawn O. Pearce8553b772006-11-24 15:38:18 -05001721label .branch.cb \
1722 -textvariable current_branch \
1723 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001724 -justify left
Shawn O. Pearce8553b772006-11-24 15:38:18 -05001725pack .branch.l1 -side left
1726pack .branch.cb -side left -fill x
1727pack .branch -side top -fill x
1728
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001729# -- Main Window Layout
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001730#
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001731panedwindow .vpane -orient vertical
1732panedwindow .vpane.files -orient horizontal
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05001733.vpane add .vpane.files -sticky nsew -height 100 -width 200
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001734pack .vpane -anchor n -side top -fill both -expand 1
1735
1736# -- Index File List
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001737#
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05001738frame .vpane.files.index -height 100 -width 200
Johannes Sixta1a49752007-05-08 13:33:06 +02001739label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001740 -background lightgreen
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001741text $ui_index -background white -borderwidth 0 \
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05001742 -width 20 -height 10 \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001743 -wrap none \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05001744 -cursor $cursor_ptr \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001745 -xscrollcommand {.vpane.files.index.sx set} \
1746 -yscrollcommand {.vpane.files.index.sy set} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001747 -state disabled
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001748scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
1749scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001750pack .vpane.files.index.title -side top -fill x
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001751pack .vpane.files.index.sx -side bottom -fill x
1752pack .vpane.files.index.sy -side right -fill y
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001753pack $ui_index -side left -fill both -expand 1
1754.vpane.files add .vpane.files.index -sticky nsew
1755
Shawn O. Pearce08126652007-01-20 22:06:51 -05001756# -- Working Directory File List
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001757#
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05001758frame .vpane.files.workdir -height 100 -width 200
Johannes Sixta1a49752007-05-08 13:33:06 +02001759label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001760 -background lightsalmon
Shawn O. Pearce08126652007-01-20 22:06:51 -05001761text $ui_workdir -background white -borderwidth 0 \
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05001762 -width 20 -height 10 \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001763 -wrap none \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05001764 -cursor $cursor_ptr \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001765 -xscrollcommand {.vpane.files.workdir.sx set} \
1766 -yscrollcommand {.vpane.files.workdir.sy set} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001767 -state disabled
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001768scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
1769scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
Shawn O. Pearce08126652007-01-20 22:06:51 -05001770pack .vpane.files.workdir.title -side top -fill x
Shawn O. Pearce3c236972007-01-21 14:58:01 -05001771pack .vpane.files.workdir.sx -side bottom -fill x
1772pack .vpane.files.workdir.sy -side right -fill y
Shawn O. Pearce08126652007-01-20 22:06:51 -05001773pack $ui_workdir -side left -fill both -expand 1
1774.vpane.files add .vpane.files.workdir -sticky nsew
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001775
Shawn O. Pearce08126652007-01-20 22:06:51 -05001776foreach i [list $ui_index $ui_workdir] {
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001777 $i tag conf in_diff -background lightgray
1778 $i tag conf in_sel -background lightgray
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001779}
1780unset i
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001781
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001782# -- Diff and Commit Area
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001783#
Shawn O. Pearce8009dcd2006-11-12 06:53:56 -05001784frame .vpane.lower -height 300 -width 400
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001785frame .vpane.lower.commarea
1786frame .vpane.lower.diff -relief sunken -borderwidth 1
1787pack .vpane.lower.commarea -side top -fill x
1788pack .vpane.lower.diff -side bottom -fill both -expand 1
Shawn O. Pearce0fd49d02007-01-24 15:21:01 -05001789.vpane add .vpane.lower -sticky nsew
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001790
1791# -- Commit Area Buttons
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001792#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001793frame .vpane.lower.commarea.buttons
1794label .vpane.lower.commarea.buttons.l -text {} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001795 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001796 -justify left
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001797pack .vpane.lower.commarea.buttons.l -side top -fill x
1798pack .vpane.lower.commarea.buttons -side left -fill y
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001799
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001800button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001801 -command do_rescan
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001802pack .vpane.lower.commarea.buttons.rescan -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05001803lappend disable_on_lock \
1804 {.vpane.lower.commarea.buttons.rescan conf -state}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001805
Shawn O. Pearce24d2bf22007-02-08 19:44:49 -05001806button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001807 -command do_add_all
Shawn O. Pearce7fe7e732006-11-08 22:48:34 -05001808pack .vpane.lower.commarea.buttons.incall -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05001809lappend disable_on_lock \
1810 {.vpane.lower.commarea.buttons.incall conf -state}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001811
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001812button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001813 -command do_signoff
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001814pack .vpane.lower.commarea.buttons.signoff -side top -fill x
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001815
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001816button .vpane.lower.commarea.buttons.commit -text {Commit} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001817 -command do_commit
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001818pack .vpane.lower.commarea.buttons.commit -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05001819lappend disable_on_lock \
1820 {.vpane.lower.commarea.buttons.commit conf -state}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001821
1822# -- Commit Message Buffer
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001823#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001824frame .vpane.lower.commarea.buffer
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001825frame .vpane.lower.commarea.buffer.header
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001826set ui_comm .vpane.lower.commarea.buffer.t
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001827set ui_coml .vpane.lower.commarea.buffer.header.l
1828radiobutton .vpane.lower.commarea.buffer.header.new \
1829 -text {New Commit} \
1830 -command do_select_commit_type \
1831 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001832 -value new
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001833lappend disable_on_lock \
1834 [list .vpane.lower.commarea.buffer.header.new conf -state]
1835radiobutton .vpane.lower.commarea.buffer.header.amend \
1836 -text {Amend Last Commit} \
1837 -command do_select_commit_type \
1838 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001839 -value amend
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001840lappend disable_on_lock \
1841 [list .vpane.lower.commarea.buffer.header.amend conf -state]
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001842label $ui_coml \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001843 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001844 -justify left
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001845proc trace_commit_type {varname args} {
1846 global ui_coml commit_type
1847 switch -glob -- $commit_type {
1848 initial {set txt {Initial Commit Message:}}
1849 amend {set txt {Amended Commit Message:}}
1850 amend-initial {set txt {Amended Initial Commit Message:}}
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001851 amend-merge {set txt {Amended Merge Commit Message:}}
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001852 merge {set txt {Merge Commit Message:}}
1853 * {set txt {Commit Message:}}
1854 }
1855 $ui_coml conf -text $txt
1856}
1857trace add variable commit_type write trace_commit_type
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001858pack $ui_coml -side left -fill x
1859pack .vpane.lower.commarea.buffer.header.amend -side right
1860pack .vpane.lower.commarea.buffer.header.new -side right
1861
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001862text $ui_comm -background white -borderwidth 1 \
Shawn O. Pearce98616712006-11-11 15:51:41 -05001863 -undo true \
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -05001864 -maxundo 20 \
Shawn O. Pearce98616712006-11-11 15:51:41 -05001865 -autoseparators true \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001866 -relief sunken \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001867 -width 75 -height 9 -wrap none \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001868 -font font_diff \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05001869 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
Shawn O. Pearce390adae2006-11-11 19:40:33 -05001870scrollbar .vpane.lower.commarea.buffer.sby \
1871 -command [list $ui_comm yview]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05001872pack .vpane.lower.commarea.buffer.header -side top -fill x
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001873pack .vpane.lower.commarea.buffer.sby -side right -fill y
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001874pack $ui_comm -side left -fill y
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001875pack .vpane.lower.commarea.buffer -side left -fill y
1876
Shawn O. Pearce0e794312006-11-11 20:24:23 -05001877# -- Commit Message Buffer Context Menu
1878#
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001879set ctxm .vpane.lower.commarea.buffer.ctxm
1880menu $ctxm -tearoff 0
1881$ctxm add command \
1882 -label {Cut} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001883 -command {tk_textCut $ui_comm}
1884$ctxm add command \
1885 -label {Copy} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001886 -command {tk_textCopy $ui_comm}
1887$ctxm add command \
1888 -label {Paste} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001889 -command {tk_textPaste $ui_comm}
1890$ctxm add command \
1891 -label {Delete} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001892 -command {$ui_comm delete sel.first sel.last}
1893$ctxm add separator
1894$ctxm add command \
1895 -label {Select All} \
Shawn O. Pearce75e78c82007-01-22 18:31:12 -05001896 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001897$ctxm add command \
1898 -label {Copy All} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001899 -command {
Shawn O. Pearce0e794312006-11-11 20:24:23 -05001900 $ui_comm tag add sel 0.0 end
1901 tk_textCopy $ui_comm
1902 $ui_comm tag remove sel 0.0 end
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001903 }
1904$ctxm add separator
1905$ctxm add command \
1906 -label {Sign Off} \
Shawn O. Pearce0e794312006-11-11 20:24:23 -05001907 -command do_signoff
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001908bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
Shawn O. Pearce0e794312006-11-11 20:24:23 -05001909
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001910# -- Diff Header
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001911#
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001912proc trace_current_diff_path {varname args} {
1913 global current_diff_path diff_actions file_states
1914 if {$current_diff_path eq {}} {
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001915 set s {}
1916 set f {}
1917 set p {}
1918 set o disabled
1919 } else {
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001920 set p $current_diff_path
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001921 set s [mapdesc [lindex $file_states($p) 0] $p]
1922 set f {File:}
1923 set p [escape_path $p]
1924 set o normal
1925 }
1926
1927 .vpane.lower.diff.header.status configure -text $s
1928 .vpane.lower.diff.header.file configure -text $f
1929 .vpane.lower.diff.header.path configure -text $p
1930 foreach w $diff_actions {
1931 uplevel #0 $w $o
1932 }
1933}
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001934trace add variable current_diff_path write trace_current_diff_path
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001935
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001936frame .vpane.lower.diff.header -background gold
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001937label .vpane.lower.diff.header.status \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001938 -background gold \
Shawn O. Pearce3e7b0e12006-11-12 22:06:37 -05001939 -width $max_status_desc \
1940 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001941 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001942label .vpane.lower.diff.header.file \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001943 -background gold \
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05001944 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001945 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001946label .vpane.lower.diff.header.path \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02001947 -background gold \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001948 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001949 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001950pack .vpane.lower.diff.header.status -side left
1951pack .vpane.lower.diff.header.file -side left
1952pack .vpane.lower.diff.header.path -fill x
1953set ctxm .vpane.lower.diff.header.ctxm
1954menu $ctxm -tearoff 0
1955$ctxm add command \
1956 -label {Copy} \
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05001957 -command {
1958 clipboard clear
1959 clipboard append \
1960 -format STRING \
1961 -type STRING \
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001962 -- $current_diff_path
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05001963 }
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05001964lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
1965bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001966
1967# -- Diff Body
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001968#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001969frame .vpane.lower.diff.body
1970set ui_diff .vpane.lower.diff.body.t
1971text $ui_diff -background white -borderwidth 0 \
1972 -width 80 -height 15 -wrap none \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001973 -font font_diff \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001974 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
1975 -yscrollcommand {.vpane.lower.diff.body.sby set} \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05001976 -state disabled
1977scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
1978 -command [list $ui_diff xview]
1979scrollbar .vpane.lower.diff.body.sby -orient vertical \
1980 -command [list $ui_diff yview]
1981pack .vpane.lower.diff.body.sbx -side bottom -fill x
1982pack .vpane.lower.diff.body.sby -side right -fill y
1983pack $ui_diff -side left -fill both -expand 1
1984pack .vpane.lower.diff.header -side top -fill x
1985pack .vpane.lower.diff.body -side bottom -fill both -expand 1
1986
Shawn O. Pearce30b14ed2007-01-24 21:30:23 -05001987$ui_diff tag conf d_cr -elide true
Shawn O. Pearceca521562007-01-21 14:49:45 -05001988$ui_diff tag conf d_@ -foreground blue -font font_diffbold
1989$ui_diff tag conf d_+ -foreground {#00a000}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05001990$ui_diff tag conf d_- -foreground red
1991
Shawn O. Pearceca521562007-01-21 14:49:45 -05001992$ui_diff tag conf d_++ -foreground {#00a000}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05001993$ui_diff tag conf d_-- -foreground red
1994$ui_diff tag conf d_+s \
Shawn O. Pearceca521562007-01-21 14:49:45 -05001995 -foreground {#00a000} \
1996 -background {#e2effa}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05001997$ui_diff tag conf d_-s \
1998 -foreground red \
Shawn O. Pearceca521562007-01-21 14:49:45 -05001999 -background {#e2effa}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002000$ui_diff tag conf d_s+ \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002001 -foreground {#00a000} \
2002 -background ivory1
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002003$ui_diff tag conf d_s- \
2004 -foreground red \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002005 -background ivory1
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002006
2007$ui_diff tag conf d<<<<<<< \
2008 -foreground orange \
2009 -font font_diffbold
2010$ui_diff tag conf d======= \
2011 -foreground orange \
2012 -font font_diffbold
2013$ui_diff tag conf d>>>>>>> \
2014 -foreground orange \
2015 -font font_diffbold
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002016
Shawn O. Pearceca521562007-01-21 14:49:45 -05002017$ui_diff tag raise sel
2018
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002019# -- Diff Body Context Menu
2020#
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002021set ctxm .vpane.lower.diff.body.ctxm
2022menu $ctxm -tearoff 0
2023$ctxm add command \
Shawn O. Pearce68c30b42007-01-21 13:27:43 -05002024 -label {Refresh} \
Shawn O. Pearce68c30b42007-01-21 13:27:43 -05002025 -command reshow_diff
Shawn O. Pearce86773d92007-01-24 20:39:30 -05002026lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
Shawn O. Pearce68c30b42007-01-21 13:27:43 -05002027$ctxm add command \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002028 -label {Copy} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002029 -command {tk_textCopy $ui_diff}
2030lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2031$ctxm add command \
2032 -label {Select All} \
Shawn O. Pearce75e78c82007-01-22 18:31:12 -05002033 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002034lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2035$ctxm add command \
2036 -label {Copy All} \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002037 -command {
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002038 $ui_diff tag add sel 0.0 end
2039 tk_textCopy $ui_diff
2040 $ui_diff tag remove sel 0.0 end
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002041 }
2042lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2043$ctxm add separator
2044$ctxm add command \
Shawn O. Pearcea25c5182007-01-24 21:20:57 -05002045 -label {Apply/Reverse Hunk} \
Shawn O. Pearcea25c5182007-01-24 21:20:57 -05002046 -command {apply_hunk $cursorX $cursorY}
2047set ui_diff_applyhunk [$ctxm index last]
2048lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2049$ctxm add separator
2050$ctxm add command \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002051 -label {Decrease Font Size} \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002052 -command {incr_font_size font_diff -1}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002053lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2054$ctxm add command \
2055 -label {Increase Font Size} \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002056 -command {incr_font_size font_diff 1}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002057lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2058$ctxm add separator
2059$ctxm add command \
2060 -label {Show Less Context} \
Shawn O. Pearceb8848f72007-05-31 23:32:54 -04002061 -command {if {$repo_config(gui.diffcontext) >= 1} {
Shawn O. Pearce358d8de2006-11-12 19:20:02 -05002062 incr repo_config(gui.diffcontext) -1
2063 reshow_diff
2064 }}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002065lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2066$ctxm add command \
2067 -label {Show More Context} \
Shawn O. Pearceb8848f72007-05-31 23:32:54 -04002068 -command {if {$repo_config(gui.diffcontext) < 99} {
Shawn O. Pearce358d8de2006-11-12 19:20:02 -05002069 incr repo_config(gui.diffcontext)
2070 reshow_diff
Shawn O. Pearceb8848f72007-05-31 23:32:54 -04002071 }}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002072lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2073$ctxm add separator
2074$ctxm add command -label {Options...} \
Shawn O. Pearce8009dcd2006-11-12 06:53:56 -05002075 -command do_options
Shawn O. Pearcea25c5182007-01-24 21:20:57 -05002076bind_button3 $ui_diff "
2077 set cursorX %x
2078 set cursorY %y
2079 if {\$ui_index eq \$current_diff_side} {
2080 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
2081 } else {
2082 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
2083 }
2084 tk_popup $ctxm %X %Y
2085"
Shawn O. Pearceb9a75e32007-01-25 12:55:20 -05002086unset ui_diff_applyhunk
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002087
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002088# -- Status Bar
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002089#
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002090label .status -textvariable ui_status_value \
2091 -anchor w \
2092 -justify left \
2093 -borderwidth 1 \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002094 -relief sunken
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002095pack .status -anchor w -side bottom -fill x
2096
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002097# -- Load geometry
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002098#
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002099catch {
Shawn O. Pearce51f4d162006-11-12 03:47:00 -05002100set gm $repo_config(gui.geometry)
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05002101wm geometry . [lindex $gm 0]
2102.vpane sash place 0 \
2103 [lindex [.vpane sash coord 0] 0] \
2104 [lindex $gm 1]
2105.vpane.files sash place 0 \
2106 [lindex $gm 2] \
2107 [lindex [.vpane.files sash coord 0] 1]
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05002108unset gm
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002109}
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002110
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002111# -- Key Bindings
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002112#
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05002113bind $ui_comm <$M1B-Key-Return> {do_commit;break}
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05002114bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2115bind $ui_comm <$M1B-Key-I> {do_add_all;break}
Shawn O. Pearce98616712006-11-11 15:51:41 -05002116bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2117bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2118bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2119bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2120bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2121bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2122bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2123bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2124
2125bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2126bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2127bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2128bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2129bind $ui_diff <$M1B-Key-v> {break}
2130bind $ui_diff <$M1B-Key-V> {break}
2131bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2132bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -05002133bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2134bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2135bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2136bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
Shawn O. Pearce60aa0652007-05-01 15:51:09 -04002137bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2138bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2139bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2140bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2141bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2142bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
Shawn O. Pearce23effa72007-01-25 12:57:57 -05002143bind $ui_diff <Button-1> {focus %W}
Shawn O. Pearce49b86f02006-11-11 15:16:01 -05002144
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05002145if {[is_enabled branch]} {
Shawn O. Pearcebd29ebc2007-01-21 01:34:55 -05002146 bind . <$M1B-Key-n> do_create_branch
2147 bind . <$M1B-Key-N> do_create_branch
2148}
2149
Shawn O. Pearce07123f42006-11-07 02:57:46 -05002150bind all <Key-F5> do_rescan
2151bind all <$M1B-Key-r> do_rescan
2152bind all <$M1B-Key-R> do_rescan
2153bind . <$M1B-Key-s> do_signoff
2154bind . <$M1B-Key-S> do_signoff
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05002155bind . <$M1B-Key-i> do_add_all
2156bind . <$M1B-Key-I> do_add_all
Shawn O. Pearce07123f42006-11-07 02:57:46 -05002157bind . <$M1B-Key-Return> do_commit
Shawn O. Pearce08126652007-01-20 22:06:51 -05002158foreach i [list $ui_index $ui_workdir] {
Shawn O. Pearce24263b72006-11-13 16:06:38 -05002159 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2160 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2161 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002162}
Shawn O. Pearce62aac802006-11-11 20:00:35 -05002163unset i
2164
2165set file_lists($ui_index) [list]
Shawn O. Pearce08126652007-01-20 22:06:51 -05002166set file_lists($ui_workdir) [list]
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002167
Shawn O. Pearce19c82142007-04-14 15:10:48 -04002168wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002169focus -force $ui_comm
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002170
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002171# -- Warn the user about environmental problems. Cygwin's Tcl
2172# does *not* pass its env array onto any processes it spawns.
2173# This means that git processes get none of our environment.
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002174#
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002175if {[is_Cygwin]} {
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002176 set ignored_env 0
2177 set suggest_user {}
2178 set msg "Possible environment issues exist.
2179
2180The following environment variables are probably
2181going to be ignored by any Git subprocess run
Shawn O. Pearcec950c662007-01-20 21:48:56 -05002182by [appname]:
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002183
2184"
2185 foreach name [array names env] {
2186 switch -regexp -- $name {
2187 {^GIT_INDEX_FILE$} -
2188 {^GIT_OBJECT_DIRECTORY$} -
2189 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2190 {^GIT_DIFF_OPTS$} -
2191 {^GIT_EXTERNAL_DIFF$} -
2192 {^GIT_PAGER$} -
2193 {^GIT_TRACE$} -
2194 {^GIT_CONFIG$} -
2195 {^GIT_CONFIG_LOCAL$} -
2196 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2197 append msg " - $name\n"
2198 incr ignored_env
2199 }
2200 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2201 append msg " - $name\n"
2202 incr ignored_env
2203 set suggest_user $name
2204 }
2205 }
2206 }
2207 if {$ignored_env > 0} {
2208 append msg "
2209This is due to a known issue with the
2210Tcl binary distributed by Cygwin."
2211
2212 if {$suggest_user ne {}} {
2213 append msg "
2214
2215A good replacement for $suggest_user
2216is placing values for the user.name and
2217user.email settings into your personal
2218~/.gitconfig file.
2219"
2220 }
2221 warn_popup $msg
2222 }
2223 unset ignored_env msg suggest_user name
2224}
2225
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002226# -- Only initialize complex UI if we are going to stay running.
2227#
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05002228if {[is_enabled transport]} {
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05002229 load_all_remotes
Shawn O. Pearcebb1ad512006-11-25 03:35:33 -05002230 load_all_heads
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002231
Shawn O. Pearcec5ab47c2007-01-21 01:31:14 -05002232 populate_branch_menu
Shawn O. Pearce3f7fd922007-01-25 17:16:22 -05002233 populate_fetch_menu
2234 populate_push_menu
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05002235}
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002236
Shawn O. Pearce8ff487c2007-01-20 21:23:21 -05002237# -- Only suggest a gc run if we are going to stay running.
2238#
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -05002239if {[is_enabled multicommit]} {
Shawn O. Pearce8ff487c2007-01-20 21:23:21 -05002240 set object_limit 2000
2241 if {[is_Windows]} {set object_limit 200}
Shawn O. Pearce81347222007-02-12 22:48:56 -05002242 regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
Shawn O. Pearce8ff487c2007-01-20 21:23:21 -05002243 if {$objects_current >= $object_limit} {
2244 if {[ask_popup \
2245 "This repository currently has $objects_current loose objects.
2246
Eygene Ryabinkin53a291a2007-03-27 14:31:55 +04002247To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
Shawn O. Pearce8ff487c2007-01-20 21:23:21 -05002248
2249Compress the database now?"] eq yes} {
2250 do_gc
2251 }
2252 }
2253 unset object_limit _junk objects_current
2254}
2255
Shawn O. Pearce53716a72006-11-18 03:31:25 -05002256lock_index begin-read
Shawn O. Pearce8f525482006-11-14 01:29:32 -05002257after 1 do_rescan