git-gui.sh 63.6 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 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
######################################################################
##
## 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
	}
}

63 64 65 66 67
######################################################################
##
## configure our library

set oguilib {@@GITGUI_LIBDIR@@}
68 69 70 71 72
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]} {
73 74
	set oguilib [file join [file dirname [file normalize $argv0]] lib]
}
75

76
set idx [file join $oguilib tclIndex]
77 78 79 80 81 82 83 84 85 86 87 88 89 90
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
91 92
		}
	}
93 94
} else {
	set idx {}
95
}
96 97
close $fd

98 99 100 101 102 103 104 105 106 107 108
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]
}
109
unset -nocomplain oguirel idx fd
110

111 112 113 114 115 116
######################################################################
##
## read only globals

set _appname [lindex [file split $argv0] end]
set _gitdir {}
117
set _gitexec {}
118
set _reponame {}
119
set _iscygwin {}
120
set _search_path {}
121 122 123 124 125 126

proc appname {} {
	global _appname
	return $_appname
}

127
proc gitdir {args} {
128
	global _gitdir
129 130 131
	if {$args eq {}} {
		return $_gitdir
	}
132
	return [eval [list file join $_gitdir] $args]
133 134
}

135 136 137
proc gitexec {args} {
	global _gitexec
	if {$_gitexec eq {}} {
138
		if {[catch {set _gitexec [git --exec-path]} err]} {
139 140
			error "Git not installed?\n\n$err"
		}
141 142 143 144 145 146 147 148
		if {[is_Cygwin]} {
			set _gitexec [exec cygpath \
				--windows \
				--absolute \
				$_gitexec]
		} else {
			set _gitexec [file normalize $_gitexec]
		}
149 150 151 152
	}
	if {$args eq {}} {
		return $_gitexec
	}
153
	return [eval [list file join $_gitexec] $args]
154 155
}

156
proc reponame {} {
157
	return $::_reponame
158
}
159

160 161 162 163 164 165 166 167
proc is_MacOSX {} {
	if {[tk windowingsystem] eq {aqua}} {
		return 1
	}
	return 0
}

proc is_Windows {} {
168
	if {$::tcl_platform(platform) eq {windows}} {
169 170 171 172 173 174
		return 1
	}
	return 0
}

proc is_Cygwin {} {
175
	global _iscygwin
176
	if {$_iscygwin eq {}} {
177
		if {$::tcl_platform(platform) eq {windows}} {
178 179 180 181 182 183 184 185 186 187 188 189
			if {[catch {set p [exec cygpath --windir]} err]} {
				set _iscygwin 0
			} else {
				set _iscygwin 1
			}
		} else {
			set _iscygwin 0
		}
	}
	return $_iscygwin
}

190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205
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
}

206 207 208 209
######################################################################
##
## config

210 211 212 213 214 215 216 217 218
proc is_many_config {name} {
	switch -glob -- $name {
	remote.*.fetch -
	remote.*.push
		{return 1}
	*
		{return 0}
	}
}
219

220 221 222 223 224 225 226 227 228 229 230
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
	}
}

231 232 233 234 235 236 237 238 239
proc get_config {name} {
	global repo_config
	if {[catch {set v $repo_config($name)}]} {
		return {}
	} else {
		return $v
	}
}

240
proc load_config {include_global} {
241 242 243
	global repo_config global_config default_config

	array unset global_config
244 245
	if {$include_global} {
		catch {
246
			set fd_rc [git_read config --global --list]
247 248 249 250 251 252 253
			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
					}
254 255
				}
			}
256
			close $fd_rc
257 258
		}
	}
259 260

	array unset repo_config
261
	catch {
262
		set fd_rc [git_read config --list]
263 264
		while {[gets $fd_rc line] >= 0} {
			if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
265 266 267 268 269
				if {[is_many_config $name]} {
					lappend repo_config($name) $value
				} else {
					set repo_config($name) $value
				}
270 271 272 273 274
			}
		}
		close $fd_rc
	}

275 276 277 278 279 280 281
	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)
		}
282 283 284
	}
}

285 286 287 288
######################################################################
##
## handy utils

289 290 291 292 293
proc _git_cmd {name} {
	global _git_cmd_path

	if {[catch {set v $_git_cmd_path($name)}]} {
		switch -- $name {
294
		  version   -
295 296 297 298 299 300 301
		--version   -
		--exec-path { return [list $::_git $name] }
		}

		set p [gitexec git-$name$::_search_exe]
		if {[file exists $p]} {
			set v [list $p]
302 303 304 305
		} 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.
306
			#
307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326
			set p [gitexec git-$name]
			set f [open $p r]
			set s [gets $f]
			close $f

			switch -glob -- $s {
			#!*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)"
			}
			set v [list $interp $p]
327
		} else {
328 329 330 331
			# Assume it is builtin to git somehow and we
			# aren't actually able to see a file for it.
			#
			set v [list $::_git $name]
332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366
		}
		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 {}
}

367 368 369 370 371 372 373 374 375 376 377 378
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
	}
}

379
proc git {args} {
380 381 382 383 384
	set opt [list exec]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
385
			_lappend_nice opt
386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402
		}

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

403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
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
		}
	}
423
	fconfigure $fd -eofchar {}
424 425 426
	return $fd
}

427 428 429 430 431 432
proc git_read {args} {
	set opt [list |]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
433
			_lappend_nice opt
434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451
		}

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

452
	return [_open_stdout_stderr [concat $opt $cmdp $args]]
453 454 455 456 457 458 459 460
}

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

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

		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]
477 478
}

479 480 481 482 483
proc sq {value} {
	regsub -all ' $value "'\\''" value
	return "'$value'"
}

484 485 486
proc load_current_branch {} {
	global current_branch is_detached

487
	set fd [open [gitdir HEAD] r]
488
	if {[gets $fd ref] < 1} {
489 490 491
		set ref {}
	}
	close $fd
492 493 494 495 496 497 498

	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.
		#
499 500
		set current_branch [string range $ref $len end]
		set is_detached 0
501 502 503
	} else {
		# Assume this is a detached head.
		#
504 505
		set current_branch HEAD
		set is_detached 1
506
	}
507 508
}

509 510 511 512 513 514 515 516 517
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
}

518 519 520 521 522 523 524 525 526 527 528
######################################################################
##
## find git

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

529 530 531 532
######################################################################
##
## version check

533
if {[catch {set _git_version [git --version]} err]} {
534 535 536 537 538
	catch {wm withdraw .}
	error_popup "Cannot determine Git version:

$err

539 540 541 542 543 544
[appname] requires Git 1.5.0 or later."
	exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
	catch {wm withdraw .}
	error_popup "Cannot parse Git version string:\n\n$_git_version"
545 546
	exit 1
}
547 548

set _real_git_version $_git_version
549
regsub -- {-dirty$} $_git_version {} _git_version
550 551
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version
552
regsub {\.GIT$} $_git_version {} _git_version
553

554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575
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

576 577 578 579 580 581
proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
582
	}
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620

	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]} {
621
	catch {wm withdraw .}
622 623 624 625 626
	error_popup "[appname] requires Git 1.5.0 or later.

You are using [git-version]:

[git --version]"
627 628 629
	exit 1
}

630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649
######################################################################
##
## 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
650
disable_option bare
651 652 653 654

switch -- $subcommand {
browser -
blame {
655 656
	enable_option bare

657 658 659 660 661 662 663 664 665 666 667 668 669
	disable_option multicommit
	disable_option branch
	disable_option transport
}
citool {
	enable_option singlecommit

	disable_option multicommit
	disable_option branch
	disable_option transport
}
}

670 671 672 673
######################################################################
##
## repository setup

674 675 676 677 678 679 680 681
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]} {
682 683
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
684 685
	exit 1
}
686 687 688
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
	catch {set _gitdir [exec cygpath --unix $_gitdir]}
}
689
if {![file isdirectory $_gitdir]} {
690
	catch {wm withdraw .}
691
	error_popup "Git directory not found:\n\n$_gitdir"
692 693
	exit 1
}
694 695 696 697 698 699 700 701 702 703 704
if {![is_enabled bare]} {
	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
	}
705
}
706 707 708 709 710
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]
711 712
}

713 714 715 716 717 718 719 720 721 722 723 724 725 726
######################################################################
##
## 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 {}
727
set is_detached 0
728 729 730
set current_diff_path {}
set selected_commit_type new

S
Shawn O. Pearce 已提交
731 732
######################################################################
##
733
## task management
S
Shawn O. Pearce 已提交
734

735
set rescan_active 0
736
set diff_active 0
737
set last_clicked {}
738

739 740 741 742 743
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
744

745
	if {$index_lock_type eq {none}} {
746 747 748 749 750
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
751
	} elseif {$index_lock_type eq "begin-$type"} {
752
		set index_lock_type $type
753 754 755 756
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
757

758 759 760 761 762 763 764 765 766 767 768 769 770
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

771
proc repository_state {ctvar hdvar mhvar} {
772
	global current_branch
773 774 775
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
776

777
	load_current_branch
778
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
779
		set hd {}
780
		set ct initial
781 782 783
		return
	}

784
	set merge_head [gitdir MERGE_HEAD]
785
	if {[file exists $merge_head]} {
786
		set ct merge
787 788 789 790 791 792
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
793
	}
794 795

	set ct normal
796 797
}

798 799 800
proc PARENT {} {
	global PARENT empty_tree

801 802 803
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
804 805
	}
	if {$empty_tree eq {}} {
806
		set empty_tree [git mktree << {}]
807 808 809 810
	}
	return $empty_tree
}

811
proc rescan {after {honor_trustmtime 1}} {
812
	global HEAD PARENT MERGE_HEAD commit_type
813
	global ui_index ui_workdir ui_comm
814
	global rescan_active file_states
815
	global repo_config
S
Shawn O. Pearce 已提交
816

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

819
	repository_state newType newHEAD newMERGE_HEAD
820
	if {[string match amend* $commit_type]
821 822
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
823
	} else {
824 825 826 827
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
828 829
	}

S
Shawn O. Pearce 已提交
830 831
	array unset file_states

832 833 834
	if {!$::GITGUI_BCK_exists &&
		(![$ui_comm edit modified]
		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
835 836
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
837 838 839
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
840
		$ui_comm edit reset
841
		$ui_comm edit modified false
842 843
	}

844
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
845
		rescan_stage2 {} $after
846
	} else {
847
		set rescan_active 1
848
		ui_status {Refreshing file status...}
849 850 851 852 853 854
		set fd_rf [git_read update-index \
			-q \
			--unmerged \
			--ignore-missing \
			--refresh \
			]
855
		fconfigure $fd_rf -blocking 0 -translation binary
856
		fileevent $fd_rf readable \
857
			[list rescan_stage2 $fd_rf $after]
858
	}
859 860
}

861
proc rescan_stage2 {fd after} {
862
	global rescan_active buf_rdi buf_rdf buf_rlo
863

864
	if {$fd ne {}} {
865 866 867 868
		read $fd
		if {![eof $fd]} return
		close $fd
	}
869

870
	set ls_others [list --exclude-per-directory=.gitignore]
871
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
872 873 874
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}
875 876 877 878
	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 已提交
879

880 881 882 883
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

884
	set rescan_active 3
885
	ui_status {Scanning for modified files ...}
886 887 888
	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 已提交
889

890 891 892
	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
893 894 895
	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 已提交
896 897
}

898
proc load_message {file} {
899
	global ui_comm
900

901
	set f [gitdir $file]
902
	if {[file isfile $f]} {
903 904 905
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
906
		fconfigure $fd -eofchar {}
907
		set content [string trim [read $fd]]
908
		close $fd
909
		regsub -all -line {[ \r\t]+$} $content {} content
910 911 912 913 914 915 916
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

917
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
918 919 920
	global buf_rdi

	append buf_rdi [read $fd]
921 922 923 924 925 926 927 928 929 930
	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
931
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
932
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
933
		merge_state \
934
			[encoding convertfrom $p] \
935 936
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
937 938
			[list]
		set c $z2
939
		incr c
S
Shawn O. Pearce 已提交
940
	}
941 942 943 944 945 946
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

947
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
948 949
}

950
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
951 952 953
	global buf_rdf

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

980
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
981 982
}

983
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
984 985 986 987 988 989
	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] {
990
		merge_state [encoding convertfrom $p] ?O
S
Shawn O. Pearce 已提交
991
	}
992
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
993 994
}

995
proc rescan_done {fd buf after} {
996
	global rescan_active current_diff_path
997
	global file_states repo_config
998
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
999

1000 1001 1002
	if {![eof $fd]} return
	set to_clear {}
	close $fd
1003
	if {[incr rescan_active -1] > 0} return
1004

1005
	prune_selection
1006 1007
	unlock_index
	display_all_files
1008
	if {$current_diff_path ne {}} reshow_diff
1009
	uplevel #0 $after
S
Shawn O. Pearce 已提交
1010 1011
}

1012 1013 1014 1015 1016 1017 1018 1019 1020 1021
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 已提交
1022 1023
######################################################################
##
1024
## ui helpers
S
Shawn O. Pearce 已提交
1025

1026 1027 1028 1029 1030 1031 1032 1033 1034
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 已提交
1035

1036 1037
proc mapdesc {state path} {
	global all_descs
1038

1039 1040 1041 1042 1043 1044
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
1045

1046
proc ui_status {msg} {
1047
	$::main_status show $msg
1048 1049 1050
}

proc ui_ready {{test {}}} {
1051
	$::main_status show {Ready.} $test
1052 1053
}

1054 1055 1056 1057
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
1058 1059
}

1060 1061
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
1062 1063
}

1064 1065
set next_icon_id 0
set null_sha1 [string repeat 0 40]
1066

1067 1068
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
1069

1070 1071
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
1072

1073 1074 1075 1076 1077 1078 1079 1080 1081
	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]}
	}
1082

1083 1084
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
1085

1086 1087
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
1088

1089 1090 1091 1092 1093 1094
	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
	}
1095

1096 1097 1098 1099 1100
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
1101

1102 1103
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
1104

1105
	if {$new_m eq {_}} {
1106
		set lno [lsearch -sorted -exact $file_lists($w) $path]
1107
		if {$lno >= 0} {
1108
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1109
			incr lno
1110 1111 1112
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
1113
		}
1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129
	} 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
1130
	}
1131 1132 1133 1134 1135
}

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

1137
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
1138
	set s $file_states($path)
1139 1140
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
1141

1142 1143 1144 1145 1146 1147 1148
	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 已提交
1149
	}
1150
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
1151

1152 1153 1154 1155
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
1156
	}
1157 1158 1159 1160
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
1161
	}
1162 1163 1164 1165 1166
	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 已提交
1167
	}
1168
}
S
Shawn O. Pearce 已提交
1169

1170 1171 1172 1173 1174 1175 1176 1177 1178 1179
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 已提交
1180 1181
}

1182 1183 1184 1185
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
S
Shawn O. Pearce 已提交
1186

1187 1188
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
1189

1190 1191 1192
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
1193

1194 1195
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
1196

1197 1198 1199 1200 1201 1202 1203 1204 1205
	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
1206
		}
S
Shawn O. Pearce 已提交
1207

1208 1209 1210 1211
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
1212
		}
1213 1214 1215
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
1216 1217 1218
		}
	}

1219 1220
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
1221 1222
}

1223 1224
######################################################################
##
1225
## icons
1226

1227 1228 1229 1230 1231 1232 1233 1234
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 已提交
1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253

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

1254 1255 1256 1257
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 已提交
1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298
   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

1299
set ui_index .vpane.files.index.list
1300
set ui_workdir .vpane.files.workdir.list
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310

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
1311
set all_icons(U$ui_workdir) file_merge
1312 1313
set all_icons(O$ui_workdir) file_plain

1314
set max_status_desc 0
S
Shawn O. Pearce 已提交
1315
foreach i {
1316 1317
		{__ "Unmodified"}

1318 1319 1320 1321 1322 1323 1324 1325 1326
		{_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"}
1327 1328

		{_D "Missing"}
1329 1330
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
1331

1332
		{U_ "Requires merge resolution"}
1333
		{UU "Requires merge resolution"}
1334 1335
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
1336
	} {
1337 1338
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1339
	}
1340
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1341
}
1342
unset i
S
Shawn O. Pearce 已提交
1343 1344 1345 1346 1347

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

1348 1349 1350
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
1351 1352 1353
		# 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
1354 1355 1356 1357
		bind $w <Control-Button-1> $cmd
	}
}

1358 1359 1360 1361 1362 1363 1364 1365 1366
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}
}

1367 1368 1369 1370 1371
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
1372
	font configure ${font}italic -size $sz
1373 1374
}

S
Shawn O. Pearce 已提交
1375 1376 1377 1378
######################################################################
##
## ui commands

1379
set starting_gitk_msg {Starting gitk... please wait...}
1380

1381
proc do_gitk {revs} {
1382 1383 1384
	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
1385 1386
	set exe [file join [file dirname $::_git] gitk]
	set cmd [list [info nameofexecutable] $exe]
1387 1388
	if {! [file exists $exe]} {
		error_popup "Unable to start gitk:\n\n$exe does not exist"
S
Shawn O. Pearce 已提交
1389
	} else {
1390 1391
		eval exec $cmd $revs &
		ui_status $::starting_gitk_msg
1392
		after 10000 {
1393
			ui_ready $starting_gitk_msg
1394
		}
S
Shawn O. Pearce 已提交
1395 1396 1397
	}
}

1398
set is_quitting 0
1399

S
Shawn O. Pearce 已提交
1400
proc do_quit {} {
1401
	global ui_comm is_quitting repo_config commit_type
1402
	global GITGUI_BCK_exists GITGUI_BCK_i
1403

1404 1405
	if {$is_quitting} return
	set is_quitting 1
1406

1407 1408 1409 1410
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
1411 1412 1413
		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
			file rename -force [gitdir GITGUI_BCK] $save
			set GITGUI_BCK_exists 0
1414
		} else {
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434
			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]}
1435 1436
		}

1437 1438 1439 1440 1441 1442 1443 1444 1445 1446
		# -- 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} {
1447
			catch {git config gui.geometry $cfg_geometry}
1448
		}
1449 1450
	}

S
Shawn O. Pearce 已提交
1451 1452 1453 1454
	destroy .
}

proc do_rescan {} {
1455
	rescan ui_ready
S
Shawn O. Pearce 已提交
1456 1457
}

1458
proc do_commit {} {
1459
	commit_tree
1460 1461
}

1462
proc toggle_or_diff {w x y} {
1463
	global file_states file_lists current_diff_path ui_index ui_workdir
1464
	global last_clicked selected_paths
1465

S
Shawn O. Pearce 已提交
1466 1467 1468
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
1469 1470 1471 1472 1473 1474 1475 1476 1477
	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
1478
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
1479

1480
	if {$col == 0} {
1481
		if {$current_diff_path eq $path} {
1482 1483 1484 1485
			set after {reshow_diff;}
		} else {
			set after {}
		}
1486
		if {$w eq $ui_index} {
1487
			update_indexinfo \
1488
				"Unstaging [short_path $path] from commit" \
1489
				[list $path] \
1490
				[concat $after [list ui_ready]]
1491
		} elseif {$w eq $ui_workdir} {
1492
			update_index \
1493
				"Adding [short_path $path]" \
1494
				[list $path] \
1495
				[concat $after [list ui_ready]]
1496
		}
1497
	} else {
1498
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
1499 1500 1501
	}
}

1502
proc add_one_to_selection {w x y} {
1503
	global file_lists last_clicked selected_paths
1504

1505
	set lno [lindex [split [$w index @$x,$y] .] 0]
1506 1507 1508 1509 1510
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
1511

1512 1513 1514 1515 1516 1517
	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
	}

1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531
	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} {
1532
	global file_lists last_clicked selected_paths
1533 1534 1535 1536

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

1539
	set lno [lindex [split [$w index @$x,$y] .] 0]
1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554
	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 已提交
1555 1556 1557 1558
}

######################################################################
##
1559
## config defaults
S
Shawn O. Pearce 已提交
1560

1561
set cursor_ptr arrow
1562 1563 1564 1565 1566 1567 1568 1569
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
}

1570
font create font_uiitalic
1571 1572
font create font_uibold
font create font_diffbold
1573
font create font_diffitalic
S
Shawn O. Pearce 已提交
1574

1575 1576
foreach class {Button Checkbutton Entry Label
		Labelframe Listbox Menu Message
1577
		Radiobutton Spinbox Text} {
1578 1579 1580 1581
	option add *$class.font font_ui
}
unset class

1582 1583 1584 1585
if {[is_Windows] || [is_MacOSX]} {
	option add *Menu.tearOff 0
}

1586
if {[is_MacOSX]} {
1587 1588
	set M1B M1
	set M1T Cmd
1589
} else {
1590 1591
	set M1B Control
	set M1T Ctrl
1592 1593
}

1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608
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
1609
			font configure ${font}italic $cn $cv
1610 1611
		}
		font configure ${font}bold -weight bold
1612
		font configure ${font}italic -slant italic
1613 1614 1615
	}
}

1616
set default_config(merge.diffstat) true
1617
set default_config(merge.summary) false
1618
set default_config(merge.verbosity) 2
1619 1620 1621
set default_config(user.name) {}
set default_config(user.email) {}

1622
set default_config(gui.matchtrackingbranch) false
1623
set default_config(gui.pruneduringfetch) false
1624
set default_config(gui.trustmtime) false
1625
set default_config(gui.diffcontext) 5
1626
set default_config(gui.newbranchtemplate) {}
1627 1628 1629 1630 1631 1632
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}}
}
1633
load_config 0
1634 1635 1636 1637 1638 1639
apply_config

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

1640 1641
set ui_comm {}

S
Shawn O. Pearce 已提交
1642
# -- Menu Bar
1643
#
1644
menu .mbar -tearoff 0
1645 1646
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
1647
if {[is_enabled branch]} {
1648
	.mbar add cascade -label Branch -menu .mbar.branch
S
Shawn O. Pearce 已提交
1649
}
1650
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1651
	.mbar add cascade -label Commit -menu .mbar.commit
1652
}
1653
if {[is_enabled transport]} {
1654 1655 1656
	.mbar add cascade -label Merge -menu .mbar.merge
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Push -menu .mbar.push
1657
}
S
Shawn O. Pearce 已提交
1658 1659
. configure -menu .mbar

1660
# -- Repository Menu
1661
#
1662
menu .mbar.repository
1663 1664

.mbar.repository add command \
1665
	-label {Browse Current Branch's Files} \
1666
	-command {browser::new $current_branch}
1667
set ui_browse_current [.mbar.repository index last]
1668 1669 1670
.mbar.repository add command \
	-label {Browse Branch Files...} \
	-command browser_open::dialog
1671 1672
.mbar.repository add separator

1673
.mbar.repository add command \
1674
	-label {Visualize Current Branch's History} \
1675
	-command {do_gitk $current_branch}
1676
set ui_visualize_current [.mbar.repository index last]
1677
.mbar.repository add command \
1678
	-label {Visualize All Branch History} \
1679
	-command {do_gitk --all}
1680
.mbar.repository add separator
1681

1682 1683 1684 1685 1686 1687 1688 1689 1690
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

1691
if {[is_enabled multicommit]} {
1692
	.mbar.repository add command -label {Database Statistics} \
1693
		-command do_stats
1694

1695
	.mbar.repository add command -label {Compress Database} \
1696
		-command do_gc
1697

1698
	.mbar.repository add command -label {Verify Database} \
1699
		-command do_fsck_objects
1700

1701
	.mbar.repository add separator
1702

1703 1704 1705
	if {[is_Cygwin]} {
		.mbar.repository add command \
			-label {Create Desktop Icon} \
1706
			-command do_cygwin_shortcut
1707
	} elseif {[is_Windows]} {
1708
		.mbar.repository add command \
1709
			-label {Create Desktop Icon} \
1710
			-command do_windows_shortcut
1711
	} elseif {[is_MacOSX]} {
1712
		.mbar.repository add command \
1713
			-label {Create Desktop Icon} \
1714
			-command do_macosx_app
1715
	}
1716
}
1717

1718
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
1719
	-command do_quit \
1720
	-accelerator $M1T-Q
S
Shawn O. Pearce 已提交
1721

1722 1723 1724 1725 1726
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
1727
	-accelerator $M1T-Z
1728 1729
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
1730
	-accelerator $M1T-Y
1731 1732 1733
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
1734
	-accelerator $M1T-X
1735 1736
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
1737
	-accelerator $M1T-C
1738 1739
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
1740
	-accelerator $M1T-V
1741 1742
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
1743
	-accelerator Del
1744 1745 1746
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
1747
	-accelerator $M1T-A
1748

1749 1750
# -- Branch Menu
#
1751
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
1752 1753 1754
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
1755
		-command branch_create::dialog \
1756
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
1757 1758 1759
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

1760 1761 1762 1763 1764 1765
	.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]

1766 1767 1768 1769 1770
	.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 已提交
1771
	.mbar.branch add command -label {Delete...} \
1772
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
1773 1774
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
1775 1776

	.mbar.branch add command -label {Reset...} \
1777
		-command merge::reset_hard
1778 1779
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
1780 1781
}

S
Shawn O. Pearce 已提交
1782
# -- Commit Menu
1783
#
1784 1785 1786 1787 1788 1789 1790
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 \
1791
		-value new
1792 1793
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1794

1795 1796 1797 1798
	.mbar.commit add radiobutton \
		-label {Amend Last Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1799
		-value amend
1800 1801
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1802

1803
	.mbar.commit add separator
1804

1805 1806
	.mbar.commit add command -label Rescan \
		-command do_rescan \
1807
		-accelerator F5
1808 1809
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1810

1811
	.mbar.commit add command -label {Stage To Commit} \
1812
		-command do_add_selection
1813 1814
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1815

1816
	.mbar.commit add command -label {Stage Changed Files To Commit} \
1817
		-command do_add_all \
1818
		-accelerator $M1T-I
1819 1820
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1821

1822
	.mbar.commit add command -label {Unstage From Commit} \
1823
		-command do_unstage_selection
1824 1825
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1826

1827
	.mbar.commit add command -label {Revert Changes} \
1828
		-command do_revert_selection
1829 1830
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1831

1832
	.mbar.commit add separator
1833

1834 1835
	.mbar.commit add command -label {Sign Off} \
		-command do_signoff \
1836
		-accelerator $M1T-S
1837

1838 1839
	.mbar.commit add command -label Commit \
		-command do_commit \
1840
		-accelerator $M1T-Return
1841 1842 1843
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
1844

1845 1846 1847 1848 1849
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
	.mbar.merge add command -label {Local Merge...} \
1850 1851
		-command merge::dialog \
		-accelerator $M1T-M
1852 1853 1854
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
	.mbar.merge add command -label {Abort Merge...} \
1855
		-command merge::reset_hard
1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866
	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...} \
1867 1868
		-command do_push_anywhere \
		-accelerator $M1T-P
1869 1870
	.mbar.push add command -label {Delete...} \
		-command remote_branch_delete::dialog
1871 1872
}

S
Shawn O. Pearce 已提交
1873 1874 1875 1876 1877 1878
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

1879
	.mbar.apple add command -label "About [appname]" \
1880
		-command do_about
1881
	.mbar.apple add command -label "Options..." \
1882
		-command do_options
S
Shawn O. Pearce 已提交
1883 1884 1885 1886 1887
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
1888
		-command do_options
1889
}
1890

1891 1892
# -- Help Menu
#
1893
.mbar add cascade -label Help -menu .mbar.help
1894
menu .mbar.help
S
Shawn O. Pearce 已提交
1895

1896
if {![is_MacOSX]} {
1897
	.mbar.help add command -label "About [appname]" \
1898
		-command do_about
S
Shawn O. Pearce 已提交
1899
}
S
Shawn O. Pearce 已提交
1900

1901 1902
set browser {}
catch {set browser $repo_config(instaweb.browser)}
1903
set doc_path [file dirname [gitexec]]
1904 1905
set doc_path [file join $doc_path Documentation index.html]

1906
if {[is_Cygwin]} {
1907
	set doc_path [exec cygpath --mixed $doc_path]
1908 1909 1910 1911 1912
}

if {$browser eq {}} {
	if {[is_MacOSX]} {
		set browser open
1913
	} elseif {[is_Cygwin]} {
1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934
		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} \
1935
		-command [list exec $browser $doc_url &]
1936 1937
}
unset browser doc_path doc_url
S
Shawn O. Pearce 已提交
1938

1939 1940 1941 1942 1943 1944
set root_exists 0
bind . <Visibility> {
	bind . <Visibility> {}
	set root_exists 1
}

1945 1946
# -- Standard bindings
#
1947
wm protocol . WM_DELETE_WINDOW do_quit
1948 1949 1950 1951 1952
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]}

1953 1954 1955 1956 1957 1958
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

1959 1960
# -- Not a normal commit type invocation?  Do that instead!
#
1961
switch -- $subcommand {
1962
browser -
1963
blame {
1964 1965
	set subcommand_args {rev? path}
	if {$argv eq {}} usage
1966
	set head {}
1967 1968 1969 1970 1971
	set path {}
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
1972
			set path $_prefix$a
1973 1974 1975
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
1976 1977
				if {$head ne {}} usage
				set head $path
1978 1979 1980
				set path {}
			}
			set is_path 1
1981 1982 1983
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
1984
			set is_path 1
1985 1986 1987 1988 1989 1990
		} else {
			usage
		}
	}
	unset is_path

1991 1992 1993 1994 1995
	if {$head ne {} && $path eq {}} {
		set path $_prefix$head
		set head {}
	}

1996
	if {$head eq {}} {
1997
		load_current_branch
1998
	} else {
1999 2000 2001 2002 2003 2004 2005 2006
		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
			if {[catch {
					set head [git rev-parse --verify $head]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
2007
		set current_branch $head
2008
	}
2009

2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028
	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
	}
2029
	}
2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042
	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
2043 2044
}
default {
2045
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2046 2047 2048 2049
	exit 1
}
}

2050 2051 2052 2053 2054 2055 2056 2057
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
2058
	-justify left
2059 2060 2061
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
2062
	-justify left
2063 2064 2065 2066
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
2067
# -- Main Window Layout
2068
#
S
Shawn O. Pearce 已提交
2069 2070
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
2071
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
2072 2073 2074
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
2075
#
2076
frame .vpane.files.index -height 100 -width 200
2077
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
2078
	-background lightgreen
S
Shawn O. Pearce 已提交
2079
text $ui_index -background white -borderwidth 0 \
2080
	-width 20 -height 10 \
2081
	-wrap none \
2082
	-cursor $cursor_ptr \
2083 2084
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
2085
	-state disabled
2086 2087
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 已提交
2088
pack .vpane.files.index.title -side top -fill x
2089 2090
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
2091 2092 2093
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

2094
# -- Working Directory File List
2095
#
2096
frame .vpane.files.workdir -height 100 -width 200
2097
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
2098
	-background lightsalmon
2099
text $ui_workdir -background white -borderwidth 0 \
2100
	-width 20 -height 10 \
2101
	-wrap none \
2102
	-cursor $cursor_ptr \
2103 2104
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
2105
	-state disabled
2106 2107
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2108
pack .vpane.files.workdir.title -side top -fill x
2109 2110
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
2111 2112
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
2113

2114
foreach i [list $ui_index $ui_workdir] {
2115 2116
	$i tag conf in_diff -background lightgray
	$i tag conf in_sel  -background lightgray
2117 2118
}
unset i
2119

2120
# -- Diff and Commit Area
2121
#
2122
frame .vpane.lower -height 300 -width 400
2123 2124 2125 2126
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
2127
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
2128 2129

# -- Commit Area Buttons
2130
#
2131 2132
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
2133
	-anchor w \
2134
	-justify left
2135 2136
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
2137

2138
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2139
	-command do_rescan
2140
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2141 2142
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
2143

2144
button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \
2145
	-command do_add_all
2146
pack .vpane.lower.commarea.buttons.incall -side top -fill x
2147 2148
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
2149

2150
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2151
	-command do_signoff
2152
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2153

2154
button .vpane.lower.commarea.buttons.commit -text {Commit} \
2155
	-command do_commit
2156
pack .vpane.lower.commarea.buttons.commit -side top -fill x
2157 2158
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
2159

2160 2161 2162 2163
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 已提交
2164
# -- Commit Message Buffer
2165
#
2166
frame .vpane.lower.commarea.buffer
2167
frame .vpane.lower.commarea.buffer.header
2168
set ui_comm .vpane.lower.commarea.buffer.t
2169 2170 2171 2172 2173
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 \
2174
	-value new
2175 2176 2177 2178 2179 2180
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 \
2181
	-value amend
2182 2183
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
2184
label $ui_coml \
S
Shawn O. Pearce 已提交
2185
	-anchor w \
2186
	-justify left
2187 2188 2189 2190 2191 2192
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:}}
2193
	amend-merge   {set txt {Amended Merge Commit Message:}}
2194 2195 2196 2197 2198 2199
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
2200 2201 2202 2203
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 已提交
2204
text $ui_comm -background white -borderwidth 1 \
2205
	-undo true \
2206
	-maxundo 20 \
2207
	-autoseparators true \
S
Shawn O. Pearce 已提交
2208
	-relief sunken \
2209
	-width 75 -height 9 -wrap none \
2210
	-font font_diff \
2211
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2212 2213
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
2214
pack .vpane.lower.commarea.buffer.header -side top -fill x
2215
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
2216
pack $ui_comm -side left -fill y
2217 2218
pack .vpane.lower.commarea.buffer -side left -fill y

2219 2220
# -- Commit Message Buffer Context Menu
#
2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237
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} \
2238
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2239 2240 2241
$ctxm add command \
	-label {Copy All} \
	-command {
2242 2243 2244
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
2245 2246 2247 2248
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
2249
	-command do_signoff
2250
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2251

2252
# -- Diff Header
2253
#
2254 2255 2256
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
2257 2258 2259 2260 2261
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
2262
		set p $current_diff_path
2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275
		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
	}
}
2276
trace add variable current_diff_path write trace_current_diff_path
2277

2278
frame .vpane.lower.diff.header -background gold
2279
label .vpane.lower.diff.header.status \
2280
	-background gold \
2281 2282
	-width $max_status_desc \
	-anchor w \
2283
	-justify left
2284
label .vpane.lower.diff.header.file \
2285
	-background gold \
2286
	-anchor w \
2287
	-justify left
2288
label .vpane.lower.diff.header.path \
2289
	-background gold \
2290
	-anchor w \
2291
	-justify left
2292 2293 2294 2295 2296 2297 2298
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} \
2299 2300 2301 2302 2303
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
2304
			-- $current_diff_path
2305
	}
2306 2307
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2308 2309

# -- Diff Body
2310
#
2311 2312 2313 2314
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 \
2315
	-font font_diff \
2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328
	-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

2329
$ui_diff tag conf d_cr -elide true
2330 2331
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
2332 2333
$ui_diff tag conf d_- -foreground red

2334
$ui_diff tag conf d_++ -foreground {#00a000}
2335 2336
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
2337 2338
	-foreground {#00a000} \
	-background {#e2effa}
2339 2340
$ui_diff tag conf d_-s \
	-foreground red \
2341
	-background {#e2effa}
2342
$ui_diff tag conf d_s+ \
2343 2344
	-foreground {#00a000} \
	-background ivory1
2345 2346
$ui_diff tag conf d_s- \
	-foreground red \
2347
	-background ivory1
2348 2349 2350 2351 2352 2353 2354 2355 2356 2357

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

2359 2360
$ui_diff tag raise sel

2361 2362
# -- Diff Body Context Menu
#
2363 2364
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
2365 2366 2367
$ctxm add command \
	-label {Refresh} \
	-command reshow_diff
2368
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2369 2370 2371 2372 2373 2374
$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} \
2375
	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2376 2377 2378 2379
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
	-command {
2380 2381 2382
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
2383 2384 2385
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
2386 2387 2388 2389 2390 2391
$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
2392 2393
$ctxm add command \
	-label {Decrease Font Size} \
2394
	-command {incr_font_size font_diff -1}
2395 2396 2397
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
2398
	-command {incr_font_size font_diff 1}
2399 2400 2401 2402
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
2403
	-command {if {$repo_config(gui.diffcontext) >= 1} {
2404 2405 2406
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
2407 2408 2409
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
2410
	-command {if {$repo_config(gui.diffcontext) < 99} {
2411 2412
		incr repo_config(gui.diffcontext)
		reshow_diff
2413
	}}
2414 2415 2416
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
2417
	-command do_options
2418
proc popup_diff_menu {ctxm x y X Y} {
2419
	global current_diff_path
2420 2421 2422 2423
	set ::cursorX $x
	set ::cursorY $y
	if {$::ui_index eq $::current_diff_side} {
		$ctxm entryconf $::ui_diff_applyhunk \
2424
			-state normal \
2425
			-label {Unstage Hunk From Commit}
2426 2427
	} elseif {![info exists file_states($current_diff_path)]
		|| {_O} eq [lindex $file_states($::current_diff_path) 0]} {
2428 2429 2430
		$ctxm entryconf $::ui_diff_applyhunk \
			-state disabled \
			-label {Stage Hunk For Commit}
2431
	} else {
2432
		$ctxm entryconf $::ui_diff_applyhunk \
2433
			-state normal \
2434
			-label {Stage Hunk For Commit}
2435
	}
2436 2437 2438
	tk_popup $ctxm $X $Y
}
bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
2439

S
Shawn O. Pearce 已提交
2440
# -- Status Bar
2441
#
2442
set main_status [::status_bar::new .status]
S
Shawn O. Pearce 已提交
2443
pack .status -anchor w -side bottom -fill x
2444
$main_status show {Initializing...}
S
Shawn O. Pearce 已提交
2445

2446
# -- Load geometry
2447
#
2448
catch {
2449
set gm $repo_config(gui.geometry)
2450 2451 2452 2453 2454 2455 2456 2457
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
2458
}
2459

S
Shawn O. Pearce 已提交
2460
# -- Key Bindings
2461
#
2462
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2463 2464
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481
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}
2482 2483 2484 2485
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}
2486 2487 2488 2489 2490 2491
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}
2492
bind $ui_diff <Button-1>   {focus %W}
2493

2494
if {[is_enabled branch]} {
2495 2496
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
2497 2498
	bind . <$M1B-Key-o> branch_checkout::dialog
	bind . <$M1B-Key-O> branch_checkout::dialog
2499 2500
	bind . <$M1B-Key-m> merge::dialog
	bind . <$M1B-Key-M> merge::dialog
2501
}
2502 2503 2504 2505
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
2506

2507 2508 2509
bind .   <Key-F5>     do_rescan
bind .   <$M1B-Key-r> do_rescan
bind .   <$M1B-Key-R> do_rescan
2510 2511
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
2512 2513
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
2514
bind .   <$M1B-Key-Return> do_commit
2515
foreach i [list $ui_index $ui_workdir] {
2516 2517 2518
	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 已提交
2519
}
2520 2521 2522
unset i

set file_lists($ui_index) [list]
2523
set file_lists($ui_workdir) [list]
2524

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

2528 2529 2530
# -- 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.
2531
#
2532
if {[is_Cygwin]} {
2533 2534 2535 2536 2537 2538
	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
2539
by [appname]:
2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582

"
	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
}

2583 2584
# -- Only initialize complex UI if we are going to stay running.
#
2585
if {[is_enabled transport]} {
2586
	load_all_remotes
2587

2588 2589
	populate_fetch_menu
	populate_push_menu
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 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644
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
}

2645
lock_index begin-read
2646 2647 2648
if {![winfo ismapped .]} {
	wm deiconify .
}
2649
after 1 do_rescan
2650 2651 2652
if {[is_enabled multicommit]} {
	after 1000 hint_gc
}