blob: 86402d49f72c56d793f2f1958a9e3d3f8300f367 [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; \
Shawn O. Pearce2f7c9a72007-09-20 21:25:34 -04009 argv0=$0; \
10 exec wish "$argv0" -- "$@"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -050011
Shawn O. Pearce7e81d4e2007-02-12 16:12:04 -050012set appvers {@@GITGUI_VERSION@@}
Shawn O. Pearced6db1ad2007-10-12 12:18:02 -040013set copyright [encoding convertfrom utf-8 {
Harri Ilari Tapio Liusvaaraa9813cb2007-09-12 23:02:35 +030014Copyright © 2006, 2007 Shawn Pearce, et. al.
Shawn O. Pearcebdc9ea22006-11-21 02:36:55 -050015
Shawn O. Pearce0499b242007-01-20 20:08:20 -050016This program is free software; you can redistribute it and/or modify
17it under the terms of the GNU General Public License as published by
18the Free Software Foundation; either version 2 of the License, or
19(at your option) any later version.
Shawn O. Pearcebdc9ea22006-11-21 02:36:55 -050020
Shawn O. Pearce0499b242007-01-20 20:08:20 -050021This program is distributed in the hope that it will be useful,
22but WITHOUT ANY WARRANTY; without even the implied warranty of
23MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24GNU General Public License for more details.
25
26You should have received a copy of the GNU General Public License
27along with this program; if not, write to the Free Software
Shawn O. Pearced6db1ad2007-10-12 12:18:02 -040028Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -050029
Shawn O. Pearcec950c662007-01-20 21:48:56 -050030######################################################################
31##
Shawn O. Pearcecfb07cc2007-06-02 16:11:26 -040032## Tcl/Tk sanity check
33
34if {[catch {package require Tcl 8.4} err]
35 || [catch {package require Tk 8.4} err]
36} {
37 catch {wm withdraw .}
38 tk_messageBox \
39 -icon error \
40 -type ok \
Michele Ballabioc8c48542007-09-13 15:19:05 +020041 -title [mc "git-gui: fatal error"] \
Shawn O. Pearcecfb07cc2007-06-02 16:11:26 -040042 -message $err
43 exit 1
44}
45
Shawn O. Pearce63c4024f2007-09-11 13:37:45 -040046catch {rename send {}} ; # What an evil concept...
Shawn O. Pearcecff93392007-09-08 23:47:00 -040047
Shawn O. Pearcecfb07cc2007-06-02 16:11:26 -040048######################################################################
49##
Shawn O. Pearcefc703c22007-09-01 21:58:29 -040050## locate our library
51
52set oguilib {@@GITGUI_LIBDIR@@}
53set oguirel {@@GITGUI_RELATIVE@@}
54if {$oguirel eq {1}} {
Johannes Sixt9534c9f2008-08-04 22:09:46 +020055 set oguilib [file dirname [file normalize $argv0]]
56 if {[file tail $oguilib] eq {git-core}} {
57 set oguilib [file dirname $oguilib]
58 }
59 set oguilib [file dirname $oguilib]
Shawn O. Pearcefc703c22007-09-01 21:58:29 -040060 set oguilib [file join $oguilib share git-gui lib]
Shawn O. Pearced4b0ccd2007-09-01 22:22:42 -040061 set oguimsg [file join $oguilib msgs]
Shawn O. Pearcefc703c22007-09-01 21:58:29 -040062} elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
Shawn O. Pearced4b0ccd2007-09-01 22:22:42 -040064 set oguimsg [file join [file dirname [file normalize $argv0]] po]
65} else {
66 set oguimsg [file join $oguilib msgs]
Shawn O. Pearcefc703c22007-09-01 21:58:29 -040067}
68unset oguirel
69
70######################################################################
71##
Shawn O. Pearcecd129012007-05-28 11:22:13 -040072## enable verbose loading?
73
74if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
75 unset _verbose
76 rename auto_load real__auto_load
77 proc auto_load {name args} {
78 puts stderr "auto_load $name"
79 return [uplevel 1 real__auto_load $name $args]
80 }
81 rename source real__source
82 proc source {name} {
83 puts stderr "source $name"
84 uplevel 1 real__source $name
85 }
86}
87
88######################################################################
89##
Shawn O. Pearced4b0ccd2007-09-01 22:22:42 -040090## Internationalization (i18n) through msgcat and gettext. See
91## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
92
93package require msgcat
Shawn O. Pearce146d73a2007-09-12 16:47:06 -040094
Shawn O. Pearceab0d33c2007-10-23 18:44:55 -040095proc _mc_trim {fmt} {
Shawn O. Pearce146d73a2007-09-12 16:47:06 -040096 set cmk [string first @@ $fmt]
97 if {$cmk > 0} {
Shawn O. Pearceab0d33c2007-10-23 18:44:55 -040098 return [string range $fmt 0 [expr {$cmk - 1}]]
Shawn O. Pearce146d73a2007-09-12 16:47:06 -040099 }
Shawn O. Pearceab0d33c2007-10-23 18:44:55 -0400100 return $fmt
101}
102
103proc mc {en_fmt args} {
104 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
105 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
106 set msg [eval [list format [_mc_trim $en_fmt]] $args]
107 }
108 return $msg
Shawn O. Pearce146d73a2007-09-12 16:47:06 -0400109}
110
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400111proc strcat {args} {
112 return [join $args {}]
113}
114
Shawn O. Pearced4b0ccd2007-09-01 22:22:42 -0400115::msgcat::mcload $oguimsg
116unset oguimsg
117
118######################################################################
119##
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500120## read only globals
121
Shawn O. Pearce0b2bc462007-09-27 02:15:29 -0400122set _appname {Git Gui}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500123set _gitdir {}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500124set _gitexec {}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500125set _reponame {}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500126set _iscygwin {}
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400127set _search_path {}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500128
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400129set _trace [lsearch -exact $argv --trace]
130if {$_trace >= 0} {
131 set argv [lreplace $argv $_trace $_trace]
132 set _trace 1
133} else {
134 set _trace 0
135}
136
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500137proc appname {} {
138 global _appname
139 return $_appname
140}
141
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500142proc gitdir {args} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500143 global _gitdir
Shawn O. Pearcec2758a12007-01-20 21:55:05 -0500144 if {$args eq {}} {
145 return $_gitdir
146 }
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400147 return [eval [list file join $_gitdir] $args]
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500148}
149
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500150proc gitexec {args} {
151 global _gitexec
152 if {$_gitexec eq {}} {
Shawn O. Pearce81347222007-02-12 22:48:56 -0500153 if {[catch {set _gitexec [git --exec-path]} err]} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500154 error "Git not installed?\n\n$err"
155 }
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400156 if {[is_Cygwin]} {
157 set _gitexec [exec cygpath \
158 --windows \
159 --absolute \
160 $_gitexec]
161 } else {
162 set _gitexec [file normalize $_gitexec]
163 }
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500164 }
165 if {$args eq {}} {
166 return $_gitexec
167 }
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400168 return [eval [list file join $_gitexec] $args]
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500169}
170
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500171proc reponame {} {
Shawn O. Pearced36cd962007-07-19 00:43:16 -0400172 return $::_reponame
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500173}
Shawn O. Pearceda5239d2006-11-11 19:03:06 -0500174
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500175proc is_MacOSX {} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500176 if {[tk windowingsystem] eq {aqua}} {
177 return 1
178 }
179 return 0
180}
181
182proc is_Windows {} {
Shawn O. Pearced36cd962007-07-19 00:43:16 -0400183 if {$::tcl_platform(platform) eq {windows}} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500184 return 1
185 }
186 return 0
187}
188
189proc is_Cygwin {} {
Shawn O. Pearced36cd962007-07-19 00:43:16 -0400190 global _iscygwin
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500191 if {$_iscygwin eq {}} {
Shawn O. Pearced36cd962007-07-19 00:43:16 -0400192 if {$::tcl_platform(platform) eq {windows}} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500193 if {[catch {set p [exec cygpath --windir]} err]} {
194 set _iscygwin 0
195 } else {
196 set _iscygwin 1
197 }
198 } else {
199 set _iscygwin 0
200 }
201 }
202 return $_iscygwin
203}
204
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -0500205proc is_enabled {option} {
206 global enabled_options
207 if {[catch {set on $enabled_options($option)}]} {return 0}
208 return $on
209}
210
211proc enable_option {option} {
212 global enabled_options
213 set enabled_options($option) 1
214}
215
216proc disable_option {option} {
217 global enabled_options
218 set enabled_options($option) 0
219}
220
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -0500221######################################################################
222##
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500223## config
224
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500225proc is_many_config {name} {
226 switch -glob -- $name {
Steffen Prohaska24f7c642007-10-08 08:25:47 +0200227 gui.recentrepo -
Shawn O. Pearce51f4d162006-11-12 03:47:00 -0500228 remote.*.fetch -
229 remote.*.push
230 {return 1}
231 *
232 {return 0}
233 }
234}
235
Shawn O. Pearcec5394492007-01-26 04:43:43 -0500236proc is_config_true {name} {
237 global repo_config
238 if {[catch {set v $repo_config($name)}]} {
239 return 0
240 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
241 return 1
242 } else {
243 return 0
244 }
245}
246
Shawn O. Pearce61f82ce2007-05-28 12:52:57 -0400247proc get_config {name} {
248 global repo_config
249 if {[catch {set v $repo_config($name)}]} {
250 return {}
251 } else {
252 return $v
253 }
254}
255
Shawn O. Pearce81347222007-02-12 22:48:56 -0500256######################################################################
257##
258## handy utils
259
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400260proc _trace_exec {cmd} {
261 if {!$::_trace} return
262 set d {}
263 foreach v $cmd {
264 if {$d ne {}} {
265 append d { }
266 }
267 if {[regexp {[ \t\r\n'"$?*]} $v]} {
268 set v [sq $v]
269 }
270 append d $v
271 }
272 puts stderr $d
273}
274
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400275proc _git_cmd {name} {
276 global _git_cmd_path
277
278 if {[catch {set v $_git_cmd_path($name)}]} {
279 switch -- $name {
Shawn O. Pearce70a75952007-07-09 02:30:24 -0400280 version -
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400281 --version -
282 --exec-path { return [list $::_git $name] }
283 }
284
285 set p [gitexec git-$name$::_search_exe]
286 if {[file exists $p]} {
287 set v [list $p]
Shawn O. Pearcec136f2b2007-07-09 02:47:33 -0400288 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
289 # Try to determine what sort of magic will make
290 # git-$name go and do its thing, because native
291 # Tcl on Windows doesn't know it.
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400292 #
Shawn O. Pearcec136f2b2007-07-09 02:47:33 -0400293 set p [gitexec git-$name]
294 set f [open $p r]
295 set s [gets $f]
296 close $f
297
Shawn O. Pearce6e4ba052007-09-02 15:19:07 -0400298 switch -glob -- [lindex $s 0] {
Shawn O. Pearcec136f2b2007-07-09 02:47:33 -0400299 #!*sh { set i sh }
300 #!*perl { set i perl }
301 #!*python { set i python }
302 default { error "git-$name is not supported: $s" }
303 }
304
305 upvar #0 _$i interp
306 if {![info exists interp]} {
307 set interp [_which $i]
308 }
309 if {$interp eq {}} {
310 error "git-$name requires $i (not in PATH)"
311 }
Shawn O. Pearce6e4ba052007-09-02 15:19:07 -0400312 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400313 } else {
Shawn O. Pearcec6729892007-07-09 02:13:00 -0400314 # Assume it is builtin to git somehow and we
315 # aren't actually able to see a file for it.
316 #
317 set v [list $::_git $name]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400318 }
319 set _git_cmd_path($name) $v
320 }
321 return $v
322}
323
Shawn O. Pearce79317e52008-07-29 22:36:58 -0700324proc _which {what args} {
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400325 global env _search_exe _search_path
326
327 if {$_search_path eq {}} {
Shawn O. Pearce299077f2007-09-21 11:08:50 -0400328 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400329 set _search_path [split [exec cygpath \
330 --windows \
331 --path \
332 --absolute \
333 $env(PATH)] {;}]
334 set _search_exe .exe
335 } elseif {[is_Windows]} {
Steffen Prohaskabe700fe2007-10-06 11:29:02 +0200336 set gitguidir [file dirname [info script]]
337 regsub -all ";" $gitguidir "\\;" gitguidir
338 set env(PATH) "$gitguidir;$env(PATH)"
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400339 set _search_path [split $env(PATH) {;}]
340 set _search_exe .exe
341 } else {
342 set _search_path [split $env(PATH) :]
343 set _search_exe {}
344 }
345 }
346
Shawn O. Pearce79317e52008-07-29 22:36:58 -0700347 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
348 set suffix {}
349 } else {
350 set suffix $_search_exe
351 }
352
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400353 foreach p $_search_path {
Shawn O. Pearce79317e52008-07-29 22:36:58 -0700354 set p [file join $p $what$suffix]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400355 if {[file exists $p]} {
356 return [file normalize $p]
357 }
358 }
359 return {}
360}
361
Shawn O. Pearce6f62b4f2007-07-17 22:31:16 -0400362proc _lappend_nice {cmd_var} {
363 global _nice
364 upvar $cmd_var cmd
365
366 if {![info exists _nice]} {
367 set _nice [_which nice]
368 }
369 if {$_nice ne {}} {
370 lappend cmd $_nice
371 }
372}
373
Shawn O. Pearce81347222007-02-12 22:48:56 -0500374proc git {args} {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400375 set opt [list]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400376
377 while {1} {
378 switch -- [lindex $args 0] {
379 --nice {
Shawn O. Pearce6f62b4f2007-07-17 22:31:16 -0400380 _lappend_nice opt
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400381 }
382
383 default {
384 break
385 }
386
387 }
388
389 set args [lrange $args 1 end]
390 }
391
392 set cmdp [_git_cmd [lindex $args 0]]
393 set args [lrange $args 1 end]
394
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400395 _trace_exec [concat $opt $cmdp $args]
396 set result [eval exec $opt $cmdp $args]
397 if {$::_trace} {
398 puts stderr "< $result"
399 }
400 return $result
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400401}
402
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400403proc _open_stdout_stderr {cmd} {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400404 _trace_exec $cmd
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400405 if {[catch {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400406 set fd [open [concat [list | ] $cmd] r]
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400407 } err]} {
408 if { [lindex $cmd end] eq {2>@1}
409 && $err eq {can not find channel named "1"}
410 } {
411 # Older versions of Tcl 8.4 don't have this 2>@1 IO
412 # redirect operator. Fallback to |& cat for those.
413 # The command was not actually started, so its safe
414 # to try to start it a second time.
415 #
416 set fd [open [concat \
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400417 [list | ] \
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400418 [lrange $cmd 0 end-1] \
419 [list |& cat] \
420 ] r]
421 } else {
422 error $err
423 }
424 }
Shawn O. Pearce6eb420e2007-07-17 01:50:10 -0400425 fconfigure $fd -eofchar {}
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400426 return $fd
427}
428
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400429proc git_read {args} {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400430 set opt [list]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400431
432 while {1} {
433 switch -- [lindex $args 0] {
434 --nice {
Shawn O. Pearce6f62b4f2007-07-17 22:31:16 -0400435 _lappend_nice opt
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400436 }
437
438 --stderr {
439 lappend args 2>@1
440 }
441
442 default {
443 break
444 }
445
446 }
447
448 set args [lrange $args 1 end]
449 }
450
451 set cmdp [_git_cmd [lindex $args 0]]
452 set args [lrange $args 1 end]
453
Shawn O. Pearce74c47632007-07-09 03:07:05 -0400454 return [_open_stdout_stderr [concat $opt $cmdp $args]]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400455}
456
457proc git_write {args} {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400458 set opt [list]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400459
460 while {1} {
461 switch -- [lindex $args 0] {
462 --nice {
Shawn O. Pearce6f62b4f2007-07-17 22:31:16 -0400463 _lappend_nice opt
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400464 }
465
466 default {
467 break
468 }
469
470 }
471
472 set args [lrange $args 1 end]
473 }
474
475 set cmdp [_git_cmd [lindex $args 0]]
476 set args [lrange $args 1 end]
477
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400478 _trace_exec [concat $opt $cmdp $args]
479 return [open [concat [list | ] $opt $cmdp $args] w]
Shawn O. Pearce81347222007-02-12 22:48:56 -0500480}
481
Shawn O. Pearceed76cb72008-01-20 14:46:59 -0500482proc githook_read {hook_name args} {
483 set pchook [gitdir hooks $hook_name]
484 lappend args 2>@1
485
Alexander Gavrilovfbc0e7a2008-07-17 00:12:28 +0400486 # On Windows [file executable] might lie so we need to ask
Shawn O. Pearceed76cb72008-01-20 14:46:59 -0500487 # the shell if the hook is executable. Yes that's annoying.
488 #
Alexander Gavrilovfbc0e7a2008-07-17 00:12:28 +0400489 if {[is_Windows]} {
Shawn O. Pearceed76cb72008-01-20 14:46:59 -0500490 upvar #0 _sh interp
491 if {![info exists interp]} {
492 set interp [_which sh]
493 }
494 if {$interp eq {}} {
495 error "hook execution requires sh (not in PATH)"
496 }
497
498 set scr {if test -x "$1";then exec "$@";fi}
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400499 set sh_c [list $interp -c $scr $interp $pchook]
Shawn O. Pearceed76cb72008-01-20 14:46:59 -0500500 return [_open_stdout_stderr [concat $sh_c $args]]
501 }
502
503 if {[file executable $pchook]} {
Shawn O. Pearce16dd62a2008-05-18 13:08:17 -0400504 return [_open_stdout_stderr [concat [list $pchook] $args]]
Shawn O. Pearceed76cb72008-01-20 14:46:59 -0500505 }
506
507 return {}
508}
509
Alexander Gavrilove6131d32008-07-17 00:48:08 +0400510proc kill_file_process {fd} {
511 set process [pid $fd]
512
513 catch {
514 if {[is_Windows]} {
515 # Use a Cygwin-specific flag to allow killing
516 # native Windows processes
517 exec kill -f $process
518 } else {
519 exec kill $process
520 }
521 }
522}
523
Shawn O. Pearce7eafa2f2007-07-09 03:28:41 -0400524proc sq {value} {
525 regsub -all ' $value "'\\''" value
526 return "'$value'"
527}
528
Shawn O. Pearced41b43e2007-07-08 18:40:56 -0400529proc load_current_branch {} {
530 global current_branch is_detached
531
Shawn O. Pearcefc4e8da2007-05-30 20:39:46 -0400532 set fd [open [gitdir HEAD] r]
Shawn O. Pearce311e02a2007-07-05 19:19:37 -0400533 if {[gets $fd ref] < 1} {
Shawn O. Pearcefc4e8da2007-05-30 20:39:46 -0400534 set ref {}
535 }
536 close $fd
Shawn O. Pearce311e02a2007-07-05 19:19:37 -0400537
538 set pfx {ref: refs/heads/}
539 set len [string length $pfx]
540 if {[string equal -length $len $pfx $ref]} {
541 # We're on a branch. It might not exist. But
542 # HEAD looks good enough to be a branch.
543 #
Shawn O. Pearced41b43e2007-07-08 18:40:56 -0400544 set current_branch [string range $ref $len end]
545 set is_detached 0
Shawn O. Pearce311e02a2007-07-05 19:19:37 -0400546 } else {
547 # Assume this is a detached head.
548 #
Shawn O. Pearced41b43e2007-07-08 18:40:56 -0400549 set current_branch HEAD
550 set is_detached 1
Shawn O. Pearce311e02a2007-07-05 19:19:37 -0400551 }
Shawn O. Pearcefc4e8da2007-05-30 20:39:46 -0400552}
553
Shawn O. Pearce27392912007-04-28 22:00:02 -0400554auto_load tk_optionMenu
555rename tk_optionMenu real__tkOptionMenu
556proc tk_optionMenu {w varName args} {
557 set m [eval real__tkOptionMenu $w $varName $args]
558 $m configure -font font_ui
559 $w configure -font font_ui
560 return $m
561}
562
Shawn O. Pearce3849bfb2007-09-16 23:12:19 -0400563proc rmsel_tag {text} {
564 $text tag conf sel \
565 -background [$text cget -background] \
566 -foreground [$text cget -foreground] \
567 -borderwidth 0
568 $text tag conf in_sel -background lightgray
569 bind $text <Motion> break
570 return $text
571}
572
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400573set root_exists 0
574bind . <Visibility> {
575 bind . <Visibility> {}
576 set root_exists 1
577}
578
Shawn O. Pearce1bdd8a12007-09-27 00:18:29 -0400579if {[is_Windows]} {
580 wm iconbitmap . -default $oguilib/git-gui.ico
581}
582
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400583######################################################################
584##
585## config defaults
586
587set cursor_ptr arrow
588font create font_diff -family Courier -size 10
589font create font_ui
590catch {
591 label .dummy
592 eval font configure font_ui [font actual [.dummy cget -font]]
593 destroy .dummy
594}
595
596font create font_uiitalic
597font create font_uibold
598font create font_diffbold
599font create font_diffitalic
600
601foreach class {Button Checkbutton Entry Label
602 Labelframe Listbox Menu Message
603 Radiobutton Spinbox Text} {
604 option add *$class.font font_ui
605}
606unset class
607
608if {[is_Windows] || [is_MacOSX]} {
609 option add *Menu.tearOff 0
610}
611
612if {[is_MacOSX]} {
613 set M1B M1
614 set M1T Cmd
615} else {
616 set M1B Control
617 set M1T Ctrl
618}
619
620proc bind_button3 {w cmd} {
621 bind $w <Any-Button-3> $cmd
622 if {[is_MacOSX]} {
623 # Mac OS X sends Button-2 on right click through three-button mouse,
624 # or through trackpad right-clicking (two-finger touch + click).
625 bind $w <Any-Button-2> $cmd
626 bind $w <Control-Button-1> $cmd
627 }
628}
629
630proc apply_config {} {
631 global repo_config font_descs
632
633 foreach option $font_descs {
634 set name [lindex $option 0]
635 set font [lindex $option 1]
636 if {[catch {
Shawn O. Pearce48b8d2b2007-11-01 00:31:36 -0400637 set need_weight 1
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400638 foreach {cn cv} $repo_config(gui.$name) {
Shawn O. Pearce48b8d2b2007-11-01 00:31:36 -0400639 if {$cn eq {-weight}} {
640 set need_weight 0
641 }
642 font configure $font $cn $cv
643 }
644 if {$need_weight} {
645 font configure $font -weight normal
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400646 }
647 } err]} {
648 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
649 }
650 foreach {cn cv} [font configure $font] {
651 font configure ${font}bold $cn $cv
652 font configure ${font}italic $cn $cv
653 }
654 font configure ${font}bold -weight bold
655 font configure ${font}italic -slant italic
656 }
657}
658
Shawn O. Pearcefe702252008-05-08 20:16:43 -0400659set default_config(branch.autosetupmerge) true
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400660set default_config(merge.diffstat) true
661set default_config(merge.summary) false
662set default_config(merge.verbosity) 2
663set default_config(user.name) {}
664set default_config(user.email) {}
665
666set default_config(gui.matchtrackingbranch) false
667set default_config(gui.pruneduringfetch) false
668set default_config(gui.trustmtime) false
Alexander Gavrilov57cae872008-07-17 00:43:48 +0400669set default_config(gui.fastcopyblame) false
670set default_config(gui.copyblamethreshold) 40
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400671set default_config(gui.diffcontext) 5
Adam Piątyszek11027d52008-03-06 20:38:40 +0100672set default_config(gui.commitmsgwidth) 75
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400673set default_config(gui.newbranchtemplate) {}
Shawn O. Pearce95b002e2008-02-07 02:35:25 -0500674set default_config(gui.spellingdictionary) {}
Shawn O. Pearcea4bee592007-09-21 03:41:51 -0400675set default_config(gui.fontui) [font configure font_ui]
676set default_config(gui.fontdiff) [font configure font_diff]
677set font_descs {
678 {fontui font_ui {mc "Main Font"}}
679 {fontdiff font_diff {mc "Diff/Console Font"}}
680}
681
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500682######################################################################
683##
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400684## find git
685
686set _git [_which git]
687if {$_git eq {}} {
688 catch {wm withdraw .}
Shawn O. Pearce183a1d12007-09-21 10:58:02 -0400689 tk_messageBox \
690 -icon error \
691 -type ok \
692 -title [mc "git-gui: fatal error"] \
693 -message [mc "Cannot find git in PATH."]
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400694 exit 1
695}
Shawn O. Pearce0b812612007-07-09 01:17:09 -0400696
697######################################################################
698##
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500699## version check
700
Shawn O. Pearced6967022007-07-08 18:48:08 -0400701if {[catch {set _git_version [git --version]} err]} {
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500702 catch {wm withdraw .}
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400703 tk_messageBox \
704 -icon error \
705 -type ok \
Michele Ballabioc8c48542007-09-13 15:19:05 +0200706 -title [mc "git-gui: fatal error"] \
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400707 -message "Cannot determine Git version:
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500708
709$err
710
Shawn O. Pearced6967022007-07-08 18:48:08 -0400711[appname] requires Git 1.5.0 or later."
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500712 exit 1
713}
Shawn O. Pearced6967022007-07-08 18:48:08 -0400714if {![regsub {^git version } $_git_version {} _git_version]} {
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500715 catch {wm withdraw .}
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400716 tk_messageBox \
717 -icon error \
718 -type ok \
Michele Ballabioc8c48542007-09-13 15:19:05 +0200719 -title [mc "git-gui: fatal error"] \
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400720 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500721 exit 1
722}
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400723
724set _real_git_version $_git_version
Wincent Colaiuta2c2a3782008-02-18 09:36:33 +0100725regsub -- {[\-\.]dirty$} $_git_version {} _git_version
Shawn O. Pearced6967022007-07-08 18:48:08 -0400726regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
727regsub {\.rc[0-9]+$} $_git_version {} _git_version
Julian Phillips91464df2007-07-17 22:14:06 +0100728regsub {\.GIT$} $_git_version {} _git_version
Steffen Prohaska96f11952007-10-06 15:27:22 +0200729regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
Shawn O. Pearced6967022007-07-08 18:48:08 -0400730
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400731if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
732 catch {wm withdraw .}
733 if {[tk_messageBox \
734 -icon warning \
735 -type yesno \
736 -default no \
737 -title "[appname]: warning" \
Christian Stimming1ac17952007-07-21 14:21:34 +0200738 -message [mc "Git version cannot be determined.
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400739
Christian Stimming1ac17952007-07-21 14:21:34 +0200740%s claims it is version '%s'.
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400741
Christian Stimming1ac17952007-07-21 14:21:34 +0200742%s requires at least Git 1.5.0 or later.
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400743
Christian Stimming1ac17952007-07-21 14:21:34 +0200744Assume '%s' is version 1.5.0?
745" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -0400746 set _git_version 1.5.0
747 } else {
748 exit 1
749 }
750}
751unset _real_git_version
752
Shawn O. Pearced6967022007-07-08 18:48:08 -0400753proc git-version {args} {
754 global _git_version
755
756 switch [llength $args] {
757 0 {
758 return $_git_version
759 }
760
761 2 {
762 set op [lindex $args 0]
763 set vr [lindex $args 1]
764 set cm [package vcompare $_git_version $vr]
765 return [expr $cm $op 0]
766 }
767
768 4 {
769 set type [lindex $args 0]
770 set name [lindex $args 1]
771 set parm [lindex $args 2]
772 set body [lindex $args 3]
773
774 if {($type ne {proc} && $type ne {method})} {
775 error "Invalid arguments to git-version"
776 }
777 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
778 error "Last arm of $type $name must be default"
779 }
780
781 foreach {op vr cb} [lrange $body 0 end-2] {
782 if {[git-version $op $vr]} {
783 return [uplevel [list $type $name $parm $cb]]
784 }
785 }
786
787 return [uplevel [list $type $name $parm [lindex $body end]]]
788 }
789
790 default {
791 error "git-version >= x"
792 }
793
794 }
795}
796
797if {[git-version < 1.5]} {
798 catch {wm withdraw .}
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400799 tk_messageBox \
800 -icon error \
801 -type ok \
Michele Ballabioc8c48542007-09-13 15:19:05 +0200802 -title [mc "git-gui: fatal error"] \
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400803 -message "[appname] requires Git 1.5.0 or later.
Shawn O. Pearced6967022007-07-08 18:48:08 -0400804
805You are using [git-version]:
806
807[git --version]"
808 exit 1
809}
Shawn O. Pearce54acdd92007-02-13 23:15:25 -0500810
811######################################################################
812##
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400813## configure our library
814
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400815set idx [file join $oguilib tclIndex]
816if {[catch {set fd [open $idx r]} err]} {
817 catch {wm withdraw .}
818 tk_messageBox \
819 -icon error \
820 -type ok \
Michele Ballabioc8c48542007-09-13 15:19:05 +0200821 -title [mc "git-gui: fatal error"] \
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400822 -message $err
823 exit 1
824}
825if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
826 set idx [list]
827 while {[gets $fd n] >= 0} {
828 if {$n ne {} && ![string match #* $n]} {
829 lappend idx $n
830 }
831 }
832} else {
833 set idx {}
834}
835close $fd
836
837if {$idx ne {}} {
838 set loaded [list]
839 foreach p $idx {
840 if {[lsearch -exact $loaded $p] >= 0} continue
841 source [file join $oguilib $p]
842 lappend loaded $p
843 }
844 unset loaded p
845} else {
846 set auto_path [concat [list $oguilib] $auto_path]
847}
Shawn O. Pearcefc703c22007-09-01 21:58:29 -0400848unset -nocomplain idx fd
Shawn O. Pearce875b7c92007-08-22 02:41:00 -0400849
850######################################################################
851##
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400852## config file parsing
853
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400854git-version proc _parse_config {arr_name args} {
Shawn O. Pearce85f7a942007-10-12 00:54:15 -0400855 >= 1.5.3 {
856 upvar $arr_name arr
857 array unset arr
858 set buf {}
859 catch {
Shawn O. Pearcea5bb31f2007-10-16 12:55:34 -0400860 set fd_rc [eval \
861 [list git_read config] \
862 $args \
863 [list --null --list]]
Shawn O. Pearce85f7a942007-10-12 00:54:15 -0400864 fconfigure $fd_rc -translation binary
865 set buf [read $fd_rc]
866 close $fd_rc
867 }
868 foreach line [split $buf "\0"] {
869 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
870 if {[is_many_config $name]} {
871 lappend arr($name) $value
872 } else {
873 set arr($name) $value
874 }
875 }
876 }
877 }
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400878 default {
879 upvar $arr_name arr
880 array unset arr
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400881 catch {
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400882 set fd_rc [eval [list git_read config --list] $args]
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400883 while {[gets $fd_rc line] >= 0} {
884 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
885 if {[is_many_config $name]} {
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400886 lappend arr($name) $value
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400887 } else {
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400888 set arr($name) $value
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400889 }
890 }
891 }
892 close $fd_rc
893 }
894 }
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400895}
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400896
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400897proc load_config {include_global} {
898 global repo_config global_config default_config
899
900 if {$include_global} {
901 _parse_config global_config --global
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400902 }
Shawn O. Pearcef00d5042007-10-12 00:42:17 -0400903 _parse_config repo_config
Shawn O. Pearce69f85ff2007-10-12 00:34:04 -0400904
905 foreach name [array names default_config] {
906 if {[catch {set v $global_config($name)}]} {
907 set global_config($name) $default_config($name)
908 }
909 if {[catch {set v $repo_config($name)}]} {
910 set repo_config($name) $default_config($name)
911 }
912 }
913}
914
915######################################################################
916##
Shawn O. Pearceba7cc662007-07-17 23:23:56 -0400917## feature option selection
918
Shawn O. Pearce0b2bc462007-09-27 02:15:29 -0400919if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
Shawn O. Pearceba7cc662007-07-17 23:23:56 -0400920 unset _junk
921} else {
922 set subcommand gui
923}
924if {$subcommand eq {gui.sh}} {
925 set subcommand gui
926}
927if {$subcommand eq {gui} && [llength $argv] > 0} {
928 set subcommand [lindex $argv 0]
929 set argv [lrange $argv 1 end]
930}
931
932enable_option multicommit
933enable_option branch
934enable_option transport
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400935disable_option bare
Shawn O. Pearceba7cc662007-07-17 23:23:56 -0400936
937switch -- $subcommand {
938browser -
939blame {
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400940 enable_option bare
941
Shawn O. Pearceba7cc662007-07-17 23:23:56 -0400942 disable_option multicommit
943 disable_option branch
944 disable_option transport
945}
946citool {
947 enable_option singlecommit
948
949 disable_option multicommit
950 disable_option branch
951 disable_option transport
952}
953}
954
955######################################################################
956##
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500957## repository setup
958
Shawn O. Pearcec6127852007-05-08 21:58:25 -0400959if {[catch {
960 set _gitdir $env(GIT_DIR)
961 set _prefix {}
962 }]
963 && [catch {
964 set _gitdir [git rev-parse --git-dir]
965 set _prefix [git rev-parse --show-prefix]
966 } err]} {
Shawn O. Pearceab08b362007-09-22 03:47:43 -0400967 load_config 1
968 apply_config
969 choose_repository::pick
Shawn O. Pearce2d195162006-11-08 23:42:51 -0500970}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500971if {![file isdirectory $_gitdir] && [is_Cygwin]} {
Shawn O. Pearce2f7c9a72007-09-20 21:25:34 -0400972 catch {set _gitdir [exec cygpath --windows $_gitdir]}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -0500973}
Shawn O. Pearcec950c662007-01-20 21:48:56 -0500974if {![file isdirectory $_gitdir]} {
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500975 catch {wm withdraw .}
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400976 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500977 exit 1
978}
Shawn O. Pearcec80d25d2007-08-24 23:15:50 -0400979if {$_prefix ne {}} {
980 regsub -all {[^/]+/} $_prefix ../ cdup
981 if {[catch {cd $cdup} err]} {
982 catch {wm withdraw .}
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400983 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
Shawn O. Pearcec80d25d2007-08-24 23:15:50 -0400984 exit 1
985 }
986 unset cdup
987} elseif {![is_enabled bare]} {
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400988 if {[lindex [file split $_gitdir] end] ne {.git}} {
989 catch {wm withdraw .}
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400990 error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400991 exit 1
992 }
993 if {[catch {cd [file dirname $_gitdir]} err]} {
994 catch {wm withdraw .}
Shawn O. Pearce31bb1d12007-09-14 01:50:09 -0400995 error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400996 exit 1
997 }
Shawn O. Pearcedbccbbd2006-11-15 22:45:33 -0500998}
Shawn O. Pearcec52c9452007-07-17 23:58:56 -0400999set _reponame [file split [file normalize $_gitdir]]
1000if {[lindex $_reponame end] eq {.git}} {
1001 set _reponame [lindex $_reponame end-1]
1002} else {
1003 set _reponame [lindex $_reponame end]
Shawn O. Pearce2d195162006-11-08 23:42:51 -05001004}
Shawn O. Pearce2d195162006-11-08 23:42:51 -05001005
Shawn O. Pearce2d195162006-11-08 23:42:51 -05001006######################################################################
1007##
Shawn O. Pearce372ef952007-02-18 02:12:32 -05001008## global init
1009
1010set current_diff_path {}
1011set current_diff_side {}
1012set diff_actions [list]
Shawn O. Pearce372ef952007-02-18 02:12:32 -05001013
1014set HEAD {}
1015set PARENT {}
1016set MERGE_HEAD [list]
1017set commit_type {}
1018set empty_tree {}
1019set current_branch {}
Shawn O. Pearced41b43e2007-07-08 18:40:56 -04001020set is_detached 0
Shawn O. Pearce372ef952007-02-18 02:12:32 -05001021set current_diff_path {}
Shawn O. Pearce9c9f5fa2007-08-23 02:44:13 -04001022set is_3way_diff 0
Shawn O. Pearce372ef952007-02-18 02:12:32 -05001023set selected_commit_type new
1024
1025######################################################################
1026##
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001027## task management
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001028
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001029set rescan_active 0
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001030set diff_active 0
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001031set last_clicked {}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001032
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001033set disable_on_lock [list]
1034set index_lock_type none
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001035
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001036proc lock_index {type} {
1037 global index_lock_type disable_on_lock
1038
Shawn O. Pearce043f7012006-11-12 18:16:45 -05001039 if {$index_lock_type eq {none}} {
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001040 set index_lock_type $type
1041 foreach w $disable_on_lock {
1042 uplevel #0 $w disabled
1043 }
1044 return 1
Shawn O. Pearce53716a72006-11-18 03:31:25 -05001045 } elseif {$index_lock_type eq "begin-$type"} {
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001046 set index_lock_type $type
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001047 return 1
1048 }
1049 return 0
1050}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001051
Shawn O. Pearcee210e672006-11-06 19:12:58 -05001052proc unlock_index {} {
1053 global index_lock_type disable_on_lock
1054
1055 set index_lock_type none
1056 foreach w $disable_on_lock {
1057 uplevel #0 $w normal
1058 }
1059}
1060
1061######################################################################
1062##
1063## status
1064
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001065proc repository_state {ctvar hdvar mhvar} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001066 global current_branch
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001067 upvar $ctvar ct $hdvar hd $mhvar mh
1068
1069 set mh [list]
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001070
Shawn O. Pearced41b43e2007-07-08 18:40:56 -04001071 load_current_branch
Shawn O. Pearce81347222007-02-12 22:48:56 -05001072 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001073 set hd {}
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001074 set ct initial
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001075 return
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001076 }
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001077
Shawn O. Pearcec2758a12007-01-20 21:55:05 -05001078 set merge_head [gitdir MERGE_HEAD]
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001079 if {[file exists $merge_head]} {
1080 set ct merge
1081 set fd_mh [open $merge_head r]
1082 while {[gets $fd_mh line] >= 0} {
1083 lappend mh $line
1084 }
1085 close $fd_mh
1086 return
1087 }
1088
1089 set ct normal
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001090}
1091
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001092proc PARENT {} {
1093 global PARENT empty_tree
1094
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001095 set p [lindex $PARENT 0]
1096 if {$p ne {}} {
1097 return $p
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001098 }
1099 if {$empty_tree eq {}} {
Shawn O. Pearce81347222007-02-12 22:48:56 -05001100 set empty_tree [git mktree << {}]
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001101 }
1102 return $empty_tree
1103}
1104
Shawn O. Pearce46aaf902007-01-22 17:10:38 -05001105proc rescan {after {honor_trustmtime 1}} {
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001106 global HEAD PARENT MERGE_HEAD commit_type
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001107 global ui_index ui_workdir ui_comm
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001108 global rescan_active file_states
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -05001109 global repo_config
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001110
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001111 if {$rescan_active > 0 || ![lock_index read]} return
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001112
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001113 repository_state newType newHEAD newMERGE_HEAD
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001114 if {[string match amend* $commit_type]
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001115 && $newType eq {normal}
1116 && $newHEAD eq $HEAD} {
Shawn O. Pearcee57ca852006-11-06 21:34:10 -05001117 } else {
Shawn O. Pearcef18e40a2006-11-20 21:27:22 -05001118 set HEAD $newHEAD
1119 set PARENT $newHEAD
1120 set MERGE_HEAD $newMERGE_HEAD
1121 set commit_type $newType
Shawn O. Pearcee57ca852006-11-06 21:34:10 -05001122 }
1123
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001124 array unset file_states
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001125
Shawn O. Pearce1e0a92f2007-07-27 02:30:15 -04001126 if {!$::GITGUI_BCK_exists &&
1127 (![$ui_comm edit modified]
1128 || [string trim [$ui_comm get 0.0 end]] eq {})} {
Shawn O. Pearceb2f3bb12007-06-11 19:39:55 -04001129 if {[string match amend* $commit_type]} {
1130 } elseif {[load_message GITGUI_MSG]} {
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001131 } elseif {[load_message MERGE_MSG]} {
1132 } elseif {[load_message SQUASH_MSG]} {
1133 }
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -05001134 $ui_comm edit reset
Shawn O. Pearce21d77442006-11-20 21:59:19 -05001135 $ui_comm edit modified false
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001136 }
1137
Shawn O. Pearce46aaf902007-01-22 17:10:38 -05001138 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001139 rescan_stage2 {} $after
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -05001140 } else {
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001141 set rescan_active 1
Christian Stimming1ac17952007-07-21 14:21:34 +02001142 ui_status [mc "Refreshing file status..."]
Shawn O. Pearce0b812612007-07-09 01:17:09 -04001143 set fd_rf [git_read update-index \
1144 -q \
1145 --unmerged \
1146 --ignore-missing \
1147 --refresh \
1148 ]
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -05001149 fconfigure $fd_rf -blocking 0 -translation binary
Shawn O. Pearce390adae2006-11-11 19:40:33 -05001150 fileevent $fd_rf readable \
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001151 [list rescan_stage2 $fd_rf $after]
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -05001152 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001153}
1154
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001155if {[is_Cygwin]} {
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001156 set is_git_info_exclude {}
1157 proc have_info_exclude {} {
Shawn O. Pearce7f83aa22008-05-21 16:40:10 -04001158 global is_git_info_exclude
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001159
Shawn O. Pearce7f83aa22008-05-21 16:40:10 -04001160 if {$is_git_info_exclude eq {}} {
1161 if {[catch {exec test -f [gitdir info exclude]}]} {
1162 set is_git_info_exclude 0
1163 } else {
1164 set is_git_info_exclude 1
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001165 }
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001166 }
Shawn O. Pearce7f83aa22008-05-21 16:40:10 -04001167 return $is_git_info_exclude
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001168 }
1169} else {
1170 proc have_info_exclude {} {
1171 return [file readable [gitdir info exclude]]
1172 }
1173}
1174
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001175proc rescan_stage2 {fd after} {
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05001176 global rescan_active buf_rdi buf_rdf buf_rlo
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001177
Shawn O. Pearce043f7012006-11-12 18:16:45 -05001178 if {$fd ne {}} {
Shawn O. Pearcee534f3a2006-11-07 21:27:29 -05001179 read $fd
1180 if {![eof $fd]} return
1181 close $fd
1182 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001183
Shawn O. Pearce0b812612007-07-09 01:17:09 -04001184 set ls_others [list --exclude-per-directory=.gitignore]
Shawn O. Pearce2fe167b2007-09-21 11:44:23 -04001185 if {[have_info_exclude]} {
1186 lappend ls_others "--exclude-from=[gitdir info exclude]"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001187 }
Shawn O. Pearce94a4dd92007-07-29 03:22:27 -04001188 set user_exclude [get_config core.excludesfile]
1189 if {$user_exclude ne {} && [file readable $user_exclude]} {
1190 lappend ls_others "--exclude-from=$user_exclude"
1191 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001192
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001193 set buf_rdi {}
1194 set buf_rdf {}
1195 set buf_rlo {}
1196
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001197 set rescan_active 3
Christian Stimming1ac17952007-07-21 14:21:34 +02001198 ui_status [mc "Scanning for modified files ..."]
Shawn O. Pearce0b812612007-07-09 01:17:09 -04001199 set fd_di [git_read diff-index --cached -z [PARENT]]
1200 set fd_df [git_read diff-files -z]
1201 set fd_lo [eval git_read ls-files --others -z $ls_others]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001202
Shawn O. Pearce51a989b2007-01-23 04:07:18 -05001203 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1204 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1205 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001206 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1207 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1208 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001209}
1210
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001211proc load_message {file} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001212 global ui_comm
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001213
Shawn O. Pearcec2758a12007-01-20 21:55:05 -05001214 set f [gitdir $file]
Shawn O. Pearcee57ca852006-11-06 21:34:10 -05001215 if {[file isfile $f]} {
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001216 if {[catch {set fd [open $f r]}]} {
1217 return 0
1218 }
Shawn O. Pearce6eb420e2007-07-17 01:50:10 -04001219 fconfigure $fd -eofchar {}
Shawn O. Pearcee57ca852006-11-06 21:34:10 -05001220 set content [string trim [read $fd]]
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001221 close $fd
Shawn O. Pearce4e55d192007-01-25 12:54:59 -05001222 regsub -all -line {[ \r\t]+$} $content {} content
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001223 $ui_comm delete 0.0 end
1224 $ui_comm insert end $content
1225 return 1
1226 }
1227 return 0
1228}
1229
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001230proc read_diff_index {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001231 global buf_rdi
1232
1233 append buf_rdi [read $fd]
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001234 set c 0
1235 set n [string length $buf_rdi]
1236 while {$c < $n} {
1237 set z1 [string first "\0" $buf_rdi $c]
1238 if {$z1 == -1} break
1239 incr z1
1240 set z2 [string first "\0" $buf_rdi $z1]
1241 if {$z2 == -1} break
1242
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001243 incr c
Shawn O. Pearce86291552006-11-19 01:00:48 -05001244 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
Shawn O. Pearce51a989b2007-01-23 04:07:18 -05001245 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001246 merge_state \
Shawn O. Pearce51a989b2007-01-23 04:07:18 -05001247 [encoding convertfrom $p] \
Shawn O. Pearce86291552006-11-19 01:00:48 -05001248 [lindex $i 4]? \
1249 [list [lindex $i 0] [lindex $i 2]] \
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001250 [list]
1251 set c $z2
Shawn O. Pearce86291552006-11-19 01:00:48 -05001252 incr c
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001253 }
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001254 if {$c < $n} {
1255 set buf_rdi [string range $buf_rdi $c end]
1256 } else {
1257 set buf_rdi {}
1258 }
1259
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001260 rescan_done $fd buf_rdi $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001261}
1262
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001263proc read_diff_files {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001264 global buf_rdf
1265
1266 append buf_rdf [read $fd]
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001267 set c 0
1268 set n [string length $buf_rdf]
1269 while {$c < $n} {
1270 set z1 [string first "\0" $buf_rdf $c]
1271 if {$z1 == -1} break
1272 incr z1
1273 set z2 [string first "\0" $buf_rdf $z1]
1274 if {$z2 == -1} break
1275
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001276 incr c
Shawn O. Pearce86291552006-11-19 01:00:48 -05001277 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
Shawn O. Pearce51a989b2007-01-23 04:07:18 -05001278 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001279 merge_state \
Shawn O. Pearce51a989b2007-01-23 04:07:18 -05001280 [encoding convertfrom $p] \
Shawn O. Pearce86291552006-11-19 01:00:48 -05001281 ?[lindex $i 4] \
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001282 [list] \
Shawn O. Pearce86291552006-11-19 01:00:48 -05001283 [list [lindex $i 0] [lindex $i 2]]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001284 set c $z2
Shawn O. Pearce86291552006-11-19 01:00:48 -05001285 incr c
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001286 }
Shawn O. Pearce868c8752006-11-07 18:34:09 -05001287 if {$c < $n} {
1288 set buf_rdf [string range $buf_rdf $c end]
1289 } else {
1290 set buf_rdf {}
1291 }
1292
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001293 rescan_done $fd buf_rdf $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001294}
1295
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001296proc read_ls_others {fd after} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001297 global buf_rlo
1298
1299 append buf_rlo [read $fd]
1300 set pck [split $buf_rlo "\0"]
1301 set buf_rlo [lindex $pck end]
1302 foreach p [lrange $pck 0 end-1] {
Shawn O. Pearce89384102007-09-09 20:38:05 -04001303 set p [encoding convertfrom $p]
1304 if {[string index $p end] eq {/}} {
1305 set p [string range $p 0 end-1]
1306 }
1307 merge_state $p ?O
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001308 }
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001309 rescan_done $fd buf_rlo $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001310}
1311
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001312proc rescan_done {fd buf after} {
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -04001313 global rescan_active current_diff_path
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -05001314 global file_states repo_config
Shawn O. Pearce7f1df792006-11-11 18:38:00 -05001315 upvar $buf to_clear
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001316
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -05001317 if {![eof $fd]} return
1318 set to_clear {}
1319 close $fd
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001320 if {[incr rescan_active -1] > 0} return
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001321
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001322 prune_selection
Shawn O. Pearcef7f8d322006-11-13 04:22:42 -05001323 unlock_index
1324 display_all_files
Shawn O. Pearcef522c9b2007-05-07 23:35:48 -04001325 if {$current_diff_path ne {}} reshow_diff
Shawn O. Pearce8f525482006-11-14 01:29:32 -05001326 uplevel #0 $after
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001327}
1328
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001329proc prune_selection {} {
1330 global file_states selected_paths
1331
1332 foreach path [array names selected_paths] {
1333 if {[catch {set still_here $file_states($path)}]} {
1334 unset selected_paths($path)
1335 }
1336 }
1337}
1338
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001339######################################################################
1340##
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001341## ui helpers
1342
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001343proc mapicon {w state path} {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001344 global all_icons
1345
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001346 if {[catch {set r $all_icons($state$w)}]} {
1347 puts "error: no icon for $w state={$state} $path"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001348 return file_plain
1349 }
1350 return $r
1351}
1352
1353proc mapdesc {state path} {
1354 global all_descs
1355
1356 if {[catch {set r $all_descs($state)}]} {
1357 puts "error: no desc for state={$state} $path"
1358 return $state
1359 }
1360 return $r
1361}
1362
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001363proc ui_status {msg} {
Shawn O. Pearce906ab7f2007-10-02 12:27:32 -04001364 global main_status
1365 if {[info exists main_status]} {
1366 $main_status show $msg
1367 }
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001368}
1369
1370proc ui_ready {{test {}}} {
Shawn O. Pearce906ab7f2007-10-02 12:27:32 -04001371 global main_status
1372 if {[info exists main_status]} {
1373 $main_status show [mc "Ready."] $test
1374 }
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001375}
1376
Shawn O. Pearce68e009d2006-11-11 17:59:34 -05001377proc escape_path {path} {
Shawn O. Pearce42b922f2007-02-08 17:13:51 -05001378 regsub -all {\\} $path "\\\\" path
Shawn O. Pearce68e009d2006-11-11 17:59:34 -05001379 regsub -all "\n" $path "\\n" path
1380 return $path
1381}
1382
Shawn O. Pearce16403d02006-11-11 21:52:06 -05001383proc short_path {path} {
1384 return [escape_path [lindex [file split $path] end]]
1385}
1386
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001387set next_icon_id 0
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -05001388set null_sha1 [string repeat 0 40]
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001389
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001390proc merge_state {path new_state {head_info {}} {index_info {}}} {
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -05001391 global file_states next_icon_id null_sha1
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001392
Shawn O. Pearce6b292672006-11-07 19:58:37 -05001393 set s0 [string index $new_state 0]
1394 set s1 [string index $new_state 1]
1395
1396 if {[catch {set info $file_states($path)}]} {
1397 set state __
1398 set icon n[incr next_icon_id]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001399 } else {
Shawn O. Pearce6b292672006-11-07 19:58:37 -05001400 set state [lindex $info 0]
1401 set icon [lindex $info 1]
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001402 if {$head_info eq {}} {set head_info [lindex $info 2]}
1403 if {$index_info eq {}} {set index_info [lindex $info 3]}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001404 }
1405
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001406 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1407 elseif {$s0 eq {_}} {set s0 _}
1408
1409 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1410 elseif {$s1 eq {_}} {set s1 _}
1411
Shawn O. Pearce51cc47f2006-11-19 01:20:42 -05001412 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1413 set head_info [list 0 $null_sha1]
1414 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001415 && $head_info eq {}} {
1416 set head_info $index_info
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001417 }
1418
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05001419 set file_states($path) [list $s0$s1 $icon \
1420 $head_info $index_info \
1421 ]
Shawn O. Pearce6b292672006-11-07 19:58:37 -05001422 return $state
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001423}
1424
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001425proc display_file_helper {w path icon_name old_m new_m} {
1426 global file_lists
1427
1428 if {$new_m eq {_}} {
Shawn O. Pearce156b2922007-01-25 22:38:59 -05001429 set lno [lsearch -sorted -exact $file_lists($w) $path]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001430 if {$lno >= 0} {
1431 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1432 incr lno
1433 $w conf -state normal
1434 $w delete $lno.0 [expr {$lno + 1}].0
1435 $w conf -state disabled
1436 }
1437 } elseif {$old_m eq {_} && $new_m ne {_}} {
1438 lappend file_lists($w) $path
1439 set file_lists($w) [lsort -unique $file_lists($w)]
Shawn O. Pearce156b2922007-01-25 22:38:59 -05001440 set lno [lsearch -sorted -exact $file_lists($w) $path]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001441 incr lno
1442 $w conf -state normal
1443 $w image create $lno.0 \
1444 -align center -padx 5 -pady 1 \
1445 -name $icon_name \
1446 -image [mapicon $w $new_m $path]
1447 $w insert $lno.1 "[escape_path $path]\n"
1448 $w conf -state disabled
1449 } elseif {$old_m ne $new_m} {
1450 $w conf -state normal
1451 $w image conf $icon_name -image [mapicon $w $new_m $path]
1452 $w conf -state disabled
1453 }
1454}
1455
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001456proc display_file {path state} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001457 global file_states selected_paths
1458 global ui_index ui_workdir
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001459
1460 set old_m [merge_state $path $state]
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001461 set s $file_states($path)
1462 set new_m [lindex $s 0]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001463 set icon_name [lindex $s 1]
1464
Shawn O. Pearce079d0d52007-01-21 13:18:11 -05001465 set o [string index $old_m 0]
1466 set n [string index $new_m 0]
1467 if {$o eq {U}} {
1468 set o _
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001469 }
Shawn O. Pearce079d0d52007-01-21 13:18:11 -05001470 if {$n eq {U}} {
1471 set n _
1472 }
1473 display_file_helper $ui_index $path $icon_name $o $n
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001474
Shawn O. Pearce079d0d52007-01-21 13:18:11 -05001475 if {[string index $old_m 0] eq {U}} {
1476 set o U
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001477 } else {
Shawn O. Pearcea4b17862007-01-21 13:25:06 -05001478 set o [string index $old_m 1]
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001479 }
Shawn O. Pearce079d0d52007-01-21 13:18:11 -05001480 if {[string index $new_m 0] eq {U}} {
1481 set n U
1482 } else {
1483 set n [string index $new_m 1]
1484 }
1485 display_file_helper $ui_workdir $path $icon_name $o $n
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001486
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001487 if {$new_m eq {__}} {
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001488 unset file_states($path)
1489 catch {unset selected_paths($path)}
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001490 }
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001491}
Shawn O. Pearcee7348172006-11-23 21:40:45 -05001492
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001493proc display_all_files_helper {w path icon_name m} {
1494 global file_lists
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001495
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001496 lappend file_lists($w) $path
1497 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1498 $w image create end \
1499 -align center -padx 5 -pady 1 \
1500 -name $icon_name \
1501 -image [mapicon $w $m $path]
1502 $w insert end "[escape_path $path]\n"
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001503}
1504
1505proc display_all_files {} {
Shawn O. Pearce08126652007-01-20 22:06:51 -05001506 global ui_index ui_workdir
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001507 global file_states file_lists
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001508 global last_clicked
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001509
1510 $ui_index conf -state normal
Shawn O. Pearce08126652007-01-20 22:06:51 -05001511 $ui_workdir conf -state normal
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001512
Shawn O. Pearce7f1df792006-11-11 18:38:00 -05001513 $ui_index delete 0.0 end
Shawn O. Pearce08126652007-01-20 22:06:51 -05001514 $ui_workdir delete 0.0 end
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001515 set last_clicked {}
Shawn O. Pearce7f1df792006-11-11 18:38:00 -05001516
Shawn O. Pearce62aac802006-11-11 20:00:35 -05001517 set file_lists($ui_index) [list]
Shawn O. Pearce08126652007-01-20 22:06:51 -05001518 set file_lists($ui_workdir) [list]
Shawn O. Pearce62aac802006-11-11 20:00:35 -05001519
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001520 foreach path [lsort [array names file_states]] {
1521 set s $file_states($path)
1522 set m [lindex $s 0]
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001523 set icon_name [lindex $s 1]
1524
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001525 set s [string index $m 0]
1526 if {$s ne {U} && $s ne {_}} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001527 display_all_files_helper $ui_index $path \
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001528 $icon_name $s
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001529 }
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001530
1531 if {[string index $m 0] eq {U}} {
1532 set s U
1533 } else {
1534 set s [string index $m 1]
1535 }
1536 if {$s ne {_}} {
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001537 display_all_files_helper $ui_workdir $path \
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001538 $icon_name $s
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001539 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001540 }
1541
Shawn O. Pearce93f654d2006-11-07 19:30:54 -05001542 $ui_index conf -state disabled
Shawn O. Pearce08126652007-01-20 22:06:51 -05001543 $ui_workdir conf -state disabled
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001544}
1545
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001546######################################################################
1547##
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001548## icons
1549
1550set filemask {
1551#define mask_width 14
1552#define mask_height 15
1553static unsigned char mask_bits[] = {
1554 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1555 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1556 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1557}
1558
1559image create bitmap file_plain -background white -foreground black -data {
1560#define plain_width 14
1561#define plain_height 15
1562static unsigned char plain_bits[] = {
1563 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1564 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1565 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1566} -maskdata $filemask
1567
1568image create bitmap file_mod -background white -foreground blue -data {
1569#define mod_width 14
1570#define mod_height 15
1571static unsigned char mod_bits[] = {
1572 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1573 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1574 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1575} -maskdata $filemask
1576
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001577image create bitmap file_fulltick -background white -foreground "#007000" -data {
1578#define file_fulltick_width 14
1579#define file_fulltick_height 15
1580static unsigned char file_fulltick_bits[] = {
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001581 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1582 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1583 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1584} -maskdata $filemask
1585
1586image create bitmap file_parttick -background white -foreground "#005050" -data {
1587#define parttick_width 14
1588#define parttick_height 15
1589static unsigned char parttick_bits[] = {
1590 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1591 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1592 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1593} -maskdata $filemask
1594
1595image create bitmap file_question -background white -foreground black -data {
1596#define file_question_width 14
1597#define file_question_height 15
1598static unsigned char file_question_bits[] = {
1599 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1600 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1601 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1602} -maskdata $filemask
1603
1604image create bitmap file_removed -background white -foreground red -data {
1605#define file_removed_width 14
1606#define file_removed_height 15
1607static unsigned char file_removed_bits[] = {
1608 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1609 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1610 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1611} -maskdata $filemask
1612
1613image create bitmap file_merge -background white -foreground blue -data {
1614#define file_merge_width 14
1615#define file_merge_height 15
1616static unsigned char file_merge_bits[] = {
1617 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1618 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1619 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1620} -maskdata $filemask
1621
Shawn O. Pearce6b292672006-11-07 19:58:37 -05001622set ui_index .vpane.files.index.list
Shawn O. Pearce08126652007-01-20 22:06:51 -05001623set ui_workdir .vpane.files.workdir.list
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001624
1625set all_icons(_$ui_index) file_plain
1626set all_icons(A$ui_index) file_fulltick
1627set all_icons(M$ui_index) file_fulltick
1628set all_icons(D$ui_index) file_removed
1629set all_icons(U$ui_index) file_merge
1630
1631set all_icons(_$ui_workdir) file_plain
1632set all_icons(M$ui_workdir) file_mod
1633set all_icons(D$ui_workdir) file_question
Shawn O. Pearce3b4db3c2007-01-21 12:30:51 -05001634set all_icons(U$ui_workdir) file_merge
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001635set all_icons(O$ui_workdir) file_plain
1636
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001637set max_status_desc 0
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001638foreach i {
Christian Stimming1ac17952007-07-21 14:21:34 +02001639 {__ {mc "Unmodified"}}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001640
Christian Stimming1ac17952007-07-21 14:21:34 +02001641 {_M {mc "Modified, not staged"}}
1642 {M_ {mc "Staged for commit"}}
1643 {MM {mc "Portions staged for commit"}}
1644 {MD {mc "Staged for commit, missing"}}
Shawn O. Pearceac391602007-01-20 23:00:28 -05001645
Christian Stimming1ac17952007-07-21 14:21:34 +02001646 {_O {mc "Untracked, not staged"}}
1647 {A_ {mc "Staged for commit"}}
1648 {AM {mc "Portions staged for commit"}}
1649 {AD {mc "Staged for commit, missing"}}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001650
Christian Stimming1ac17952007-07-21 14:21:34 +02001651 {_D {mc "Missing"}}
1652 {D_ {mc "Staged for removal"}}
1653 {DO {mc "Staged for removal, still present"}}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001654
Christian Stimming1ac17952007-07-21 14:21:34 +02001655 {U_ {mc "Requires merge resolution"}}
1656 {UU {mc "Requires merge resolution"}}
1657 {UM {mc "Requires merge resolution"}}
1658 {UD {mc "Requires merge resolution"}}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001659 } {
Christian Stimming1ac17952007-07-21 14:21:34 +02001660 set text [eval [lindex $i 1]]
1661 if {$max_status_desc < [string length $text]} {
1662 set max_status_desc [string length $text]
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001663 }
Christian Stimming1ac17952007-07-21 14:21:34 +02001664 set all_descs([lindex $i 0]) $text
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001665}
Shawn O. Pearce21e409a2007-01-20 22:45:19 -05001666unset i
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001667
1668######################################################################
1669##
1670## util
1671
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001672proc scrollbar2many {list mode args} {
1673 foreach w $list {eval $w $mode $args}
1674}
1675
1676proc many2scrollbar {list mode sb top bottom} {
1677 $sb set $top $bottom
1678 foreach w $list {$w $mode moveto $top}
1679}
1680
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001681proc incr_font_size {font {amt 1}} {
1682 set sz [font configure $font -size]
1683 incr sz $amt
1684 font configure $font -size $sz
1685 font configure ${font}bold -size $sz
Shawn O. Pearcedebcd0f2007-06-02 17:15:56 -04001686 font configure ${font}italic -size $sz
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001687}
1688
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001689######################################################################
1690##
1691## ui commands
1692
Christian Stimming1ac17952007-07-21 14:21:34 +02001693set starting_gitk_msg [mc "Starting gitk... please wait..."]
Shawn O. Pearcecc4b1c02006-11-06 23:47:05 -05001694
Shawn O. Pearced0752422006-11-21 20:33:09 -05001695proc do_gitk {revs} {
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05001696 # -- Always start gitk through whatever we were loaded with. This
1697 # lets us bypass using shell process on Windows systems.
1698 #
Shawn O. Pearce79317e52008-07-29 22:36:58 -07001699 set exe [_which gitk -script]
Shawn O. Pearce02efd482007-07-09 02:10:39 -04001700 set cmd [list [info nameofexecutable] $exe]
Abhijit Menon-Sen15430be2008-07-24 18:58:53 +05301701 if {$exe eq {}} {
1702 error_popup [mc "Couldn't find gitk in PATH"]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001703 } else {
Shawn O. Pearce501e4c62007-10-02 12:24:44 -04001704 global env
1705
1706 if {[info exists env(GIT_DIR)]} {
1707 set old_GIT_DIR $env(GIT_DIR)
1708 } else {
1709 set old_GIT_DIR {}
1710 }
1711
1712 set pwd [pwd]
1713 cd [file dirname [gitdir]]
1714 set env(GIT_DIR) [file tail [gitdir]]
1715
Shawn O. Pearce02efd482007-07-09 02:10:39 -04001716 eval exec $cmd $revs &
Shawn O. Pearce501e4c62007-10-02 12:24:44 -04001717
1718 if {$old_GIT_DIR eq {}} {
1719 unset env(GIT_DIR)
1720 } else {
1721 set env(GIT_DIR) $old_GIT_DIR
1722 }
1723 cd $pwd
1724
Shawn O. Pearce02efd482007-07-09 02:10:39 -04001725 ui_status $::starting_gitk_msg
Shawn O. Pearced0752422006-11-21 20:33:09 -05001726 after 10000 {
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001727 ui_ready $starting_gitk_msg
Shawn O. Pearced0752422006-11-21 20:33:09 -05001728 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001729 }
1730}
1731
Shawn O. Pearceb5834d72006-11-12 02:27:28 -05001732set is_quitting 0
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05001733
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001734proc do_quit {} {
Shawn O. Pearcec950c662007-01-20 21:48:56 -05001735 global ui_comm is_quitting repo_config commit_type
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04001736 global GITGUI_BCK_exists GITGUI_BCK_i
Shawn O. Pearce95b002e2008-02-07 02:35:25 -05001737 global ui_comm_spell
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05001738
Shawn O. Pearceb5834d72006-11-12 02:27:28 -05001739 if {$is_quitting} return
1740 set is_quitting 1
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001741
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001742 if {[winfo exists $ui_comm]} {
1743 # -- Stash our current commit buffer.
1744 #
1745 set save [gitdir GITGUI_MSG]
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04001746 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1747 file rename -force [gitdir GITGUI_BCK] $save
1748 set GITGUI_BCK_exists 0
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001749 } else {
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04001750 set msg [string trim [$ui_comm get 0.0 end]]
1751 regsub -all -line {[ \r\t]+$} $msg {} msg
1752 if {(![string match amend* $commit_type]
1753 || [$ui_comm edit modified])
1754 && $msg ne {}} {
1755 catch {
1756 set fd [open $save w]
1757 puts -nonewline $fd $msg
1758 close $fd
1759 }
1760 } else {
1761 catch {file delete $save}
1762 }
1763 }
1764
Shawn O. Pearce95b002e2008-02-07 02:35:25 -05001765 # -- Cancel our spellchecker if its running.
1766 #
1767 if {[info exists ui_comm_spell]} {
1768 $ui_comm_spell stop
1769 }
1770
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04001771 # -- Remove our editor backup, its not needed.
1772 #
1773 after cancel $GITGUI_BCK_i
1774 if {$GITGUI_BCK_exists} {
1775 catch {file delete [gitdir GITGUI_BCK]}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001776 }
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001777
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001778 # -- Stash our current window geometry into this repository.
1779 #
1780 set cfg_geometry [list]
1781 lappend cfg_geometry [wm geometry .]
Johannes Sixta0592d32007-10-10 20:50:40 -04001782 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
1783 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001784 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1785 set rc_geometry {}
1786 }
1787 if {$cfg_geometry ne $rc_geometry} {
Shawn O. Pearce81347222007-02-12 22:48:56 -05001788 catch {git config gui.geometry $cfg_geometry}
Shawn O. Pearcedb7f34d2007-02-08 17:47:17 -05001789 }
Shawn O. Pearce51f4d162006-11-12 03:47:00 -05001790 }
1791
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001792 destroy .
1793}
1794
1795proc do_rescan {} {
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001796 rescan ui_ready
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001797}
1798
Shawn O. Pearce6e27d822006-11-06 20:03:36 -05001799proc do_commit {} {
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05001800 commit_tree
Shawn O. Pearce6e27d822006-11-06 20:03:36 -05001801}
1802
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301803proc next_diff {} {
1804 global next_diff_p next_diff_w next_diff_i
1805 show_diff $next_diff_p $next_diff_w $next_diff_i
1806}
1807
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001808proc toggle_or_diff {w x y} {
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05001809 global file_states file_lists current_diff_path ui_index ui_workdir
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001810 global last_clicked selected_paths
Shawn O. Pearce131f5032006-11-06 16:07:32 -05001811
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001812 set pos [split [$w index @$x,$y] .]
1813 set lno [lindex $pos 0]
1814 set col [lindex $pos 1]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001815 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1816 if {$path eq {}} {
1817 set last_clicked {}
1818 return
1819 }
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001820
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001821 set last_clicked [list $w $lno]
1822 array unset selected_paths
1823 $ui_index tag remove in_sel 0.0 end
Shawn O. Pearce08126652007-01-20 22:06:51 -05001824 $ui_workdir tag remove in_sel 0.0 end
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001825
Richard Quirkcead78e2008-06-20 16:58:15 +02001826 if {$col == 0 && $y > 1} {
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301827 set i [expr {$lno-1}]
1828 set ll [expr {[llength $file_lists($w)]-1}]
1829
1830 if {$i == $ll && $i == 0} {
Shawn O. Pearce32e0bca2006-11-18 03:03:16 -05001831 set after {reshow_diff;}
1832 } else {
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301833 global next_diff_p next_diff_w next_diff_i
1834
Abhijit Menon-Senf531e462008-06-25 16:06:50 +05301835 set next_diff_w $w
1836
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301837 if {$i < $ll} {
1838 set i [expr {$i + 1}]
Abhijit Menon-Senf531e462008-06-25 16:06:50 +05301839 set next_diff_i $i
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301840 } else {
Abhijit Menon-Senf531e462008-06-25 16:06:50 +05301841 set next_diff_i $i
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301842 set i [expr {$i - 1}]
1843 }
1844
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301845 set next_diff_p [lindex $file_lists($w) $i]
1846
1847 if {$next_diff_p ne {} && $current_diff_path ne {}} {
1848 set after {next_diff;}
1849 } else {
1850 set after {}
1851 }
Shawn O. Pearce32e0bca2006-11-18 03:03:16 -05001852 }
Abhijit Menon-Sen8a965b82008-06-13 03:42:10 +05301853
Shawn O. Pearcede5f6d52007-01-20 23:10:30 -05001854 if {$w eq $ui_index} {
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001855 update_indexinfo \
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05001856 "Unstaging [short_path $path] from commit" \
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001857 [list $path] \
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001858 [concat $after [list ui_ready]]
Shawn O. Pearcede5f6d52007-01-20 23:10:30 -05001859 } elseif {$w eq $ui_workdir} {
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001860 update_index \
Shawn O. Pearce4d583c82007-01-20 19:07:46 -05001861 "Adding [short_path $path]" \
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001862 [list $path] \
Shawn O. Pearce699d5602007-07-05 23:16:13 -04001863 [concat $after [list ui_ready]]
Shawn O. Pearce74d18d22006-11-19 00:37:49 -05001864 }
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001865 } else {
Shawn O. Pearce03e4ec52006-11-11 17:52:16 -05001866 show_diff $path $w $lno
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001867 }
1868}
1869
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001870proc add_one_to_selection {w x y} {
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001871 global file_lists last_clicked selected_paths
Shawn O. Pearce7f1df792006-11-11 18:38:00 -05001872
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001873 set lno [lindex [split [$w index @$x,$y] .] 0]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001874 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1875 if {$path eq {}} {
1876 set last_clicked {}
1877 return
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001878 }
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001879
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001880 if {$last_clicked ne {}
1881 && [lindex $last_clicked 0] ne $w} {
1882 array unset selected_paths
1883 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1884 }
1885
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001886 set last_clicked [list $w $lno]
1887 if {[catch {set in_sel $selected_paths($path)}]} {
1888 set in_sel 0
1889 }
1890 if {$in_sel} {
1891 unset selected_paths($path)
1892 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1893 } else {
1894 set selected_paths($path) 1
1895 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1896 }
1897}
1898
1899proc add_range_to_selection {w x y} {
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001900 global file_lists last_clicked selected_paths
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001901
1902 if {[lindex $last_clicked 0] ne $w} {
1903 toggle_or_diff $w $x $y
1904 return
1905 }
1906
Shawn O. Pearce833eda72007-01-20 23:46:53 -05001907 set lno [lindex [split [$w index @$x,$y] .] 0]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05001908 set lc [lindex $last_clicked 1]
1909 if {$lc < $lno} {
1910 set begin $lc
1911 set end $lno
1912 } else {
1913 set begin $lno
1914 set end $lc
1915 }
1916
1917 foreach path [lrange $file_lists($w) \
1918 [expr {$begin - 1}] \
1919 [expr {$end - 1}]] {
1920 set selected_paths($path) 1
1921 }
1922 $w tag add in_sel $begin.0 [expr {$end + 1}].0
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001923}
1924
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01001925proc show_more_context {} {
1926 global repo_config
1927 if {$repo_config(gui.diffcontext) < 99} {
1928 incr repo_config(gui.diffcontext)
1929 reshow_diff
1930 }
1931}
1932
1933proc show_less_context {} {
1934 global repo_config
Clemens Buchacher55ba8a32008-08-30 18:45:27 +02001935 if {$repo_config(gui.diffcontext) > 1} {
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01001936 incr repo_config(gui.diffcontext) -1
1937 reshow_diff
1938 }
1939}
1940
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001941######################################################################
1942##
Shawn O. Pearce92148d82006-11-12 05:27:00 -05001943## ui construction
1944
Shawn O. Pearcea4bee592007-09-21 03:41:51 -04001945load_config 0
1946apply_config
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001947set ui_comm {}
1948
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001949# -- Menu Bar
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001950#
Shawn O. Pearceb4946932006-11-12 00:40:38 -05001951menu .mbar -tearoff 0
Christian Stimming1ac17952007-07-21 14:21:34 +02001952.mbar add cascade -label [mc Repository] -menu .mbar.repository
1953.mbar add cascade -label [mc Edit] -menu .mbar.edit
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05001954if {[is_enabled branch]} {
Christian Stimming1ac17952007-07-21 14:21:34 +02001955 .mbar add cascade -label [mc Branch] -menu .mbar.branch
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05001956}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001957if {[is_enabled multicommit] || [is_enabled singlecommit]} {
Harri Ilari Tapio Liusvaaraa9813cb2007-09-12 23:02:35 +03001958 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05001959}
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05001960if {[is_enabled transport]} {
Christian Stimming1ac17952007-07-21 14:21:34 +02001961 .mbar add cascade -label [mc Merge] -menu .mbar.merge
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07001962 .mbar add cascade -label [mc Remote] -menu .mbar.remote
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05001963}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05001964. configure -menu .mbar
1965
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001966# -- Repository Menu
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05001967#
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05001968menu .mbar.repository
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001969
1970.mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02001971 -label [mc "Browse Current Branch's Files"] \
Shawn O. Pearcec74b6c62007-05-08 20:33:47 -04001972 -command {browser::new $current_branch}
Shawn O. Pearcea8139882007-07-23 01:11:08 -04001973set ui_browse_current [.mbar.repository index last]
Shawn O. Pearce8e891fa2007-07-18 01:39:27 -04001974.mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02001975 -label [mc "Browse Branch Files..."] \
Shawn O. Pearce8e891fa2007-07-18 01:39:27 -04001976 -command browser_open::dialog
Shawn O. Pearce35874c12007-01-29 00:50:41 -05001977.mbar.repository add separator
1978
Shawn O. Pearced0752422006-11-21 20:33:09 -05001979.mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02001980 -label [mc "Visualize Current Branch's History"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001981 -command {do_gitk $current_branch}
Shawn O. Pearcea8139882007-07-23 01:11:08 -04001982set ui_visualize_current [.mbar.repository index last]
Shawn O. Pearce5753ef12007-01-25 13:01:16 -05001983.mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02001984 -label [mc "Visualize All Branch History"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001985 -command {do_gitk --all}
Shawn O. Pearced0752422006-11-21 20:33:09 -05001986.mbar.repository add separator
Shawn O. Pearce75e355d2006-11-20 22:22:10 -05001987
Shawn O. Pearcea8139882007-07-23 01:11:08 -04001988proc current_branch_write {args} {
1989 global current_branch
1990 .mbar.repository entryconf $::ui_browse_current \
Christian Stimming1ac17952007-07-21 14:21:34 +02001991 -label [mc "Browse %s's Files" $current_branch]
Shawn O. Pearcea8139882007-07-23 01:11:08 -04001992 .mbar.repository entryconf $::ui_visualize_current \
Christian Stimming1ac17952007-07-21 14:21:34 +02001993 -label [mc "Visualize %s's History" $current_branch]
Shawn O. Pearcea8139882007-07-23 01:11:08 -04001994}
1995trace add variable current_branch write current_branch_write
1996
Shawn O. Pearcecf25ddc2007-02-08 18:03:41 -05001997if {[is_enabled multicommit]} {
Christian Stimming1ac17952007-07-21 14:21:34 +02001998 .mbar.repository add command -label [mc "Database Statistics"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04001999 -command do_stats
Shawn O. Pearce0fd49d02007-01-24 15:21:01 -05002000
Christian Stimming1ac17952007-07-21 14:21:34 +02002001 .mbar.repository add command -label [mc "Compress Database"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002002 -command do_gc
Shawn O. Pearce4aca7402006-11-15 22:35:26 -05002003
Christian Stimming1ac17952007-07-21 14:21:34 +02002004 .mbar.repository add command -label [mc "Verify Database"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002005 -command do_fsck_objects
Shawn O. Pearce444f92d2006-11-20 21:43:41 -05002006
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05002007 .mbar.repository add separator
Shawn O. Pearce75e355d2006-11-20 22:22:10 -05002008
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002009 if {[is_Cygwin]} {
2010 .mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002011 -label [mc "Create Desktop Icon"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002012 -command do_cygwin_shortcut
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002013 } elseif {[is_Windows]} {
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05002014 .mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002015 -label [mc "Create Desktop Icon"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002016 -command do_windows_shortcut
Shawn O. Pearce06c31112006-11-18 00:31:00 -05002017 } elseif {[is_MacOSX]} {
Shawn O. Pearcea4abfa62006-11-20 23:01:47 -05002018 .mbar.repository add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002019 -label [mc "Create Desktop Icon"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002020 -command do_macosx_app
Shawn O. Pearce4aca7402006-11-15 22:35:26 -05002021 }
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05002022}
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002023
Soeren Finsteraf894942008-07-07 18:50:13 +02002024if {[is_MacOSX]} {
2025 proc ::tk::mac::Quit {args} { do_quit }
2026} else {
2027 .mbar.repository add command -label [mc Quit] \
2028 -command do_quit \
2029 -accelerator $M1T-Q
2030}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002031
Shawn O. Pearce98616712006-11-11 15:51:41 -05002032# -- Edit Menu
2033#
2034menu .mbar.edit
Christian Stimming1ac17952007-07-21 14:21:34 +02002035.mbar.edit add command -label [mc Undo] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002036 -command {catch {[focus] edit undo}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002037 -accelerator $M1T-Z
Christian Stimming1ac17952007-07-21 14:21:34 +02002038.mbar.edit add command -label [mc Redo] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002039 -command {catch {[focus] edit redo}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002040 -accelerator $M1T-Y
Shawn O. Pearce98616712006-11-11 15:51:41 -05002041.mbar.edit add separator
Christian Stimming1ac17952007-07-21 14:21:34 +02002042.mbar.edit add command -label [mc Cut] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002043 -command {catch {tk_textCut [focus]}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002044 -accelerator $M1T-X
Christian Stimming1ac17952007-07-21 14:21:34 +02002045.mbar.edit add command -label [mc Copy] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002046 -command {catch {tk_textCopy [focus]}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002047 -accelerator $M1T-C
Christian Stimming1ac17952007-07-21 14:21:34 +02002048.mbar.edit add command -label [mc Paste] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002049 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002050 -accelerator $M1T-V
Christian Stimming1ac17952007-07-21 14:21:34 +02002051.mbar.edit add command -label [mc Delete] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002052 -command {catch {[focus] delete sel.first sel.last}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002053 -accelerator Del
Shawn O. Pearce98616712006-11-11 15:51:41 -05002054.mbar.edit add separator
Christian Stimming1ac17952007-07-21 14:21:34 +02002055.mbar.edit add command -label [mc "Select All"] \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002056 -command {catch {[focus] tag add sel 0.0 end}} \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002057 -accelerator $M1T-A
Shawn O. Pearce98616712006-11-11 15:51:41 -05002058
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002059# -- Branch Menu
2060#
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05002061if {[is_enabled branch]} {
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05002062 menu .mbar.branch
2063
Christian Stimming1ac17952007-07-21 14:21:34 +02002064 .mbar.branch add command -label [mc "Create..."] \
Shawn O. Pearceb1fa2bf2007-07-03 22:57:18 -04002065 -command branch_create::dialog \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002066 -accelerator $M1T-N
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05002067 lappend disable_on_lock [list .mbar.branch entryconf \
2068 [.mbar.branch index last] -state]
2069
Christian Stimming1ac17952007-07-21 14:21:34 +02002070 .mbar.branch add command -label [mc "Checkout..."] \
Shawn O. Pearced41b43e2007-07-08 18:40:56 -04002071 -command branch_checkout::dialog \
2072 -accelerator $M1T-O
2073 lappend disable_on_lock [list .mbar.branch entryconf \
2074 [.mbar.branch index last] -state]
2075
Christian Stimming1ac17952007-07-21 14:21:34 +02002076 .mbar.branch add command -label [mc "Rename..."] \
Shawn O. Pearce61f82ce2007-05-28 12:52:57 -04002077 -command branch_rename::dialog
2078 lappend disable_on_lock [list .mbar.branch entryconf \
2079 [.mbar.branch index last] -state]
2080
Christian Stimming1ac17952007-07-21 14:21:34 +02002081 .mbar.branch add command -label [mc "Delete..."] \
Shawn O. Pearce3206c632007-07-03 23:33:59 -04002082 -command branch_delete::dialog
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05002083 lappend disable_on_lock [list .mbar.branch entryconf \
2084 [.mbar.branch index last] -state]
Shawn O. Pearcefd234df2007-02-26 11:22:10 -05002085
Christian Stimming1ac17952007-07-21 14:21:34 +02002086 .mbar.branch add command -label [mc "Reset..."] \
Shawn O. Pearcea6c9b082007-05-02 13:56:27 -04002087 -command merge::reset_hard
Shawn O. Pearcefd234df2007-02-26 11:22:10 -05002088 lappend disable_on_lock [list .mbar.branch entryconf \
2089 [.mbar.branch index last] -state]
Shawn O. Pearce700a65c2006-11-24 17:30:12 -05002090}
2091
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002092# -- Commit Menu
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002093#
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002094if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2095 menu .mbar.commit
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002096
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002097 .mbar.commit add radiobutton \
Christian Stimming1ac17952007-07-21 14:21:34 +02002098 -label [mc "New Commit"] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002099 -command do_select_commit_type \
2100 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002101 -value new
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002102 lappend disable_on_lock \
2103 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002104
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002105 .mbar.commit add radiobutton \
Christian Stimming1ac17952007-07-21 14:21:34 +02002106 -label [mc "Amend Last Commit"] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002107 -command do_select_commit_type \
2108 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002109 -value amend
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002110 lappend disable_on_lock \
2111 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002112
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002113 .mbar.commit add separator
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002114
Christian Stimming1ac17952007-07-21 14:21:34 +02002115 .mbar.commit add command -label [mc Rescan] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002116 -command do_rescan \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002117 -accelerator F5
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002118 lappend disable_on_lock \
2119 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002120
Christian Stimming1ac17952007-07-21 14:21:34 +02002121 .mbar.commit add command -label [mc "Stage To Commit"] \
Shawn O. Pearcecd16a6c2007-11-08 02:22:21 -05002122 -command do_add_selection \
2123 -accelerator $M1T-T
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002124 lappend disable_on_lock \
2125 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002126
Christian Stimming1ac17952007-07-21 14:21:34 +02002127 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002128 -command do_add_all \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002129 -accelerator $M1T-I
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002130 lappend disable_on_lock \
2131 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002132
Christian Stimming1ac17952007-07-21 14:21:34 +02002133 .mbar.commit add command -label [mc "Unstage From Commit"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002134 -command do_unstage_selection
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002135 lappend disable_on_lock \
2136 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearcee7348172006-11-23 21:40:45 -05002137
Christian Stimming1ac17952007-07-21 14:21:34 +02002138 .mbar.commit add command -label [mc "Revert Changes"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002139 -command do_revert_selection
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002140 lappend disable_on_lock \
2141 [list .mbar.commit entryconf [.mbar.commit index last] -state]
Shawn O. Pearcee7348172006-11-23 21:40:45 -05002142
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002143 .mbar.commit add separator
Shawn O. Pearce1461c5f2006-11-19 00:29:55 -05002144
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01002145 .mbar.commit add command -label [mc "Show Less Context"] \
2146 -command show_less_context \
Michele Ballabio729ffa52008-04-04 23:04:42 +02002147 -accelerator $M1T-\-
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01002148
2149 .mbar.commit add command -label [mc "Show More Context"] \
2150 -command show_more_context \
Michele Ballabio729ffa52008-04-04 23:04:42 +02002151 -accelerator $M1T-=
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01002152
2153 .mbar.commit add separator
2154
Christian Stimming1ac17952007-07-21 14:21:34 +02002155 .mbar.commit add command -label [mc "Sign Off"] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002156 -command do_signoff \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002157 -accelerator $M1T-S
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002158
Harri Ilari Tapio Liusvaaraa9813cb2007-09-12 23:02:35 +03002159 .mbar.commit add command -label [mc Commit@@verb] \
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002160 -command do_commit \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002161 -accelerator $M1T-Return
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002162 lappend disable_on_lock \
2163 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2164}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002165
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002166# -- Merge Menu
2167#
2168if {[is_enabled branch]} {
2169 menu .mbar.merge
Christian Stimming1ac17952007-07-21 14:21:34 +02002170 .mbar.merge add command -label [mc "Local Merge..."] \
Shawn O. Pearcea870ddc2007-07-19 00:39:23 -04002171 -command merge::dialog \
2172 -accelerator $M1T-M
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002173 lappend disable_on_lock \
2174 [list .mbar.merge entryconf [.mbar.merge index last] -state]
Christian Stimming1ac17952007-07-21 14:21:34 +02002175 .mbar.merge add command -label [mc "Abort Merge..."] \
Shawn O. Pearcea6c9b082007-05-02 13:56:27 -04002176 -command merge::reset_hard
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002177 lappend disable_on_lock \
2178 [list .mbar.merge entryconf [.mbar.merge index last] -state]
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002179}
2180
2181# -- Transport Menu
2182#
2183if {[is_enabled transport]} {
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002184 menu .mbar.remote
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002185
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002186 .mbar.remote add command \
2187 -label [mc "Push..."] \
Shawn O. Pearce840bcfa2007-07-05 22:15:00 -04002188 -command do_push_anywhere \
2189 -accelerator $M1T-P
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002190 .mbar.remote add command \
2191 -label [mc "Delete..."] \
Shawn O. Pearceaa252f12007-05-28 15:23:32 -04002192 -command remote_branch_delete::dialog
Shawn O. Pearce9b28a8b2007-02-26 11:17:11 -05002193}
2194
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05002195if {[is_MacOSX]} {
2196 # -- Apple Menu (Mac OS X only)
2197 #
Shawn O. Pearce442b3ca2008-03-15 01:11:08 -04002198 .mbar add cascade -label Apple -menu .mbar.apple
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05002199 menu .mbar.apple
Shawn O. Pearce82aa2352006-11-20 23:55:51 -05002200
Christian Stimming1ac17952007-07-21 14:21:34 +02002201 .mbar.apple add command -label [mc "About %s" [appname]] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002202 -command do_about
Shawn O. Pearce13824e22007-10-07 22:39:08 -07002203 .mbar.apple add separator
2204 .mbar.apple add command \
2205 -label [mc "Preferences..."] \
2206 -command do_options \
2207 -accelerator $M1T-,
2208 bind . <$M1B-,> do_options
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05002209} else {
2210 # -- Edit Menu
2211 #
2212 .mbar.edit add separator
Christian Stimming1ac17952007-07-21 14:21:34 +02002213 .mbar.edit add command -label [mc "Options..."] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002214 -command do_options
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002215}
Shawn O. Pearce557afe82006-12-07 22:07:38 -05002216
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002217# -- Help Menu
2218#
Christian Stimming1ac17952007-07-21 14:21:34 +02002219.mbar add cascade -label [mc Help] -menu .mbar.help
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002220menu .mbar.help
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05002221
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002222if {![is_MacOSX]} {
Christian Stimming1ac17952007-07-21 14:21:34 +02002223 .mbar.help add command -label [mc "About %s" [appname]] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002224 -command do_about
Shawn O. Pearce0c8d7832006-11-21 02:33:56 -05002225}
2226
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002227set browser {}
2228catch {set browser $repo_config(instaweb.browser)}
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002229set doc_path [file dirname [gitexec]]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002230set doc_path [file join $doc_path Documentation index.html]
2231
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002232if {[is_Cygwin]} {
Shawn O. Pearceee405992007-02-18 19:06:09 -05002233 set doc_path [exec cygpath --mixed $doc_path]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002234}
2235
2236if {$browser eq {}} {
2237 if {[is_MacOSX]} {
2238 set browser open
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002239 } elseif {[is_Cygwin]} {
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002240 set program_files [file dirname [exec cygpath --windir]]
2241 set program_files [file join $program_files {Program Files}]
2242 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
2243 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
2244 if {[file exists $firefox]} {
2245 set browser $firefox
2246 } elseif {[file exists $ie]} {
2247 set browser $ie
2248 }
2249 unset program_files firefox ie
2250 }
2251}
2252
2253if {[file isfile $doc_path]} {
2254 set doc_url "file:$doc_path"
2255} else {
2256 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2257}
2258
2259if {$browser ne {}} {
Christian Stimming1ac17952007-07-21 14:21:34 +02002260 .mbar.help add command -label [mc "Online Documentation"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002261 -command [list exec $browser $doc_url &]
Shawn O. Pearce273984f2007-01-28 20:00:36 -05002262}
2263unset browser doc_path doc_url
Shawn O. Pearce82aa2352006-11-20 23:55:51 -05002264
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002265# -- Standard bindings
2266#
Shawn O. Pearce39fa2a92007-06-11 23:52:43 -04002267wm protocol . WM_DELETE_WINDOW do_quit
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002268bind all <$M1B-Key-q> do_quit
2269bind all <$M1B-Key-Q> do_quit
2270bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2271bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2272
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002273set subcommand_args {}
2274proc usage {} {
2275 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2276 exit 1
2277}
2278
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002279# -- Not a normal commit type invocation? Do that instead!
2280#
Shawn O. Pearce258871d2007-02-08 19:41:32 -05002281switch -- $subcommand {
Shawn O. Pearce85d2d592007-07-18 00:53:14 -04002282browser -
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002283blame {
Shawn O. Pearcec52c9452007-07-17 23:58:56 -04002284 set subcommand_args {rev? path}
2285 if {$argv eq {}} usage
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002286 set head {}
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002287 set path {}
2288 set is_path 0
2289 foreach a $argv {
2290 if {$is_path || [file exists $_prefix$a]} {
2291 if {$path ne {}} usage
Shawn O. Pearce6b3d8b92007-05-09 18:35:04 -04002292 set path $_prefix$a
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002293 break
2294 } elseif {$a eq {--}} {
2295 if {$path ne {}} {
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002296 if {$head ne {}} usage
2297 set head $path
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002298 set path {}
2299 }
2300 set is_path 1
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002301 } elseif {$head eq {}} {
2302 if {$head ne {}} usage
2303 set head $a
Shawn O. Pearcec52c9452007-07-17 23:58:56 -04002304 set is_path 1
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002305 } else {
2306 usage
2307 }
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002308 }
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002309 unset is_path
2310
Shawn O. Pearcec52c9452007-07-17 23:58:56 -04002311 if {$head ne {} && $path eq {}} {
2312 set path $_prefix$head
2313 set head {}
2314 }
2315
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002316 if {$head eq {}} {
Shawn O. Pearced41b43e2007-07-08 18:40:56 -04002317 load_current_branch
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002318 } else {
Shawn O. Pearce02087ab2007-07-08 21:19:59 -04002319 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2320 if {[catch {
2321 set head [git rev-parse --verify $head]
2322 } err]} {
2323 puts stderr $err
2324 exit 1
2325 }
2326 }
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002327 set current_branch $head
Shawn O. Pearce3e45ee12007-05-08 22:36:01 -04002328 }
Shawn O. Pearcea0db0d62007-05-08 22:48:47 -04002329
Shawn O. Pearce85d2d592007-07-18 00:53:14 -04002330 switch -- $subcommand {
2331 browser {
2332 if {$head eq {}} {
2333 if {$path ne {} && [file isdirectory $path]} {
2334 set head $current_branch
2335 } else {
2336 set head $path
2337 set path {}
2338 }
2339 }
2340 browser::new $head $path
Shawn O. Pearcec52c9452007-07-17 23:58:56 -04002341 }
Shawn O. Pearce85d2d592007-07-18 00:53:14 -04002342 blame {
2343 if {$head eq {} && ![file exists $path]} {
Michele Ballabioc8c48542007-09-13 15:19:05 +02002344 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
Shawn O. Pearce85d2d592007-07-18 00:53:14 -04002345 exit 1
2346 }
2347 blame::new $head $path
2348 }
2349 }
Shawn O. Pearce258871d2007-02-08 19:41:32 -05002350 return
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002351}
Shawn O. Pearce258871d2007-02-08 19:41:32 -05002352citool -
2353gui {
2354 if {[llength $argv] != 0} {
2355 puts -nonewline stderr "usage: $argv0"
Shawn O. Pearce0b2bc462007-09-27 02:15:29 -04002356 if {$subcommand ne {gui}
2357 && [file tail $argv0] ne "git-$subcommand"} {
Shawn O. Pearce258871d2007-02-08 19:41:32 -05002358 puts -nonewline stderr " $subcommand"
2359 }
2360 puts stderr {}
2361 exit 1
2362 }
2363 # fall through to setup UI for commits
2364}
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002365default {
Shawn O. Pearcec0f7a6c2007-02-21 01:24:57 -05002366 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
Shawn O. Pearce2ebba522007-02-08 19:10:52 -05002367 exit 1
2368}
2369}
2370
Shawn O. Pearce8553b772006-11-24 15:38:18 -05002371# -- Branch Control
2372#
2373frame .branch \
2374 -borderwidth 1 \
2375 -relief sunken
2376label .branch.l1 \
Christian Stimming1ac17952007-07-21 14:21:34 +02002377 -text [mc "Current Branch:"] \
Shawn O. Pearce8553b772006-11-24 15:38:18 -05002378 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002379 -justify left
Shawn O. Pearce8553b772006-11-24 15:38:18 -05002380label .branch.cb \
2381 -textvariable current_branch \
2382 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002383 -justify left
Shawn O. Pearce8553b772006-11-24 15:38:18 -05002384pack .branch.l1 -side left
2385pack .branch.cb -side left -fill x
2386pack .branch -side top -fill x
2387
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002388# -- Main Window Layout
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002389#
Johannes Sixta0592d32007-10-10 20:50:40 -04002390panedwindow .vpane -orient horizontal
2391panedwindow .vpane.files -orient vertical
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05002392.vpane add .vpane.files -sticky nsew -height 100 -width 200
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002393pack .vpane -anchor n -side top -fill both -expand 1
2394
2395# -- Index File List
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002396#
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05002397frame .vpane.files.index -height 100 -width 200
Shawn O. Pearcec73ce762007-10-05 08:47:23 -04002398label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002399 -background lightgreen -foreground black
2400text $ui_index -background white -foreground black \
2401 -borderwidth 0 \
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05002402 -width 20 -height 10 \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002403 -wrap none \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05002404 -cursor $cursor_ptr \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002405 -xscrollcommand {.vpane.files.index.sx set} \
2406 -yscrollcommand {.vpane.files.index.sy set} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002407 -state disabled
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002408scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2409scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002410pack .vpane.files.index.title -side top -fill x
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002411pack .vpane.files.index.sx -side bottom -fill x
2412pack .vpane.files.index.sy -side right -fill y
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002413pack $ui_index -side left -fill both -expand 1
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002414
Shawn O. Pearce08126652007-01-20 22:06:51 -05002415# -- Working Directory File List
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002416#
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05002417frame .vpane.files.workdir -height 100 -width 200
Shawn O. Pearcec73ce762007-10-05 08:47:23 -04002418label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002419 -background lightsalmon -foreground black
2420text $ui_workdir -background white -foreground black \
2421 -borderwidth 0 \
Shawn O. Pearcec5a1eb82007-01-21 17:50:42 -05002422 -width 20 -height 10 \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002423 -wrap none \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05002424 -cursor $cursor_ptr \
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002425 -xscrollcommand {.vpane.files.workdir.sx set} \
2426 -yscrollcommand {.vpane.files.workdir.sy set} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002427 -state disabled
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002428scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2429scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
Shawn O. Pearce08126652007-01-20 22:06:51 -05002430pack .vpane.files.workdir.title -side top -fill x
Shawn O. Pearce3c236972007-01-21 14:58:01 -05002431pack .vpane.files.workdir.sx -side bottom -fill x
2432pack .vpane.files.workdir.sy -side right -fill y
Shawn O. Pearce08126652007-01-20 22:06:51 -05002433pack $ui_workdir -side left -fill both -expand 1
Johannes Sixta0592d32007-10-10 20:50:40 -04002434
Shawn O. Pearce08126652007-01-20 22:06:51 -05002435.vpane.files add .vpane.files.workdir -sticky nsew
Johannes Sixta0592d32007-10-10 20:50:40 -04002436.vpane.files add .vpane.files.index -sticky nsew
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002437
Shawn O. Pearce08126652007-01-20 22:06:51 -05002438foreach i [list $ui_index $ui_workdir] {
Shawn O. Pearce3849bfb2007-09-16 23:12:19 -04002439 rmsel_tag $i
2440 $i tag conf in_diff -background [$i tag cget in_sel -background]
Shawn O. Pearce24263b72006-11-13 16:06:38 -05002441}
2442unset i
Shawn O. Pearce131f5032006-11-06 16:07:32 -05002443
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002444# -- Diff and Commit Area
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002445#
Shawn O. Pearce8009dcd2006-11-12 06:53:56 -05002446frame .vpane.lower -height 300 -width 400
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002447frame .vpane.lower.commarea
2448frame .vpane.lower.diff -relief sunken -borderwidth 1
Johannes Sixta0592d32007-10-10 20:50:40 -04002449pack .vpane.lower.diff -fill both -expand 1
2450pack .vpane.lower.commarea -side bottom -fill x
Shawn O. Pearce0fd49d02007-01-24 15:21:01 -05002451.vpane add .vpane.lower -sticky nsew
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002452
2453# -- Commit Area Buttons
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002454#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002455frame .vpane.lower.commarea.buttons
2456label .vpane.lower.commarea.buttons.l -text {} \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002457 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002458 -justify left
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002459pack .vpane.lower.commarea.buttons.l -side top -fill x
2460pack .vpane.lower.commarea.buttons -side left -fill y
Shawn O. Pearce131f5032006-11-06 16:07:32 -05002461
Christian Stimming1ac17952007-07-21 14:21:34 +02002462button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002463 -command do_rescan
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002464pack .vpane.lower.commarea.buttons.rescan -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002465lappend disable_on_lock \
2466 {.vpane.lower.commarea.buttons.rescan conf -state}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05002467
Christian Stimming1ac17952007-07-21 14:21:34 +02002468button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002469 -command do_add_all
Shawn O. Pearce7fe7e732006-11-08 22:48:34 -05002470pack .vpane.lower.commarea.buttons.incall -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002471lappend disable_on_lock \
2472 {.vpane.lower.commarea.buttons.incall conf -state}
Shawn O. Pearce131f5032006-11-06 16:07:32 -05002473
Christian Stimming1ac17952007-07-21 14:21:34 +02002474button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002475 -command do_signoff
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002476pack .vpane.lower.commarea.buttons.signoff -side top -fill x
Shawn O. Pearce131f5032006-11-06 16:07:32 -05002477
Harri Ilari Tapio Liusvaaraa9813cb2007-09-12 23:02:35 +03002478button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002479 -command do_commit
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002480pack .vpane.lower.commarea.buttons.commit -side top -fill x
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002481lappend disable_on_lock \
2482 {.vpane.lower.commarea.buttons.commit conf -state}
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002483
Christian Stimming1ac17952007-07-21 14:21:34 +02002484button .vpane.lower.commarea.buttons.push -text [mc Push] \
Shawn O. Pearce87b49a52007-07-05 22:19:33 -04002485 -command do_push_anywhere
2486pack .vpane.lower.commarea.buttons.push -side top -fill x
2487
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002488# -- Commit Message Buffer
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002489#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002490frame .vpane.lower.commarea.buffer
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002491frame .vpane.lower.commarea.buffer.header
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002492set ui_comm .vpane.lower.commarea.buffer.t
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002493set ui_coml .vpane.lower.commarea.buffer.header.l
2494radiobutton .vpane.lower.commarea.buffer.header.new \
Christian Stimming1ac17952007-07-21 14:21:34 +02002495 -text [mc "New Commit"] \
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002496 -command do_select_commit_type \
2497 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002498 -value new
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002499lappend disable_on_lock \
2500 [list .vpane.lower.commarea.buffer.header.new conf -state]
2501radiobutton .vpane.lower.commarea.buffer.header.amend \
Christian Stimming1ac17952007-07-21 14:21:34 +02002502 -text [mc "Amend Last Commit"] \
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002503 -command do_select_commit_type \
2504 -variable selected_commit_type \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002505 -value amend
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002506lappend disable_on_lock \
2507 [list .vpane.lower.commarea.buffer.header.amend conf -state]
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002508label $ui_coml \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002509 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002510 -justify left
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05002511proc trace_commit_type {varname args} {
2512 global ui_coml commit_type
2513 switch -glob -- $commit_type {
Christian Stimming1ac17952007-07-21 14:21:34 +02002514 initial {set txt [mc "Initial Commit Message:"]}
2515 amend {set txt [mc "Amended Commit Message:"]}
2516 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
2517 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
2518 merge {set txt [mc "Merge Commit Message:"]}
2519 * {set txt [mc "Commit Message:"]}
Shawn O. Pearce4539eac2006-11-18 02:50:58 -05002520 }
2521 $ui_coml conf -text $txt
2522}
2523trace add variable commit_type write trace_commit_type
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002524pack $ui_coml -side left -fill x
2525pack .vpane.lower.commarea.buffer.header.amend -side right
2526pack .vpane.lower.commarea.buffer.header.new -side right
2527
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002528text $ui_comm -background white -foreground black \
2529 -borderwidth 1 \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002530 -undo true \
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -05002531 -maxundo 20 \
Shawn O. Pearce98616712006-11-11 15:51:41 -05002532 -autoseparators true \
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002533 -relief sunken \
Adam Piątyszek11027d52008-03-06 20:38:40 +01002534 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002535 -font font_diff \
Shawn O. Pearce6c6dd012006-11-11 20:33:30 -05002536 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002537scrollbar .vpane.lower.commarea.buffer.sby \
2538 -command [list $ui_comm yview]
Shawn O. Pearce24ac9b72006-11-18 20:59:49 -05002539pack .vpane.lower.commarea.buffer.header -side top -fill x
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002540pack .vpane.lower.commarea.buffer.sby -side right -fill y
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002541pack $ui_comm -side left -fill y
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002542pack .vpane.lower.commarea.buffer -side left -fill y
2543
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002544# -- Commit Message Buffer Context Menu
2545#
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002546set ctxm .vpane.lower.commarea.buffer.ctxm
2547menu $ctxm -tearoff 0
2548$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002549 -label [mc Cut] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002550 -command {tk_textCut $ui_comm}
2551$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002552 -label [mc Copy] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002553 -command {tk_textCopy $ui_comm}
2554$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002555 -label [mc Paste] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002556 -command {tk_textPaste $ui_comm}
2557$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002558 -label [mc Delete] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002559 -command {$ui_comm delete sel.first sel.last}
2560$ctxm add separator
2561$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002562 -label [mc "Select All"] \
Shawn O. Pearce75e78c82007-01-22 18:31:12 -05002563 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002564$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002565 -label [mc "Copy All"] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002566 -command {
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002567 $ui_comm tag add sel 0.0 end
2568 tk_textCopy $ui_comm
2569 $ui_comm tag remove sel 0.0 end
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002570 }
2571$ctxm add separator
2572$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002573 -label [mc "Sign Off"] \
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002574 -command do_signoff
Shawn O. Pearce95b002e2008-02-07 02:35:25 -05002575set ui_comm_ctxm $ctxm
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002576
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002577# -- Diff Header
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002578#
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05002579proc trace_current_diff_path {varname args} {
2580 global current_diff_path diff_actions file_states
2581 if {$current_diff_path eq {}} {
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002582 set s {}
2583 set f {}
2584 set p {}
2585 set o disabled
2586 } else {
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05002587 set p $current_diff_path
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002588 set s [mapdesc [lindex $file_states($p) 0] $p]
Christian Stimming1ac17952007-07-21 14:21:34 +02002589 set f [mc "File:"]
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002590 set p [escape_path $p]
2591 set o normal
2592 }
2593
2594 .vpane.lower.diff.header.status configure -text $s
2595 .vpane.lower.diff.header.file configure -text $f
2596 .vpane.lower.diff.header.path configure -text $p
2597 foreach w $diff_actions {
2598 uplevel #0 $w $o
2599 }
2600}
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05002601trace add variable current_diff_path write trace_current_diff_path
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002602
Matthijs Melchior9adccb02007-06-05 23:50:02 +02002603frame .vpane.lower.diff.header -background gold
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002604label .vpane.lower.diff.header.status \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02002605 -background gold \
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002606 -foreground black \
Shawn O. Pearce3e7b0e12006-11-12 22:06:37 -05002607 -width $max_status_desc \
2608 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002609 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002610label .vpane.lower.diff.header.file \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02002611 -background gold \
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002612 -foreground black \
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05002613 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002614 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002615label .vpane.lower.diff.header.path \
Matthijs Melchior9adccb02007-06-05 23:50:02 +02002616 -background gold \
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002617 -foreground black \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002618 -anchor w \
Shawn O. Pearce7416bbc2007-04-28 23:14:08 -04002619 -justify left
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002620pack .vpane.lower.diff.header.status -side left
2621pack .vpane.lower.diff.header.file -side left
2622pack .vpane.lower.diff.header.path -fill x
2623set ctxm .vpane.lower.diff.header.ctxm
2624menu $ctxm -tearoff 0
2625$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002626 -label [mc Copy] \
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05002627 -command {
2628 clipboard clear
2629 clipboard append \
2630 -format STRING \
2631 -type STRING \
Shawn O. Pearce20a53c02007-01-21 11:37:58 -05002632 -- $current_diff_path
Shawn O. Pearcefce89e42006-11-13 00:48:44 -05002633 }
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002634lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2635bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002636
2637# -- Diff Body
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002638#
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002639frame .vpane.lower.diff.body
2640set ui_diff .vpane.lower.diff.body.t
Philipp A. Hartmannc382fdd2008-03-05 17:54:22 +01002641text $ui_diff -background white -foreground black \
2642 -borderwidth 0 \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002643 -width 80 -height 15 -wrap none \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002644 -font font_diff \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002645 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2646 -yscrollcommand {.vpane.lower.diff.body.sby set} \
Shawn O. Pearce0fb8f9c2006-11-07 20:27:46 -05002647 -state disabled
2648scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2649 -command [list $ui_diff xview]
2650scrollbar .vpane.lower.diff.body.sby -orient vertical \
2651 -command [list $ui_diff yview]
2652pack .vpane.lower.diff.body.sbx -side bottom -fill x
2653pack .vpane.lower.diff.body.sby -side right -fill y
2654pack $ui_diff -side left -fill both -expand 1
2655pack .vpane.lower.diff.header -side top -fill x
2656pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2657
Shawn O. Pearce30b14ed2007-01-24 21:30:23 -05002658$ui_diff tag conf d_cr -elide true
Shawn O. Pearceca521562007-01-21 14:49:45 -05002659$ui_diff tag conf d_@ -foreground blue -font font_diffbold
2660$ui_diff tag conf d_+ -foreground {#00a000}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002661$ui_diff tag conf d_- -foreground red
2662
Shawn O. Pearceca521562007-01-21 14:49:45 -05002663$ui_diff tag conf d_++ -foreground {#00a000}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002664$ui_diff tag conf d_-- -foreground red
2665$ui_diff tag conf d_+s \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002666 -foreground {#00a000} \
2667 -background {#e2effa}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002668$ui_diff tag conf d_-s \
2669 -foreground red \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002670 -background {#e2effa}
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002671$ui_diff tag conf d_s+ \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002672 -foreground {#00a000} \
2673 -background ivory1
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002674$ui_diff tag conf d_s- \
2675 -foreground red \
Shawn O. Pearceca521562007-01-21 14:49:45 -05002676 -background ivory1
Shawn O. Pearcefec4a782007-01-21 13:12:02 -05002677
2678$ui_diff tag conf d<<<<<<< \
2679 -foreground orange \
2680 -font font_diffbold
2681$ui_diff tag conf d======= \
2682 -foreground orange \
2683 -font font_diffbold
2684$ui_diff tag conf d>>>>>>> \
2685 -foreground orange \
2686 -font font_diffbold
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002687
Shawn O. Pearceca521562007-01-21 14:49:45 -05002688$ui_diff tag raise sel
2689
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002690# -- Diff Body Context Menu
2691#
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002692set ctxm .vpane.lower.diff.body.ctxm
2693menu $ctxm -tearoff 0
2694$ctxm add command \
Johannes Sixtfba60722007-12-13 15:39:21 +01002695 -label [mc "Apply/Reverse Hunk"] \
2696 -command {apply_hunk $cursorX $cursorY}
2697set ui_diff_applyhunk [$ctxm index last]
2698lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
Johannes Sixt58219882008-06-27 09:22:01 +02002699$ctxm add command \
2700 -label [mc "Apply/Reverse Line"] \
2701 -command {apply_line $cursorX $cursorY; do_rescan}
2702set ui_diff_applyline [$ctxm index last]
2703lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
Johannes Sixtfba60722007-12-13 15:39:21 +01002704$ctxm add separator
2705$ctxm add command \
2706 -label [mc "Show Less Context"] \
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01002707 -command show_less_context
Johannes Sixtfba60722007-12-13 15:39:21 +01002708lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2709$ctxm add command \
2710 -label [mc "Show More Context"] \
Jonathan del Strotherc91ee2b2008-04-01 11:54:03 +01002711 -command show_more_context
Johannes Sixtfba60722007-12-13 15:39:21 +01002712lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2713$ctxm add separator
2714$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002715 -label [mc Refresh] \
Shawn O. Pearce68c30b42007-01-21 13:27:43 -05002716 -command reshow_diff
Shawn O. Pearce86773d92007-01-24 20:39:30 -05002717lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
Shawn O. Pearce68c30b42007-01-21 13:27:43 -05002718$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002719 -label [mc Copy] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002720 -command {tk_textCopy $ui_diff}
2721lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2722$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002723 -label [mc "Select All"] \
Shawn O. Pearce75e78c82007-01-22 18:31:12 -05002724 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002725lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2726$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002727 -label [mc "Copy All"] \
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002728 -command {
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002729 $ui_diff tag add sel 0.0 end
2730 tk_textCopy $ui_diff
2731 $ui_diff tag remove sel 0.0 end
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002732 }
2733lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2734$ctxm add separator
2735$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002736 -label [mc "Decrease Font Size"] \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002737 -command {incr_font_size font_diff -1}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002738lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2739$ctxm add command \
Christian Stimming1ac17952007-07-21 14:21:34 +02002740 -label [mc "Increase Font Size"] \
Shawn O. Pearceb4946932006-11-12 00:40:38 -05002741 -command {incr_font_size font_diff 1}
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002742lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2743$ctxm add separator
Christian Stimming1ac17952007-07-21 14:21:34 +02002744$ctxm add command -label [mc "Options..."] \
Shawn O. Pearce8009dcd2006-11-12 06:53:56 -05002745 -command do_options
Shawn O. Pearce83751fc2007-07-23 00:36:39 -04002746proc popup_diff_menu {ctxm x y X Y} {
Shawn O. Pearcece015c22007-08-21 02:22:53 -04002747 global current_diff_path file_states
Shawn O. Pearce83751fc2007-07-23 00:36:39 -04002748 set ::cursorX $x
2749 set ::cursorY $y
2750 if {$::ui_index eq $::current_diff_side} {
Christian Stimming1ac17952007-07-21 14:21:34 +02002751 set l [mc "Unstage Hunk From Commit"]
Johannes Sixt58219882008-06-27 09:22:01 +02002752 set t [mc "Unstage Line From Commit"]
Shawn O. Pearcea25c5182007-01-24 21:20:57 -05002753 } else {
Christian Stimming1ac17952007-07-21 14:21:34 +02002754 set l [mc "Stage Hunk For Commit"]
Johannes Sixt58219882008-06-27 09:22:01 +02002755 set t [mc "Stage Line For Commit"]
Shawn O. Pearcea25c5182007-01-24 21:20:57 -05002756 }
Shawn O. Pearce047d94d2007-09-02 15:38:04 -04002757 if {$::is_3way_diff
2758 || $current_diff_path eq {}
2759 || ![info exists file_states($current_diff_path)]
2760 || {_O} eq [lindex $file_states($current_diff_path) 0]} {
Shawn O. Pearce9c9f5fa2007-08-23 02:44:13 -04002761 set s disabled
Shawn O. Pearce047d94d2007-09-02 15:38:04 -04002762 } else {
2763 set s normal
Shawn O. Pearce9c9f5fa2007-08-23 02:44:13 -04002764 }
Shawn O. Pearce9f4119e2007-08-23 02:39:45 -04002765 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
Johannes Sixt58219882008-06-27 09:22:01 +02002766 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
Shawn O. Pearce83751fc2007-07-23 00:36:39 -04002767 tk_popup $ctxm $X $Y
2768}
2769bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
Shawn O. Pearce0e794312006-11-11 20:24:23 -05002770
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002771# -- Status Bar
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002772#
Shawn O. Pearce51530d12007-07-08 22:06:33 -04002773set main_status [::status_bar::new .status]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002774pack .status -anchor w -side bottom -fill x
Christian Stimming1ac17952007-07-21 14:21:34 +02002775$main_status show [mc "Initializing..."]
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002776
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002777# -- Load geometry
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002778#
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002779catch {
Shawn O. Pearce51f4d162006-11-12 03:47:00 -05002780set gm $repo_config(gui.geometry)
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05002781wm geometry . [lindex $gm 0]
2782.vpane sash place 0 \
Johannes Sixta0592d32007-10-10 20:50:40 -04002783 [lindex $gm 1] \
2784 [lindex [.vpane sash coord 0] 1]
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05002785.vpane.files sash place 0 \
Johannes Sixta0592d32007-10-10 20:50:40 -04002786 [lindex [.vpane.files sash coord 0] 0] \
2787 [lindex $gm 2]
Shawn O. Pearcec4fe7722006-11-11 19:32:24 -05002788unset gm
Shawn O. Pearce390adae2006-11-11 19:40:33 -05002789}
Shawn O. Pearce2d195162006-11-08 23:42:51 -05002790
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002791# -- Key Bindings
Shawn O. Pearcee8ab6442006-11-15 18:55:05 -05002792#
Shawn O. Pearceec6b4242006-11-06 20:50:59 -05002793bind $ui_comm <$M1B-Key-Return> {do_commit;break}
Shawn O. Pearcecd16a6c2007-11-08 02:22:21 -05002794bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
2795bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05002796bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2797bind $ui_comm <$M1B-Key-I> {do_add_all;break}
Shawn O. Pearce98616712006-11-11 15:51:41 -05002798bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2799bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2800bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2801bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2802bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2803bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2804bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2805bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
Michele Ballabio729ffa52008-04-04 23:04:42 +02002806bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
2807bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
2808bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
2809bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
2810bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
Shawn O. Pearce98616712006-11-11 15:51:41 -05002811
2812bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2813bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2814bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2815bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2816bind $ui_diff <$M1B-Key-v> {break}
2817bind $ui_diff <$M1B-Key-V> {break}
2818bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2819bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
Shawn O. Pearceb2c6fcf2006-11-11 16:16:25 -05002820bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2821bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2822bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2823bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
Shawn O. Pearce60aa0652007-05-01 15:51:09 -04002824bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2825bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2826bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2827bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2828bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2829bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
Shawn O. Pearce23effa72007-01-25 12:57:57 -05002830bind $ui_diff <Button-1> {focus %W}
Shawn O. Pearce49b86f02006-11-11 15:16:01 -05002831
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05002832if {[is_enabled branch]} {
Shawn O. Pearceb1fa2bf2007-07-03 22:57:18 -04002833 bind . <$M1B-Key-n> branch_create::dialog
2834 bind . <$M1B-Key-N> branch_create::dialog
Shawn O. Pearced41b43e2007-07-08 18:40:56 -04002835 bind . <$M1B-Key-o> branch_checkout::dialog
2836 bind . <$M1B-Key-O> branch_checkout::dialog
Shawn O. Pearcea870ddc2007-07-19 00:39:23 -04002837 bind . <$M1B-Key-m> merge::dialog
2838 bind . <$M1B-Key-M> merge::dialog
Shawn O. Pearcebd29ebc2007-01-21 01:34:55 -05002839}
Shawn O. Pearce840bcfa2007-07-05 22:15:00 -04002840if {[is_enabled transport]} {
2841 bind . <$M1B-Key-p> do_push_anywhere
2842 bind . <$M1B-Key-P> do_push_anywhere
2843}
Shawn O. Pearcebd29ebc2007-01-21 01:34:55 -05002844
Shawn O. Pearcef1e031b2007-07-05 22:16:38 -04002845bind . <Key-F5> do_rescan
2846bind . <$M1B-Key-r> do_rescan
2847bind . <$M1B-Key-R> do_rescan
Shawn O. Pearce07123f42006-11-07 02:57:46 -05002848bind . <$M1B-Key-s> do_signoff
2849bind . <$M1B-Key-S> do_signoff
Shawn O. Pearcecd16a6c2007-11-08 02:22:21 -05002850bind . <$M1B-Key-t> do_add_selection
2851bind . <$M1B-Key-T> do_add_selection
Shawn O. Pearce93e912c2007-01-20 23:07:04 -05002852bind . <$M1B-Key-i> do_add_all
2853bind . <$M1B-Key-I> do_add_all
Michele Ballabio729ffa52008-04-04 23:04:42 +02002854bind . <$M1B-Key-minus> {show_less_context;break}
2855bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
2856bind . <$M1B-Key-equal> {show_more_context;break}
2857bind . <$M1B-Key-plus> {show_more_context;break}
2858bind . <$M1B-Key-KP_Add> {show_more_context;break}
Shawn O. Pearce07123f42006-11-07 02:57:46 -05002859bind . <$M1B-Key-Return> do_commit
Shawn O. Pearce08126652007-01-20 22:06:51 -05002860foreach i [list $ui_index $ui_workdir] {
Shawn O. Pearce24263b72006-11-13 16:06:38 -05002861 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2862 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2863 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002864}
Shawn O. Pearce62aac802006-11-11 20:00:35 -05002865unset i
2866
2867set file_lists($ui_index) [list]
Shawn O. Pearce08126652007-01-20 22:06:51 -05002868set file_lists($ui_workdir) [list]
Shawn O. Pearcea49c67d2006-11-18 03:27:23 -05002869
Shawn O. Pearce19c82142007-04-14 15:10:48 -04002870wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
Shawn O. Pearcecb07fc22006-11-06 14:20:27 -05002871focus -force $ui_comm
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002872
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002873# -- Warn the user about environmental problems. Cygwin's Tcl
2874# does *not* pass its env array onto any processes it spawns.
2875# This means that git processes get none of our environment.
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002876#
Shawn O. Pearce20ddfca2007-01-28 20:58:47 -05002877if {[is_Cygwin]} {
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002878 set ignored_env 0
2879 set suggest_user {}
Michele Ballabioc8c48542007-09-13 15:19:05 +02002880 set msg [mc "Possible environment issues exist.
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002881
2882The following environment variables are probably
2883going to be ignored by any Git subprocess run
Michele Ballabioc8c48542007-09-13 15:19:05 +02002884by %s:
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002885
Michele Ballabioc8c48542007-09-13 15:19:05 +02002886" [appname]]
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002887 foreach name [array names env] {
2888 switch -regexp -- $name {
2889 {^GIT_INDEX_FILE$} -
2890 {^GIT_OBJECT_DIRECTORY$} -
2891 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2892 {^GIT_DIFF_OPTS$} -
2893 {^GIT_EXTERNAL_DIFF$} -
2894 {^GIT_PAGER$} -
2895 {^GIT_TRACE$} -
2896 {^GIT_CONFIG$} -
2897 {^GIT_CONFIG_LOCAL$} -
2898 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2899 append msg " - $name\n"
2900 incr ignored_env
2901 }
2902 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2903 append msg " - $name\n"
2904 incr ignored_env
2905 set suggest_user $name
2906 }
2907 }
2908 }
2909 if {$ignored_env > 0} {
Michele Ballabioc8c48542007-09-13 15:19:05 +02002910 append msg [mc "
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002911This is due to a known issue with the
Michele Ballabioc8c48542007-09-13 15:19:05 +02002912Tcl binary distributed by Cygwin."]
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002913
2914 if {$suggest_user ne {}} {
Michele Ballabioc8c48542007-09-13 15:19:05 +02002915 append msg [mc "
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002916
Michele Ballabioc8c48542007-09-13 15:19:05 +02002917A good replacement for %s
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002918is placing values for the user.name and
2919user.email settings into your personal
2920~/.gitconfig file.
Michele Ballabioc8c48542007-09-13 15:19:05 +02002921" $suggest_user]
Shawn O. Pearce1d8b3cb2006-11-21 15:28:14 -05002922 }
2923 warn_popup $msg
2924 }
2925 unset ignored_env msg suggest_user name
2926}
2927
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002928# -- Only initialize complex UI if we are going to stay running.
2929#
Shawn O. Pearce64a906f2007-02-08 18:10:05 -05002930if {[is_enabled transport]} {
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05002931 load_all_remotes
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002932
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002933 set n [.mbar.remote index end]
Shawn O. Pearce3f7fd922007-01-25 17:16:22 -05002934 populate_push_menu
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002935 populate_fetch_menu
2936 set n [expr {[.mbar.remote index end] - $n}]
2937 if {$n > 0} {
Alexander Gavrilov7e09b152008-07-27 10:34:21 +04002938 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
Shawn O. Pearce6bdf5e52007-10-07 22:23:54 -07002939 .mbar.remote insert $n separator
2940 }
2941 unset n
Shawn O. Pearce4ccdab02006-11-12 16:20:36 -05002942}
Shawn O. Pearce85ab3132006-11-25 03:38:39 -05002943
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04002944if {[winfo exists $ui_comm]} {
2945 set GITGUI_BCK_exists [load_message GITGUI_BCK]
2946
2947 # -- If both our backup and message files exist use the
2948 # newer of the two files to initialize the buffer.
2949 #
2950 if {$GITGUI_BCK_exists} {
2951 set m [gitdir GITGUI_MSG]
2952 if {[file isfile $m]} {
2953 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
2954 catch {file delete [gitdir GITGUI_MSG]}
2955 } else {
2956 $ui_comm delete 0.0 end
2957 $ui_comm edit reset
2958 $ui_comm edit modified false
2959 catch {file delete [gitdir GITGUI_BCK]}
2960 set GITGUI_BCK_exists 0
2961 }
2962 }
2963 unset m
2964 }
2965
2966 proc backup_commit_buffer {} {
2967 global ui_comm GITGUI_BCK_exists
2968
2969 set m [$ui_comm edit modified]
2970 if {$m || $GITGUI_BCK_exists} {
2971 set msg [string trim [$ui_comm get 0.0 end]]
2972 regsub -all -line {[ \r\t]+$} $msg {} msg
2973
2974 if {$msg eq {}} {
2975 if {$GITGUI_BCK_exists} {
2976 catch {file delete [gitdir GITGUI_BCK]}
2977 set GITGUI_BCK_exists 0
2978 }
2979 } elseif {$m} {
2980 catch {
2981 set fd [open [gitdir GITGUI_BCK] w]
2982 puts -nonewline $fd $msg
2983 close $fd
2984 set GITGUI_BCK_exists 1
2985 }
2986 }
2987
2988 $ui_comm edit modified false
2989 }
2990
2991 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
2992 }
2993
2994 backup_commit_buffer
Shawn O. Pearce95b002e2008-02-07 02:35:25 -05002995
2996 # -- If the user has aspell available we can drive it
2997 # in pipe mode to spellcheck the commit message.
2998 #
2999 set spell_cmd [list |]
3000 set spell_dict [get_config gui.spellingdictionary]
3001 lappend spell_cmd aspell
3002 if {$spell_dict ne {}} {
3003 lappend spell_cmd --master=$spell_dict
3004 }
3005 lappend spell_cmd --mode=none
3006 lappend spell_cmd --encoding=utf-8
3007 lappend spell_cmd pipe
3008 if {$spell_dict eq {none}
3009 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3010 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3011 } else {
3012 set ui_comm_spell [spellcheck::init \
3013 $spell_fd \
3014 $ui_comm \
3015 $ui_comm_ctxm \
3016 ]
3017 }
3018 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
Shawn O. Pearce4578c5c2007-07-21 04:57:57 -04003019}
3020
Shawn O. Pearce53716a72006-11-18 03:31:25 -05003021lock_index begin-read
Shawn O. Pearce301dfaa2007-07-17 23:09:31 -04003022if {![winfo ismapped .]} {
3023 wm deiconify .
3024}
Shawn O. Pearce8f525482006-11-14 01:29:32 -05003025after 1 do_rescan
Shawn O. Pearce3972b982007-07-17 23:20:56 -04003026if {[is_enabled multicommit]} {
3027 after 1000 hint_gc
3028}