git-gui.sh 62.3 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 157 158 159
proc reponame {} {
	global _reponame
	return $_reponame
}
160

161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192
proc is_MacOSX {} {
	global tcl_platform tk_library
	if {[tk windowingsystem] eq {aqua}} {
		return 1
	}
	return 0
}

proc is_Windows {} {
	global tcl_platform
	if {$tcl_platform(platform) eq {windows}} {
		return 1
	}
	return 0
}

proc is_Cygwin {} {
	global tcl_platform _iscygwin
	if {$_iscygwin eq {}} {
		if {$tcl_platform(platform) eq {windows}} {
			if {[catch {set p [exec cygpath --windir]} err]} {
				set _iscygwin 0
			} else {
				set _iscygwin 1
			}
		} else {
			set _iscygwin 0
		}
	}
	return $_iscygwin
}

193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208
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
}

209 210 211 212
######################################################################
##
## config

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

223 224 225 226 227 228 229 230 231 232 233
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
	}
}

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

243
proc load_config {include_global} {
244 245 246
	global repo_config global_config default_config

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

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

278 279 280 281 282 283 284
	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)
		}
285 286 287
	}
}

288 289 290 291
######################################################################
##
## handy utils

292 293 294 295 296
proc _git_cmd {name} {
	global _git_cmd_path

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

		set p [gitexec git-$name$::_search_exe]
		if {[file exists $p]} {
			set v [list $p]
305 306 307 308
		} 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.
309
			#
310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329
			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]
330
		} else {
331 332 333 334
			# Assume it is builtin to git somehow and we
			# aren't actually able to see a file for it.
			#
			set v [list $::_git $name]
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 367 368 369
		}
		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 {}
}

370
proc git {args} {
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
	set opt [list exec]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
			global _nice
			if {$_nice ne {}} {
				lappend opt $_nice
			}
		}

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

397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419
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
		}
	}
	return $fd
}

420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447
proc git_read {args} {
	set opt [list |]

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
			global _nice
			if {$_nice ne {}} {
				lappend opt $_nice
			}
		}

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

448
	return [_open_stdout_stderr [concat $opt $cmdp $args]]
449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475
}

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

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
			global _nice
			if {$_nice ne {}} {
				lappend opt $_nice
			}
		}

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

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

483 484 485
proc load_current_branch {} {
	global current_branch is_detached

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

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

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

517 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
}
set _nice [_which nice]

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
regsub {-dirty$} $_git_version {} _git_version
548 549 550 551 552 553 554 555 556
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version

proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
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 595

	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]} {
596
	catch {wm withdraw .}
597 598 599 600 601
	error_popup "[appname] requires Git 1.5.0 or later.

You are using [git-version]:

[git --version]"
602 603 604
	exit 1
}

605 606 607 608
######################################################################
##
## repository setup

609 610 611 612 613 614 615 616
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]} {
617 618
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
619 620
	exit 1
}
621 622 623
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
	catch {set _gitdir [exec cygpath --unix $_gitdir]}
}
624
if {![file isdirectory $_gitdir]} {
625
	catch {wm withdraw .}
626
	error_popup "Git directory not found:\n\n$_gitdir"
627 628
	exit 1
}
629
if {[lindex [file split $_gitdir] end] ne {.git}} {
630
	catch {wm withdraw .}
631
	error_popup "Cannot use funny .git directory:\n\n$_gitdir"
632 633
	exit 1
}
634
if {[catch {cd [file dirname $_gitdir]} err]} {
635
	catch {wm withdraw .}
636
	error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
637
	exit 1
638
}
639 640
set _reponame [lindex [file split \
	[file normalize [file dirname $_gitdir]]] \
641
	end]
642

643 644 645 646 647 648 649 650 651 652 653 654 655 656
######################################################################
##
## 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 {}
657
set is_detached 0
658 659 660
set current_diff_path {}
set selected_commit_type new

S
Shawn O. Pearce 已提交
661 662
######################################################################
##
663
## task management
S
Shawn O. Pearce 已提交
664

665
set rescan_active 0
666
set diff_active 0
667
set last_clicked {}
668

669 670 671 672 673
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
674

675
	if {$index_lock_type eq {none}} {
676 677 678 679 680
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
681
	} elseif {$index_lock_type eq "begin-$type"} {
682
		set index_lock_type $type
683 684 685 686
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
687

688 689 690 691 692 693 694 695 696 697 698 699 700
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

701
proc repository_state {ctvar hdvar mhvar} {
702
	global current_branch
703 704 705
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
706

707
	load_current_branch
708
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
709
		set hd {}
710
		set ct initial
711 712 713
		return
	}

714
	set merge_head [gitdir MERGE_HEAD]
715
	if {[file exists $merge_head]} {
716
		set ct merge
717 718 719 720 721 722
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
723
	}
724 725

	set ct normal
726 727
}

728 729 730
proc PARENT {} {
	global PARENT empty_tree

731 732 733
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
734 735
	}
	if {$empty_tree eq {}} {
736
		set empty_tree [git mktree << {}]
737 738 739 740
	}
	return $empty_tree
}

741
proc rescan {after {honor_trustmtime 1}} {
742
	global HEAD PARENT MERGE_HEAD commit_type
743
	global ui_index ui_workdir ui_comm
744
	global rescan_active file_states
745
	global repo_config
S
Shawn O. Pearce 已提交
746

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

749
	repository_state newType newHEAD newMERGE_HEAD
750
	if {[string match amend* $commit_type]
751 752
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
753
	} else {
754 755 756 757
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
758 759
	}

S
Shawn O. Pearce 已提交
760 761
	array unset file_states

762
	if {![$ui_comm edit modified]
763
		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
764 765
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
766 767 768
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
769
		$ui_comm edit reset
770
		$ui_comm edit modified false
771 772
	}

773
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
774
		rescan_stage2 {} $after
775
	} else {
776
		set rescan_active 1
777
		ui_status {Refreshing file status...}
778 779 780 781 782 783
		set fd_rf [git_read update-index \
			-q \
			--unmerged \
			--ignore-missing \
			--refresh \
			]
784
		fconfigure $fd_rf -blocking 0 -translation binary
785
		fileevent $fd_rf readable \
786
			[list rescan_stage2 $fd_rf $after]
787
	}
788 789
}

790
proc rescan_stage2 {fd after} {
791
	global rescan_active buf_rdi buf_rdf buf_rlo
792

793
	if {$fd ne {}} {
794 795 796 797
		read $fd
		if {![eof $fd]} return
		close $fd
	}
798

799
	set ls_others [list --exclude-per-directory=.gitignore]
800
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
801 802 803 804
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}

805 806 807 808
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

809
	set rescan_active 3
810
	ui_status {Scanning for modified files ...}
811 812 813
	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 已提交
814

815 816 817
	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
818 819 820
	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 已提交
821 822
}

823
proc load_message {file} {
824
	global ui_comm
825

826
	set f [gitdir $file]
827
	if {[file isfile $f]} {
828 829 830
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
831
		set content [string trim [read $fd]]
832
		close $fd
833
		regsub -all -line {[ \r\t]+$} $content {} content
834 835 836 837 838 839 840
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

841
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
842 843 844
	global buf_rdi

	append buf_rdi [read $fd]
845 846 847 848 849 850 851 852 853 854
	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
855
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
856
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
857
		merge_state \
858
			[encoding convertfrom $p] \
859 860
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
861 862
			[list]
		set c $z2
863
		incr c
S
Shawn O. Pearce 已提交
864
	}
865 866 867 868 869 870
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

871
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
872 873
}

874
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
875 876 877
	global buf_rdf

	append buf_rdf [read $fd]
878 879 880 881 882 883 884 885 886 887
	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
888
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
889
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
890
		merge_state \
891
			[encoding convertfrom $p] \
892
			?[lindex $i 4] \
893
			[list] \
894
			[list [lindex $i 0] [lindex $i 2]]
895
		set c $z2
896
		incr c
897 898 899 900 901
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
902
	}
903

904
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
905 906
}

907
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
908 909 910 911 912 913
	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] {
914
		merge_state [encoding convertfrom $p] ?O
S
Shawn O. Pearce 已提交
915
	}
916
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
917 918
}

919
proc rescan_done {fd buf after} {
920
	global rescan_active current_diff_path
921
	global file_states repo_config
922
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
923

924 925 926
	if {![eof $fd]} return
	set to_clear {}
	close $fd
927
	if {[incr rescan_active -1] > 0} return
928

929
	prune_selection
930 931
	unlock_index
	display_all_files
932
	if {$current_diff_path ne {}} reshow_diff
933
	uplevel #0 $after
S
Shawn O. Pearce 已提交
934 935
}

936 937 938 939 940 941 942 943 944 945
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 已提交
946 947
######################################################################
##
948
## ui helpers
S
Shawn O. Pearce 已提交
949

950 951 952 953 954 955 956 957 958
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 已提交
959

960 961
proc mapdesc {state path} {
	global all_descs
962

963 964 965 966 967 968
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
969

970
proc ui_status {msg} {
971
	$::main_status show $msg
972 973 974
}

proc ui_ready {{test {}}} {
975
	$::main_status show {Ready.} $test
976 977
}

978 979 980 981
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
982 983
}

984 985
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
986 987
}

988 989
set next_icon_id 0
set null_sha1 [string repeat 0 40]
990

991 992
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
993

994 995
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
996

997 998 999 1000 1001 1002 1003 1004 1005
	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]}
	}
1006

1007 1008
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
1009

1010 1011
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
1012

1013 1014 1015 1016 1017 1018
	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
	}
1019

1020 1021 1022 1023 1024
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
1025

1026 1027
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
1028

1029
	if {$new_m eq {_}} {
1030
		set lno [lsearch -sorted -exact $file_lists($w) $path]
1031
		if {$lno >= 0} {
1032
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1033
			incr lno
1034 1035 1036
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
1037
		}
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053
	} 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
1054
	}
1055 1056 1057 1058 1059
}

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

1061
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
1062
	set s $file_states($path)
1063 1064
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
1065

1066 1067 1068 1069 1070 1071 1072
	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 已提交
1073
	}
1074
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
1075

1076 1077 1078 1079
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
1080
	}
1081 1082 1083 1084
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
1085
	}
1086 1087 1088 1089 1090
	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 已提交
1091
	}
1092
}
S
Shawn O. Pearce 已提交
1093

1094 1095 1096 1097 1098 1099 1100 1101 1102 1103
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 已提交
1104 1105
}

1106 1107 1108 1109
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
S
Shawn O. Pearce 已提交
1110

1111 1112
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
1113

1114 1115 1116
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
1117

1118 1119
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
1120

1121 1122 1123 1124 1125 1126 1127 1128 1129
	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
1130
		}
S
Shawn O. Pearce 已提交
1131

1132 1133 1134 1135
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
1136
		}
1137 1138 1139
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
1140 1141 1142
		}
	}

1143 1144
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
1145 1146
}

1147 1148
######################################################################
##
1149
## icons
1150

1151 1152 1153 1154 1155 1156 1157 1158
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 已提交
1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177

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

1178 1179 1180 1181
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 已提交
1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222
   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

1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247
set file_dir_data {
#define file_width 18
#define file_height 18
static unsigned char file_bits[] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
  0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
  0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
  0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
}
image create bitmap file_dir -background white -foreground blue \
	-data $file_dir_data -maskdata $file_dir_data
unset file_dir_data

set file_uplevel_data {
#define up_width 15
#define up_height 15
static unsigned char up_bits[] = {
  0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
  0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
  0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
}
image create bitmap file_uplevel -background white -foreground red \
	-data $file_uplevel_data -maskdata $file_uplevel_data
unset file_uplevel_data
1248

1249
set ui_index .vpane.files.index.list
1250
set ui_workdir .vpane.files.workdir.list
1251 1252 1253 1254 1255 1256 1257 1258 1259 1260

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
1261
set all_icons(U$ui_workdir) file_merge
1262 1263
set all_icons(O$ui_workdir) file_plain

1264
set max_status_desc 0
S
Shawn O. Pearce 已提交
1265
foreach i {
1266 1267
		{__ "Unmodified"}

1268 1269 1270 1271 1272 1273 1274 1275 1276
		{_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"}
1277 1278

		{_D "Missing"}
1279 1280
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
1281

1282
		{U_ "Requires merge resolution"}
1283
		{UU "Requires merge resolution"}
1284 1285
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
1286
	} {
1287 1288
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1289
	}
1290
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1291
}
1292
unset i
S
Shawn O. Pearce 已提交
1293 1294 1295 1296 1297

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

1298 1299 1300 1301 1302 1303 1304
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		bind $w <Control-Button-1> $cmd
	}
}

1305 1306 1307 1308 1309 1310 1311 1312 1313
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}
}

1314 1315 1316 1317 1318
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
1319
	font configure ${font}italic -size $sz
1320 1321
}

S
Shawn O. Pearce 已提交
1322 1323 1324 1325
######################################################################
##
## ui commands

1326
set starting_gitk_msg {Starting gitk... please wait...}
1327

1328
proc do_gitk {revs} {
1329 1330 1331
	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
1332 1333
	set exe [file join [file dirname $::_git] gitk]
	set cmd [list [info nameofexecutable] $exe]
1334 1335
	if {! [file exists $exe]} {
		error_popup "Unable to start gitk:\n\n$exe does not exist"
S
Shawn O. Pearce 已提交
1336
	} else {
1337 1338
		eval exec $cmd $revs &
		ui_status $::starting_gitk_msg
1339
		after 10000 {
1340
			ui_ready $starting_gitk_msg
1341
		}
S
Shawn O. Pearce 已提交
1342 1343 1344
	}
}

1345
set is_quitting 0
1346

S
Shawn O. Pearce 已提交
1347
proc do_quit {} {
1348
	global ui_comm is_quitting repo_config commit_type
1349

1350 1351
	if {$is_quitting} return
	set is_quitting 1
1352

1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
		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}
1369 1370
		}

1371 1372 1373 1374 1375 1376 1377 1378 1379 1380
		# -- 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} {
1381
			catch {git config gui.geometry $cfg_geometry}
1382
		}
1383 1384
	}

S
Shawn O. Pearce 已提交
1385 1386 1387 1388
	destroy .
}

proc do_rescan {} {
1389
	rescan ui_ready
S
Shawn O. Pearce 已提交
1390 1391
}

1392
proc do_commit {} {
1393
	commit_tree
1394 1395
}

1396
proc toggle_or_diff {w x y} {
1397
	global file_states file_lists current_diff_path ui_index ui_workdir
1398
	global last_clicked selected_paths
1399

S
Shawn O. Pearce 已提交
1400 1401 1402
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
1403 1404 1405 1406 1407 1408 1409 1410 1411
	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
1412
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
1413

1414
	if {$col == 0} {
1415
		if {$current_diff_path eq $path} {
1416 1417 1418 1419
			set after {reshow_diff;}
		} else {
			set after {}
		}
1420
		if {$w eq $ui_index} {
1421
			update_indexinfo \
1422
				"Unstaging [short_path $path] from commit" \
1423
				[list $path] \
1424
				[concat $after [list ui_ready]]
1425
		} elseif {$w eq $ui_workdir} {
1426
			update_index \
1427
				"Adding [short_path $path]" \
1428
				[list $path] \
1429
				[concat $after [list ui_ready]]
1430
		}
1431
	} else {
1432
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
1433 1434 1435
	}
}

1436
proc add_one_to_selection {w x y} {
1437
	global file_lists last_clicked selected_paths
1438

1439
	set lno [lindex [split [$w index @$x,$y] .] 0]
1440 1441 1442 1443 1444
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
1445

1446 1447 1448 1449 1450 1451
	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
	}

1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465
	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} {
1466
	global file_lists last_clicked selected_paths
1467 1468 1469 1470

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

1473
	set lno [lindex [split [$w index @$x,$y] .] 0]
1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488
	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 已提交
1489 1490 1491 1492
}

######################################################################
##
1493
## config defaults
S
Shawn O. Pearce 已提交
1494

1495
set cursor_ptr arrow
1496 1497 1498 1499 1500 1501 1502 1503
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
}

1504
font create font_uiitalic
1505 1506
font create font_uibold
font create font_diffbold
1507
font create font_diffitalic
S
Shawn O. Pearce 已提交
1508

1509 1510
foreach class {Button Checkbutton Entry Label
		Labelframe Listbox Menu Message
1511
		Radiobutton Spinbox Text} {
1512 1513 1514 1515
	option add *$class.font font_ui
}
unset class

1516 1517 1518 1519
if {[is_Windows] || [is_MacOSX]} {
	option add *Menu.tearOff 0
}

1520
if {[is_MacOSX]} {
1521 1522
	set M1B M1
	set M1T Cmd
1523
} else {
1524 1525
	set M1B Control
	set M1T Ctrl
1526 1527
}

1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542
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
1543
			font configure ${font}italic $cn $cv
1544 1545
		}
		font configure ${font}bold -weight bold
1546
		font configure ${font}italic -slant italic
1547 1548 1549
	}
}

1550
set default_config(merge.diffstat) true
1551
set default_config(merge.summary) false
1552
set default_config(merge.verbosity) 2
1553 1554 1555
set default_config(user.name) {}
set default_config(user.email) {}

1556
set default_config(gui.matchtrackingbranch) false
1557
set default_config(gui.pruneduringfetch) false
1558
set default_config(gui.trustmtime) false
1559
set default_config(gui.diffcontext) 5
1560
set default_config(gui.newbranchtemplate) {}
1561 1562 1563 1564 1565 1566
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}}
}
1567
load_config 0
1568 1569
apply_config

1570 1571 1572 1573
######################################################################
##
## feature option selection

1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586
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]
}

1587 1588 1589 1590
enable_option multicommit
enable_option branch
enable_option transport

1591
switch -- $subcommand {
1592
browser -
1593
blame {
1594 1595 1596 1597
	disable_option multicommit
	disable_option branch
	disable_option transport
}
1598 1599
citool {
	enable_option singlecommit
1600 1601 1602 1603 1604 1605 1606

	disable_option multicommit
	disable_option branch
	disable_option transport
}
}

1607 1608 1609 1610
######################################################################
##
## ui construction

1611 1612
set ui_comm {}

S
Shawn O. Pearce 已提交
1613
# -- Menu Bar
1614
#
1615
menu .mbar -tearoff 0
1616 1617
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
1618
if {[is_enabled branch]} {
1619
	.mbar add cascade -label Branch -menu .mbar.branch
S
Shawn O. Pearce 已提交
1620
}
1621
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1622
	.mbar add cascade -label Commit -menu .mbar.commit
1623
}
1624
if {[is_enabled transport]} {
1625 1626 1627
	.mbar add cascade -label Merge -menu .mbar.merge
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Push -menu .mbar.push
1628
}
S
Shawn O. Pearce 已提交
1629 1630
. configure -menu .mbar

1631
# -- Repository Menu
1632
#
1633
menu .mbar.repository
1634 1635 1636

.mbar.repository add command \
	-label {Browse Current Branch} \
1637
	-command {browser::new $current_branch}
1638
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1639 1640
.mbar.repository add separator

1641 1642
.mbar.repository add command \
	-label {Visualize Current Branch} \
1643
	-command {do_gitk $current_branch}
1644
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1645 1646
.mbar.repository add command \
	-label {Visualize All Branches} \
1647
	-command {do_gitk --all}
1648
.mbar.repository add separator
1649

1650
if {[is_enabled multicommit]} {
1651
	.mbar.repository add command -label {Database Statistics} \
1652
		-command do_stats
1653

1654
	.mbar.repository add command -label {Compress Database} \
1655
		-command do_gc
1656

1657
	.mbar.repository add command -label {Verify Database} \
1658
		-command do_fsck_objects
1659

1660
	.mbar.repository add separator
1661

1662 1663 1664
	if {[is_Cygwin]} {
		.mbar.repository add command \
			-label {Create Desktop Icon} \
1665
			-command do_cygwin_shortcut
1666
	} elseif {[is_Windows]} {
1667
		.mbar.repository add command \
1668
			-label {Create Desktop Icon} \
1669
			-command do_windows_shortcut
1670
	} elseif {[is_MacOSX]} {
1671
		.mbar.repository add command \
1672
			-label {Create Desktop Icon} \
1673
			-command do_macosx_app
1674
	}
1675
}
1676

1677
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
1678
	-command do_quit \
1679
	-accelerator $M1T-Q
S
Shawn O. Pearce 已提交
1680

1681 1682 1683 1684 1685
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
1686
	-accelerator $M1T-Z
1687 1688
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
1689
	-accelerator $M1T-Y
1690 1691 1692
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
1693
	-accelerator $M1T-X
1694 1695
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
1696
	-accelerator $M1T-C
1697 1698
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
1699
	-accelerator $M1T-V
1700 1701
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
1702
	-accelerator Del
1703 1704 1705
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
1706
	-accelerator $M1T-A
1707

1708 1709
# -- Branch Menu
#
1710
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
1711 1712 1713
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
1714
		-command branch_create::dialog \
1715
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
1716 1717 1718
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

1719 1720 1721 1722 1723 1724
	.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]

1725 1726 1727 1728 1729
	.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 已提交
1730
	.mbar.branch add command -label {Delete...} \
1731
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
1732 1733
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
1734 1735

	.mbar.branch add command -label {Reset...} \
1736
		-command merge::reset_hard
1737 1738
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
1739 1740
}

S
Shawn O. Pearce 已提交
1741
# -- Commit Menu
1742
#
1743 1744 1745 1746 1747 1748 1749
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 \
1750
		-value new
1751 1752
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1753

1754 1755 1756 1757
	.mbar.commit add radiobutton \
		-label {Amend Last Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1758
		-value amend
1759 1760
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1761

1762
	.mbar.commit add separator
1763

1764 1765
	.mbar.commit add command -label Rescan \
		-command do_rescan \
1766
		-accelerator F5
1767 1768
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1769

1770
	.mbar.commit add command -label {Add To Commit} \
1771
		-command do_add_selection
1772 1773
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1774

1775
	.mbar.commit add command -label {Add Existing To Commit} \
1776
		-command do_add_all \
1777
		-accelerator $M1T-I
1778 1779
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1780

1781
	.mbar.commit add command -label {Unstage From Commit} \
1782
		-command do_unstage_selection
1783 1784
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1785

1786
	.mbar.commit add command -label {Revert Changes} \
1787
		-command do_revert_selection
1788 1789
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1790

1791
	.mbar.commit add separator
1792

1793 1794
	.mbar.commit add command -label {Sign Off} \
		-command do_signoff \
1795
		-accelerator $M1T-S
1796

1797 1798
	.mbar.commit add command -label Commit \
		-command do_commit \
1799
		-accelerator $M1T-Return
1800 1801 1802
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
1803

1804 1805 1806 1807 1808
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
	.mbar.merge add command -label {Local Merge...} \
1809
		-command merge::dialog
1810 1811 1812
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
	.mbar.merge add command -label {Abort Merge...} \
1813
		-command merge::reset_hard
1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825
	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...} \
1826 1827
		-command do_push_anywhere \
		-accelerator $M1T-P
1828 1829
	.mbar.push add command -label {Delete...} \
		-command remote_branch_delete::dialog
1830 1831
}

S
Shawn O. Pearce 已提交
1832 1833 1834 1835 1836 1837
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

1838
	.mbar.apple add command -label "About [appname]" \
1839
		-command do_about
1840
	.mbar.apple add command -label "Options..." \
1841
		-command do_options
S
Shawn O. Pearce 已提交
1842 1843 1844 1845 1846
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
1847
		-command do_options
S
Shawn O. Pearce 已提交
1848

1849 1850
	# -- Tools Menu
	#
1851
	if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
1852 1853 1854 1855 1856 1857
	proc do_miga {} {
		if {![lock_index update]} return
		set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
		set miga_fd [open "|$cmd" r]
		fconfigure $miga_fd -blocking 0
		fileevent $miga_fd readable [list miga_done $miga_fd]
1858
		ui_status {Running miga...}
1859 1860 1861 1862 1863 1864
	}
	proc miga_done {fd} {
		read $fd 512
		if {[eof $fd]} {
			close $fd
			unlock_index
1865
			rescan ui_ready
1866 1867 1868 1869 1870
		}
	}
	.mbar add cascade -label Tools -menu .mbar.tools
	menu .mbar.tools
	.mbar.tools add command -label "Migrate" \
1871
		-command do_miga
1872 1873 1874
	lappend disable_on_lock \
		[list .mbar.tools entryconf [.mbar.tools index last] -state]
	}
1875
}
1876

1877 1878
# -- Help Menu
#
1879
.mbar add cascade -label Help -menu .mbar.help
1880
menu .mbar.help
S
Shawn O. Pearce 已提交
1881

1882
if {![is_MacOSX]} {
1883
	.mbar.help add command -label "About [appname]" \
1884
		-command do_about
S
Shawn O. Pearce 已提交
1885
}
S
Shawn O. Pearce 已提交
1886

1887 1888
set browser {}
catch {set browser $repo_config(instaweb.browser)}
1889
set doc_path [file dirname [gitexec]]
1890 1891
set doc_path [file join $doc_path Documentation index.html]

1892
if {[is_Cygwin]} {
1893
	set doc_path [exec cygpath --mixed $doc_path]
1894 1895 1896 1897 1898
}

if {$browser eq {}} {
	if {[is_MacOSX]} {
		set browser open
1899
	} elseif {[is_Cygwin]} {
1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920
		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} \
1921
		-command [list exec $browser $doc_url &]
1922 1923
}
unset browser doc_path doc_url
S
Shawn O. Pearce 已提交
1924

1925 1926
# -- Standard bindings
#
1927
wm protocol . WM_DELETE_WINDOW do_quit
1928 1929 1930 1931 1932
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]}

1933 1934 1935 1936 1937 1938
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

1939 1940
# -- Not a normal commit type invocation?  Do that instead!
#
1941
switch -- $subcommand {
1942
browser {
1943 1944
	set subcommand_args {rev?}
	switch [llength $argv] {
1945
	0 { load_current_branch }
1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957
	1 {
		set current_branch [lindex $argv 0]
		if {[regexp {^[0-9a-f]{1,39}$} $current_branch]} {
			if {[catch {
					set current_branch \
					[git rev-parse --verify $current_branch]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
	}
1958
	default usage
1959
	}
1960
	browser::new $current_branch
1961 1962
	return
}
1963
blame {
1964
	set subcommand_args {rev? path?}
1965
	set head {}
1966 1967 1968 1969 1970
	set path {}
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
1971
			set path $_prefix$a
1972 1973 1974
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
1975 1976
				if {$head ne {}} usage
				set head $path
1977 1978 1979
				set path {}
			}
			set is_path 1
1980 1981 1982
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
1983 1984 1985 1986 1987 1988
		} else {
			usage
		}
	}
	unset is_path

1989
	if {$head eq {}} {
1990
		load_current_branch
1991
	} else {
1992 1993 1994 1995 1996 1997 1998 1999
		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
			if {[catch {
					set head [git rev-parse --verify $head]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
2000
		set current_branch $head
2001
	}
2002 2003 2004

	if {$path eq {}} usage
	blame::new $head $path
2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017
	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
2018 2019
}
default {
2020
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2021 2022 2023 2024
	exit 1
}
}

2025 2026 2027 2028 2029 2030 2031 2032
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
2033
	-justify left
2034 2035 2036
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
2037
	-justify left
2038 2039 2040 2041
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
2042
# -- Main Window Layout
2043
#
S
Shawn O. Pearce 已提交
2044 2045
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
2046
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
2047 2048 2049
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
2050
#
2051
frame .vpane.files.index -height 100 -width 200
2052
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
2053
	-background lightgreen
S
Shawn O. Pearce 已提交
2054
text $ui_index -background white -borderwidth 0 \
2055
	-width 20 -height 10 \
2056
	-wrap none \
2057
	-cursor $cursor_ptr \
2058 2059
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
2060
	-state disabled
2061 2062
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 已提交
2063
pack .vpane.files.index.title -side top -fill x
2064 2065
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
2066 2067 2068
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

2069
# -- Working Directory File List
2070
#
2071
frame .vpane.files.workdir -height 100 -width 200
2072
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
2073
	-background lightsalmon
2074
text $ui_workdir -background white -borderwidth 0 \
2075
	-width 20 -height 10 \
2076
	-wrap none \
2077
	-cursor $cursor_ptr \
2078 2079
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
2080
	-state disabled
2081 2082
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2083
pack .vpane.files.workdir.title -side top -fill x
2084 2085
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
2086 2087
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
2088

2089
foreach i [list $ui_index $ui_workdir] {
2090 2091
	$i tag conf in_diff -background lightgray
	$i tag conf in_sel  -background lightgray
2092 2093
}
unset i
2094

2095
# -- Diff and Commit Area
2096
#
2097
frame .vpane.lower -height 300 -width 400
2098 2099 2100 2101
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
2102
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
2103 2104

# -- Commit Area Buttons
2105
#
2106 2107
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
2108
	-anchor w \
2109
	-justify left
2110 2111
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
2112

2113
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2114
	-command do_rescan
2115
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2116 2117
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
2118

2119
button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
2120
	-command do_add_all
2121
pack .vpane.lower.commarea.buttons.incall -side top -fill x
2122 2123
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
2124

2125
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2126
	-command do_signoff
2127
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2128

2129
button .vpane.lower.commarea.buttons.commit -text {Commit} \
2130
	-command do_commit
2131
pack .vpane.lower.commarea.buttons.commit -side top -fill x
2132 2133
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
2134

2135 2136 2137 2138
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 已提交
2139
# -- Commit Message Buffer
2140
#
2141
frame .vpane.lower.commarea.buffer
2142
frame .vpane.lower.commarea.buffer.header
2143
set ui_comm .vpane.lower.commarea.buffer.t
2144 2145 2146 2147 2148
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 \
2149
	-value new
2150 2151 2152 2153 2154 2155
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 \
2156
	-value amend
2157 2158
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
2159
label $ui_coml \
S
Shawn O. Pearce 已提交
2160
	-anchor w \
2161
	-justify left
2162 2163 2164 2165 2166 2167
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:}}
2168
	amend-merge   {set txt {Amended Merge Commit Message:}}
2169 2170 2171 2172 2173 2174
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
2175 2176 2177 2178
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 已提交
2179
text $ui_comm -background white -borderwidth 1 \
2180
	-undo true \
2181
	-maxundo 20 \
2182
	-autoseparators true \
S
Shawn O. Pearce 已提交
2183
	-relief sunken \
2184
	-width 75 -height 9 -wrap none \
2185
	-font font_diff \
2186
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2187 2188
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
2189
pack .vpane.lower.commarea.buffer.header -side top -fill x
2190
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
2191
pack $ui_comm -side left -fill y
2192 2193
pack .vpane.lower.commarea.buffer -side left -fill y

2194 2195
# -- Commit Message Buffer Context Menu
#
2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212
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} \
2213
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
2214 2215 2216
$ctxm add command \
	-label {Copy All} \
	-command {
2217 2218 2219
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
2220 2221 2222 2223
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
2224
	-command do_signoff
2225
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2226

2227
# -- Diff Header
2228
#
2229 2230 2231
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
2232 2233 2234 2235 2236
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
2237
		set p $current_diff_path
2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250
		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
	}
}
2251
trace add variable current_diff_path write trace_current_diff_path
2252

2253
frame .vpane.lower.diff.header -background gold
2254
label .vpane.lower.diff.header.status \
2255
	-background gold \
2256 2257
	-width $max_status_desc \
	-anchor w \
2258
	-justify left
2259
label .vpane.lower.diff.header.file \
2260
	-background gold \
2261
	-anchor w \
2262
	-justify left
2263
label .vpane.lower.diff.header.path \
2264
	-background gold \
2265
	-anchor w \
2266
	-justify left
2267 2268 2269 2270 2271 2272 2273
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} \
2274 2275 2276 2277 2278
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
2279
			-- $current_diff_path
2280
	}
2281 2282
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2283 2284

# -- Diff Body
2285
#
2286 2287 2288 2289
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 \
2290
	-font font_diff \
2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303
	-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

2304
$ui_diff tag conf d_cr -elide true
2305 2306
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
2307 2308
$ui_diff tag conf d_- -foreground red

2309
$ui_diff tag conf d_++ -foreground {#00a000}
2310 2311
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
2312 2313
	-foreground {#00a000} \
	-background {#e2effa}
2314 2315
$ui_diff tag conf d_-s \
	-foreground red \
2316
	-background {#e2effa}
2317
$ui_diff tag conf d_s+ \
2318 2319
	-foreground {#00a000} \
	-background ivory1
2320 2321
$ui_diff tag conf d_s- \
	-foreground red \
2322
	-background ivory1
2323 2324 2325 2326 2327 2328 2329 2330 2331 2332

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

2334 2335
$ui_diff tag raise sel

2336 2337
# -- Diff Body Context Menu
#
2338 2339
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
2340 2341 2342
$ctxm add command \
	-label {Refresh} \
	-command reshow_diff
2343
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2344 2345 2346 2347 2348 2349
$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} \
2350
	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2351 2352 2353 2354
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
	-command {
2355 2356 2357
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
2358 2359 2360
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
2361 2362 2363 2364 2365 2366
$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
2367 2368
$ctxm add command \
	-label {Decrease Font Size} \
2369
	-command {incr_font_size font_diff -1}
2370 2371 2372
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
2373
	-command {incr_font_size font_diff 1}
2374 2375 2376 2377
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
2378
	-command {if {$repo_config(gui.diffcontext) >= 1} {
2379 2380 2381
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
2382 2383 2384
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
2385
	-command {if {$repo_config(gui.diffcontext) < 99} {
2386 2387
		incr repo_config(gui.diffcontext)
		reshow_diff
2388
	}}
2389 2390 2391
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
2392
	-command do_options
2393 2394 2395 2396 2397 2398 2399 2400 2401 2402
bind_button3 $ui_diff "
	set cursorX %x
	set cursorY %y
	if {\$ui_index eq \$current_diff_side} {
		$ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
	} else {
		$ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
	}
	tk_popup $ctxm %X %Y
"
2403
unset ui_diff_applyhunk
2404

S
Shawn O. Pearce 已提交
2405
# -- Status Bar
2406
#
2407
set main_status [::status_bar::new .status]
S
Shawn O. Pearce 已提交
2408
pack .status -anchor w -side bottom -fill x
2409
$main_status show {Initializing...}
S
Shawn O. Pearce 已提交
2410

2411
# -- Load geometry
2412
#
2413
catch {
2414
set gm $repo_config(gui.geometry)
2415 2416 2417 2418 2419 2420 2421 2422
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
2423
}
2424

S
Shawn O. Pearce 已提交
2425
# -- Key Bindings
2426
#
2427
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2428 2429
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446
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}
2447 2448 2449 2450
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}
2451 2452 2453 2454 2455 2456
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}
2457
bind $ui_diff <Button-1>   {focus %W}
2458

2459
if {[is_enabled branch]} {
2460 2461
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
2462 2463
	bind . <$M1B-Key-o> branch_checkout::dialog
	bind . <$M1B-Key-O> branch_checkout::dialog
2464
}
2465 2466 2467 2468
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
2469

2470 2471 2472
bind .   <Key-F5>     do_rescan
bind .   <$M1B-Key-r> do_rescan
bind .   <$M1B-Key-R> do_rescan
2473 2474
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
2475 2476
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
2477
bind .   <$M1B-Key-Return> do_commit
2478
foreach i [list $ui_index $ui_workdir] {
2479 2480 2481
	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 已提交
2482
}
2483 2484 2485
unset i

set file_lists($ui_index) [list]
2486
set file_lists($ui_workdir) [list]
2487

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

2491 2492 2493
# -- 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.
2494
#
2495
if {[is_Cygwin]} {
2496 2497 2498 2499 2500 2501
	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
2502
by [appname]:
2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545

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

2546 2547
# -- Only initialize complex UI if we are going to stay running.
#
2548
if {[is_enabled transport]} {
2549
	load_all_remotes
2550

2551 2552
	populate_fetch_menu
	populate_push_menu
2553
}
2554

2555 2556
# -- Only suggest a gc run if we are going to stay running.
#
2557
if {[is_enabled multicommit]} {
2558 2559
	set object_limit 2000
	if {[is_Windows]} {set object_limit 200}
2560
	regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
2561 2562 2563 2564
	if {$objects_current >= $object_limit} {
		if {[ask_popup \
			"This repository currently has $objects_current loose objects.

2565
To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2566 2567 2568 2569 2570 2571 2572 2573

Compress the database now?"] eq yes} {
			do_gc
		}
	}
	unset object_limit _junk objects_current
}

2574
lock_index begin-read
2575
after 1 do_rescan