git-gui: Update German translation (12 new or changed strings).
[git/git.git] / git-gui.sh
CommitLineData
bd11b82d 1#!/bin/sh
cb07fc2a 2# Tcl ignores the next line -*- tcl -*- \
4e817d1a
SP
3 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
5 then \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
7 exit; \
8 fi; \
2f7c9a7f
SP
9 argv0=$0; \
10 exec wish "$argv0" -- "$@"
cb07fc2a 11
7e81d4ee 12set appvers {@@GITGUI_VERSION@@}
d6db1ad5 13set copyright [encoding convertfrom utf-8 {
a9813cb5 14Copyright © 2006, 2007 Shawn Pearce, et. al.
bdc9ea20 15
0499b24a
SP
16This 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.
20
21This 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
d6db1ad5 28Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
cb07fc2a 29
f522c9b5 30######################################################################
cfb07cca
SP
31##
32## 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 \
c8c4854b 41 -title [mc "git-gui: fatal error"] \
cfb07cca
SP
42 -message $err
43 exit 1
44}
45
63c4024f 46catch {rename send {}} ; # What an evil concept...
cff93397 47
fc703c20
SP
48######################################################################
49##
50## locate our library
51
52set oguilib {@@GITGUI_LIBDIR@@}
53set oguirel {@@GITGUI_RELATIVE@@}
54if {$oguirel eq {1}} {
9534c9fb
JS
55 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]
fc703c20 60 set oguilib [file join $oguilib share git-gui lib]
d4b0ccd9 61 set oguimsg [file join $oguilib msgs]
fc703c20
SP
62} elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
d4b0ccd9
SP
64 set oguimsg [file join [file dirname [file normalize $argv0]] po]
65} else {
66 set oguimsg [file join $oguilib msgs]
fc703c20
SP
67}
68unset oguirel
69
cd12901b
SP
70######################################################################
71##
72## 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
c950c66e 88######################################################################
d4b0ccd9
SP
89##
90## Internationalization (i18n) through msgcat and gettext. See
91## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
92
93package require msgcat
146d73a3 94
ab0d33c4 95proc _mc_trim {fmt} {
146d73a3
SP
96 set cmk [string first @@ $fmt]
97 if {$cmk > 0} {
ab0d33c4 98 return [string range $fmt 0 [expr {$cmk - 1}]]
146d73a3 99 }
ab0d33c4
SP
100 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
146d73a3
SP
109}
110
31bb1d1b
SP
111proc strcat {args} {
112 return [join $args {}]
113}
114
d4b0ccd9
SP
115::msgcat::mcload $oguimsg
116unset oguimsg
117
118######################################################################
c950c66e
SP
119##
120## read only globals
121
0b2bc460 122set _appname {Git Gui}
c950c66e 123set _gitdir {}
21985a11 124set _gitworktree {}
29e5573d 125set _isbare {}
20ddfcaa 126set _gitexec {}
3eb5682b 127set _githtmldir {}
c950c66e 128set _reponame {}
20ddfcaa 129set _iscygwin {}
0b812616 130set _search_path {}
c950c66e 131
16dd62ac
SP
132set _trace [lsearch -exact $argv --trace]
133if {$_trace >= 0} {
134 set argv [lreplace $argv $_trace $_trace]
135 set _trace 1
136} else {
137 set _trace 0
138}
139
c950c66e
SP
140proc appname {} {
141 global _appname
142 return $_appname
143}
144
c2758a17 145proc gitdir {args} {
c950c66e 146 global _gitdir
c2758a17
SP
147 if {$args eq {}} {
148 return $_gitdir
149 }
0b812616 150 return [eval [list file join $_gitdir] $args]
c950c66e
SP
151}
152
20ddfcaa
SP
153proc gitexec {args} {
154 global _gitexec
155 if {$_gitexec eq {}} {
81347223 156 if {[catch {set _gitexec [git --exec-path]} err]} {
20ddfcaa
SP
157 error "Git not installed?\n\n$err"
158 }
0b812616
SP
159 if {[is_Cygwin]} {
160 set _gitexec [exec cygpath \
161 --windows \
162 --absolute \
163 $_gitexec]
164 } else {
165 set _gitexec [file normalize $_gitexec]
166 }
20ddfcaa
SP
167 }
168 if {$args eq {}} {
169 return $_gitexec
170 }
0b812616 171 return [eval [list file join $_gitexec] $args]
20ddfcaa
SP
172}
173
3eb5682b
MH
174proc githtmldir {args} {
175 global _githtmldir
176 if {$_githtmldir eq {}} {
177 if {[catch {set _githtmldir [git --html-path]}]} {
178 # Git not installed or option not yet supported
179 return {}
180 }
181 if {[is_Cygwin]} {
182 set _githtmldir [exec cygpath \
183 --windows \
184 --absolute \
185 $_githtmldir]
186 } else {
187 set _githtmldir [file normalize $_githtmldir]
188 }
189 }
190 if {$args eq {}} {
191 return $_githtmldir
192 }
193 return [eval [list file join $_githtmldir] $args]
194}
195
c950c66e 196proc reponame {} {
d36cd968 197 return $::_reponame
c950c66e 198}
da5239dc 199
20ddfcaa 200proc is_MacOSX {} {
20ddfcaa
SP
201 if {[tk windowingsystem] eq {aqua}} {
202 return 1
203 }
204 return 0
205}
206
207proc is_Windows {} {
d36cd968 208 if {$::tcl_platform(platform) eq {windows}} {
20ddfcaa
SP
209 return 1
210 }
211 return 0
212}
213
214proc is_Cygwin {} {
d36cd968 215 global _iscygwin
20ddfcaa 216 if {$_iscygwin eq {}} {
d36cd968 217 if {$::tcl_platform(platform) eq {windows}} {
20ddfcaa
SP
218 if {[catch {set p [exec cygpath --windir]} err]} {
219 set _iscygwin 0
220 } else {
221 set _iscygwin 1
222 }
223 } else {
224 set _iscygwin 0
225 }
226 }
227 return $_iscygwin
228}
229
cf25ddc8
SP
230proc is_enabled {option} {
231 global enabled_options
232 if {[catch {set on $enabled_options($option)}]} {return 0}
233 return $on
234}
235
236proc enable_option {option} {
237 global enabled_options
238 set enabled_options($option) 1
239}
240
241proc disable_option {option} {
242 global enabled_options
243 set enabled_options($option) 0
244}
245
2d19516d
SP
246######################################################################
247##
248## config
249
51f4d16b
SP
250proc is_many_config {name} {
251 switch -glob -- $name {
24f7c64b 252 gui.recentrepo -
51f4d16b
SP
253 remote.*.fetch -
254 remote.*.push
255 {return 1}
256 *
257 {return 0}
258 }
259}
2d19516d 260
c539449b
SP
261proc is_config_true {name} {
262 global repo_config
263 if {[catch {set v $repo_config($name)}]} {
264 return 0
265 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
266 return 1
267 } else {
268 return 0
269 }
270}
271
61f82ce7
SP
272proc get_config {name} {
273 global repo_config
274 if {[catch {set v $repo_config($name)}]} {
275 return {}
276 } else {
277 return $v
278 }
279}
280
29e5573d
GB
281proc is_bare {} {
282 global _isbare
283 global _gitdir
284 global _gitworktree
285
286 if {$_isbare eq {}} {
287 if {[catch {
288 set _bare [git rev-parse --is-bare-repository]
289 switch -- $_bare {
290 true { set _isbare 1 }
291 false { set _isbare 0}
292 default { throw }
293 }
294 }]} {
295 if {[is_config_true core.bare]
296 || ($_gitworktree eq {}
297 && [lindex [file split $_gitdir] end] ne {.git})} {
298 set _isbare 1
299 } else {
300 set _isbare 0
301 }
302 }
303 }
304 return $_isbare
305}
306
81347223
SP
307######################################################################
308##
309## handy utils
310
16dd62ac
SP
311proc _trace_exec {cmd} {
312 if {!$::_trace} return
313 set d {}
314 foreach v $cmd {
315 if {$d ne {}} {
316 append d { }
317 }
318 if {[regexp {[ \t\r\n'"$?*]} $v]} {
319 set v [sq $v]
320 }
321 append d $v
322 }
323 puts stderr $d
324}
325
0b812616
SP
326proc _git_cmd {name} {
327 global _git_cmd_path
328
329 if {[catch {set v $_git_cmd_path($name)}]} {
330 switch -- $name {
70a7595c 331 version -
0b812616
SP
332 --version -
333 --exec-path { return [list $::_git $name] }
334 }
335
336 set p [gitexec git-$name$::_search_exe]
337 if {[file exists $p]} {
338 set v [list $p]
c136f2b8
SP
339 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
340 # Try to determine what sort of magic will make
341 # git-$name go and do its thing, because native
342 # Tcl on Windows doesn't know it.
0b812616 343 #
c136f2b8
SP
344 set p [gitexec git-$name]
345 set f [open $p r]
346 set s [gets $f]
347 close $f
348
6e4ba05c 349 switch -glob -- [lindex $s 0] {
c136f2b8
SP
350 #!*sh { set i sh }
351 #!*perl { set i perl }
352 #!*python { set i python }
353 default { error "git-$name is not supported: $s" }
354 }
355
356 upvar #0 _$i interp
357 if {![info exists interp]} {
358 set interp [_which $i]
359 }
360 if {$interp eq {}} {
361 error "git-$name requires $i (not in PATH)"
362 }
6e4ba05c 363 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
0b812616 364 } else {
c6729890
SP
365 # Assume it is builtin to git somehow and we
366 # aren't actually able to see a file for it.
367 #
368 set v [list $::_git $name]
0b812616
SP
369 }
370 set _git_cmd_path($name) $v
371 }
372 return $v
373}
374
79317e5d 375proc _which {what args} {
0b812616
SP
376 global env _search_exe _search_path
377
378 if {$_search_path eq {}} {
299077fb 379 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
0b812616
SP
380 set _search_path [split [exec cygpath \
381 --windows \
382 --path \
383 --absolute \
384 $env(PATH)] {;}]
385 set _search_exe .exe
386 } elseif {[is_Windows]} {
be700fe3
SP
387 set gitguidir [file dirname [info script]]
388 regsub -all ";" $gitguidir "\\;" gitguidir
389 set env(PATH) "$gitguidir;$env(PATH)"
0b812616
SP
390 set _search_path [split $env(PATH) {;}]
391 set _search_exe .exe
392 } else {
393 set _search_path [split $env(PATH) :]
394 set _search_exe {}
395 }
396 }
397
79317e5d
SP
398 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
399 set suffix {}
400 } else {
401 set suffix $_search_exe
402 }
403
0b812616 404 foreach p $_search_path {
79317e5d 405 set p [file join $p $what$suffix]
0b812616
SP
406 if {[file exists $p]} {
407 return [file normalize $p]
408 }
409 }
410 return {}
411}
412
6f62b4f7
SP
413proc _lappend_nice {cmd_var} {
414 global _nice
415 upvar $cmd_var cmd
416
417 if {![info exists _nice]} {
418 set _nice [_which nice]
419 }
420 if {$_nice ne {}} {
421 lappend cmd $_nice
422 }
423}
424
81347223 425proc git {args} {
16dd62ac 426 set opt [list]
0b812616
SP
427
428 while {1} {
429 switch -- [lindex $args 0] {
430 --nice {
6f62b4f7 431 _lappend_nice opt
0b812616
SP
432 }
433
434 default {
435 break
436 }
437
438 }
439
440 set args [lrange $args 1 end]
441 }
442
443 set cmdp [_git_cmd [lindex $args 0]]
444 set args [lrange $args 1 end]
445
16dd62ac
SP
446 _trace_exec [concat $opt $cmdp $args]
447 set result [eval exec $opt $cmdp $args]
448 if {$::_trace} {
449 puts stderr "< $result"
450 }
451 return $result
0b812616
SP
452}
453
74c4763c 454proc _open_stdout_stderr {cmd} {
16dd62ac 455 _trace_exec $cmd
74c4763c 456 if {[catch {
16dd62ac 457 set fd [open [concat [list | ] $cmd] r]
74c4763c
SP
458 } err]} {
459 if { [lindex $cmd end] eq {2>@1}
460 && $err eq {can not find channel named "1"}
461 } {
462 # Older versions of Tcl 8.4 don't have this 2>@1 IO
463 # redirect operator. Fallback to |& cat for those.
464 # The command was not actually started, so its safe
465 # to try to start it a second time.
466 #
467 set fd [open [concat \
16dd62ac 468 [list | ] \
74c4763c
SP
469 [lrange $cmd 0 end-1] \
470 [list |& cat] \
471 ] r]
472 } else {
473 error $err
474 }
475 }
6eb420ef 476 fconfigure $fd -eofchar {}
74c4763c
SP
477 return $fd
478}
479
0b812616 480proc git_read {args} {
16dd62ac 481 set opt [list]
0b812616
SP
482
483 while {1} {
484 switch -- [lindex $args 0] {
485 --nice {
6f62b4f7 486 _lappend_nice opt
0b812616
SP
487 }
488
489 --stderr {
490 lappend args 2>@1
491 }
492
493 default {
494 break
495 }
496
497 }
498
499 set args [lrange $args 1 end]
500 }
501
502 set cmdp [_git_cmd [lindex $args 0]]
503 set args [lrange $args 1 end]
504
74c4763c 505 return [_open_stdout_stderr [concat $opt $cmdp $args]]
0b812616
SP
506}
507
508proc git_write {args} {
16dd62ac 509 set opt [list]
0b812616
SP
510
511 while {1} {
512 switch -- [lindex $args 0] {
513 --nice {
6f62b4f7 514 _lappend_nice opt
0b812616
SP
515 }
516
517 default {
518 break
519 }
520
521 }
522
523 set args [lrange $args 1 end]
524 }
525
526 set cmdp [_git_cmd [lindex $args 0]]
527 set args [lrange $args 1 end]
528
16dd62ac
SP
529 _trace_exec [concat $opt $cmdp $args]
530 return [open [concat [list | ] $opt $cmdp $args] w]
81347223
SP
531}
532
ed76cb70
SP
533proc githook_read {hook_name args} {
534 set pchook [gitdir hooks $hook_name]
535 lappend args 2>@1
536
fbc0e7ac 537 # On Windows [file executable] might lie so we need to ask
ed76cb70
SP
538 # the shell if the hook is executable. Yes that's annoying.
539 #
fbc0e7ac 540 if {[is_Windows]} {
ed76cb70
SP
541 upvar #0 _sh interp
542 if {![info exists interp]} {
543 set interp [_which sh]
544 }
545 if {$interp eq {}} {
546 error "hook execution requires sh (not in PATH)"
547 }
548
549 set scr {if test -x "$1";then exec "$@";fi}
16dd62ac 550 set sh_c [list $interp -c $scr $interp $pchook]
ed76cb70
SP
551 return [_open_stdout_stderr [concat $sh_c $args]]
552 }
553
554 if {[file executable $pchook]} {
16dd62ac 555 return [_open_stdout_stderr [concat [list $pchook] $args]]
ed76cb70
SP
556 }
557
558 return {}
559}
560
e6131d30
AG
561proc kill_file_process {fd} {
562 set process [pid $fd]
563
564 catch {
565 if {[is_Windows]} {
566 # Use a Cygwin-specific flag to allow killing
567 # native Windows processes
568 exec kill -f $process
569 } else {
570 exec kill $process
571 }
572 }
573}
574
1ffca60f
SP
575proc gitattr {path attr default} {
576 if {[catch {set r [git check-attr $attr -- $path]}]} {
577 set r unspecified
578 } else {
579 set r [join [lrange [split $r :] 2 end] :]
580 regsub {^ } $r {} r
581 }
582 if {$r eq {unspecified}} {
583 return $default
584 }
585 return $r
586}
587
7eafa2f1
SP
588proc sq {value} {
589 regsub -all ' $value "'\\''" value
590 return "'$value'"
591}
592
d41b43eb
SP
593proc load_current_branch {} {
594 global current_branch is_detached
595
fc4e8da7 596 set fd [open [gitdir HEAD] r]
311e02a4 597 if {[gets $fd ref] < 1} {
fc4e8da7
SP
598 set ref {}
599 }
600 close $fd
311e02a4
SP
601
602 set pfx {ref: refs/heads/}
603 set len [string length $pfx]
604 if {[string equal -length $len $pfx $ref]} {
605 # We're on a branch. It might not exist. But
606 # HEAD looks good enough to be a branch.
607 #
d41b43eb
SP
608 set current_branch [string range $ref $len end]
609 set is_detached 0
311e02a4
SP
610 } else {
611 # Assume this is a detached head.
612 #
d41b43eb
SP
613 set current_branch HEAD
614 set is_detached 1
311e02a4 615 }
fc4e8da7
SP
616}
617
2739291b
SP
618auto_load tk_optionMenu
619rename tk_optionMenu real__tkOptionMenu
620proc tk_optionMenu {w varName args} {
621 set m [eval real__tkOptionMenu $w $varName $args]
622 $m configure -font font_ui
623 $w configure -font font_ui
624 return $m
625}
626
3849bfba
SP
627proc rmsel_tag {text} {
628 $text tag conf sel \
629 -background [$text cget -background] \
630 -foreground [$text cget -foreground] \
631 -borderwidth 0
632 $text tag conf in_sel -background lightgray
633 bind $text <Motion> break
634 return $text
635}
636
a4bee597
SP
637set root_exists 0
638bind . <Visibility> {
639 bind . <Visibility> {}
640 set root_exists 1
641}
642
1bdd8a15
SP
643if {[is_Windows]} {
644 wm iconbitmap . -default $oguilib/git-gui.ico
f10d5b06 645 set ::tk::AlwaysShowSelection 1
8c762125
AG
646
647 # Spoof an X11 display for SSH
648 if {![info exists env(DISPLAY)]} {
649 set env(DISPLAY) :9999
650 }
d1f2b362
GB
651} else {
652 catch {
653 image create photo gitlogo -width 16 -height 16
654
655 gitlogo put #33CC33 -to 7 0 9 2
656 gitlogo put #33CC33 -to 4 2 12 4
657 gitlogo put #33CC33 -to 7 4 9 6
658 gitlogo put #CC3333 -to 4 6 12 8
659 gitlogo put gray26 -to 4 9 6 10
660 gitlogo put gray26 -to 3 10 6 12
661 gitlogo put gray26 -to 8 9 13 11
662 gitlogo put gray26 -to 8 11 10 12
663 gitlogo put gray26 -to 11 11 13 14
664 gitlogo put gray26 -to 3 12 5 14
665 gitlogo put gray26 -to 5 13
666 gitlogo put gray26 -to 10 13
667 gitlogo put gray26 -to 4 14 12 15
668 gitlogo put gray26 -to 5 15 11 16
669 gitlogo redither
670
671 wm iconphoto . -default gitlogo
672 }
1bdd8a15
SP
673}
674
a4bee597
SP
675######################################################################
676##
677## config defaults
678
679set cursor_ptr arrow
680font create font_diff -family Courier -size 10
681font create font_ui
682catch {
683 label .dummy
684 eval font configure font_ui [font actual [.dummy cget -font]]
685 destroy .dummy
686}
687
688font create font_uiitalic
689font create font_uibold
690font create font_diffbold
691font create font_diffitalic
692
693foreach class {Button Checkbutton Entry Label
a91be3fc 694 Labelframe Listbox Message
a4bee597
SP
695 Radiobutton Spinbox Text} {
696 option add *$class.font font_ui
697}
a91be3fc
DS
698if {![is_MacOSX]} {
699 option add *Menu.font font_ui
700}
a4bee597
SP
701unset class
702
703if {[is_Windows] || [is_MacOSX]} {
704 option add *Menu.tearOff 0
705}
706
707if {[is_MacOSX]} {
708 set M1B M1
709 set M1T Cmd
710} else {
711 set M1B Control
712 set M1T Ctrl
713}
714
715proc bind_button3 {w cmd} {
716 bind $w <Any-Button-3> $cmd
717 if {[is_MacOSX]} {
718 # Mac OS X sends Button-2 on right click through three-button mouse,
719 # or through trackpad right-clicking (two-finger touch + click).
720 bind $w <Any-Button-2> $cmd
721 bind $w <Control-Button-1> $cmd
722 }
723}
724
725proc apply_config {} {
726 global repo_config font_descs
727
728 foreach option $font_descs {
729 set name [lindex $option 0]
730 set font [lindex $option 1]
731 if {[catch {
48b8d2b3 732 set need_weight 1
a4bee597 733 foreach {cn cv} $repo_config(gui.$name) {
48b8d2b3
SP
734 if {$cn eq {-weight}} {
735 set need_weight 0
736 }
737 font configure $font $cn $cv
738 }
739 if {$need_weight} {
740 font configure $font -weight normal
a4bee597
SP
741 }
742 } err]} {
743 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
744 }
745 foreach {cn cv} [font configure $font] {
746 font configure ${font}bold $cn $cv
747 font configure ${font}italic $cn $cv
748 }
749 font configure ${font}bold -weight bold
750 font configure ${font}italic -slant italic
751 }
752}
753
fe70225d 754set default_config(branch.autosetupmerge) true
7e30682c 755set default_config(merge.tool) {}
fb25092a 756set default_config(mergetool.keepbackup) true
a4bee597
SP
757set default_config(merge.diffstat) true
758set default_config(merge.summary) false
759set default_config(merge.verbosity) 2
760set default_config(user.name) {}
761set default_config(user.email) {}
762
72e6b002 763set default_config(gui.encoding) [encoding system]
a4bee597
SP
764set default_config(gui.matchtrackingbranch) false
765set default_config(gui.pruneduringfetch) false
766set default_config(gui.trustmtime) false
57cae87b
AG
767set default_config(gui.fastcopyblame) false
768set default_config(gui.copyblamethreshold) 40
a9c80b83 769set default_config(gui.blamehistoryctx) 7
a4bee597 770set default_config(gui.diffcontext) 5
11027d54 771set default_config(gui.commitmsgwidth) 75
a4bee597 772set default_config(gui.newbranchtemplate) {}
95b002ee 773set default_config(gui.spellingdictionary) {}
a4bee597
SP
774set default_config(gui.fontui) [font configure font_ui]
775set default_config(gui.fontdiff) [font configure font_diff]
dd6451f9
DZ
776# TODO: this option should be added to the git-config documentation
777set default_config(gui.maxfilesdisplayed) 5000
a4bee597
SP
778set font_descs {
779 {fontui font_ui {mc "Main Font"}}
780 {fontdiff font_diff {mc "Diff/Console Font"}}
781}
782
0b812616
SP
783######################################################################
784##
785## find git
786
787set _git [_which git]
788if {$_git eq {}} {
789 catch {wm withdraw .}
183a1d14
SP
790 tk_messageBox \
791 -icon error \
792 -type ok \
793 -title [mc "git-gui: fatal error"] \
794 -message [mc "Cannot find git in PATH."]
0b812616
SP
795 exit 1
796}
0b812616 797
54acdd95
SP
798######################################################################
799##
800## version check
801
d6967022 802if {[catch {set _git_version [git --version]} err]} {
54acdd95 803 catch {wm withdraw .}
875b7c93
SP
804 tk_messageBox \
805 -icon error \
806 -type ok \
c8c4854b 807 -title [mc "git-gui: fatal error"] \
875b7c93 808 -message "Cannot determine Git version:
54acdd95
SP
809
810$err
811
d6967022
SP
812[appname] requires Git 1.5.0 or later."
813 exit 1
814}
815if {![regsub {^git version } $_git_version {} _git_version]} {
816 catch {wm withdraw .}
875b7c93
SP
817 tk_messageBox \
818 -icon error \
819 -type ok \
c8c4854b 820 -title [mc "git-gui: fatal error"] \
31bb1d1b 821 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
54acdd95
SP
822 exit 1
823}
301dfaa9
SP
824
825set _real_git_version $_git_version
2c2a3782 826regsub -- {[\-\.]dirty$} $_git_version {} _git_version
d6967022 827regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
764369c5 828regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
91464dfb 829regsub {\.GIT$} $_git_version {} _git_version
764369c5 830regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
d6967022 831
301dfaa9
SP
832if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
833 catch {wm withdraw .}
834 if {[tk_messageBox \
835 -icon warning \
836 -type yesno \
837 -default no \
838 -title "[appname]: warning" \
1ac17950 839 -message [mc "Git version cannot be determined.
301dfaa9 840
1ac17950 841%s claims it is version '%s'.
301dfaa9 842
1ac17950 843%s requires at least Git 1.5.0 or later.
301dfaa9 844
1ac17950
CS
845Assume '%s' is version 1.5.0?
846" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
301dfaa9
SP
847 set _git_version 1.5.0
848 } else {
849 exit 1
850 }
851}
852unset _real_git_version
853
d6967022
SP
854proc git-version {args} {
855 global _git_version
856
857 switch [llength $args] {
858 0 {
859 return $_git_version
54acdd95 860 }
d6967022
SP
861
862 2 {
863 set op [lindex $args 0]
864 set vr [lindex $args 1]
865 set cm [package vcompare $_git_version $vr]
866 return [expr $cm $op 0]
867 }
868
869 4 {
870 set type [lindex $args 0]
871 set name [lindex $args 1]
872 set parm [lindex $args 2]
873 set body [lindex $args 3]
874
875 if {($type ne {proc} && $type ne {method})} {
876 error "Invalid arguments to git-version"
877 }
878 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
879 error "Last arm of $type $name must be default"
880 }
881
882 foreach {op vr cb} [lrange $body 0 end-2] {
883 if {[git-version $op $vr]} {
884 return [uplevel [list $type $name $parm $cb]]
885 }
886 }
887
888 return [uplevel [list $type $name $parm [lindex $body end]]]
889 }
890
891 default {
892 error "git-version >= x"
893 }
894
895 }
896}
897
898if {[git-version < 1.5]} {
54acdd95 899 catch {wm withdraw .}
875b7c93
SP
900 tk_messageBox \
901 -icon error \
902 -type ok \
c8c4854b 903 -title [mc "git-gui: fatal error"] \
875b7c93 904 -message "[appname] requires Git 1.5.0 or later.
d6967022
SP
905
906You are using [git-version]:
907
908[git --version]"
54acdd95
SP
909 exit 1
910}
54acdd95 911
875b7c93
SP
912######################################################################
913##
914## configure our library
915
875b7c93
SP
916set idx [file join $oguilib tclIndex]
917if {[catch {set fd [open $idx r]} err]} {
918 catch {wm withdraw .}
919 tk_messageBox \
920 -icon error \
921 -type ok \
c8c4854b 922 -title [mc "git-gui: fatal error"] \
875b7c93
SP
923 -message $err
924 exit 1
925}
926if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
927 set idx [list]
928 while {[gets $fd n] >= 0} {
929 if {$n ne {} && ![string match #* $n]} {
930 lappend idx $n
931 }
932 }
933} else {
934 set idx {}
935}
936close $fd
937
938if {$idx ne {}} {
939 set loaded [list]
940 foreach p $idx {
941 if {[lsearch -exact $loaded $p] >= 0} continue
942 source [file join $oguilib $p]
943 lappend loaded $p
944 }
945 unset loaded p
946} else {
947 set auto_path [concat [list $oguilib] $auto_path]
948}
fc703c20 949unset -nocomplain idx fd
875b7c93 950
ba7cc660 951######################################################################
69f85ffa
SP
952##
953## config file parsing
954
f00d504a 955git-version proc _parse_config {arr_name args} {
85f7a94b
SP
956 >= 1.5.3 {
957 upvar $arr_name arr
958 array unset arr
959 set buf {}
960 catch {
a5bb31fb
SP
961 set fd_rc [eval \
962 [list git_read config] \
963 $args \
964 [list --null --list]]
85f7a94b
SP
965 fconfigure $fd_rc -translation binary
966 set buf [read $fd_rc]
967 close $fd_rc
968 }
969 foreach line [split $buf "\0"] {
970 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
971 if {[is_many_config $name]} {
972 lappend arr($name) $value
973 } else {
974 set arr($name) $value
975 }
976 }
977 }
978 }
f00d504a
SP
979 default {
980 upvar $arr_name arr
981 array unset arr
69f85ffa 982 catch {
f00d504a 983 set fd_rc [eval [list git_read config --list] $args]
69f85ffa
SP
984 while {[gets $fd_rc line] >= 0} {
985 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
986 if {[is_many_config $name]} {
f00d504a 987 lappend arr($name) $value
69f85ffa 988 } else {
f00d504a 989 set arr($name) $value
69f85ffa
SP
990 }
991 }
992 }
993 close $fd_rc
994 }
995 }
f00d504a 996}
69f85ffa 997
f00d504a 998proc load_config {include_global} {
153ad78b 999 global repo_config global_config system_config default_config
f00d504a
SP
1000
1001 if {$include_global} {
153ad78b 1002 _parse_config system_config --system
f00d504a 1003 _parse_config global_config --global
69f85ffa 1004 }
f00d504a 1005 _parse_config repo_config
69f85ffa
SP
1006
1007 foreach name [array names default_config] {
153ad78b
AG
1008 if {[catch {set v $system_config($name)}]} {
1009 set system_config($name) $default_config($name)
1010 }
1011 }
1012 foreach name [array names system_config] {
69f85ffa 1013 if {[catch {set v $global_config($name)}]} {
153ad78b 1014 set global_config($name) $system_config($name)
69f85ffa
SP
1015 }
1016 if {[catch {set v $repo_config($name)}]} {
153ad78b 1017 set repo_config($name) $system_config($name)
69f85ffa
SP
1018 }
1019 }
1020}
1021
1022######################################################################
ba7cc660
SP
1023##
1024## feature option selection
1025
0b2bc460 1026if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
ba7cc660
SP
1027 unset _junk
1028} else {
1029 set subcommand gui
1030}
1031if {$subcommand eq {gui.sh}} {
1032 set subcommand gui
1033}
1034if {$subcommand eq {gui} && [llength $argv] > 0} {
1035 set subcommand [lindex $argv 0]
1036 set argv [lrange $argv 1 end]
1037}
1038
1039enable_option multicommit
1040enable_option branch
1041enable_option transport
c52c9452 1042disable_option bare
ba7cc660
SP
1043
1044switch -- $subcommand {
1045browser -
1046blame {
c52c9452
SP
1047 enable_option bare
1048
ba7cc660
SP
1049 disable_option multicommit
1050 disable_option branch
1051 disable_option transport
1052}
1053citool {
1054 enable_option singlecommit
1e65c622 1055 enable_option retcode
ba7cc660
SP
1056
1057 disable_option multicommit
1058 disable_option branch
1059 disable_option transport
1e65c622
AG
1060
1061 while {[llength $argv] > 0} {
1062 set a [lindex $argv 0]
1063 switch -- $a {
1064 --amend {
1065 enable_option initialamend
1066 }
1067 --nocommit {
1068 enable_option nocommit
1069 enable_option nocommitmsg
1070 }
1071 --commitmsg {
1072 disable_option nocommitmsg
1073 }
1074 default {
1075 break
1076 }
1077 }
1078
1079 set argv [lrange $argv 1 end]
1080 }
ba7cc660
SP
1081}
1082}
1083
e29c0d10
AG
1084######################################################################
1085##
1086## execution environment
1087
1088set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1089
1090# Suggest our implementation of askpass, if none is set
1091if {![info exists env(SSH_ASKPASS)]} {
1092 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1093}
1094
2d19516d
SP
1095######################################################################
1096##
1097## repository setup
1098
bb4812bc 1099set picked 0
c6127856
SP
1100if {[catch {
1101 set _gitdir $env(GIT_DIR)
1102 set _prefix {}
1103 }]
1104 && [catch {
87cd09f4
GB
1105 # beware that from the .git dir this sets _gitdir to .
1106 # and _prefix to the empty string
c6127856
SP
1107 set _gitdir [git rev-parse --git-dir]
1108 set _prefix [git rev-parse --show-prefix]
1109 } err]} {
ab08b363
SP
1110 load_config 1
1111 apply_config
1112 choose_repository::pick
bb4812bc 1113 set picked 1
2d19516d 1114}
87cd09f4
GB
1115
1116# we expand the _gitdir when it's just a single dot (i.e. when we're being
1117# run from the .git dir itself) lest the routines to find the worktree
1118# get confused
1119if {$_gitdir eq "."} {
1120 set _gitdir [pwd]
1121}
1122
20ddfcaa 1123if {![file isdirectory $_gitdir] && [is_Cygwin]} {
2f7c9a7f 1124 catch {set _gitdir [exec cygpath --windows $_gitdir]}
20ddfcaa 1125}
c950c66e 1126if {![file isdirectory $_gitdir]} {
dbccbbda 1127 catch {wm withdraw .}
31bb1d1b 1128 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
dbccbbda
SP
1129 exit 1
1130}
21985a11
GB
1131# _gitdir exists, so try loading the config
1132load_config 0
1133apply_config
1134# try to set work tree from environment, falling back to core.worktree
1135if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1136 set _gitworktree [get_config core.worktree]
1137}
c80d25db 1138if {$_prefix ne {}} {
21985a11
GB
1139 if {$_gitworktree eq {}} {
1140 regsub -all {[^/]+/} $_prefix ../ cdup
1141 } else {
1142 set cdup $_gitworktree
1143 }
c80d25db
SP
1144 if {[catch {cd $cdup} err]} {
1145 catch {wm withdraw .}
31bb1d1b 1146 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
c80d25db
SP
1147 exit 1
1148 }
21985a11 1149 set _gitworktree [pwd]
c80d25db
SP
1150 unset cdup
1151} elseif {![is_enabled bare]} {
29e5573d 1152 if {[is_bare]} {
c52c9452 1153 catch {wm withdraw .}
29e5573d 1154 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
c52c9452
SP
1155 exit 1
1156 }
21985a11
GB
1157 if {$_gitworktree eq {}} {
1158 set _gitworktree [file dirname $_gitdir]
1159 }
1160 if {[catch {cd $_gitworktree} err]} {
c52c9452 1161 catch {wm withdraw .}
21985a11 1162 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
c52c9452
SP
1163 exit 1
1164 }
21985a11 1165 set _gitworktree [pwd]
dbccbbda 1166}
c52c9452
SP
1167set _reponame [file split [file normalize $_gitdir]]
1168if {[lindex $_reponame end] eq {.git}} {
1169 set _reponame [lindex $_reponame end-1]
1170} else {
1171 set _reponame [lindex $_reponame end]
2d19516d 1172}
2d19516d 1173
a9fa11fe
GB
1174set env(GIT_DIR) $_gitdir
1175set env(GIT_WORK_TREE) $_gitworktree
1176
372ef954
SP
1177######################################################################
1178##
1179## global init
1180
1181set current_diff_path {}
1182set current_diff_side {}
1183set diff_actions [list]
372ef954
SP
1184
1185set HEAD {}
1186set PARENT {}
1187set MERGE_HEAD [list]
1188set commit_type {}
1189set empty_tree {}
1190set current_branch {}
d41b43eb 1191set is_detached 0
372ef954 1192set current_diff_path {}
9c9f5fa9 1193set is_3way_diff 0
cd846aa1 1194set is_submodule_diff 0
3e34838c 1195set is_conflict_diff 0
372ef954 1196set selected_commit_type new
8052e788 1197set diff_empty_count 0
372ef954 1198
a9786bb4
AG
1199set nullid "0000000000000000000000000000000000000000"
1200set nullid2 "0000000000000000000000000000000000000001"
1201
cb07fc2a
SP
1202######################################################################
1203##
e210e674 1204## task management
cb07fc2a 1205
8f52548a 1206set rescan_active 0
131f503b 1207set diff_active 0
24263b77 1208set last_clicked {}
131f503b 1209
e210e674
SP
1210set disable_on_lock [list]
1211set index_lock_type none
1212
1213proc lock_index {type} {
1214 global index_lock_type disable_on_lock
131f503b 1215
043f7011 1216 if {$index_lock_type eq {none}} {
e210e674
SP
1217 set index_lock_type $type
1218 foreach w $disable_on_lock {
1219 uplevel #0 $w disabled
1220 }
1221 return 1
53716a7b 1222 } elseif {$index_lock_type eq "begin-$type"} {
e210e674 1223 set index_lock_type $type
131f503b
SP
1224 return 1
1225 }
1226 return 0
1227}
cb07fc2a 1228
e210e674
SP
1229proc unlock_index {} {
1230 global index_lock_type disable_on_lock
1231
1232 set index_lock_type none
1233 foreach w $disable_on_lock {
1234 uplevel #0 $w normal
1235 }
1236}
1237
1238######################################################################
1239##
1240## status
1241
f18e40a1 1242proc repository_state {ctvar hdvar mhvar} {
c950c66e 1243 global current_branch
f18e40a1
SP
1244 upvar $ctvar ct $hdvar hd $mhvar mh
1245
1246 set mh [list]
ec6b424a 1247
d41b43eb 1248 load_current_branch
81347223 1249 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
4539eacd 1250 set hd {}
ec6b424a 1251 set ct initial
f18e40a1
SP
1252 return
1253 }
1254
c2758a17 1255 set merge_head [gitdir MERGE_HEAD]
f18e40a1 1256 if {[file exists $merge_head]} {
ec6b424a 1257 set ct merge
f18e40a1
SP
1258 set fd_mh [open $merge_head r]
1259 while {[gets $fd_mh line] >= 0} {
1260 lappend mh $line
1261 }
1262 close $fd_mh
1263 return
ec6b424a 1264 }
f18e40a1
SP
1265
1266 set ct normal
ec6b424a
SP
1267}
1268
4539eacd
SP
1269proc PARENT {} {
1270 global PARENT empty_tree
1271
f18e40a1
SP
1272 set p [lindex $PARENT 0]
1273 if {$p ne {}} {
1274 return $p
4539eacd
SP
1275 }
1276 if {$empty_tree eq {}} {
81347223 1277 set empty_tree [git mktree << {}]
4539eacd
SP
1278 }
1279 return $empty_tree
1280}
1281
1e65c622
AG
1282proc force_amend {} {
1283 global selected_commit_type
1284 global HEAD PARENT MERGE_HEAD commit_type
1285
1286 repository_state newType newHEAD newMERGE_HEAD
1287 set HEAD $newHEAD
1288 set PARENT $newHEAD
1289 set MERGE_HEAD $newMERGE_HEAD
1290 set commit_type $newType
1291
1292 set selected_commit_type amend
1293 do_select_commit_type
1294}
1295
46aaf90b 1296proc rescan {after {honor_trustmtime 1}} {
f18e40a1 1297 global HEAD PARENT MERGE_HEAD commit_type
699d5601 1298 global ui_index ui_workdir ui_comm
8f52548a 1299 global rescan_active file_states
cf25ddc8 1300 global repo_config
cb07fc2a 1301
8f52548a 1302 if {$rescan_active > 0 || ![lock_index read]} return
cb07fc2a 1303
f18e40a1 1304 repository_state newType newHEAD newMERGE_HEAD
4539eacd 1305 if {[string match amend* $commit_type]
f18e40a1
SP
1306 && $newType eq {normal}
1307 && $newHEAD eq $HEAD} {
e57ca85e 1308 } else {
f18e40a1
SP
1309 set HEAD $newHEAD
1310 set PARENT $newHEAD
1311 set MERGE_HEAD $newMERGE_HEAD
1312 set commit_type $newType
e57ca85e
SP
1313 }
1314
cb07fc2a 1315 array unset file_states
cb07fc2a 1316
1e0a92fd
SP
1317 if {!$::GITGUI_BCK_exists &&
1318 (![$ui_comm edit modified]
1319 || [string trim [$ui_comm get 0.0 end]] eq {})} {
b2f3bb1b
SP
1320 if {[string match amend* $commit_type]} {
1321 } elseif {[load_message GITGUI_MSG]} {
2cd1fd1f 1322 } elseif {[run_prepare_commit_msg_hook]} {
131f503b
SP
1323 } elseif {[load_message MERGE_MSG]} {
1324 } elseif {[load_message SQUASH_MSG]} {
1325 }
b2c6fcf1 1326 $ui_comm edit reset
21d7744f 1327 $ui_comm edit modified false
131f503b
SP
1328 }
1329
46aaf90b 1330 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
8f52548a 1331 rescan_stage2 {} $after
e534f3a8 1332 } else {
8f52548a 1333 set rescan_active 1
1ac17950 1334 ui_status [mc "Refreshing file status..."]
0b812616
SP
1335 set fd_rf [git_read update-index \
1336 -q \
1337 --unmerged \
1338 --ignore-missing \
1339 --refresh \
1340 ]
e534f3a8 1341 fconfigure $fd_rf -blocking 0 -translation binary
390adaea 1342 fileevent $fd_rf readable \
8f52548a 1343 [list rescan_stage2 $fd_rf $after]
e534f3a8 1344 }
131f503b
SP
1345}
1346
2fe167b6 1347if {[is_Cygwin]} {
2fe167b6
SP
1348 set is_git_info_exclude {}
1349 proc have_info_exclude {} {
7f83aa2d 1350 global is_git_info_exclude
2fe167b6 1351
7f83aa2d
SP
1352 if {$is_git_info_exclude eq {}} {
1353 if {[catch {exec test -f [gitdir info exclude]}]} {
1354 set is_git_info_exclude 0
1355 } else {
1356 set is_git_info_exclude 1
2fe167b6 1357 }
2fe167b6 1358 }
7f83aa2d 1359 return $is_git_info_exclude
2fe167b6
SP
1360 }
1361} else {
1362 proc have_info_exclude {} {
1363 return [file readable [gitdir info exclude]]
1364 }
1365}
1366
8f52548a 1367proc rescan_stage2 {fd after} {
4539eacd 1368 global rescan_active buf_rdi buf_rdf buf_rlo
131f503b 1369
043f7011 1370 if {$fd ne {}} {
e534f3a8
SP
1371 read $fd
1372 if {![eof $fd]} return
1373 close $fd
1374 }
131f503b 1375
0b812616 1376 set ls_others [list --exclude-per-directory=.gitignore]
2fe167b6
SP
1377 if {[have_info_exclude]} {
1378 lappend ls_others "--exclude-from=[gitdir info exclude]"
cb07fc2a 1379 }
94a4dd9b
SP
1380 set user_exclude [get_config core.excludesfile]
1381 if {$user_exclude ne {} && [file readable $user_exclude]} {
1382 lappend ls_others "--exclude-from=$user_exclude"
1383 }
cb07fc2a 1384
868c8752
SP
1385 set buf_rdi {}
1386 set buf_rdf {}
1387 set buf_rlo {}
1388
8f52548a 1389 set rescan_active 3
1ac17950 1390 ui_status [mc "Scanning for modified files ..."]
0b812616
SP
1391 set fd_di [git_read diff-index --cached -z [PARENT]]
1392 set fd_df [git_read diff-files -z]
1393 set fd_lo [eval git_read ls-files --others -z $ls_others]
cb07fc2a 1394
51a989ba
SP
1395 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1396 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1397 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
8f52548a
SP
1398 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1399 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1400 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
cb07fc2a
SP
1401}
1402
131f503b 1403proc load_message {file} {
c950c66e 1404 global ui_comm
131f503b 1405
c2758a17 1406 set f [gitdir $file]
e57ca85e 1407 if {[file isfile $f]} {
131f503b
SP
1408 if {[catch {set fd [open $f r]}]} {
1409 return 0
1410 }
6eb420ef 1411 fconfigure $fd -eofchar {}
e57ca85e 1412 set content [string trim [read $fd]]
131f503b 1413 close $fd
4e55d19a 1414 regsub -all -line {[ \r\t]+$} $content {} content
131f503b
SP
1415 $ui_comm delete 0.0 end
1416 $ui_comm insert end $content
1417 return 1
1418 }
1419 return 0
1420}
1421
2cd1fd1f
JW
1422proc run_prepare_commit_msg_hook {} {
1423 global pch_error
1424
1425 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1426 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1427 # empty file but existant file.
1428
1429 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1430
1431 if {[file isfile [gitdir MERGE_MSG]]} {
1432 set pcm_source "merge"
1433 set fd_mm [open [gitdir MERGE_MSG] r]
1434 puts -nonewline $fd_pcm [read $fd_mm]
1435 close $fd_mm
1436 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1437 set pcm_source "squash"
1438 set fd_sm [open [gitdir SQUASH_MSG] r]
1439 puts -nonewline $fd_pcm [read $fd_sm]
1440 close $fd_sm
1441 } else {
1442 set pcm_source ""
1443 }
1444
1445 close $fd_pcm
1446
1447 set fd_ph [githook_read prepare-commit-msg \
1448 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1449 if {$fd_ph eq {}} {
1450 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1451 return 0;
1452 }
1453
1454 ui_status [mc "Calling prepare-commit-msg hook..."]
1455 set pch_error {}
1456
1457 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1458 fileevent $fd_ph readable \
1459 [list prepare_commit_msg_hook_wait $fd_ph]
1460
1461 return 1;
1462}
1463
1464proc prepare_commit_msg_hook_wait {fd_ph} {
1465 global pch_error
1466
1467 append pch_error [read $fd_ph]
1468 fconfigure $fd_ph -blocking 1
1469 if {[eof $fd_ph]} {
1470 if {[catch {close $fd_ph}]} {
1471 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1472 hook_failed_popup prepare-commit-msg $pch_error
1473 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1474 exit 1
1475 } else {
1476 load_message PREPARE_COMMIT_MSG
1477 }
1478 set pch_error {}
1479 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1480 return
1481 }
1482 fconfigure $fd_ph -blocking 0
1483 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1484}
1485
8f52548a 1486proc read_diff_index {fd after} {
cb07fc2a
SP
1487 global buf_rdi
1488
1489 append buf_rdi [read $fd]
868c8752
SP
1490 set c 0
1491 set n [string length $buf_rdi]
1492 while {$c < $n} {
1493 set z1 [string first "\0" $buf_rdi $c]
1494 if {$z1 == -1} break
1495 incr z1
1496 set z2 [string first "\0" $buf_rdi $z1]
1497 if {$z2 == -1} break
1498
868c8752 1499 incr c
86291555 1500 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
51a989ba 1501 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1461c5f3 1502 merge_state \
51a989ba 1503 [encoding convertfrom $p] \
86291555
SP
1504 [lindex $i 4]? \
1505 [list [lindex $i 0] [lindex $i 2]] \
1461c5f3
SP
1506 [list]
1507 set c $z2
86291555 1508 incr c
cb07fc2a 1509 }
868c8752
SP
1510 if {$c < $n} {
1511 set buf_rdi [string range $buf_rdi $c end]
1512 } else {
1513 set buf_rdi {}
1514 }
1515
8f52548a 1516 rescan_done $fd buf_rdi $after
cb07fc2a
SP
1517}
1518
8f52548a 1519proc read_diff_files {fd after} {
cb07fc2a
SP
1520 global buf_rdf
1521
1522 append buf_rdf [read $fd]
868c8752
SP
1523 set c 0
1524 set n [string length $buf_rdf]
1525 while {$c < $n} {
1526 set z1 [string first "\0" $buf_rdf $c]
1527 if {$z1 == -1} break
1528 incr z1
1529 set z2 [string first "\0" $buf_rdf $z1]
1530 if {$z2 == -1} break
1531
868c8752 1532 incr c
86291555 1533 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
51a989ba 1534 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1461c5f3 1535 merge_state \
51a989ba 1536 [encoding convertfrom $p] \
86291555 1537 ?[lindex $i 4] \
1461c5f3 1538 [list] \
86291555 1539 [list [lindex $i 0] [lindex $i 2]]
1461c5f3 1540 set c $z2
86291555 1541 incr c
868c8752
SP
1542 }
1543 if {$c < $n} {
1544 set buf_rdf [string range $buf_rdf $c end]
1545 } else {
1546 set buf_rdf {}
cb07fc2a 1547 }
868c8752 1548
8f52548a 1549 rescan_done $fd buf_rdf $after
cb07fc2a
SP
1550}
1551
8f52548a 1552proc read_ls_others {fd after} {
cb07fc2a
SP
1553 global buf_rlo
1554
1555 append buf_rlo [read $fd]
1556 set pck [split $buf_rlo "\0"]
1557 set buf_rlo [lindex $pck end]
1558 foreach p [lrange $pck 0 end-1] {
89384101
SP
1559 set p [encoding convertfrom $p]
1560 if {[string index $p end] eq {/}} {
1561 set p [string range $p 0 end-1]
1562 }
1563 merge_state $p ?O
cb07fc2a 1564 }
8f52548a 1565 rescan_done $fd buf_rlo $after
cb07fc2a
SP
1566}
1567
8f52548a 1568proc rescan_done {fd buf after} {
f522c9b5 1569 global rescan_active current_diff_path
f7f8d322 1570 global file_states repo_config
7f1df79b 1571 upvar $buf to_clear
cb07fc2a 1572
f7f8d322
SP
1573 if {![eof $fd]} return
1574 set to_clear {}
1575 close $fd
8f52548a 1576 if {[incr rescan_active -1] > 0} return
93f654df 1577
24263b77 1578 prune_selection
f7f8d322
SP
1579 unlock_index
1580 display_all_files
7cf4566f
AG
1581 if {$current_diff_path ne {}} { reshow_diff $after }
1582 if {$current_diff_path eq {}} { select_first_diff $after }
cb07fc2a
SP
1583}
1584
24263b77
SP
1585proc prune_selection {} {
1586 global file_states selected_paths
1587
1588 foreach path [array names selected_paths] {
1589 if {[catch {set still_here $file_states($path)}]} {
1590 unset selected_paths($path)
1591 }
1592 }
1593}
1594
cb07fc2a
SP
1595######################################################################
1596##
f522c9b5 1597## ui helpers
cb07fc2a 1598
f522c9b5
SP
1599proc mapicon {w state path} {
1600 global all_icons
1601
1602 if {[catch {set r $all_icons($state$w)}]} {
1603 puts "error: no icon for $w state={$state} $path"
1604 return file_plain
1605 }
1606 return $r
1607}
cb07fc2a 1608
f522c9b5
SP
1609proc mapdesc {state path} {
1610 global all_descs
03e4ec53 1611
f522c9b5
SP
1612 if {[catch {set r $all_descs($state)}]} {
1613 puts "error: no desc for state={$state} $path"
1614 return $state
1615 }
1616 return $r
1617}
03e4ec53 1618
699d5601 1619proc ui_status {msg} {
906ab7f6
SP
1620 global main_status
1621 if {[info exists main_status]} {
1622 $main_status show $msg
1623 }
699d5601
SP
1624}
1625
1626proc ui_ready {{test {}}} {
906ab7f6
SP
1627 global main_status
1628 if {[info exists main_status]} {
1629 $main_status show [mc "Ready."] $test
1630 }
699d5601
SP
1631}
1632
f522c9b5
SP
1633proc escape_path {path} {
1634 regsub -all {\\} $path "\\\\" path
1635 regsub -all "\n" $path "\\n" path
1636 return $path
cb07fc2a
SP
1637}
1638
f522c9b5
SP
1639proc short_path {path} {
1640 return [escape_path [lindex [file split $path] end]]
7f1df79b
SP
1641}
1642
f522c9b5
SP
1643set next_icon_id 0
1644set null_sha1 [string repeat 0 40]
16403d0b 1645
f522c9b5
SP
1646proc merge_state {path new_state {head_info {}} {index_info {}}} {
1647 global file_states next_icon_id null_sha1
16403d0b 1648
f522c9b5
SP
1649 set s0 [string index $new_state 0]
1650 set s1 [string index $new_state 1]
16403d0b 1651
f522c9b5
SP
1652 if {[catch {set info $file_states($path)}]} {
1653 set state __
1654 set icon n[incr next_icon_id]
1655 } else {
1656 set state [lindex $info 0]
1657 set icon [lindex $info 1]
1658 if {$head_info eq {}} {set head_info [lindex $info 2]}
1659 if {$index_info eq {}} {set index_info [lindex $info 3]}
1660 }
16403d0b 1661
f522c9b5
SP
1662 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1663 elseif {$s0 eq {_}} {set s0 _}
124355d3 1664
f522c9b5
SP
1665 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1666 elseif {$s1 eq {_}} {set s1 _}
16403d0b 1667
f522c9b5
SP
1668 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1669 set head_info [list 0 $null_sha1]
1670 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1671 && $head_info eq {}} {
1672 set head_info $index_info
7ec2b69f
JL
1673 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1674 set index_info $head_info
1675 set head_info {}
f522c9b5 1676 }
16403d0b 1677
f522c9b5
SP
1678 set file_states($path) [list $s0$s1 $icon \
1679 $head_info $index_info \
1680 ]
1681 return $state
1682}
cb07fc2a 1683
f522c9b5
SP
1684proc display_file_helper {w path icon_name old_m new_m} {
1685 global file_lists
cb07fc2a 1686
f522c9b5 1687 if {$new_m eq {_}} {
156b2921 1688 set lno [lsearch -sorted -exact $file_lists($w) $path]
5f8b70b1 1689 if {$lno >= 0} {
f522c9b5 1690 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
5f8b70b1 1691 incr lno
f522c9b5
SP
1692 $w conf -state normal
1693 $w delete $lno.0 [expr {$lno + 1}].0
1694 $w conf -state disabled
03e4ec53 1695 }
f522c9b5
SP
1696 } elseif {$old_m eq {_} && $new_m ne {_}} {
1697 lappend file_lists($w) $path
1698 set file_lists($w) [lsort -unique $file_lists($w)]
1699 set lno [lsearch -sorted -exact $file_lists($w) $path]
1700 incr lno
1701 $w conf -state normal
1702 $w image create $lno.0 \
1703 -align center -padx 5 -pady 1 \
1704 -name $icon_name \
1705 -image [mapicon $w $new_m $path]
1706 $w insert $lno.1 "[escape_path $path]\n"
1707 $w conf -state disabled
1708 } elseif {$old_m ne $new_m} {
1709 $w conf -state normal
1710 $w image conf $icon_name -image [mapicon $w $new_m $path]
1711 $w conf -state disabled
03e4ec53 1712 }
f522c9b5
SP
1713}
1714
1715proc display_file {path state} {
1716 global file_states selected_paths
1717 global ui_index ui_workdir
03e4ec53 1718
f522c9b5 1719 set old_m [merge_state $path $state]
cb07fc2a 1720 set s $file_states($path)
f522c9b5
SP
1721 set new_m [lindex $s 0]
1722 set icon_name [lindex $s 1]
82cb8706 1723
f522c9b5
SP
1724 set o [string index $old_m 0]
1725 set n [string index $new_m 0]
1726 if {$o eq {U}} {
1727 set o _
1728 }
1729 if {$n eq {U}} {
1730 set n _
cb07fc2a 1731 }
f522c9b5 1732 display_file_helper $ui_index $path $icon_name $o $n
cb07fc2a 1733
f522c9b5
SP
1734 if {[string index $old_m 0] eq {U}} {
1735 set o U
1736 } else {
1737 set o [string index $old_m 1]
82cb8706 1738 }
f522c9b5
SP
1739 if {[string index $new_m 0] eq {U}} {
1740 set n U
1741 } else {
1742 set n [string index $new_m 1]
82cb8706 1743 }
f522c9b5
SP
1744 display_file_helper $ui_workdir $path $icon_name $o $n
1745
1746 if {$new_m eq {__}} {
1747 unset file_states($path)
1748 catch {unset selected_paths($path)}
cb07fc2a 1749 }
f522c9b5 1750}
cb07fc2a 1751
f522c9b5
SP
1752proc display_all_files_helper {w path icon_name m} {
1753 global file_lists
1754
1755 lappend file_lists($w) $path
1756 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1757 $w image create end \
1758 -align center -padx 5 -pady 1 \
1759 -name $icon_name \
1760 -image [mapicon $w $m $path]
1761 $w insert end "[escape_path $path]\n"
cb07fc2a
SP
1762}
1763
dd6451f9 1764set files_warning 0
f522c9b5
SP
1765proc display_all_files {} {
1766 global ui_index ui_workdir
1767 global file_states file_lists
1768 global last_clicked
dd6451f9 1769 global files_warning
cb07fc2a 1770
f522c9b5
SP
1771 $ui_index conf -state normal
1772 $ui_workdir conf -state normal
cb07fc2a 1773
f522c9b5
SP
1774 $ui_index delete 0.0 end
1775 $ui_workdir delete 0.0 end
1776 set last_clicked {}
cb07fc2a 1777
f522c9b5
SP
1778 set file_lists($ui_index) [list]
1779 set file_lists($ui_workdir) [list]
16403d0b 1780
dd6451f9
DZ
1781 set to_display [lsort [array names file_states]]
1782 set display_limit [get_config gui.maxfilesdisplayed]
1783 if {[llength $to_display] > $display_limit} {
1784 if {!$files_warning} {
1785 # do not repeatedly warn:
1786 set files_warning 1
1787 info_popup [mc "Displaying only %s of %s files." \
1788 $display_limit [llength $to_display]]
1789 }
1790 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1791 }
1792 foreach path $to_display {
f522c9b5
SP
1793 set s $file_states($path)
1794 set m [lindex $s 0]
1795 set icon_name [lindex $s 1]
1796
1797 set s [string index $m 0]
1798 if {$s ne {U} && $s ne {_}} {
1799 display_all_files_helper $ui_index $path \
1800 $icon_name $s
16403d0b 1801 }
cb07fc2a 1802
f522c9b5
SP
1803 if {[string index $m 0] eq {U}} {
1804 set s U
1805 } else {
1806 set s [string index $m 1]
a25c5189 1807 }
f522c9b5
SP
1808 if {$s ne {_}} {
1809 display_all_files_helper $ui_workdir $path \
1810 $icon_name $s
a25c5189
SP
1811 }
1812 }
1813
f522c9b5
SP
1814 $ui_index conf -state disabled
1815 $ui_workdir conf -state disabled
a25c5189
SP
1816}
1817
ec6b424a
SP
1818######################################################################
1819##
f522c9b5 1820## icons
ec6b424a 1821
f522c9b5
SP
1822set filemask {
1823#define mask_width 14
1824#define mask_height 15
1825static unsigned char mask_bits[] = {
1826 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1827 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1828 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1829}
cb07fc2a
SP
1830
1831image create bitmap file_plain -background white -foreground black -data {
1832#define plain_width 14
1833#define plain_height 15
1834static unsigned char plain_bits[] = {
1835 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1836 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1837 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1838} -maskdata $filemask
1839
1840image create bitmap file_mod -background white -foreground blue -data {
1841#define mod_width 14
1842#define mod_height 15
1843static unsigned char mod_bits[] = {
1844 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1845 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1846 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1847} -maskdata $filemask
1848
131f503b
SP
1849image create bitmap file_fulltick -background white -foreground "#007000" -data {
1850#define file_fulltick_width 14
1851#define file_fulltick_height 15
1852static unsigned char file_fulltick_bits[] = {
cb07fc2a
SP
1853 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1854 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1855 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1856} -maskdata $filemask
1857
cb07fc2a
SP
1858image create bitmap file_question -background white -foreground black -data {
1859#define file_question_width 14
1860#define file_question_height 15
1861static unsigned char file_question_bits[] = {
1862 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1863 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1864 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1865} -maskdata $filemask
1866
1867image create bitmap file_removed -background white -foreground red -data {
1868#define file_removed_width 14
1869#define file_removed_height 15
1870static unsigned char file_removed_bits[] = {
1871 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1872 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1873 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1874} -maskdata $filemask
1875
1876image create bitmap file_merge -background white -foreground blue -data {
1877#define file_merge_width 14
1878#define file_merge_height 15
1879static unsigned char file_merge_bits[] = {
1880 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1881 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1882 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1883} -maskdata $filemask
1884
e681cb7d
GH
1885image create bitmap file_statechange -background white -foreground green -data {
1886#define file_merge_width 14
1887#define file_merge_height 15
1888static unsigned char file_statechange_bits[] = {
1889 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1890 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1891 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1892} -maskdata $filemask
1893
6b292675 1894set ui_index .vpane.files.index.list
0812665e 1895set ui_workdir .vpane.files.workdir.list
21e409ad
SP
1896
1897set all_icons(_$ui_index) file_plain
0602de48 1898set all_icons(A$ui_index) file_plain
21e409ad
SP
1899set all_icons(M$ui_index) file_fulltick
1900set all_icons(D$ui_index) file_removed
1901set all_icons(U$ui_index) file_merge
e681cb7d 1902set all_icons(T$ui_index) file_statechange
21e409ad
SP
1903
1904set all_icons(_$ui_workdir) file_plain
1905set all_icons(M$ui_workdir) file_mod
1906set all_icons(D$ui_workdir) file_question
3b4db3c1 1907set all_icons(U$ui_workdir) file_merge
21e409ad 1908set all_icons(O$ui_workdir) file_plain
e681cb7d 1909set all_icons(T$ui_workdir) file_statechange
21e409ad 1910
131f503b 1911set max_status_desc 0
cb07fc2a 1912foreach i {
1ac17950
CS
1913 {__ {mc "Unmodified"}}
1914
1915 {_M {mc "Modified, not staged"}}
1916 {M_ {mc "Staged for commit"}}
1917 {MM {mc "Portions staged for commit"}}
1918 {MD {mc "Staged for commit, missing"}}
1919
e681cb7d
GH
1920 {_T {mc "File type changed, not staged"}}
1921 {T_ {mc "File type changed, staged"}}
1922
1ac17950
CS
1923 {_O {mc "Untracked, not staged"}}
1924 {A_ {mc "Staged for commit"}}
1925 {AM {mc "Portions staged for commit"}}
1926 {AD {mc "Staged for commit, missing"}}
1927
1928 {_D {mc "Missing"}}
1929 {D_ {mc "Staged for removal"}}
1930 {DO {mc "Staged for removal, still present"}}
1931
ff515d81 1932 {_U {mc "Requires merge resolution"}}
1ac17950
CS
1933 {U_ {mc "Requires merge resolution"}}
1934 {UU {mc "Requires merge resolution"}}
1935 {UM {mc "Requires merge resolution"}}
1936 {UD {mc "Requires merge resolution"}}
ff515d81 1937 {UT {mc "Requires merge resolution"}}
cb07fc2a 1938 } {
1ac17950
CS
1939 set text [eval [lindex $i 1]]
1940 if {$max_status_desc < [string length $text]} {
1941 set max_status_desc [string length $text]
131f503b 1942 }
1ac17950 1943 set all_descs([lindex $i 0]) $text
cb07fc2a 1944}
21e409ad 1945unset i
cb07fc2a
SP
1946
1947######################################################################
1948##
1949## util
1950
35874c16
SP
1951proc scrollbar2many {list mode args} {
1952 foreach w $list {eval $w $mode $args}
1953}
1954
1955proc many2scrollbar {list mode sb top bottom} {
1956 $sb set $top $bottom
1957 foreach w $list {$w $mode moveto $top}
1958}
1959
b4946930
SP
1960proc incr_font_size {font {amt 1}} {
1961 set sz [font configure $font -size]
1962 incr sz $amt
1963 font configure $font -size $sz
1964 font configure ${font}bold -size $sz
debcd0fd 1965 font configure ${font}italic -size $sz
b4946930
SP
1966}
1967
cb07fc2a
SP
1968######################################################################
1969##
1970## ui commands
1971
1ac17950 1972set starting_gitk_msg [mc "Starting gitk... please wait..."]
cc4b1c02 1973
25476c63
JL
1974proc do_gitk {revs {is_submodule false}} {
1975 global current_diff_path file_states current_diff_side ui_index
a9fa11fe 1976 global _gitdir _gitworktree
25476c63 1977
20ddfcaa
SP
1978 # -- Always start gitk through whatever we were loaded with. This
1979 # lets us bypass using shell process on Windows systems.
1980 #
79317e5d 1981 set exe [_which gitk -script]
02efd48f 1982 set cmd [list [info nameofexecutable] $exe]
15430be5
AMS
1983 if {$exe eq {}} {
1984 error_popup [mc "Couldn't find gitk in PATH"]
cb07fc2a 1985 } else {
501e4c6f
SP
1986 global env
1987
501e4c6f 1988 set pwd [pwd]
501e4c6f 1989
25476c63 1990 if {!$is_submodule} {
29e5573d 1991 if {![is_bare]} {
21985a11
GB
1992 cd $_gitworktree
1993 }
25476c63
JL
1994 } else {
1995 cd $current_diff_path
1996 if {$revs eq {--}} {
1997 set s $file_states($current_diff_path)
1998 set old_sha1 {}
1999 set new_sha1 {}
2000 switch -glob -- [lindex $s 0] {
2001 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2002 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2003 MM {
2004 if {$current_diff_side eq $ui_index} {
2005 set old_sha1 [lindex [lindex $s 2] 1]
2006 set new_sha1 [lindex [lindex $s 3] 1]
2007 } else {
2008 set old_sha1 [lindex [lindex $s 3] 1]
2009 }
2010 }
2011 }
2012 set revs $old_sha1...$new_sha1
2013 }
a9fa11fe
GB
2014 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2015 # we've been using for the main repository, so unset them.
2016 # TODO we could make life easier (start up faster?) for gitk
2017 # by setting these to the appropriate values to allow gitk
2018 # to skip the heuristics to find their proper value
2019 unset env(GIT_DIR)
2020 unset env(GIT_WORK_TREE)
25476c63 2021 }
e27d106e 2022 eval exec $cmd $revs "--" "--" &
501e4c6f 2023
a9fa11fe
GB
2024 set env(GIT_DIR) $_gitdir
2025 set env(GIT_WORK_TREE) $_gitworktree
25476c63
JL
2026 cd $pwd
2027
2028 ui_status $::starting_gitk_msg
2029 after 10000 {
2030 ui_ready $starting_gitk_msg
2031 }
2032 }
2033}
2034
2035proc do_git_gui {} {
2036 global current_diff_path
2037
2038 # -- Always start git gui through whatever we were loaded with. This
2039 # lets us bypass using shell process on Windows systems.
2040 #
2041 set exe [_which git]
2042 if {$exe eq {}} {
2043 error_popup [mc "Couldn't find git gui in PATH"]
2044 } else {
2045 global env
a9fa11fe 2046 global _gitdir _gitworktree
25476c63 2047
a9fa11fe
GB
2048 # see note in do_gitk about unsetting these vars when
2049 # running tools in a submodule
2050 unset env(GIT_DIR)
2051 unset env(GIT_WORK_TREE)
25476c63
JL
2052
2053 set pwd [pwd]
2054 cd $current_diff_path
2055
2056 eval exec $exe gui &
2057
a9fa11fe
GB
2058 set env(GIT_DIR) $_gitdir
2059 set env(GIT_WORK_TREE) $_gitworktree
501e4c6f
SP
2060 cd $pwd
2061
02efd48f 2062 ui_status $::starting_gitk_msg
d0752429 2063 after 10000 {
699d5601 2064 ui_ready $starting_gitk_msg
d0752429 2065 }
cb07fc2a
SP
2066 }
2067}
2068
afd54240 2069proc do_explore {} {
21985a11 2070 global _gitworktree
afd54240
PB
2071 set explorer {}
2072 if {[is_Cygwin] || [is_Windows]} {
2073 set explorer "explorer.exe"
2074 } elseif {[is_MacOSX]} {
2075 set explorer "open"
2076 } else {
2077 # freedesktop.org-conforming system is our best shot
2078 set explorer "xdg-open"
2079 }
21985a11 2080 eval exec $explorer $_gitworktree &
afd54240
PB
2081}
2082
b5834d70 2083set is_quitting 0
1e65c622 2084set ret_code 1
c4fe7728 2085
1e65c622
AG
2086proc terminate_me {win} {
2087 global ret_code
2088 if {$win ne {.}} return
2089 exit $ret_code
2090}
2091
2092proc do_quit {{rc {1}}} {
c950c66e 2093 global ui_comm is_quitting repo_config commit_type
4578c5cb 2094 global GITGUI_BCK_exists GITGUI_BCK_i
95b002ee 2095 global ui_comm_spell
1e65c622 2096 global ret_code
c4fe7728 2097
b5834d70
SP
2098 if {$is_quitting} return
2099 set is_quitting 1
131f503b 2100
db7f34d4
SP
2101 if {[winfo exists $ui_comm]} {
2102 # -- Stash our current commit buffer.
2103 #
2104 set save [gitdir GITGUI_MSG]
4578c5cb
SP
2105 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2106 file rename -force [gitdir GITGUI_BCK] $save
2107 set GITGUI_BCK_exists 0
db7f34d4 2108 } else {
4578c5cb
SP
2109 set msg [string trim [$ui_comm get 0.0 end]]
2110 regsub -all -line {[ \r\t]+$} $msg {} msg
2111 if {(![string match amend* $commit_type]
2112 || [$ui_comm edit modified])
2113 && $msg ne {}} {
2114 catch {
2115 set fd [open $save w]
2116 puts -nonewline $fd $msg
2117 close $fd
2118 }
2119 } else {
2120 catch {file delete $save}
2121 }
2122 }
2123
95b002ee
SP
2124 # -- Cancel our spellchecker if its running.
2125 #
2126 if {[info exists ui_comm_spell]} {
2127 $ui_comm_spell stop
2128 }
2129
4578c5cb
SP
2130 # -- Remove our editor backup, its not needed.
2131 #
2132 after cancel $GITGUI_BCK_i
2133 if {$GITGUI_BCK_exists} {
2134 catch {file delete [gitdir GITGUI_BCK]}
131f503b 2135 }
131f503b 2136
db7f34d4
SP
2137 # -- Stash our current window geometry into this repository.
2138 #
ed7b6033
AB
2139 set cfg_wmstate [wm state .]
2140 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2141 set rc_wmstate {}
2142 }
2143 if {$cfg_wmstate ne $rc_wmstate} {
2144 catch {git config gui.wmstate $cfg_wmstate}
2145 }
2146 if {$cfg_wmstate eq {zoomed}} {
2147 # on Windows wm geometry will lie about window
2148 # position (but not size) when window is zoomed
2149 # restore the window before querying wm geometry
2150 wm state . normal
2151 }
db7f34d4
SP
2152 set cfg_geometry [list]
2153 lappend cfg_geometry [wm geometry .]
a0592d3f
JS
2154 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2155 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
db7f34d4
SP
2156 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2157 set rc_geometry {}
2158 }
2159 if {$cfg_geometry ne $rc_geometry} {
81347223 2160 catch {git config gui.geometry $cfg_geometry}
db7f34d4 2161 }
51f4d16b
SP
2162 }
2163
1e65c622 2164 set ret_code $rc
60204ddb
JM
2165
2166 # Briefly enable send again, working around Tk bug
2167 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2168 tk appname [appname]
2169
cb07fc2a
SP
2170 destroy .
2171}
2172
2173proc do_rescan {} {
699d5601 2174 rescan ui_ready
cb07fc2a
SP
2175}
2176
8056cc4f 2177proc ui_do_rescan {} {
7cf4566f 2178 rescan {force_first_diff ui_ready}
8056cc4f
AG
2179}
2180
6e27d826 2181proc do_commit {} {
ec6b424a 2182 commit_tree
6e27d826
SP
2183}
2184
7cf4566f 2185proc next_diff {{after {}}} {
8a965b8e 2186 global next_diff_p next_diff_w next_diff_i
7cf4566f 2187 show_diff $next_diff_p $next_diff_w {} {} $after
29853b90
AG
2188}
2189
2190proc find_anchor_pos {lst name} {
2191 set lid [lsearch -sorted -exact $lst $name]
2192
2193 if {$lid == -1} {
2194 set lid 0
2195 foreach lname $lst {
2196 if {$lname >= $name} break
2197 incr lid
2198 }
2199 }
2200
2201 return $lid
2202}
2203
2204proc find_file_from {flist idx delta path mmask} {
2205 global file_states
2206
2207 set len [llength $flist]
2208 while {$idx >= 0 && $idx < $len} {
2209 set name [lindex $flist $idx]
2210
2211 if {$name ne $path && [info exists file_states($name)]} {
2212 set state [lindex $file_states($name) 0]
2213
2214 if {$mmask eq {} || [regexp $mmask $state]} {
2215 return $idx
2216 }
2217 }
2218
2219 incr idx $delta
2220 }
2221
2222 return {}
2223}
2224
2225proc find_next_diff {w path {lno {}} {mmask {}}} {
2226 global next_diff_p next_diff_w next_diff_i
2227 global file_lists ui_index ui_workdir
2228
2229 set flist $file_lists($w)
2230 if {$lno eq {}} {
2231 set lno [find_anchor_pos $flist $path]
2232 } else {
2233 incr lno -1
2234 }
2235
2236 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2237 if {$w eq $ui_index} {
2238 set mmask "^$mmask"
2239 } else {
2240 set mmask "$mmask\$"
2241 }
2242 }
2243
2244 set idx [find_file_from $flist $lno 1 $path $mmask]
2245 if {$idx eq {}} {
2246 incr lno -1
2247 set idx [find_file_from $flist $lno -1 $path $mmask]
2248 }
2249
2250 if {$idx ne {}} {
2251 set next_diff_w $w
2252 set next_diff_p [lindex $flist $idx]
2253 set next_diff_i [expr {$idx+1}]
2254 return 1
2255 } else {
2256 return 0
2257 }
2258}
2259
2260proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2261 global current_diff_path
2262
2263 if {$path ne $current_diff_path} {
2264 return {}
2265 } elseif {[find_next_diff $w $path $lno $mmask]} {
2266 return {next_diff;}
2267 } else {
2268 return {reshow_diff;}
2269 }
2270}
2271
7cf4566f 2272proc select_first_diff {after} {
29853b90
AG
2273 global ui_workdir
2274
2275 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2276 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
7cf4566f
AG
2277 next_diff $after
2278 } else {
2279 uplevel #0 $after
29853b90 2280 }
8a965b8e
AMS
2281}
2282
7cf4566f
AG
2283proc force_first_diff {after} {
2284 global ui_workdir current_diff_path file_states
8056cc4f
AG
2285
2286 if {[info exists file_states($current_diff_path)]} {
2287 set state [lindex $file_states($current_diff_path) 0]
7cf4566f
AG
2288 } else {
2289 set state {OO}
2290 }
8056cc4f 2291
7cf4566f
AG
2292 set reselect 0
2293 if {[string first {U} $state] >= 0} {
2294 # Already a conflict, do nothing
2295 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2296 set reselect 1
2297 } elseif {[string index $state 1] ne {O}} {
2298 # Already a diff & no conflicts, do nothing
2299 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2300 set reselect 1
8056cc4f
AG
2301 }
2302
7cf4566f
AG
2303 if {$reselect} {
2304 next_diff $after
2305 } else {
2306 uplevel #0 $after
2307 }
8056cc4f
AG
2308}
2309
24263b77 2310proc toggle_or_diff {w x y} {
20a53c02 2311 global file_states file_lists current_diff_path ui_index ui_workdir
24263b77 2312 global last_clicked selected_paths
131f503b 2313
cb07fc2a
SP
2314 set pos [split [$w index @$x,$y] .]
2315 set lno [lindex $pos 0]
2316 set col [lindex $pos 1]
24263b77
SP
2317 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2318 if {$path eq {}} {
2319 set last_clicked {}
2320 return
2321 }
2322
2323 set last_clicked [list $w $lno]
2324 array unset selected_paths
2325 $ui_index tag remove in_sel 0.0 end
0812665e 2326 $ui_workdir tag remove in_sel 0.0 end
cb07fc2a 2327
3e34838c 2328 # Determine the state of the file
617ceee6
AG
2329 if {[info exists file_states($path)]} {
2330 set state [lindex $file_states($path) 0]
8056cc4f
AG
2331 } else {
2332 set state {__}
2333 }
2334
8056cc4f 2335 # Restage the file, or simply show the diff
cead78ed 2336 if {$col == 0 && $y > 1} {
3e34838c
AG
2337 # Conflicts need special handling
2338 if {[string first {U} $state] >= 0} {
0aea2842
AG
2339 # $w must always be $ui_workdir, but...
2340 if {$w ne $ui_workdir} { set lno {} }
2341 merge_stage_workdir $path $lno
3e34838c
AG
2342 return
2343 }
2344
8056cc4f
AG
2345 if {[string index $state 1] eq {O}} {
2346 set mmask {}
2347 } else {
2348 set mmask {[^O]}
2349 }
2350
2351 set after [next_diff_after_action $w $path $lno $mmask]
8a965b8e 2352
de5f6d5d 2353 if {$w eq $ui_index} {
74d18d2e 2354 update_indexinfo \
93e912c5 2355 "Unstaging [short_path $path] from commit" \
74d18d2e 2356 [list $path] \
699d5601 2357 [concat $after [list ui_ready]]
de5f6d5d 2358 } elseif {$w eq $ui_workdir} {
74d18d2e 2359 update_index \
4d583c86 2360 "Adding [short_path $path]" \
74d18d2e 2361 [list $path] \
699d5601 2362 [concat $after [list ui_ready]]
74d18d2e 2363 }
24263b77 2364 } else {
03e4ec53 2365 show_diff $path $w $lno
cb07fc2a
SP
2366 }
2367}
2368
24263b77 2369proc add_one_to_selection {w x y} {
833eda73 2370 global file_lists last_clicked selected_paths
7f1df79b 2371
833eda73 2372 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
2373 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2374 if {$path eq {}} {
2375 set last_clicked {}
2376 return
2377 }
cb07fc2a 2378
833eda73
SP
2379 if {$last_clicked ne {}
2380 && [lindex $last_clicked 0] ne $w} {
2381 array unset selected_paths
2382 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2383 }
2384
24263b77
SP
2385 set last_clicked [list $w $lno]
2386 if {[catch {set in_sel $selected_paths($path)}]} {
2387 set in_sel 0
2388 }
2389 if {$in_sel} {
2390 unset selected_paths($path)
2391 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2392 } else {
2393 set selected_paths($path) 1
2394 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2395 }
2396}
2397
2398proc add_range_to_selection {w x y} {
833eda73 2399 global file_lists last_clicked selected_paths
24263b77
SP
2400
2401 if {[lindex $last_clicked 0] ne $w} {
2402 toggle_or_diff $w $x $y
2403 return
cb07fc2a 2404 }
24263b77 2405
833eda73 2406 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
2407 set lc [lindex $last_clicked 1]
2408 if {$lc < $lno} {
2409 set begin $lc
2410 set end $lno
2411 } else {
2412 set begin $lno
2413 set end $lc
2414 }
2415
2416 foreach path [lrange $file_lists($w) \
2417 [expr {$begin - 1}] \
2418 [expr {$end - 1}]] {
2419 set selected_paths($path) 1
2420 }
2421 $w tag add in_sel $begin.0 [expr {$end + 1}].0
cb07fc2a
SP
2422}
2423
c91ee2bd
JS
2424proc show_more_context {} {
2425 global repo_config
2426 if {$repo_config(gui.diffcontext) < 99} {
2427 incr repo_config(gui.diffcontext)
2428 reshow_diff
2429 }
2430}
2431
2432proc show_less_context {} {
2433 global repo_config
55ba8a34 2434 if {$repo_config(gui.diffcontext) > 1} {
c91ee2bd
JS
2435 incr repo_config(gui.diffcontext) -1
2436 reshow_diff
2437 }
2438}
2439
cb07fc2a
SP
2440######################################################################
2441##
a4bee597 2442## ui construction
db453781 2443
2ebba528
SP
2444set ui_comm {}
2445
cb07fc2a 2446# -- Menu Bar
a49c67d1 2447#
b4946930 2448menu .mbar -tearoff 0
a91be3fc
DS
2449if {[is_MacOSX]} {
2450 # -- Apple Menu (Mac OS X only)
2451 #
2452 .mbar add cascade -label Apple -menu .mbar.apple
2453 menu .mbar.apple
2454}
1ac17950
CS
2455.mbar add cascade -label [mc Repository] -menu .mbar.repository
2456.mbar add cascade -label [mc Edit] -menu .mbar.edit
64a906f8 2457if {[is_enabled branch]} {
1ac17950 2458 .mbar add cascade -label [mc Branch] -menu .mbar.branch
700a65ce 2459}
2ebba528 2460if {[is_enabled multicommit] || [is_enabled singlecommit]} {
a9813cb5 2461 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2ebba528 2462}
64a906f8 2463if {[is_enabled transport]} {
1ac17950 2464 .mbar add cascade -label [mc Merge] -menu .mbar.merge
6bdf5e5f 2465 .mbar add cascade -label [mc Remote] -menu .mbar.remote
4ccdab02 2466}
0ce76ded
AG
2467if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2468 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2469}
cb07fc2a 2470
a4abfa62 2471# -- Repository Menu
a49c67d1 2472#
a4abfa62 2473menu .mbar.repository
35874c16 2474
29e5573d
GB
2475if {![is_bare]} {
2476 .mbar.repository add command \
2477 -label [mc "Explore Working Copy"] \
2478 -command {do_explore}
2479 .mbar.repository add separator
2480}
afd54240 2481
35874c16 2482.mbar.repository add command \
1ac17950 2483 -label [mc "Browse Current Branch's Files"] \
c74b6c66 2484 -command {browser::new $current_branch}
a8139888 2485set ui_browse_current [.mbar.repository index last]
8e891fac 2486.mbar.repository add command \
1ac17950 2487 -label [mc "Browse Branch Files..."] \
8e891fac 2488 -command browser_open::dialog
35874c16
SP
2489.mbar.repository add separator
2490
d0752429 2491.mbar.repository add command \
1ac17950 2492 -label [mc "Visualize Current Branch's History"] \
7416bbc6 2493 -command {do_gitk $current_branch}
a8139888 2494set ui_visualize_current [.mbar.repository index last]
5753ef1a 2495.mbar.repository add command \
1ac17950 2496 -label [mc "Visualize All Branch History"] \
7416bbc6 2497 -command {do_gitk --all}
d0752429 2498.mbar.repository add separator
75e355d6 2499
a8139888
SP
2500proc current_branch_write {args} {
2501 global current_branch
2502 .mbar.repository entryconf $::ui_browse_current \
1ac17950 2503 -label [mc "Browse %s's Files" $current_branch]
a8139888 2504 .mbar.repository entryconf $::ui_visualize_current \
1ac17950 2505 -label [mc "Visualize %s's History" $current_branch]
a8139888
SP
2506}
2507trace add variable current_branch write current_branch_write
2508
cf25ddc8 2509if {[is_enabled multicommit]} {
1ac17950 2510 .mbar.repository add command -label [mc "Database Statistics"] \
7416bbc6 2511 -command do_stats
0fd49d0a 2512
1ac17950 2513 .mbar.repository add command -label [mc "Compress Database"] \
7416bbc6 2514 -command do_gc
4aca740b 2515
1ac17950 2516 .mbar.repository add command -label [mc "Verify Database"] \
7416bbc6 2517 -command do_fsck_objects
444f92d0 2518
a4abfa62 2519 .mbar.repository add separator
75e355d6 2520
20ddfcaa
SP
2521 if {[is_Cygwin]} {
2522 .mbar.repository add command \
1ac17950 2523 -label [mc "Create Desktop Icon"] \
7416bbc6 2524 -command do_cygwin_shortcut
20ddfcaa 2525 } elseif {[is_Windows]} {
a4abfa62 2526 .mbar.repository add command \
1ac17950 2527 -label [mc "Create Desktop Icon"] \
7416bbc6 2528 -command do_windows_shortcut
06c31115 2529 } elseif {[is_MacOSX]} {
a4abfa62 2530 .mbar.repository add command \
1ac17950 2531 -label [mc "Create Desktop Icon"] \
7416bbc6 2532 -command do_macosx_app
4aca740b 2533 }
4ccdab02 2534}
85ab313e 2535
af894943
SF
2536if {[is_MacOSX]} {
2537 proc ::tk::mac::Quit {args} { do_quit }
2538} else {
2539 .mbar.repository add command -label [mc Quit] \
2540 -command do_quit \
2541 -accelerator $M1T-Q
2542}
cb07fc2a 2543
9861671d
SP
2544# -- Edit Menu
2545#
2546menu .mbar.edit
1ac17950 2547.mbar.edit add command -label [mc Undo] \
9861671d 2548 -command {catch {[focus] edit undo}} \
7416bbc6 2549 -accelerator $M1T-Z
1ac17950 2550.mbar.edit add command -label [mc Redo] \
9861671d 2551 -command {catch {[focus] edit redo}} \
7416bbc6 2552 -accelerator $M1T-Y
9861671d 2553.mbar.edit add separator
1ac17950 2554.mbar.edit add command -label [mc Cut] \
9861671d 2555 -command {catch {tk_textCut [focus]}} \
7416bbc6 2556 -accelerator $M1T-X
1ac17950 2557.mbar.edit add command -label [mc Copy] \
9861671d 2558 -command {catch {tk_textCopy [focus]}} \
7416bbc6 2559 -accelerator $M1T-C
1ac17950 2560.mbar.edit add command -label [mc Paste] \
9861671d 2561 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
7416bbc6 2562 -accelerator $M1T-V
1ac17950 2563.mbar.edit add command -label [mc Delete] \
9861671d 2564 -command {catch {[focus] delete sel.first sel.last}} \
7416bbc6 2565 -accelerator Del
9861671d 2566.mbar.edit add separator
1ac17950 2567.mbar.edit add command -label [mc "Select All"] \
9861671d 2568 -command {catch {[focus] tag add sel 0.0 end}} \
7416bbc6 2569 -accelerator $M1T-A
9861671d 2570
85ab313e
SP
2571# -- Branch Menu
2572#
64a906f8 2573if {[is_enabled branch]} {
700a65ce
SP
2574 menu .mbar.branch
2575
1ac17950 2576 .mbar.branch add command -label [mc "Create..."] \
b1fa2bff 2577 -command branch_create::dialog \
7416bbc6 2578 -accelerator $M1T-N
700a65ce
SP
2579 lappend disable_on_lock [list .mbar.branch entryconf \
2580 [.mbar.branch index last] -state]
2581
1ac17950 2582 .mbar.branch add command -label [mc "Checkout..."] \
d41b43eb
SP
2583 -command branch_checkout::dialog \
2584 -accelerator $M1T-O
2585 lappend disable_on_lock [list .mbar.branch entryconf \
2586 [.mbar.branch index last] -state]
2587
1ac17950 2588 .mbar.branch add command -label [mc "Rename..."] \
61f82ce7
SP
2589 -command branch_rename::dialog
2590 lappend disable_on_lock [list .mbar.branch entryconf \
2591 [.mbar.branch index last] -state]
2592
1ac17950 2593 .mbar.branch add command -label [mc "Delete..."] \
3206c63d 2594 -command branch_delete::dialog
700a65ce
SP
2595 lappend disable_on_lock [list .mbar.branch entryconf \
2596 [.mbar.branch index last] -state]
fd234dfd 2597
1ac17950 2598 .mbar.branch add command -label [mc "Reset..."] \
a6c9b081 2599 -command merge::reset_hard
fd234dfd
SP
2600 lappend disable_on_lock [list .mbar.branch entryconf \
2601 [.mbar.branch index last] -state]
700a65ce
SP
2602}
2603
cb07fc2a 2604# -- Commit Menu
a49c67d1 2605#
1e65c622
AG
2606proc commit_btn_caption {} {
2607 if {[is_enabled nocommit]} {
2608 return [mc "Done"]
2609 } else {
2610 return [mc Commit@@verb]
2611 }
2612}
2613
2ebba528
SP
2614if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2615 menu .mbar.commit
2616
1e02b32e
SP
2617 if {![is_enabled nocommit]} {
2618 .mbar.commit add radiobutton \
2619 -label [mc "New Commit"] \
2620 -command do_select_commit_type \
2621 -variable selected_commit_type \
2622 -value new
2623 lappend disable_on_lock \
2624 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2625
2626 .mbar.commit add radiobutton \
2627 -label [mc "Amend Last Commit"] \
2628 -command do_select_commit_type \
2629 -variable selected_commit_type \
2630 -value amend
2631 lappend disable_on_lock \
2632 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2633
2634 .mbar.commit add separator
2635 }
24ac9b75 2636
1ac17950 2637 .mbar.commit add command -label [mc Rescan] \
8056cc4f 2638 -command ui_do_rescan \
7416bbc6 2639 -accelerator F5
2ebba528
SP
2640 lappend disable_on_lock \
2641 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2642
1ac17950 2643 .mbar.commit add command -label [mc "Stage To Commit"] \
cd16a6c9
SP
2644 -command do_add_selection \
2645 -accelerator $M1T-T
2ebba528
SP
2646 lappend disable_on_lock \
2647 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2648
1ac17950 2649 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2ebba528 2650 -command do_add_all \
7416bbc6 2651 -accelerator $M1T-I
2ebba528
SP
2652 lappend disable_on_lock \
2653 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2654
1ac17950 2655 .mbar.commit add command -label [mc "Unstage From Commit"] \
b677c66e
VS
2656 -command do_unstage_selection \
2657 -accelerator $M1T-U
2ebba528
SP
2658 lappend disable_on_lock \
2659 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2660
1ac17950 2661 .mbar.commit add command -label [mc "Revert Changes"] \
b677c66e
VS
2662 -command do_revert_selection \
2663 -accelerator $M1T-J
2ebba528
SP
2664 lappend disable_on_lock \
2665 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2666
2ebba528 2667 .mbar.commit add separator
1461c5f3 2668
c91ee2bd
JS
2669 .mbar.commit add command -label [mc "Show Less Context"] \
2670 -command show_less_context \
729ffa50 2671 -accelerator $M1T-\-
c91ee2bd
JS
2672
2673 .mbar.commit add command -label [mc "Show More Context"] \
2674 -command show_more_context \
729ffa50 2675 -accelerator $M1T-=
c91ee2bd
JS
2676
2677 .mbar.commit add separator
2678
ed70e4d7 2679 if {![is_enabled nocommitmsg]} {
1e02b32e
SP
2680 .mbar.commit add command -label [mc "Sign Off"] \
2681 -command do_signoff \
2682 -accelerator $M1T-S
2683 }
24ac9b75 2684
1e65c622 2685 .mbar.commit add command -label [commit_btn_caption] \
2ebba528 2686 -command do_commit \
7416bbc6 2687 -accelerator $M1T-Return
2ebba528
SP
2688 lappend disable_on_lock \
2689 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2690}
cb07fc2a 2691
9b28a8b9
SP
2692# -- Merge Menu
2693#
2694if {[is_enabled branch]} {
2695 menu .mbar.merge
1ac17950 2696 .mbar.merge add command -label [mc "Local Merge..."] \
a870ddc0
SP
2697 -command merge::dialog \
2698 -accelerator $M1T-M
9b28a8b9
SP
2699 lappend disable_on_lock \
2700 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1ac17950 2701 .mbar.merge add command -label [mc "Abort Merge..."] \
a6c9b081 2702 -command merge::reset_hard
9b28a8b9
SP
2703 lappend disable_on_lock \
2704 [list .mbar.merge entryconf [.mbar.merge index last] -state]
9b28a8b9
SP
2705}
2706
2707# -- Transport Menu
2708#
2709if {[is_enabled transport]} {
6bdf5e5f 2710 menu .mbar.remote
9b28a8b9 2711
ba6485e0
PB
2712 .mbar.remote add command \
2713 -label [mc "Add..."] \
2714 -command remote_add::dialog \
2715 -accelerator $M1T-A
6bdf5e5f
SP
2716 .mbar.remote add command \
2717 -label [mc "Push..."] \
840bcfa7
SP
2718 -command do_push_anywhere \
2719 -accelerator $M1T-P
6bdf5e5f 2720 .mbar.remote add command \
3c1c2a00 2721 -label [mc "Delete Branch..."] \
aa252f19 2722 -command remote_branch_delete::dialog
9b28a8b9
SP
2723}
2724
0c8d7839 2725if {[is_MacOSX]} {
a91be3fc 2726 proc ::tk::mac::ShowPreferences {} {do_options}
0c8d7839
SP
2727} else {
2728 # -- Edit Menu
2729 #
2730 .mbar.edit add separator
1ac17950 2731 .mbar.edit add command -label [mc "Options..."] \
7416bbc6 2732 -command do_options
273984fc 2733}
557afe82 2734
0ce76ded
AG
2735# -- Tools Menu
2736#
2737if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2738 set tools_menubar .mbar.tools
2739 menu $tools_menubar
2740 $tools_menubar add separator
2741 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2742 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2743 set tools_tailcnt 3
2744 if {[array names repo_config guitool.*.cmd] ne {}} {
2745 tools_populate_all
2746 }
2747}
2748
273984fc
SP
2749# -- Help Menu
2750#
1ac17950 2751.mbar add cascade -label [mc Help] -menu .mbar.help
273984fc 2752menu .mbar.help
0c8d7839 2753
a91be3fc
DS
2754if {[is_MacOSX]} {
2755 .mbar.apple add command -label [mc "About %s" [appname]] \
2756 -command do_about
2757 .mbar.apple add separator
2758} else {
1ac17950 2759 .mbar.help add command -label [mc "About %s" [appname]] \
7416bbc6 2760 -command do_about
0c8d7839 2761}
a91be3fc 2762. configure -menu .mbar
2db21e70 2763
3eb5682b
MH
2764set doc_path [githtmldir]
2765if {$doc_path ne {}} {
2766 set doc_path [file join $doc_path index.html]
273984fc 2767
3eb5682b
MH
2768 if {[is_Cygwin]} {
2769 set doc_path [exec cygpath --mixed $doc_path]
2770 }
273984fc
SP
2771}
2772
273984fc
SP
2773if {[file isfile $doc_path]} {
2774 set doc_url "file:$doc_path"
2775} else {
2776 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2777}
2778
2db21e70
PB
2779proc start_browser {url} {
2780 git "web--browse" $url
273984fc 2781}
2db21e70
PB
2782
2783.mbar.help add command -label [mc "Online Documentation"] \
2784 -command [list start_browser $doc_url]
98a6846b
AG
2785
2786.mbar.help add command -label [mc "Show SSH Key"] \
2787 -command do_ssh_key
2788
2db21e70 2789unset doc_path doc_url
82aa2354 2790
2ebba528
SP
2791# -- Standard bindings
2792#
39fa2a98 2793wm protocol . WM_DELETE_WINDOW do_quit
2ebba528
SP
2794bind all <$M1B-Key-q> do_quit
2795bind all <$M1B-Key-Q> do_quit
2796bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2797bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2798
3e45ee1e
SP
2799set subcommand_args {}
2800proc usage {} {
2801 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2802 exit 1
2803}
2804
95e706b5
AG
2805proc normalize_relpath {path} {
2806 set elements {}
2807 foreach item [file split $path] {
2808 if {$item eq {.}} continue
2809 if {$item eq {..} && [llength $elements] > 0
2810 && [lindex $elements end] ne {..}} {
2811 set elements [lrange $elements 0 end-1]
2812 continue
2813 }
2814 lappend elements $item
2815 }
2816 return [eval file join $elements]
2817}
2818
2ebba528
SP
2819# -- Not a normal commit type invocation? Do that instead!
2820#
258871d3 2821switch -- $subcommand {
85d2d597 2822browser -
2ebba528 2823blame {
f7078b40
AG
2824 if {$subcommand eq "blame"} {
2825 set subcommand_args {[--line=<num>] rev? path}
2826 } else {
2827 set subcommand_args {rev? path}
2828 }
c52c9452 2829 if {$argv eq {}} usage
a0db0d61 2830 set head {}
3e45ee1e 2831 set path {}
f7078b40 2832 set jump_spec {}
3e45ee1e
SP
2833 set is_path 0
2834 foreach a $argv {
2835 if {$is_path || [file exists $_prefix$a]} {
2836 if {$path ne {}} usage
95e706b5 2837 set path [normalize_relpath $_prefix$a]
3e45ee1e
SP
2838 break
2839 } elseif {$a eq {--}} {
2840 if {$path ne {}} {
a0db0d61
SP
2841 if {$head ne {}} usage
2842 set head $path
3e45ee1e
SP
2843 set path {}
2844 }
2845 set is_path 1
f7078b40
AG
2846 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2847 if {$jump_spec ne {} || $head ne {}} usage
2848 set jump_spec [list $lnum]
a0db0d61
SP
2849 } elseif {$head eq {}} {
2850 if {$head ne {}} usage
2851 set head $a
c52c9452 2852 set is_path 1
3e45ee1e
SP
2853 } else {
2854 usage
2855 }
2856 }
2857 unset is_path
2858
c52c9452 2859 if {$head ne {} && $path eq {}} {
95e706b5 2860 set path [normalize_relpath $_prefix$head]
c52c9452
SP
2861 set head {}
2862 }
2863
a0db0d61 2864 if {$head eq {}} {
d41b43eb 2865 load_current_branch
a0db0d61 2866 } else {
02087abc
SP
2867 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2868 if {[catch {
2869 set head [git rev-parse --verify $head]
2870 } err]} {
2871 puts stderr $err
2872 exit 1
2873 }
2874 }
a0db0d61 2875 set current_branch $head
2ebba528 2876 }
a0db0d61 2877
85d2d597
SP
2878 switch -- $subcommand {
2879 browser {
f7078b40 2880 if {$jump_spec ne {}} usage
85d2d597
SP
2881 if {$head eq {}} {
2882 if {$path ne {} && [file isdirectory $path]} {
2883 set head $current_branch
2884 } else {
2885 set head $path
2886 set path {}
2887 }
2888 }
2889 browser::new $head $path
2890 }
2891 blame {
2892 if {$head eq {} && ![file exists $path]} {
c8c4854b 2893 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
85d2d597
SP
2894 exit 1
2895 }
f7078b40 2896 blame::new $head $path $jump_spec
85d2d597 2897 }
c52c9452 2898 }
258871d3
SP
2899 return
2900}
2901citool -
2902gui {
2903 if {[llength $argv] != 0} {
2904 puts -nonewline stderr "usage: $argv0"
0b2bc460
SP
2905 if {$subcommand ne {gui}
2906 && [file tail $argv0] ne "git-$subcommand"} {
258871d3
SP
2907 puts -nonewline stderr " $subcommand"
2908 }
2909 puts stderr {}
2910 exit 1
2911 }
2912 # fall through to setup UI for commits
2ebba528 2913}
2ebba528 2914default {
c0f7a6c3 2915 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2ebba528
SP
2916 exit 1
2917}
2918}
2919
8553b772
SP
2920# -- Branch Control
2921#
2922frame .branch \
2923 -borderwidth 1 \
2924 -relief sunken
2925label .branch.l1 \
1ac17950 2926 -text [mc "Current Branch:"] \
8553b772 2927 -anchor w \
7416bbc6 2928 -justify left
8553b772
SP
2929label .branch.cb \
2930 -textvariable current_branch \
2931 -anchor w \
7416bbc6 2932 -justify left
8553b772
SP
2933pack .branch.l1 -side left
2934pack .branch.cb -side left -fill x
2935pack .branch -side top -fill x
2936
cb07fc2a 2937# -- Main Window Layout
a49c67d1 2938#
a0592d3f
JS
2939panedwindow .vpane -orient horizontal
2940panedwindow .vpane.files -orient vertical
c5a1eb88 2941.vpane add .vpane.files -sticky nsew -height 100 -width 200
cb07fc2a
SP
2942pack .vpane -anchor n -side top -fill both -expand 1
2943
2944# -- Index File List
a49c67d1 2945#
c5a1eb88 2946frame .vpane.files.index -height 100 -width 200
c73ce762 2947label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
c382fdd7
PH
2948 -background lightgreen -foreground black
2949text $ui_index -background white -foreground black \
2950 -borderwidth 0 \
c5a1eb88 2951 -width 20 -height 10 \
3c236977 2952 -wrap none \
6c6dd01a 2953 -cursor $cursor_ptr \
3c236977
SP
2954 -xscrollcommand {.vpane.files.index.sx set} \
2955 -yscrollcommand {.vpane.files.index.sy set} \
cb07fc2a 2956 -state disabled
3c236977
SP
2957scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2958scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
cb07fc2a 2959pack .vpane.files.index.title -side top -fill x
3c236977
SP
2960pack .vpane.files.index.sx -side bottom -fill x
2961pack .vpane.files.index.sy -side right -fill y
cb07fc2a 2962pack $ui_index -side left -fill both -expand 1
cb07fc2a 2963
0812665e 2964# -- Working Directory File List
a49c67d1 2965#
c5a1eb88 2966frame .vpane.files.workdir -height 100 -width 200
c73ce762 2967label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
c382fdd7
PH
2968 -background lightsalmon -foreground black
2969text $ui_workdir -background white -foreground black \
2970 -borderwidth 0 \
c5a1eb88 2971 -width 20 -height 10 \
3c236977 2972 -wrap none \
6c6dd01a 2973 -cursor $cursor_ptr \
3c236977
SP
2974 -xscrollcommand {.vpane.files.workdir.sx set} \
2975 -yscrollcommand {.vpane.files.workdir.sy set} \
cb07fc2a 2976 -state disabled
3c236977
SP
2977scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2978scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
0812665e 2979pack .vpane.files.workdir.title -side top -fill x
3c236977
SP
2980pack .vpane.files.workdir.sx -side bottom -fill x
2981pack .vpane.files.workdir.sy -side right -fill y
0812665e 2982pack $ui_workdir -side left -fill both -expand 1
a0592d3f 2983
0812665e 2984.vpane.files add .vpane.files.workdir -sticky nsew
a0592d3f 2985.vpane.files add .vpane.files.index -sticky nsew
cb07fc2a 2986
0812665e 2987foreach i [list $ui_index $ui_workdir] {
3849bfba
SP
2988 rmsel_tag $i
2989 $i tag conf in_diff -background [$i tag cget in_sel -background]
24263b77
SP
2990}
2991unset i
131f503b 2992
0fb8f9ce 2993# -- Diff and Commit Area
a49c67d1 2994#
8009dcdc 2995frame .vpane.lower -height 300 -width 400
0fb8f9ce
SP
2996frame .vpane.lower.commarea
2997frame .vpane.lower.diff -relief sunken -borderwidth 1
a0592d3f
JS
2998pack .vpane.lower.diff -fill both -expand 1
2999pack .vpane.lower.commarea -side bottom -fill x
0fd49d0a 3000.vpane add .vpane.lower -sticky nsew
cb07fc2a
SP
3001
3002# -- Commit Area Buttons
a49c67d1 3003#
0fb8f9ce
SP
3004frame .vpane.lower.commarea.buttons
3005label .vpane.lower.commarea.buttons.l -text {} \
cb07fc2a 3006 -anchor w \
7416bbc6 3007 -justify left
0fb8f9ce
SP
3008pack .vpane.lower.commarea.buttons.l -side top -fill x
3009pack .vpane.lower.commarea.buttons -side left -fill y
131f503b 3010
1ac17950 3011button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
8056cc4f 3012 -command ui_do_rescan
0fb8f9ce 3013pack .vpane.lower.commarea.buttons.rescan -side top -fill x
390adaea
SP
3014lappend disable_on_lock \
3015 {.vpane.lower.commarea.buttons.rescan conf -state}
131f503b 3016
1ac17950 3017button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
7416bbc6 3018 -command do_add_all
7fe7e733 3019pack .vpane.lower.commarea.buttons.incall -side top -fill x
390adaea
SP
3020lappend disable_on_lock \
3021 {.vpane.lower.commarea.buttons.incall conf -state}
131f503b 3022
ed70e4d7 3023if {![is_enabled nocommitmsg]} {
1e02b32e
SP
3024 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3025 -command do_signoff
3026 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3027}
131f503b 3028
1e65c622 3029button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
7416bbc6 3030 -command do_commit
0fb8f9ce 3031pack .vpane.lower.commarea.buttons.commit -side top -fill x
390adaea
SP
3032lappend disable_on_lock \
3033 {.vpane.lower.commarea.buttons.commit conf -state}
cb07fc2a 3034
1e02b32e
SP
3035if {![is_enabled nocommit]} {
3036 button .vpane.lower.commarea.buttons.push -text [mc Push] \
3037 -command do_push_anywhere
3038 pack .vpane.lower.commarea.buttons.push -side top -fill x
1e65c622
AG
3039}
3040
cb07fc2a 3041# -- Commit Message Buffer
a49c67d1 3042#
0fb8f9ce 3043frame .vpane.lower.commarea.buffer
24ac9b75 3044frame .vpane.lower.commarea.buffer.header
0fb8f9ce 3045set ui_comm .vpane.lower.commarea.buffer.t
24ac9b75 3046set ui_coml .vpane.lower.commarea.buffer.header.l
1e02b32e
SP
3047
3048if {![is_enabled nocommit]} {
3049 radiobutton .vpane.lower.commarea.buffer.header.new \
3050 -text [mc "New Commit"] \
3051 -command do_select_commit_type \
3052 -variable selected_commit_type \
3053 -value new
3054 lappend disable_on_lock \
3055 [list .vpane.lower.commarea.buffer.header.new conf -state]
3056 radiobutton .vpane.lower.commarea.buffer.header.amend \
3057 -text [mc "Amend Last Commit"] \
3058 -command do_select_commit_type \
3059 -variable selected_commit_type \
3060 -value amend
3061 lappend disable_on_lock \
3062 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3063}
3064
a49c67d1 3065label $ui_coml \
cb07fc2a 3066 -anchor w \
7416bbc6 3067 -justify left
4539eacd
SP
3068proc trace_commit_type {varname args} {
3069 global ui_coml commit_type
3070 switch -glob -- $commit_type {
1ac17950
CS
3071 initial {set txt [mc "Initial Commit Message:"]}
3072 amend {set txt [mc "Amended Commit Message:"]}
3073 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3074 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3075 merge {set txt [mc "Merge Commit Message:"]}
3076 * {set txt [mc "Commit Message:"]}
4539eacd
SP
3077 }
3078 $ui_coml conf -text $txt
3079}
3080trace add variable commit_type write trace_commit_type
24ac9b75 3081pack $ui_coml -side left -fill x
1e02b32e
SP
3082
3083if {![is_enabled nocommit]} {
3084 pack .vpane.lower.commarea.buffer.header.amend -side right
3085 pack .vpane.lower.commarea.buffer.header.new -side right
3086}
24ac9b75 3087
c382fdd7
PH
3088text $ui_comm -background white -foreground black \
3089 -borderwidth 1 \
9861671d 3090 -undo true \
b2c6fcf1 3091 -maxundo 20 \
9861671d 3092 -autoseparators true \
cb07fc2a 3093 -relief sunken \
11027d54 3094 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
b4946930 3095 -font font_diff \
6c6dd01a 3096 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
390adaea
SP
3097scrollbar .vpane.lower.commarea.buffer.sby \
3098 -command [list $ui_comm yview]
24ac9b75 3099pack .vpane.lower.commarea.buffer.header -side top -fill x
0fb8f9ce 3100pack .vpane.lower.commarea.buffer.sby -side right -fill y
cb07fc2a 3101pack $ui_comm -side left -fill y
0fb8f9ce
SP
3102pack .vpane.lower.commarea.buffer -side left -fill y
3103
0e794311
SP
3104# -- Commit Message Buffer Context Menu
3105#
e8ab6446
SP
3106set ctxm .vpane.lower.commarea.buffer.ctxm
3107menu $ctxm -tearoff 0
3108$ctxm add command \
1ac17950 3109 -label [mc Cut] \
e8ab6446
SP
3110 -command {tk_textCut $ui_comm}
3111$ctxm add command \
1ac17950 3112 -label [mc Copy] \
e8ab6446
SP
3113 -command {tk_textCopy $ui_comm}
3114$ctxm add command \
1ac17950 3115 -label [mc Paste] \
e8ab6446
SP
3116 -command {tk_textPaste $ui_comm}
3117$ctxm add command \
1ac17950 3118 -label [mc Delete] \
bf516eca 3119 -command {catch {$ui_comm delete sel.first sel.last}}
e8ab6446
SP
3120$ctxm add separator
3121$ctxm add command \
1ac17950 3122 -label [mc "Select All"] \
75e78c8a 3123 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
e8ab6446 3124$ctxm add command \
1ac17950 3125 -label [mc "Copy All"] \
e8ab6446 3126 -command {
0e794311
SP
3127 $ui_comm tag add sel 0.0 end
3128 tk_textCopy $ui_comm
3129 $ui_comm tag remove sel 0.0 end
e8ab6446
SP
3130 }
3131$ctxm add separator
3132$ctxm add command \
1ac17950 3133 -label [mc "Sign Off"] \
0e794311 3134 -command do_signoff
95b002ee 3135set ui_comm_ctxm $ctxm
0e794311 3136
0fb8f9ce 3137# -- Diff Header
a49c67d1 3138#
20a53c02
SP
3139proc trace_current_diff_path {varname args} {
3140 global current_diff_path diff_actions file_states
3141 if {$current_diff_path eq {}} {
e8ab6446
SP
3142 set s {}
3143 set f {}
3144 set p {}
3145 set o disabled
3146 } else {
20a53c02 3147 set p $current_diff_path
e8ab6446 3148 set s [mapdesc [lindex $file_states($p) 0] $p]
1ac17950 3149 set f [mc "File:"]
e8ab6446
SP
3150 set p [escape_path $p]
3151 set o normal
3152 }
3153
3154 .vpane.lower.diff.header.status configure -text $s
3155 .vpane.lower.diff.header.file configure -text $f
3156 .vpane.lower.diff.header.path configure -text $p
3157 foreach w $diff_actions {
3158 uplevel #0 $w $o
3159 }
3160}
20a53c02 3161trace add variable current_diff_path write trace_current_diff_path
e8ab6446 3162
9adccb05 3163frame .vpane.lower.diff.header -background gold
e8ab6446 3164label .vpane.lower.diff.header.status \
9adccb05 3165 -background gold \
c382fdd7 3166 -foreground black \
3e7b0e1d
SP
3167 -width $max_status_desc \
3168 -anchor w \
7416bbc6 3169 -justify left
e8ab6446 3170label .vpane.lower.diff.header.file \
9adccb05 3171 -background gold \
c382fdd7 3172 -foreground black \
e8ab6446 3173 -anchor w \
7416bbc6 3174 -justify left
e8ab6446 3175label .vpane.lower.diff.header.path \
9adccb05 3176 -background gold \
c382fdd7 3177 -foreground black \
fce89e46 3178 -anchor w \
7416bbc6 3179 -justify left
e8ab6446
SP
3180pack .vpane.lower.diff.header.status -side left
3181pack .vpane.lower.diff.header.file -side left
3182pack .vpane.lower.diff.header.path -fill x
3183set ctxm .vpane.lower.diff.header.ctxm
3184menu $ctxm -tearoff 0
3185$ctxm add command \
1ac17950 3186 -label [mc Copy] \
fce89e46
SP
3187 -command {
3188 clipboard clear
3189 clipboard append \
3190 -format STRING \
3191 -type STRING \
20a53c02 3192 -- $current_diff_path
fce89e46 3193 }
e8ab6446
SP
3194lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3195bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
0fb8f9ce
SP
3196
3197# -- Diff Body
a49c67d1 3198#
0fb8f9ce
SP
3199frame .vpane.lower.diff.body
3200set ui_diff .vpane.lower.diff.body.t
c382fdd7
PH
3201text $ui_diff -background white -foreground black \
3202 -borderwidth 0 \
acb9108c 3203 -width 80 -height 5 -wrap none \
b4946930 3204 -font font_diff \
0fb8f9ce
SP
3205 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3206 -yscrollcommand {.vpane.lower.diff.body.sby set} \
0fb8f9ce
SP
3207 -state disabled
3208scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3209 -command [list $ui_diff xview]
3210scrollbar .vpane.lower.diff.body.sby -orient vertical \
3211 -command [list $ui_diff yview]
3212pack .vpane.lower.diff.body.sbx -side bottom -fill x
3213pack .vpane.lower.diff.body.sby -side right -fill y
3214pack $ui_diff -side left -fill both -expand 1
3215pack .vpane.lower.diff.header -side top -fill x
3216pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3217
30b14ed3 3218$ui_diff tag conf d_cr -elide true
ca521566
SP
3219$ui_diff tag conf d_@ -foreground blue -font font_diffbold
3220$ui_diff tag conf d_+ -foreground {#00a000}
fec4a785
SP
3221$ui_diff tag conf d_- -foreground red
3222
ca521566 3223$ui_diff tag conf d_++ -foreground {#00a000}
fec4a785
SP
3224$ui_diff tag conf d_-- -foreground red
3225$ui_diff tag conf d_+s \
ca521566
SP
3226 -foreground {#00a000} \
3227 -background {#e2effa}
fec4a785
SP
3228$ui_diff tag conf d_-s \
3229 -foreground red \
ca521566 3230 -background {#e2effa}
fec4a785 3231$ui_diff tag conf d_s+ \
ca521566
SP
3232 -foreground {#00a000} \
3233 -background ivory1
fec4a785
SP
3234$ui_diff tag conf d_s- \
3235 -foreground red \
ca521566 3236 -background ivory1
fec4a785
SP
3237
3238$ui_diff tag conf d<<<<<<< \
3239 -foreground orange \
3240 -font font_diffbold
3241$ui_diff tag conf d======= \
3242 -foreground orange \
3243 -font font_diffbold
3244$ui_diff tag conf d>>>>>>> \
3245 -foreground orange \
3246 -font font_diffbold
cb07fc2a 3247
ca521566
SP
3248$ui_diff tag raise sel
3249
0e794311
SP
3250# -- Diff Body Context Menu
3251#
042c2325
AG
3252
3253proc create_common_diff_popup {ctxm} {
042c2325
AG
3254 $ctxm add command \
3255 -label [mc Refresh] \
3256 -command reshow_diff
3257 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3258 $ctxm add command \
3259 -label [mc Copy] \
3260 -command {tk_textCopy $ui_diff}
3261 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3262 $ctxm add command \
3263 -label [mc "Select All"] \
3264 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3265 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3266 $ctxm add command \
3267 -label [mc "Copy All"] \
3268 -command {
3269 $ui_diff tag add sel 0.0 end
3270 tk_textCopy $ui_diff
3271 $ui_diff tag remove sel 0.0 end
3272 }
3273 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3274 $ctxm add separator
3275 $ctxm add command \
3276 -label [mc "Decrease Font Size"] \
3277 -command {incr_font_size font_diff -1}
3278 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3279 $ctxm add command \
3280 -label [mc "Increase Font Size"] \
3281 -command {incr_font_size font_diff 1}
3282 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3283 $ctxm add separator
3fe01623
AG
3284 set emenu $ctxm.enc
3285 menu $emenu
3286 build_encoding_menu $emenu [list force_diff_encoding]
3287 $ctxm add cascade \
3288 -label [mc "Encoding"] \
3289 -menu $emenu
3290 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3291 $ctxm add separator
042c2325
AG
3292 $ctxm add command -label [mc "Options..."] \
3293 -command do_options
3294}
3295
e8ab6446
SP
3296set ctxm .vpane.lower.diff.body.ctxm
3297menu $ctxm -tearoff 0
fba6072e
JS
3298$ctxm add command \
3299 -label [mc "Apply/Reverse Hunk"] \
3300 -command {apply_hunk $cursorX $cursorY}
3301set ui_diff_applyhunk [$ctxm index last]
3302lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
5821988f
JS
3303$ctxm add command \
3304 -label [mc "Apply/Reverse Line"] \
ff07c3b6 3305 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
5821988f
JS
3306set ui_diff_applyline [$ctxm index last]
3307lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
fba6072e 3308$ctxm add separator
25476c63
JL
3309$ctxm add command \
3310 -label [mc "Show Less Context"] \
3311 -command show_less_context
3312lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3313$ctxm add command \
3314 -label [mc "Show More Context"] \
3315 -command show_more_context
3316lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3317$ctxm add separator
042c2325
AG
3318create_common_diff_popup $ctxm
3319
3320set ctxmmg .vpane.lower.diff.body.ctxmmg
3321menu $ctxmmg -tearoff 0
7e30682c
AG
3322$ctxmmg add command \
3323 -label [mc "Run Merge Tool"] \
3324 -command {merge_resolve_tool}
3325lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3326$ctxmmg add separator
042c2325
AG
3327$ctxmmg add command \
3328 -label [mc "Use Remote Version"] \
3329 -command {merge_resolve_one 3}
3330lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3331$ctxmmg add command \
3332 -label [mc "Use Local Version"] \
3333 -command {merge_resolve_one 2}
3334lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3335$ctxmmg add command \
3336 -label [mc "Revert To Base"] \
3337 -command {merge_resolve_one 1}
3338lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3339$ctxmmg add separator
25476c63
JL
3340$ctxmmg add command \
3341 -label [mc "Show Less Context"] \
3342 -command show_less_context
3343lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3344$ctxmmg add command \
3345 -label [mc "Show More Context"] \
3346 -command show_more_context
3347lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3348$ctxmmg add separator
042c2325
AG
3349create_common_diff_popup $ctxmmg
3350
25476c63
JL
3351set ctxmsm .vpane.lower.diff.body.ctxmsm
3352menu $ctxmsm -tearoff 0
3353$ctxmsm add command \
3354 -label [mc "Visualize These Changes In The Submodule"] \
3355 -command {do_gitk -- true}
3356lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3357$ctxmsm add command \
3358 -label [mc "Visualize Current Branch History In The Submodule"] \
3359 -command {do_gitk {} true}
3360lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3361$ctxmsm add command \
3362 -label [mc "Visualize All Branch History In The Submodule"] \
3363 -command {do_gitk --all true}
3364lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3365$ctxmsm add separator
3366$ctxmsm add command \
3367 -label [mc "Start git gui In The Submodule"] \
3368 -command {do_git_gui}
3369lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3370$ctxmsm add separator
3371create_common_diff_popup $ctxmsm
3372
3373proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
ce015c21 3374 global current_diff_path file_states
83751fc1
SP
3375 set ::cursorX $x
3376 set ::cursorY $y
042c2325
AG
3377 if {[info exists file_states($current_diff_path)]} {
3378 set state [lindex $file_states($current_diff_path) 0]
a25c5189 3379 } else {
042c2325
AG
3380 set state {__}
3381 }
ff515d81 3382 if {[string first {U} $state] >= 0} {
042c2325 3383 tk_popup $ctxmmg $X $Y
25476c63
JL
3384 } elseif {$::is_submodule_diff} {
3385 tk_popup $ctxmsm $X $Y
047d94d5 3386 } else {
ff07c3b6 3387 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
042c2325
AG
3388 if {$::ui_index eq $::current_diff_side} {
3389 set l [mc "Unstage Hunk From Commit"]
ff07c3b6
JE
3390 if {$has_range} {
3391 set t [mc "Unstage Lines From Commit"]
3392 } else {
3393 set t [mc "Unstage Line From Commit"]
3394 }
042c2325
AG
3395 } else {
3396 set l [mc "Stage Hunk For Commit"]
ff07c3b6
JE
3397 if {$has_range} {
3398 set t [mc "Stage Lines For Commit"]
3399 } else {
3400 set t [mc "Stage Line For Commit"]
3401 }
042c2325 3402 }
25476c63 3403 if {$::is_3way_diff
042c2325
AG
3404 || $current_diff_path eq {}
3405 || {__} eq $state
3406 || {_O} eq $state
3407 || {_T} eq $state
3408 || {T_} eq $state} {
3409 set s disabled
3410 } else {
3411 set s normal
3412 }
3413 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3414 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3415 tk_popup $ctxm $X $Y
9c9f5fa9 3416 }
83751fc1 3417}
25476c63 3418bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
0e794311 3419
cb07fc2a 3420# -- Status Bar
e8ab6446 3421#
51530d17 3422set main_status [::status_bar::new .status]
cb07fc2a 3423pack .status -anchor w -side bottom -fill x
1ac17950 3424$main_status show [mc "Initializing..."]
cb07fc2a 3425
2d19516d 3426# -- Load geometry
e8ab6446 3427#
2d19516d 3428catch {
51f4d16b 3429set gm $repo_config(gui.geometry)
c4fe7728
SP
3430wm geometry . [lindex $gm 0]
3431.vpane sash place 0 \
a0592d3f
JS
3432 [lindex $gm 1] \
3433 [lindex [.vpane sash coord 0] 1]
c4fe7728 3434.vpane.files sash place 0 \
a0592d3f
JS
3435 [lindex [.vpane.files sash coord 0] 0] \
3436 [lindex $gm 2]
c4fe7728 3437unset gm
390adaea 3438}
2d19516d 3439
ed7b6033
AB
3440# -- Load window state
3441#
3442catch {
3443set gws $repo_config(gui.wmstate)
3444wm state . $gws
3445unset gws
3446}
3447
cb07fc2a 3448# -- Key Bindings
e8ab6446 3449#
ec6b424a 3450bind $ui_comm <$M1B-Key-Return> {do_commit;break}
cd16a6c9
SP
3451bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3452bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
b677c66e
VS
3453bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3454bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3455bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3456bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
93e912c5
SP
3457bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3458bind $ui_comm <$M1B-Key-I> {do_add_all;break}
9861671d
SP
3459bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3460bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3461bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3462bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3463bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3464bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3465bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3466bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
729ffa50
MB
3467bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3468bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3469bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3470bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3471bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
9861671d
SP
3472
3473bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3474bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3475bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3476bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3477bind $ui_diff <$M1B-Key-v> {break}
3478bind $ui_diff <$M1B-Key-V> {break}
3479bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3480bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
b2c6fcf1
SP
3481bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3482bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3483bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3484bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
60aa065f
SP
3485bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3486bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3487bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3488bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3489bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3490bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
23effa79 3491bind $ui_diff <Button-1> {focus %W}
49b86f01 3492
64a906f8 3493if {[is_enabled branch]} {
b1fa2bff
SP
3494 bind . <$M1B-Key-n> branch_create::dialog
3495 bind . <$M1B-Key-N> branch_create::dialog
d41b43eb
SP
3496 bind . <$M1B-Key-o> branch_checkout::dialog
3497 bind . <$M1B-Key-O> branch_checkout::dialog
a870ddc0
SP
3498 bind . <$M1B-Key-m> merge::dialog
3499 bind . <$M1B-Key-M> merge::dialog
bd29ebc3 3500}
840bcfa7
SP
3501if {[is_enabled transport]} {
3502 bind . <$M1B-Key-p> do_push_anywhere
3503 bind . <$M1B-Key-P> do_push_anywhere
3504}
bd29ebc3 3505
8056cc4f
AG
3506bind . <Key-F5> ui_do_rescan
3507bind . <$M1B-Key-r> ui_do_rescan
3508bind . <$M1B-Key-R> ui_do_rescan
07123f40
SP
3509bind . <$M1B-Key-s> do_signoff
3510bind . <$M1B-Key-S> do_signoff
cd16a6c9
SP
3511bind . <$M1B-Key-t> do_add_selection
3512bind . <$M1B-Key-T> do_add_selection
93e912c5
SP
3513bind . <$M1B-Key-i> do_add_all
3514bind . <$M1B-Key-I> do_add_all
729ffa50
MB
3515bind . <$M1B-Key-minus> {show_less_context;break}
3516bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3517bind . <$M1B-Key-equal> {show_more_context;break}
3518bind . <$M1B-Key-plus> {show_more_context;break}
3519bind . <$M1B-Key-KP_Add> {show_more_context;break}
07123f40 3520bind . <$M1B-Key-Return> do_commit
0812665e 3521foreach i [list $ui_index $ui_workdir] {
24263b77
SP
3522 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3523 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3524 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
cb07fc2a 3525}
62aac80b
SP
3526unset i
3527
3528set file_lists($ui_index) [list]
0812665e 3529set file_lists($ui_workdir) [list]
a49c67d1 3530
21985a11 3531wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
cb07fc2a 3532focus -force $ui_comm
1d8b3cbf 3533
85ab313e
SP
3534# -- Warn the user about environmental problems. Cygwin's Tcl
3535# does *not* pass its env array onto any processes it spawns.
3536# This means that git processes get none of our environment.
1d8b3cbf 3537#
20ddfcaa 3538if {[is_Cygwin]} {
1d8b3cbf
SP
3539 set ignored_env 0
3540 set suggest_user {}
c8c4854b 3541 set msg [mc "Possible environment issues exist.
1d8b3cbf
SP
3542
3543The following environment variables are probably
3544going to be ignored by any Git subprocess run
c8c4854b 3545by %s:
1d8b3cbf 3546
c8c4854b 3547" [appname]]
1d8b3cbf
SP
3548 foreach name [array names env] {
3549 switch -regexp -- $name {
3550 {^GIT_INDEX_FILE$} -
3551 {^GIT_OBJECT_DIRECTORY$} -
3552 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3553 {^GIT_DIFF_OPTS$} -
3554 {^GIT_EXTERNAL_DIFF$} -
3555 {^GIT_PAGER$} -
3556 {^GIT_TRACE$} -
3557 {^GIT_CONFIG$} -
1d8b3cbf
SP
3558 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3559 append msg " - $name\n"
3560 incr ignored_env
3561 }
3562 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3563 append msg " - $name\n"
3564 incr ignored_env
3565 set suggest_user $name
3566 }
3567 }
3568 }
3569 if {$ignored_env > 0} {
c8c4854b 3570 append msg [mc "
1d8b3cbf 3571This is due to a known issue with the
c8c4854b 3572Tcl binary distributed by Cygwin."]
1d8b3cbf
SP
3573
3574 if {$suggest_user ne {}} {
c8c4854b 3575 append msg [mc "
1d8b3cbf 3576
c8c4854b 3577A good replacement for %s
1d8b3cbf
SP
3578is placing values for the user.name and
3579user.email settings into your personal
3580~/.gitconfig file.
c8c4854b 3581" $suggest_user]
1d8b3cbf
SP
3582 }
3583 warn_popup $msg
3584 }
3585 unset ignored_env msg suggest_user name
3586}
3587
85ab313e
SP
3588# -- Only initialize complex UI if we are going to stay running.
3589#
64a906f8 3590if {[is_enabled transport]} {
4ccdab02 3591 load_all_remotes
85ab313e 3592
6bdf5e5f 3593 set n [.mbar.remote index end]
8329bd07