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

11
set appvers {@@GITGUI_VERSION@@}
12
set copyright {
13
Copyright  2006, 2007 Shawn Pearce, et. al.
14

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
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}
S
Shawn O. Pearce 已提交
28

29
######################################################################
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
##
## 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 \
		-title "git-gui: fatal error" \
		-message $err
	exit 1
}

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

47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
######################################################################
##
## 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
	}
}

65 66 67 68 69 70 71 72 73 74 75 76
######################################################################
##
## Fake internationalization to ease backporting of changes.

proc mc {fmt args} {
	set cmk [string first @@ $fmt]
	if {$cmk > 0} {
		set fmt [string range $fmt 0 [expr {$cmk - 1}]]
	}
	return [eval [list format $fmt] $args]
}

77 78 79 80 81 82
######################################################################
##
## read only globals

set _appname [lindex [file split $argv0] end]
set _gitdir {}
83
set _gitexec {}
84
set _reponame {}
85
set _iscygwin {}
86
set _search_path {}
87 88 89 90 91 92

proc appname {} {
	global _appname
	return $_appname
}

93
proc gitdir {args} {
94
	global _gitdir
95 96 97
	if {$args eq {}} {
		return $_gitdir
	}
98
	return [eval [list file join $_gitdir] $args]
99 100
}

101 102 103
proc gitexec {args} {
	global _gitexec
	if {$_gitexec eq {}} {
104
		if {[catch {set _gitexec [git --exec-path]} err]} {
105 106
			error "Git not installed?\n\n$err"
		}
107 108 109 110 111 112 113 114
		if {[is_Cygwin]} {
			set _gitexec [exec cygpath \
				--windows \
				--absolute \
				$_gitexec]
		} else {
			set _gitexec [file normalize $_gitexec]
		}
115 116 117 118
	}
	if {$args eq {}} {
		return $_gitexec
	}
119
	return [eval [list file join $_gitexec] $args]
120 121
}

122
proc reponame {} {
123
	return $::_reponame
124
}
125

126 127 128 129 130 131 132 133
proc is_MacOSX {} {
	if {[tk windowingsystem] eq {aqua}} {
		return 1
	}
	return 0
}

proc is_Windows {} {
134
	if {$::tcl_platform(platform) eq {windows}} {
135 136 137 138 139 140
		return 1
	}
	return 0
}

proc is_Cygwin {} {
141
	global _iscygwin
142
	if {$_iscygwin eq {}} {
143
		if {$::tcl_platform(platform) eq {windows}} {
144 145 146 147 148 149 150 151 152 153 154 155
			if {[catch {set p [exec cygpath --windir]} err]} {
				set _iscygwin 0
			} else {
				set _iscygwin 1
			}
		} else {
			set _iscygwin 0
		}
	}
	return $_iscygwin
}

156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
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
}

172 173 174 175
######################################################################
##
## config

176 177 178 179 180 181 182 183 184
proc is_many_config {name} {
	switch -glob -- $name {
	remote.*.fetch -
	remote.*.push
		{return 1}
	*
		{return 0}
	}
}
185

186 187 188 189 190 191 192 193 194 195 196
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
	}
}

197 198 199 200 201 202 203 204 205
proc get_config {name} {
	global repo_config
	if {[catch {set v $repo_config($name)}]} {
		return {}
	} else {
		return $v
	}
}

206
proc load_config {include_global} {
207 208 209
	global repo_config global_config default_config

	array unset global_config
210 211
	if {$include_global} {
		catch {
212
			set fd_rc [git_read config --global --list]
213 214 215 216 217 218 219
			while {[gets $fd_rc line] >= 0} {
				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
					if {[is_many_config $name]} {
						lappend global_config($name) $value
					} else {
						set global_config($name) $value
					}
220 221
				}
			}
222
			close $fd_rc
223 224
		}
	}
225 226

	array unset repo_config
227
	catch {
228
		set fd_rc [git_read config --list]
229 230
		while {[gets $fd_rc line] >= 0} {
			if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
231 232 233 234 235
				if {[is_many_config $name]} {
					lappend repo_config($name) $value
				} else {
					set repo_config($name) $value
				}
236 237 238 239 240
			}
		}
		close $fd_rc
	}

241 242 243 244 245 246 247
	foreach name [array names default_config] {
		if {[catch {set v $global_config($name)}]} {
			set global_config($name) $default_config($name)
		}
		if {[catch {set v $repo_config($name)}]} {
			set repo_config($name) $default_config($name)
		}
248 249 250
	}
}

251 252 253 254
######################################################################
##
## handy utils

255 256 257 258 259
proc _git_cmd {name} {
	global _git_cmd_path

	if {[catch {set v $_git_cmd_path($name)}]} {
		switch -- $name {
260
		  version   -
261 262 263 264 265 266 267
		--version   -
		--exec-path { return [list $::_git $name] }
		}

		set p [gitexec git-$name$::_search_exe]
		if {[file exists $p]} {
			set v [list $p]
268 269 270 271
		} 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.
272
			#
273 274 275 276 277
			set p [gitexec git-$name]
			set f [open $p r]
			set s [gets $f]
			close $f

278
			switch -glob -- [lindex $s 0] {
279 280 281 282 283 284 285 286 287 288 289 290 291
			#!*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)"
			}
292
			set v [concat [list $interp] [lrange $s 1 end] [list $p]]
293
		} else {
294 295 296 297
			# Assume it is builtin to git somehow and we
			# aren't actually able to see a file for it.
			#
			set v [list $::_git $name]
298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332
		}
		set _git_cmd_path($name) $v
	}
	return $v
}

proc _which {what} {
	global env _search_exe _search_path

	if {$_search_path eq {}} {
		if {[is_Cygwin]} {
			set _search_path [split [exec cygpath \
				--windows \
				--path \
				--absolute \
				$env(PATH)] {;}]
			set _search_exe .exe
		} elseif {[is_Windows]} {
			set _search_path [split $env(PATH) {;}]
			set _search_exe .exe
		} else {
			set _search_path [split $env(PATH) :]
			set _search_exe {}
		}
	}

	foreach p $_search_path {
		set p [file join $p $what$_search_exe]
		if {[file exists $p]} {
			return [file normalize $p]
		}
	}
	return {}
}

333 334 335 336 337 338 339 340 341 342 343 344
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
	}
}

345
proc git {args} {
346 347 348 349 350
	set opt [list exec]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
351
			_lappend_nice opt
352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

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

	return [eval $opt $cmdp $args]
}

369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388
proc _open_stdout_stderr {cmd} {
	if {[catch {
			set fd [open $cmd r]
		} 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 \
				[lrange $cmd 0 end-1] \
				[list |& cat] \
				] r]
		} else {
			error $err
		}
	}
389
	fconfigure $fd -eofchar {}
390 391 392
	return $fd
}

393 394 395 396 397 398
proc git_read {args} {
	set opt [list |]

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

		--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]

418
	return [_open_stdout_stderr [concat $opt $cmdp $args]]
419 420 421 422 423 424 425 426
}

proc git_write {args} {
	set opt [list |]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
427
			_lappend_nice opt
428 429 430 431 432 433 434 435 436 437 438 439 440 441 442
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

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

	return [open [concat $opt $cmdp $args] w]
443 444
}

445 446 447 448 449
proc sq {value} {
	regsub -all ' $value "'\\''" value
	return "'$value'"
}

450 451 452
proc load_current_branch {} {
	global current_branch is_detached

453
	set fd [open [gitdir HEAD] r]
454
	if {[gets $fd ref] < 1} {
455 456 457
		set ref {}
	}
	close $fd
458 459 460 461 462 463 464

	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.
		#
465 466
		set current_branch [string range $ref $len end]
		set is_detached 0
467 468 469
	} else {
		# Assume this is a detached head.
		#
470 471
		set current_branch HEAD
		set is_detached 1
472
	}
473 474
}

475 476 477 478 479 480 481 482 483
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
}

484 485 486 487 488 489 490 491 492 493 494
######################################################################
##
## find git

set _git  [_which git]
if {$_git eq {}} {
	catch {wm withdraw .}
	error_popup "Cannot find git in PATH."
	exit 1
}

495 496 497 498
######################################################################
##
## version check

499
if {[catch {set _git_version [git --version]} err]} {
500
	catch {wm withdraw .}
501 502 503 504 505
	tk_messageBox \
		-icon error \
		-type ok \
		-title "git-gui: fatal error" \
		-message "Cannot determine Git version:
506 507 508

$err

509 510 511 512 513
[appname] requires Git 1.5.0 or later."
	exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
	catch {wm withdraw .}
514 515 516 517 518
	tk_messageBox \
		-icon error \
		-type ok \
		-title "git-gui: fatal error" \
		-message "Cannot parse Git version string:\n\n$_git_version"
519 520
	exit 1
}
521 522

set _real_git_version $_git_version
523
regsub -- {-dirty$} $_git_version {} _git_version
524 525
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version
526
regsub {\.GIT$} $_git_version {} _git_version
527

528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
	catch {wm withdraw .}
	if {[tk_messageBox \
		-icon warning \
		-type yesno \
		-default no \
		-title "[appname]: warning" \
		-message "Git version cannot be determined.

$_git claims it is version '$_real_git_version'.

[appname] requires at least Git 1.5.0 or later.

Assume '$_real_git_version' is version 1.5.0?
"] eq {yes}} {
		set _git_version 1.5.0
	} else {
		exit 1
	}
}
unset _real_git_version

550 551 552 553 554 555
proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
556
	}
557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594

	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]} {
595
	catch {wm withdraw .}
596 597 598 599 600
	tk_messageBox \
		-icon error \
		-type ok \
		-title "git-gui: fatal error" \
		-message "[appname] requires Git 1.5.0 or later.
601 602 603 604

You are using [git-version]:

[git --version]"
605 606 607
	exit 1
}

608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655
######################################################################
##
## configure our library

set oguilib {@@GITGUI_LIBDIR@@}
set oguirel {@@GITGUI_RELATIVE@@}
if {$oguirel eq {1}} {
	set oguilib [file dirname [file dirname [file normalize $argv0]]]
	set oguilib [file join $oguilib share git-gui lib]
} elseif {[string match @@* $oguirel]} {
	set oguilib [file join [file dirname [file normalize $argv0]] lib]
}

set idx [file join $oguilib tclIndex]
if {[catch {set fd [open $idx r]} err]} {
	catch {wm withdraw .}
	tk_messageBox \
		-icon error \
		-type ok \
		-title "git-gui: fatal error" \
		-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]
}
unset -nocomplain oguirel idx fd

656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675
######################################################################
##
## feature option selection

if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
	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
676
disable_option bare
677 678 679 680

switch -- $subcommand {
browser -
blame {
681 682
	enable_option bare

683 684 685 686 687 688 689 690 691 692 693 694 695
	disable_option multicommit
	disable_option branch
	disable_option transport
}
citool {
	enable_option singlecommit

	disable_option multicommit
	disable_option branch
	disable_option transport
}
}

696 697 698 699
######################################################################
##
## repository setup

700 701 702 703 704 705 706 707
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]} {
708 709
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
710 711
	exit 1
}
712 713 714
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
	catch {set _gitdir [exec cygpath --unix $_gitdir]}
}
715
if {![file isdirectory $_gitdir]} {
716
	catch {wm withdraw .}
717
	error_popup "Git directory not found:\n\n$_gitdir"
718 719
	exit 1
}
720 721 722 723 724 725 726 727 728
if {$_prefix ne {}} {
	regsub -all {[^/]+/} $_prefix ../ cdup
	if {[catch {cd $cdup} err]} {
		catch {wm withdraw .}
		error_popup "Cannot move to top of working directory:\n\n$err"
		exit 1
	}
	unset cdup
} elseif {![is_enabled bare]} {
729 730 731 732 733 734 735 736 737 738
	if {[lindex [file split $_gitdir] end] ne {.git}} {
		catch {wm withdraw .}
		error_popup "Cannot use funny .git directory:\n\n$_gitdir"
		exit 1
	}
	if {[catch {cd [file dirname $_gitdir]} err]} {
		catch {wm withdraw .}
		error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
		exit 1
	}
739
}
740 741 742 743 744
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]
745 746
}

747 748 749 750 751 752 753 754 755 756 757 758 759 760
######################################################################
##
## 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 {}
761
set is_detached 0
762
set current_diff_path {}
763
set is_3way_diff 0
764 765
set selected_commit_type new

S
Shawn O. Pearce 已提交
766 767
######################################################################
##
768
## task management
S
Shawn O. Pearce 已提交
769

770
set rescan_active 0
771
set diff_active 0
772
set last_clicked {}
773

774 775 776 777 778
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
779

780
	if {$index_lock_type eq {none}} {
781 782 783 784 785
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
786
	} elseif {$index_lock_type eq "begin-$type"} {
787
		set index_lock_type $type
788 789 790 791
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
792

793 794 795 796 797 798 799 800 801 802 803 804 805
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

806
proc repository_state {ctvar hdvar mhvar} {
807
	global current_branch
808 809 810
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
811

812
	load_current_branch
813
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
814
		set hd {}
815
		set ct initial
816 817 818
		return
	}

819
	set merge_head [gitdir MERGE_HEAD]
820
	if {[file exists $merge_head]} {
821
		set ct merge
822 823 824 825 826 827
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
828
	}
829 830

	set ct normal
831 832
}

833 834 835
proc PARENT {} {
	global PARENT empty_tree

836 837 838
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
839 840
	}
	if {$empty_tree eq {}} {
841
		set empty_tree [git mktree << {}]
842 843 844 845
	}
	return $empty_tree
}

846
proc rescan {after {honor_trustmtime 1}} {
847
	global HEAD PARENT MERGE_HEAD commit_type
848
	global ui_index ui_workdir ui_comm
849
	global rescan_active file_states
850
	global repo_config
S
Shawn O. Pearce 已提交
851

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

854
	repository_state newType newHEAD newMERGE_HEAD
855
	if {[string match amend* $commit_type]
856 857
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
858
	} else {
859 860 861 862
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
863 864
	}

S
Shawn O. Pearce 已提交
865 866
	array unset file_states

867 868 869
	if {!$::GITGUI_BCK_exists &&
		(![$ui_comm edit modified]
		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
870 871
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
872 873 874
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
875
		$ui_comm edit reset
876
		$ui_comm edit modified false
877 878
	}

879
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
880
		rescan_stage2 {} $after
881
	} else {
882
		set rescan_active 1
883
		ui_status {Refreshing file status...}
884 885 886 887 888 889
		set fd_rf [git_read update-index \
			-q \
			--unmerged \
			--ignore-missing \
			--refresh \
			]
890
		fconfigure $fd_rf -blocking 0 -translation binary
891
		fileevent $fd_rf readable \
892
			[list rescan_stage2 $fd_rf $after]
893
	}
894 895
}

896
proc rescan_stage2 {fd after} {
897
	global rescan_active buf_rdi buf_rdf buf_rlo
898

899
	if {$fd ne {}} {
900 901 902 903
		read $fd
		if {![eof $fd]} return
		close $fd
	}
904

905
	set ls_others [list --exclude-per-directory=.gitignore]
906
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
907 908 909
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}
910 911 912 913
	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 已提交
914

915 916 917 918
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

919
	set rescan_active 3
920
	ui_status {Scanning for modified files ...}
921 922 923
	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 已提交
924

925 926 927
	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
928 929 930
	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 已提交
931 932
}

933
proc load_message {file} {
934
	global ui_comm
935

936
	set f [gitdir $file]
937
	if {[file isfile $f]} {
938 939 940
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
941
		fconfigure $fd -eofchar {}
942
		set content [string trim [read $fd]]
943
		close $fd
944
		regsub -all -line {[ \r\t]+$} $content {} content
945 946 947 948 949 950 951
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

952
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
953 954 955
	global buf_rdi

	append buf_rdi [read $fd]
956 957 958 959 960 961 962 963 964 965
	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
966
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
967
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
968
		merge_state \
969
			[encoding convertfrom $p] \
970 971
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
972 973
			[list]
		set c $z2
974
		incr c
S
Shawn O. Pearce 已提交
975
	}
976 977 978 979 980 981
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

982
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
983 984
}

985
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
986 987 988
	global buf_rdf

	append buf_rdf [read $fd]
989 990 991 992 993 994 995 996 997 998
	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
999
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1000
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1001
		merge_state \
1002
			[encoding convertfrom $p] \
1003
			?[lindex $i 4] \
1004
			[list] \
1005
			[list [lindex $i 0] [lindex $i 2]]
1006
		set c $z2
1007
		incr c
1008 1009 1010 1011 1012
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
1013
	}
1014

1015
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
1016 1017
}

1018
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
1019 1020 1021 1022 1023 1024
	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] {
1025 1026 1027 1028 1029
		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 已提交
1030
	}
1031
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
1032 1033
}

1034
proc rescan_done {fd buf after} {
1035
	global rescan_active current_diff_path
1036
	global file_states repo_config
1037
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
1038

1039 1040 1041
	if {![eof $fd]} return
	set to_clear {}
	close $fd
1042
	if {[incr rescan_active -1] > 0} return
1043

1044
	prune_selection
1045 1046
	unlock_index
	display_all_files
1047
	if {$current_diff_path ne {}} reshow_diff
1048
	uplevel #0 $after
S
Shawn O. Pearce 已提交
1049 1050
}

1051 1052 1053 1054 1055 1056 1057 1058 1059 1060
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 已提交
1061 1062
######################################################################
##
1063
## ui helpers
S
Shawn O. Pearce 已提交
1064

1065 1066 1067 1068 1069 1070 1071 1072 1073
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 已提交
1074

1075 1076
proc mapdesc {state path} {
	global all_descs
1077

1078 1079 1080 1081 1082 1083
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
1084

1085
proc ui_status {msg} {
1086
	$::main_status show $msg
1087 1088 1089
}

proc ui_ready {{test {}}} {
1090
	$::main_status show {Ready.} $test
1091 1092
}

1093 1094 1095 1096
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
1097 1098
}

1099 1100
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
1101 1102
}

1103 1104
set next_icon_id 0
set null_sha1 [string repeat 0 40]
1105

1106 1107
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
1108

1109 1110
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
1111

1112 1113 1114 1115 1116 1117 1118 1119 1120
	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]}
	}
1121

1122 1123
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
1124

1125 1126
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
1127

1128 1129 1130 1131 1132 1133
	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
	}
1134

1135 1136 1137 1138 1139
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
1140

1141 1142
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
1143

1144
	if {$new_m eq {_}} {
1145
		set lno [lsearch -sorted -exact $file_lists($w) $path]
1146
		if {$lno >= 0} {
1147
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1148
			incr lno
1149 1150 1151
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
1152
		}
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
	} 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
1169
	}
1170 1171 1172 1173 1174
}

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

1176
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
1177
	set s $file_states($path)
1178 1179
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
1180

1181 1182 1183 1184 1185 1186 1187
	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 已提交
1188
	}
1189
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
1190

1191 1192 1193 1194
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
1195
	}
1196 1197 1198 1199
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
1200
	}
1201 1202 1203 1204 1205
	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 已提交
1206
	}
1207
}
S
Shawn O. Pearce 已提交
1208

1209 1210 1211 1212 1213 1214 1215 1216 1217 1218
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 已提交
1219 1220
}

1221 1222 1223 1224
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
S
Shawn O. Pearce 已提交
1225

1226 1227
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
1228

1229 1230 1231
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
1232

1233 1234
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
1235

1236 1237 1238 1239 1240 1241 1242 1243 1244
	foreach path [lsort [array names file_states]] {
		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
1245
		}
S
Shawn O. Pearce 已提交
1246

1247 1248 1249 1250
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
1251
		}
1252 1253 1254
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
1255 1256 1257
		}
	}

1258 1259
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
1260 1261
}

1262 1263
######################################################################
##
1264
## icons
1265

1266 1267 1268 1269 1270 1271 1272 1273
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 已提交
1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292

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

1293 1294 1295 1296
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 已提交
1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337
   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

1338
set ui_index .vpane.files.index.list
1339
set ui_workdir .vpane.files.workdir.list
1340 1341 1342 1343 1344 1345 1346 1347 1348 1349

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

set all_icons(_$ui_workdir) file_plain
set all_icons(M$ui_workdir) file_mod
set all_icons(D$ui_workdir) file_question
1350
set all_icons(U$ui_workdir) file_merge
1351 1352
set all_icons(O$ui_workdir) file_plain

1353
set max_status_desc 0
S
Shawn O. Pearce 已提交
1354
foreach i {
1355 1356
		{__ "Unmodified"}

1357 1358 1359 1360 1361 1362 1363 1364 1365
		{_M "Modified, not staged"}
		{M_ "Staged for commit"}
		{MM "Portions staged for commit"}
		{MD "Staged for commit, missing"}

		{_O "Untracked, not staged"}
		{A_ "Staged for commit"}
		{AM "Portions staged for commit"}
		{AD "Staged for commit, missing"}
1366 1367

		{_D "Missing"}
1368 1369
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
1370

1371
		{U_ "Requires merge resolution"}
1372
		{UU "Requires merge resolution"}
1373 1374
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
1375
	} {
1376 1377
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1378
	}
1379
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1380
}
1381
unset i
S
Shawn O. Pearce 已提交
1382 1383 1384 1385 1386

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

1387 1388 1389
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
1390 1391 1392
		# 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
1393 1394 1395 1396
		bind $w <Control-Button-1> $cmd
	}
}

1397 1398 1399 1400 1401 1402 1403 1404 1405
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}
}

1406 1407 1408 1409 1410
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
1411
	font configure ${font}italic -size $sz
1412 1413
}

S
Shawn O. Pearce 已提交
1414 1415 1416 1417
######################################################################
##
## ui commands

1418
set starting_gitk_msg {Starting gitk... please wait...}
1419

1420
proc do_gitk {revs} {
1421 1422 1423
	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
1424 1425
	set exe [file join [file dirname $::_git] gitk]
	set cmd [list [info nameofexecutable] $exe]
1426 1427
	if {! [file exists $exe]} {
		error_popup "Unable to start gitk:\n\n$exe does not exist"
S
Shawn O. Pearce 已提交
1428
	} else {
1429 1430
		eval exec $cmd $revs &
		ui_status $::starting_gitk_msg
1431
		after 10000 {
1432
			ui_ready $starting_gitk_msg
1433
		}
S
Shawn O. Pearce 已提交
1434 1435 1436
	}
}

1437
set is_quitting 0
1438

S
Shawn O. Pearce 已提交
1439
proc do_quit {} {
1440
	global ui_comm is_quitting repo_config commit_type
1441
	global GITGUI_BCK_exists GITGUI_BCK_i
1442

1443 1444
	if {$is_quitting} return
	set is_quitting 1
1445

1446 1447 1448 1449
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
1450 1451 1452
		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
			file rename -force [gitdir GITGUI_BCK] $save
			set GITGUI_BCK_exists 0
1453
		} else {
1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473
			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}
			}
		}

		# -- Remove our editor backup, its not needed.
		#
		after cancel $GITGUI_BCK_i
		if {$GITGUI_BCK_exists} {
			catch {file delete [gitdir GITGUI_BCK]}
1474 1475
		}

1476 1477 1478 1479 1480 1481 1482 1483 1484 1485
		# -- Stash our current window geometry into this repository.
		#
		set cfg_geometry [list]
		lappend cfg_geometry [wm geometry .]
		lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
		lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
			set rc_geometry {}
		}
		if {$cfg_geometry ne $rc_geometry} {
1486
			catch {git config gui.geometry $cfg_geometry}
1487
		}
1488 1489
	}

S
Shawn O. Pearce 已提交
1490 1491 1492 1493
	destroy .
}

proc do_rescan {} {
1494
	rescan ui_ready
S
Shawn O. Pearce 已提交
1495 1496
}

1497
proc do_commit {} {
1498
	commit_tree
1499 1500
}

1501
proc toggle_or_diff {w x y} {
1502
	global file_states file_lists current_diff_path ui_index ui_workdir
1503
	global last_clicked selected_paths
1504

S
Shawn O. Pearce 已提交
1505 1506 1507
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
1508 1509 1510 1511 1512 1513 1514 1515 1516
	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
1517
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
1518

1519
	if {$col == 0} {
1520
		if {$current_diff_path eq $path} {
1521 1522 1523 1524
			set after {reshow_diff;}
		} else {
			set after {}
		}
1525
		if {$w eq $ui_index} {
1526
			update_indexinfo \
1527
				"Unstaging [short_path $path] from commit" \
1528
				[list $path] \
1529
				[concat $after [list ui_ready]]
1530
		} elseif {$w eq $ui_workdir} {
1531
			update_index \
1532
				"Adding [short_path $path]" \
1533
				[list $path] \
1534
				[concat $after [list ui_ready]]
1535
		}
1536
	} else {
1537
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
1538 1539 1540
	}
}

1541
proc add_one_to_selection {w x y} {
1542
	global file_lists last_clicked selected_paths
1543

1544
	set lno [lindex [split [$w index @$x,$y] .] 0]
1545 1546 1547 1548 1549
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
1550

1551 1552 1553 1554 1555 1556
	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
	}

1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570
	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} {
1571
	global file_lists last_clicked selected_paths
1572 1573 1574 1575

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

1578
	set lno [lindex [split [$w index @$x,$y] .] 0]
1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593
	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 已提交
1594 1595 1596 1597
}

######################################################################
##
1598
## config defaults
S
Shawn O. Pearce 已提交
1599

1600
set cursor_ptr arrow
1601 1602 1603 1604 1605 1606 1607 1608
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
}

1609
font create font_uiitalic
1610 1611
font create font_uibold
font create font_diffbold
1612
font create font_diffitalic
S
Shawn O. Pearce 已提交
1613

1614 1615
foreach class {Button Checkbutton Entry Label
		Labelframe Listbox Menu Message
1616
		Radiobutton Spinbox Text} {
1617 1618 1619 1620
	option add *$class.font font_ui
}
unset class

1621 1622 1623 1624
if {[is_Windows] || [is_MacOSX]} {
	option add *Menu.tearOff 0
}

1625
if {[is_MacOSX]} {
1626 1627
	set M1B M1
	set M1T Cmd
1628
} else {
1629 1630
	set M1B Control
	set M1T Ctrl
1631 1632
}

1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647
proc apply_config {} {
	global repo_config font_descs

	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		if {[catch {
			foreach {cn cv} $repo_config(gui.$name) {
				font configure $font $cn $cv
			}
			} err]} {
			error_popup "Invalid font specified in gui.$name:\n\n$err"
		}
		foreach {cn cv} [font configure $font] {
			font configure ${font}bold $cn $cv
1648
			font configure ${font}italic $cn $cv
1649 1650
		}
		font configure ${font}bold -weight bold
1651
		font configure ${font}italic -slant italic
1652 1653 1654
	}
}

1655
set default_config(merge.diffstat) true
1656
set default_config(merge.summary) false
1657
set default_config(merge.verbosity) 2
1658 1659 1660
set default_config(user.name) {}
set default_config(user.email) {}

1661
set default_config(gui.matchtrackingbranch) false
1662
set default_config(gui.pruneduringfetch) false
1663
set default_config(gui.trustmtime) false
1664
set default_config(gui.diffcontext) 5
1665
set default_config(gui.newbranchtemplate) {}
1666 1667 1668 1669 1670 1671
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
set font_descs {
	{fontui   font_ui   {Main Font}}
	{fontdiff font_diff {Diff/Console Font}}
}
1672
load_config 0
1673 1674 1675 1676 1677 1678
apply_config

######################################################################
##
## ui construction

1679 1680
set ui_comm {}

S
Shawn O. Pearce 已提交
1681
# -- Menu Bar
1682
#
1683
menu .mbar -tearoff 0
1684 1685
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
1686
if {[is_enabled branch]} {
1687
	.mbar add cascade -label Branch -menu .mbar.branch
S
Shawn O. Pearce 已提交
1688
}
1689
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1690
	.mbar add cascade -label Commit -menu .mbar.commit
1691
}
1692
if {[is_enabled transport]} {
1693 1694 1695
	.mbar add cascade -label Merge -menu .mbar.merge
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Push -menu .mbar.push
1696
}
S
Shawn O. Pearce 已提交
1697 1698
. configure -menu .mbar

1699
# -- Repository Menu
1700
#
1701
menu .mbar.repository
1702 1703

.mbar.repository add command \
1704
	-label {Browse Current Branch's Files} \
1705
	-command {browser::new $current_branch}
1706
set ui_browse_current [.mbar.repository index last]
1707 1708 1709
.mbar.repository add command \
	-label {Browse Branch Files...} \
	-command browser_open::dialog
1710 1711
.mbar.repository add separator

1712
.mbar.repository add command \
1713
	-label {Visualize Current Branch's History} \
1714
	-command {do_gitk $current_branch}
1715
set ui_visualize_current [.mbar.repository index last]
1716
.mbar.repository add command \
1717
	-label {Visualize All Branch History} \
1718
	-command {do_gitk --all}
1719
.mbar.repository add separator
1720

1721 1722 1723 1724 1725 1726 1727 1728 1729
proc current_branch_write {args} {
	global current_branch
	.mbar.repository entryconf $::ui_browse_current \
		-label "Browse $current_branch's Files"
	.mbar.repository entryconf $::ui_visualize_current \
		-label "Visualize $current_branch's History"
}
trace add variable current_branch write current_branch_write

1730
if {[is_enabled multicommit]} {
1731
	.mbar.repository add command -label {Database Statistics} \
1732
		-command do_stats
1733

1734
	.mbar.repository add command -label {Compress Database} \
1735
		-command do_gc
1736

1737
	.mbar.repository add command -label {Verify Database} \
1738
		-command do_fsck_objects
1739

1740
	.mbar.repository add separator
1741

1742 1743 1744
	if {[is_Cygwin]} {
		.mbar.repository add command \
			-label {Create Desktop Icon} \
1745
			-command do_cygwin_shortcut
1746
	} elseif {[is_Windows]} {
1747
		.mbar.repository add command \
1748
			-label {Create Desktop Icon} \
1749
			-command do_windows_shortcut
1750
	} elseif {[is_MacOSX]} {
1751
		.mbar.repository add command \
1752
			-label {Create Desktop Icon} \
1753
			-command do_macosx_app
1754
	}
1755
}
1756

1757
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
1758
	-command do_quit \
1759
	-accelerator $M1T-Q
S
Shawn O. Pearce 已提交
1760

1761 1762 1763 1764 1765
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
1766
	-accelerator $M1T-Z
1767 1768
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
1769
	-accelerator $M1T-Y
1770 1771 1772
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
1773
	-accelerator $M1T-X
1774 1775
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
1776
	-accelerator $M1T-C
1777 1778
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
1779
	-accelerator $M1T-V
1780 1781
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
1782
	-accelerator Del
1783 1784 1785
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
1786
	-accelerator $M1T-A
1787

1788 1789
# -- Branch Menu
#
1790
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
1791 1792 1793
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
1794
		-command branch_create::dialog \
1795
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
1796 1797 1798
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

1799 1800 1801 1802 1803 1804
	.mbar.branch add command -label {Checkout...} \
		-command branch_checkout::dialog \
		-accelerator $M1T-O
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

1805 1806 1807 1808 1809
	.mbar.branch add command -label {Rename...} \
		-command branch_rename::dialog
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

S
Shawn O. Pearce 已提交
1810
	.mbar.branch add command -label {Delete...} \
1811
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
1812 1813
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
1814 1815

	.mbar.branch add command -label {Reset...} \
1816
		-command merge::reset_hard
1817 1818
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
1819 1820
}

S
Shawn O. Pearce 已提交
1821
# -- Commit Menu
1822
#
1823 1824 1825 1826 1827 1828 1829
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	menu .mbar.commit

	.mbar.commit add radiobutton \
		-label {New Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1830
		-value new
1831 1832
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1833

1834 1835 1836 1837
	.mbar.commit add radiobutton \
		-label {Amend Last Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1838
		-value amend
1839 1840
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1841

1842
	.mbar.commit add separator
1843

1844 1845
	.mbar.commit add command -label Rescan \
		-command do_rescan \
1846
		-accelerator F5
1847 1848
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1849

1850
	.mbar.commit add command -label {Stage To Commit} \
1851
		-command do_add_selection
1852 1853
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1854

1855
	.mbar.commit add command -label {Stage Changed Files To Commit} \
1856
		-command do_add_all \
1857
		-accelerator $M1T-I
1858 1859
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1860

1861
	.mbar.commit add command -label {Unstage From Commit} \
1862
		-command do_unstage_selection
1863 1864
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1865

1866
	.mbar.commit add command -label {Revert Changes} \
1867
		-command do_revert_selection
1868 1869
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1870

1871
	.mbar.commit add separator
1872

1873 1874
	.mbar.commit add command -label {Sign Off} \
		-command do_signoff \
1875
		-accelerator $M1T-S
1876

1877 1878
	.mbar.commit add command -label Commit \
		-command do_commit \
1879
		-accelerator $M1T-Return
1880 1881 1882
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
1883

1884 1885 1886 1887 1888
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
	.mbar.merge add command -label {Local Merge...} \
1889 1890
		-command merge::dialog \
		-accelerator $M1T-M
1891 1892 1893
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
	.mbar.merge add command -label {Abort Merge...} \
1894
		-command merge::reset_hard
1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
}

# -- Transport Menu
#
if {[is_enabled transport]} {
	menu .mbar.fetch

	menu .mbar.push
	.mbar.push add command -label {Push...} \
1906 1907
		-command do_push_anywhere \
		-accelerator $M1T-P
1908 1909
	.mbar.push add command -label {Delete...} \
		-command remote_branch_delete::dialog
1910 1911
}

S
Shawn O. Pearce 已提交
1912 1913 1914 1915 1916 1917
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

1918
	.mbar.apple add command -label "About [appname]" \
1919
		-command do_about
1920
	.mbar.apple add command -label "Options..." \
1921
		-command do_options
S
Shawn O. Pearce 已提交
1922 1923 1924 1925 1926
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
1927
		-command do_options
1928
}
1929

1930 1931
# -- Help Menu
#
1932
.mbar add cascade -label Help -menu .mbar.help
1933
menu .mbar.help
S
Shawn O. Pearce 已提交
1934

1935
if {![is_MacOSX]} {
1936
	.mbar.help add command -label "About [appname]" \
1937
		-command do_about
S
Shawn O. Pearce 已提交
1938
}
S
Shawn O. Pearce 已提交
1939

1940 1941
set browser {}
catch {set browser $repo_config(instaweb.browser)}
1942
set doc_path [file dirname [gitexec]]
1943 1944
set doc_path [file join $doc_path Documentation index.html]

1945
if {[is_Cygwin]} {
1946
	set doc_path [exec cygpath --mixed $doc_path]
1947 1948 1949 1950 1951
}

if {$browser eq {}} {
	if {[is_MacOSX]} {
		set browser open
1952
	} elseif {[is_Cygwin]} {
1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973
		set program_files [file dirname [exec cygpath --windir]]
		set program_files [file join $program_files {Program Files}]
		set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
		set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
		if {[file exists $firefox]} {
			set browser $firefox
		} elseif {[file exists $ie]} {
			set browser $ie
		}
		unset program_files firefox ie
	}
}

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

if {$browser ne {}} {
	.mbar.help add command -label {Online Documentation} \
1974
		-command [list exec $browser $doc_url &]
1975 1976
}
unset browser doc_path doc_url
S
Shawn O. Pearce 已提交
1977

1978 1979 1980 1981 1982 1983
set root_exists 0
bind . <Visibility> {
	bind . <Visibility> {}
	set root_exists 1
}

1984 1985
# -- Standard bindings
#
1986
wm protocol . WM_DELETE_WINDOW do_quit
1987 1988 1989 1990 1991
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]}

1992 1993 1994 1995 1996 1997
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

1998 1999
# -- Not a normal commit type invocation?  Do that instead!
#
2000
switch -- $subcommand {
2001
browser -
2002
blame {
2003 2004
	set subcommand_args {rev? path}
	if {$argv eq {}} usage
2005
	set head {}
2006 2007 2008 2009 2010
	set path {}
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
2011
			set path $_prefix$a
2012 2013 2014
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
2015 2016
				if {$head ne {}} usage
				set head $path
2017 2018 2019
				set path {}
			}
			set is_path 1
2020 2021 2022
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
2023
			set is_path 1
2024 2025 2026 2027 2028 2029
		} else {
			usage
		}
	}
	unset is_path

2030 2031 2032 2033 2034
	if {$head ne {} && $path eq {}} {
		set path $_prefix$head
		set head {}
	}

2035
	if {$head eq {}} {
2036
		load_current_branch
2037
	} else {
2038 2039 2040 2041 2042 2043 2044 2045
		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
			if {[catch {
					set head [git rev-parse --verify $head]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
2046
		set current_branch $head
2047
	}
2048

2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067
	switch -- $subcommand {
	browser {
		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]} {
			puts stderr "fatal: cannot stat path $path: No such file or directory"
			exit 1
		}
		blame::new $head $path
	}
2068
	}
2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081
	return
}
citool -
gui {
	if {[llength $argv] != 0} {
		puts -nonewline stderr "usage: $argv0"
		if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
			puts -nonewline stderr " $subcommand"
		}
		puts stderr {}
		exit 1
	}
	# fall through to setup UI for commits
2082 2083
}
default {
2084
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2085 2086 2087 2088
	exit 1
}
}

2089 2090 2091 2092 2093 2094 2095 2096
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
2097
	-justify left
2098 2099 2100
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
2101
	-justify left
2102 2103 2104 2105
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
2106
# -- Main Window Layout
2107
#
S
Shawn O. Pearce 已提交
2108 2109
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
2110
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
2111 2112 2113
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
2114
#
2115
frame .vpane.files.index -height 100 -width 200
2116
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
2117
	-background lightgreen
S
Shawn O. Pearce 已提交
2118
text $ui_index -background white -borderwidth 0 \
2119
	-width 20 -height 10 \
2120
	-wrap none \
2121
	-cursor $cursor_ptr \
2122 2123
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
2124
	-state disabled
2125 2126
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 已提交
2127
pack .vpane.files.index.title -side top -fill x
2128 2129
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
2130 2131 2132
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

2133
# -- Working Directory File List
2134
#
2135
frame .vpane.files.workdir -height 100 -width 200
2136
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
2137
	-background lightsalmon
2138
text $ui_workdir -background white -borderwidth 0 \
2139
	-width 20 -height 10 \
2140
	-wrap none \
2141
	-cursor $cursor_ptr \
2142 2143
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
2144
	-state disabled
2145 2146
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2147
pack .vpane.files.workdir.title -side top -fill x
2148 2149
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
2150 2151
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
2152

2153
foreach i [list $ui_index $ui_workdir] {
2154 2155
	$i tag conf in_diff -background lightgray
	$i tag conf in_sel  -background lightgray
2156 2157
}
unset i
2158

2159
# -- Diff and Commit Area
2160
#
2161
frame .vpane.lower -height 300 -width 400
2162 2163 2164 2165
frame .vpane.lower.commarea
frame .vpane.lower.diff -relief sunken -borderwidth 1
pack .vpane.lower.commarea -side top -fill x
pack .vpane.lower.diff -side bottom -fill both -expand 1
2166
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
2167 2168

# -- Commit Area Buttons
2169
#
2170 2171
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
2172
	-anchor w \
2173
	-justify left
2174 2175
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
2176

2177
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2178
	-command do_rescan
2179
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2180 2181
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
2182

2183
button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \
2184
	-command do_add_all
2185
pack .vpane.lower.commarea.buttons.incall -side top -fill x
2186 2187
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
2188

2189
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2190
	-command do_signoff
2191
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2192

2193
button .vpane.lower.commarea.buttons.commit -text {Commit} \
2194
	-command do_commit
2195
pack .vpane.lower.commarea.buttons.commit -side top -fill x
2196 2197
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
2198

2199 2200 2201 2202
button .vpane.lower.commarea.buttons.push -text {Push} \
	-command do_push_anywhere
pack .vpane.lower.commarea.buttons.push -side top -fill x

S
Shawn O. Pearce 已提交
2203
# -- Commit Message Buffer
2204
#
2205
frame .vpane.lower.commarea.buffer
2206
frame .vpane.lower.commarea.buffer.header
2207
set ui_comm .vpane.lower.commarea.buffer.t
2208 2209 2210 2211 2212
set ui_coml .vpane.lower.commarea.buffer.header.l
radiobutton .vpane.lower.commarea.buffer.header.new \
	-text {New Commit} \
	-command do_select_commit_type \
	-variable selected_commit_type \
2213
	-value new
2214 2215 2216 2217 2218 2219
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.new conf -state]
radiobutton .vpane.lower.commarea.buffer.header.amend \
	-text {Amend Last Commit} \
	-command do_select_commit_type \
	-variable selected_commit_type \
2220
	-value amend
2221 2222
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
2223
label $ui_coml \
S
Shawn O. Pearce 已提交
2224
	-anchor w \
2225
	-justify left
2226 2227 2228 2229 2230 2231
proc trace_commit_type {varname args} {
	global ui_coml commit_type
	switch -glob -- $commit_type {
	initial       {set txt {Initial Commit Message:}}
	amend         {set txt {Amended Commit Message:}}
	amend-initial {set txt {Amended Initial Commit Message:}}
2232
	amend-merge   {set txt {Amended Merge Commit Message:}}
2233 2234 2235 2236 2237 2238
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
2239 2240 2241 2242
pack $ui_coml -side left -fill x
pack .vpane.lower.commarea.buffer.header.amend -side right
pack .vpane.lower.commarea.buffer.header.new -side right

S
Shawn O. Pearce 已提交
2243
text $ui_comm -background white -borderwidth 1 \
2244
	-undo true \
2245
	-maxundo 20 \
2246
	-autoseparators true \
S
Shawn O. Pearce 已提交
2247
	-relief sunken \
2248
	-width 75 -height 9 -wrap none \
2249
	-font font_diff \
2250
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2251 2252
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
2253
pack .vpane.lower.commarea.buffer.header -side top -fill x
2254
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
2255
pack $ui_comm -side left -fill y
2256 2257
pack .vpane.lower.commarea.buffer -side left -fill y

2258 2259
# -- Commit Message Buffer Context Menu
#
2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Cut} \
	-command {tk_textCut $ui_comm}
$ctxm add command \
	-label {Copy} \
	-command {tk_textCopy $ui_comm}
$ctxm add command \
	-label {Paste} \
	-command {tk_textPaste $ui_comm}
$ctxm add command \
	-label {Delete} \
	-command {$ui_comm delete sel.first sel.last}
$ctxm add separator
$ctxm add command \
	-label {Select All} \
2277
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2278 2279 2280
$ctxm add command \
	-label {Copy All} \
	-command {
2281 2282 2283
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
2284 2285 2286 2287
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
2288
	-command do_signoff
2289
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2290

2291
# -- Diff Header
2292
#
2293 2294 2295
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
2296 2297 2298 2299 2300
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
2301
		set p $current_diff_path
2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314
		set s [mapdesc [lindex $file_states($p) 0] $p]
		set f {File:}
		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
	}
}
2315
trace add variable current_diff_path write trace_current_diff_path
2316

2317
frame .vpane.lower.diff.header -background gold
2318
label .vpane.lower.diff.header.status \
2319
	-background gold \
2320 2321
	-width $max_status_desc \
	-anchor w \
2322
	-justify left
2323
label .vpane.lower.diff.header.file \
2324
	-background gold \
2325
	-anchor w \
2326
	-justify left
2327
label .vpane.lower.diff.header.path \
2328
	-background gold \
2329
	-anchor w \
2330
	-justify left
2331 2332 2333 2334 2335 2336 2337
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 \
	-label {Copy} \
2338 2339 2340 2341 2342
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
2343
			-- $current_diff_path
2344
	}
2345 2346
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2347 2348

# -- Diff Body
2349
#
2350 2351 2352 2353
frame .vpane.lower.diff.body
set ui_diff .vpane.lower.diff.body.t
text $ui_diff -background white -borderwidth 0 \
	-width 80 -height 15 -wrap none \
2354
	-font font_diff \
2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367
	-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

2368
$ui_diff tag conf d_cr -elide true
2369 2370
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
2371 2372
$ui_diff tag conf d_- -foreground red

2373
$ui_diff tag conf d_++ -foreground {#00a000}
2374 2375
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
2376 2377
	-foreground {#00a000} \
	-background {#e2effa}
2378 2379
$ui_diff tag conf d_-s \
	-foreground red \
2380
	-background {#e2effa}
2381
$ui_diff tag conf d_s+ \
2382 2383
	-foreground {#00a000} \
	-background ivory1
2384 2385
$ui_diff tag conf d_s- \
	-foreground red \
2386
	-background ivory1
2387 2388 2389 2390 2391 2392 2393 2394 2395 2396

$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 已提交
2397

2398 2399
$ui_diff tag raise sel

2400 2401
# -- Diff Body Context Menu
#
2402 2403
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
2404 2405 2406
$ctxm add command \
	-label {Refresh} \
	-command reshow_diff
2407
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2408 2409 2410 2411 2412 2413
$ctxm add command \
	-label {Copy} \
	-command {tk_textCopy $ui_diff}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Select All} \
2414
	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2415 2416 2417 2418
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
	-command {
2419 2420 2421
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
2422 2423 2424
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
2425 2426 2427 2428 2429 2430
$ctxm add command \
	-label {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]
$ctxm add separator
2431 2432
$ctxm add command \
	-label {Decrease Font Size} \
2433
	-command {incr_font_size font_diff -1}
2434 2435 2436
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
2437
	-command {incr_font_size font_diff 1}
2438 2439 2440 2441
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
2442
	-command {if {$repo_config(gui.diffcontext) >= 1} {
2443 2444 2445
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
2446 2447 2448
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
2449
	-command {if {$repo_config(gui.diffcontext) < 99} {
2450 2451
		incr repo_config(gui.diffcontext)
		reshow_diff
2452
	}}
2453 2454 2455
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
2456
	-command do_options
2457
proc popup_diff_menu {ctxm x y X Y} {
2458
	global current_diff_path file_states
2459 2460 2461
	set ::cursorX $x
	set ::cursorY $y
	if {$::ui_index eq $::current_diff_side} {
2462
		set l "Unstage Hunk From Commit"
2463
	} else {
2464
		set l "Stage Hunk For Commit"
2465
	}
2466 2467 2468 2469
	if {$::is_3way_diff
		|| $current_diff_path eq {}
		|| ![info exists file_states($current_diff_path)]
		|| {_O} eq [lindex $file_states($current_diff_path) 0]} {
2470
		set s disabled
2471 2472
	} else {
		set s normal
2473
	}
2474
	$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
2475 2476 2477
	tk_popup $ctxm $X $Y
}
bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
2478

S
Shawn O. Pearce 已提交
2479
# -- Status Bar
2480
#
2481
set main_status [::status_bar::new .status]
S
Shawn O. Pearce 已提交
2482
pack .status -anchor w -side bottom -fill x
2483
$main_status show {Initializing...}
S
Shawn O. Pearce 已提交
2484

2485
# -- Load geometry
2486
#
2487
catch {
2488
set gm $repo_config(gui.geometry)
2489 2490 2491 2492 2493 2494 2495 2496
wm geometry . [lindex $gm 0]
.vpane sash place 0 \
	[lindex [.vpane sash coord 0] 0] \
	[lindex $gm 1]
.vpane.files sash place 0 \
	[lindex $gm 2] \
	[lindex [.vpane.files sash coord 0] 1]
unset gm
2497
}
2498

S
Shawn O. Pearce 已提交
2499
# -- Key Bindings
2500
#
2501
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2502 2503
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520
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}

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}
2521 2522 2523 2524
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}
2525 2526 2527 2528 2529 2530
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}
2531
bind $ui_diff <Button-1>   {focus %W}
2532

2533
if {[is_enabled branch]} {
2534 2535
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
2536 2537
	bind . <$M1B-Key-o> branch_checkout::dialog
	bind . <$M1B-Key-O> branch_checkout::dialog
2538 2539
	bind . <$M1B-Key-m> merge::dialog
	bind . <$M1B-Key-M> merge::dialog
2540
}
2541 2542 2543 2544
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
2545

2546 2547 2548
bind .   <Key-F5>     do_rescan
bind .   <$M1B-Key-r> do_rescan
bind .   <$M1B-Key-R> do_rescan
2549 2550
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
2551 2552
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
2553
bind .   <$M1B-Key-Return> do_commit
2554
foreach i [list $ui_index $ui_workdir] {
2555 2556 2557
	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 已提交
2558
}
2559 2560 2561
unset i

set file_lists($ui_index) [list]
2562
set file_lists($ui_workdir) [list]
2563

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

2567 2568 2569
# -- 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.
2570
#
2571
if {[is_Cygwin]} {
2572 2573 2574 2575 2576 2577
	set ignored_env 0
	set suggest_user {}
	set msg "Possible environment issues exist.

The following environment variables are probably
going to be ignored by any Git subprocess run
2578
by [appname]:
2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621

"
	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_CONFIG_LOCAL$} -
		{^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} {
		append msg "
This is due to a known issue with the
Tcl binary distributed by Cygwin."

		if {$suggest_user ne {}} {
			append msg "

A good replacement for $suggest_user
is placing values for the user.name and
user.email settings into your personal
~/.gitconfig file.
"
		}
		warn_popup $msg
	}
	unset ignored_env msg suggest_user name
}

2622 2623
# -- Only initialize complex UI if we are going to stay running.
#
2624
if {[is_enabled transport]} {
2625
	load_all_remotes
2626

2627 2628
	populate_fetch_menu
	populate_push_menu
2629
}
2630

2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683
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
}

2684
lock_index begin-read
2685 2686 2687
if {![winfo ismapped .]} {
	wm deiconify .
}
2688
after 1 do_rescan
2689 2690 2691
if {[is_enabled multicommit]} {
	after 1000 hint_gc
}