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