git-gui: Update french translation
[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}} {
55 set oguilib [file dirname [file dirname [file normalize $argv0]]]
56 set oguilib [file join $oguilib share git-gui lib]
d4b0ccd9 57 set oguimsg [file join $oguilib msgs]
fc703c20
SP
58} elseif {[string match @@* $oguirel]} {
59 set oguilib [file join [file dirname [file normalize $argv0]] lib]
d4b0ccd9
SP
60 set oguimsg [file join [file dirname [file normalize $argv0]] po]
61} else {
62 set oguimsg [file join $oguilib msgs]
fc703c20
SP
63}
64unset oguirel
65
cd12901b
SP
66######################################################################
67##
68## enable verbose loading?
69
70if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
71 unset _verbose
72 rename auto_load real__auto_load
73 proc auto_load {name args} {
74 puts stderr "auto_load $name"
75 return [uplevel 1 real__auto_load $name $args]
76 }
77 rename source real__source
78 proc source {name} {
79 puts stderr "source $name"
80 uplevel 1 real__source $name
81 }
82}
83
c950c66e 84######################################################################
d4b0ccd9
SP
85##
86## Internationalization (i18n) through msgcat and gettext. See
87## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
88
89package require msgcat
146d73a3 90
ab0d33c4 91proc _mc_trim {fmt} {
146d73a3
SP
92 set cmk [string first @@ $fmt]
93 if {$cmk > 0} {
ab0d33c4 94 return [string range $fmt 0 [expr {$cmk - 1}]]
146d73a3 95 }
ab0d33c4
SP
96 return $fmt
97}
98
99proc mc {en_fmt args} {
100 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
101 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
102 set msg [eval [list format [_mc_trim $en_fmt]] $args]
103 }
104 return $msg
146d73a3
SP
105}
106
31bb1d1b
SP
107proc strcat {args} {
108 return [join $args {}]
109}
110
d4b0ccd9
SP
111::msgcat::mcload $oguimsg
112unset oguimsg
113
114######################################################################
c950c66e
SP
115##
116## read only globals
117
0b2bc460 118set _appname {Git Gui}
c950c66e 119set _gitdir {}
20ddfcaa 120set _gitexec {}
c950c66e 121set _reponame {}
20ddfcaa 122set _iscygwin {}
0b812616 123set _search_path {}
c950c66e
SP
124
125proc appname {} {
126 global _appname
127 return $_appname
128}
129
c2758a17 130proc gitdir {args} {
c950c66e 131 global _gitdir
c2758a17
SP
132 if {$args eq {}} {
133 return $_gitdir
134 }
0b812616 135 return [eval [list file join $_gitdir] $args]
c950c66e
SP
136}
137
20ddfcaa
SP
138proc gitexec {args} {
139 global _gitexec
140 if {$_gitexec eq {}} {
81347223 141 if {[catch {set _gitexec [git --exec-path]} err]} {
20ddfcaa
SP
142 error "Git not installed?\n\n$err"
143 }
0b812616
SP
144 if {[is_Cygwin]} {
145 set _gitexec [exec cygpath \
146 --windows \
147 --absolute \
148 $_gitexec]
149 } else {
150 set _gitexec [file normalize $_gitexec]
151 }
20ddfcaa
SP
152 }
153 if {$args eq {}} {
154 return $_gitexec
155 }
0b812616 156 return [eval [list file join $_gitexec] $args]
20ddfcaa
SP
157}
158
c950c66e 159proc reponame {} {
d36cd968 160 return $::_reponame
c950c66e 161}
da5239dc 162
20ddfcaa 163proc is_MacOSX {} {
20ddfcaa
SP
164 if {[tk windowingsystem] eq {aqua}} {
165 return 1
166 }
167 return 0
168}
169
170proc is_Windows {} {
d36cd968 171 if {$::tcl_platform(platform) eq {windows}} {
20ddfcaa
SP
172 return 1
173 }
174 return 0
175}
176
177proc is_Cygwin {} {
d36cd968 178 global _iscygwin
20ddfcaa 179 if {$_iscygwin eq {}} {
d36cd968 180 if {$::tcl_platform(platform) eq {windows}} {
20ddfcaa
SP
181 if {[catch {set p [exec cygpath --windir]} err]} {
182 set _iscygwin 0
183 } else {
184 set _iscygwin 1
185 }
186 } else {
187 set _iscygwin 0
188 }
189 }
190 return $_iscygwin
191}
192
cf25ddc8
SP
193proc is_enabled {option} {
194 global enabled_options
195 if {[catch {set on $enabled_options($option)}]} {return 0}
196 return $on
197}
198
199proc enable_option {option} {
200 global enabled_options
201 set enabled_options($option) 1
202}
203
204proc disable_option {option} {
205 global enabled_options
206 set enabled_options($option) 0
207}
208
2d19516d
SP
209######################################################################
210##
211## config
212
51f4d16b
SP
213proc is_many_config {name} {
214 switch -glob -- $name {
24f7c64b 215 gui.recentrepo -
51f4d16b
SP
216 remote.*.fetch -
217 remote.*.push
218 {return 1}
219 *
220 {return 0}
221 }
222}
2d19516d 223
c539449b
SP
224proc is_config_true {name} {
225 global repo_config
226 if {[catch {set v $repo_config($name)}]} {
227 return 0
228 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
229 return 1
230 } else {
231 return 0
232 }
233}
234
61f82ce7
SP
235proc get_config {name} {
236 global repo_config
237 if {[catch {set v $repo_config($name)}]} {
238 return {}
239 } else {
240 return $v
241 }
242}
243
81347223
SP
244######################################################################
245##
246## handy utils
247
0b812616
SP
248proc _git_cmd {name} {
249 global _git_cmd_path
250
251 if {[catch {set v $_git_cmd_path($name)}]} {
252 switch -- $name {
70a7595c 253 version -
0b812616
SP
254 --version -
255 --exec-path { return [list $::_git $name] }
256 }
257
258 set p [gitexec git-$name$::_search_exe]
259 if {[file exists $p]} {
260 set v [list $p]
c136f2b8
SP
261 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
262 # Try to determine what sort of magic will make
263 # git-$name go and do its thing, because native
264 # Tcl on Windows doesn't know it.
0b812616 265 #
c136f2b8
SP
266 set p [gitexec git-$name]
267 set f [open $p r]
268 set s [gets $f]
269 close $f
270
6e4ba05c 271 switch -glob -- [lindex $s 0] {
c136f2b8
SP
272 #!*sh { set i sh }
273 #!*perl { set i perl }
274 #!*python { set i python }
275 default { error "git-$name is not supported: $s" }
276 }
277
278 upvar #0 _$i interp
279 if {![info exists interp]} {
280 set interp [_which $i]
281 }
282 if {$interp eq {}} {
283 error "git-$name requires $i (not in PATH)"
284 }
6e4ba05c 285 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
0b812616 286 } else {
c6729890
SP
287 # Assume it is builtin to git somehow and we
288 # aren't actually able to see a file for it.
289 #
290 set v [list $::_git $name]
0b812616
SP
291 }
292 set _git_cmd_path($name) $v
293 }
294 return $v
295}
296
297proc _which {what} {
298 global env _search_exe _search_path
299
300 if {$_search_path eq {}} {
299077fb 301 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
0b812616
SP
302 set _search_path [split [exec cygpath \
303 --windows \
304 --path \
305 --absolute \
306 $env(PATH)] {;}]
307 set _search_exe .exe
308 } elseif {[is_Windows]} {
be700fe3
SP
309 set gitguidir [file dirname [info script]]
310 regsub -all ";" $gitguidir "\\;" gitguidir
311 set env(PATH) "$gitguidir;$env(PATH)"
0b812616
SP
312 set _search_path [split $env(PATH) {;}]
313 set _search_exe .exe
314 } else {
315 set _search_path [split $env(PATH) :]
316 set _search_exe {}
317 }
318 }
319
320 foreach p $_search_path {
321 set p [file join $p $what$_search_exe]
322 if {[file exists $p]} {
323 return [file normalize $p]
324 }
325 }
326 return {}
327}
328
6f62b4f7
SP
329proc _lappend_nice {cmd_var} {
330 global _nice
331 upvar $cmd_var cmd
332
333 if {![info exists _nice]} {
334 set _nice [_which nice]
335 }
336 if {$_nice ne {}} {
337 lappend cmd $_nice
338 }
339}
340
81347223 341proc git {args} {
0b812616
SP
342 set opt [list exec]
343
344 while {1} {
345 switch -- [lindex $args 0] {
346 --nice {
6f62b4f7 347 _lappend_nice opt
0b812616
SP
348 }
349
350 default {
351 break
352 }
353
354 }
355
356 set args [lrange $args 1 end]
357 }
358
359 set cmdp [_git_cmd [lindex $args 0]]
360 set args [lrange $args 1 end]
361
362 return [eval $opt $cmdp $args]
363}
364
74c4763c
SP
365proc _open_stdout_stderr {cmd} {
366 if {[catch {
367 set fd [open $cmd r]
368 } err]} {
369 if { [lindex $cmd end] eq {2>@1}
370 && $err eq {can not find channel named "1"}
371 } {
372 # Older versions of Tcl 8.4 don't have this 2>@1 IO
373 # redirect operator. Fallback to |& cat for those.
374 # The command was not actually started, so its safe
375 # to try to start it a second time.
376 #
377 set fd [open [concat \
378 [lrange $cmd 0 end-1] \
379 [list |& cat] \
380 ] r]
381 } else {
382 error $err
383 }
384 }
6eb420ef 385 fconfigure $fd -eofchar {}
74c4763c
SP
386 return $fd
387}
388
0b812616
SP
389proc git_read {args} {
390 set opt [list |]
391
392 while {1} {
393 switch -- [lindex $args 0] {
394 --nice {
6f62b4f7 395 _lappend_nice opt
0b812616
SP
396 }
397
398 --stderr {
399 lappend args 2>@1
400 }
401
402 default {
403 break
404 }
405
406 }
407
408 set args [lrange $args 1 end]
409 }
410
411 set cmdp [_git_cmd [lindex $args 0]]
412 set args [lrange $args 1 end]
413
74c4763c 414 return [_open_stdout_stderr [concat $opt $cmdp $args]]
0b812616
SP
415}
416
417proc git_write {args} {
418 set opt [list |]
419
420 while {1} {
421 switch -- [lindex $args 0] {
422 --nice {
6f62b4f7 423 _lappend_nice opt
0b812616
SP
424 }
425
426 default {
427 break
428 }
429
430 }
431
432 set args [lrange $args 1 end]
433 }
434
435 set cmdp [_git_cmd [lindex $args 0]]
436 set args [lrange $args 1 end]
437
438 return [open [concat $opt $cmdp $args] w]
81347223
SP
439}
440
ed76cb70
SP
441proc githook_read {hook_name args} {
442 set pchook [gitdir hooks $hook_name]
443 lappend args 2>@1
444
445 # On Cygwin [file executable] might lie so we need to ask
446 # the shell if the hook is executable. Yes that's annoying.
447 #
448 if {[is_Cygwin]} {
449 upvar #0 _sh interp
450 if {![info exists interp]} {
451 set interp [_which sh]
452 }
453 if {$interp eq {}} {
454 error "hook execution requires sh (not in PATH)"
455 }
456
457 set scr {if test -x "$1";then exec "$@";fi}
458 set sh_c [list | $interp -c $scr $interp $pchook]
459 return [_open_stdout_stderr [concat $sh_c $args]]
460 }
461
462 if {[file executable $pchook]} {
463 return [_open_stdout_stderr [concat [list | $pchook] $args]]
464 }
465
466 return {}
467}
468
7eafa2f1
SP
469proc sq {value} {
470 regsub -all ' $value "'\\''" value
471 return "'$value'"
472}
473
d41b43eb
SP
474proc load_current_branch {} {
475 global current_branch is_detached
476
fc4e8da7 477 set fd [open [gitdir HEAD] r]
311e02a4 478 if {[gets $fd ref] < 1} {
fc4e8da7
SP
479 set ref {}
480 }
481 close $fd
311e02a4
SP
482
483 set pfx {ref: refs/heads/}
484 set len [string length $pfx]
485 if {[string equal -length $len $pfx $ref]} {
486 # We're on a branch. It might not exist. But
487 # HEAD looks good enough to be a branch.
488 #
d41b43eb
SP
489 set current_branch [string range $ref $len end]
490 set is_detached 0
311e02a4
SP
491 } else {
492 # Assume this is a detached head.
493 #
d41b43eb
SP
494 set current_branch HEAD
495 set is_detached 1
311e02a4 496 }
fc4e8da7
SP
497}
498
2739291b
SP
499auto_load tk_optionMenu
500rename tk_optionMenu real__tkOptionMenu
501proc tk_optionMenu {w varName args} {
502 set m [eval real__tkOptionMenu $w $varName $args]
503 $m configure -font font_ui
504 $w configure -font font_ui
505 return $m
506}
507
3849bfba
SP
508proc rmsel_tag {text} {
509 $text tag conf sel \
510 -background [$text cget -background] \
511 -foreground [$text cget -foreground] \
512 -borderwidth 0
513 $text tag conf in_sel -background lightgray
514 bind $text <Motion> break
515 return $text
516}
517
a4bee597
SP
518set root_exists 0
519bind . <Visibility> {
520 bind . <Visibility> {}
521 set root_exists 1
522}
523
1bdd8a15
SP
524if {[is_Windows]} {
525 wm iconbitmap . -default $oguilib/git-gui.ico
526}
527
a4bee597
SP
528######################################################################
529##
530## config defaults
531
532set cursor_ptr arrow
533font create font_diff -family Courier -size 10
534font create font_ui
535catch {
536 label .dummy
537 eval font configure font_ui [font actual [.dummy cget -font]]
538 destroy .dummy
539}
540
541font create font_uiitalic
542font create font_uibold
543font create font_diffbold
544font create font_diffitalic
545
546foreach class {Button Checkbutton Entry Label
547 Labelframe Listbox Menu Message
548 Radiobutton Spinbox Text} {
549 option add *$class.font font_ui
550}
551unset class
552
553if {[is_Windows] || [is_MacOSX]} {
554 option add *Menu.tearOff 0
555}
556
557if {[is_MacOSX]} {
558 set M1B M1
559 set M1T Cmd
560} else {
561 set M1B Control
562 set M1T Ctrl
563}
564
565proc bind_button3 {w cmd} {
566 bind $w <Any-Button-3> $cmd
567 if {[is_MacOSX]} {
568 # Mac OS X sends Button-2 on right click through three-button mouse,
569 # or through trackpad right-clicking (two-finger touch + click).
570 bind $w <Any-Button-2> $cmd
571 bind $w <Control-Button-1> $cmd
572 }
573}
574
575proc apply_config {} {
576 global repo_config font_descs
577
578 foreach option $font_descs {
579 set name [lindex $option 0]
580 set font [lindex $option 1]
581 if {[catch {
48b8d2b3 582 set need_weight 1
a4bee597 583 foreach {cn cv} $repo_config(gui.$name) {
48b8d2b3
SP
584 if {$cn eq {-weight}} {
585 set need_weight 0
586 }
587 font configure $font $cn $cv
588 }
589 if {$need_weight} {
590 font configure $font -weight normal
a4bee597
SP
591 }
592 } err]} {
593 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
594 }
595 foreach {cn cv} [font configure $font] {
596 font configure ${font}bold $cn $cv
597 font configure ${font}italic $cn $cv
598 }
599 font configure ${font}bold -weight bold
600 font configure ${font}italic -slant italic
601 }
602}
603
604set default_config(merge.diffstat) true
605set default_config(merge.summary) false
606set default_config(merge.verbosity) 2
607set default_config(user.name) {}
608set default_config(user.email) {}
609
610set default_config(gui.matchtrackingbranch) false
611set default_config(gui.pruneduringfetch) false
612set default_config(gui.trustmtime) false
613set default_config(gui.diffcontext) 5
11027d54 614set default_config(gui.commitmsgwidth) 75
a4bee597 615set default_config(gui.newbranchtemplate) {}
95b002ee 616set default_config(gui.spellingdictionary) {}
a4bee597
SP
617set default_config(gui.fontui) [font configure font_ui]
618set default_config(gui.fontdiff) [font configure font_diff]
619set font_descs {
620 {fontui font_ui {mc "Main Font"}}
621 {fontdiff font_diff {mc "Diff/Console Font"}}
622}
623
0b812616
SP
624######################################################################
625##
626## find git
627
628set _git [_which git]
629if {$_git eq {}} {
630 catch {wm withdraw .}
183a1d14
SP
631 tk_messageBox \
632 -icon error \
633 -type ok \
634 -title [mc "git-gui: fatal error"] \
635 -message [mc "Cannot find git in PATH."]
0b812616
SP
636 exit 1
637}
0b812616 638
54acdd95
SP
639######################################################################
640##
641## version check
642
d6967022 643if {[catch {set _git_version [git --version]} err]} {
54acdd95 644 catch {wm withdraw .}
875b7c93
SP
645 tk_messageBox \
646 -icon error \
647 -type ok \
c8c4854b 648 -title [mc "git-gui: fatal error"] \
875b7c93 649 -message "Cannot determine Git version:
54acdd95
SP
650
651$err
652
d6967022
SP
653[appname] requires Git 1.5.0 or later."
654 exit 1
655}
656if {![regsub {^git version } $_git_version {} _git_version]} {
657 catch {wm withdraw .}
875b7c93
SP
658 tk_messageBox \
659 -icon error \
660 -type ok \
c8c4854b 661 -title [mc "git-gui: fatal error"] \
31bb1d1b 662 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
54acdd95
SP
663 exit 1
664}
301dfaa9
SP
665
666set _real_git_version $_git_version
2c2a3782 667regsub -- {[\-\.]dirty$} $_git_version {} _git_version
d6967022
SP
668regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
669regsub {\.rc[0-9]+$} $_git_version {} _git_version
91464dfb 670regsub {\.GIT$} $_git_version {} _git_version
96f11953 671regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
d6967022 672
301dfaa9
SP
673if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
674 catch {wm withdraw .}
675 if {[tk_messageBox \
676 -icon warning \
677 -type yesno \
678 -default no \
679 -title "[appname]: warning" \
1ac17950 680 -message [mc "Git version cannot be determined.
301dfaa9 681
1ac17950 682%s claims it is version '%s'.
301dfaa9 683
1ac17950 684%s requires at least Git 1.5.0 or later.
301dfaa9 685
1ac17950
CS
686Assume '%s' is version 1.5.0?
687" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
301dfaa9
SP
688 set _git_version 1.5.0
689 } else {
690 exit 1
691 }
692}
693unset _real_git_version
694
d6967022
SP
695proc git-version {args} {
696 global _git_version
697
698 switch [llength $args] {
699 0 {
700 return $_git_version
54acdd95 701 }
d6967022
SP
702
703 2 {
704 set op [lindex $args 0]
705 set vr [lindex $args 1]
706 set cm [package vcompare $_git_version $vr]
707 return [expr $cm $op 0]
708 }
709
710 4 {
711 set type [lindex $args 0]
712 set name [lindex $args 1]
713 set parm [lindex $args 2]
714 set body [lindex $args 3]
715
716 if {($type ne {proc} && $type ne {method})} {
717 error "Invalid arguments to git-version"
718 }
719 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
720 error "Last arm of $type $name must be default"
721 }
722
723 foreach {op vr cb} [lrange $body 0 end-2] {
724 if {[git-version $op $vr]} {
725 return [uplevel [list $type $name $parm $cb]]
726 }
727 }
728
729 return [uplevel [list $type $name $parm [lindex $body end]]]
730 }
731
732 default {
733 error "git-version >= x"
734 }
735
736 }
737}
738
739if {[git-version < 1.5]} {
54acdd95 740 catch {wm withdraw .}
875b7c93
SP
741 tk_messageBox \
742 -icon error \
743 -type ok \
c8c4854b 744 -title [mc "git-gui: fatal error"] \
875b7c93 745 -message "[appname] requires Git 1.5.0 or later.
d6967022
SP
746
747You are using [git-version]:
748
749[git --version]"
54acdd95
SP
750 exit 1
751}
54acdd95 752
875b7c93
SP
753######################################################################
754##
755## configure our library
756
875b7c93
SP
757set idx [file join $oguilib tclIndex]
758if {[catch {set fd [open $idx r]} err]} {
759 catch {wm withdraw .}
760 tk_messageBox \
761 -icon error \
762 -type ok \
c8c4854b 763 -title [mc "git-gui: fatal error"] \
875b7c93
SP
764 -message $err
765 exit 1
766}
767if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
768 set idx [list]
769 while {[gets $fd n] >= 0} {
770 if {$n ne {} && ![string match #* $n]} {
771 lappend idx $n
772 }
773 }
774} else {
775 set idx {}
776}
777close $fd
778
779if {$idx ne {}} {
780 set loaded [list]
781 foreach p $idx {
782 if {[lsearch -exact $loaded $p] >= 0} continue
783 source [file join $oguilib $p]
784 lappend loaded $p
785 }
786 unset loaded p
787} else {
788 set auto_path [concat [list $oguilib] $auto_path]
789}
fc703c20 790unset -nocomplain idx fd
875b7c93 791
ba7cc660 792######################################################################
69f85ffa
SP
793##
794## config file parsing
795
f00d504a 796git-version proc _parse_config {arr_name args} {
85f7a94b
SP
797 >= 1.5.3 {
798 upvar $arr_name arr
799 array unset arr
800 set buf {}
801 catch {
a5bb31fb
SP
802 set fd_rc [eval \
803 [list git_read config] \
804 $args \
805 [list --null --list]]
85f7a94b
SP
806 fconfigure $fd_rc -translation binary
807 set buf [read $fd_rc]
808 close $fd_rc
809 }
810 foreach line [split $buf "\0"] {
811 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
812 if {[is_many_config $name]} {
813 lappend arr($name) $value
814 } else {
815 set arr($name) $value
816 }
817 }
818 }
819 }
f00d504a
SP
820 default {
821 upvar $arr_name arr
822 array unset arr
69f85ffa 823 catch {
f00d504a 824 set fd_rc [eval [list git_read config --list] $args]
69f85ffa
SP
825 while {[gets $fd_rc line] >= 0} {
826 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
827 if {[is_many_config $name]} {
f00d504a 828 lappend arr($name) $value
69f85ffa 829 } else {
f00d504a 830 set arr($name) $value
69f85ffa
SP
831 }
832 }
833 }
834 close $fd_rc
835 }
836 }
f00d504a 837}
69f85ffa 838
f00d504a
SP
839proc load_config {include_global} {
840 global repo_config global_config default_config
841
842 if {$include_global} {
843 _parse_config global_config --global
69f85ffa 844 }
f00d504a 845 _parse_config repo_config
69f85ffa
SP
846
847 foreach name [array names default_config] {
848 if {[catch {set v $global_config($name)}]} {
849 set global_config($name) $default_config($name)
850 }
851 if {[catch {set v $repo_config($name)}]} {
852 set repo_config($name) $default_config($name)
853 }
854 }
855}
856
857######################################################################
ba7cc660
SP
858##
859## feature option selection
860
0b2bc460 861if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
ba7cc660
SP
862 unset _junk
863} else {
864 set subcommand gui
865}
866if {$subcommand eq {gui.sh}} {
867 set subcommand gui
868}
869if {$subcommand eq {gui} && [llength $argv] > 0} {
870 set subcommand [lindex $argv 0]
871 set argv [lrange $argv 1 end]
872}
873
874enable_option multicommit
875enable_option branch
876enable_option transport
c52c9452 877disable_option bare
ba7cc660
SP
878
879switch -- $subcommand {
880browser -
881blame {
c52c9452
SP
882 enable_option bare
883
ba7cc660
SP
884 disable_option multicommit
885 disable_option branch
886 disable_option transport
887}
888citool {
889 enable_option singlecommit
890
891 disable_option multicommit
892 disable_option branch
893 disable_option transport
894}
895}
896
2d19516d
SP
897######################################################################
898##
899## repository setup
900
c6127856
SP
901if {[catch {
902 set _gitdir $env(GIT_DIR)
903 set _prefix {}
904 }]
905 && [catch {
906 set _gitdir [git rev-parse --git-dir]
907 set _prefix [git rev-parse --show-prefix]
908 } err]} {
ab08b363
SP
909 load_config 1
910 apply_config
911 choose_repository::pick
2d19516d 912}
20ddfcaa 913if {![file isdirectory $_gitdir] && [is_Cygwin]} {
2f7c9a7f 914 catch {set _gitdir [exec cygpath --windows $_gitdir]}
20ddfcaa 915}
c950c66e 916if {![file isdirectory $_gitdir]} {
dbccbbda 917 catch {wm withdraw .}
31bb1d1b 918 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
dbccbbda
SP
919 exit 1
920}
c80d25db
SP
921if {$_prefix ne {}} {
922 regsub -all {[^/]+/} $_prefix ../ cdup
923 if {[catch {cd $cdup} err]} {
924 catch {wm withdraw .}
31bb1d1b 925 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
c80d25db
SP
926 exit 1
927 }
928 unset cdup
929} elseif {![is_enabled bare]} {
c52c9452
SP
930 if {[lindex [file split $_gitdir] end] ne {.git}} {
931 catch {wm withdraw .}
31bb1d1b 932 error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
c52c9452
SP
933 exit 1
934 }
935 if {[catch {cd [file dirname $_gitdir]} err]} {
936 catch {wm withdraw .}
31bb1d1b 937 error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
c52c9452
SP
938 exit 1
939 }
dbccbbda 940}
c52c9452
SP
941set _reponame [file split [file normalize $_gitdir]]
942if {[lindex $_reponame end] eq {.git}} {
943 set _reponame [lindex $_reponame end-1]
944} else {
945 set _reponame [lindex $_reponame end]
2d19516d 946}
2d19516d 947
372ef954
SP
948######################################################################
949##
950## global init
951
952set current_diff_path {}
953set current_diff_side {}
954set diff_actions [list]
372ef954
SP
955
956set HEAD {}
957set PARENT {}
958set MERGE_HEAD [list]
959set commit_type {}
960set empty_tree {}
961set current_branch {}
d41b43eb 962set is_detached 0
372ef954 963set current_diff_path {}
9c9f5fa9 964set is_3way_diff 0
372ef954
SP
965set selected_commit_type new
966
cb07fc2a
SP
967######################################################################
968##
e210e674 969## task management
cb07fc2a 970
8f52548a 971set rescan_active 0
131f503b 972set diff_active 0
24263b77 973set last_clicked {}
131f503b 974
e210e674
SP
975set disable_on_lock [list]
976set index_lock_type none
977
978proc lock_index {type} {
979 global index_lock_type disable_on_lock
131f503b 980
043f7011 981 if {$index_lock_type eq {none}} {
e210e674
SP
982 set index_lock_type $type
983 foreach w $disable_on_lock {
984 uplevel #0 $w disabled
985 }
986 return 1
53716a7b 987 } elseif {$index_lock_type eq "begin-$type"} {
e210e674 988 set index_lock_type $type
131f503b
SP
989 return 1
990 }
991 return 0
992}
cb07fc2a 993
e210e674
SP
994proc unlock_index {} {
995 global index_lock_type disable_on_lock
996
997 set index_lock_type none
998 foreach w $disable_on_lock {
999 uplevel #0 $w normal
1000 }
1001}
1002
1003######################################################################
1004##
1005## status
1006
f18e40a1 1007proc repository_state {ctvar hdvar mhvar} {
c950c66e 1008 global current_branch
f18e40a1
SP
1009 upvar $ctvar ct $hdvar hd $mhvar mh
1010
1011 set mh [list]
ec6b424a 1012
d41b43eb 1013 load_current_branch
81347223 1014 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
4539eacd 1015 set hd {}
ec6b424a 1016 set ct initial
f18e40a1
SP
1017 return
1018 }
1019
c2758a17 1020 set merge_head [gitdir MERGE_HEAD]
f18e40a1 1021 if {[file exists $merge_head]} {
ec6b424a 1022 set ct merge
f18e40a1
SP
1023 set fd_mh [open $merge_head r]
1024 while {[gets $fd_mh line] >= 0} {
1025 lappend mh $line
1026 }
1027 close $fd_mh
1028 return
ec6b424a 1029 }
f18e40a1
SP
1030
1031 set ct normal
ec6b424a
SP
1032}
1033
4539eacd
SP
1034proc PARENT {} {
1035 global PARENT empty_tree
1036
f18e40a1
SP
1037 set p [lindex $PARENT 0]
1038 if {$p ne {}} {
1039 return $p
4539eacd
SP
1040 }
1041 if {$empty_tree eq {}} {
81347223 1042 set empty_tree [git mktree << {}]
4539eacd
SP
1043 }
1044 return $empty_tree
1045}
1046
46aaf90b 1047proc rescan {after {honor_trustmtime 1}} {
f18e40a1 1048 global HEAD PARENT MERGE_HEAD commit_type
699d5601 1049 global ui_index ui_workdir ui_comm
8f52548a 1050 global rescan_active file_states
cf25ddc8 1051 global repo_config
cb07fc2a 1052
8f52548a 1053 if {$rescan_active > 0 || ![lock_index read]} return
cb07fc2a 1054
f18e40a1 1055 repository_state newType newHEAD newMERGE_HEAD
4539eacd 1056 if {[string match amend* $commit_type]
f18e40a1
SP
1057 && $newType eq {normal}
1058 && $newHEAD eq $HEAD} {
e57ca85e 1059 } else {
f18e40a1
SP
1060 set HEAD $newHEAD
1061 set PARENT $newHEAD
1062 set MERGE_HEAD $newMERGE_HEAD
1063 set commit_type $newType
e57ca85e
SP
1064 }
1065
cb07fc2a 1066 array unset file_states
cb07fc2a 1067
1e0a92fd
SP
1068 if {!$::GITGUI_BCK_exists &&
1069 (![$ui_comm edit modified]
1070 || [string trim [$ui_comm get 0.0 end]] eq {})} {
b2f3bb1b
SP
1071 if {[string match amend* $commit_type]} {
1072 } elseif {[load_message GITGUI_MSG]} {
131f503b
SP
1073 } elseif {[load_message MERGE_MSG]} {
1074 } elseif {[load_message SQUASH_MSG]} {
1075 }
b2c6fcf1 1076 $ui_comm edit reset
21d7744f 1077 $ui_comm edit modified false
131f503b
SP
1078 }
1079
46aaf90b 1080 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
8f52548a 1081 rescan_stage2 {} $after
e534f3a8 1082 } else {
8f52548a 1083 set rescan_active 1
1ac17950 1084 ui_status [mc "Refreshing file status..."]
0b812616
SP
1085 set fd_rf [git_read update-index \
1086 -q \
1087 --unmerged \
1088 --ignore-missing \
1089 --refresh \
1090 ]
e534f3a8 1091 fconfigure $fd_rf -blocking 0 -translation binary
390adaea 1092 fileevent $fd_rf readable \
8f52548a 1093 [list rescan_stage2 $fd_rf $after]
e534f3a8 1094 }
131f503b
SP
1095}
1096
2fe167b6
SP
1097if {[is_Cygwin]} {
1098 set is_git_info_link {}
1099 set is_git_info_exclude {}
1100 proc have_info_exclude {} {
1101 global is_git_info_link is_git_info_exclude
1102
1103 if {$is_git_info_link eq {}} {
1104 set is_git_info_link [file isfile [gitdir info.lnk]]
1105 }
1106
1107 if {$is_git_info_link} {
1108 if {$is_git_info_exclude eq {}} {
1109 if {[catch {exec test -f [gitdir info exclude]}]} {
1110 set is_git_info_exclude 0
1111 } else {
1112 set is_git_info_exclude 1
1113 }
1114 }
1115 return $is_git_info_exclude
1116 } else {
1117 return [file readable [gitdir info exclude]]
1118 }
1119 }
1120} else {
1121 proc have_info_exclude {} {
1122 return [file readable [gitdir info exclude]]
1123 }
1124}
1125
8f52548a 1126proc rescan_stage2 {fd after} {
4539eacd 1127 global rescan_active buf_rdi buf_rdf buf_rlo
131f503b 1128
043f7011 1129 if {$fd ne {}} {
e534f3a8
SP
1130 read $fd
1131 if {![eof $fd]} return
1132 close $fd
1133 }
131f503b 1134
0b812616 1135 set ls_others [list --exclude-per-directory=.gitignore]
2fe167b6
SP
1136 if {[have_info_exclude]} {
1137 lappend ls_others "--exclude-from=[gitdir info exclude]"
cb07fc2a 1138 }
94a4dd9b
SP
1139 set user_exclude [get_config core.excludesfile]
1140 if {$user_exclude ne {} && [file readable $user_exclude]} {
1141 lappend ls_others "--exclude-from=$user_exclude"
1142 }
cb07fc2a 1143
868c8752
SP
1144 set buf_rdi {}
1145 set buf_rdf {}
1146 set buf_rlo {}
1147
8f52548a 1148 set rescan_active 3
1ac17950 1149 ui_status [mc "Scanning for modified files ..."]
0b812616
SP
1150 set fd_di [git_read diff-index --cached -z [PARENT]]
1151 set fd_df [git_read diff-files -z]
1152 set fd_lo [eval git_read ls-files --others -z $ls_others]
cb07fc2a 1153
51a989ba
SP
1154 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1155 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1156 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
8f52548a
SP
1157 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1158 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1159 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
cb07fc2a
SP
1160}
1161
131f503b 1162proc load_message {file} {
c950c66e 1163 global ui_comm
131f503b 1164
c2758a17 1165 set f [gitdir $file]
e57ca85e 1166 if {[file isfile $f]} {
131f503b
SP
1167 if {[catch {set fd [open $f r]}]} {
1168 return 0
1169 }
6eb420ef 1170 fconfigure $fd -eofchar {}
e57ca85e 1171 set content [string trim [read $fd]]
131f503b 1172 close $fd
4e55d19a 1173 regsub -all -line {[ \r\t]+$} $content {} content
131f503b
SP
1174 $ui_comm delete 0.0 end
1175 $ui_comm insert end $content
1176 return 1
1177 }
1178 return 0
1179}
1180
8f52548a 1181proc read_diff_index {fd after} {
cb07fc2a
SP
1182 global buf_rdi
1183
1184 append buf_rdi [read $fd]
868c8752
SP
1185 set c 0
1186 set n [string length $buf_rdi]
1187 while {$c < $n} {
1188 set z1 [string first "\0" $buf_rdi $c]
1189 if {$z1 == -1} break
1190 incr z1
1191 set z2 [string first "\0" $buf_rdi $z1]
1192 if {$z2 == -1} break
1193
868c8752 1194 incr c
86291555 1195 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
51a989ba 1196 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1461c5f3 1197 merge_state \
51a989ba 1198 [encoding convertfrom $p] \
86291555
SP
1199 [lindex $i 4]? \
1200 [list [lindex $i 0] [lindex $i 2]] \
1461c5f3
SP
1201 [list]
1202 set c $z2
86291555 1203 incr c
cb07fc2a 1204 }
868c8752
SP
1205 if {$c < $n} {
1206 set buf_rdi [string range $buf_rdi $c end]
1207 } else {
1208 set buf_rdi {}
1209 }
1210
8f52548a 1211 rescan_done $fd buf_rdi $after
cb07fc2a
SP
1212}
1213
8f52548a 1214proc read_diff_files {fd after} {
cb07fc2a
SP
1215 global buf_rdf
1216
1217 append buf_rdf [read $fd]
868c8752
SP
1218 set c 0
1219 set n [string length $buf_rdf]
1220 while {$c < $n} {
1221 set z1 [string first "\0" $buf_rdf $c]
1222 if {$z1 == -1} break
1223 incr z1
1224 set z2 [string first "\0" $buf_rdf $z1]
1225 if {$z2 == -1} break
1226
868c8752 1227 incr c
86291555 1228 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
51a989ba 1229 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1461c5f3 1230 merge_state \
51a989ba 1231 [encoding convertfrom $p] \
86291555 1232 ?[lindex $i 4] \
1461c5f3 1233 [list] \
86291555 1234 [list [lindex $i 0] [lindex $i 2]]
1461c5f3 1235 set c $z2
86291555 1236 incr c
868c8752
SP
1237 }
1238 if {$c < $n} {
1239 set buf_rdf [string range $buf_rdf $c end]
1240 } else {
1241 set buf_rdf {}
cb07fc2a 1242 }
868c8752 1243
8f52548a 1244 rescan_done $fd buf_rdf $after
cb07fc2a
SP
1245}
1246
8f52548a 1247proc read_ls_others {fd after} {
cb07fc2a
SP
1248 global buf_rlo
1249
1250 append buf_rlo [read $fd]
1251 set pck [split $buf_rlo "\0"]
1252 set buf_rlo [lindex $pck end]
1253 foreach p [lrange $pck 0 end-1] {
89384101
SP
1254 set p [encoding convertfrom $p]
1255 if {[string index $p end] eq {/}} {
1256 set p [string range $p 0 end-1]
1257 }
1258 merge_state $p ?O
cb07fc2a 1259 }
8f52548a 1260 rescan_done $fd buf_rlo $after
cb07fc2a
SP
1261}
1262
8f52548a 1263proc rescan_done {fd buf after} {
f522c9b5 1264 global rescan_active current_diff_path
f7f8d322 1265 global file_states repo_config
7f1df79b 1266 upvar $buf to_clear
cb07fc2a 1267
f7f8d322
SP
1268 if {![eof $fd]} return
1269 set to_clear {}
1270 close $fd
8f52548a 1271 if {[incr rescan_active -1] > 0} return
93f654df 1272
24263b77 1273 prune_selection
f7f8d322
SP
1274 unlock_index
1275 display_all_files
f522c9b5 1276 if {$current_diff_path ne {}} reshow_diff
8f52548a 1277 uplevel #0 $after
cb07fc2a
SP
1278}
1279
24263b77
SP
1280proc prune_selection {} {
1281 global file_states selected_paths
1282
1283 foreach path [array names selected_paths] {
1284 if {[catch {set still_here $file_states($path)}]} {
1285 unset selected_paths($path)
1286 }
1287 }
1288}
1289
cb07fc2a
SP
1290######################################################################
1291##
f522c9b5 1292## ui helpers
cb07fc2a 1293
f522c9b5
SP
1294proc mapicon {w state path} {
1295 global all_icons
1296
1297 if {[catch {set r $all_icons($state$w)}]} {
1298 puts "error: no icon for $w state={$state} $path"
1299 return file_plain
1300 }
1301 return $r
1302}
cb07fc2a 1303
f522c9b5
SP
1304proc mapdesc {state path} {
1305 global all_descs
03e4ec53 1306
f522c9b5
SP
1307 if {[catch {set r $all_descs($state)}]} {
1308 puts "error: no desc for state={$state} $path"
1309 return $state
1310 }
1311 return $r
1312}
03e4ec53 1313
699d5601 1314proc ui_status {msg} {
906ab7f6
SP
1315 global main_status
1316 if {[info exists main_status]} {
1317 $main_status show $msg
1318 }
699d5601
SP
1319}
1320
1321proc ui_ready {{test {}}} {
906ab7f6
SP
1322 global main_status
1323 if {[info exists main_status]} {
1324 $main_status show [mc "Ready."] $test
1325 }
699d5601
SP
1326}
1327
f522c9b5
SP
1328proc escape_path {path} {
1329 regsub -all {\\} $path "\\\\" path
1330 regsub -all "\n" $path "\\n" path
1331 return $path
cb07fc2a
SP
1332}
1333
f522c9b5
SP
1334proc short_path {path} {
1335 return [escape_path [lindex [file split $path] end]]
7f1df79b
SP
1336}
1337
f522c9b5
SP
1338set next_icon_id 0
1339set null_sha1 [string repeat 0 40]
16403d0b 1340
f522c9b5
SP
1341proc merge_state {path new_state {head_info {}} {index_info {}}} {
1342 global file_states next_icon_id null_sha1
16403d0b 1343
f522c9b5
SP
1344 set s0 [string index $new_state 0]
1345 set s1 [string index $new_state 1]
16403d0b 1346
f522c9b5
SP
1347 if {[catch {set info $file_states($path)}]} {
1348 set state __
1349 set icon n[incr next_icon_id]
1350 } else {
1351 set state [lindex $info 0]
1352 set icon [lindex $info 1]
1353 if {$head_info eq {}} {set head_info [lindex $info 2]}
1354 if {$index_info eq {}} {set index_info [lindex $info 3]}
1355 }
16403d0b 1356
f522c9b5
SP
1357 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1358 elseif {$s0 eq {_}} {set s0 _}
124355d3 1359
f522c9b5
SP
1360 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1361 elseif {$s1 eq {_}} {set s1 _}
16403d0b 1362
f522c9b5
SP
1363 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1364 set head_info [list 0 $null_sha1]
1365 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1366 && $head_info eq {}} {
1367 set head_info $index_info
1368 }
16403d0b 1369
f522c9b5
SP
1370 set file_states($path) [list $s0$s1 $icon \
1371 $head_info $index_info \
1372 ]
1373 return $state
1374}
cb07fc2a 1375
f522c9b5
SP
1376proc display_file_helper {w path icon_name old_m new_m} {
1377 global file_lists
cb07fc2a 1378
f522c9b5 1379 if {$new_m eq {_}} {
156b2921 1380 set lno [lsearch -sorted -exact $file_lists($w) $path]
5f8b70b1 1381 if {$lno >= 0} {
f522c9b5 1382 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
5f8b70b1 1383 incr lno
f522c9b5
SP
1384 $w conf -state normal
1385 $w delete $lno.0 [expr {$lno + 1}].0
1386 $w conf -state disabled
03e4ec53 1387 }
f522c9b5
SP
1388 } elseif {$old_m eq {_} && $new_m ne {_}} {
1389 lappend file_lists($w) $path
1390 set file_lists($w) [lsort -unique $file_lists($w)]
1391 set lno [lsearch -sorted -exact $file_lists($w) $path]
1392 incr lno
1393 $w conf -state normal
1394 $w image create $lno.0 \
1395 -align center -padx 5 -pady 1 \
1396 -name $icon_name \
1397 -image [mapicon $w $new_m $path]
1398 $w insert $lno.1 "[escape_path $path]\n"
1399 $w conf -state disabled
1400 } elseif {$old_m ne $new_m} {
1401 $w conf -state normal
1402 $w image conf $icon_name -image [mapicon $w $new_m $path]
1403 $w conf -state disabled
03e4ec53 1404 }
f522c9b5
SP
1405}
1406
1407proc display_file {path state} {
1408 global file_states selected_paths
1409 global ui_index ui_workdir
03e4ec53 1410
f522c9b5 1411 set old_m [merge_state $path $state]
cb07fc2a 1412 set s $file_states($path)
f522c9b5
SP
1413 set new_m [lindex $s 0]
1414 set icon_name [lindex $s 1]
82cb8706 1415
f522c9b5
SP
1416 set o [string index $old_m 0]
1417 set n [string index $new_m 0]
1418 if {$o eq {U}} {
1419 set o _
1420 }
1421 if {$n eq {U}} {
1422 set n _
cb07fc2a 1423 }
f522c9b5 1424 display_file_helper $ui_index $path $icon_name $o $n
cb07fc2a 1425
f522c9b5
SP
1426 if {[string index $old_m 0] eq {U}} {
1427 set o U
1428 } else {
1429 set o [string index $old_m 1]
82cb8706 1430 }
f522c9b5
SP
1431 if {[string index $new_m 0] eq {U}} {
1432 set n U
1433 } else {
1434 set n [string index $new_m 1]
82cb8706 1435 }
f522c9b5
SP
1436 display_file_helper $ui_workdir $path $icon_name $o $n
1437
1438 if {$new_m eq {__}} {
1439 unset file_states($path)
1440 catch {unset selected_paths($path)}
cb07fc2a 1441 }
f522c9b5 1442}
cb07fc2a 1443
f522c9b5
SP
1444proc display_all_files_helper {w path icon_name m} {
1445 global file_lists
1446
1447 lappend file_lists($w) $path
1448 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1449 $w image create end \
1450 -align center -padx 5 -pady 1 \
1451 -name $icon_name \
1452 -image [mapicon $w $m $path]
1453 $w insert end "[escape_path $path]\n"
cb07fc2a
SP
1454}
1455
f522c9b5
SP
1456proc display_all_files {} {
1457 global ui_index ui_workdir
1458 global file_states file_lists
1459 global last_clicked
cb07fc2a 1460
f522c9b5
SP
1461 $ui_index conf -state normal
1462 $ui_workdir conf -state normal
cb07fc2a 1463
f522c9b5
SP
1464 $ui_index delete 0.0 end
1465 $ui_workdir delete 0.0 end
1466 set last_clicked {}
cb07fc2a 1467
f522c9b5
SP
1468 set file_lists($ui_index) [list]
1469 set file_lists($ui_workdir) [list]
16403d0b 1470
f522c9b5
SP
1471 foreach path [lsort [array names file_states]] {
1472 set s $file_states($path)
1473 set m [lindex $s 0]
1474 set icon_name [lindex $s 1]
1475
1476 set s [string index $m 0]
1477 if {$s ne {U} && $s ne {_}} {
1478 display_all_files_helper $ui_index $path \
1479 $icon_name $s
16403d0b 1480 }
cb07fc2a 1481
f522c9b5
SP
1482 if {[string index $m 0] eq {U}} {
1483 set s U
1484 } else {
1485 set s [string index $m 1]
a25c5189 1486 }
f522c9b5
SP
1487 if {$s ne {_}} {
1488 display_all_files_helper $ui_workdir $path \
1489 $icon_name $s
a25c5189
SP
1490 }
1491 }
1492
f522c9b5
SP
1493 $ui_index conf -state disabled
1494 $ui_workdir conf -state disabled
a25c5189
SP
1495}
1496
ec6b424a
SP
1497######################################################################
1498##
f522c9b5 1499## icons
ec6b424a 1500
f522c9b5
SP
1501set filemask {
1502#define mask_width 14
1503#define mask_height 15
1504static unsigned char mask_bits[] = {
1505 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1506 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1507 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1508}
cb07fc2a
SP
1509
1510image create bitmap file_plain -background white -foreground black -data {
1511#define plain_width 14
1512#define plain_height 15
1513static unsigned char plain_bits[] = {
1514 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1515 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1516 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1517} -maskdata $filemask
1518
1519image create bitmap file_mod -background white -foreground blue -data {
1520#define mod_width 14
1521#define mod_height 15
1522static unsigned char mod_bits[] = {
1523 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1524 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1525 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1526} -maskdata $filemask
1527
131f503b
SP
1528image create bitmap file_fulltick -background white -foreground "#007000" -data {
1529#define file_fulltick_width 14
1530#define file_fulltick_height 15
1531static unsigned char file_fulltick_bits[] = {
cb07fc2a
SP
1532 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1533 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1534 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1535} -maskdata $filemask
1536
1537image create bitmap file_parttick -background white -foreground "#005050" -data {
1538#define parttick_width 14
1539#define parttick_height 15
1540static unsigned char parttick_bits[] = {
1541 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1542 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1543 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1544} -maskdata $filemask
1545
1546image create bitmap file_question -background white -foreground black -data {
1547#define file_question_width 14
1548#define file_question_height 15
1549static unsigned char file_question_bits[] = {
1550 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1551 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1552 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1553} -maskdata $filemask
1554
1555image create bitmap file_removed -background white -foreground red -data {
1556#define file_removed_width 14
1557#define file_removed_height 15
1558static unsigned char file_removed_bits[] = {
1559 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1560 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1561 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1562} -maskdata $filemask
1563
1564image create bitmap file_merge -background white -foreground blue -data {
1565#define file_merge_width 14
1566#define file_merge_height 15
1567static unsigned char file_merge_bits[] = {
1568 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1569 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1570 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1571} -maskdata $filemask
1572
6b292675 1573set ui_index .vpane.files.index.list
0812665e 1574set ui_workdir .vpane.files.workdir.list
21e409ad
SP
1575
1576set all_icons(_$ui_index) file_plain
1577set all_icons(A$ui_index) file_fulltick
1578set all_icons(M$ui_index) file_fulltick
1579set all_icons(D$ui_index) file_removed
1580set all_icons(U$ui_index) file_merge
1581
1582set all_icons(_$ui_workdir) file_plain
1583set all_icons(M$ui_workdir) file_mod
1584set all_icons(D$ui_workdir) file_question
3b4db3c1 1585set all_icons(U$ui_workdir) file_merge
21e409ad
SP
1586set all_icons(O$ui_workdir) file_plain
1587
131f503b 1588set max_status_desc 0
cb07fc2a 1589foreach i {
1ac17950
CS
1590 {__ {mc "Unmodified"}}
1591
1592 {_M {mc "Modified, not staged"}}
1593 {M_ {mc "Staged for commit"}}
1594 {MM {mc "Portions staged for commit"}}
1595 {MD {mc "Staged for commit, missing"}}
1596
1597 {_O {mc "Untracked, not staged"}}
1598 {A_ {mc "Staged for commit"}}
1599 {AM {mc "Portions staged for commit"}}
1600 {AD {mc "Staged for commit, missing"}}
1601
1602 {_D {mc "Missing"}}
1603 {D_ {mc "Staged for removal"}}
1604 {DO {mc "Staged for removal, still present"}}
1605
1606 {U_ {mc "Requires merge resolution"}}
1607 {UU {mc "Requires merge resolution"}}
1608 {UM {mc "Requires merge resolution"}}
1609 {UD {mc "Requires merge resolution"}}
cb07fc2a 1610 } {
1ac17950
CS
1611 set text [eval [lindex $i 1]]
1612 if {$max_status_desc < [string length $text]} {
1613 set max_status_desc [string length $text]
131f503b 1614 }
1ac17950 1615 set all_descs([lindex $i 0]) $text
cb07fc2a 1616}
21e409ad 1617unset i
cb07fc2a
SP
1618
1619######################################################################
1620##
1621## util
1622
35874c16
SP
1623proc scrollbar2many {list mode args} {
1624 foreach w $list {eval $w $mode $args}
1625}
1626
1627proc many2scrollbar {list mode sb top bottom} {
1628 $sb set $top $bottom
1629 foreach w $list {$w $mode moveto $top}
1630}
1631
b4946930
SP
1632proc incr_font_size {font {amt 1}} {
1633 set sz [font configure $font -size]
1634 incr sz $amt
1635 font configure $font -size $sz
1636 font configure ${font}bold -size $sz
debcd0fd 1637 font configure ${font}italic -size $sz
b4946930
SP
1638}
1639
cb07fc2a
SP
1640######################################################################
1641##
1642## ui commands
1643
1ac17950 1644set starting_gitk_msg [mc "Starting gitk... please wait..."]
cc4b1c02 1645
d0752429 1646proc do_gitk {revs} {
20ddfcaa
SP
1647 # -- Always start gitk through whatever we were loaded with. This
1648 # lets us bypass using shell process on Windows systems.
1649 #
02efd48f
SP
1650 set exe [file join [file dirname $::_git] gitk]
1651 set cmd [list [info nameofexecutable] $exe]
7aecb128 1652 if {! [file exists $exe]} {
1ac17950 1653 error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
cb07fc2a 1654 } else {
501e4c6f
SP
1655 global env
1656
1657 if {[info exists env(GIT_DIR)]} {
1658 set old_GIT_DIR $env(GIT_DIR)
1659 } else {
1660 set old_GIT_DIR {}
1661 }
1662
1663 set pwd [pwd]
1664 cd [file dirname [gitdir]]
1665 set env(GIT_DIR) [file tail [gitdir]]
1666
02efd48f 1667 eval exec $cmd $revs &
501e4c6f
SP
1668
1669 if {$old_GIT_DIR eq {}} {
1670 unset env(GIT_DIR)
1671 } else {
1672 set env(GIT_DIR) $old_GIT_DIR
1673 }
1674 cd $pwd
1675
02efd48f 1676 ui_status $::starting_gitk_msg
d0752429 1677 after 10000 {
699d5601 1678 ui_ready $starting_gitk_msg
d0752429 1679 }
cb07fc2a
SP
1680 }
1681}
1682
b5834d70 1683set is_quitting 0
c4fe7728 1684
cb07fc2a 1685proc do_quit {} {
c950c66e 1686 global ui_comm is_quitting repo_config commit_type
4578c5cb 1687 global GITGUI_BCK_exists GITGUI_BCK_i
95b002ee 1688 global ui_comm_spell
c4fe7728 1689
b5834d70
SP
1690 if {$is_quitting} return
1691 set is_quitting 1
131f503b 1692
db7f34d4
SP
1693 if {[winfo exists $ui_comm]} {
1694 # -- Stash our current commit buffer.
1695 #
1696 set save [gitdir GITGUI_MSG]
4578c5cb
SP
1697 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1698 file rename -force [gitdir GITGUI_BCK] $save
1699 set GITGUI_BCK_exists 0
db7f34d4 1700 } else {
4578c5cb
SP
1701 set msg [string trim [$ui_comm get 0.0 end]]
1702 regsub -all -line {[ \r\t]+$} $msg {} msg
1703 if {(![string match amend* $commit_type]
1704 || [$ui_comm edit modified])
1705 && $msg ne {}} {
1706 catch {
1707 set fd [open $save w]
1708 puts -nonewline $fd $msg
1709 close $fd
1710 }
1711 } else {
1712 catch {file delete $save}
1713 }
1714 }
1715
95b002ee
SP
1716 # -- Cancel our spellchecker if its running.
1717 #
1718 if {[info exists ui_comm_spell]} {
1719 $ui_comm_spell stop
1720 }
1721
4578c5cb
SP
1722 # -- Remove our editor backup, its not needed.
1723 #
1724 after cancel $GITGUI_BCK_i
1725 if {$GITGUI_BCK_exists} {
1726 catch {file delete [gitdir GITGUI_BCK]}
131f503b 1727 }
131f503b 1728
db7f34d4
SP
1729 # -- Stash our current window geometry into this repository.
1730 #
1731 set cfg_geometry [list]
1732 lappend cfg_geometry [wm geometry .]
a0592d3f
JS
1733 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
1734 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
db7f34d4
SP
1735 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1736 set rc_geometry {}
1737 }
1738 if {$cfg_geometry ne $rc_geometry} {
81347223 1739 catch {git config gui.geometry $cfg_geometry}
db7f34d4 1740 }
51f4d16b
SP
1741 }
1742
cb07fc2a
SP
1743 destroy .
1744}
1745
1746proc do_rescan {} {
699d5601 1747 rescan ui_ready
cb07fc2a
SP
1748}
1749
6e27d826 1750proc do_commit {} {
ec6b424a 1751 commit_tree
6e27d826
SP
1752}
1753
24263b77 1754proc toggle_or_diff {w x y} {
20a53c02 1755 global file_states file_lists current_diff_path ui_index ui_workdir
24263b77 1756 global last_clicked selected_paths
131f503b 1757
cb07fc2a
SP
1758 set pos [split [$w index @$x,$y] .]
1759 set lno [lindex $pos 0]
1760 set col [lindex $pos 1]
24263b77
SP
1761 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1762 if {$path eq {}} {
1763 set last_clicked {}
1764 return
1765 }
1766
1767 set last_clicked [list $w $lno]
1768 array unset selected_paths
1769 $ui_index tag remove in_sel 0.0 end
0812665e 1770 $ui_workdir tag remove in_sel 0.0 end
cb07fc2a 1771
24263b77 1772 if {$col == 0} {
20a53c02 1773 if {$current_diff_path eq $path} {
32e0bcab
SP
1774 set after {reshow_diff;}
1775 } else {
1776 set after {}
1777 }
de5f6d5d 1778 if {$w eq $ui_index} {
74d18d2e 1779 update_indexinfo \
93e912c5 1780 "Unstaging [short_path $path] from commit" \
74d18d2e 1781 [list $path] \
699d5601 1782 [concat $after [list ui_ready]]
de5f6d5d 1783 } elseif {$w eq $ui_workdir} {
74d18d2e 1784 update_index \
4d583c86 1785 "Adding [short_path $path]" \
74d18d2e 1786 [list $path] \
699d5601 1787 [concat $after [list ui_ready]]
74d18d2e 1788 }
24263b77 1789 } else {
03e4ec53 1790 show_diff $path $w $lno
cb07fc2a
SP
1791 }
1792}
1793
24263b77 1794proc add_one_to_selection {w x y} {
833eda73 1795 global file_lists last_clicked selected_paths
7f1df79b 1796
833eda73 1797 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
1798 set path [lindex $file_lists($w) [expr {$lno - 1}]]
1799 if {$path eq {}} {
1800 set last_clicked {}
1801 return
1802 }
cb07fc2a 1803
833eda73
SP
1804 if {$last_clicked ne {}
1805 && [lindex $last_clicked 0] ne $w} {
1806 array unset selected_paths
1807 [lindex $last_clicked 0] tag remove in_sel 0.0 end
1808 }
1809
24263b77
SP
1810 set last_clicked [list $w $lno]
1811 if {[catch {set in_sel $selected_paths($path)}]} {
1812 set in_sel 0
1813 }
1814 if {$in_sel} {
1815 unset selected_paths($path)
1816 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
1817 } else {
1818 set selected_paths($path) 1
1819 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1820 }
1821}
1822
1823proc add_range_to_selection {w x y} {
833eda73 1824 global file_lists last_clicked selected_paths
24263b77
SP
1825
1826 if {[lindex $last_clicked 0] ne $w} {
1827 toggle_or_diff $w $x $y
1828 return
cb07fc2a 1829 }
24263b77 1830
833eda73 1831 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
1832 set lc [lindex $last_clicked 1]
1833 if {$lc < $lno} {
1834 set begin $lc
1835 set end $lno
1836 } else {
1837 set begin $lno
1838 set end $lc
1839 }
1840
1841 foreach path [lrange $file_lists($w) \
1842 [expr {$begin - 1}] \
1843 [expr {$end - 1}]] {
1844 set selected_paths($path) 1
1845 }
1846 $w tag add in_sel $begin.0 [expr {$end + 1}].0
cb07fc2a
SP
1847}
1848
c91ee2bd
JS
1849proc show_more_context {} {
1850 global repo_config
1851 if {$repo_config(gui.diffcontext) < 99} {
1852 incr repo_config(gui.diffcontext)
1853 reshow_diff
1854 }
1855}
1856
1857proc show_less_context {} {
1858 global repo_config
1859 if {$repo_config(gui.diffcontext) >= 1} {
1860 incr repo_config(gui.diffcontext) -1
1861 reshow_diff
1862 }
1863}
1864
cb07fc2a
SP
1865######################################################################
1866##
a4bee597 1867## ui construction
db453781 1868
6bbd1cb9 1869load_config 0
92148d80 1870apply_config
2ebba528
SP
1871set ui_comm {}
1872
cb07fc2a 1873# -- Menu Bar
a49c67d1 1874#
b4946930 1875menu .mbar -tearoff 0
1ac17950
CS
1876.mbar add cascade -label [mc Repository] -menu .mbar.repository
1877.mbar add cascade -label [mc Edit] -menu .mbar.edit
64a906f8 1878if {[is_enabled branch]} {
1ac17950 1879 .mbar add cascade -label [mc Branch] -menu .mbar.branch
700a65ce 1880}
2ebba528 1881if {[is_enabled multicommit] || [is_enabled singlecommit]} {
a9813cb5 1882 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2ebba528 1883}
64a906f8 1884if {[is_enabled transport]} {
1ac17950 1885 .mbar add cascade -label [mc Merge] -menu .mbar.merge
6bdf5e5f 1886 .mbar add cascade -label [mc Remote] -menu .mbar.remote
4ccdab02 1887}
cb07fc2a
SP
1888. configure -menu .mbar
1889
a4abfa62 1890# -- Repository Menu
a49c67d1 1891#
a4abfa62 1892menu .mbar.repository
35874c16
SP
1893
1894.mbar.repository add command \
1ac17950 1895 -label [mc "Browse Current Branch's Files"] \
c74b6c66 1896 -command {browser::new $current_branch}
a8139888 1897set ui_browse_current [.mbar.repository index last]
8e891fac 1898.mbar.repository add command \
1ac17950 1899 -label [mc "Browse Branch Files..."] \
8e891fac 1900 -command browser_open::dialog
35874c16
SP
1901.mbar.repository add separator
1902
d0752429 1903.mbar.repository add command \
1ac17950 1904 -label [mc "Visualize Current Branch's History"] \
7416bbc6 1905 -command {do_gitk $current_branch}
a8139888 1906set ui_visualize_current [.mbar.repository index last]
5753ef1a 1907.mbar.repository add command \
1ac17950 1908 -label [mc "Visualize All Branch History"] \
7416bbc6 1909 -command {do_gitk --all}
d0752429 1910.mbar.repository add separator
75e355d6 1911
a8139888
SP
1912proc current_branch_write {args} {
1913 global current_branch
1914 .mbar.repository entryconf $::ui_browse_current \
1ac17950 1915 -label [mc "Browse %s's Files" $current_branch]
a8139888 1916 .mbar.repository entryconf $::ui_visualize_current \
1ac17950 1917 -label [mc "Visualize %s's History" $current_branch]
a8139888
SP
1918}
1919trace add variable current_branch write current_branch_write
1920
cf25ddc8 1921if {[is_enabled multicommit]} {
1ac17950 1922 .mbar.repository add command -label [mc "Database Statistics"] \
7416bbc6 1923 -command do_stats
0fd49d0a 1924
1ac17950 1925 .mbar.repository add command -label [mc "Compress Database"] \
7416bbc6 1926 -command do_gc
4aca740b 1927
1ac17950 1928 .mbar.repository add command -label [mc "Verify Database"] \
7416bbc6 1929 -command do_fsck_objects
444f92d0 1930
a4abfa62 1931 .mbar.repository add separator
75e355d6 1932
20ddfcaa
SP
1933 if {[is_Cygwin]} {
1934 .mbar.repository add command \
1ac17950 1935 -label [mc "Create Desktop Icon"] \
7416bbc6 1936 -command do_cygwin_shortcut
20ddfcaa 1937 } elseif {[is_Windows]} {
a4abfa62 1938 .mbar.repository add command \
1ac17950 1939 -label [mc "Create Desktop Icon"] \
7416bbc6 1940 -command do_windows_shortcut
06c31115 1941 } elseif {[is_MacOSX]} {
a4abfa62 1942 .mbar.repository add command \
1ac17950 1943 -label [mc "Create Desktop Icon"] \
7416bbc6 1944 -command do_macosx_app
4aca740b 1945 }
4ccdab02 1946}
85ab313e 1947
1ac17950 1948.mbar.repository add command -label [mc Quit] \
cb07fc2a 1949 -command do_quit \
7416bbc6 1950 -accelerator $M1T-Q
cb07fc2a 1951
9861671d
SP
1952# -- Edit Menu
1953#
1954menu .mbar.edit
1ac17950 1955.mbar.edit add command -label [mc Undo] \
9861671d 1956 -command {catch {[focus] edit undo}} \
7416bbc6 1957 -accelerator $M1T-Z
1ac17950 1958.mbar.edit add command -label [mc Redo] \
9861671d 1959 -command {catch {[focus] edit redo}} \
7416bbc6 1960 -accelerator $M1T-Y
9861671d 1961.mbar.edit add separator
1ac17950 1962.mbar.edit add command -label [mc Cut] \
9861671d 1963 -command {catch {tk_textCut [focus]}} \
7416bbc6 1964 -accelerator $M1T-X
1ac17950 1965.mbar.edit add command -label [mc Copy] \
9861671d 1966 -command {catch {tk_textCopy [focus]}} \
7416bbc6 1967 -accelerator $M1T-C
1ac17950 1968.mbar.edit add command -label [mc Paste] \
9861671d 1969 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
7416bbc6 1970 -accelerator $M1T-V
1ac17950 1971.mbar.edit add command -label [mc Delete] \
9861671d 1972 -command {catch {[focus] delete sel.first sel.last}} \
7416bbc6 1973 -accelerator Del
9861671d 1974.mbar.edit add separator
1ac17950 1975.mbar.edit add command -label [mc "Select All"] \
9861671d 1976 -command {catch {[focus] tag add sel 0.0 end}} \
7416bbc6 1977 -accelerator $M1T-A
9861671d 1978
85ab313e
SP
1979# -- Branch Menu
1980#
64a906f8 1981if {[is_enabled branch]} {
700a65ce
SP
1982 menu .mbar.branch
1983
1ac17950 1984 .mbar.branch add command -label [mc "Create..."] \
b1fa2bff 1985 -command branch_create::dialog \
7416bbc6 1986 -accelerator $M1T-N
700a65ce
SP
1987 lappend disable_on_lock [list .mbar.branch entryconf \
1988 [.mbar.branch index last] -state]
1989
1ac17950 1990 .mbar.branch add command -label [mc "Checkout..."] \
d41b43eb
SP
1991 -command branch_checkout::dialog \
1992 -accelerator $M1T-O
1993 lappend disable_on_lock [list .mbar.branch entryconf \
1994 [.mbar.branch index last] -state]
1995
1ac17950 1996 .mbar.branch add command -label [mc "Rename..."] \
61f82ce7
SP
1997 -command branch_rename::dialog
1998 lappend disable_on_lock [list .mbar.branch entryconf \
1999 [.mbar.branch index last] -state]
2000
1ac17950 2001 .mbar.branch add command -label [mc "Delete..."] \
3206c63d 2002 -command branch_delete::dialog
700a65ce
SP
2003 lappend disable_on_lock [list .mbar.branch entryconf \
2004 [.mbar.branch index last] -state]
fd234dfd 2005
1ac17950 2006 .mbar.branch add command -label [mc "Reset..."] \
a6c9b081 2007 -command merge::reset_hard
fd234dfd
SP
2008 lappend disable_on_lock [list .mbar.branch entryconf \
2009 [.mbar.branch index last] -state]
700a65ce
SP
2010}
2011
cb07fc2a 2012# -- Commit Menu
a49c67d1 2013#
2ebba528
SP
2014if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2015 menu .mbar.commit
2016
2017 .mbar.commit add radiobutton \
1ac17950 2018 -label [mc "New Commit"] \
2ebba528
SP
2019 -command do_select_commit_type \
2020 -variable selected_commit_type \
7416bbc6 2021 -value new
2ebba528
SP
2022 lappend disable_on_lock \
2023 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2024
2ebba528 2025 .mbar.commit add radiobutton \
1ac17950 2026 -label [mc "Amend Last Commit"] \
2ebba528
SP
2027 -command do_select_commit_type \
2028 -variable selected_commit_type \
7416bbc6 2029 -value amend
2ebba528
SP
2030 lappend disable_on_lock \
2031 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2032
2ebba528 2033 .mbar.commit add separator
24ac9b75 2034
1ac17950 2035 .mbar.commit add command -label [mc Rescan] \
2ebba528 2036 -command do_rescan \
7416bbc6 2037 -accelerator F5
2ebba528
SP
2038 lappend disable_on_lock \
2039 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2040
1ac17950 2041 .mbar.commit add command -label [mc "Stage To Commit"] \
cd16a6c9
SP
2042 -command do_add_selection \
2043 -accelerator $M1T-T
2ebba528
SP
2044 lappend disable_on_lock \
2045 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2046
1ac17950 2047 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2ebba528 2048 -command do_add_all \
7416bbc6 2049 -accelerator $M1T-I
2ebba528
SP
2050 lappend disable_on_lock \
2051 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2052
1ac17950 2053 .mbar.commit add command -label [mc "Unstage From Commit"] \
7416bbc6 2054 -command do_unstage_selection
2ebba528
SP
2055 lappend disable_on_lock \
2056 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2057
1ac17950 2058 .mbar.commit add command -label [mc "Revert Changes"] \
7416bbc6 2059 -command do_revert_selection
2ebba528
SP
2060 lappend disable_on_lock \
2061 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2062
2ebba528 2063 .mbar.commit add separator
1461c5f3 2064
c91ee2bd
JS
2065 .mbar.commit add command -label [mc "Show Less Context"] \
2066 -command show_less_context \
2067 -accelerator $M1T-\[
2068
2069 .mbar.commit add command -label [mc "Show More Context"] \
2070 -command show_more_context \
2071 -accelerator $M1T-\]
2072
2073 .mbar.commit add separator
2074
1ac17950 2075 .mbar.commit add command -label [mc "Sign Off"] \
2ebba528 2076 -command do_signoff \
7416bbc6 2077 -accelerator $M1T-S
24ac9b75 2078
a9813cb5 2079 .mbar.commit add command -label [mc Commit@@verb] \
2ebba528 2080 -command do_commit \
7416bbc6 2081 -accelerator $M1T-Return
2ebba528
SP
2082 lappend disable_on_lock \
2083 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2084}
cb07fc2a 2085
9b28a8b9
SP
2086# -- Merge Menu
2087#
2088if {[is_enabled branch]} {
2089 menu .mbar.merge
1ac17950 2090 .mbar.merge add command -label [mc "Local Merge..."] \
a870ddc0
SP
2091 -command merge::dialog \
2092 -accelerator $M1T-M
9b28a8b9
SP
2093 lappend disable_on_lock \
2094 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1ac17950 2095 .mbar.merge add command -label [mc "Abort Merge..."] \
a6c9b081 2096 -command merge::reset_hard
9b28a8b9
SP
2097 lappend disable_on_lock \
2098 [list .mbar.merge entryconf [.mbar.merge index last] -state]
9b28a8b9
SP
2099}
2100
2101# -- Transport Menu
2102#
2103if {[is_enabled transport]} {
6bdf5e5f 2104 menu .mbar.remote
9b28a8b9 2105
6bdf5e5f
SP
2106 .mbar.remote add command \
2107 -label [mc "Push..."] \
840bcfa7
SP
2108 -command do_push_anywhere \
2109 -accelerator $M1T-P
6bdf5e5f
SP
2110 .mbar.remote add command \
2111 -label [mc "Delete..."] \
aa252f19 2112 -command remote_branch_delete::dialog
9b28a8b9
SP
2113}
2114
0c8d7839
SP
2115if {[is_MacOSX]} {
2116 # -- Apple Menu (Mac OS X only)
2117 #
442b3caa 2118 .mbar add cascade -label Apple -menu .mbar.apple
0c8d7839
SP
2119 menu .mbar.apple
2120
1ac17950 2121 .mbar.apple add command -label [mc "About %s" [appname]] \
7416bbc6 2122 -command do_about
13824e2d
SP
2123 .mbar.apple add separator
2124 .mbar.apple add command \
2125 -label [mc "Preferences..."] \
2126 -command do_options \
2127 -accelerator $M1T-,
2128 bind . <$M1B-,> do_options
0c8d7839
SP
2129} else {
2130 # -- Edit Menu
2131 #
2132 .mbar.edit add separator
1ac17950 2133 .mbar.edit add command -label [mc "Options..."] \
7416bbc6 2134 -command do_options
273984fc 2135}
557afe82 2136
273984fc
SP
2137# -- Help Menu
2138#
1ac17950 2139.mbar add cascade -label [mc Help] -menu .mbar.help
273984fc 2140menu .mbar.help
0c8d7839 2141
273984fc 2142if {![is_MacOSX]} {
1ac17950 2143 .mbar.help add command -label [mc "About %s" [appname]] \
7416bbc6 2144 -command do_about
0c8d7839 2145}
82aa2354 2146
273984fc
SP
2147set browser {}
2148catch {set browser $repo_config(instaweb.browser)}
20ddfcaa 2149set doc_path [file dirname [gitexec]]
273984fc
SP
2150set doc_path [file join $doc_path Documentation index.html]
2151
20ddfcaa 2152if {[is_Cygwin]} {
ee405993 2153 set doc_path [exec cygpath --mixed $doc_path]
273984fc
SP
2154}
2155
2156if {$browser eq {}} {
2157 if {[is_MacOSX]} {
2158 set browser open
20ddfcaa 2159 } elseif {[is_Cygwin]} {
273984fc
SP
2160 set program_files [file dirname [exec cygpath --windir]]
2161 set program_files [file join $program_files {Program Files}]
2162 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
2163 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
2164 if {[file exists $firefox]} {
2165 set browser $firefox
2166 } elseif {[file exists $ie]} {
2167 set browser $ie
2168 }
2169 unset program_files firefox ie
2170 }
2171}
2172
2173if {[file isfile $doc_path]} {
2174 set doc_url "file:$doc_path"
2175} else {
2176 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2177}
2178
2179if {$browser ne {}} {
1ac17950 2180 .mbar.help add command -label [mc "Online Documentation"] \
7416bbc6 2181 -command [list exec $browser $doc_url &]
273984fc
SP
2182}
2183unset browser doc_path doc_url
82aa2354 2184
2ebba528
SP
2185# -- Standard bindings
2186#
39fa2a98 2187wm protocol . WM_DELETE_WINDOW do_quit
2ebba528
SP
2188bind all <$M1B-Key-q> do_quit
2189bind all <$M1B-Key-Q> do_quit
2190bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2191bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2192
3e45ee1e
SP
2193set subcommand_args {}
2194proc usage {} {
2195 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2196 exit 1
2197}
2198
2ebba528
SP
2199# -- Not a normal commit type invocation? Do that instead!
2200#
258871d3 2201switch -- $subcommand {
85d2d597 2202browser -
2ebba528 2203blame {
c52c9452
SP
2204 set subcommand_args {rev? path}
2205 if {$argv eq {}} usage
a0db0d61 2206 set head {}
3e45ee1e
SP
2207 set path {}
2208 set is_path 0
2209 foreach a $argv {
2210 if {$is_path || [file exists $_prefix$a]} {
2211 if {$path ne {}} usage
6b3d8b97 2212 set path $_prefix$a
3e45ee1e
SP
2213 break
2214 } elseif {$a eq {--}} {
2215 if {$path ne {}} {
a0db0d61
SP
2216 if {$head ne {}} usage
2217 set head $path
3e45ee1e
SP
2218 set path {}
2219 }
2220 set is_path 1
a0db0d61
SP
2221 } elseif {$head eq {}} {
2222 if {$head ne {}} usage
2223 set head $a
c52c9452 2224 set is_path 1
3e45ee1e
SP
2225 } else {
2226 usage
2227 }
2228 }
2229 unset is_path
2230
c52c9452
SP
2231 if {$head ne {} && $path eq {}} {
2232 set path $_prefix$head
2233 set head {}
2234 }
2235
a0db0d61 2236 if {$head eq {}} {
d41b43eb 2237 load_current_branch
a0db0d61 2238 } else {
02087abc
SP
2239 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2240 if {[catch {
2241 set head [git rev-parse --verify $head]
2242 } err]} {
2243 puts stderr $err
2244 exit 1
2245 }
2246 }
a0db0d61 2247 set current_branch $head
2ebba528 2248 }
a0db0d61 2249
85d2d597
SP
2250 switch -- $subcommand {
2251 browser {
2252 if {$head eq {}} {
2253 if {$path ne {} && [file isdirectory $path]} {
2254 set head $current_branch
2255 } else {
2256 set head $path
2257 set path {}
2258 }
2259 }
2260 browser::new $head $path
2261 }
2262 blame {
2263 if {$head eq {} && ![file exists $path]} {
c8c4854b 2264 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
85d2d597
SP
2265 exit 1
2266 }
2267 blame::new $head $path
2268 }
c52c9452 2269 }
258871d3
SP
2270 return
2271}
2272citool -
2273gui {
2274 if {[llength $argv] != 0} {
2275 puts -nonewline stderr "usage: $argv0"
0b2bc460
SP
2276 if {$subcommand ne {gui}
2277 && [file tail $argv0] ne "git-$subcommand"} {
258871d3
SP
2278 puts -nonewline stderr " $subcommand"
2279 }
2280 puts stderr {}
2281 exit 1
2282 }
2283 # fall through to setup UI for commits
2ebba528 2284}
2ebba528 2285default {
c0f7a6c3 2286 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2ebba528
SP
2287 exit 1
2288}
2289}
2290
8553b772
SP
2291# -- Branch Control
2292#
2293frame .branch \
2294 -borderwidth 1 \
2295 -relief sunken
2296label .branch.l1 \
1ac17950 2297 -text [mc "Current Branch:"] \
8553b772 2298 -anchor w \
7416bbc6 2299 -justify left
8553b772
SP
2300label .branch.cb \
2301 -textvariable current_branch \
2302 -anchor w \
7416bbc6 2303 -justify left
8553b772
SP
2304pack .branch.l1 -side left
2305pack .branch.cb -side left -fill x
2306pack .branch -side top -fill x
2307
cb07fc2a 2308# -- Main Window Layout
a49c67d1 2309#
a0592d3f
JS
2310panedwindow .vpane -orient horizontal
2311panedwindow .vpane.files -orient vertical
c5a1eb88 2312.vpane add .vpane.files -sticky nsew -height 100 -width 200
cb07fc2a
SP
2313pack .vpane -anchor n -side top -fill both -expand 1
2314
2315# -- Index File List
a49c67d1 2316#
c5a1eb88 2317frame .vpane.files.index -height 100 -width 200
c73ce762 2318label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
c382fdd7
PH
2319 -background lightgreen -foreground black
2320text $ui_index -background white -foreground black \
2321 -borderwidth 0 \
c5a1eb88 2322 -width 20 -height 10 \
3c236977 2323 -wrap none \
6c6dd01a 2324 -cursor $cursor_ptr \
3c236977
SP
2325 -xscrollcommand {.vpane.files.index.sx set} \
2326 -yscrollcommand {.vpane.files.index.sy set} \
cb07fc2a 2327 -state disabled
3c236977
SP
2328scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2329scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
cb07fc2a 2330pack .vpane.files.index.title -side top -fill x
3c236977
SP
2331pack .vpane.files.index.sx -side bottom -fill x
2332pack .vpane.files.index.sy -side right -fill y
cb07fc2a 2333pack $ui_index -side left -fill both -expand 1
cb07fc2a 2334
0812665e 2335# -- Working Directory File List
a49c67d1 2336#
c5a1eb88 2337frame .vpane.files.workdir -height 100 -width 200
c73ce762 2338label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
c382fdd7
PH
2339 -background lightsalmon -foreground black
2340text $ui_workdir -background white -foreground black \
2341 -borderwidth 0 \
c5a1eb88 2342 -width 20 -height 10 \
3c236977 2343 -wrap none \
6c6dd01a 2344 -cursor $cursor_ptr \
3c236977
SP
2345 -xscrollcommand {.vpane.files.workdir.sx set} \
2346 -yscrollcommand {.vpane.files.workdir.sy set} \
cb07fc2a 2347 -state disabled
3c236977
SP
2348scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2349scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
0812665e 2350pack .vpane.files.workdir.title -side top -fill x
3c236977
SP
2351pack .vpane.files.workdir.sx -side bottom -fill x
2352pack .vpane.files.workdir.sy -side right -fill y
0812665e 2353pack $ui_workdir -side left -fill both -expand 1
a0592d3f 2354
0812665e 2355.vpane.files add .vpane.files.workdir -sticky nsew
a0592d3f 2356.vpane.files add .vpane.files.index -sticky nsew
cb07fc2a 2357
0812665e 2358foreach i [list $ui_index $ui_workdir] {
3849bfba
SP
2359 rmsel_tag $i
2360 $i tag conf in_diff -background [$i tag cget in_sel -background]
24263b77
SP
2361}
2362unset i
131f503b 2363
0fb8f9ce 2364# -- Diff and Commit Area
a49c67d1 2365#
8009dcdc 2366frame .vpane.lower -height 300 -width 400
0fb8f9ce
SP
2367frame .vpane.lower.commarea
2368frame .vpane.lower.diff -relief sunken -borderwidth 1
a0592d3f
JS
2369pack .vpane.lower.diff -fill both -expand 1
2370pack .vpane.lower.commarea -side bottom -fill x
0fd49d0a 2371.vpane add .vpane.lower -sticky nsew
cb07fc2a
SP
2372
2373# -- Commit Area Buttons
a49c67d1 2374#
0fb8f9ce
SP
2375frame .vpane.lower.commarea.buttons
2376label .vpane.lower.commarea.buttons.l -text {} \
cb07fc2a 2377 -anchor w \
7416bbc6 2378 -justify left
0fb8f9ce
SP
2379pack .vpane.lower.commarea.buttons.l -side top -fill x
2380pack .vpane.lower.commarea.buttons -side left -fill y
131f503b 2381
1ac17950 2382button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
7416bbc6 2383 -command do_rescan
0fb8f9ce 2384pack .vpane.lower.commarea.buttons.rescan -side top -fill x
390adaea
SP
2385lappend disable_on_lock \
2386 {.vpane.lower.commarea.buttons.rescan conf -state}
131f503b 2387
1ac17950 2388button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
7416bbc6 2389 -command do_add_all
7fe7e733 2390pack .vpane.lower.commarea.buttons.incall -side top -fill x
390adaea
SP
2391lappend disable_on_lock \
2392 {.vpane.lower.commarea.buttons.incall conf -state}
131f503b 2393
1ac17950 2394button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
7416bbc6 2395 -command do_signoff
0fb8f9ce 2396pack .vpane.lower.commarea.buttons.signoff -side top -fill x
131f503b 2397
a9813cb5 2398button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
7416bbc6 2399 -command do_commit
0fb8f9ce 2400pack .vpane.lower.commarea.buttons.commit -side top -fill x
390adaea
SP
2401lappend disable_on_lock \
2402 {.vpane.lower.commarea.buttons.commit conf -state}
cb07fc2a 2403
1ac17950 2404button .vpane.lower.commarea.buttons.push -text [mc Push] \
87b49a53
SP
2405 -command do_push_anywhere
2406pack .vpane.lower.commarea.buttons.push -side top -fill x
2407
cb07fc2a 2408# -- Commit Message Buffer
a49c67d1 2409#
0fb8f9ce 2410frame .vpane.lower.commarea.buffer
24ac9b75 2411frame .vpane.lower.commarea.buffer.header
0fb8f9ce 2412set ui_comm .vpane.lower.commarea.buffer.t
24ac9b75
SP
2413set ui_coml .vpane.lower.commarea.buffer.header.l
2414radiobutton .vpane.lower.commarea.buffer.header.new \
1ac17950 2415 -text [mc "New Commit"] \
24ac9b75
SP
2416 -command do_select_commit_type \
2417 -variable selected_commit_type \
7416bbc6 2418 -value new
24ac9b75
SP
2419lappend disable_on_lock \
2420 [list .vpane.lower.commarea.buffer.header.new conf -state]
2421radiobutton .vpane.lower.commarea.buffer.header.amend \
1ac17950 2422 -text [mc "Amend Last Commit"] \
24ac9b75
SP
2423 -command do_select_commit_type \
2424 -variable selected_commit_type \
7416bbc6 2425 -value amend
24ac9b75
SP
2426lappend disable_on_lock \
2427 [list .vpane.lower.commarea.buffer.header.amend conf -state]
a49c67d1 2428label $ui_coml \
cb07fc2a 2429 -anchor w \
7416bbc6 2430 -justify left
4539eacd
SP
2431proc trace_commit_type {varname args} {
2432 global ui_coml commit_type
2433 switch -glob -- $commit_type {
1ac17950
CS
2434 initial {set txt [mc "Initial Commit Message:"]}
2435 amend {set txt [mc "Amended Commit Message:"]}
2436 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
2437 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
2438 merge {set txt [mc "Merge Commit Message:"]}
2439 * {set txt [mc "Commit Message:"]}
4539eacd
SP
2440 }
2441 $ui_coml conf -text $txt
2442}
2443trace add variable commit_type write trace_commit_type
24ac9b75
SP
2444pack $ui_coml -side left -fill x
2445pack .vpane.lower.commarea.buffer.header.amend -side right
2446pack .vpane.lower.commarea.buffer.header.new -side right
2447
c382fdd7
PH
2448text $ui_comm -background white -foreground black \
2449 -borderwidth 1 \
9861671d 2450 -undo true \
b2c6fcf1 2451 -maxundo 20 \
9861671d 2452 -autoseparators true \
cb07fc2a 2453 -relief sunken \
11027d54 2454 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
b4946930 2455 -font font_diff \
6c6dd01a 2456 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
390adaea
SP
2457scrollbar .vpane.lower.commarea.buffer.sby \
2458 -command [list $ui_comm yview]
24ac9b75 2459pack .vpane.lower.commarea.buffer.header -side top -fill x
0fb8f9ce 2460pack .vpane.lower.commarea.buffer.sby -side right -fill y
cb07fc2a 2461pack $ui_comm -side left -fill y
0fb8f9ce
SP
2462pack .vpane.lower.commarea.buffer -side left -fill y
2463
0e794311
SP
2464# -- Commit Message Buffer Context Menu
2465#
e8ab6446
SP
2466set ctxm .vpane.lower.commarea.buffer.ctxm
2467menu $ctxm -tearoff 0
2468$ctxm add command \
1ac17950 2469 -label [mc Cut] \
e8ab6446
SP
2470 -command {tk_textCut $ui_comm}
2471$ctxm add command \
1ac17950 2472 -label [mc Copy] \
e8ab6446
SP
2473 -command {tk_textCopy $ui_comm}
2474$ctxm add command \
1ac17950 2475 -label [mc Paste] \
e8ab6446
SP
2476 -command {tk_textPaste $ui_comm}
2477$ctxm add command \
1ac17950 2478 -label [mc Delete] \
e8ab6446
SP
2479 -command {$ui_comm delete sel.first sel.last}
2480$ctxm add separator
2481$ctxm add command \
1ac17950 2482 -label [mc "Select All"] \
75e78c8a 2483 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
e8ab6446 2484$ctxm add command \
1ac17950 2485 -label [mc "Copy All"] \
e8ab6446 2486 -command {
0e794311
SP
2487 $ui_comm tag add sel 0.0 end
2488 tk_textCopy $ui_comm
2489 $ui_comm tag remove sel 0.0 end
e8ab6446
SP
2490 }
2491$ctxm add separator
2492$ctxm add command \
1ac17950 2493 -label [mc "Sign Off"] \
0e794311 2494 -command do_signoff
95b002ee 2495set ui_comm_ctxm $ctxm
0e794311 2496
0fb8f9ce 2497# -- Diff Header
a49c67d1 2498#
20a53c02
SP
2499proc trace_current_diff_path {varname args} {
2500 global current_diff_path diff_actions file_states
2501 if {$current_diff_path eq {}} {
e8ab6446
SP
2502 set s {}
2503 set f {}
2504 set p {}
2505 set o disabled
2506 } else {
20a53c02 2507 set p $current_diff_path
e8ab6446 2508 set s [mapdesc [lindex $file_states($p) 0] $p]
1ac17950 2509 set f [mc "File:"]
e8ab6446
SP
2510 set p [escape_path $p]
2511 set o normal
2512 }
2513
2514 .vpane.lower.diff.header.status configure -text $s
2515 .vpane.lower.diff.header.file configure -text $f
2516 .vpane.lower.diff.header.path configure -text $p
2517 foreach w $diff_actions {
2518 uplevel #0 $w $o
2519 }
2520}
20a53c02 2521trace add variable current_diff_path write trace_current_diff_path
e8ab6446 2522
9adccb05 2523frame .vpane.lower.diff.header -background gold
e8ab6446 2524label .vpane.lower.diff.header.status \
9adccb05 2525 -background gold \
c382fdd7 2526 -foreground black \
3e7b0e1d
SP
2527 -width $max_status_desc \
2528 -anchor w \
7416bbc6 2529 -justify left
e8ab6446 2530label .vpane.lower.diff.header.file \
9adccb05 2531 -background gold \
c382fdd7 2532 -foreground black \
e8ab6446 2533 -anchor w \
7416bbc6 2534 -justify left
e8ab6446 2535label .vpane.lower.diff.header.path \
9adccb05 2536 -background gold \
c382fdd7 2537 -foreground black \
fce89e46 2538 -anchor w \
7416bbc6 2539 -justify left
e8ab6446
SP
2540pack .vpane.lower.diff.header.status -side left
2541pack .vpane.lower.diff.header.file -side left
2542pack .vpane.lower.diff.header.path -fill x
2543set ctxm .vpane.lower.diff.header.ctxm
2544menu $ctxm -tearoff 0
2545$ctxm add command \
1ac17950 2546 -label [mc Copy] \
fce89e46
SP
2547 -command {
2548 clipboard clear
2549 clipboard append \
2550 -format STRING \
2551 -type STRING \
20a53c02 2552 -- $current_diff_path
fce89e46 2553 }
e8ab6446
SP
2554lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2555bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
0fb8f9ce
SP
2556
2557# -- Diff Body
a49c67d1 2558#
0fb8f9ce
SP
2559frame .vpane.lower.diff.body
2560set ui_diff .vpane.lower.diff.body.t
c382fdd7
PH
2561text $ui_diff -background white -foreground black \
2562 -borderwidth 0 \
0fb8f9ce 2563 -width 80 -height 15 -wrap none \
b4946930 2564 -font font_diff \
0fb8f9ce
SP
2565 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2566 -yscrollcommand {.vpane.lower.diff.body.sby set} \
0fb8f9ce
SP
2567 -state disabled
2568scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2569 -command [list $ui_diff xview]
2570scrollbar .vpane.lower.diff.body.sby -orient vertical \
2571 -command [list $ui_diff yview]
2572pack .vpane.lower.diff.body.sbx -side bottom -fill x
2573pack .vpane.lower.diff.body.sby -side right -fill y
2574pack $ui_diff -side left -fill both -expand 1
2575pack .vpane.lower.diff.header -side top -fill x
2576pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2577
30b14ed3 2578$ui_diff tag conf d_cr -elide true
ca521566
SP
2579$ui_diff tag conf d_@ -foreground blue -font font_diffbold
2580$ui_diff tag conf d_+ -foreground {#00a000}
fec4a785
SP
2581$ui_diff tag conf d_- -foreground red
2582
ca521566 2583$ui_diff tag conf d_++ -foreground {#00a000}
fec4a785
SP
2584$ui_diff tag conf d_-- -foreground red
2585$ui_diff tag conf d_+s \
ca521566
SP
2586 -foreground {#00a000} \
2587 -background {#e2effa}
fec4a785
SP
2588$ui_diff tag conf d_-s \
2589 -foreground red \
ca521566 2590 -background {#e2effa}
fec4a785 2591$ui_diff tag conf d_s+ \
ca521566
SP
2592 -foreground {#00a000} \
2593 -background ivory1
fec4a785
SP
2594$ui_diff tag conf d_s- \
2595 -foreground red \
ca521566 2596 -background ivory1
fec4a785
SP
2597
2598$ui_diff tag conf d<<<<<<< \
2599 -foreground orange \
2600 -font font_diffbold
2601$ui_diff tag conf d======= \
2602 -foreground orange \
2603 -font font_diffbold
2604$ui_diff tag conf d>>>>>>> \
2605 -foreground orange \
2606 -font font_diffbold
cb07fc2a 2607
ca521566
SP
2608$ui_diff tag raise sel
2609
0e794311
SP
2610# -- Diff Body Context Menu
2611#
e8ab6446
SP
2612set ctxm .vpane.lower.diff.body.ctxm
2613menu $ctxm -tearoff 0
fba6072e
JS
2614$ctxm add command \
2615 -label [mc "Apply/Reverse Hunk"] \
2616 -command {apply_hunk $cursorX $cursorY}
2617set ui_diff_applyhunk [$ctxm index last]
2618lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2619$ctxm add separator
2620$ctxm add command \
2621 -label [mc "Show Less Context"] \
c91ee2bd 2622 -command show_less_context
fba6072e
JS
2623lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2624$ctxm add command \
2625 -label [mc "Show More Context"] \
c91ee2bd 2626 -command show_more_context
fba6072e
JS
2627lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2628$ctxm add separator
68c30b4a 2629$ctxm add command \
1ac17950 2630 -label [mc Refresh] \
68c30b4a 2631 -command reshow_diff
86773d9b 2632lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
e8ab6446 2633$ctxm add command \
1ac17950 2634 -label [mc Copy] \
e8ab6446
SP
2635 -command {tk_textCopy $ui_diff}
2636lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2637$ctxm add command \
1ac17950 2638 -label [mc "Select All"] \
75e78c8a 2639 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
e8ab6446
SP
2640lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2641$ctxm add command \
1ac17950 2642 -label [mc "Copy All"] \
e8ab6446 2643 -command {
0e794311
SP
2644 $ui_diff tag add sel 0.0 end
2645 tk_textCopy $ui_diff
2646 $ui_diff tag remove sel 0.0 end
e8ab6446
SP
2647 }
2648lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2649$ctxm add separator
2650$ctxm add command \
1ac17950 2651 -label [mc "Decrease Font Size"] \
b4946930 2652 -command {incr_font_size font_diff -1}
e8ab6446
SP
2653lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2654$ctxm add command \
1ac17950 2655 -label [mc "Increase Font Size"] \
b4946930 2656 -command {incr_font_size font_diff 1}
e8ab6446
SP
2657lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2658$ctxm add separator
1ac17950 2659$ctxm add command -label [mc "Options..."] \
8009dcdc 2660 -command do_options
83751fc1 2661proc popup_diff_menu {ctxm x y X Y} {
ce015c21 2662 global current_diff_path file_states
83751fc1
SP
2663 set ::cursorX $x
2664 set ::cursorY $y
2665 if {$::ui_index eq $::current_diff_side} {
1ac17950 2666 set l [mc "Unstage Hunk From Commit"]
a25c5189 2667 } else {
1ac17950 2668 set l [mc "Stage Hunk For Commit"]
a25c5189 2669 }
047d94d5
SP
2670 if {$::is_3way_diff
2671 || $current_diff_path eq {}
2672 || ![info exists file_states($current_diff_path)]
2673 || {_O} eq [lindex $file_states($current_diff_path) 0]} {
9c9f5fa9 2674 set s disabled
047d94d5
SP
2675 } else {
2676 set s normal
9c9f5fa9 2677 }
9f4119eb 2678 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
83751fc1
SP
2679 tk_popup $ctxm $X $Y
2680}
2681bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
0e794311 2682
cb07fc2a 2683# -- Status Bar
e8ab6446 2684#
51530d17 2685set main_status [::status_bar::new .status]
cb07fc2a 2686pack .status -anchor w -side bottom -fill x
1ac17950 2687$main_status show [mc "Initializing..."]
cb07fc2a 2688
2d19516d 2689# -- Load geometry
e8ab6446 2690#
2d19516d 2691catch {
51f4d16b 2692set gm $repo_config(gui.geometry)
c4fe7728
SP
2693wm geometry . [lindex $gm 0]
2694.vpane sash place 0 \
a0592d3f
JS
2695 [lindex $gm 1] \
2696 [lindex [.vpane sash coord 0] 1]
c4fe7728 2697.vpane.files sash place 0 \
a0592d3f
JS
2698 [lindex [.vpane.files sash coord 0] 0] \
2699 [lindex $gm 2]
c4fe7728 2700unset gm
390adaea 2701}
2d19516d 2702
cb07fc2a 2703# -- Key Bindings
e8ab6446 2704#
ec6b424a 2705bind $ui_comm <$M1B-Key-Return> {do_commit;break}
cd16a6c9
SP
2706bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
2707bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
93e912c5
SP
2708bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2709bind $ui_comm <$M1B-Key-I> {do_add_all;break}
9861671d
SP
2710bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2711bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2712bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2713bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2714bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2715bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2716bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2717bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
54906add
SP
2718bind $ui_comm <$M1B-Key-bracketleft> {show_less_context;break}
2719bind $ui_comm <$M1B-Key-bracketright> {show_more_context;break}
9861671d
SP
2720
2721bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2722bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2723bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2724bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2725bind $ui_diff <$M1B-Key-v> {break}
2726bind $ui_diff <$M1B-Key-V> {break}
2727bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2728bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
b2c6fcf1
SP
2729bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2730bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2731bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2732bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
60aa065f
SP
2733bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2734bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2735bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2736bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2737bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2738bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
23effa79 2739bind $ui_diff <Button-1> {focus %W}
49b86f01 2740
64a906f8 2741if {[is_enabled branch]} {
b1fa2bff
SP
2742 bind . <$M1B-Key-n> branch_create::dialog
2743 bind . <$M1B-Key-N> branch_create::dialog
d41b43eb
SP
2744 bind . <$M1B-Key-o> branch_checkout::dialog
2745 bind . <$M1B-Key-O> branch_checkout::dialog
a870ddc0
SP
2746 bind . <$M1B-Key-m> merge::dialog
2747 bind . <$M1B-Key-M> merge::dialog
bd29ebc3 2748}
840bcfa7
SP
2749if {[is_enabled transport]} {
2750 bind . <$M1B-Key-p> do_push_anywhere
2751 bind . <$M1B-Key-P> do_push_anywhere
2752}
bd29ebc3 2753
f1e031bb
SP
2754bind . <Key-F5> do_rescan
2755bind . <$M1B-Key-r> do_rescan
2756bind . <$M1B-Key-R> do_rescan
07123f40
SP
2757bind . <$M1B-Key-s> do_signoff
2758bind . <$M1B-Key-S> do_signoff
cd16a6c9
SP
2759bind . <$M1B-Key-t> do_add_selection
2760bind . <$M1B-Key-T> do_add_selection
93e912c5
SP
2761bind . <$M1B-Key-i> do_add_all
2762bind . <$M1B-Key-I> do_add_all
54906add
SP
2763bind . <$M1B-Key-bracketleft> {show_less_context;break}
2764bind . <$M1B-Key-bracketright> {show_more_context;break}
07123f40 2765bind . <$M1B-Key-Return> do_commit
0812665e 2766foreach i [list $ui_index $ui_workdir] {
24263b77
SP
2767 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2768 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2769 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
cb07fc2a 2770}
62aac80b
SP
2771unset i
2772
2773set file_lists($ui_index) [list]
0812665e 2774set file_lists($ui_workdir) [list]
a49c67d1 2775
19c82148 2776wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
cb07fc2a 2777focus -force $ui_comm
1d8b3cbf 2778
85ab313e
SP
2779# -- Warn the user about environmental problems. Cygwin's Tcl
2780# does *not* pass its env array onto any processes it spawns.
2781# This means that git processes get none of our environment.
1d8b3cbf 2782#
20ddfcaa 2783if {[is_Cygwin]} {
1d8b3cbf
SP
2784 set ignored_env 0
2785 set suggest_user {}
c8c4854b 2786 set msg [mc "Possible environment issues exist.
1d8b3cbf
SP
2787
2788The following environment variables are probably
2789going to be ignored by any Git subprocess run
c8c4854b 2790by %s:
1d8b3cbf 2791
c8c4854b 2792" [appname]]
1d8b3cbf
SP
2793 foreach name [array names env] {
2794 switch -regexp -- $name {
2795 {^GIT_INDEX_FILE$} -
2796 {^GIT_OBJECT_DIRECTORY$} -
2797 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2798 {^GIT_DIFF_OPTS$} -
2799 {^GIT_EXTERNAL_DIFF$} -
2800 {^GIT_PAGER$} -
2801 {^GIT_TRACE$} -
2802 {^GIT_CONFIG$} -
2803 {^GIT_CONFIG_LOCAL$} -
2804 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2805 append msg " - $name\n"
2806 incr ignored_env
2807 }
2808 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2809 append msg " - $name\n"
2810 incr ignored_env
2811 set suggest_user $name
2812 }
2813 }
2814 }
2815 if {$ignored_env > 0} {
c8c4854b 2816 append msg [mc "
1d8b3cbf 2817This is due to a known issue with the
c8c4854b 2818Tcl binary distributed by Cygwin."]
1d8b3cbf
SP
2819
2820 if {$suggest_user ne {}} {
c8c4854b 2821 append msg [mc "
1d8b3cbf 2822
c8c4854b 2823A good replacement for %s
1d8b3cbf
SP
2824is placing values for the user.name and
2825user.email settings into your personal
2826~/.gitconfig file.
c8c4854b 2827" $suggest_user]
1d8b3cbf
SP
2828 }
2829 warn_popup $msg
2830 }
2831 unset ignored_env msg suggest_user name
2832}
2833
85ab313e
SP
2834# -- Only initialize complex UI if we are going to stay running.
2835#
64a906f8 2836if {[is_enabled transport]} {
4ccdab02 2837 load_all_remotes
85ab313e 2838
6bdf5e5f 2839 set n [.mbar.remote index end]
3f7fd924 2840 populate_push_menu
6bdf5e5f
SP
2841 populate_fetch_menu
2842 set n [expr {[.mbar.remote index end] - $n}]
2843 if {$n > 0} {
2844 .mbar.remote insert $n separator
2845 }
2846 unset n
4ccdab02 2847}
85ab313e 2848
4578c5cb
SP
2849if {[winfo exists $ui_comm]} {
2850 set GITGUI_BCK_exists [load_message GITGUI_BCK]
2851
2852 # -- If both our backup and message files exist use the
2853 # newer of the two files to initialize the buffer.
2854 #
2855 if {$GITGUI_BCK_exists} {
2856 set m [gitdir GITGUI_MSG]
2857 if {[file isfile $m]} {
2858 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
2859 catch {file delete [gitdir GITGUI_MSG]}
2860 } else {
2861 $ui_comm delete 0.0 end
2862 $ui_comm edit reset
2863 $ui_comm edit modified false
2864 catch {file delete [gitdir GITGUI_BCK]}
2865 set GITGUI_BCK_exists 0
2866 }
2867 }
2868 unset m
2869 }
2870
2871 proc backup_commit_buffer {} {
2872 global ui_comm GITGUI_BCK_exists
2873
2874 set m [$ui_comm edit modified]
2875 if {$m || $GITGUI_BCK_exists} {
2876 set msg [string trim [$ui_comm get 0.0 end]]
2877 regsub -all -line {[ \r\t]+$} $msg {} msg
2878
2879 if {$msg eq {}} {
2880 if {$GITGUI_BCK_exists} {
2881 catch {file delete [gitdir GITGUI_BCK]}
2882 set GITGUI_BCK_exists 0
2883 }
2884 } elseif {$m} {
2885 catch {
2886 set fd [open [gitdir GITGUI_BCK] w]
2887 puts -nonewline $fd $msg
2888 close $fd
2889 set GITGUI_BCK_exists 1
2890 }
2891 }
2892
2893 $ui_comm edit modified false
2894 }
2895
2896 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
2897 }
2898
2899 backup_commit_buffer
95b002ee
SP
2900
2901 # -- If the user has aspell available we can drive it
2902 # in pipe mode to spellcheck the commit message.
2903 #
2904 set spell_cmd [list |]
2905 set spell_dict [get_config gui.spellingdictionary]
2906 lappend spell_cmd aspell
2907 if {$spell_dict ne {}} {
2908 lappend spell_cmd --master=$spell_dict
2909 }
2910 lappend spell_cmd --mode=none
2911 lappend spell_cmd --encoding=utf-8
2912 lappend spell_cmd pipe
2913 if {$spell_dict eq {none}
2914 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
2915 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
2916 } else {
2917 set ui_comm_spell [spellcheck::init \
2918 $spell_fd \
2919 $ui_comm \
2920 $ui_comm_ctxm \
2921 ]
2922 }
2923 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4578c5cb
SP
2924}
2925
53716a7b 2926lock_index begin-read
301dfaa9
SP
2927if {![winfo ismapped .]} {
2928 wm deiconify .
2929}
8f52548a 2930after 1 do_rescan
3972b987
SP
2931if {[is_enabled multicommit]} {
2932 after 1000 hint_gc
2933}