git-gui.sh 85.3 KB
Newer Older
1
#!/bin/sh
S
Shawn O. Pearce 已提交
2
# Tcl ignores the next line -*- tcl -*- \
3 4 5 6 7 8
 if test "z$*" = zversion \
 || test "z$*" = z--version; \
 then \
	echo 'git-gui version @@GITGUI_VERSION@@'; \
	exit; \
 fi; \
9 10
 argv0=$0; \
 exec wish "$argv0" -- "$@"
S
Shawn O. Pearce 已提交
11

12
set appvers {@@GITGUI_VERSION@@}
13
set copyright [encoding convertfrom utf-8 {
14
Copyright © 2006, 2007 Shawn Pearce, et. al.
15

16 17 18 19 20 21 22 23 24 25 26 27
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
28
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}]
S
Shawn O. Pearce 已提交
29

30
######################################################################
31 32 33 34 35 36 37 38 39 40
##
## Tcl/Tk sanity check

if {[catch {package require Tcl 8.4} err]
 || [catch {package require Tk  8.4} err]
} {
	catch {wm withdraw .}
	tk_messageBox \
		-icon error \
		-type ok \
41
		-title [mc "git-gui: fatal error"] \
42 43 44 45
		-message $err
	exit 1
}

46
catch {rename send {}} ; # What an evil concept...
47

48 49 50 51 52 53 54
######################################################################
##
## locate our library

set oguilib {@@GITGUI_LIBDIR@@}
set oguirel {@@GITGUI_RELATIVE@@}
if {$oguirel eq {1}} {
55 56 57 58 59
	set oguilib [file dirname [file normalize $argv0]]
	if {[file tail $oguilib] eq {git-core}} {
		set oguilib [file dirname $oguilib]
	}
	set oguilib [file dirname $oguilib]
60
	set oguilib [file join $oguilib share git-gui lib]
61
	set oguimsg [file join $oguilib msgs]
62 63
} elseif {[string match @@* $oguirel]} {
	set oguilib [file join [file dirname [file normalize $argv0]] lib]
64 65 66
	set oguimsg [file join [file dirname [file normalize $argv0]] po]
} else {
	set oguimsg [file join $oguilib msgs]
67 68 69
}
unset oguirel

70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
######################################################################
##
## enable verbose loading?

if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
	unset _verbose
	rename auto_load real__auto_load
	proc auto_load {name args} {
		puts stderr "auto_load $name"
		return [uplevel 1 real__auto_load $name $args]
	}
	rename source real__source
	proc source {name} {
		puts stderr "source    $name"
		uplevel 1 real__source $name
	}
}

88
######################################################################
89 90 91 92 93
##
## Internationalization (i18n) through msgcat and gettext. See
## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html

package require msgcat
94

95
proc _mc_trim {fmt} {
96 97
	set cmk [string first @@ $fmt]
	if {$cmk > 0} {
98
		return [string range $fmt 0 [expr {$cmk - 1}]]
99
	}
100 101 102 103 104 105 106 107 108
	return $fmt
}

proc mc {en_fmt args} {
	set fmt [_mc_trim [::msgcat::mc $en_fmt]]
	if {[catch {set msg [eval [list format $fmt] $args]} err]} {
		set msg [eval [list format [_mc_trim $en_fmt]] $args]
	}
	return $msg
109 110
}

111 112 113 114
proc strcat {args} {
	return [join $args {}]
}

115 116 117 118
::msgcat::mcload $oguimsg
unset oguimsg

######################################################################
119 120 121
##
## read only globals

122
set _appname {Git Gui}
123
set _gitdir {}
124
set _gitexec {}
125
set _githtmldir {}
126
set _reponame {}
127
set _iscygwin {}
128
set _search_path {}
129

130 131 132 133 134 135 136 137
set _trace [lsearch -exact $argv --trace]
if {$_trace >= 0} {
	set argv [lreplace $argv $_trace $_trace]
	set _trace 1
} else {
	set _trace 0
}

138 139 140 141 142
proc appname {} {
	global _appname
	return $_appname
}

143
proc gitdir {args} {
144
	global _gitdir
145 146 147
	if {$args eq {}} {
		return $_gitdir
	}
148
	return [eval [list file join $_gitdir] $args]
149 150
}

151 152 153
proc gitexec {args} {
	global _gitexec
	if {$_gitexec eq {}} {
154
		if {[catch {set _gitexec [git --exec-path]} err]} {
155 156
			error "Git not installed?\n\n$err"
		}
157 158 159 160 161 162 163 164
		if {[is_Cygwin]} {
			set _gitexec [exec cygpath \
				--windows \
				--absolute \
				$_gitexec]
		} else {
			set _gitexec [file normalize $_gitexec]
		}
165 166 167 168
	}
	if {$args eq {}} {
		return $_gitexec
	}
169
	return [eval [list file join $_gitexec] $args]
170 171
}

172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193
proc githtmldir {args} {
	global _githtmldir
	if {$_githtmldir eq {}} {
		if {[catch {set _githtmldir [git --html-path]}]} {
			# Git not installed or option not yet supported
			return {}
		}
		if {[is_Cygwin]} {
			set _githtmldir [exec cygpath \
				--windows \
				--absolute \
				$_githtmldir]
		} else {
			set _githtmldir [file normalize $_githtmldir]
		}
	}
	if {$args eq {}} {
		return $_githtmldir
	}
	return [eval [list file join $_githtmldir] $args]
}

194
proc reponame {} {
195
	return $::_reponame
196
}
197

198 199 200 201 202 203 204 205
proc is_MacOSX {} {
	if {[tk windowingsystem] eq {aqua}} {
		return 1
	}
	return 0
}

proc is_Windows {} {
206
	if {$::tcl_platform(platform) eq {windows}} {
207 208 209 210 211 212
		return 1
	}
	return 0
}

proc is_Cygwin {} {
213
	global _iscygwin
214
	if {$_iscygwin eq {}} {
215
		if {$::tcl_platform(platform) eq {windows}} {
216 217 218 219 220 221 222 223 224 225 226 227
			if {[catch {set p [exec cygpath --windir]} err]} {
				set _iscygwin 0
			} else {
				set _iscygwin 1
			}
		} else {
			set _iscygwin 0
		}
	}
	return $_iscygwin
}

228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243
proc is_enabled {option} {
	global enabled_options
	if {[catch {set on $enabled_options($option)}]} {return 0}
	return $on
}

proc enable_option {option} {
	global enabled_options
	set enabled_options($option) 1
}

proc disable_option {option} {
	global enabled_options
	set enabled_options($option) 0
}

244 245 246 247
######################################################################
##
## config

248 249
proc is_many_config {name} {
	switch -glob -- $name {
250
	gui.recentrepo -
251 252 253 254 255 256 257
	remote.*.fetch -
	remote.*.push
		{return 1}
	*
		{return 0}
	}
}
258

259 260 261 262 263 264 265 266 267 268 269
proc is_config_true {name} {
	global repo_config
	if {[catch {set v $repo_config($name)}]} {
		return 0
	} elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
		return 1
	} else {
		return 0
	}
}

270 271 272 273 274 275 276 277 278
proc get_config {name} {
	global repo_config
	if {[catch {set v $repo_config($name)}]} {
		return {}
	} else {
		return $v
	}
}

279 280 281 282
######################################################################
##
## handy utils

283 284 285 286 287 288 289 290 291 292 293 294 295 296 297
proc _trace_exec {cmd} {
	if {!$::_trace} return
	set d {}
	foreach v $cmd {
		if {$d ne {}} {
			append d { }
		}
		if {[regexp {[ \t\r\n'"$?*]} $v]} {
			set v [sq $v]
		}
		append d $v
	}
	puts stderr $d
}

298 299 300 301 302
proc _git_cmd {name} {
	global _git_cmd_path

	if {[catch {set v $_git_cmd_path($name)}]} {
		switch -- $name {
303
		  version   -
304 305 306 307 308 309 310
		--version   -
		--exec-path { return [list $::_git $name] }
		}

		set p [gitexec git-$name$::_search_exe]
		if {[file exists $p]} {
			set v [list $p]
311 312 313 314
		} elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
			# Try to determine what sort of magic will make
			# git-$name go and do its thing, because native
			# Tcl on Windows doesn't know it.
315
			#
316 317 318 319 320
			set p [gitexec git-$name]
			set f [open $p r]
			set s [gets $f]
			close $f

321
			switch -glob -- [lindex $s 0] {
322 323 324 325 326 327 328 329 330 331 332 333 334
			#!*sh     { set i sh     }
			#!*perl   { set i perl   }
			#!*python { set i python }
			default   { error "git-$name is not supported: $s" }
			}

			upvar #0 _$i interp
			if {![info exists interp]} {
				set interp [_which $i]
			}
			if {$interp eq {}} {
				error "git-$name requires $i (not in PATH)"
			}
335
			set v [concat [list $interp] [lrange $s 1 end] [list $p]]
336
		} else {
337 338 339 340
			# Assume it is builtin to git somehow and we
			# aren't actually able to see a file for it.
			#
			set v [list $::_git $name]
341 342 343 344 345 346
		}
		set _git_cmd_path($name) $v
	}
	return $v
}

347
proc _which {what args} {
348 349 350
	global env _search_exe _search_path

	if {$_search_path eq {}} {
351
		if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
352 353 354 355 356 357 358
			set _search_path [split [exec cygpath \
				--windows \
				--path \
				--absolute \
				$env(PATH)] {;}]
			set _search_exe .exe
		} elseif {[is_Windows]} {
359 360 361
			set gitguidir [file dirname [info script]]
			regsub -all ";" $gitguidir "\\;" gitguidir
			set env(PATH) "$gitguidir;$env(PATH)"
362 363 364 365 366 367 368 369
			set _search_path [split $env(PATH) {;}]
			set _search_exe .exe
		} else {
			set _search_path [split $env(PATH) :]
			set _search_exe {}
		}
	}

370 371 372 373 374 375
	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
		set suffix {}
	} else {
		set suffix $_search_exe
	}

376
	foreach p $_search_path {
377
		set p [file join $p $what$suffix]
378 379 380 381 382 383 384
		if {[file exists $p]} {
			return [file normalize $p]
		}
	}
	return {}
}

385 386 387 388 389 390 391 392 393 394 395 396
proc _lappend_nice {cmd_var} {
	global _nice
	upvar $cmd_var cmd

	if {![info exists _nice]} {
		set _nice [_which nice]
	}
	if {$_nice ne {}} {
		lappend cmd $_nice
	}
}

397
proc git {args} {
398
	set opt [list]
399 400 401 402

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
403
			_lappend_nice opt
404 405 406 407 408 409 410 411 412 413 414 415 416 417
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

	set cmdp [_git_cmd [lindex $args 0]]
	set args [lrange $args 1 end]

418 419 420 421 422 423
	_trace_exec [concat $opt $cmdp $args]
	set result [eval exec $opt $cmdp $args]
	if {$::_trace} {
		puts stderr "< $result"
	}
	return $result
424 425
}

426
proc _open_stdout_stderr {cmd} {
427
	_trace_exec $cmd
428
	if {[catch {
429
			set fd [open [concat [list | ] $cmd] r]
430 431 432 433 434 435 436 437 438 439
		} err]} {
		if {   [lindex $cmd end] eq {2>@1}
		    && $err eq {can not find channel named "1"}
			} {
			# Older versions of Tcl 8.4 don't have this 2>@1 IO
			# redirect operator.  Fallback to |& cat for those.
			# The command was not actually started, so its safe
			# to try to start it a second time.
			#
			set fd [open [concat \
440
				[list | ] \
441 442 443 444 445 446 447
				[lrange $cmd 0 end-1] \
				[list |& cat] \
				] r]
		} else {
			error $err
		}
	}
448
	fconfigure $fd -eofchar {}
449 450 451
	return $fd
}

452
proc git_read {args} {
453
	set opt [list]
454 455 456 457

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
458
			_lappend_nice opt
459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476
		}

		--stderr {
			lappend args 2>@1
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

	set cmdp [_git_cmd [lindex $args 0]]
	set args [lrange $args 1 end]

477
	return [_open_stdout_stderr [concat $opt $cmdp $args]]
478 479 480
}

proc git_write {args} {
481
	set opt [list]
482 483 484 485

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
486
			_lappend_nice opt
487 488 489 490 491 492 493 494 495 496 497 498 499 500
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

	set cmdp [_git_cmd [lindex $args 0]]
	set args [lrange $args 1 end]

501 502
	_trace_exec [concat $opt $cmdp $args]
	return [open [concat [list | ] $opt $cmdp $args] w]
503 504
}

505 506 507 508
proc githook_read {hook_name args} {
	set pchook [gitdir hooks $hook_name]
	lappend args 2>@1

509
	# On Windows [file executable] might lie so we need to ask
510 511
	# the shell if the hook is executable.  Yes that's annoying.
	#
512
	if {[is_Windows]} {
513 514 515 516 517 518 519 520 521
		upvar #0 _sh interp
		if {![info exists interp]} {
			set interp [_which sh]
		}
		if {$interp eq {}} {
			error "hook execution requires sh (not in PATH)"
		}

		set scr {if test -x "$1";then exec "$@";fi}
522
		set sh_c [list $interp -c $scr $interp $pchook]
523 524 525 526
		return [_open_stdout_stderr [concat $sh_c $args]]
	}

	if {[file executable $pchook]} {
527
		return [_open_stdout_stderr [concat [list $pchook] $args]]
528 529 530 531 532
	}

	return {}
}

533 534 535 536 537 538 539 540 541 542 543 544 545 546
proc kill_file_process {fd} {
	set process [pid $fd]

	catch {
		if {[is_Windows]} {
			# Use a Cygwin-specific flag to allow killing
			# native Windows processes
			exec kill -f $process
		} else {
			exec kill $process
		}
	}
}

547 548 549 550 551 552 553 554 555 556 557 558 559
proc gitattr {path attr default} {
	if {[catch {set r [git check-attr $attr -- $path]}]} {
		set r unspecified
	} else {
		set r [join [lrange [split $r :] 2 end] :]
		regsub {^ } $r {} r
	}
	if {$r eq {unspecified}} {
		return $default
	}
	return $r
}

560 561 562 563 564
proc sq {value} {
	regsub -all ' $value "'\\''" value
	return "'$value'"
}

565 566 567
proc load_current_branch {} {
	global current_branch is_detached

568
	set fd [open [gitdir HEAD] r]
569
	if {[gets $fd ref] < 1} {
570 571 572
		set ref {}
	}
	close $fd
573 574 575 576 577 578 579

	set pfx {ref: refs/heads/}
	set len [string length $pfx]
	if {[string equal -length $len $pfx $ref]} {
		# We're on a branch.  It might not exist.  But
		# HEAD looks good enough to be a branch.
		#
580 581
		set current_branch [string range $ref $len end]
		set is_detached 0
582 583 584
	} else {
		# Assume this is a detached head.
		#
585 586
		set current_branch HEAD
		set is_detached 1
587
	}
588 589
}

590 591 592 593 594 595 596 597 598
auto_load tk_optionMenu
rename tk_optionMenu real__tkOptionMenu
proc tk_optionMenu {w varName args} {
	set m [eval real__tkOptionMenu $w $varName $args]
	$m configure -font font_ui
	$w configure -font font_ui
	return $m
}

599 600 601 602 603 604 605 606 607 608
proc rmsel_tag {text} {
	$text tag conf sel \
		-background [$text cget -background] \
		-foreground [$text cget -foreground] \
		-borderwidth 0
	$text tag conf in_sel -background lightgray
	bind $text <Motion> break
	return $text
}

609 610 611 612 613 614
set root_exists 0
bind . <Visibility> {
	bind . <Visibility> {}
	set root_exists 1
}

615 616
if {[is_Windows]} {
	wm iconbitmap . -default $oguilib/git-gui.ico
617
	set ::tk::AlwaysShowSelection 1
618 619 620 621 622

	# Spoof an X11 display for SSH
	if {![info exists env(DISPLAY)]} {
		set env(DISPLAY) :9999
	}
623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644
} else {
	catch {
		image create photo gitlogo -width 16 -height 16

		gitlogo put #33CC33 -to  7  0  9  2
		gitlogo put #33CC33 -to  4  2 12  4
		gitlogo put #33CC33 -to  7  4  9  6
		gitlogo put #CC3333 -to  4  6 12  8
		gitlogo put gray26  -to  4  9  6 10
		gitlogo put gray26  -to  3 10  6 12
		gitlogo put gray26  -to  8  9 13 11
		gitlogo put gray26  -to  8 11 10 12
		gitlogo put gray26  -to 11 11 13 14
		gitlogo put gray26  -to  3 12  5 14
		gitlogo put gray26  -to  5 13
		gitlogo put gray26  -to 10 13
		gitlogo put gray26  -to  4 14 12 15
		gitlogo put gray26  -to  5 15 11 16
		gitlogo redither

		wm iconphoto . -default gitlogo
	}
645 646
}

647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665
######################################################################
##
## config defaults

set cursor_ptr arrow
font create font_diff -family Courier -size 10
font create font_ui
catch {
	label .dummy
	eval font configure font_ui [font actual [.dummy cget -font]]
	destroy .dummy
}

font create font_uiitalic
font create font_uibold
font create font_diffbold
font create font_diffitalic

foreach class {Button Checkbutton Entry Label
666
		Labelframe Listbox Message
667 668 669
		Radiobutton Spinbox Text} {
	option add *$class.font font_ui
}
670 671 672
if {![is_MacOSX]} {
	option add *Menu.font font_ui
}
673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703
unset class

if {[is_Windows] || [is_MacOSX]} {
	option add *Menu.tearOff 0
}

if {[is_MacOSX]} {
	set M1B M1
	set M1T Cmd
} else {
	set M1B Control
	set M1T Ctrl
}

proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		# Mac OS X sends Button-2 on right click through three-button mouse,
		# or through trackpad right-clicking (two-finger touch + click).
		bind $w <Any-Button-2> $cmd
		bind $w <Control-Button-1> $cmd
	}
}

proc apply_config {} {
	global repo_config font_descs

	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		if {[catch {
704
			set need_weight 1
705
			foreach {cn cv} $repo_config(gui.$name) {
706 707 708 709 710 711 712
				if {$cn eq {-weight}} {
					set need_weight 0
				}
				font configure $font $cn $cv
			}
			if {$need_weight} {
				font configure $font -weight normal
713 714 715 716 717 718 719 720 721 722 723 724 725
			}
			} err]} {
			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
		}
		foreach {cn cv} [font configure $font] {
			font configure ${font}bold $cn $cv
			font configure ${font}italic $cn $cv
		}
		font configure ${font}bold -weight bold
		font configure ${font}italic -slant italic
	}
}

726
set default_config(branch.autosetupmerge) true
727
set default_config(merge.tool) {}
728
set default_config(mergetool.keepbackup) true
729 730 731 732 733 734
set default_config(merge.diffstat) true
set default_config(merge.summary) false
set default_config(merge.verbosity) 2
set default_config(user.name) {}
set default_config(user.email) {}

735
set default_config(gui.encoding) [encoding system]
736 737 738
set default_config(gui.matchtrackingbranch) false
set default_config(gui.pruneduringfetch) false
set default_config(gui.trustmtime) false
739 740
set default_config(gui.fastcopyblame) false
set default_config(gui.copyblamethreshold) 40
741
set default_config(gui.blamehistoryctx) 7
742
set default_config(gui.diffcontext) 5
743
set default_config(gui.commitmsgwidth) 75
744
set default_config(gui.newbranchtemplate) {}
745
set default_config(gui.spellingdictionary) {}
746 747
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
748 749
# TODO: this option should be added to the git-config documentation
set default_config(gui.maxfilesdisplayed) 5000
750 751 752 753 754
set font_descs {
	{fontui   font_ui   {mc "Main Font"}}
	{fontdiff font_diff {mc "Diff/Console Font"}}
}

755 756 757 758 759 760 761
######################################################################
##
## find git

set _git  [_which git]
if {$_git eq {}} {
	catch {wm withdraw .}
762 763 764 765 766
	tk_messageBox \
		-icon error \
		-type ok \
		-title [mc "git-gui: fatal error"] \
		-message [mc "Cannot find git in PATH."]
767 768 769
	exit 1
}

770 771 772 773
######################################################################
##
## version check

774
if {[catch {set _git_version [git --version]} err]} {
775
	catch {wm withdraw .}
776 777 778
	tk_messageBox \
		-icon error \
		-type ok \
779
		-title [mc "git-gui: fatal error"] \
780
		-message "Cannot determine Git version:
781 782 783

$err

784 785 786 787 788
[appname] requires Git 1.5.0 or later."
	exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
	catch {wm withdraw .}
789 790 791
	tk_messageBox \
		-icon error \
		-type ok \
792
		-title [mc "git-gui: fatal error"] \
793
		-message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
794 795
	exit 1
}
796 797

set _real_git_version $_git_version
798
regsub -- {[\-\.]dirty$} $_git_version {} _git_version
799
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
800
regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
801
regsub {\.GIT$} $_git_version {} _git_version
802
regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
803

804 805 806 807 808 809 810
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
	catch {wm withdraw .}
	if {[tk_messageBox \
		-icon warning \
		-type yesno \
		-default no \
		-title "[appname]: warning" \
811
		 -message [mc "Git version cannot be determined.
812

813
%s claims it is version '%s'.
814

815
%s requires at least Git 1.5.0 or later.
816

817 818
Assume '%s' is version 1.5.0?
" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
819 820 821 822 823 824 825
		set _git_version 1.5.0
	} else {
		exit 1
	}
}
unset _real_git_version

826 827 828 829 830 831
proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
832
	}
833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870

	2 {
		set op [lindex $args 0]
		set vr [lindex $args 1]
		set cm [package vcompare $_git_version $vr]
		return [expr $cm $op 0]
	}

	4 {
		set type [lindex $args 0]
		set name [lindex $args 1]
		set parm [lindex $args 2]
		set body [lindex $args 3]

		if {($type ne {proc} && $type ne {method})} {
			error "Invalid arguments to git-version"
		}
		if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
			error "Last arm of $type $name must be default"
		}

		foreach {op vr cb} [lrange $body 0 end-2] {
			if {[git-version $op $vr]} {
				return [uplevel [list $type $name $parm $cb]]
			}
		}

		return [uplevel [list $type $name $parm [lindex $body end]]]
	}

	default {
		error "git-version >= x"
	}

	}
}

if {[git-version < 1.5]} {
871
	catch {wm withdraw .}
872 873 874
	tk_messageBox \
		-icon error \
		-type ok \
875
		-title [mc "git-gui: fatal error"] \
876
		-message "[appname] requires Git 1.5.0 or later.
877 878 879 880

You are using [git-version]:

[git --version]"
881 882 883
	exit 1
}

884 885 886 887 888 889 890 891 892 893
######################################################################
##
## configure our library

set idx [file join $oguilib tclIndex]
if {[catch {set fd [open $idx r]} err]} {
	catch {wm withdraw .}
	tk_messageBox \
		-icon error \
		-type ok \
894
		-title [mc "git-gui: fatal error"] \
895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920
		-message $err
	exit 1
}
if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
	set idx [list]
	while {[gets $fd n] >= 0} {
		if {$n ne {} && ![string match #* $n]} {
			lappend idx $n
		}
	}
} else {
	set idx {}
}
close $fd

if {$idx ne {}} {
	set loaded [list]
	foreach p $idx {
		if {[lsearch -exact $loaded $p] >= 0} continue
		source [file join $oguilib $p]
		lappend loaded $p
	}
	unset loaded p
} else {
	set auto_path [concat [list $oguilib] $auto_path]
}
921
unset -nocomplain idx fd
922

923
######################################################################
924 925 926
##
## config file parsing

927
git-version proc _parse_config {arr_name args} {
928 929 930 931 932
	>= 1.5.3 {
		upvar $arr_name arr
		array unset arr
		set buf {}
		catch {
933 934 935 936
			set fd_rc [eval \
				[list git_read config] \
				$args \
				[list --null --list]]
937 938 939 940 941 942 943 944 945 946 947 948 949 950
			fconfigure $fd_rc -translation binary
			set buf [read $fd_rc]
			close $fd_rc
		}
		foreach line [split $buf "\0"] {
			if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
				if {[is_many_config $name]} {
					lappend arr($name) $value
				} else {
					set arr($name) $value
				}
			}
		}
	}
951 952 953
	default {
		upvar $arr_name arr
		array unset arr
954
		catch {
955
			set fd_rc [eval [list git_read config --list] $args]
956 957 958
			while {[gets $fd_rc line] >= 0} {
				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
					if {[is_many_config $name]} {
959
						lappend arr($name) $value
960
					} else {
961
						set arr($name) $value
962 963 964 965 966 967
					}
				}
			}
			close $fd_rc
		}
	}
968
}
969

970
proc load_config {include_global} {
971
	global repo_config global_config system_config default_config
972 973

	if {$include_global} {
974
		_parse_config system_config --system
975
		_parse_config global_config --global
976
	}
977
	_parse_config repo_config
978 979

	foreach name [array names default_config] {
980 981 982 983 984
		if {[catch {set v $system_config($name)}]} {
			set system_config($name) $default_config($name)
		}
	}
	foreach name [array names system_config] {
985
		if {[catch {set v $global_config($name)}]} {
986
			set global_config($name) $system_config($name)
987 988
		}
		if {[catch {set v $repo_config($name)}]} {
989
			set repo_config($name) $system_config($name)
990 991 992 993 994
		}
	}
}

######################################################################
995 996 997
##
## feature option selection

998
if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013
	unset _junk
} else {
	set subcommand gui
}
if {$subcommand eq {gui.sh}} {
	set subcommand gui
}
if {$subcommand eq {gui} && [llength $argv] > 0} {
	set subcommand [lindex $argv 0]
	set argv [lrange $argv 1 end]
}

enable_option multicommit
enable_option branch
enable_option transport
1014
disable_option bare
1015 1016 1017 1018

switch -- $subcommand {
browser -
blame {
1019 1020
	enable_option bare

1021 1022 1023 1024 1025 1026
	disable_option multicommit
	disable_option branch
	disable_option transport
}
citool {
	enable_option singlecommit
1027
	enable_option retcode
1028 1029 1030 1031

	disable_option multicommit
	disable_option branch
	disable_option transport
1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052

	while {[llength $argv] > 0} {
		set a [lindex $argv 0]
		switch -- $a {
		--amend {
			enable_option initialamend
		}
		--nocommit {
			enable_option nocommit
			enable_option nocommitmsg
		}
		--commitmsg {
			disable_option nocommitmsg
		}
		default {
			break
		}
		}

		set argv [lrange $argv 1 end]
	}
1053 1054 1055
}
}

1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066
######################################################################
##
## execution environment

set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]

# Suggest our implementation of askpass, if none is set
if {![info exists env(SSH_ASKPASS)]} {
	set env(SSH_ASKPASS) [gitexec git-gui--askpass]
}

1067 1068 1069 1070
######################################################################
##
## repository setup

1071
set picked 0
1072 1073 1074 1075 1076 1077 1078 1079
if {[catch {
		set _gitdir $env(GIT_DIR)
		set _prefix {}
		}]
	&& [catch {
		set _gitdir [git rev-parse --git-dir]
		set _prefix [git rev-parse --show-prefix]
	} err]} {
1080 1081 1082
	load_config 1
	apply_config
	choose_repository::pick
1083
	set picked 1
1084
}
1085
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1086
	catch {set _gitdir [exec cygpath --windows $_gitdir]}
1087
}
1088
if {![file isdirectory $_gitdir]} {
1089
	catch {wm withdraw .}
1090
	error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1091 1092
	exit 1
}
1093 1094 1095 1096
if {$_prefix ne {}} {
	regsub -all {[^/]+/} $_prefix ../ cdup
	if {[catch {cd $cdup} err]} {
		catch {wm withdraw .}
1097
		error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1098 1099 1100 1101
		exit 1
	}
	unset cdup
} elseif {![is_enabled bare]} {
1102 1103
	if {[lindex [file split $_gitdir] end] ne {.git}} {
		catch {wm withdraw .}
1104
		error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
1105 1106 1107 1108
		exit 1
	}
	if {[catch {cd [file dirname $_gitdir]} err]} {
		catch {wm withdraw .}
1109
		error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
1110 1111
		exit 1
	}
1112
}
1113 1114 1115 1116 1117
set _reponame [file split [file normalize $_gitdir]]
if {[lindex $_reponame end] eq {.git}} {
	set _reponame [lindex $_reponame end-1]
} else {
	set _reponame [lindex $_reponame end]
1118 1119
}

1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133
######################################################################
##
## global init

set current_diff_path {}
set current_diff_side {}
set diff_actions [list]

set HEAD {}
set PARENT {}
set MERGE_HEAD [list]
set commit_type {}
set empty_tree {}
set current_branch {}
1134
set is_detached 0
1135
set current_diff_path {}
1136
set is_3way_diff 0
1137
set is_submodule_diff 0
1138
set is_conflict_diff 0
1139
set selected_commit_type new
1140
set diff_empty_count 0
1141

1142 1143 1144
set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001"

S
Shawn O. Pearce 已提交
1145 1146
######################################################################
##
1147
## task management
S
Shawn O. Pearce 已提交
1148

1149
set rescan_active 0
1150
set diff_active 0
1151
set last_clicked {}
1152

1153 1154 1155 1156 1157
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
1158

1159
	if {$index_lock_type eq {none}} {
1160 1161 1162 1163 1164
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
1165
	} elseif {$index_lock_type eq "begin-$type"} {
1166
		set index_lock_type $type
1167 1168 1169 1170
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
1171

1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184
proc unlock_index {} {
	global index_lock_type disable_on_lock

	set index_lock_type none
	foreach w $disable_on_lock {
		uplevel #0 $w normal
	}
}

######################################################################
##
## status

1185
proc repository_state {ctvar hdvar mhvar} {
1186
	global current_branch
1187 1188 1189
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
1190

1191
	load_current_branch
1192
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1193
		set hd {}
1194
		set ct initial
1195 1196 1197
		return
	}

1198
	set merge_head [gitdir MERGE_HEAD]
1199
	if {[file exists $merge_head]} {
1200
		set ct merge
1201 1202 1203 1204 1205 1206
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
1207
	}
1208 1209

	set ct normal
1210 1211
}

1212 1213 1214
proc PARENT {} {
	global PARENT empty_tree

1215 1216 1217
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
1218 1219
	}
	if {$empty_tree eq {}} {
1220
		set empty_tree [git mktree << {}]
1221 1222 1223 1224
	}
	return $empty_tree
}

1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238
proc force_amend {} {
	global selected_commit_type
	global HEAD PARENT MERGE_HEAD commit_type

	repository_state newType newHEAD newMERGE_HEAD
	set HEAD $newHEAD
	set PARENT $newHEAD
	set MERGE_HEAD $newMERGE_HEAD
	set commit_type $newType

	set selected_commit_type amend
	do_select_commit_type
}

1239
proc rescan {after {honor_trustmtime 1}} {
1240
	global HEAD PARENT MERGE_HEAD commit_type
1241
	global ui_index ui_workdir ui_comm
1242
	global rescan_active file_states
1243
	global repo_config
S
Shawn O. Pearce 已提交
1244

1245
	if {$rescan_active > 0 || ![lock_index read]} return
S
Shawn O. Pearce 已提交
1246

1247
	repository_state newType newHEAD newMERGE_HEAD
1248
	if {[string match amend* $commit_type]
1249 1250
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
1251
	} else {
1252 1253 1254 1255
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
1256 1257
	}

S
Shawn O. Pearce 已提交
1258 1259
	array unset file_states

1260 1261 1262
	if {!$::GITGUI_BCK_exists &&
		(![$ui_comm edit modified]
		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
1263 1264
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
1265
		} elseif {[run_prepare_commit_msg_hook]} {
1266 1267 1268
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
1269
		$ui_comm edit reset
1270
		$ui_comm edit modified false
1271 1272
	}

1273
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1274
		rescan_stage2 {} $after
1275
	} else {
1276
		set rescan_active 1
1277
		ui_status [mc "Refreshing file status..."]
1278 1279 1280 1281 1282 1283
		set fd_rf [git_read update-index \
			-q \
			--unmerged \
			--ignore-missing \
			--refresh \
			]
1284
		fconfigure $fd_rf -blocking 0 -translation binary
1285
		fileevent $fd_rf readable \
1286
			[list rescan_stage2 $fd_rf $after]
1287
	}
1288 1289
}

1290 1291 1292
if {[is_Cygwin]} {
	set is_git_info_exclude {}
	proc have_info_exclude {} {
1293
		global is_git_info_exclude
1294

1295 1296 1297 1298 1299
		if {$is_git_info_exclude eq {}} {
			if {[catch {exec test -f [gitdir info exclude]}]} {
				set is_git_info_exclude 0
			} else {
				set is_git_info_exclude 1
1300 1301
			}
		}
1302
		return $is_git_info_exclude
1303 1304 1305 1306 1307 1308 1309
	}
} else {
	proc have_info_exclude {} {
		return [file readable [gitdir info exclude]]
	}
}

1310
proc rescan_stage2 {fd after} {
1311
	global rescan_active buf_rdi buf_rdf buf_rlo
1312

1313
	if {$fd ne {}} {
1314 1315 1316 1317
		read $fd
		if {![eof $fd]} return
		close $fd
	}
1318

1319
	set ls_others [list --exclude-per-directory=.gitignore]
1320 1321
	if {[have_info_exclude]} {
		lappend ls_others "--exclude-from=[gitdir info exclude]"
S
Shawn O. Pearce 已提交
1322
	}
1323 1324 1325 1326
	set user_exclude [get_config core.excludesfile]
	if {$user_exclude ne {} && [file readable $user_exclude]} {
		lappend ls_others "--exclude-from=$user_exclude"
	}
S
Shawn O. Pearce 已提交
1327

1328 1329 1330 1331
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

1332
	set rescan_active 3
1333
	ui_status [mc "Scanning for modified files ..."]
1334 1335 1336
	set fd_di [git_read diff-index --cached -z [PARENT]]
	set fd_df [git_read diff-files -z]
	set fd_lo [eval git_read ls-files --others -z $ls_others]
S
Shawn O. Pearce 已提交
1337

1338 1339 1340
	fconfigure $fd_di -blocking 0 -translation binary -encoding binary
	fconfigure $fd_df -blocking 0 -translation binary -encoding binary
	fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1341 1342 1343
	fileevent $fd_di readable [list read_diff_index $fd_di $after]
	fileevent $fd_df readable [list read_diff_files $fd_df $after]
	fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
S
Shawn O. Pearce 已提交
1344 1345
}

1346
proc load_message {file} {
1347
	global ui_comm
1348

1349
	set f [gitdir $file]
1350
	if {[file isfile $f]} {
1351 1352 1353
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
1354
		fconfigure $fd -eofchar {}
1355
		set content [string trim [read $fd]]
1356
		close $fd
1357
		regsub -all -line {[ \r\t]+$} $content {} content
1358 1359 1360 1361 1362 1363 1364
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428
proc run_prepare_commit_msg_hook {} {
	global pch_error

	# prepare-commit-msg requires PREPARE_COMMIT_MSG exist.  From git-gui
	# it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
	# empty file but existant file.

	set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]

	if {[file isfile [gitdir MERGE_MSG]]} {
		set pcm_source "merge"
		set fd_mm [open [gitdir MERGE_MSG] r]
		puts -nonewline $fd_pcm [read $fd_mm]
		close $fd_mm
	} elseif {[file isfile [gitdir SQUASH_MSG]]} {
		set pcm_source "squash"
		set fd_sm [open [gitdir SQUASH_MSG] r]
		puts -nonewline $fd_pcm [read $fd_sm]
		close $fd_sm
	} else {
		set pcm_source ""
	}

	close $fd_pcm

	set fd_ph [githook_read prepare-commit-msg \
			[gitdir PREPARE_COMMIT_MSG] $pcm_source]
	if {$fd_ph eq {}} {
		catch {file delete [gitdir PREPARE_COMMIT_MSG]}
		return 0;
	}

	ui_status [mc "Calling prepare-commit-msg hook..."]
	set pch_error {}

	fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
	fileevent $fd_ph readable \
		[list prepare_commit_msg_hook_wait $fd_ph]

	return 1;
}

proc prepare_commit_msg_hook_wait {fd_ph} {
	global pch_error

	append pch_error [read $fd_ph]
	fconfigure $fd_ph -blocking 1
	if {[eof $fd_ph]} {
		if {[catch {close $fd_ph}]} {
			ui_status [mc "Commit declined by prepare-commit-msg hook."]
			hook_failed_popup prepare-commit-msg $pch_error
			catch {file delete [gitdir PREPARE_COMMIT_MSG]}
			exit 1
		} else {
			load_message PREPARE_COMMIT_MSG
		}
		set pch_error {}
		catch {file delete [gitdir PREPARE_COMMIT_MSG]}
		return
        }
	fconfigure $fd_ph -blocking 0
	catch {file delete [gitdir PREPARE_COMMIT_MSG]}
}

1429
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
1430 1431 1432
	global buf_rdi

	append buf_rdi [read $fd]
1433 1434 1435 1436 1437 1438 1439 1440 1441 1442
	set c 0
	set n [string length $buf_rdi]
	while {$c < $n} {
		set z1 [string first "\0" $buf_rdi $c]
		if {$z1 == -1} break
		incr z1
		set z2 [string first "\0" $buf_rdi $z1]
		if {$z2 == -1} break

		incr c
1443
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1444
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1445
		merge_state \
1446
			[encoding convertfrom $p] \
1447 1448
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
1449 1450
			[list]
		set c $z2
1451
		incr c
S
Shawn O. Pearce 已提交
1452
	}
1453 1454 1455 1456 1457 1458
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

1459
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
1460 1461
}

1462
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
1463 1464 1465
	global buf_rdf

	append buf_rdf [read $fd]
1466 1467 1468 1469 1470 1471 1472 1473 1474 1475
	set c 0
	set n [string length $buf_rdf]
	while {$c < $n} {
		set z1 [string first "\0" $buf_rdf $c]
		if {$z1 == -1} break
		incr z1
		set z2 [string first "\0" $buf_rdf $z1]
		if {$z2 == -1} break

		incr c
1476
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1477
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1478
		merge_state \
1479
			[encoding convertfrom $p] \
1480
			?[lindex $i 4] \
1481
			[list] \
1482
			[list [lindex $i 0] [lindex $i 2]]
1483
		set c $z2
1484
		incr c
1485 1486 1487 1488 1489
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
1490
	}
1491

1492
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
1493 1494
}

1495
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
1496 1497 1498 1499 1500 1501
	global buf_rlo

	append buf_rlo [read $fd]
	set pck [split $buf_rlo "\0"]
	set buf_rlo [lindex $pck end]
	foreach p [lrange $pck 0 end-1] {
1502 1503 1504 1505 1506
		set p [encoding convertfrom $p]
		if {[string index $p end] eq {/}} {
			set p [string range $p 0 end-1]
		}
		merge_state $p ?O
S
Shawn O. Pearce 已提交
1507
	}
1508
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
1509 1510
}

1511
proc rescan_done {fd buf after} {
1512
	global rescan_active current_diff_path
1513
	global file_states repo_config
1514
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
1515

1516 1517 1518
	if {![eof $fd]} return
	set to_clear {}
	close $fd
1519
	if {[incr rescan_active -1] > 0} return
1520

1521
	prune_selection
1522 1523
	unlock_index
	display_all_files
1524 1525
	if {$current_diff_path ne {}} { reshow_diff $after }
	if {$current_diff_path eq {}} { select_first_diff $after }
S
Shawn O. Pearce 已提交
1526 1527
}

1528 1529 1530 1531 1532 1533 1534 1535 1536 1537
proc prune_selection {} {
	global file_states selected_paths

	foreach path [array names selected_paths] {
		if {[catch {set still_here $file_states($path)}]} {
			unset selected_paths($path)
		}
	}
}

S
Shawn O. Pearce 已提交
1538 1539
######################################################################
##
1540
## ui helpers
S
Shawn O. Pearce 已提交
1541

1542 1543 1544 1545 1546 1547 1548 1549 1550
proc mapicon {w state path} {
	global all_icons

	if {[catch {set r $all_icons($state$w)}]} {
		puts "error: no icon for $w state={$state} $path"
		return file_plain
	}
	return $r
}
S
Shawn O. Pearce 已提交
1551

1552 1553
proc mapdesc {state path} {
	global all_descs
1554

1555 1556 1557 1558 1559 1560
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
1561

1562
proc ui_status {msg} {
1563 1564 1565 1566
	global main_status
	if {[info exists main_status]} {
		$main_status show $msg
	}
1567 1568 1569
}

proc ui_ready {{test {}}} {
1570 1571 1572 1573
	global main_status
	if {[info exists main_status]} {
		$main_status show [mc "Ready."] $test
	}
1574 1575
}

1576 1577 1578 1579
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
1580 1581
}

1582 1583
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
1584 1585
}

1586 1587
set next_icon_id 0
set null_sha1 [string repeat 0 40]
1588

1589 1590
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
1591

1592 1593
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
1594

1595 1596 1597 1598 1599 1600 1601 1602 1603
	if {[catch {set info $file_states($path)}]} {
		set state __
		set icon n[incr next_icon_id]
	} else {
		set state [lindex $info 0]
		set icon [lindex $info 1]
		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
		if {$index_info eq {}} {set index_info [lindex $info 3]}
	}
1604

1605 1606
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
1607

1608 1609
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
1610

1611 1612 1613 1614 1615 1616
	if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
		set head_info [list 0 $null_sha1]
	} elseif {$s0 ne {_} && [string index $state 0] eq {_}
		&& $head_info eq {}} {
		set head_info $index_info
	}
1617

1618 1619 1620 1621 1622
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
1623

1624 1625
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
1626

1627
	if {$new_m eq {_}} {
1628
		set lno [lsearch -sorted -exact $file_lists($w) $path]
1629
		if {$lno >= 0} {
1630
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1631
			incr lno
1632 1633 1634
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
1635
		}
1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651
	} elseif {$old_m eq {_} && $new_m ne {_}} {
		lappend file_lists($w) $path
		set file_lists($w) [lsort -unique $file_lists($w)]
		set lno [lsearch -sorted -exact $file_lists($w) $path]
		incr lno
		$w conf -state normal
		$w image create $lno.0 \
			-align center -padx 5 -pady 1 \
			-name $icon_name \
			-image [mapicon $w $new_m $path]
		$w insert $lno.1 "[escape_path $path]\n"
		$w conf -state disabled
	} elseif {$old_m ne $new_m} {
		$w conf -state normal
		$w image conf $icon_name -image [mapicon $w $new_m $path]
		$w conf -state disabled
1652
	}
1653 1654 1655 1656 1657
}

proc display_file {path state} {
	global file_states selected_paths
	global ui_index ui_workdir
1658

1659
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
1660
	set s $file_states($path)
1661 1662
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
1663

1664 1665 1666 1667 1668 1669 1670
	set o [string index $old_m 0]
	set n [string index $new_m 0]
	if {$o eq {U}} {
		set o _
	}
	if {$n eq {U}} {
		set n _
S
Shawn O. Pearce 已提交
1671
	}
1672
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
1673

1674 1675 1676 1677
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
1678
	}
1679 1680 1681 1682
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
1683
	}
1684 1685 1686 1687 1688
	display_file_helper	$ui_workdir $path $icon_name $o $n

	if {$new_m eq {__}} {
		unset file_states($path)
		catch {unset selected_paths($path)}
S
Shawn O. Pearce 已提交
1689
	}
1690
}
S
Shawn O. Pearce 已提交
1691

1692 1693 1694 1695 1696 1697 1698 1699 1700 1701
proc display_all_files_helper {w path icon_name m} {
	global file_lists

	lappend file_lists($w) $path
	set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
	$w image create end \
		-align center -padx 5 -pady 1 \
		-name $icon_name \
		-image [mapicon $w $m $path]
	$w insert end "[escape_path $path]\n"
S
Shawn O. Pearce 已提交
1702 1703
}

1704
set files_warning 0
1705 1706 1707 1708
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
1709
	global files_warning
S
Shawn O. Pearce 已提交
1710

1711 1712
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
1713

1714 1715 1716
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
1717

1718 1719
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
1720

1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732
	set to_display [lsort [array names file_states]]
	set display_limit [get_config gui.maxfilesdisplayed]
	if {[llength $to_display] > $display_limit} {
		if {!$files_warning} {
			# do not repeatedly warn:
			set files_warning 1
			info_popup [mc "Displaying only %s of %s files." \
				$display_limit [llength $to_display]]
		}
		set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
	}
	foreach path $to_display {
1733 1734 1735 1736 1737 1738 1739 1740
		set s $file_states($path)
		set m [lindex $s 0]
		set icon_name [lindex $s 1]

		set s [string index $m 0]
		if {$s ne {U} && $s ne {_}} {
			display_all_files_helper $ui_index $path \
				$icon_name $s
1741
		}
S
Shawn O. Pearce 已提交
1742

1743 1744 1745 1746
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
1747
		}
1748 1749 1750
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
1751 1752 1753
		}
	}

1754 1755
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
1756 1757
}

1758 1759
######################################################################
##
1760
## icons
1761

1762 1763 1764 1765 1766 1767 1768 1769
set filemask {
#define mask_width 14
#define mask_height 15
static unsigned char mask_bits[] = {
   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
}
S
Shawn O. Pearce 已提交
1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788

image create bitmap file_plain -background white -foreground black -data {
#define plain_width 14
#define plain_height 15
static unsigned char plain_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

image create bitmap file_mod -background white -foreground blue -data {
#define mod_width 14
#define mod_height 15
static unsigned char mod_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

1789 1790 1791 1792
image create bitmap file_fulltick -background white -foreground "#007000" -data {
#define file_fulltick_width 14
#define file_fulltick_height 15
static unsigned char file_fulltick_bits[] = {
S
Shawn O. Pearce 已提交
1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833
   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

image create bitmap file_parttick -background white -foreground "#005050" -data {
#define parttick_width 14
#define parttick_height 15
static unsigned char parttick_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

image create bitmap file_question -background white -foreground black -data {
#define file_question_width 14
#define file_question_height 15
static unsigned char file_question_bits[] = {
   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

image create bitmap file_removed -background white -foreground red -data {
#define file_removed_width 14
#define file_removed_height 15
static unsigned char file_removed_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

image create bitmap file_merge -background white -foreground blue -data {
#define file_merge_width 14
#define file_merge_height 15
static unsigned char file_merge_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

1834 1835 1836 1837 1838 1839 1840 1841 1842
image create bitmap file_statechange -background white -foreground green -data {
#define file_merge_width 14
#define file_merge_height 15
static unsigned char file_statechange_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
   0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

1843
set ui_index .vpane.files.index.list
1844
set ui_workdir .vpane.files.workdir.list
1845 1846 1847 1848 1849 1850

set all_icons(_$ui_index)   file_plain
set all_icons(A$ui_index)   file_fulltick
set all_icons(M$ui_index)   file_fulltick
set all_icons(D$ui_index)   file_removed
set all_icons(U$ui_index)   file_merge
1851
set all_icons(T$ui_index)   file_statechange
1852 1853 1854 1855

set all_icons(_$ui_workdir) file_plain
set all_icons(M$ui_workdir) file_mod
set all_icons(D$ui_workdir) file_question
1856
set all_icons(U$ui_workdir) file_merge
1857
set all_icons(O$ui_workdir) file_plain
1858
set all_icons(T$ui_workdir) file_statechange
1859

1860
set max_status_desc 0
S
Shawn O. Pearce 已提交
1861
foreach i {
1862 1863 1864 1865 1866 1867 1868
		{__ {mc "Unmodified"}}

		{_M {mc "Modified, not staged"}}
		{M_ {mc "Staged for commit"}}
		{MM {mc "Portions staged for commit"}}
		{MD {mc "Staged for commit, missing"}}

1869 1870 1871
		{_T {mc "File type changed, not staged"}}
		{T_ {mc "File type changed, staged"}}

1872 1873 1874 1875 1876 1877 1878 1879 1880
		{_O {mc "Untracked, not staged"}}
		{A_ {mc "Staged for commit"}}
		{AM {mc "Portions staged for commit"}}
		{AD {mc "Staged for commit, missing"}}

		{_D {mc "Missing"}}
		{D_ {mc "Staged for removal"}}
		{DO {mc "Staged for removal, still present"}}

1881
		{_U {mc "Requires merge resolution"}}
1882 1883 1884 1885
		{U_ {mc "Requires merge resolution"}}
		{UU {mc "Requires merge resolution"}}
		{UM {mc "Requires merge resolution"}}
		{UD {mc "Requires merge resolution"}}
1886
		{UT {mc "Requires merge resolution"}}
S
Shawn O. Pearce 已提交
1887
	} {
1888 1889 1890
	set text [eval [lindex $i 1]]
	if {$max_status_desc < [string length $text]} {
		set max_status_desc [string length $text]
1891
	}
1892
	set all_descs([lindex $i 0]) $text
S
Shawn O. Pearce 已提交
1893
}
1894
unset i
S
Shawn O. Pearce 已提交
1895 1896 1897 1898 1899

######################################################################
##
## util

1900 1901 1902 1903 1904 1905 1906 1907 1908
proc scrollbar2many {list mode args} {
	foreach w $list {eval $w $mode $args}
}

proc many2scrollbar {list mode sb top bottom} {
	$sb set $top $bottom
	foreach w $list {$w $mode moveto $top}
}

1909 1910 1911 1912 1913
proc incr_font_size {font {amt 1}} {
	set sz [font configure $font -size]
	incr sz $amt
	font configure $font -size $sz
	font configure ${font}bold -size $sz
1914
	font configure ${font}italic -size $sz
1915 1916
}

S
Shawn O. Pearce 已提交
1917 1918 1919 1920
######################################################################
##
## ui commands

1921
set starting_gitk_msg [mc "Starting gitk... please wait..."]
1922

1923
proc do_gitk {revs} {
1924 1925 1926
	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
1927
	set exe [_which gitk -script]
1928
	set cmd [list [info nameofexecutable] $exe]
1929 1930
	if {$exe eq {}} {
		error_popup [mc "Couldn't find gitk in PATH"]
S
Shawn O. Pearce 已提交
1931
	} else {
1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943
		global env

		if {[info exists env(GIT_DIR)]} {
			set old_GIT_DIR $env(GIT_DIR)
		} else {
			set old_GIT_DIR {}
		}

		set pwd [pwd]
		cd [file dirname [gitdir]]
		set env(GIT_DIR) [file tail [gitdir]]

1944
		eval exec $cmd $revs &
1945 1946 1947 1948 1949 1950 1951 1952

		if {$old_GIT_DIR eq {}} {
			unset env(GIT_DIR)
		} else {
			set env(GIT_DIR) $old_GIT_DIR
		}
		cd $pwd

1953
		ui_status $::starting_gitk_msg
1954
		after 10000 {
1955
			ui_ready $starting_gitk_msg
1956
		}
S
Shawn O. Pearce 已提交
1957 1958 1959
	}
}

1960 1961 1962 1963 1964 1965 1966 1967 1968 1969
proc do_explore {} {
	set explorer {}
	if {[is_Cygwin] || [is_Windows]} {
		set explorer "explorer.exe"
	} elseif {[is_MacOSX]} {
		set explorer "open"
	} else {
		# freedesktop.org-conforming system is our best shot
		set explorer "xdg-open"
	}
1970
	eval exec $explorer [list [file nativename [file dirname [gitdir]]]] &
1971 1972
}

1973
set is_quitting 0
1974
set ret_code    1
1975

1976 1977 1978 1979 1980 1981 1982
proc terminate_me {win} {
	global ret_code
	if {$win ne {.}} return
	exit $ret_code
}

proc do_quit {{rc {1}}} {
1983
	global ui_comm is_quitting repo_config commit_type
1984
	global GITGUI_BCK_exists GITGUI_BCK_i
1985
	global ui_comm_spell
1986
	global ret_code
1987

1988 1989
	if {$is_quitting} return
	set is_quitting 1
1990

1991 1992 1993 1994
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
1995 1996 1997
		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
			file rename -force [gitdir GITGUI_BCK] $save
			set GITGUI_BCK_exists 0
1998
		} else {
1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013
			set msg [string trim [$ui_comm get 0.0 end]]
			regsub -all -line {[ \r\t]+$} $msg {} msg
			if {(![string match amend* $commit_type]
				|| [$ui_comm edit modified])
				&& $msg ne {}} {
				catch {
					set fd [open $save w]
					puts -nonewline $fd $msg
					close $fd
				}
			} else {
				catch {file delete $save}
			}
		}

2014 2015 2016 2017 2018 2019
		# -- Cancel our spellchecker if its running.
		#
		if {[info exists ui_comm_spell]} {
			$ui_comm_spell stop
		}

2020 2021 2022 2023 2024
		# -- Remove our editor backup, its not needed.
		#
		after cancel $GITGUI_BCK_i
		if {$GITGUI_BCK_exists} {
			catch {file delete [gitdir GITGUI_BCK]}
2025 2026
		}

2027 2028
		# -- Stash our current window geometry into this repository.
		#
2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041
		set cfg_wmstate [wm state .]
		if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
			set rc_wmstate {}
		}
		if {$cfg_wmstate ne $rc_wmstate} {
			catch {git config gui.wmstate $cfg_wmstate}
		}
		if {$cfg_wmstate eq {zoomed}} {
			# on Windows wm geometry will lie about window
			# position (but not size) when window is zoomed
			# restore the window before querying wm geometry
			wm state . normal
		}
2042 2043
		set cfg_geometry [list]
		lappend cfg_geometry [wm geometry .]
2044 2045
		lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
		lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2046 2047 2048 2049
		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
			set rc_geometry {}
		}
		if {$cfg_geometry ne $rc_geometry} {
2050
			catch {git config gui.geometry $cfg_geometry}
2051
		}
2052 2053
	}

2054
	set ret_code $rc
2055 2056 2057 2058 2059

	# Briefly enable send again, working around Tk bug
	# http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
	tk appname [appname]

S
Shawn O. Pearce 已提交
2060 2061 2062 2063
	destroy .
}

proc do_rescan {} {
2064
	rescan ui_ready
S
Shawn O. Pearce 已提交
2065 2066
}

2067
proc ui_do_rescan {} {
2068
	rescan {force_first_diff ui_ready}
2069 2070
}

2071
proc do_commit {} {
2072
	commit_tree
2073 2074
}

2075
proc next_diff {{after {}}} {
2076
	global next_diff_p next_diff_w next_diff_i
2077
	show_diff $next_diff_p $next_diff_w {} {} $after
2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161
}

proc find_anchor_pos {lst name} {
	set lid [lsearch -sorted -exact $lst $name]

	if {$lid == -1} {
		set lid 0
		foreach lname $lst {
			if {$lname >= $name} break
			incr lid
		}
	}

	return $lid
}

proc find_file_from {flist idx delta path mmask} {
	global file_states

	set len [llength $flist]
	while {$idx >= 0 && $idx < $len} {
		set name [lindex $flist $idx]

		if {$name ne $path && [info exists file_states($name)]} {
			set state [lindex $file_states($name) 0]

			if {$mmask eq {} || [regexp $mmask $state]} {
				return $idx
			}
		}

		incr idx $delta
	}

	return {}
}

proc find_next_diff {w path {lno {}} {mmask {}}} {
	global next_diff_p next_diff_w next_diff_i
	global file_lists ui_index ui_workdir

	set flist $file_lists($w)
	if {$lno eq {}} {
		set lno [find_anchor_pos $flist $path]
	} else {
		incr lno -1
	}

	if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
		if {$w eq $ui_index} {
			set mmask "^$mmask"
		} else {
			set mmask "$mmask\$"
		}
	}

	set idx [find_file_from $flist $lno 1 $path $mmask]
	if {$idx eq {}} {
		incr lno -1
		set idx [find_file_from $flist $lno -1 $path $mmask]
	}

	if {$idx ne {}} {
		set next_diff_w $w
		set next_diff_p [lindex $flist $idx]
		set next_diff_i [expr {$idx+1}]
		return 1
	} else {
		return 0
	}
}

proc next_diff_after_action {w path {lno {}} {mmask {}}} {
	global current_diff_path

	if {$path ne $current_diff_path} {
		return {}
	} elseif {[find_next_diff $w $path $lno $mmask]} {
		return {next_diff;}
	} else {
		return {reshow_diff;}
	}
}

2162
proc select_first_diff {after} {
2163 2164 2165 2166
	global ui_workdir

	if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
	    [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2167 2168 2169
		next_diff $after
	} else {
		uplevel #0 $after
2170
	}
2171 2172
}

2173 2174
proc force_first_diff {after} {
	global ui_workdir current_diff_path file_states
2175 2176 2177

	if {[info exists file_states($current_diff_path)]} {
		set state [lindex $file_states($current_diff_path) 0]
2178 2179 2180
	} else {
		set state {OO}
	}
2181

2182 2183 2184 2185 2186 2187 2188 2189 2190
	set reselect 0
	if {[string first {U} $state] >= 0} {
		# Already a conflict, do nothing
	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
		set reselect 1
	} elseif {[string index $state 1] ne {O}} {
		# Already a diff & no conflicts, do nothing
	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
		set reselect 1
2191 2192
	}

2193 2194 2195 2196 2197
	if {$reselect} {
		next_diff $after
	} else {
		uplevel #0 $after
	}
2198 2199
}

2200
proc toggle_or_diff {w x y} {
2201
	global file_states file_lists current_diff_path ui_index ui_workdir
2202
	global last_clicked selected_paths
2203

S
Shawn O. Pearce 已提交
2204 2205 2206
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
2207 2208 2209 2210 2211 2212 2213 2214 2215
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}

	set last_clicked [list $w $lno]
	array unset selected_paths
	$ui_index tag remove in_sel 0.0 end
2216
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
2217

2218
	# Determine the state of the file
2219 2220
	if {[info exists file_states($path)]} {
		set state [lindex $file_states($path) 0]
2221 2222 2223 2224 2225
	} else {
		set state {__}
	}

	# Restage the file, or simply show the diff
2226
	if {$col == 0 && $y > 1} {
2227 2228
		# Conflicts need special handling
		if {[string first {U} $state] >= 0} {
2229 2230 2231
			# $w must always be $ui_workdir, but...
			if {$w ne $ui_workdir} { set lno {} }
			merge_stage_workdir $path $lno
2232 2233 2234
			return
		}

2235 2236 2237 2238 2239 2240 2241
		if {[string index $state 1] eq {O}} {
			set mmask {}
		} else {
			set mmask {[^O]}
		}

		set after [next_diff_after_action $w $path $lno $mmask]
2242

2243
		if {$w eq $ui_index} {
2244
			update_indexinfo \
2245
				"Unstaging [short_path $path] from commit" \
2246
				[list $path] \
2247
				[concat $after [list ui_ready]]
2248
		} elseif {$w eq $ui_workdir} {
2249
			update_index \
2250
				"Adding [short_path $path]" \
2251
				[list $path] \
2252
				[concat $after [list ui_ready]]
2253
		}
2254
	} else {
2255
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
2256 2257 2258
	}
}

2259
proc add_one_to_selection {w x y} {
2260
	global file_lists last_clicked selected_paths
2261

2262
	set lno [lindex [split [$w index @$x,$y] .] 0]
2263 2264 2265 2266 2267
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
2268

2269 2270 2271 2272 2273 2274
	if {$last_clicked ne {}
		&& [lindex $last_clicked 0] ne $w} {
		array unset selected_paths
		[lindex $last_clicked 0] tag remove in_sel 0.0 end
	}

2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288
	set last_clicked [list $w $lno]
	if {[catch {set in_sel $selected_paths($path)}]} {
		set in_sel 0
	}
	if {$in_sel} {
		unset selected_paths($path)
		$w tag remove in_sel $lno.0 [expr {$lno + 1}].0
	} else {
		set selected_paths($path) 1
		$w tag add in_sel $lno.0 [expr {$lno + 1}].0
	}
}

proc add_range_to_selection {w x y} {
2289
	global file_lists last_clicked selected_paths
2290 2291 2292 2293

	if {[lindex $last_clicked 0] ne $w} {
		toggle_or_diff $w $x $y
		return
S
Shawn O. Pearce 已提交
2294
	}
2295

2296
	set lno [lindex [split [$w index @$x,$y] .] 0]
2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311
	set lc [lindex $last_clicked 1]
	if {$lc < $lno} {
		set begin $lc
		set end $lno
	} else {
		set begin $lno
		set end $lc
	}

	foreach path [lrange $file_lists($w) \
		[expr {$begin - 1}] \
		[expr {$end - 1}]] {
		set selected_paths($path) 1
	}
	$w tag add in_sel $begin.0 [expr {$end + 1}].0
S
Shawn O. Pearce 已提交
2312 2313
}

2314 2315 2316 2317 2318 2319 2320 2321 2322 2323
proc show_more_context {} {
	global repo_config
	if {$repo_config(gui.diffcontext) < 99} {
		incr repo_config(gui.diffcontext)
		reshow_diff
	}
}

proc show_less_context {} {
	global repo_config
2324
	if {$repo_config(gui.diffcontext) > 1} {
2325 2326 2327 2328 2329
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}
}

S
Shawn O. Pearce 已提交
2330 2331
######################################################################
##
2332
## ui construction
2333

2334
load_config 0
2335
apply_config
2336 2337
set ui_comm {}

S
Shawn O. Pearce 已提交
2338
# -- Menu Bar
2339
#
2340
menu .mbar -tearoff 0
2341 2342 2343 2344 2345 2346
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple
}
2347 2348
.mbar add cascade -label [mc Repository] -menu .mbar.repository
.mbar add cascade -label [mc Edit] -menu .mbar.edit
2349
if {[is_enabled branch]} {
2350
	.mbar add cascade -label [mc Branch] -menu .mbar.branch
S
Shawn O. Pearce 已提交
2351
}
2352
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2353
	.mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2354
}
2355
if {[is_enabled transport]} {
2356
	.mbar add cascade -label [mc Merge] -menu .mbar.merge
2357
	.mbar add cascade -label [mc Remote] -menu .mbar.remote
2358
}
2359 2360 2361
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	.mbar add cascade -label [mc Tools] -menu .mbar.tools
}
S
Shawn O. Pearce 已提交
2362

2363
# -- Repository Menu
2364
#
2365
menu .mbar.repository
2366

2367 2368 2369 2370 2371
.mbar.repository add command \
	-label [mc "Explore Working Copy"] \
	-command {do_explore}
.mbar.repository add separator

2372
.mbar.repository add command \
2373
	-label [mc "Browse Current Branch's Files"] \
2374
	-command {browser::new $current_branch}
2375
set ui_browse_current [.mbar.repository index last]
2376
.mbar.repository add command \
2377
	-label [mc "Browse Branch Files..."] \
2378
	-command browser_open::dialog
2379 2380
.mbar.repository add separator

2381
.mbar.repository add command \
2382
	-label [mc "Visualize Current Branch's History"] \
2383
	-command {do_gitk $current_branch}
2384
set ui_visualize_current [.mbar.repository index last]
2385
.mbar.repository add command \
2386
	-label [mc "Visualize All Branch History"] \
2387
	-command {do_gitk --all}
2388
.mbar.repository add separator
2389

2390 2391 2392
proc current_branch_write {args} {
	global current_branch
	.mbar.repository entryconf $::ui_browse_current \
2393
		-label [mc "Browse %s's Files" $current_branch]
2394
	.mbar.repository entryconf $::ui_visualize_current \
2395
		-label [mc "Visualize %s's History" $current_branch]
2396 2397 2398
}
trace add variable current_branch write current_branch_write

2399
if {[is_enabled multicommit]} {
2400
	.mbar.repository add command -label [mc "Database Statistics"] \
2401
		-command do_stats
2402

2403
	.mbar.repository add command -label [mc "Compress Database"] \
2404
		-command do_gc
2405

2406
	.mbar.repository add command -label [mc "Verify Database"] \
2407
		-command do_fsck_objects
2408

2409
	.mbar.repository add separator
2410

2411 2412
	if {[is_Cygwin]} {
		.mbar.repository add command \
2413
			-label [mc "Create Desktop Icon"] \
2414
			-command do_cygwin_shortcut
2415
	} elseif {[is_Windows]} {
2416
		.mbar.repository add command \
2417
			-label [mc "Create Desktop Icon"] \
2418
			-command do_windows_shortcut
2419
	} elseif {[is_MacOSX]} {
2420
		.mbar.repository add command \
2421
			-label [mc "Create Desktop Icon"] \
2422
			-command do_macosx_app
2423
	}
2424
}
2425

2426 2427 2428 2429 2430 2431 2432
if {[is_MacOSX]} {
	proc ::tk::mac::Quit {args} { do_quit }
} else {
	.mbar.repository add command -label [mc Quit] \
		-command do_quit \
		-accelerator $M1T-Q
}
S
Shawn O. Pearce 已提交
2433

2434 2435 2436
# -- Edit Menu
#
menu .mbar.edit
2437
.mbar.edit add command -label [mc Undo] \
2438
	-command {catch {[focus] edit undo}} \
2439
	-accelerator $M1T-Z
2440
.mbar.edit add command -label [mc Redo] \
2441
	-command {catch {[focus] edit redo}} \
2442
	-accelerator $M1T-Y
2443
.mbar.edit add separator
2444
.mbar.edit add command -label [mc Cut] \
2445
	-command {catch {tk_textCut [focus]}} \
2446
	-accelerator $M1T-X
2447
.mbar.edit add command -label [mc Copy] \
2448
	-command {catch {tk_textCopy [focus]}} \
2449
	-accelerator $M1T-C
2450
.mbar.edit add command -label [mc Paste] \
2451
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
2452
	-accelerator $M1T-V
2453
.mbar.edit add command -label [mc Delete] \
2454
	-command {catch {[focus] delete sel.first sel.last}} \
2455
	-accelerator Del
2456
.mbar.edit add separator
2457
.mbar.edit add command -label [mc "Select All"] \
2458
	-command {catch {[focus] tag add sel 0.0 end}} \
2459
	-accelerator $M1T-A
2460

2461 2462
# -- Branch Menu
#
2463
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
2464 2465
	menu .mbar.branch

2466
	.mbar.branch add command -label [mc "Create..."] \
2467
		-command branch_create::dialog \
2468
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
2469 2470 2471
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2472
	.mbar.branch add command -label [mc "Checkout..."] \
2473 2474 2475 2476 2477
		-command branch_checkout::dialog \
		-accelerator $M1T-O
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2478
	.mbar.branch add command -label [mc "Rename..."] \
2479 2480 2481 2482
		-command branch_rename::dialog
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2483
	.mbar.branch add command -label [mc "Delete..."] \
2484
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
2485 2486
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
2487

2488
	.mbar.branch add command -label [mc "Reset..."] \
2489
		-command merge::reset_hard
2490 2491
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
2492 2493
}

S
Shawn O. Pearce 已提交
2494
# -- Commit Menu
2495
#
2496 2497 2498 2499 2500 2501 2502 2503
proc commit_btn_caption {} {
	if {[is_enabled nocommit]} {
		return [mc "Done"]
	} else {
		return [mc Commit@@verb]
	}
}

2504 2505 2506
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	menu .mbar.commit

2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525
	if {![is_enabled nocommit]} {
		.mbar.commit add radiobutton \
			-label [mc "New Commit"] \
			-command do_select_commit_type \
			-variable selected_commit_type \
			-value new
		lappend disable_on_lock \
			[list .mbar.commit entryconf [.mbar.commit index last] -state]

		.mbar.commit add radiobutton \
			-label [mc "Amend Last Commit"] \
			-command do_select_commit_type \
			-variable selected_commit_type \
			-value amend
		lappend disable_on_lock \
			[list .mbar.commit entryconf [.mbar.commit index last] -state]

		.mbar.commit add separator
	}
2526

2527
	.mbar.commit add command -label [mc Rescan] \
2528
		-command ui_do_rescan \
2529
		-accelerator F5
2530 2531
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2532

2533
	.mbar.commit add command -label [mc "Stage To Commit"] \
2534 2535
		-command do_add_selection \
		-accelerator $M1T-T
2536 2537
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2538

2539
	.mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2540
		-command do_add_all \
2541
		-accelerator $M1T-I
2542 2543
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2544

2545
	.mbar.commit add command -label [mc "Unstage From Commit"] \
2546 2547
		-command do_unstage_selection \
		-accelerator $M1T-U
2548 2549
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2550

2551
	.mbar.commit add command -label [mc "Revert Changes"] \
2552 2553
		-command do_revert_selection \
		-accelerator $M1T-J
2554 2555
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2556

2557
	.mbar.commit add separator
2558

2559 2560
	.mbar.commit add command -label [mc "Show Less Context"] \
		-command show_less_context \
2561
		-accelerator $M1T-\-
2562 2563 2564

	.mbar.commit add command -label [mc "Show More Context"] \
		-command show_more_context \
2565
		-accelerator $M1T-=
2566 2567 2568

	.mbar.commit add separator

2569
	if {![is_enabled nocommitmsg]} {
2570 2571 2572 2573
		.mbar.commit add command -label [mc "Sign Off"] \
			-command do_signoff \
			-accelerator $M1T-S
	}
2574

2575
	.mbar.commit add command -label [commit_btn_caption] \
2576
		-command do_commit \
2577
		-accelerator $M1T-Return
2578 2579 2580
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
2581

2582 2583 2584 2585
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
2586
	.mbar.merge add command -label [mc "Local Merge..."] \
2587 2588
		-command merge::dialog \
		-accelerator $M1T-M
2589 2590
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
2591
	.mbar.merge add command -label [mc "Abort Merge..."] \
2592
		-command merge::reset_hard
2593 2594 2595 2596 2597 2598 2599
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
}

# -- Transport Menu
#
if {[is_enabled transport]} {
2600
	menu .mbar.remote
2601

2602 2603 2604 2605
	.mbar.remote add command \
		-label [mc "Add..."] \
		-command remote_add::dialog \
		-accelerator $M1T-A
2606 2607
	.mbar.remote add command \
		-label [mc "Push..."] \
2608 2609
		-command do_push_anywhere \
		-accelerator $M1T-P
2610
	.mbar.remote add command \
2611
		-label [mc "Delete Branch..."] \
2612
		-command remote_branch_delete::dialog
2613 2614
}

S
Shawn O. Pearce 已提交
2615
if {[is_MacOSX]} {
2616
	proc ::tk::mac::ShowPreferences {} {do_options}
S
Shawn O. Pearce 已提交
2617 2618 2619 2620
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
2621
	.mbar.edit add command -label [mc "Options..."] \
2622
		-command do_options
2623
}
2624

2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638
# -- Tools Menu
#
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	set tools_menubar .mbar.tools
	menu $tools_menubar
	$tools_menubar add separator
	$tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
	$tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
	set tools_tailcnt 3
	if {[array names repo_config guitool.*.cmd] ne {}} {
		tools_populate_all
	}
}

2639 2640
# -- Help Menu
#
2641
.mbar add cascade -label [mc Help] -menu .mbar.help
2642
menu .mbar.help
S
Shawn O. Pearce 已提交
2643

2644 2645 2646 2647 2648
if {[is_MacOSX]} {
	.mbar.apple add command -label [mc "About %s" [appname]] \
		-command do_about
	.mbar.apple add separator
} else {
2649
	.mbar.help add command -label [mc "About %s" [appname]] \
2650
		-command do_about
S
Shawn O. Pearce 已提交
2651
}
2652
. configure -menu .mbar
2653

2654 2655 2656
set doc_path [githtmldir]
if {$doc_path ne {}} {
	set doc_path [file join $doc_path index.html]
2657

2658 2659 2660
	if {[is_Cygwin]} {
		set doc_path [exec cygpath --mixed $doc_path]
	}
2661 2662 2663 2664 2665 2666 2667 2668
}

if {[file isfile $doc_path]} {
	set doc_url "file:$doc_path"
} else {
	set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
}

2669 2670
proc start_browser {url} {
	git "web--browse" $url
2671
}
2672 2673 2674

.mbar.help add command -label [mc "Online Documentation"] \
	-command [list start_browser $doc_url]
2675 2676 2677 2678

.mbar.help add command -label [mc "Show SSH Key"] \
	-command do_ssh_key

2679
unset doc_path doc_url
S
Shawn O. Pearce 已提交
2680

2681 2682
# -- Standard bindings
#
2683
wm protocol . WM_DELETE_WINDOW do_quit
2684 2685 2686 2687 2688
bind all <$M1B-Key-q> do_quit
bind all <$M1B-Key-Q> do_quit
bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}

2689 2690 2691 2692 2693 2694
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708
proc normalize_relpath {path} {
	set elements {}
	foreach item [file split $path] {
		if {$item eq {.}} continue
		if {$item eq {..} && [llength $elements] > 0
		    && [lindex $elements end] ne {..}} {
			set elements [lrange $elements 0 end-1]
			continue
		}
		lappend elements $item
	}
	return [eval file join $elements]
}

2709 2710
# -- Not a normal commit type invocation?  Do that instead!
#
2711
switch -- $subcommand {
2712
browser -
2713
blame {
2714 2715 2716 2717 2718
	if {$subcommand eq "blame"} {
		set subcommand_args {[--line=<num>] rev? path}
	} else {
		set subcommand_args {rev? path}
	}
2719
	if {$argv eq {}} usage
2720
	set head {}
2721
	set path {}
2722
	set jump_spec {}
2723 2724 2725 2726
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
2727
			set path [normalize_relpath $_prefix$a]
2728 2729 2730
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
2731 2732
				if {$head ne {}} usage
				set head $path
2733 2734 2735
				set path {}
			}
			set is_path 1
2736 2737 2738
		} elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
			if {$jump_spec ne {} || $head ne {}} usage
			set jump_spec [list $lnum]
2739 2740 2741
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
2742
			set is_path 1
2743 2744 2745 2746 2747 2748
		} else {
			usage
		}
	}
	unset is_path

2749
	if {$head ne {} && $path eq {}} {
2750
		set path [normalize_relpath $_prefix$head]
2751 2752 2753
		set head {}
	}

2754
	if {$head eq {}} {
2755
		load_current_branch
2756
	} else {
2757 2758 2759 2760 2761 2762 2763 2764
		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
			if {[catch {
					set head [git rev-parse --verify $head]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
2765
		set current_branch $head
2766
	}
2767

2768 2769
	switch -- $subcommand {
	browser {
2770
		if {$jump_spec ne {}} usage
2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782
		if {$head eq {}} {
			if {$path ne {} && [file isdirectory $path]} {
				set head $current_branch
			} else {
				set head $path
				set path {}
			}
		}
		browser::new $head $path
	}
	blame   {
		if {$head eq {} && ![file exists $path]} {
2783
			puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2784 2785
			exit 1
		}
2786
		blame::new $head $path $jump_spec
2787
	}
2788
	}
2789 2790 2791 2792 2793 2794
	return
}
citool -
gui {
	if {[llength $argv] != 0} {
		puts -nonewline stderr "usage: $argv0"
2795 2796
		if {$subcommand ne {gui}
			&& [file tail $argv0] ne "git-$subcommand"} {
2797 2798 2799 2800 2801 2802
			puts -nonewline stderr " $subcommand"
		}
		puts stderr {}
		exit 1
	}
	# fall through to setup UI for commits
2803 2804
}
default {
2805
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2806 2807 2808 2809
	exit 1
}
}

2810 2811 2812 2813 2814 2815
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
2816
	-text [mc "Current Branch:"] \
2817
	-anchor w \
2818
	-justify left
2819 2820 2821
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
2822
	-justify left
2823 2824 2825 2826
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
2827
# -- Main Window Layout
2828
#
2829 2830
panedwindow .vpane -orient horizontal
panedwindow .vpane.files -orient vertical
2831
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
2832 2833 2834
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
2835
#
2836
frame .vpane.files.index -height 100 -width 200
2837
label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2838 2839 2840
	-background lightgreen -foreground black
text $ui_index -background white -foreground black \
	-borderwidth 0 \
2841
	-width 20 -height 10 \
2842
	-wrap none \
2843
	-cursor $cursor_ptr \
2844 2845
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
2846
	-state disabled
2847 2848
scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
S
Shawn O. Pearce 已提交
2849
pack .vpane.files.index.title -side top -fill x
2850 2851
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
2852 2853
pack $ui_index -side left -fill both -expand 1

2854
# -- Working Directory File List
2855
#
2856
frame .vpane.files.workdir -height 100 -width 200
2857
label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2858 2859 2860
	-background lightsalmon -foreground black
text $ui_workdir -background white -foreground black \
	-borderwidth 0 \
2861
	-width 20 -height 10 \
2862
	-wrap none \
2863
	-cursor $cursor_ptr \
2864 2865
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
2866
	-state disabled
2867 2868
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2869
pack .vpane.files.workdir.title -side top -fill x
2870 2871
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
2872
pack $ui_workdir -side left -fill both -expand 1
2873

2874
.vpane.files add .vpane.files.workdir -sticky nsew
2875
.vpane.files add .vpane.files.index -sticky nsew
S
Shawn O. Pearce 已提交
2876

2877
foreach i [list $ui_index $ui_workdir] {
2878 2879
	rmsel_tag $i
	$i tag conf in_diff -background [$i tag cget in_sel -background]
2880 2881
}
unset i
2882

2883
# -- Diff and Commit Area
2884
#
2885
frame .vpane.lower -height 300 -width 400
2886 2887
frame .vpane.lower.commarea
frame .vpane.lower.diff -relief sunken -borderwidth 1
2888 2889
pack .vpane.lower.diff -fill both -expand 1
pack .vpane.lower.commarea -side bottom -fill x
2890
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
2891 2892

# -- Commit Area Buttons
2893
#
2894 2895
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
2896
	-anchor w \
2897
	-justify left
2898 2899
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
2900

2901
button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
2902
	-command ui_do_rescan
2903
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2904 2905
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
2906

2907
button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
2908
	-command do_add_all
2909
pack .vpane.lower.commarea.buttons.incall -side top -fill x
2910 2911
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
2912

2913
if {![is_enabled nocommitmsg]} {
2914 2915 2916 2917
	button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
		-command do_signoff
	pack .vpane.lower.commarea.buttons.signoff -side top -fill x
}
2918

2919
button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
2920
	-command do_commit
2921
pack .vpane.lower.commarea.buttons.commit -side top -fill x
2922 2923
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
2924

2925 2926 2927 2928
if {![is_enabled nocommit]} {
	button .vpane.lower.commarea.buttons.push -text [mc Push] \
		-command do_push_anywhere
	pack .vpane.lower.commarea.buttons.push -side top -fill x
2929 2930
}

S
Shawn O. Pearce 已提交
2931
# -- Commit Message Buffer
2932
#
2933
frame .vpane.lower.commarea.buffer
2934
frame .vpane.lower.commarea.buffer.header
2935
set ui_comm .vpane.lower.commarea.buffer.t
2936
set ui_coml .vpane.lower.commarea.buffer.header.l
2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954

if {![is_enabled nocommit]} {
	radiobutton .vpane.lower.commarea.buffer.header.new \
		-text [mc "New Commit"] \
		-command do_select_commit_type \
		-variable selected_commit_type \
		-value new
	lappend disable_on_lock \
		[list .vpane.lower.commarea.buffer.header.new conf -state]
	radiobutton .vpane.lower.commarea.buffer.header.amend \
		-text [mc "Amend Last Commit"] \
		-command do_select_commit_type \
		-variable selected_commit_type \
		-value amend
	lappend disable_on_lock \
		[list .vpane.lower.commarea.buffer.header.amend conf -state]
}

2955
label $ui_coml \
S
Shawn O. Pearce 已提交
2956
	-anchor w \
2957
	-justify left
2958 2959 2960
proc trace_commit_type {varname args} {
	global ui_coml commit_type
	switch -glob -- $commit_type {
2961 2962 2963 2964 2965 2966
	initial       {set txt [mc "Initial Commit Message:"]}
	amend         {set txt [mc "Amended Commit Message:"]}
	amend-initial {set txt [mc "Amended Initial Commit Message:"]}
	amend-merge   {set txt [mc "Amended Merge Commit Message:"]}
	merge         {set txt [mc "Merge Commit Message:"]}
	*             {set txt [mc "Commit Message:"]}
2967 2968 2969 2970
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
2971
pack $ui_coml -side left -fill x
2972 2973 2974 2975 2976

if {![is_enabled nocommit]} {
	pack .vpane.lower.commarea.buffer.header.amend -side right
	pack .vpane.lower.commarea.buffer.header.new -side right
}
2977

2978 2979
text $ui_comm -background white -foreground black \
	-borderwidth 1 \
2980
	-undo true \
2981
	-maxundo 20 \
2982
	-autoseparators true \
S
Shawn O. Pearce 已提交
2983
	-relief sunken \
2984
	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
2985
	-font font_diff \
2986
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2987 2988
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
2989
pack .vpane.lower.commarea.buffer.header -side top -fill x
2990
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
2991
pack $ui_comm -side left -fill y
2992 2993
pack .vpane.lower.commarea.buffer -side left -fill y

2994 2995
# -- Commit Message Buffer Context Menu
#
2996 2997 2998
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
2999
	-label [mc Cut] \
3000 3001
	-command {tk_textCut $ui_comm}
$ctxm add command \
3002
	-label [mc Copy] \
3003 3004
	-command {tk_textCopy $ui_comm}
$ctxm add command \
3005
	-label [mc Paste] \
3006 3007
	-command {tk_textPaste $ui_comm}
$ctxm add command \
3008
	-label [mc Delete] \
3009
	-command {catch {$ui_comm delete sel.first sel.last}}
3010 3011
$ctxm add separator
$ctxm add command \
3012
	-label [mc "Select All"] \
3013
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3014
$ctxm add command \
3015
	-label [mc "Copy All"] \
3016
	-command {
3017 3018 3019
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
3020 3021 3022
	}
$ctxm add separator
$ctxm add command \
3023
	-label [mc "Sign Off"] \
3024
	-command do_signoff
3025
set ui_comm_ctxm $ctxm
3026

3027
# -- Diff Header
3028
#
3029 3030 3031
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
3032 3033 3034 3035 3036
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
3037
		set p $current_diff_path
3038
		set s [mapdesc [lindex $file_states($p) 0] $p]
3039
		set f [mc "File:"]
3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050
		set p [escape_path $p]
		set o normal
	}

	.vpane.lower.diff.header.status configure -text $s
	.vpane.lower.diff.header.file configure -text $f
	.vpane.lower.diff.header.path configure -text $p
	foreach w $diff_actions {
		uplevel #0 $w $o
	}
}
3051
trace add variable current_diff_path write trace_current_diff_path
3052

3053
frame .vpane.lower.diff.header -background gold
3054
label .vpane.lower.diff.header.status \
3055
	-background gold \
3056
	-foreground black \
3057 3058
	-width $max_status_desc \
	-anchor w \
3059
	-justify left
3060
label .vpane.lower.diff.header.file \
3061
	-background gold \
3062
	-foreground black \
3063
	-anchor w \
3064
	-justify left
3065
label .vpane.lower.diff.header.path \
3066
	-background gold \
3067
	-foreground black \
3068
	-anchor w \
3069
	-justify left
3070 3071 3072 3073 3074 3075
pack .vpane.lower.diff.header.status -side left
pack .vpane.lower.diff.header.file -side left
pack .vpane.lower.diff.header.path -fill x
set ctxm .vpane.lower.diff.header.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
3076
	-label [mc Copy] \
3077 3078 3079 3080 3081
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
3082
			-- $current_diff_path
3083
	}
3084 3085
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3086 3087

# -- Diff Body
3088
#
3089 3090
frame .vpane.lower.diff.body
set ui_diff .vpane.lower.diff.body.t
3091 3092
text $ui_diff -background white -foreground black \
	-borderwidth 0 \
3093
	-width 80 -height 5 -wrap none \
3094
	-font font_diff \
3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107
	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
	-yscrollcommand {.vpane.lower.diff.body.sby set} \
	-state disabled
scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
	-command [list $ui_diff xview]
scrollbar .vpane.lower.diff.body.sby -orient vertical \
	-command [list $ui_diff yview]
pack .vpane.lower.diff.body.sbx -side bottom -fill x
pack .vpane.lower.diff.body.sby -side right -fill y
pack $ui_diff -side left -fill both -expand 1
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1

3108
$ui_diff tag conf d_cr -elide true
3109 3110
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
3111 3112
$ui_diff tag conf d_- -foreground red

3113
$ui_diff tag conf d_++ -foreground {#00a000}
3114 3115
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
3116 3117
	-foreground {#00a000} \
	-background {#e2effa}
3118 3119
$ui_diff tag conf d_-s \
	-foreground red \
3120
	-background {#e2effa}
3121
$ui_diff tag conf d_s+ \
3122 3123
	-foreground {#00a000} \
	-background ivory1
3124 3125
$ui_diff tag conf d_s- \
	-foreground red \
3126
	-background ivory1
3127 3128 3129 3130 3131 3132 3133 3134 3135 3136

$ui_diff tag conf d<<<<<<< \
	-foreground orange \
	-font font_diffbold
$ui_diff tag conf d======= \
	-foreground orange \
	-font font_diffbold
$ui_diff tag conf d>>>>>>> \
	-foreground orange \
	-font font_diffbold
S
Shawn O. Pearce 已提交
3137

3138 3139
$ui_diff tag raise sel

3140 3141
# -- Diff Body Context Menu
#
3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182

proc create_common_diff_popup {ctxm} {
	$ctxm add command \
		-label [mc "Show Less Context"] \
		-command show_less_context
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Show More Context"] \
		-command show_more_context
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
	$ctxm add command \
		-label [mc Refresh] \
		-command reshow_diff
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc Copy] \
		-command {tk_textCopy $ui_diff}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Select All"] \
		-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Copy All"] \
		-command {
			$ui_diff tag add sel 0.0 end
			tk_textCopy $ui_diff
			$ui_diff tag remove sel 0.0 end
		}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
	$ctxm add command \
		-label [mc "Decrease Font Size"] \
		-command {incr_font_size font_diff -1}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Increase Font Size"] \
		-command {incr_font_size font_diff 1}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
3183 3184 3185 3186 3187 3188 3189 3190
	set emenu $ctxm.enc
	menu $emenu
	build_encoding_menu $emenu [list force_diff_encoding]
	$ctxm add cascade \
		-label [mc "Encoding"] \
		-menu $emenu
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
3191 3192 3193 3194
	$ctxm add command -label [mc "Options..."] \
		-command do_options
}

3195 3196
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
3197 3198 3199 3200 3201
$ctxm add command \
	-label [mc "Apply/Reverse Hunk"] \
	-command {apply_hunk $cursorX $cursorY}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3202 3203 3204 3205 3206
$ctxm add command \
	-label [mc "Apply/Reverse Line"] \
	-command {apply_line $cursorX $cursorY; do_rescan}
set ui_diff_applyline [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3207
$ctxm add separator
3208 3209 3210 3211
create_common_diff_popup $ctxm

set ctxmmg .vpane.lower.diff.body.ctxmmg
menu $ctxmmg -tearoff 0
3212 3213 3214 3215 3216
$ctxmmg add command \
	-label [mc "Run Merge Tool"] \
	-command {merge_resolve_tool}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add separator
3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232
$ctxmmg add command \
	-label [mc "Use Remote Version"] \
	-command {merge_resolve_one 3}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add command \
	-label [mc "Use Local Version"] \
	-command {merge_resolve_one 2}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add command \
	-label [mc "Revert To Base"] \
	-command {merge_resolve_one 1}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add separator
create_common_diff_popup $ctxmmg

proc popup_diff_menu {ctxm ctxmmg x y X Y} {
3233
	global current_diff_path file_states
3234 3235
	set ::cursorX $x
	set ::cursorY $y
3236 3237
	if {[info exists file_states($current_diff_path)]} {
		set state [lindex $file_states($current_diff_path) 0]
3238
	} else {
3239 3240
		set state {__}
	}
3241
	if {[string first {U} $state] >= 0} {
3242
		tk_popup $ctxmmg $X $Y
3243
	} else {
3244 3245 3246 3247 3248 3249 3250
		if {$::ui_index eq $::current_diff_side} {
			set l [mc "Unstage Hunk From Commit"]
			set t [mc "Unstage Line From Commit"]
		} else {
			set l [mc "Stage Hunk For Commit"]
			set t [mc "Stage Line For Commit"]
		}
3251
		if {$::is_3way_diff || $::is_submodule_diff
3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263
			|| $current_diff_path eq {}
			|| {__} eq $state
			|| {_O} eq $state
			|| {_T} eq $state
			|| {T_} eq $state} {
			set s disabled
		} else {
			set s normal
		}
		$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
		$ctxm entryconf $::ui_diff_applyline -state $s -label $t
		tk_popup $ctxm $X $Y
3264
	}
3265
}
3266
bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y]
3267

S
Shawn O. Pearce 已提交
3268
# -- Status Bar
3269
#
3270
set main_status [::status_bar::new .status]
S
Shawn O. Pearce 已提交
3271
pack .status -anchor w -side bottom -fill x
3272
$main_status show [mc "Initializing..."]
S
Shawn O. Pearce 已提交
3273

3274
# -- Load geometry
3275
#
3276
catch {
3277
set gm $repo_config(gui.geometry)
3278 3279
wm geometry . [lindex $gm 0]
.vpane sash place 0 \
3280 3281
	[lindex $gm 1] \
	[lindex [.vpane sash coord 0] 1]
3282
.vpane.files sash place 0 \
3283 3284
	[lindex [.vpane.files sash coord 0] 0] \
	[lindex $gm 2]
3285
unset gm
3286
}
3287

3288 3289 3290 3291 3292 3293 3294 3295
# -- Load window state
#
catch {
set gws $repo_config(gui.wmstate)
wm state . $gws
unset gws
}

S
Shawn O. Pearce 已提交
3296
# -- Key Bindings
3297
#
3298
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3299 3300
bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3301 3302 3303 3304
bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3305 3306
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3307 3308 3309 3310 3311 3312 3313 3314
bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3315 3316 3317 3318 3319
bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3320 3321 3322 3323 3324 3325 3326 3327 3328

bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-v> {break}
bind $ui_diff <$M1B-Key-V> {break}
bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3329 3330 3331 3332
bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
3333 3334 3335 3336 3337 3338
bind $ui_diff <Key-k>         {catch {%W yview scroll -1 units};break}
bind $ui_diff <Key-j>         {catch {%W yview scroll  1 units};break}
bind $ui_diff <Key-h>         {catch {%W xview scroll -1 units};break}
bind $ui_diff <Key-l>         {catch {%W xview scroll  1 units};break}
bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
bind $ui_diff <Control-Key-f> {catch {%W yview scroll  1 pages};break}
3339
bind $ui_diff <Button-1>   {focus %W}
3340

3341
if {[is_enabled branch]} {
3342 3343
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
3344 3345
	bind . <$M1B-Key-o> branch_checkout::dialog
	bind . <$M1B-Key-O> branch_checkout::dialog
3346 3347
	bind . <$M1B-Key-m> merge::dialog
	bind . <$M1B-Key-M> merge::dialog
3348
}
3349 3350 3351 3352
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
3353

3354 3355 3356
bind .   <Key-F5>     ui_do_rescan
bind .   <$M1B-Key-r> ui_do_rescan
bind .   <$M1B-Key-R> ui_do_rescan
3357 3358
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
3359 3360
bind .   <$M1B-Key-t> do_add_selection
bind .   <$M1B-Key-T> do_add_selection
3361 3362
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
3363 3364 3365 3366 3367
bind .   <$M1B-Key-minus> {show_less_context;break}
bind .   <$M1B-Key-KP_Subtract> {show_less_context;break}
bind .   <$M1B-Key-equal> {show_more_context;break}
bind .   <$M1B-Key-plus> {show_more_context;break}
bind .   <$M1B-Key-KP_Add> {show_more_context;break}
3368
bind .   <$M1B-Key-Return> do_commit
3369
foreach i [list $ui_index $ui_workdir] {
3370 3371 3372
	bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
	bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
	bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
S
Shawn O. Pearce 已提交
3373
}
3374 3375 3376
unset i

set file_lists($ui_index) [list]
3377
set file_lists($ui_workdir) [list]
3378

3379
wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
S
Shawn O. Pearce 已提交
3380
focus -force $ui_comm
3381

3382 3383 3384
# -- Warn the user about environmental problems.  Cygwin's Tcl
#    does *not* pass its env array onto any processes it spawns.
#    This means that git processes get none of our environment.
3385
#
3386
if {[is_Cygwin]} {
3387 3388
	set ignored_env 0
	set suggest_user {}
3389
	set msg [mc "Possible environment issues exist.
3390 3391 3392

The following environment variables are probably
going to be ignored by any Git subprocess run
3393
by %s:
3394

3395
" [appname]]
3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417
	foreach name [array names env] {
		switch -regexp -- $name {
		{^GIT_INDEX_FILE$} -
		{^GIT_OBJECT_DIRECTORY$} -
		{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
		{^GIT_DIFF_OPTS$} -
		{^GIT_EXTERNAL_DIFF$} -
		{^GIT_PAGER$} -
		{^GIT_TRACE$} -
		{^GIT_CONFIG$} -
		{^GIT_(AUTHOR|COMMITTER)_DATE$} {
			append msg " - $name\n"
			incr ignored_env
		}
		{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
			append msg " - $name\n"
			incr ignored_env
			set suggest_user $name
		}
		}
	}
	if {$ignored_env > 0} {
3418
		append msg [mc "
3419
This is due to a known issue with the
3420
Tcl binary distributed by Cygwin."]
3421 3422

		if {$suggest_user ne {}} {
3423
			append msg [mc "
3424

3425
A good replacement for %s
3426 3427 3428
is placing values for the user.name and
user.email settings into your personal
~/.gitconfig file.
3429
" $suggest_user]
3430 3431 3432 3433 3434 3435
		}
		warn_popup $msg
	}
	unset ignored_env msg suggest_user name
}

3436 3437
# -- Only initialize complex UI if we are going to stay running.
#
3438
if {[is_enabled transport]} {
3439
	load_all_remotes
3440

3441
	set n [.mbar.remote index end]
3442
	populate_remotes_menu
3443 3444
	set n [expr {[.mbar.remote index end] - $n}]
	if {$n > 0} {
3445
		if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3446 3447 3448
		.mbar.remote insert $n separator
	}
	unset n
3449
}
3450

3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501
if {[winfo exists $ui_comm]} {
	set GITGUI_BCK_exists [load_message GITGUI_BCK]

	# -- If both our backup and message files exist use the
	#    newer of the two files to initialize the buffer.
	#
	if {$GITGUI_BCK_exists} {
		set m [gitdir GITGUI_MSG]
		if {[file isfile $m]} {
			if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
				catch {file delete [gitdir GITGUI_MSG]}
			} else {
				$ui_comm delete 0.0 end
				$ui_comm edit reset
				$ui_comm edit modified false
				catch {file delete [gitdir GITGUI_BCK]}
				set GITGUI_BCK_exists 0
			}
		}
		unset m
	}

	proc backup_commit_buffer {} {
		global ui_comm GITGUI_BCK_exists

		set m [$ui_comm edit modified]
		if {$m || $GITGUI_BCK_exists} {
			set msg [string trim [$ui_comm get 0.0 end]]
			regsub -all -line {[ \r\t]+$} $msg {} msg

			if {$msg eq {}} {
				if {$GITGUI_BCK_exists} {
					catch {file delete [gitdir GITGUI_BCK]}
					set GITGUI_BCK_exists 0
				}
			} elseif {$m} {
				catch {
					set fd [open [gitdir GITGUI_BCK] w]
					puts -nonewline $fd $msg
					close $fd
					set GITGUI_BCK_exists 1
				}
			}

			$ui_comm edit modified false
		}

		set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
	}

	backup_commit_buffer
3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525

	# -- If the user has aspell available we can drive it
	#    in pipe mode to spellcheck the commit message.
	#
	set spell_cmd [list |]
	set spell_dict [get_config gui.spellingdictionary]
	lappend spell_cmd aspell
	if {$spell_dict ne {}} {
		lappend spell_cmd --master=$spell_dict
	}
	lappend spell_cmd --mode=none
	lappend spell_cmd --encoding=utf-8
	lappend spell_cmd pipe
	if {$spell_dict eq {none}
	 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
		bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
	} else {
		set ui_comm_spell [spellcheck::init \
			$spell_fd \
			$ui_comm \
			$ui_comm_ctxm \
		]
	}
	unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3526 3527
}

3528
lock_index begin-read
3529 3530 3531
if {![winfo ismapped .]} {
	wm deiconify .
}
3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542
after 1 {
	if {[is_enabled initialamend]} {
		force_amend
	} else {
		do_rescan
	}

	if {[is_enabled nocommitmsg]} {
		$ui_comm configure -state disabled -background gray
	}
}
3543 3544 3545
if {[is_enabled multicommit]} {
	after 1000 hint_gc
}
3546 3547 3548
if {[is_enabled retcode]} {
	bind . <Destroy> {+terminate_me %W}
}
3549 3550 3551
if {$picked && [is_config_true gui.autoexplore]} {
	do_explore
}