]> git.ipfire.org Git - thirdparty/git.git/blame - git-gui.sh
git-gui: convert new/amend commit radiobutton to checkbutton
[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 {}
ba41b5b3 1344set commit_type_is_amend 0
372ef954
SP
1345set empty_tree {}
1346set current_branch {}
d41b43eb 1347set is_detached 0
372ef954 1348set current_diff_path {}
9c9f5fa9 1349set is_3way_diff 0
cd846aa1 1350set is_submodule_diff 0
3e34838c 1351set is_conflict_diff 0
8052e788 1352set diff_empty_count 0
a4fa2f0a
PY
1353set last_revert {}
1354set last_revert_enc {}
372ef954 1355
a9786bb4
AG
1356set nullid "0000000000000000000000000000000000000000"
1357set nullid2 "0000000000000000000000000000000000000001"
1358
cb07fc2a
SP
1359######################################################################
1360##
e210e674 1361## task management
cb07fc2a 1362
8f52548a 1363set rescan_active 0
131f503b 1364set diff_active 0
24263b77 1365set last_clicked {}
131f503b 1366
e210e674
SP
1367set disable_on_lock [list]
1368set index_lock_type none
1369
1370proc lock_index {type} {
1371 global index_lock_type disable_on_lock
131f503b 1372
043f7011 1373 if {$index_lock_type eq {none}} {
e210e674
SP
1374 set index_lock_type $type
1375 foreach w $disable_on_lock {
1376 uplevel #0 $w disabled
1377 }
1378 return 1
53716a7b 1379 } elseif {$index_lock_type eq "begin-$type"} {
e210e674 1380 set index_lock_type $type
131f503b
SP
1381 return 1
1382 }
1383 return 0
1384}
cb07fc2a 1385
e210e674
SP
1386proc unlock_index {} {
1387 global index_lock_type disable_on_lock
1388
1389 set index_lock_type none
1390 foreach w $disable_on_lock {
1391 uplevel #0 $w normal
1392 }
1393}
1394
1395######################################################################
1396##
1397## status
1398
f18e40a1 1399proc repository_state {ctvar hdvar mhvar} {
c950c66e 1400 global current_branch
f18e40a1
SP
1401 upvar $ctvar ct $hdvar hd $mhvar mh
1402
1403 set mh [list]
ec6b424a 1404
d41b43eb 1405 load_current_branch
81347223 1406 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
4539eacd 1407 set hd {}
ec6b424a 1408 set ct initial
f18e40a1
SP
1409 return
1410 }
1411
c2758a17 1412 set merge_head [gitdir MERGE_HEAD]
f18e40a1 1413 if {[file exists $merge_head]} {
ec6b424a 1414 set ct merge
f18e40a1
SP
1415 set fd_mh [open $merge_head r]
1416 while {[gets $fd_mh line] >= 0} {
1417 lappend mh $line
1418 }
1419 close $fd_mh
1420 return
ec6b424a 1421 }
f18e40a1
SP
1422
1423 set ct normal
ec6b424a
SP
1424}
1425
4539eacd
SP
1426proc PARENT {} {
1427 global PARENT empty_tree
1428
f18e40a1
SP
1429 set p [lindex $PARENT 0]
1430 if {$p ne {}} {
1431 return $p
4539eacd
SP
1432 }
1433 if {$empty_tree eq {}} {
81347223 1434 set empty_tree [git mktree << {}]
4539eacd
SP
1435 }
1436 return $empty_tree
1437}
1438
1e65c622 1439proc force_amend {} {
ba41b5b3 1440 global commit_type_is_amend
1e65c622
AG
1441 global HEAD PARENT MERGE_HEAD commit_type
1442
1443 repository_state newType newHEAD newMERGE_HEAD
1444 set HEAD $newHEAD
1445 set PARENT $newHEAD
1446 set MERGE_HEAD $newMERGE_HEAD
1447 set commit_type $newType
1448
ba41b5b3 1449 set commit_type_is_amend 1
1e65c622
AG
1450 do_select_commit_type
1451}
1452
46aaf90b 1453proc rescan {after {honor_trustmtime 1}} {
f18e40a1 1454 global HEAD PARENT MERGE_HEAD commit_type
699d5601 1455 global ui_index ui_workdir ui_comm
8f52548a 1456 global rescan_active file_states
cf25ddc8 1457 global repo_config
cb07fc2a 1458
8f52548a 1459 if {$rescan_active > 0 || ![lock_index read]} return
cb07fc2a 1460
f18e40a1 1461 repository_state newType newHEAD newMERGE_HEAD
4539eacd 1462 if {[string match amend* $commit_type]
f18e40a1
SP
1463 && $newType eq {normal}
1464 && $newHEAD eq $HEAD} {
e57ca85e 1465 } else {
f18e40a1
SP
1466 set HEAD $newHEAD
1467 set PARENT $newHEAD
1468 set MERGE_HEAD $newMERGE_HEAD
1469 set commit_type $newType
e57ca85e
SP
1470 }
1471
cb07fc2a 1472 array unset file_states
cb07fc2a 1473
1e0a92fd
SP
1474 if {!$::GITGUI_BCK_exists &&
1475 (![$ui_comm edit modified]
1476 || [string trim [$ui_comm get 0.0 end]] eq {})} {
b2f3bb1b 1477 if {[string match amend* $commit_type]} {
fda1ba02 1478 } elseif {[load_message GITGUI_MSG utf-8]} {
2cd1fd1f 1479 } elseif {[run_prepare_commit_msg_hook]} {
131f503b
SP
1480 } elseif {[load_message MERGE_MSG]} {
1481 } elseif {[load_message SQUASH_MSG]} {
1482 }
b2c6fcf1 1483 $ui_comm edit reset
21d7744f 1484 $ui_comm edit modified false
131f503b
SP
1485 }
1486
46aaf90b 1487 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
8f52548a 1488 rescan_stage2 {} $after
e534f3a8 1489 } else {
8f52548a 1490 set rescan_active 1
1ac17950 1491 ui_status [mc "Refreshing file status..."]
0b812616
SP
1492 set fd_rf [git_read update-index \
1493 -q \
1494 --unmerged \
1495 --ignore-missing \
1496 --refresh \
1497 ]
e534f3a8 1498 fconfigure $fd_rf -blocking 0 -translation binary
390adaea 1499 fileevent $fd_rf readable \
8f52548a 1500 [list rescan_stage2 $fd_rf $after]
e534f3a8 1501 }
131f503b
SP
1502}
1503
2fe167b6 1504if {[is_Cygwin]} {
2fe167b6
SP
1505 set is_git_info_exclude {}
1506 proc have_info_exclude {} {
7f83aa2d 1507 global is_git_info_exclude
2fe167b6 1508
7f83aa2d
SP
1509 if {$is_git_info_exclude eq {}} {
1510 if {[catch {exec test -f [gitdir info exclude]}]} {
1511 set is_git_info_exclude 0
1512 } else {
1513 set is_git_info_exclude 1
2fe167b6 1514 }
2fe167b6 1515 }
7f83aa2d 1516 return $is_git_info_exclude
2fe167b6
SP
1517 }
1518} else {
1519 proc have_info_exclude {} {
1520 return [file readable [gitdir info exclude]]
1521 }
1522}
1523
8f52548a 1524proc rescan_stage2 {fd after} {
4539eacd 1525 global rescan_active buf_rdi buf_rdf buf_rlo
131f503b 1526
043f7011 1527 if {$fd ne {}} {
e534f3a8
SP
1528 read $fd
1529 if {![eof $fd]} return
1530 close $fd
1531 }
131f503b 1532
ce3e848b 1533 if {[package vcompare $::_git_version 1.6.3] >= 0} {
673eb4a0
SN
1534 set ls_others [list --exclude-standard]
1535 } else {
1536 set ls_others [list --exclude-per-directory=.gitignore]
1537 if {[have_info_exclude]} {
1538 lappend ls_others "--exclude-from=[gitdir info exclude]"
1539 }
1540 set user_exclude [get_config core.excludesfile]
1541 if {$user_exclude ne {} && [file readable $user_exclude]} {
1542 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1543 }
94a4dd9b 1544 }
cb07fc2a 1545
868c8752
SP
1546 set buf_rdi {}
1547 set buf_rdf {}
1548 set buf_rlo {}
1549
e632b3c0 1550 set rescan_active 2
1ac17950 1551 ui_status [mc "Scanning for modified files ..."]
e0db1dd7
JL
1552 if {[git-version >= "1.7.2"]} {
1553 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1554 } else {
1555 set fd_di [git_read diff-index --cached -z [PARENT]]
1556 }
0b812616 1557 set fd_df [git_read diff-files -z]
cb07fc2a 1558
51a989ba
SP
1559 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1560 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
e632b3c0 1561
8f52548a
SP
1562 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1563 fileevent $fd_df readable [list read_diff_files $fd_df $after]
e632b3c0
MK
1564
1565 if {[is_config_true gui.displayuntracked]} {
1566 set fd_lo [eval git_read ls-files --others -z $ls_others]
1567 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1568 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1569 incr rescan_active
1570 }
cb07fc2a
SP
1571}
1572
fda1ba02 1573proc load_message {file {encoding {}}} {
c950c66e 1574 global ui_comm
131f503b 1575
c2758a17 1576 set f [gitdir $file]
e57ca85e 1577 if {[file isfile $f]} {
131f503b
SP
1578 if {[catch {set fd [open $f r]}]} {
1579 return 0
1580 }
6eb420ef 1581 fconfigure $fd -eofchar {}
fda1ba02
PT
1582 if {$encoding ne {}} {
1583 fconfigure $fd -encoding $encoding
1584 }
e57ca85e 1585 set content [string trim [read $fd]]
131f503b 1586 close $fd
4e55d19a 1587 regsub -all -line {[ \r\t]+$} $content {} content
131f503b
SP
1588 $ui_comm delete 0.0 end
1589 $ui_comm insert end $content
1590 return 1
1591 }
1592 return 0
1593}
1594
2cd1fd1f
JW
1595proc run_prepare_commit_msg_hook {} {
1596 global pch_error
1597
1598 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1599 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
c5c45e1a 1600 # empty file but existent file.
2cd1fd1f
JW
1601
1602 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1603
1604 if {[file isfile [gitdir MERGE_MSG]]} {
1605 set pcm_source "merge"
1606 set fd_mm [open [gitdir MERGE_MSG] r]
af465c0c 1607 fconfigure $fd_mm -encoding utf-8
2cd1fd1f
JW
1608 puts -nonewline $fd_pcm [read $fd_mm]
1609 close $fd_mm
1610 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1611 set pcm_source "squash"
1612 set fd_sm [open [gitdir SQUASH_MSG] r]
af465c0c 1613 fconfigure $fd_sm -encoding utf-8
2cd1fd1f
JW
1614 puts -nonewline $fd_pcm [read $fd_sm]
1615 close $fd_sm
1616 } else {
1617 set pcm_source ""
1618 }
1619
1620 close $fd_pcm
1621
1622 set fd_ph [githook_read prepare-commit-msg \
1623 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1624 if {$fd_ph eq {}} {
1625 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1626 return 0;
1627 }
1628
1629 ui_status [mc "Calling prepare-commit-msg hook..."]
1630 set pch_error {}
1631
1632 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1633 fileevent $fd_ph readable \
1634 [list prepare_commit_msg_hook_wait $fd_ph]
1635
1636 return 1;
1637}
1638
1639proc prepare_commit_msg_hook_wait {fd_ph} {
1640 global pch_error
1641
1642 append pch_error [read $fd_ph]
1643 fconfigure $fd_ph -blocking 1
1644 if {[eof $fd_ph]} {
1645 if {[catch {close $fd_ph}]} {
1646 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1647 hook_failed_popup prepare-commit-msg $pch_error
1648 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1649 exit 1
1650 } else {
1651 load_message PREPARE_COMMIT_MSG
1652 }
1653 set pch_error {}
1654 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1655 return
1656 }
1657 fconfigure $fd_ph -blocking 0
1658 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1659}
1660
8f52548a 1661proc read_diff_index {fd after} {
cb07fc2a
SP
1662 global buf_rdi
1663
1664 append buf_rdi [read $fd]
868c8752
SP
1665 set c 0
1666 set n [string length $buf_rdi]
1667 while {$c < $n} {
1668 set z1 [string first "\0" $buf_rdi $c]
1669 if {$z1 == -1} break
1670 incr z1
1671 set z2 [string first "\0" $buf_rdi $z1]
1672 if {$z2 == -1} break
1673
868c8752 1674 incr c
86291555 1675 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
51a989ba 1676 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1461c5f3 1677 merge_state \
e2039e94 1678 [encoding convertfrom utf-8 $p] \
86291555
SP
1679 [lindex $i 4]? \
1680 [list [lindex $i 0] [lindex $i 2]] \
1461c5f3
SP
1681 [list]
1682 set c $z2
86291555 1683 incr c
cb07fc2a 1684 }
868c8752
SP
1685 if {$c < $n} {
1686 set buf_rdi [string range $buf_rdi $c end]
1687 } else {
1688 set buf_rdi {}
1689 }
1690
8f52548a 1691 rescan_done $fd buf_rdi $after
cb07fc2a
SP
1692}
1693
8f52548a 1694proc read_diff_files {fd after} {
cb07fc2a
SP
1695 global buf_rdf
1696
1697 append buf_rdf [read $fd]
868c8752
SP
1698 set c 0
1699 set n [string length $buf_rdf]
1700 while {$c < $n} {
1701 set z1 [string first "\0" $buf_rdf $c]
1702 if {$z1 == -1} break
1703 incr z1
1704 set z2 [string first "\0" $buf_rdf $z1]
1705 if {$z2 == -1} break
1706
868c8752 1707 incr c
86291555 1708 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
51a989ba 1709 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1461c5f3 1710 merge_state \
e2039e94 1711 [encoding convertfrom utf-8 $p] \
86291555 1712 ?[lindex $i 4] \
1461c5f3 1713 [list] \
86291555 1714 [list [lindex $i 0] [lindex $i 2]]
1461c5f3 1715 set c $z2
86291555 1716 incr c
868c8752
SP
1717 }
1718 if {$c < $n} {
1719 set buf_rdf [string range $buf_rdf $c end]
1720 } else {
1721 set buf_rdf {}
cb07fc2a 1722 }
868c8752 1723
8f52548a 1724 rescan_done $fd buf_rdf $after
cb07fc2a
SP
1725}
1726
8f52548a 1727proc read_ls_others {fd after} {
cb07fc2a
SP
1728 global buf_rlo
1729
1730 append buf_rlo [read $fd]
1731 set pck [split $buf_rlo "\0"]
1732 set buf_rlo [lindex $pck end]
1733 foreach p [lrange $pck 0 end-1] {
e2039e94 1734 set p [encoding convertfrom utf-8 $p]
89384101
SP
1735 if {[string index $p end] eq {/}} {
1736 set p [string range $p 0 end-1]
1737 }
1738 merge_state $p ?O
cb07fc2a 1739 }
8f52548a 1740 rescan_done $fd buf_rlo $after
cb07fc2a
SP
1741}
1742
8f52548a 1743proc rescan_done {fd buf after} {
f522c9b5 1744 global rescan_active current_diff_path
f7f8d322 1745 global file_states repo_config
7f1df79b 1746 upvar $buf to_clear
cb07fc2a 1747
f7f8d322
SP
1748 if {![eof $fd]} return
1749 set to_clear {}
1750 close $fd
8f52548a 1751 if {[incr rescan_active -1] > 0} return
93f654df 1752
24263b77 1753 prune_selection
f7f8d322
SP
1754 unlock_index
1755 display_all_files
7cf4566f
AG
1756 if {$current_diff_path ne {}} { reshow_diff $after }
1757 if {$current_diff_path eq {}} { select_first_diff $after }
cb07fc2a
SP
1758}
1759
24263b77
SP
1760proc prune_selection {} {
1761 global file_states selected_paths
1762
1763 foreach path [array names selected_paths] {
1764 if {[catch {set still_here $file_states($path)}]} {
1765 unset selected_paths($path)
1766 }
1767 }
1768}
1769
cb07fc2a
SP
1770######################################################################
1771##
f522c9b5 1772## ui helpers
cb07fc2a 1773
f522c9b5
SP
1774proc mapicon {w state path} {
1775 global all_icons
1776
1777 if {[catch {set r $all_icons($state$w)}]} {
1778 puts "error: no icon for $w state={$state} $path"
1779 return file_plain
1780 }
1781 return $r
1782}
cb07fc2a 1783
f522c9b5
SP
1784proc mapdesc {state path} {
1785 global all_descs
03e4ec53 1786
f522c9b5
SP
1787 if {[catch {set r $all_descs($state)}]} {
1788 puts "error: no desc for state={$state} $path"
1789 return $state
1790 }
1791 return $r
1792}
03e4ec53 1793
699d5601 1794proc ui_status {msg} {
906ab7f6
SP
1795 global main_status
1796 if {[info exists main_status]} {
1797 $main_status show $msg
1798 }
699d5601
SP
1799}
1800
1801proc ui_ready {{test {}}} {
906ab7f6
SP
1802 global main_status
1803 if {[info exists main_status]} {
1804 $main_status show [mc "Ready."] $test
1805 }
699d5601
SP
1806}
1807
f522c9b5
SP
1808proc escape_path {path} {
1809 regsub -all {\\} $path "\\\\" path
1810 regsub -all "\n" $path "\\n" path
1811 return $path
cb07fc2a
SP
1812}
1813
f522c9b5
SP
1814proc short_path {path} {
1815 return [escape_path [lindex [file split $path] end]]
7f1df79b
SP
1816}
1817
f522c9b5
SP
1818set next_icon_id 0
1819set null_sha1 [string repeat 0 40]
16403d0b 1820
f522c9b5
SP
1821proc merge_state {path new_state {head_info {}} {index_info {}}} {
1822 global file_states next_icon_id null_sha1
16403d0b 1823
f522c9b5
SP
1824 set s0 [string index $new_state 0]
1825 set s1 [string index $new_state 1]
16403d0b 1826
f522c9b5
SP
1827 if {[catch {set info $file_states($path)}]} {
1828 set state __
1829 set icon n[incr next_icon_id]
1830 } else {
1831 set state [lindex $info 0]
1832 set icon [lindex $info 1]
1833 if {$head_info eq {}} {set head_info [lindex $info 2]}
1834 if {$index_info eq {}} {set index_info [lindex $info 3]}
1835 }
16403d0b 1836
f522c9b5
SP
1837 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1838 elseif {$s0 eq {_}} {set s0 _}
124355d3 1839
f522c9b5
SP
1840 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1841 elseif {$s1 eq {_}} {set s1 _}
16403d0b 1842
f522c9b5
SP
1843 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1844 set head_info [list 0 $null_sha1]
1845 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1846 && $head_info eq {}} {
1847 set head_info $index_info
7ec2b69f
JL
1848 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1849 set index_info $head_info
1850 set head_info {}
f522c9b5 1851 }
16403d0b 1852
f522c9b5
SP
1853 set file_states($path) [list $s0$s1 $icon \
1854 $head_info $index_info \
1855 ]
1856 return $state
1857}
cb07fc2a 1858
f522c9b5
SP
1859proc display_file_helper {w path icon_name old_m new_m} {
1860 global file_lists
cb07fc2a 1861
f522c9b5 1862 if {$new_m eq {_}} {
156b2921 1863 set lno [lsearch -sorted -exact $file_lists($w) $path]
5f8b70b1 1864 if {$lno >= 0} {
f522c9b5 1865 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
5f8b70b1 1866 incr lno
f522c9b5
SP
1867 $w conf -state normal
1868 $w delete $lno.0 [expr {$lno + 1}].0
1869 $w conf -state disabled
03e4ec53 1870 }
f522c9b5
SP
1871 } elseif {$old_m eq {_} && $new_m ne {_}} {
1872 lappend file_lists($w) $path
1873 set file_lists($w) [lsort -unique $file_lists($w)]
1874 set lno [lsearch -sorted -exact $file_lists($w) $path]
1875 incr lno
1876 $w conf -state normal
1877 $w image create $lno.0 \
1878 -align center -padx 5 -pady 1 \
1879 -name $icon_name \
1880 -image [mapicon $w $new_m $path]
1881 $w insert $lno.1 "[escape_path $path]\n"
1882 $w conf -state disabled
1883 } elseif {$old_m ne $new_m} {
1884 $w conf -state normal
1885 $w image conf $icon_name -image [mapicon $w $new_m $path]
1886 $w conf -state disabled
03e4ec53 1887 }
f522c9b5
SP
1888}
1889
1890proc display_file {path state} {
1891 global file_states selected_paths
1892 global ui_index ui_workdir
03e4ec53 1893
f522c9b5 1894 set old_m [merge_state $path $state]
cb07fc2a 1895 set s $file_states($path)
f522c9b5
SP
1896 set new_m [lindex $s 0]
1897 set icon_name [lindex $s 1]
82cb8706 1898
f522c9b5
SP
1899 set o [string index $old_m 0]
1900 set n [string index $new_m 0]
1901 if {$o eq {U}} {
1902 set o _
1903 }
1904 if {$n eq {U}} {
1905 set n _
cb07fc2a 1906 }
f522c9b5 1907 display_file_helper $ui_index $path $icon_name $o $n
cb07fc2a 1908
f522c9b5
SP
1909 if {[string index $old_m 0] eq {U}} {
1910 set o U
1911 } else {
1912 set o [string index $old_m 1]
82cb8706 1913 }
f522c9b5
SP
1914 if {[string index $new_m 0] eq {U}} {
1915 set n U
1916 } else {
1917 set n [string index $new_m 1]
82cb8706 1918 }
f522c9b5
SP
1919 display_file_helper $ui_workdir $path $icon_name $o $n
1920
1921 if {$new_m eq {__}} {
1922 unset file_states($path)
1923 catch {unset selected_paths($path)}
cb07fc2a 1924 }
f522c9b5 1925}
cb07fc2a 1926
f522c9b5
SP
1927proc display_all_files_helper {w path icon_name m} {
1928 global file_lists
1929
1930 lappend file_lists($w) $path
1931 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1932 $w image create end \
1933 -align center -padx 5 -pady 1 \
1934 -name $icon_name \
1935 -image [mapicon $w $m $path]
1936 $w insert end "[escape_path $path]\n"
cb07fc2a
SP
1937}
1938
dd6451f9 1939set files_warning 0
f522c9b5
SP
1940proc display_all_files {} {
1941 global ui_index ui_workdir
1942 global file_states file_lists
1943 global last_clicked
dd6451f9 1944 global files_warning
cb07fc2a 1945
f522c9b5
SP
1946 $ui_index conf -state normal
1947 $ui_workdir conf -state normal
cb07fc2a 1948
f522c9b5
SP
1949 $ui_index delete 0.0 end
1950 $ui_workdir delete 0.0 end
1951 set last_clicked {}
cb07fc2a 1952
f522c9b5
SP
1953 set file_lists($ui_index) [list]
1954 set file_lists($ui_workdir) [list]
16403d0b 1955
dd6451f9
DZ
1956 set to_display [lsort [array names file_states]]
1957 set display_limit [get_config gui.maxfilesdisplayed]
a117fa21 1958 set displayed 0
dd6451f9 1959 foreach path $to_display {
f522c9b5
SP
1960 set s $file_states($path)
1961 set m [lindex $s 0]
1962 set icon_name [lindex $s 1]
1963
a117fa21
CK
1964 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1965 if {!$files_warning} {
1966 # do not repeatedly warn:
1967 set files_warning 1
1968 info_popup [mc "Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." \
1969 $display_limit [llength $to_display]]
1970 }
1971 continue
1972 }
1973
f522c9b5
SP
1974 set s [string index $m 0]
1975 if {$s ne {U} && $s ne {_}} {
1976 display_all_files_helper $ui_index $path \
1977 $icon_name $s
16403d0b 1978 }
cb07fc2a 1979
f522c9b5
SP
1980 if {[string index $m 0] eq {U}} {
1981 set s U
1982 } else {
1983 set s [string index $m 1]
a25c5189 1984 }
f522c9b5
SP
1985 if {$s ne {_}} {
1986 display_all_files_helper $ui_workdir $path \
1987 $icon_name $s
a117fa21 1988 incr displayed
a25c5189
SP
1989 }
1990 }
1991
f522c9b5
SP
1992 $ui_index conf -state disabled
1993 $ui_workdir conf -state disabled
a25c5189
SP
1994}
1995
ec6b424a
SP
1996######################################################################
1997##
f522c9b5 1998## icons
ec6b424a 1999
f522c9b5
SP
2000set filemask {
2001#define mask_width 14
2002#define mask_height 15
2003static unsigned char mask_bits[] = {
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2007}
cb07fc2a
SP
2008
2009image create bitmap file_plain -background white -foreground black -data {
2010#define plain_width 14
2011#define plain_height 15
2012static unsigned char plain_bits[] = {
2013 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2016} -maskdata $filemask
2017
2018image create bitmap file_mod -background white -foreground blue -data {
2019#define mod_width 14
2020#define mod_height 15
2021static unsigned char mod_bits[] = {
2022 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2025} -maskdata $filemask
2026
131f503b
SP
2027image create bitmap file_fulltick -background white -foreground "#007000" -data {
2028#define file_fulltick_width 14
2029#define file_fulltick_height 15
2030static unsigned char file_fulltick_bits[] = {
cb07fc2a
SP
2031 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2034} -maskdata $filemask
2035
cb07fc2a
SP
2036image create bitmap file_question -background white -foreground black -data {
2037#define file_question_width 14
2038#define file_question_height 15
2039static unsigned char file_question_bits[] = {
2040 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2043} -maskdata $filemask
2044
2045image create bitmap file_removed -background white -foreground red -data {
2046#define file_removed_width 14
2047#define file_removed_height 15
2048static unsigned char file_removed_bits[] = {
2049 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2052} -maskdata $filemask
2053
2054image create bitmap file_merge -background white -foreground blue -data {
2055#define file_merge_width 14
2056#define file_merge_height 15
2057static unsigned char file_merge_bits[] = {
2058 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2061} -maskdata $filemask
2062
e681cb7d 2063image create bitmap file_statechange -background white -foreground green -data {
bf5fe3f3
BW
2064#define file_statechange_width 14
2065#define file_statechange_height 15
e681cb7d
GH
2066static unsigned char file_statechange_bits[] = {
2067 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2070} -maskdata $filemask
2071
6b292675 2072set ui_index .vpane.files.index.list
0812665e 2073set ui_workdir .vpane.files.workdir.list
21e409ad
SP
2074
2075set all_icons(_$ui_index) file_plain
0602de48 2076set all_icons(A$ui_index) file_plain
21e409ad
SP
2077set all_icons(M$ui_index) file_fulltick
2078set all_icons(D$ui_index) file_removed
2079set all_icons(U$ui_index) file_merge
e681cb7d 2080set all_icons(T$ui_index) file_statechange
21e409ad
SP
2081
2082set all_icons(_$ui_workdir) file_plain
2083set all_icons(M$ui_workdir) file_mod
2084set all_icons(D$ui_workdir) file_question
3b4db3c1 2085set all_icons(U$ui_workdir) file_merge
21e409ad 2086set all_icons(O$ui_workdir) file_plain
e681cb7d 2087set all_icons(T$ui_workdir) file_statechange
21e409ad 2088
131f503b 2089set max_status_desc 0
cb07fc2a 2090foreach i {
1ac17950
CS
2091 {__ {mc "Unmodified"}}
2092
2093 {_M {mc "Modified, not staged"}}
2094 {M_ {mc "Staged for commit"}}
2095 {MM {mc "Portions staged for commit"}}
2096 {MD {mc "Staged for commit, missing"}}
2097
e681cb7d 2098 {_T {mc "File type changed, not staged"}}
7587f4d3
BW
2099 {MT {mc "File type changed, old type staged for commit"}}
2100 {AT {mc "File type changed, old type staged for commit"}}
e681cb7d 2101 {T_ {mc "File type changed, staged"}}
7587f4d3
BW
2102 {TM {mc "File type change staged, modification not staged"}}
2103 {TD {mc "File type change staged, file missing"}}
e681cb7d 2104
1ac17950
CS
2105 {_O {mc "Untracked, not staged"}}
2106 {A_ {mc "Staged for commit"}}
2107 {AM {mc "Portions staged for commit"}}
2108 {AD {mc "Staged for commit, missing"}}
2109
2110 {_D {mc "Missing"}}
2111 {D_ {mc "Staged for removal"}}
2112 {DO {mc "Staged for removal, still present"}}
2113
ff515d81 2114 {_U {mc "Requires merge resolution"}}
1ac17950
CS
2115 {U_ {mc "Requires merge resolution"}}
2116 {UU {mc "Requires merge resolution"}}
2117 {UM {mc "Requires merge resolution"}}
2118 {UD {mc "Requires merge resolution"}}
ff515d81 2119 {UT {mc "Requires merge resolution"}}
cb07fc2a 2120 } {
1ac17950
CS
2121 set text [eval [lindex $i 1]]
2122 if {$max_status_desc < [string length $text]} {
2123 set max_status_desc [string length $text]
131f503b 2124 }
1ac17950 2125 set all_descs([lindex $i 0]) $text
cb07fc2a 2126}
21e409ad 2127unset i
cb07fc2a
SP
2128
2129######################################################################
2130##
2131## util
2132
35874c16
SP
2133proc scrollbar2many {list mode args} {
2134 foreach w $list {eval $w $mode $args}
2135}
2136
2137proc many2scrollbar {list mode sb top bottom} {
2138 $sb set $top $bottom
2139 foreach w $list {$w $mode moveto $top}
2140}
2141
b4946930
SP
2142proc incr_font_size {font {amt 1}} {
2143 set sz [font configure $font -size]
2144 incr sz $amt
2145 font configure $font -size $sz
2146 font configure ${font}bold -size $sz
debcd0fd 2147 font configure ${font}italic -size $sz
b4946930
SP
2148}
2149
cb07fc2a
SP
2150######################################################################
2151##
2152## ui commands
2153
1ac17950 2154set starting_gitk_msg [mc "Starting gitk... please wait..."]
cc4b1c02 2155
25476c63
JL
2156proc do_gitk {revs {is_submodule false}} {
2157 global current_diff_path file_states current_diff_side ui_index
a9fa11fe 2158 global _gitdir _gitworktree
25476c63 2159
20ddfcaa
SP
2160 # -- Always start gitk through whatever we were loaded with. This
2161 # lets us bypass using shell process on Windows systems.
2162 #
79317e5d 2163 set exe [_which gitk -script]
02efd48f 2164 set cmd [list [info nameofexecutable] $exe]
15430be5
AMS
2165 if {$exe eq {}} {
2166 error_popup [mc "Couldn't find gitk in PATH"]
cb07fc2a 2167 } else {
501e4c6f
SP
2168 global env
2169
501e4c6f 2170 set pwd [pwd]
501e4c6f 2171
25476c63 2172 if {!$is_submodule} {
29e5573d 2173 if {![is_bare]} {
21985a11
GB
2174 cd $_gitworktree
2175 }
25476c63
JL
2176 } else {
2177 cd $current_diff_path
2178 if {$revs eq {--}} {
2179 set s $file_states($current_diff_path)
2180 set old_sha1 {}
2181 set new_sha1 {}
2182 switch -glob -- [lindex $s 0] {
2183 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2184 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2185 MM {
2186 if {$current_diff_side eq $ui_index} {
2187 set old_sha1 [lindex [lindex $s 2] 1]
2188 set new_sha1 [lindex [lindex $s 3] 1]
2189 } else {
2190 set old_sha1 [lindex [lindex $s 3] 1]
2191 }
2192 }
2193 }
2194 set revs $old_sha1...$new_sha1
2195 }
a9fa11fe
GB
2196 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2197 # we've been using for the main repository, so unset them.
2198 # TODO we could make life easier (start up faster?) for gitk
2199 # by setting these to the appropriate values to allow gitk
2200 # to skip the heuristics to find their proper value
2201 unset env(GIT_DIR)
2202 unset env(GIT_WORK_TREE)
25476c63 2203 }
e27d106e 2204 eval exec $cmd $revs "--" "--" &
501e4c6f 2205
a9fa11fe
GB
2206 set env(GIT_DIR) $_gitdir
2207 set env(GIT_WORK_TREE) $_gitworktree
25476c63
JL
2208 cd $pwd
2209
2210 ui_status $::starting_gitk_msg
2211 after 10000 {
2212 ui_ready $starting_gitk_msg
2213 }
2214 }
2215}
2216
2217proc do_git_gui {} {
2218 global current_diff_path
2219
2220 # -- Always start git gui through whatever we were loaded with. This
2221 # lets us bypass using shell process on Windows systems.
2222 #
831cc7eb 2223 set exe [list [_which git]]
25476c63
JL
2224 if {$exe eq {}} {
2225 error_popup [mc "Couldn't find git gui in PATH"]
2226 } else {
2227 global env
a9fa11fe 2228 global _gitdir _gitworktree
25476c63 2229
a9fa11fe
GB
2230 # see note in do_gitk about unsetting these vars when
2231 # running tools in a submodule
2232 unset env(GIT_DIR)
2233 unset env(GIT_WORK_TREE)
25476c63
JL
2234
2235 set pwd [pwd]
2236 cd $current_diff_path
2237
2238 eval exec $exe gui &
2239
a9fa11fe
GB
2240 set env(GIT_DIR) $_gitdir
2241 set env(GIT_WORK_TREE) $_gitworktree
501e4c6f
SP
2242 cd $pwd
2243
02efd48f 2244 ui_status $::starting_gitk_msg
d0752429 2245 after 10000 {
699d5601 2246 ui_ready $starting_gitk_msg
d0752429 2247 }
cb07fc2a
SP
2248 }
2249}
2250
afd54240 2251proc do_explore {} {
21985a11 2252 global _gitworktree
afd54240
PB
2253 set explorer {}
2254 if {[is_Cygwin] || [is_Windows]} {
2255 set explorer "explorer.exe"
2256 } elseif {[is_MacOSX]} {
2257 set explorer "open"
2258 } else {
2259 # freedesktop.org-conforming system is our best shot
2260 set explorer "xdg-open"
2261 }
2e0cda65 2262 eval exec $explorer [list [file nativename $_gitworktree]] &
afd54240
PB
2263}
2264
b5834d70 2265set is_quitting 0
1e65c622 2266set ret_code 1
c4fe7728 2267
1e65c622
AG
2268proc terminate_me {win} {
2269 global ret_code
2270 if {$win ne {.}} return
2271 exit $ret_code
2272}
2273
2274proc do_quit {{rc {1}}} {
c950c66e 2275 global ui_comm is_quitting repo_config commit_type
4578c5cb 2276 global GITGUI_BCK_exists GITGUI_BCK_i
95b002ee 2277 global ui_comm_spell
c80d7be5 2278 global ret_code use_ttk
c4fe7728 2279
b5834d70
SP
2280 if {$is_quitting} return
2281 set is_quitting 1
131f503b 2282
db7f34d4
SP
2283 if {[winfo exists $ui_comm]} {
2284 # -- Stash our current commit buffer.
2285 #
2286 set save [gitdir GITGUI_MSG]
4578c5cb
SP
2287 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2288 file rename -force [gitdir GITGUI_BCK] $save
2289 set GITGUI_BCK_exists 0
db7f34d4 2290 } else {
4578c5cb
SP
2291 set msg [string trim [$ui_comm get 0.0 end]]
2292 regsub -all -line {[ \r\t]+$} $msg {} msg
2293 if {(![string match amend* $commit_type]
2294 || [$ui_comm edit modified])
2295 && $msg ne {}} {
2296 catch {
2297 set fd [open $save w]
fda1ba02 2298 fconfigure $fd -encoding utf-8
4578c5cb
SP
2299 puts -nonewline $fd $msg
2300 close $fd
2301 }
2302 } else {
2303 catch {file delete $save}
2304 }
2305 }
2306
95b002ee
SP
2307 # -- Cancel our spellchecker if its running.
2308 #
2309 if {[info exists ui_comm_spell]} {
2310 $ui_comm_spell stop
2311 }
2312
4578c5cb
SP
2313 # -- Remove our editor backup, its not needed.
2314 #
2315 after cancel $GITGUI_BCK_i
2316 if {$GITGUI_BCK_exists} {
2317 catch {file delete [gitdir GITGUI_BCK]}
131f503b 2318 }
131f503b 2319
db7f34d4
SP
2320 # -- Stash our current window geometry into this repository.
2321 #
ed7b6033
AB
2322 set cfg_wmstate [wm state .]
2323 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2324 set rc_wmstate {}
2325 }
2326 if {$cfg_wmstate ne $rc_wmstate} {
2327 catch {git config gui.wmstate $cfg_wmstate}
2328 }
2329 if {$cfg_wmstate eq {zoomed}} {
2330 # on Windows wm geometry will lie about window
2331 # position (but not size) when window is zoomed
2332 # restore the window before querying wm geometry
2333 wm state . normal
2334 }
db7f34d4
SP
2335 set cfg_geometry [list]
2336 lappend cfg_geometry [wm geometry .]
c80d7be5
PT
2337 if {$use_ttk} {
2338 lappend cfg_geometry [.vpane sashpos 0]
2339 lappend cfg_geometry [.vpane.files sashpos 0]
2340 } else {
2341 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2342 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2343 }
db7f34d4
SP
2344 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2345 set rc_geometry {}
2346 }
2347 if {$cfg_geometry ne $rc_geometry} {
81347223 2348 catch {git config gui.geometry $cfg_geometry}
db7f34d4 2349 }
51f4d16b
SP
2350 }
2351
1e65c622 2352 set ret_code $rc
60204ddb
JM
2353
2354 # Briefly enable send again, working around Tk bug
2355 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2356 tk appname [appname]
2357
cb07fc2a
SP
2358 destroy .
2359}
2360
2361proc do_rescan {} {
699d5601 2362 rescan ui_ready
cb07fc2a
SP
2363}
2364
8056cc4f 2365proc ui_do_rescan {} {
7cf4566f 2366 rescan {force_first_diff ui_ready}
8056cc4f
AG
2367}
2368
6e27d826 2369proc do_commit {} {
ec6b424a 2370 commit_tree
6e27d826
SP
2371}
2372
7cf4566f 2373proc next_diff {{after {}}} {
8a965b8e 2374 global next_diff_p next_diff_w next_diff_i
7cf4566f 2375 show_diff $next_diff_p $next_diff_w {} {} $after
29853b90
AG
2376}
2377
2378proc find_anchor_pos {lst name} {
2379 set lid [lsearch -sorted -exact $lst $name]
2380
2381 if {$lid == -1} {
2382 set lid 0
2383 foreach lname $lst {
2384 if {$lname >= $name} break
2385 incr lid
2386 }
2387 }
2388
2389 return $lid
2390}
2391
2392proc find_file_from {flist idx delta path mmask} {
2393 global file_states
2394
2395 set len [llength $flist]
2396 while {$idx >= 0 && $idx < $len} {
2397 set name [lindex $flist $idx]
2398
2399 if {$name ne $path && [info exists file_states($name)]} {
2400 set state [lindex $file_states($name) 0]
2401
2402 if {$mmask eq {} || [regexp $mmask $state]} {
2403 return $idx
2404 }
2405 }
2406
2407 incr idx $delta
2408 }
2409
2410 return {}
2411}
2412
2413proc find_next_diff {w path {lno {}} {mmask {}}} {
2414 global next_diff_p next_diff_w next_diff_i
2415 global file_lists ui_index ui_workdir
2416
2417 set flist $file_lists($w)
2418 if {$lno eq {}} {
2419 set lno [find_anchor_pos $flist $path]
2420 } else {
2421 incr lno -1
2422 }
2423
2424 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2425 if {$w eq $ui_index} {
2426 set mmask "^$mmask"
2427 } else {
2428 set mmask "$mmask\$"
2429 }
2430 }
2431
2432 set idx [find_file_from $flist $lno 1 $path $mmask]
2433 if {$idx eq {}} {
2434 incr lno -1
2435 set idx [find_file_from $flist $lno -1 $path $mmask]
2436 }
2437
2438 if {$idx ne {}} {
2439 set next_diff_w $w
2440 set next_diff_p [lindex $flist $idx]
2441 set next_diff_i [expr {$idx+1}]
2442 return 1
2443 } else {
2444 return 0
2445 }
2446}
2447
2448proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2449 global current_diff_path
2450
2451 if {$path ne $current_diff_path} {
2452 return {}
2453 } elseif {[find_next_diff $w $path $lno $mmask]} {
2454 return {next_diff;}
2455 } else {
2456 return {reshow_diff;}
2457 }
2458}
2459
7cf4566f 2460proc select_first_diff {after} {
29853b90
AG
2461 global ui_workdir
2462
2463 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2464 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
7cf4566f
AG
2465 next_diff $after
2466 } else {
2467 uplevel #0 $after
29853b90 2468 }
8a965b8e
AMS
2469}
2470
7cf4566f
AG
2471proc force_first_diff {after} {
2472 global ui_workdir current_diff_path file_states
8056cc4f
AG
2473
2474 if {[info exists file_states($current_diff_path)]} {
2475 set state [lindex $file_states($current_diff_path) 0]
7cf4566f
AG
2476 } else {
2477 set state {OO}
2478 }
8056cc4f 2479
7cf4566f
AG
2480 set reselect 0
2481 if {[string first {U} $state] >= 0} {
2482 # Already a conflict, do nothing
2483 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2484 set reselect 1
2485 } elseif {[string index $state 1] ne {O}} {
2486 # Already a diff & no conflicts, do nothing
2487 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2488 set reselect 1
8056cc4f
AG
2489 }
2490
7cf4566f
AG
2491 if {$reselect} {
2492 next_diff $after
2493 } else {
2494 uplevel #0 $after
2495 }
8056cc4f
AG
2496}
2497
088ad75d 2498proc toggle_or_diff {mode w args} {
20a53c02 2499 global file_states file_lists current_diff_path ui_index ui_workdir
e07446ed 2500 global last_clicked selected_paths file_lists_last_clicked
131f503b 2501
088ad75d
PT
2502 if {$mode eq "click"} {
2503 foreach {x y} $args break
2504 set pos [split [$w index @$x,$y] .]
2505 foreach {lno col} $pos break
2506 } else {
2507 if {$last_clicked ne {}} {
2508 set lno [lindex $last_clicked 1]
2509 } else {
2510 set lno [expr {int([lindex [$w tag ranges in_diff] 0])}]
2511 }
2512 if {$mode eq "toggle"} {
2513 set col 0; set y 2
2514 } else {
2515 incr lno [expr {$mode eq "up" ? -1 : 1}]
2516 set col 1
2517 }
2518 }
2519
24263b77
SP
2520 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2521 if {$path eq {}} {
2522 set last_clicked {}
2523 return
2524 }
2525
2526 set last_clicked [list $w $lno]
088ad75d 2527 focus $w
24263b77
SP
2528 array unset selected_paths
2529 $ui_index tag remove in_sel 0.0 end
0812665e 2530 $ui_workdir tag remove in_sel 0.0 end
cb07fc2a 2531
e07446ed
BSP
2532 set file_lists_last_clicked($w) $path
2533
3e34838c 2534 # Determine the state of the file
617ceee6
AG
2535 if {[info exists file_states($path)]} {
2536 set state [lindex $file_states($path) 0]
8056cc4f
AG
2537 } else {
2538 set state {__}
2539 }
2540
8056cc4f 2541 # Restage the file, or simply show the diff
cead78ed 2542 if {$col == 0 && $y > 1} {
3e34838c
AG
2543 # Conflicts need special handling
2544 if {[string first {U} $state] >= 0} {
0aea2842
AG
2545 # $w must always be $ui_workdir, but...
2546 if {$w ne $ui_workdir} { set lno {} }
2547 merge_stage_workdir $path $lno
3e34838c
AG
2548 return
2549 }
2550
8056cc4f
AG
2551 if {[string index $state 1] eq {O}} {
2552 set mmask {}
2553 } else {
2554 set mmask {[^O]}
2555 }
2556
2557 set after [next_diff_after_action $w $path $lno $mmask]
8a965b8e 2558
de5f6d5d 2559 if {$w eq $ui_index} {
74d18d2e 2560 update_indexinfo \
93e912c5 2561 "Unstaging [short_path $path] from commit" \
74d18d2e 2562 [list $path] \
699d5601 2563 [concat $after [list ui_ready]]
de5f6d5d 2564 } elseif {$w eq $ui_workdir} {
74d18d2e 2565 update_index \
4d583c86 2566 "Adding [short_path $path]" \
74d18d2e 2567 [list $path] \
699d5601 2568 [concat $after [list ui_ready]]
74d18d2e 2569 }
24263b77 2570 } else {
a8ca7869 2571 set selected_paths($path) 1
03e4ec53 2572 show_diff $path $w $lno
cb07fc2a
SP
2573 }
2574}
2575
24263b77 2576proc add_one_to_selection {w x y} {
833eda73 2577 global file_lists last_clicked selected_paths
7f1df79b 2578
833eda73 2579 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
2580 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2581 if {$path eq {}} {
2582 set last_clicked {}
2583 return
2584 }
cb07fc2a 2585
833eda73
SP
2586 if {$last_clicked ne {}
2587 && [lindex $last_clicked 0] ne $w} {
2588 array unset selected_paths
2589 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2590 }
2591
24263b77
SP
2592 set last_clicked [list $w $lno]
2593 if {[catch {set in_sel $selected_paths($path)}]} {
2594 set in_sel 0
2595 }
2596 if {$in_sel} {
2597 unset selected_paths($path)
2598 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2599 } else {
2600 set selected_paths($path) 1
2601 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2602 }
2603}
2604
2605proc add_range_to_selection {w x y} {
833eda73 2606 global file_lists last_clicked selected_paths
24263b77
SP
2607
2608 if {[lindex $last_clicked 0] ne $w} {
088ad75d 2609 toggle_or_diff click $w $x $y
24263b77 2610 return
cb07fc2a 2611 }
24263b77 2612
833eda73 2613 set lno [lindex [split [$w index @$x,$y] .] 0]
24263b77
SP
2614 set lc [lindex $last_clicked 1]
2615 if {$lc < $lno} {
2616 set begin $lc
2617 set end $lno
2618 } else {
2619 set begin $lno
2620 set end $lc
2621 }
2622
2623 foreach path [lrange $file_lists($w) \
2624 [expr {$begin - 1}] \
2625 [expr {$end - 1}]] {
2626 set selected_paths($path) 1
2627 }
2628 $w tag add in_sel $begin.0 [expr {$end + 1}].0
cb07fc2a
SP
2629}
2630
c91ee2bd
JS
2631proc show_more_context {} {
2632 global repo_config
2633 if {$repo_config(gui.diffcontext) < 99} {
2634 incr repo_config(gui.diffcontext)
2635 reshow_diff
2636 }
2637}
2638
2639proc show_less_context {} {
2640 global repo_config
55ba8a34 2641 if {$repo_config(gui.diffcontext) > 1} {
c91ee2bd
JS
2642 incr repo_config(gui.diffcontext) -1
2643 reshow_diff
2644 }
2645}
2646
e07446ed
BSP
2647proc focus_widget {widget} {
2648 global file_lists last_clicked selected_paths
2649 global file_lists_last_clicked
2650
2651 if {[llength $file_lists($widget)] > 0} {
2652 set path $file_lists_last_clicked($widget)
2653 set index [lsearch -sorted -exact $file_lists($widget) $path]
2654 if {$index < 0} {
2655 set index 0
2656 set path [lindex $file_lists($widget) $index]
2657 }
2658
2659 focus $widget
2660 set last_clicked [list $widget [expr $index + 1]]
2661 array unset selected_paths
2662 set selected_paths($path) 1
2663 show_diff $path $widget
2664 }
2665}
2666
cb07fc2a
SP
2667######################################################################
2668##
a4bee597 2669## ui construction
db453781 2670
2ebba528
SP
2671set ui_comm {}
2672
cb07fc2a 2673# -- Menu Bar
a49c67d1 2674#
b4946930 2675menu .mbar -tearoff 0
a91be3fc
DS
2676if {[is_MacOSX]} {
2677 # -- Apple Menu (Mac OS X only)
2678 #
2679 .mbar add cascade -label Apple -menu .mbar.apple
2680 menu .mbar.apple
2681}
1ac17950
CS
2682.mbar add cascade -label [mc Repository] -menu .mbar.repository
2683.mbar add cascade -label [mc Edit] -menu .mbar.edit
64a906f8 2684if {[is_enabled branch]} {
1ac17950 2685 .mbar add cascade -label [mc Branch] -menu .mbar.branch
700a65ce 2686}
2ebba528 2687if {[is_enabled multicommit] || [is_enabled singlecommit]} {
a9813cb5 2688 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2ebba528 2689}
64a906f8 2690if {[is_enabled transport]} {
1ac17950 2691 .mbar add cascade -label [mc Merge] -menu .mbar.merge
6bdf5e5f 2692 .mbar add cascade -label [mc Remote] -menu .mbar.remote
4ccdab02 2693}
0ce76ded
AG
2694if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2695 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2696}
cb07fc2a 2697
a4abfa62 2698# -- Repository Menu
a49c67d1 2699#
a4abfa62 2700menu .mbar.repository
35874c16 2701
29e5573d
GB
2702if {![is_bare]} {
2703 .mbar.repository add command \
2704 -label [mc "Explore Working Copy"] \
2705 -command {do_explore}
224cce8f
PT
2706}
2707
2708if {[is_Windows]} {
2709 .mbar.repository add command \
2710 -label [mc "Git Bash"] \
2711 -command {eval exec [auto_execok start] \
2712 [list "Git Bash" bash --login -l &]}
2713}
2714
2715if {[is_Windows] || ![is_bare]} {
29e5573d
GB
2716 .mbar.repository add separator
2717}
afd54240 2718
35874c16 2719.mbar.repository add command \
1ac17950 2720 -label [mc "Browse Current Branch's Files"] \
c74b6c66 2721 -command {browser::new $current_branch}
a8139888 2722set ui_browse_current [.mbar.repository index last]
8e891fac 2723.mbar.repository add command \
1ac17950 2724 -label [mc "Browse Branch Files..."] \
8e891fac 2725 -command browser_open::dialog
35874c16
SP
2726.mbar.repository add separator
2727
d0752429 2728.mbar.repository add command \
1ac17950 2729 -label [mc "Visualize Current Branch's History"] \
7416bbc6 2730 -command {do_gitk $current_branch}
a8139888 2731set ui_visualize_current [.mbar.repository index last]
5753ef1a 2732.mbar.repository add command \
1ac17950 2733 -label [mc "Visualize All Branch History"] \
7416bbc6 2734 -command {do_gitk --all}
d0752429 2735.mbar.repository add separator
75e355d6 2736
a8139888
SP
2737proc current_branch_write {args} {
2738 global current_branch
2739 .mbar.repository entryconf $::ui_browse_current \
1ac17950 2740 -label [mc "Browse %s's Files" $current_branch]
a8139888 2741 .mbar.repository entryconf $::ui_visualize_current \
1ac17950 2742 -label [mc "Visualize %s's History" $current_branch]
a8139888
SP
2743}
2744trace add variable current_branch write current_branch_write
2745
cf25ddc8 2746if {[is_enabled multicommit]} {
1ac17950 2747 .mbar.repository add command -label [mc "Database Statistics"] \
7416bbc6 2748 -command do_stats
0fd49d0a 2749
1ac17950 2750 .mbar.repository add command -label [mc "Compress Database"] \
7416bbc6 2751 -command do_gc
4aca740b 2752
1ac17950 2753 .mbar.repository add command -label [mc "Verify Database"] \
7416bbc6 2754 -command do_fsck_objects
444f92d0 2755
a4abfa62 2756 .mbar.repository add separator
75e355d6 2757
20ddfcaa
SP
2758 if {[is_Cygwin]} {
2759 .mbar.repository add command \
1ac17950 2760 -label [mc "Create Desktop Icon"] \
7416bbc6 2761 -command do_cygwin_shortcut
20ddfcaa 2762 } elseif {[is_Windows]} {
a4abfa62 2763 .mbar.repository add command \
1ac17950 2764 -label [mc "Create Desktop Icon"] \
7416bbc6 2765 -command do_windows_shortcut
06c31115 2766 } elseif {[is_MacOSX]} {
a4abfa62 2767 .mbar.repository add command \
1ac17950 2768 -label [mc "Create Desktop Icon"] \
7416bbc6 2769 -command do_macosx_app
4aca740b 2770 }
4ccdab02 2771}
85ab313e 2772
af894943
SF
2773if {[is_MacOSX]} {
2774 proc ::tk::mac::Quit {args} { do_quit }
2775} else {
2776 .mbar.repository add command -label [mc Quit] \
2777 -command do_quit \
2778 -accelerator $M1T-Q
2779}
cb07fc2a 2780
9861671d
SP
2781# -- Edit Menu
2782#
2783menu .mbar.edit
1ac17950 2784.mbar.edit add command -label [mc Undo] \
9861671d 2785 -command {catch {[focus] edit undo}} \
7416bbc6 2786 -accelerator $M1T-Z
1ac17950 2787.mbar.edit add command -label [mc Redo] \
9861671d 2788 -command {catch {[focus] edit redo}} \
7416bbc6 2789 -accelerator $M1T-Y
9861671d 2790.mbar.edit add separator
1ac17950 2791.mbar.edit add command -label [mc Cut] \
9861671d 2792 -command {catch {tk_textCut [focus]}} \
7416bbc6 2793 -accelerator $M1T-X
1ac17950 2794.mbar.edit add command -label [mc Copy] \
9861671d 2795 -command {catch {tk_textCopy [focus]}} \
7416bbc6 2796 -accelerator $M1T-C
1ac17950 2797.mbar.edit add command -label [mc Paste] \
9861671d 2798 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
7416bbc6 2799 -accelerator $M1T-V
1ac17950 2800.mbar.edit add command -label [mc Delete] \
9861671d 2801 -command {catch {[focus] delete sel.first sel.last}} \
7416bbc6 2802 -accelerator Del
9861671d 2803.mbar.edit add separator
1ac17950 2804.mbar.edit add command -label [mc "Select All"] \
9861671d 2805 -command {catch {[focus] tag add sel 0.0 end}} \
7416bbc6 2806 -accelerator $M1T-A
9861671d 2807
85ab313e
SP
2808# -- Branch Menu
2809#
64a906f8 2810if {[is_enabled branch]} {
700a65ce
SP
2811 menu .mbar.branch
2812
1ac17950 2813 .mbar.branch add command -label [mc "Create..."] \
b1fa2bff 2814 -command branch_create::dialog \
7416bbc6 2815 -accelerator $M1T-N
700a65ce
SP
2816 lappend disable_on_lock [list .mbar.branch entryconf \
2817 [.mbar.branch index last] -state]
2818
1ac17950 2819 .mbar.branch add command -label [mc "Checkout..."] \
d41b43eb
SP
2820 -command branch_checkout::dialog \
2821 -accelerator $M1T-O
2822 lappend disable_on_lock [list .mbar.branch entryconf \
2823 [.mbar.branch index last] -state]
2824
1ac17950 2825 .mbar.branch add command -label [mc "Rename..."] \
61f82ce7
SP
2826 -command branch_rename::dialog
2827 lappend disable_on_lock [list .mbar.branch entryconf \
2828 [.mbar.branch index last] -state]
2829
1ac17950 2830 .mbar.branch add command -label [mc "Delete..."] \
3206c63d 2831 -command branch_delete::dialog
700a65ce
SP
2832 lappend disable_on_lock [list .mbar.branch entryconf \
2833 [.mbar.branch index last] -state]
fd234dfd 2834
1ac17950 2835 .mbar.branch add command -label [mc "Reset..."] \
a6c9b081 2836 -command merge::reset_hard
fd234dfd
SP
2837 lappend disable_on_lock [list .mbar.branch entryconf \
2838 [.mbar.branch index last] -state]
700a65ce
SP
2839}
2840
cb07fc2a 2841# -- Commit Menu
a49c67d1 2842#
1e65c622
AG
2843proc commit_btn_caption {} {
2844 if {[is_enabled nocommit]} {
2845 return [mc "Done"]
2846 } else {
2847 return [mc Commit@@verb]
2848 }
2849}
2850
2ebba528
SP
2851if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2852 menu .mbar.commit
2853
1e02b32e 2854 if {![is_enabled nocommit]} {
ba41b5b3 2855 .mbar.commit add checkbutton \
1e02b32e 2856 -label [mc "Amend Last Commit"] \
ba41b5b3
BW
2857 -variable commit_type_is_amend \
2858 -command do_select_commit_type
1e02b32e
SP
2859 lappend disable_on_lock \
2860 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2861
2862 .mbar.commit add separator
2863 }
24ac9b75 2864
1ac17950 2865 .mbar.commit add command -label [mc Rescan] \
8056cc4f 2866 -command ui_do_rescan \
7416bbc6 2867 -accelerator F5
2ebba528
SP
2868 lappend disable_on_lock \
2869 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2870
1ac17950 2871 .mbar.commit add command -label [mc "Stage To Commit"] \
cd16a6c9
SP
2872 -command do_add_selection \
2873 -accelerator $M1T-T
2ebba528
SP
2874 lappend disable_on_lock \
2875 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2876
1ac17950 2877 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2ebba528 2878 -command do_add_all \
7416bbc6 2879 -accelerator $M1T-I
2ebba528
SP
2880 lappend disable_on_lock \
2881 [list .mbar.commit entryconf [.mbar.commit index last] -state]
24ac9b75 2882
1ac17950 2883 .mbar.commit add command -label [mc "Unstage From Commit"] \
b677c66e
VS
2884 -command do_unstage_selection \
2885 -accelerator $M1T-U
2ebba528
SP
2886 lappend disable_on_lock \
2887 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2888
1ac17950 2889 .mbar.commit add command -label [mc "Revert Changes"] \
b677c66e
VS
2890 -command do_revert_selection \
2891 -accelerator $M1T-J
2ebba528
SP
2892 lappend disable_on_lock \
2893 [list .mbar.commit entryconf [.mbar.commit index last] -state]
e734817d 2894
2ebba528 2895 .mbar.commit add separator
1461c5f3 2896
c91ee2bd
JS
2897 .mbar.commit add command -label [mc "Show Less Context"] \
2898 -command show_less_context \
729ffa50 2899 -accelerator $M1T-\-
c91ee2bd
JS
2900
2901 .mbar.commit add command -label [mc "Show More Context"] \
2902 -command show_more_context \
729ffa50 2903 -accelerator $M1T-=
c91ee2bd
JS
2904
2905 .mbar.commit add separator
2906
ed70e4d7 2907 if {![is_enabled nocommitmsg]} {
1e02b32e
SP
2908 .mbar.commit add command -label [mc "Sign Off"] \
2909 -command do_signoff \
2910 -accelerator $M1T-S
2911 }
24ac9b75 2912
1e65c622 2913 .mbar.commit add command -label [commit_btn_caption] \
2ebba528 2914 -command do_commit \
7416bbc6 2915 -accelerator $M1T-Return
2ebba528
SP
2916 lappend disable_on_lock \
2917 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2918}
cb07fc2a 2919
9b28a8b9
SP
2920# -- Merge Menu
2921#
2922if {[is_enabled branch]} {
2923 menu .mbar.merge
1ac17950 2924 .mbar.merge add command -label [mc "Local Merge..."] \
a870ddc0
SP
2925 -command merge::dialog \
2926 -accelerator $M1T-M
9b28a8b9
SP
2927 lappend disable_on_lock \
2928 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1ac17950 2929 .mbar.merge add command -label [mc "Abort Merge..."] \
a6c9b081 2930 -command merge::reset_hard
9b28a8b9
SP
2931 lappend disable_on_lock \
2932 [list .mbar.merge entryconf [.mbar.merge index last] -state]
9b28a8b9
SP
2933}
2934
2935# -- Transport Menu
2936#
2937if {[is_enabled transport]} {
6bdf5e5f 2938 menu .mbar.remote
9b28a8b9 2939
ba6485e0
PB
2940 .mbar.remote add command \
2941 -label [mc "Add..."] \
2942 -command remote_add::dialog \
2943 -accelerator $M1T-A
6bdf5e5f
SP
2944 .mbar.remote add command \
2945 -label [mc "Push..."] \
840bcfa7
SP
2946 -command do_push_anywhere \
2947 -accelerator $M1T-P
6bdf5e5f 2948 .mbar.remote add command \
3c1c2a00 2949 -label [mc "Delete Branch..."] \
aa252f19 2950 -command remote_branch_delete::dialog
9b28a8b9
SP
2951}
2952
0c8d7839 2953if {[is_MacOSX]} {
a91be3fc 2954 proc ::tk::mac::ShowPreferences {} {do_options}
0c8d7839
SP
2955} else {
2956 # -- Edit Menu
2957 #
2958 .mbar.edit add separator
1ac17950 2959 .mbar.edit add command -label [mc "Options..."] \
7416bbc6 2960 -command do_options
273984fc 2961}
557afe82 2962
0ce76ded
AG
2963# -- Tools Menu
2964#
2965if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2966 set tools_menubar .mbar.tools
2967 menu $tools_menubar
2968 $tools_menubar add separator
2969 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2970 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2971 set tools_tailcnt 3
2972 if {[array names repo_config guitool.*.cmd] ne {}} {
2973 tools_populate_all
2974 }
2975}
2976
273984fc
SP
2977# -- Help Menu
2978#
1ac17950 2979.mbar add cascade -label [mc Help] -menu .mbar.help
273984fc 2980menu .mbar.help
0c8d7839 2981
a91be3fc
DS
2982if {[is_MacOSX]} {
2983 .mbar.apple add command -label [mc "About %s" [appname]] \
2984 -command do_about
2985 .mbar.apple add separator
2986} else {
1ac17950 2987 .mbar.help add command -label [mc "About %s" [appname]] \
7416bbc6 2988 -command do_about
0c8d7839 2989}
a91be3fc 2990. configure -menu .mbar
2db21e70 2991
3eb5682b
MH
2992set doc_path [githtmldir]
2993if {$doc_path ne {}} {
2994 set doc_path [file join $doc_path index.html]
273984fc 2995
3eb5682b
MH
2996 if {[is_Cygwin]} {
2997 set doc_path [exec cygpath --mixed $doc_path]
2998 }
273984fc
SP
2999}
3000
273984fc
SP
3001if {[file isfile $doc_path]} {
3002 set doc_url "file:$doc_path"
3003} else {
3004 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
3005}
3006
2db21e70
PB
3007proc start_browser {url} {
3008 git "web--browse" $url
273984fc 3009}
2db21e70
PB
3010
3011.mbar.help add command -label [mc "Online Documentation"] \
3012 -command [list start_browser $doc_url]
98a6846b
AG
3013
3014.mbar.help add command -label [mc "Show SSH Key"] \
3015 -command do_ssh_key
3016
2db21e70 3017unset doc_path doc_url
82aa2354 3018
2ebba528
SP
3019# -- Standard bindings
3020#
39fa2a98 3021wm protocol . WM_DELETE_WINDOW do_quit
2ebba528
SP
3022bind all <$M1B-Key-q> do_quit
3023bind all <$M1B-Key-Q> do_quit
3024bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3025bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3026
3e45ee1e
SP
3027set subcommand_args {}
3028proc usage {} {
43c65a85 3029 set s "[mc usage:] $::argv0 $::subcommand $::subcommand_args"
ea47503d
PT
3030 if {[tk windowingsystem] eq "win32"} {
3031 wm withdraw .
7ae1e727
PT
3032 tk_messageBox -icon info -message $s \
3033 -title [mc "Usage"]
ea47503d
PT
3034 } else {
3035 puts stderr $s
3036 }
3e45ee1e
SP
3037 exit 1
3038}
3039
95e706b5
AG
3040proc normalize_relpath {path} {
3041 set elements {}
3042 foreach item [file split $path] {
3043 if {$item eq {.}} continue
3044 if {$item eq {..} && [llength $elements] > 0
3045 && [lindex $elements end] ne {..}} {
3046 set elements [lrange $elements 0 end-1]
3047 continue
3048 }
3049 lappend elements $item
3050 }
3051 return [eval file join $elements]
3052}
3053
2ebba528
SP
3054# -- Not a normal commit type invocation? Do that instead!
3055#
258871d3 3056switch -- $subcommand {
85d2d597 3057browser -
2ebba528 3058blame {
f7078b40
AG
3059 if {$subcommand eq "blame"} {
3060 set subcommand_args {[--line=<num>] rev? path}
3061 } else {
3062 set subcommand_args {rev? path}
3063 }
c52c9452 3064 if {$argv eq {}} usage
a0db0d61 3065 set head {}
3e45ee1e 3066 set path {}
f7078b40 3067 set jump_spec {}
3e45ee1e
SP
3068 set is_path 0
3069 foreach a $argv {
2f38dd03 3070 set p [file join $_prefix $a]
e3d06ca9 3071
2f38dd03 3072 if {$is_path || [file exists $p]} {
e3d06ca9 3073 if {$path ne {}} usage
2f38dd03 3074 set path [normalize_relpath $p]
e3d06ca9 3075 break
3e45ee1e
SP
3076 } elseif {$a eq {--}} {
3077 if {$path ne {}} {
a0db0d61
SP
3078 if {$head ne {}} usage
3079 set head $path
3e45ee1e
SP
3080 set path {}
3081 }
3082 set is_path 1
f7078b40
AG
3083 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
3084 if {$jump_spec ne {} || $head ne {}} usage
3085 set jump_spec [list $lnum]
a0db0d61
SP
3086 } elseif {$head eq {}} {
3087 if {$head ne {}} usage
3088 set head $a
c52c9452 3089 set is_path 1
3e45ee1e
SP
3090 } else {
3091 usage
3092 }
3093 }
3094 unset is_path
3095
c52c9452 3096 if {$head ne {} && $path eq {}} {
df46eda3
AW
3097 if {[string index $head 0] eq {/}} {
3098 set path [normalize_relpath $head]
3099 set head {}
3100 } else {
3101 set path [normalize_relpath $_prefix$head]
3102 set head {}
3103 }
c52c9452
SP
3104 }
3105
a0db0d61 3106 if {$head eq {}} {
d41b43eb 3107 load_current_branch
a0db0d61 3108 } else {
02087abc
SP
3109 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
3110 if {[catch {
3111 set head [git rev-parse --verify $head]
3112 } err]} {
7ae1e727
PT
3113 if {[tk windowingsystem] eq "win32"} {
3114 tk_messageBox -icon error -title [mc Error] -message $err
3115 } else {
3116 puts stderr $err
3117 }
02087abc
SP
3118 exit 1
3119 }
3120 }
a0db0d61 3121 set current_branch $head
2ebba528 3122 }
a0db0d61 3123
2810a58d 3124 wm deiconify .
85d2d597
SP
3125 switch -- $subcommand {
3126 browser {
f7078b40 3127 if {$jump_spec ne {}} usage
85d2d597
SP
3128 if {$head eq {}} {
3129 if {$path ne {} && [file isdirectory $path]} {
3130 set head $current_branch
3131 } else {
3132 set head $path
3133 set path {}
3134 }
3135 }
3136 browser::new $head $path
3137 }
3138 blame {
3139 if {$head eq {} && ![file exists $path]} {
78077772
PT
3140 catch {wm withdraw .}
3141 tk_messageBox \
3142 -icon error \
3143 -type ok \
3144 -title [mc "git-gui: fatal error"] \
3145 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
85d2d597
SP
3146 exit 1
3147 }
f7078b40 3148 blame::new $head $path $jump_spec
85d2d597 3149 }
c52c9452 3150 }
258871d3
SP
3151 return
3152}
3153citool -
3154gui {
3155 if {[llength $argv] != 0} {
7ae1e727 3156 usage
258871d3
SP
3157 }
3158 # fall through to setup UI for commits
2ebba528 3159}
2ebba528 3160default {
43c65a85 3161 set err "[mc usage:] $argv0 \[{blame|browser|citool}\]"
7ae1e727
PT
3162 if {[tk windowingsystem] eq "win32"} {
3163 wm withdraw .
3164 tk_messageBox -icon error -message $err \
3165 -title [mc "Usage"]
3166 } else {
3167 puts stderr $err
3168 }
2ebba528
SP
3169 exit 1
3170}
3171}
3172
8553b772
SP
3173# -- Branch Control
3174#
c80d7be5
PT
3175${NS}::frame .branch
3176if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3177${NS}::label .branch.l1 \
1ac17950 3178 -text [mc "Current Branch:"] \
8553b772 3179 -anchor w \
7416bbc6 3180 -justify left
c80d7be5 3181${NS}::label .branch.cb \
8553b772
SP
3182 -textvariable current_branch \
3183 -anchor w \
7416bbc6 3184 -justify left
8553b772
SP
3185pack .branch.l1 -side left
3186pack .branch.cb -side left -fill x
3187pack .branch -side top -fill x
3188
cb07fc2a 3189# -- Main Window Layout
a49c67d1 3190#
c80d7be5
PT
3191${NS}::panedwindow .vpane -orient horizontal
3192${NS}::panedwindow .vpane.files -orient vertical
3193if {$use_ttk} {
3194 .vpane add .vpane.files
3195} else {
3196 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3197}
cb07fc2a
SP
3198pack .vpane -anchor n -side top -fill both -expand 1
3199
30508bc4
PT
3200# -- Working Directory File List
3201
3202textframe .vpane.files.workdir -height 100 -width 200
3203tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3204 -background lightsalmon -foreground black
3205ttext $ui_workdir -background white -foreground black \
3206 -borderwidth 0 \
3207 -width 20 -height 10 \
3208 -wrap none \
3209 -takefocus 1 -highlightthickness 1\
3210 -cursor $cursor_ptr \
3211 -xscrollcommand {.vpane.files.workdir.sx set} \
3212 -yscrollcommand {.vpane.files.workdir.sy set} \
3213 -state disabled
3214${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3215${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3216pack .vpane.files.workdir.title -side top -fill x
3217pack .vpane.files.workdir.sx -side bottom -fill x
3218pack .vpane.files.workdir.sy -side right -fill y
3219pack $ui_workdir -side left -fill both -expand 1
3220
cb07fc2a 3221# -- Index File List
a49c67d1 3222#
30508bc4 3223textframe .vpane.files.index -height 100 -width 200
c80d7be5
PT
3224tlabel .vpane.files.index.title \
3225 -text [mc "Staged Changes (Will Commit)"] \
c382fdd7 3226 -background lightgreen -foreground black
30508bc4 3227ttext $ui_index -background white -foreground black \
c382fdd7 3228 -borderwidth 0 \
c5a1eb88 3229 -width 20 -height 10 \
3c236977 3230 -wrap none \
088ad75d 3231 -takefocus 1 -highlightthickness 1\
6c6dd01a 3232 -cursor $cursor_ptr \
3c236977
SP
3233 -xscrollcommand {.vpane.files.index.sx set} \
3234 -yscrollcommand {.vpane.files.index.sy set} \
cb07fc2a 3235 -state disabled
c80d7be5
PT
3236${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3237${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
cb07fc2a 3238pack .vpane.files.index.title -side top -fill x
3c236977
SP
3239pack .vpane.files.index.sx -side bottom -fill x
3240pack .vpane.files.index.sy -side right -fill y
cb07fc2a 3241pack $ui_index -side left -fill both -expand 1
cb07fc2a 3242
30508bc4 3243# -- Insert the workdir and index into the panes
a49c67d1 3244#
c80d7be5
PT
3245.vpane.files add .vpane.files.workdir
3246.vpane.files add .vpane.files.index
3247if {!$use_ttk} {
3248 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3249 .vpane.files paneconfigure .vpane.files.index -sticky news
3250}
cb07fc2a 3251
0812665e 3252foreach i [list $ui_index $ui_workdir] {
3849bfba
SP
3253 rmsel_tag $i
3254 $i tag conf in_diff -background [$i tag cget in_sel -background]
24263b77
SP
3255}
3256unset i
131f503b 3257
0fb8f9ce 3258# -- Diff and Commit Area
a49c67d1 3259#
02f6cfbd
MK
3260if {$have_tk85} {
3261 ${NS}::panedwindow .vpane.lower -orient vertical
3262 ${NS}::frame .vpane.lower.commarea
3263 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
3264 .vpane.lower add .vpane.lower.diff
3265 .vpane.lower add .vpane.lower.commarea
3266 .vpane add .vpane.lower
3267 if {$use_ttk} {
3268 .vpane.lower pane .vpane.lower.diff -weight 1
3269 .vpane.lower pane .vpane.lower.commarea -weight 0
3270 } else {
3271 .vpane.lower paneconfigure .vpane.lower.diff -stretch always
3272 .vpane.lower paneconfigure .vpane.lower.commarea -stretch never
3273 }
918dbf58 3274} else {
02f6cfbd
MK
3275 frame .vpane.lower -height 300 -width 400
3276 frame .vpane.lower.commarea
3277 frame .vpane.lower.diff -relief sunken -borderwidth 1
3278 pack .vpane.lower.diff -fill both -expand 1
3279 pack .vpane.lower.commarea -side bottom -fill x
3280 .vpane add .vpane.lower
3281 .vpane paneconfigure .vpane.lower -sticky nsew
918dbf58 3282}
cb07fc2a
SP
3283
3284# -- Commit Area Buttons
a49c67d1 3285#
c80d7be5
PT
3286${NS}::frame .vpane.lower.commarea.buttons
3287${NS}::label .vpane.lower.commarea.buttons.l -text {} \
cb07fc2a 3288 -anchor w \
7416bbc6 3289 -justify left
0fb8f9ce
SP
3290pack .vpane.lower.commarea.buttons.l -side top -fill x
3291pack .vpane.lower.commarea.buttons -side left -fill y
131f503b 3292
c80d7be5 3293${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
8056cc4f 3294 -command ui_do_rescan
0fb8f9ce 3295pack .vpane.lower.commarea.buttons.rescan -side top -fill x
390adaea
SP
3296lappend disable_on_lock \
3297 {.vpane.lower.commarea.buttons.rescan conf -state}
131f503b 3298
c80d7be5 3299${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
7416bbc6 3300 -command do_add_all
7fe7e733 3301pack .vpane.lower.commarea.buttons.incall -side top -fill x
390adaea
SP
3302lappend disable_on_lock \
3303 {.vpane.lower.commarea.buttons.incall conf -state}
131f503b 3304
ed70e4d7 3305if {![is_enabled nocommitmsg]} {
c80d7be5 3306 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
1e02b32e
SP
3307 -command do_signoff
3308 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3309}
131f503b 3310
c80d7be5 3311${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
7416bbc6 3312 -command do_commit
0fb8f9ce 3313pack .vpane.lower.commarea.buttons.commit -side top -fill x
390adaea
SP
3314lappend disable_on_lock \
3315 {.vpane.lower.commarea.buttons.commit conf -state}
cb07fc2a 3316
1e02b32e 3317if {![is_enabled nocommit]} {
c80d7be5 3318 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
1e02b32e
SP
3319 -command do_push_anywhere
3320 pack .vpane.lower.commarea.buttons.push -side top -fill x
1e65c622
AG
3321}
3322
cb07fc2a 3323# -- Commit Message Buffer
a49c67d1 3324#
c80d7be5
PT
3325${NS}::frame .vpane.lower.commarea.buffer
3326${NS}::frame .vpane.lower.commarea.buffer.header
30508bc4 3327set ui_comm .vpane.lower.commarea.buffer.frame.t
24ac9b75 3328set ui_coml .vpane.lower.commarea.buffer.header.l
1e02b32e
SP
3329
3330if {![is_enabled nocommit]} {
ba41b5b3 3331 ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
1e02b32e 3332 -text [mc "Amend Last Commit"] \
ba41b5b3
BW
3333 -variable commit_type_is_amend \
3334 -command do_select_commit_type
1e02b32e
SP
3335 lappend disable_on_lock \
3336 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3337}
3338
c80d7be5 3339${NS}::label $ui_coml \
cb07fc2a 3340 -anchor w \
7416bbc6 3341 -justify left
4539eacd
SP
3342proc trace_commit_type {varname args} {
3343 global ui_coml commit_type
3344 switch -glob -- $commit_type {
1ac17950
CS
3345 initial {set txt [mc "Initial Commit Message:"]}
3346 amend {set txt [mc "Amended Commit Message:"]}
3347 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3348 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3349 merge {set txt [mc "Merge Commit Message:"]}
3350 * {set txt [mc "Commit Message:"]}
4539eacd
SP
3351 }
3352 $ui_coml conf -text $txt
3353}
3354trace add variable commit_type write trace_commit_type
24ac9b75 3355pack $ui_coml -side left -fill x
1e02b32e
SP
3356
3357if {![is_enabled nocommit]} {
3358 pack .vpane.lower.commarea.buffer.header.amend -side right
1e02b32e 3359}
24ac9b75 3360
30508bc4
PT
3361textframe .vpane.lower.commarea.buffer.frame
3362ttext $ui_comm -background white -foreground black \
c382fdd7 3363 -borderwidth 1 \
9861671d 3364 -undo true \
b2c6fcf1 3365 -maxundo 20 \
9861671d 3366 -autoseparators true \
30508bc4
PT
3367 -takefocus 1 \
3368 -highlightthickness 1 \
cb07fc2a 3369 -relief sunken \
11027d54 3370 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
b4946930 3371 -font font_diff \
30508bc4
PT
3372 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
3373${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
390adaea 3374 -command [list $ui_comm yview]
30508bc4
PT
3375
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"] \
62bd9993 3591 -command {apply_or_revert_hunk $cursorX $cursorY 0}
fba6072e
JS
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"] \
5f0a516d 3596 -command {apply_or_revert_range_or_line $cursorX $cursorY 0; 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
62bd9993
PY
3600$ctxm add command \
3601 -label [mc "Revert Hunk"] \
3602 -command {apply_or_revert_hunk $cursorX $cursorY 1}
3603set ui_diff_reverthunk [$ctxm index last]
3604lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state]
5f0a516d
PY
3605$ctxm add command \
3606 -label [mc "Revert Line"] \
3607 -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan}
3608set ui_diff_revertline [$ctxm index last]
3609lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state]
a4fa2f0a
PY
3610$ctxm add command \
3611 -label [mc "Undo Last Revert"] \
3612 -command {undo_last_revert; do_rescan}
3613set ui_diff_undorevert [$ctxm index last]
3614lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state]
5f0a516d 3615$ctxm add separator
25476c63
JL
3616$ctxm add command \
3617 -label [mc "Show Less Context"] \
3618 -command show_less_context
3619lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3620$ctxm add command \
3621 -label [mc "Show More Context"] \
3622 -command show_more_context
3623lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3624$ctxm add separator
042c2325
AG
3625create_common_diff_popup $ctxm
3626
3627set ctxmmg .vpane.lower.diff.body.ctxmmg
3628menu $ctxmmg -tearoff 0
7e30682c
AG
3629$ctxmmg add command \
3630 -label [mc "Run Merge Tool"] \
3631 -command {merge_resolve_tool}
3632lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3633$ctxmmg add separator
042c2325
AG
3634$ctxmmg add command \
3635 -label [mc "Use Remote Version"] \
3636 -command {merge_resolve_one 3}
3637lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3638$ctxmmg add command \
3639 -label [mc "Use Local Version"] \
3640 -command {merge_resolve_one 2}
3641lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3642$ctxmmg add command \
3643 -label [mc "Revert To Base"] \
3644 -command {merge_resolve_one 1}
3645lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3646$ctxmmg add separator
25476c63
JL
3647$ctxmmg add command \
3648 -label [mc "Show Less Context"] \
3649 -command show_less_context
3650lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3651$ctxmmg add command \
3652 -label [mc "Show More Context"] \
3653 -command show_more_context
3654lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3655$ctxmmg add separator
042c2325
AG
3656create_common_diff_popup $ctxmmg
3657
25476c63
JL
3658set ctxmsm .vpane.lower.diff.body.ctxmsm
3659menu $ctxmsm -tearoff 0
3660$ctxmsm add command \
3661 -label [mc "Visualize These Changes In The Submodule"] \
3662 -command {do_gitk -- true}
3663lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3664$ctxmsm add command \
3665 -label [mc "Visualize Current Branch History In The Submodule"] \
3666 -command {do_gitk {} true}
3667lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3668$ctxmsm add command \
3669 -label [mc "Visualize All Branch History In The Submodule"] \
3670 -command {do_gitk --all true}
3671lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3672$ctxmsm add separator
3673$ctxmsm add command \
3674 -label [mc "Start git gui In The Submodule"] \
3675 -command {do_git_gui}
3676lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3677$ctxmsm add separator
3678create_common_diff_popup $ctxmsm
3679
1fbaccad
CP
3680proc has_textconv {path} {
3681 if {[is_config_false gui.textconv]} {
3682 return 0
3683 }
3684 set filter [gitattr $path diff set]
3685 set textconv [get_config [join [list diff $filter textconv] .]]
3686 if {$filter ne {set} && $textconv ne {}} {
3687 return 1
3688 } else {
3689 return 0
3690 }
3691}
3692
25476c63 3693proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
a4fa2f0a 3694 global current_diff_path file_states last_revert
83751fc1
SP
3695 set ::cursorX $x
3696 set ::cursorY $y
042c2325
AG
3697 if {[info exists file_states($current_diff_path)]} {
3698 set state [lindex $file_states($current_diff_path) 0]
a25c5189 3699 } else {
042c2325
AG
3700 set state {__}
3701 }
ff515d81 3702 if {[string first {U} $state] >= 0} {
042c2325 3703 tk_popup $ctxmmg $X $Y
25476c63
JL
3704 } elseif {$::is_submodule_diff} {
3705 tk_popup $ctxmsm $X $Y
047d94d5 3706 } else {
ff07c3b6 3707 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
a4fa2f0a 3708 set u [mc "Undo Last Revert"]
042c2325
AG
3709 if {$::ui_index eq $::current_diff_side} {
3710 set l [mc "Unstage Hunk From Commit"]
62bd9993
PY
3711 set h [mc "Revert Hunk"]
3712
ff07c3b6
JE
3713 if {$has_range} {
3714 set t [mc "Unstage Lines From Commit"]
5f0a516d 3715 set r [mc "Revert Lines"]
ff07c3b6
JE
3716 } else {
3717 set t [mc "Unstage Line From Commit"]
5f0a516d 3718 set r [mc "Revert Line"]
ff07c3b6 3719 }
042c2325
AG
3720 } else {
3721 set l [mc "Stage Hunk For Commit"]
62bd9993
PY
3722 set h [mc "Revert Hunk"]
3723
ff07c3b6
JE
3724 if {$has_range} {
3725 set t [mc "Stage Lines For Commit"]
5f0a516d 3726 set r [mc "Revert Lines"]
ff07c3b6
JE
3727 } else {
3728 set t [mc "Stage Line For Commit"]
5f0a516d 3729 set r [mc "Revert Line"]
ff07c3b6 3730 }
042c2325 3731 }
25476c63 3732 if {$::is_3way_diff
042c2325
AG
3733 || $current_diff_path eq {}
3734 || {__} eq $state
3735 || {_O} eq $state
7587f4d3
BW
3736 || [string match {?T} $state]
3737 || [string match {T?} $state]
1fbaccad 3738 || [has_textconv $current_diff_path]} {
042c2325 3739 set s disabled
5f0a516d 3740 set revert_state disabled
042c2325
AG
3741 } else {
3742 set s normal
5f0a516d
PY
3743
3744 # Only allow reverting changes in the working tree. If
3745 # the user wants to revert changes in the index, they
3746 # need to unstage those first.
3747 if {$::ui_workdir eq $::current_diff_side} {
3748 set revert_state normal
3749 } else {
3750 set revert_state disabled
3751 }
042c2325 3752 }
5f0a516d 3753
a4fa2f0a
PY
3754 if {$last_revert eq {}} {
3755 set undo_state disabled
3756 } else {
3757 set undo_state normal
3758 }
3759
042c2325
AG
3760 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3761 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
5f0a516d
PY
3762 $ctxm entryconf $::ui_diff_revertline -state $revert_state \
3763 -label $r
62bd9993
PY
3764 $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \
3765 -label $h
a4fa2f0a
PY
3766 $ctxm entryconf $::ui_diff_undorevert -state $undo_state \
3767 -label $u
62bd9993 3768
042c2325 3769 tk_popup $ctxm $X $Y
9c9f5fa9 3770 }
83751fc1 3771}
25476c63 3772bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
0e794311 3773
cb07fc2a 3774# -- Status Bar
e8ab6446 3775#
51530d17 3776set main_status [::status_bar::new .status]
cb07fc2a 3777pack .status -anchor w -side bottom -fill x
1ac17950 3778$main_status show [mc "Initializing..."]
cb07fc2a 3779
2d19516d 3780# -- Load geometry
e8ab6446 3781#
2810a58d
PT
3782proc on_ttk_pane_mapped {w pane pos} {
3783 bind $w <Map> {}
3784 after 0 [list after idle [list $w sashpos $pane $pos]]
3785}
3786proc on_tk_pane_mapped {w pane x y} {
3787 bind $w <Map> {}
3788 after 0 [list after idle [list $w sash place $pane $x $y]]
3789}
3790proc on_application_mapped {} {
3791 global repo_config use_ttk
3792 bind . <Map> {}
3793 set gm $repo_config(gui.geometry)
3794 if {$use_ttk} {
3795 bind .vpane <Map> \
3796 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3797 bind .vpane.files <Map> \
3798 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3799 } else {
3800 bind .vpane <Map> \
3801 [list on_tk_pane_mapped %W 0 \
3802 [lindex $gm 1] \
3803 [lindex [.vpane sash coord 0] 1]]
3804 bind .vpane.files <Map> \
3805 [list on_tk_pane_mapped %W 0 \
3806 [lindex [.vpane.files sash coord 0] 0] \
3807 [lindex $gm 2]]
3808 }
3809 wm geometry . [lindex $gm 0]
c80d7be5 3810}
2810a58d
PT
3811if {[info exists repo_config(gui.geometry)]} {
3812 bind . <Map> [list on_application_mapped]
3813 wm geometry . [lindex $repo_config(gui.geometry) 0]
390adaea 3814}
2d19516d 3815
ed7b6033
AB
3816# -- Load window state
3817#
2810a58d
PT
3818if {[info exists repo_config(gui.wmstate)]} {
3819 catch {wm state . $repo_config(gui.wmstate)}
ed7b6033
AB
3820}
3821
cb07fc2a 3822# -- Key Bindings
e8ab6446 3823#
ec6b424a 3824bind $ui_comm <$M1B-Key-Return> {do_commit;break}
cd16a6c9
SP
3825bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3826bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
b677c66e
VS
3827bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3828bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3829bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3830bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
93e912c5
SP
3831bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3832bind $ui_comm <$M1B-Key-I> {do_add_all;break}
9861671d
SP
3833bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3834bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3835bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3836bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3837bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3838bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3839bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3840bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
729ffa50
MB
3841bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3842bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3843bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3844bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3845bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
9861671d
SP
3846
3847bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3848bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3849bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3850bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3851bind $ui_diff <$M1B-Key-v> {break}
3852bind $ui_diff <$M1B-Key-V> {break}
3853bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3854bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
44e88ce0
VS
3855bind $ui_diff <$M1B-Key-j> {do_revert_selection;break}
3856bind $ui_diff <$M1B-Key-J> {do_revert_selection;break}
b2c6fcf1
SP
3857bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3858bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3859bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3860bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
60aa065f
SP
3861bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3862bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3863bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3864bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3865bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3866bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
23effa79 3867bind $ui_diff <Button-1> {focus %W}
49b86f01 3868
64a906f8 3869if {[is_enabled branch]} {
b1fa2bff
SP
3870 bind . <$M1B-Key-n> branch_create::dialog
3871 bind . <$M1B-Key-N> branch_create::dialog
d41b43eb
SP
3872 bind . <$M1B-Key-o> branch_checkout::dialog
3873 bind . <$M1B-Key-O> branch_checkout::dialog
a870ddc0
SP
3874 bind . <$M1B-Key-m> merge::dialog
3875 bind . <$M1B-Key-M> merge::dialog
bd29ebc3 3876}
840bcfa7
SP
3877if {[is_enabled transport]} {
3878 bind . <$M1B-Key-p> do_push_anywhere
3879 bind . <$M1B-Key-P> do_push_anywhere
3880}
bd29ebc3 3881
8056cc4f
AG
3882bind . <Key-F5> ui_do_rescan
3883bind . <$M1B-Key-r> ui_do_rescan
3884bind . <$M1B-Key-R> ui_do_rescan
07123f40
SP
3885bind . <$M1B-Key-s> do_signoff
3886bind . <$M1B-Key-S> do_signoff
088ad75d
PT
3887bind . <$M1B-Key-t> { toggle_or_diff toggle %W }
3888bind . <$M1B-Key-T> { toggle_or_diff toggle %W }
3889bind . <$M1B-Key-u> { toggle_or_diff toggle %W }
3890bind . <$M1B-Key-U> { toggle_or_diff toggle %W }
d6db1bbe
HV
3891bind . <$M1B-Key-j> do_revert_selection
3892bind . <$M1B-Key-J> do_revert_selection
93e912c5
SP
3893bind . <$M1B-Key-i> do_add_all
3894bind . <$M1B-Key-I> do_add_all
729ffa50
MB
3895bind . <$M1B-Key-minus> {show_less_context;break}
3896bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3897bind . <$M1B-Key-equal> {show_more_context;break}
3898bind . <$M1B-Key-plus> {show_more_context;break}
3899bind . <$M1B-Key-KP_Add> {show_more_context;break}
07123f40 3900bind . <$M1B-Key-Return> do_commit
0812665e 3901foreach i [list $ui_index $ui_workdir] {
088ad75d
PT
3902 bind $i <Button-1> { toggle_or_diff click %W %x %y; break }
3903 bind $i <$M1B-Button-1> { add_one_to_selection %W %x %y; break }
3904 bind $i <Shift-Button-1> { add_range_to_selection %W %x %y; break }
3905 bind $i <Key-Up> { toggle_or_diff up %W; break }
3906 bind $i <Key-Down> { toggle_or_diff down %W; break }
cb07fc2a 3907}
62aac80b
SP
3908unset i
3909
e07446ed
BSP
3910bind . <Alt-Key-1> {focus_widget $::ui_workdir}
3911bind . <Alt-Key-2> {focus_widget $::ui_index}
3912bind . <Alt-Key-3> {focus $::ui_diff}
3913bind . <Alt-Key-4> {focus $::ui_comm}
3914
3915set file_lists_last_clicked($ui_index) {}
3916set file_lists_last_clicked($ui_workdir) {}
3917
62aac80b 3918set file_lists($ui_index) [list]
0812665e 3919set file_lists($ui_workdir) [list]
a49c67d1 3920
21985a11 3921wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
cb07fc2a 3922focus -force $ui_comm
1d8b3cbf 3923
85ab313e
SP
3924# -- Warn the user about environmental problems. Cygwin's Tcl
3925# does *not* pass its env array onto any processes it spawns.
3926# This means that git processes get none of our environment.
1d8b3cbf 3927#
20ddfcaa 3928if {[is_Cygwin]} {
1d8b3cbf
SP
3929 set ignored_env 0
3930 set suggest_user {}
c8c4854b 3931 set msg [mc "Possible environment issues exist.
1d8b3cbf
SP
3932
3933The following environment variables are probably
3934going to be ignored by any Git subprocess run
c8c4854b 3935by %s:
1d8b3cbf 3936
c8c4854b 3937" [appname]]
1d8b3cbf
SP
3938 foreach name [array names env] {
3939 switch -regexp -- $name {
3940 {^GIT_INDEX_FILE$} -
3941 {^GIT_OBJECT_DIRECTORY$} -
3942 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3943 {^GIT_DIFF_OPTS$} -
3944 {^GIT_EXTERNAL_DIFF$} -
3945 {^GIT_PAGER$} -
3946 {^GIT_TRACE$} -
3947 {^GIT_CONFIG$} -
1d8b3cbf
SP
3948 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3949 append msg " - $name\n"
3950 incr ignored_env
3951 }
3952 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3953 append msg " - $name\n"
3954 incr ignored_env
3955 set suggest_user $name
3956 }
3957 }
3958 }
3959 if {$ignored_env > 0} {
c8c4854b 3960 append msg [mc "
1d8b3cbf 3961This is due to a known issue with the
c8c4854b 3962Tcl binary distributed by Cygwin."]
1d8b3cbf
SP
3963
3964 if {$suggest_user ne {}} {
c8c4854b 3965 append msg [mc "
1d8b3cbf 3966
c8c4854b 3967A good replacement for %s
1d8b3cbf
SP
3968is placing values for the user.name and
3969user.email settings into your personal
3970~/.gitconfig file.
c8c4854b 3971" $suggest_user]
1d8b3cbf
SP
3972 }
3973 warn_popup $msg
3974 }
3975 unset ignored_env msg suggest_user name
3976}
3977
85ab313e
SP
3978# -- Only initialize complex UI if we are going to stay running.
3979#
64a906f8 3980if {[is_enabled transport]} {
4ccdab02 3981 load_all_remotes
85ab313e 3982
6bdf5e5f 3983 set n [.mbar.remote index end]
8329bd07 3984 populate_remotes_menu
6bdf5e5f
SP
3985 set n [expr {[.mbar.remote index end] - $n}]
3986 if {$n > 0} {
7e09b153 3987 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
6bdf5e5f
SP
3988 .mbar.remote insert $n separator
3989 }
3990 unset n
4ccdab02 3991}
85ab313e 3992
4578c5cb 3993if {[winfo exists $ui_comm]} {
fda1ba02 3994 set GITGUI_BCK_exists [load_message GITGUI_BCK utf-8]
4578c5cb
SP
3995
3996 # -- If both our backup and message files exist use the
3997 # newer of the two files to initialize the buffer.
3998 #
3999 if {$GITGUI_BCK_exists} {
4000 set m [gitdir GITGUI_MSG]
4001 if {[file isfile $m]} {
4002 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
4003 catch {file delete [gitdir GITGUI_MSG]}
4004 } else {
4005 $ui_comm delete 0.0 end
4006 $ui_comm edit reset
4007 $ui_comm edit modified false
4008 catch {file delete [gitdir GITGUI_BCK]}
4009 set GITGUI_BCK_exists 0
4010 }
4011 }
4012 unset m
4013 }
4014
4015 proc backup_commit_buffer {} {
4016 global ui_comm GITGUI_BCK_exists
4017
4018 set m [$ui_comm edit modified]
4019 if {$m || $GITGUI_BCK_exists} {
4020 set msg [string trim [$ui_comm get 0.0 end]]
4021 regsub -all -line {[ \r\t]+$} $msg {} msg
4022
4023 if {$msg eq {}} {
4024 if {$GITGUI_BCK_exists} {
4025 catch {file delete [gitdir GITGUI_BCK]}
4026 set GITGUI_BCK_exists 0
4027 }
4028 } elseif {$m} {
4029 catch {
4030 set fd [open [gitdir GITGUI_BCK] w]
fda1ba02 4031 fconfigure $fd -encoding utf-8
4578c5cb
SP
4032 puts -nonewline $fd $msg
4033 close $fd
4034 set GITGUI_BCK_exists 1
4035 }
4036 }
4037
4038 $ui_comm edit modified false
4039 }
4040
4041 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
4042 }
4043
4044 backup_commit_buffer
95b002ee
SP
4045
4046 # -- If the user has aspell available we can drive it
4047 # in pipe mode to spellcheck the commit message.
4048 #
4049 set spell_cmd [list |]
4050 set spell_dict [get_config gui.spellingdictionary]
4051 lappend spell_cmd aspell
4052 if {$spell_dict ne {}} {
4053 lappend spell_cmd --master=$spell_dict
4054 }
4055 lappend spell_cmd --mode=none
4056 lappend spell_cmd --encoding=utf-8
4057 lappend spell_cmd pipe
4058 if {$spell_dict eq {none}
4059 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
4060 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
4061 } else {
4062 set ui_comm_spell [spellcheck::init \
4063 $spell_fd \
4064 $ui_comm \
4065 $ui_comm_ctxm \
4066 ]
4067 }
4068 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4578c5cb
SP
4069}
4070
53716a7b 4071lock_index begin-read
301dfaa9
SP
4072if {![winfo ismapped .]} {
4073 wm deiconify .
4074}
1e65c622
AG
4075after 1 {
4076 if {[is_enabled initialamend]} {
4077 force_amend
4078 } else {
4079 do_rescan
4080 }
4081
4082 if {[is_enabled nocommitmsg]} {
4083 $ui_comm configure -state disabled -background gray
4084 }
4085}
af867683 4086if {[is_enabled multicommit] && ![is_config_false gui.gcwarning]} {
3972b987
SP
4087 after 1000 hint_gc
4088}
1e65c622
AG
4089if {[is_enabled retcode]} {
4090 bind . <Destroy> {+terminate_me %W}
4091}
bb4812bc
PB
4092if {$picked && [is_config_true gui.autoexplore]} {
4093 do_explore
4094}
c80d7be5
PT
4095
4096# Local variables:
4097# mode: tcl
4098# indent-tabs-mode: t
4099# tab-width: 4
4100# End: