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

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

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

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

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

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

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

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

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

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

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

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

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

package require msgcat
94

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

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

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

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

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

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

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

140 141 142 143 144
proc appname {} {
	global _appname
	return $_appname
}

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

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

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

196
proc reponame {} {
197
	return $::_reponame
198
}
199

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

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

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

230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245
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
}

246 247 248 249
######################################################################
##
## config

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

261 262 263 264 265 266 267 268 269 270 271
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
	}
}

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

281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306
proc is_bare {} {
	global _isbare
	global _gitdir
	global _gitworktree

	if {$_isbare eq {}} {
		if {[catch {
			set _bare [git rev-parse --is-bare-repository]
			switch  -- $_bare {
			true { set _isbare 1 }
			false { set _isbare 0}
			default { throw }
			}
		}]} {
			if {[is_config_true core.bare]
				|| ($_gitworktree eq {}
					&& [lindex [file split $_gitdir] end] ne {.git})} {
				set _isbare 1
			} else {
				set _isbare 0
			}
		}
	}
	return $_isbare
}

307 308 309 310
######################################################################
##
## handy utils

311 312 313 314 315 316 317 318 319 320 321 322 323 324 325
proc _trace_exec {cmd} {
	if {!$::_trace} return
	set d {}
	foreach v $cmd {
		if {$d ne {}} {
			append d { }
		}
		if {[regexp {[ \t\r\n'"$?*]} $v]} {
			set v [sq $v]
		}
		append d $v
	}
	puts stderr $d
}

326 327 328 329 330
proc _git_cmd {name} {
	global _git_cmd_path

	if {[catch {set v $_git_cmd_path($name)}]} {
		switch -- $name {
331
		  version   -
332 333 334 335 336 337 338
		--version   -
		--exec-path { return [list $::_git $name] }
		}

		set p [gitexec git-$name$::_search_exe]
		if {[file exists $p]} {
			set v [list $p]
339 340 341 342
		} 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.
343
			#
344 345 346 347 348
			set p [gitexec git-$name]
			set f [open $p r]
			set s [gets $f]
			close $f

349
			switch -glob -- [lindex $s 0] {
350 351 352 353 354 355 356 357 358 359 360 361 362
			#!*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)"
			}
363
			set v [concat [list $interp] [lrange $s 1 end] [list $p]]
364
		} else {
365 366 367 368
			# Assume it is builtin to git somehow and we
			# aren't actually able to see a file for it.
			#
			set v [list $::_git $name]
369 370 371 372 373 374
		}
		set _git_cmd_path($name) $v
	}
	return $v
}

375
proc _which {what args} {
376 377 378
	global env _search_exe _search_path

	if {$_search_path eq {}} {
379
		if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
380 381 382 383 384 385 386
			set _search_path [split [exec cygpath \
				--windows \
				--path \
				--absolute \
				$env(PATH)] {;}]
			set _search_exe .exe
		} elseif {[is_Windows]} {
387 388 389
			set gitguidir [file dirname [info script]]
			regsub -all ";" $gitguidir "\\;" gitguidir
			set env(PATH) "$gitguidir;$env(PATH)"
390 391 392 393 394 395 396 397
			set _search_path [split $env(PATH) {;}]
			set _search_exe .exe
		} else {
			set _search_path [split $env(PATH) :]
			set _search_exe {}
		}
	}

398 399 400 401 402 403
	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
		set suffix {}
	} else {
		set suffix $_search_exe
	}

404
	foreach p $_search_path {
405
		set p [file join $p $what$suffix]
406 407 408 409 410 411 412
		if {[file exists $p]} {
			return [file normalize $p]
		}
	}
	return {}
}

413 414 415 416 417 418
proc _lappend_nice {cmd_var} {
	global _nice
	upvar $cmd_var cmd

	if {![info exists _nice]} {
		set _nice [_which nice]
419 420 421
		if {[catch {exec $_nice git version}]} {
			set _nice {}
		}
422 423 424 425 426 427
	}
	if {$_nice ne {}} {
		lappend cmd $_nice
	}
}

428
proc git {args} {
429
	set opt [list]
430 431 432 433

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

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

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

449 450 451 452 453 454
	_trace_exec [concat $opt $cmdp $args]
	set result [eval exec $opt $cmdp $args]
	if {$::_trace} {
		puts stderr "< $result"
	}
	return $result
455 456
}

457
proc _open_stdout_stderr {cmd} {
458
	_trace_exec $cmd
459
	if {[catch {
460
			set fd [open [concat [list | ] $cmd] r]
461 462 463 464 465 466 467 468 469 470
		} 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 \
471
				[list | ] \
472 473 474 475 476 477 478
				[lrange $cmd 0 end-1] \
				[list |& cat] \
				] r]
		} else {
			error $err
		}
	}
479
	fconfigure $fd -eofchar {}
480 481 482
	return $fd
}

483
proc git_read {args} {
484
	set opt [list]
485 486 487 488

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
489
			_lappend_nice opt
490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507
		}

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

508
	return [_open_stdout_stderr [concat $opt $cmdp $args]]
509 510 511
}

proc git_write {args} {
512
	set opt [list]
513 514 515 516

	while {1} {
		switch -- [lindex $args 0] {
		--nice {
517
			_lappend_nice opt
518 519 520 521 522 523 524 525 526 527 528 529 530 531
		}

		default {
			break
		}

		}

		set args [lrange $args 1 end]
	}

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

532 533
	_trace_exec [concat $opt $cmdp $args]
	return [open [concat [list | ] $opt $cmdp $args] w]
534 535
}

536 537 538 539
proc githook_read {hook_name args} {
	set pchook [gitdir hooks $hook_name]
	lappend args 2>@1

540
	# On Windows [file executable] might lie so we need to ask
541 542
	# the shell if the hook is executable.  Yes that's annoying.
	#
543
	if {[is_Windows]} {
544 545 546 547 548 549 550 551 552
		upvar #0 _sh interp
		if {![info exists interp]} {
			set interp [_which sh]
		}
		if {$interp eq {}} {
			error "hook execution requires sh (not in PATH)"
		}

		set scr {if test -x "$1";then exec "$@";fi}
553
		set sh_c [list $interp -c $scr $interp $pchook]
554 555 556 557
		return [_open_stdout_stderr [concat $sh_c $args]]
	}

	if {[file executable $pchook]} {
558
		return [_open_stdout_stderr [concat [list $pchook] $args]]
559 560 561 562 563
	}

	return {}
}

564 565 566 567 568 569 570 571 572 573 574 575 576 577
proc kill_file_process {fd} {
	set process [pid $fd]

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

578 579 580 581 582 583 584 585 586 587 588 589 590
proc gitattr {path attr default} {
	if {[catch {set r [git check-attr $attr -- $path]}]} {
		set r unspecified
	} else {
		set r [join [lrange [split $r :] 2 end] :]
		regsub {^ } $r {} r
	}
	if {$r eq {unspecified}} {
		return $default
	}
	return $r
}

591 592 593 594 595
proc sq {value} {
	regsub -all ' $value "'\\''" value
	return "'$value'"
}

596 597 598
proc load_current_branch {} {
	global current_branch is_detached

599
	set fd [open [gitdir HEAD] r]
600
	if {[gets $fd ref] < 1} {
601 602 603
		set ref {}
	}
	close $fd
604 605 606 607 608 609 610

	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.
		#
611 612
		set current_branch [string range $ref $len end]
		set is_detached 0
613 614 615
	} else {
		# Assume this is a detached head.
		#
616 617
		set current_branch HEAD
		set is_detached 1
618
	}
619 620
}

621 622 623 624 625 626 627 628 629
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
}

630 631 632 633 634 635 636 637 638 639
proc rmsel_tag {text} {
	$text tag conf sel \
		-background [$text cget -background] \
		-foreground [$text cget -foreground] \
		-borderwidth 0
	$text tag conf in_sel -background lightgray
	bind $text <Motion> break
	return $text
}

640 641 642 643 644 645
set root_exists 0
bind . <Visibility> {
	bind . <Visibility> {}
	set root_exists 1
}

646 647
if {[is_Windows]} {
	wm iconbitmap . -default $oguilib/git-gui.ico
648
	set ::tk::AlwaysShowSelection 1
649 650 651 652 653

	# Spoof an X11 display for SSH
	if {![info exists env(DISPLAY)]} {
		set env(DISPLAY) :9999
	}
654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675
} else {
	catch {
		image create photo gitlogo -width 16 -height 16

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

		wm iconphoto . -default gitlogo
	}
676 677
}

678 679 680 681 682 683
######################################################################
##
## config defaults

set cursor_ptr arrow
font create font_ui
684 685 686 687 688 689 690 691 692 693
if {[lsearch -exact [font names] TkDefaultFont] != -1} {
	eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
	eval [linsert [font actual TkFixedFont] 0 font create font_diff]
} else {
	font create font_diff -family Courier -size 10
	catch {
		label .dummy
		eval font configure font_ui [font actual [.dummy cget -font]]
		destroy .dummy
	}
694 695 696 697 698 699 700 701
}

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

foreach class {Button Checkbutton Entry Label
702
		Labelframe Listbox Message
703 704 705
		Radiobutton Spinbox Text} {
	option add *$class.font font_ui
}
706 707
if {![is_MacOSX]} {
	option add *Menu.font font_ui
708 709 710
	option add *Entry.borderWidth 1 startupFile
	option add *Entry.relief sunken startupFile
	option add *RadioButton.anchor w startupFile
711
}
712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742
unset class

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

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

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

proc apply_config {} {
	global repo_config font_descs

	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		if {[catch {
743
			set need_weight 1
744
			foreach {cn cv} $repo_config(gui.$name) {
745 746 747 748 749 750 751
				if {$cn eq {-weight}} {
					set need_weight 0
				}
				font configure $font $cn $cv
			}
			if {$need_weight} {
				font configure $font -weight normal
752 753 754 755 756 757 758 759 760 761 762
			}
			} err]} {
			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
		}
		foreach {cn cv} [font configure $font] {
			font configure ${font}bold $cn $cv
			font configure ${font}italic $cn $cv
		}
		font configure ${font}bold -weight bold
		font configure ${font}italic -slant italic
	}
763 764 765 766 767 768 769 770 771 772 773 774

	global use_ttk NS
	set use_ttk 0
	set NS {}
	if {$repo_config(gui.usettk)} {
		set use_ttk [package vsatisfies [package provide Tk] 8.5]
		if {$use_ttk} {
			set NS ttk
			bind [winfo class .] <<ThemeChanged>> [list InitTheme]
			pave_toplevel .
		}
	}
775 776
}

777
set default_config(branch.autosetupmerge) true
778
set default_config(merge.tool) {}
779
set default_config(mergetool.keepbackup) true
780 781 782 783 784 785
set default_config(merge.diffstat) true
set default_config(merge.summary) false
set default_config(merge.verbosity) 2
set default_config(user.name) {}
set default_config(user.email) {}

786
set default_config(gui.encoding) [encoding system]
787 788 789
set default_config(gui.matchtrackingbranch) false
set default_config(gui.pruneduringfetch) false
set default_config(gui.trustmtime) false
790 791
set default_config(gui.fastcopyblame) false
set default_config(gui.copyblamethreshold) 40
792
set default_config(gui.blamehistoryctx) 7
793
set default_config(gui.diffcontext) 5
794
set default_config(gui.commitmsgwidth) 75
795
set default_config(gui.newbranchtemplate) {}
796
set default_config(gui.spellingdictionary) {}
797 798
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
799 800
# TODO: this option should be added to the git-config documentation
set default_config(gui.maxfilesdisplayed) 5000
801
set default_config(gui.usettk) 1
802 803 804 805 806
set font_descs {
	{fontui   font_ui   {mc "Main Font"}}
	{fontdiff font_diff {mc "Diff/Console Font"}}
}

807 808 809 810 811 812 813
######################################################################
##
## find git

set _git  [_which git]
if {$_git eq {}} {
	catch {wm withdraw .}
814 815 816 817 818
	tk_messageBox \
		-icon error \
		-type ok \
		-title [mc "git-gui: fatal error"] \
		-message [mc "Cannot find git in PATH."]
819 820 821
	exit 1
}

822 823 824 825
######################################################################
##
## version check

826
if {[catch {set _git_version [git --version]} err]} {
827
	catch {wm withdraw .}
828 829 830
	tk_messageBox \
		-icon error \
		-type ok \
831
		-title [mc "git-gui: fatal error"] \
832
		-message "Cannot determine Git version:
833 834 835

$err

836 837 838 839 840
[appname] requires Git 1.5.0 or later."
	exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
	catch {wm withdraw .}
841 842 843
	tk_messageBox \
		-icon error \
		-type ok \
844
		-title [mc "git-gui: fatal error"] \
845
		-message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
846 847
	exit 1
}
848 849

set _real_git_version $_git_version
850
regsub -- {[\-\.]dirty$} $_git_version {} _git_version
851
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
852
regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
853
regsub {\.GIT$} $_git_version {} _git_version
854
regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
855

856 857 858 859 860 861 862
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
	catch {wm withdraw .}
	if {[tk_messageBox \
		-icon warning \
		-type yesno \
		-default no \
		-title "[appname]: warning" \
863
		 -message [mc "Git version cannot be determined.
864

865
%s claims it is version '%s'.
866

867
%s requires at least Git 1.5.0 or later.
868

869 870
Assume '%s' is version 1.5.0?
" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
871 872 873 874 875 876 877
		set _git_version 1.5.0
	} else {
		exit 1
	}
}
unset _real_git_version

878 879 880 881 882 883
proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
884
	}
885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922

	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]} {
923
	catch {wm withdraw .}
924 925 926
	tk_messageBox \
		-icon error \
		-type ok \
927
		-title [mc "git-gui: fatal error"] \
928
		-message "[appname] requires Git 1.5.0 or later.
929 930 931 932

You are using [git-version]:

[git --version]"
933 934 935
	exit 1
}

936 937 938 939 940 941 942 943 944 945
######################################################################
##
## configure our library

set idx [file join $oguilib tclIndex]
if {[catch {set fd [open $idx r]} err]} {
	catch {wm withdraw .}
	tk_messageBox \
		-icon error \
		-type ok \
946
		-title [mc "git-gui: fatal error"] \
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972
		-message $err
	exit 1
}
if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
	set idx [list]
	while {[gets $fd n] >= 0} {
		if {$n ne {} && ![string match #* $n]} {
			lappend idx $n
		}
	}
} else {
	set idx {}
}
close $fd

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

975
######################################################################
976 977 978
##
## config file parsing

979
git-version proc _parse_config {arr_name args} {
980 981 982 983 984
	>= 1.5.3 {
		upvar $arr_name arr
		array unset arr
		set buf {}
		catch {
985 986 987 988
			set fd_rc [eval \
				[list git_read config] \
				$args \
				[list --null --list]]
989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002
			fconfigure $fd_rc -translation binary
			set buf [read $fd_rc]
			close $fd_rc
		}
		foreach line [split $buf "\0"] {
			if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
				if {[is_many_config $name]} {
					lappend arr($name) $value
				} else {
					set arr($name) $value
				}
			}
		}
	}
1003 1004 1005
	default {
		upvar $arr_name arr
		array unset arr
1006
		catch {
1007
			set fd_rc [eval [list git_read config --list] $args]
1008 1009 1010
			while {[gets $fd_rc line] >= 0} {
				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
					if {[is_many_config $name]} {
1011
						lappend arr($name) $value
1012
					} else {
1013
						set arr($name) $value
1014 1015 1016 1017 1018 1019
					}
				}
			}
			close $fd_rc
		}
	}
1020
}
1021

1022
proc load_config {include_global} {
1023
	global repo_config global_config system_config default_config
1024 1025

	if {$include_global} {
1026
		_parse_config system_config --system
1027
		_parse_config global_config --global
1028
	}
1029
	_parse_config repo_config
1030 1031

	foreach name [array names default_config] {
1032 1033 1034 1035 1036
		if {[catch {set v $system_config($name)}]} {
			set system_config($name) $default_config($name)
		}
	}
	foreach name [array names system_config] {
1037
		if {[catch {set v $global_config($name)}]} {
1038
			set global_config($name) $system_config($name)
1039 1040
		}
		if {[catch {set v $repo_config($name)}]} {
1041
			set repo_config($name) $system_config($name)
1042 1043 1044 1045 1046
		}
	}
}

######################################################################
1047 1048 1049
##
## feature option selection

1050
if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065
	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
1066
disable_option bare
1067 1068 1069 1070

switch -- $subcommand {
browser -
blame {
1071 1072
	enable_option bare

1073 1074 1075 1076 1077 1078
	disable_option multicommit
	disable_option branch
	disable_option transport
}
citool {
	enable_option singlecommit
1079
	enable_option retcode
1080 1081 1082 1083

	disable_option multicommit
	disable_option branch
	disable_option transport
1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104

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

		set argv [lrange $argv 1 end]
	}
1105 1106 1107
}
}

1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118
######################################################################
##
## execution environment

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

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

1119 1120 1121 1122
######################################################################
##
## repository setup

1123
set picked 0
1124 1125 1126 1127 1128
if {[catch {
		set _gitdir $env(GIT_DIR)
		set _prefix {}
		}]
	&& [catch {
1129 1130
		# beware that from the .git dir this sets _gitdir to .
		# and _prefix to the empty string
1131 1132 1133
		set _gitdir [git rev-parse --git-dir]
		set _prefix [git rev-parse --show-prefix]
	} err]} {
1134 1135 1136
	load_config 1
	apply_config
	choose_repository::pick
1137
	set picked 1
1138
}
1139 1140 1141 1142 1143 1144 1145 1146

# we expand the _gitdir when it's just a single dot (i.e. when we're being
# run from the .git dir itself) lest the routines to find the worktree
# get confused
if {$_gitdir eq "."} {
	set _gitdir [pwd]
}

1147
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1148
	catch {set _gitdir [exec cygpath --windows $_gitdir]}
1149
}
1150
if {![file isdirectory $_gitdir]} {
1151
	catch {wm withdraw .}
1152
	error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1153 1154
	exit 1
}
1155 1156 1157 1158 1159 1160
# _gitdir exists, so try loading the config
load_config 0
apply_config
# try to set work tree from environment, falling back to core.worktree
if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
	set _gitworktree [get_config core.worktree]
1161 1162 1163
	if {$_gitworktree eq ""} {
		set _gitworktree [file dirname [file normalize $_gitdir]]
	}
1164
}
1165
if {$_prefix ne {}} {
1166 1167 1168 1169 1170
	if {$_gitworktree eq {}} {
		regsub -all {[^/]+/} $_prefix ../ cdup
	} else {
		set cdup $_gitworktree
	}
1171 1172
	if {[catch {cd $cdup} err]} {
		catch {wm withdraw .}
1173
		error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1174 1175
		exit 1
	}
1176
	set _gitworktree [pwd]
1177 1178
	unset cdup
} elseif {![is_enabled bare]} {
1179
	if {[is_bare]} {
1180
		catch {wm withdraw .}
1181
		error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1182 1183
		exit 1
	}
1184 1185 1186 1187
	if {$_gitworktree eq {}} {
		set _gitworktree [file dirname $_gitdir]
	}
	if {[catch {cd $_gitworktree} err]} {
1188
		catch {wm withdraw .}
1189
		error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1190 1191
		exit 1
	}
1192
	set _gitworktree [pwd]
1193
}
1194 1195 1196 1197 1198
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]
1199 1200
}

1201 1202 1203
set env(GIT_DIR) $_gitdir
set env(GIT_WORK_TREE) $_gitworktree

1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217
######################################################################
##
## 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 {}
1218
set is_detached 0
1219
set current_diff_path {}
1220
set is_3way_diff 0
1221
set is_submodule_diff 0
1222
set is_conflict_diff 0
1223
set selected_commit_type new
1224
set diff_empty_count 0
1225

1226 1227 1228
set nullid "0000000000000000000000000000000000000000"
set nullid2 "0000000000000000000000000000000000000001"

S
Shawn O. Pearce 已提交
1229 1230
######################################################################
##
1231
## task management
S
Shawn O. Pearce 已提交
1232

1233
set rescan_active 0
1234
set diff_active 0
1235
set last_clicked {}
1236

1237 1238 1239 1240 1241
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
1242

1243
	if {$index_lock_type eq {none}} {
1244 1245 1246 1247 1248
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
1249
	} elseif {$index_lock_type eq "begin-$type"} {
1250
		set index_lock_type $type
1251 1252 1253 1254
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
1255

1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268
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

1269
proc repository_state {ctvar hdvar mhvar} {
1270
	global current_branch
1271 1272 1273
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
1274

1275
	load_current_branch
1276
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1277
		set hd {}
1278
		set ct initial
1279 1280 1281
		return
	}

1282
	set merge_head [gitdir MERGE_HEAD]
1283
	if {[file exists $merge_head]} {
1284
		set ct merge
1285 1286 1287 1288 1289 1290
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
1291
	}
1292 1293

	set ct normal
1294 1295
}

1296 1297 1298
proc PARENT {} {
	global PARENT empty_tree

1299 1300 1301
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
1302 1303
	}
	if {$empty_tree eq {}} {
1304
		set empty_tree [git mktree << {}]
1305 1306 1307 1308
	}
	return $empty_tree
}

1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322
proc force_amend {} {
	global selected_commit_type
	global HEAD PARENT MERGE_HEAD commit_type

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

	set selected_commit_type amend
	do_select_commit_type
}

1323
proc rescan {after {honor_trustmtime 1}} {
1324
	global HEAD PARENT MERGE_HEAD commit_type
1325
	global ui_index ui_workdir ui_comm
1326
	global rescan_active file_states
1327
	global repo_config
S
Shawn O. Pearce 已提交
1328

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

1331
	repository_state newType newHEAD newMERGE_HEAD
1332
	if {[string match amend* $commit_type]
1333 1334
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
1335
	} else {
1336 1337 1338 1339
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
1340 1341
	}

S
Shawn O. Pearce 已提交
1342 1343
	array unset file_states

1344 1345 1346
	if {!$::GITGUI_BCK_exists &&
		(![$ui_comm edit modified]
		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
1347 1348
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
1349
		} elseif {[run_prepare_commit_msg_hook]} {
1350 1351 1352
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
1353
		$ui_comm edit reset
1354
		$ui_comm edit modified false
1355 1356
	}

1357
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1358
		rescan_stage2 {} $after
1359
	} else {
1360
		set rescan_active 1
1361
		ui_status [mc "Refreshing file status..."]
1362 1363 1364 1365 1366 1367
		set fd_rf [git_read update-index \
			-q \
			--unmerged \
			--ignore-missing \
			--refresh \
			]
1368
		fconfigure $fd_rf -blocking 0 -translation binary
1369
		fileevent $fd_rf readable \
1370
			[list rescan_stage2 $fd_rf $after]
1371
	}
1372 1373
}

1374 1375 1376
if {[is_Cygwin]} {
	set is_git_info_exclude {}
	proc have_info_exclude {} {
1377
		global is_git_info_exclude
1378

1379 1380 1381 1382 1383
		if {$is_git_info_exclude eq {}} {
			if {[catch {exec test -f [gitdir info exclude]}]} {
				set is_git_info_exclude 0
			} else {
				set is_git_info_exclude 1
1384 1385
			}
		}
1386
		return $is_git_info_exclude
1387 1388 1389 1390 1391 1392 1393
	}
} else {
	proc have_info_exclude {} {
		return [file readable [gitdir info exclude]]
	}
}

1394
proc rescan_stage2 {fd after} {
1395
	global rescan_active buf_rdi buf_rdf buf_rlo
1396

1397
	if {$fd ne {}} {
1398 1399 1400 1401
		read $fd
		if {![eof $fd]} return
		close $fd
	}
1402

1403
	set ls_others [list --exclude-per-directory=.gitignore]
1404 1405
	if {[have_info_exclude]} {
		lappend ls_others "--exclude-from=[gitdir info exclude]"
S
Shawn O. Pearce 已提交
1406
	}
1407 1408 1409 1410
	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 已提交
1411

1412 1413 1414 1415
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

1416
	set rescan_active 3
1417
	ui_status [mc "Scanning for modified files ..."]
1418 1419 1420
	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 已提交
1421

1422 1423 1424
	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
1425 1426 1427
	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 已提交
1428 1429
}

1430
proc load_message {file} {
1431
	global ui_comm
1432

1433
	set f [gitdir $file]
1434
	if {[file isfile $f]} {
1435 1436 1437
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
1438
		fconfigure $fd -eofchar {}
1439
		set content [string trim [read $fd]]
1440
		close $fd
1441
		regsub -all -line {[ \r\t]+$} $content {} content
1442 1443 1444 1445 1446 1447 1448
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512
proc run_prepare_commit_msg_hook {} {
	global pch_error

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

	set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]

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

	close $fd_pcm

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

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

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

	return 1;
}

proc prepare_commit_msg_hook_wait {fd_ph} {
	global pch_error

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

1513
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
1514 1515 1516
	global buf_rdi

	append buf_rdi [read $fd]
1517 1518 1519 1520 1521 1522 1523 1524 1525 1526
	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
1527
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1528
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1529
		merge_state \
1530
			[encoding convertfrom $p] \
1531 1532
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
1533 1534
			[list]
		set c $z2
1535
		incr c
S
Shawn O. Pearce 已提交
1536
	}
1537 1538 1539 1540 1541 1542
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

1543
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
1544 1545
}

1546
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
1547 1548 1549
	global buf_rdf

	append buf_rdf [read $fd]
1550 1551 1552 1553 1554 1555 1556 1557 1558 1559
	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
1560
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1561
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1562
		merge_state \
1563
			[encoding convertfrom $p] \
1564
			?[lindex $i 4] \
1565
			[list] \
1566
			[list [lindex $i 0] [lindex $i 2]]
1567
		set c $z2
1568
		incr c
1569 1570 1571 1572 1573
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
1574
	}
1575

1576
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
1577 1578
}

1579
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
1580 1581 1582 1583 1584 1585
	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] {
1586 1587 1588 1589 1590
		set p [encoding convertfrom $p]
		if {[string index $p end] eq {/}} {
			set p [string range $p 0 end-1]
		}
		merge_state $p ?O
S
Shawn O. Pearce 已提交
1591
	}
1592
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
1593 1594
}

1595
proc rescan_done {fd buf after} {
1596
	global rescan_active current_diff_path
1597
	global file_states repo_config
1598
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
1599

1600 1601 1602
	if {![eof $fd]} return
	set to_clear {}
	close $fd
1603
	if {[incr rescan_active -1] > 0} return
1604

1605
	prune_selection
1606 1607
	unlock_index
	display_all_files
1608 1609
	if {$current_diff_path ne {}} { reshow_diff $after }
	if {$current_diff_path eq {}} { select_first_diff $after }
S
Shawn O. Pearce 已提交
1610 1611
}

1612 1613 1614 1615 1616 1617 1618 1619 1620 1621
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 已提交
1622 1623
######################################################################
##
1624
## ui helpers
S
Shawn O. Pearce 已提交
1625

1626 1627 1628 1629 1630 1631 1632 1633 1634
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 已提交
1635

1636 1637
proc mapdesc {state path} {
	global all_descs
1638

1639 1640 1641 1642 1643 1644
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
1645

1646
proc ui_status {msg} {
1647 1648 1649 1650
	global main_status
	if {[info exists main_status]} {
		$main_status show $msg
	}
1651 1652 1653
}

proc ui_ready {{test {}}} {
1654 1655 1656 1657
	global main_status
	if {[info exists main_status]} {
		$main_status show [mc "Ready."] $test
	}
1658 1659
}

1660 1661 1662 1663
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
1664 1665
}

1666 1667
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
1668 1669
}

1670 1671
set next_icon_id 0
set null_sha1 [string repeat 0 40]
1672

1673 1674
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
1675

1676 1677
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
1678

1679 1680 1681 1682 1683 1684 1685 1686 1687
	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]}
	}
1688

1689 1690
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
1691

1692 1693
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
1694

1695 1696 1697 1698 1699
	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
1700 1701 1702
	} elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
		set index_info $head_info
		set head_info {}
1703
	}
1704

1705 1706 1707 1708 1709
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
1710

1711 1712
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
1713

1714
	if {$new_m eq {_}} {
1715
		set lno [lsearch -sorted -exact $file_lists($w) $path]
1716
		if {$lno >= 0} {
1717
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1718
			incr lno
1719 1720 1721
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
1722
		}
1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738
	} 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
1739
	}
1740 1741 1742 1743 1744
}

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

1746
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
1747
	set s $file_states($path)
1748 1749
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
1750

1751 1752 1753 1754 1755 1756 1757
	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 已提交
1758
	}
1759
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
1760

1761 1762 1763 1764
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
1765
	}
1766 1767 1768 1769
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
1770
	}
1771 1772 1773 1774 1775
	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 已提交
1776
	}
1777
}
S
Shawn O. Pearce 已提交
1778

1779 1780 1781 1782 1783 1784 1785 1786 1787 1788
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 已提交
1789 1790
}

1791
set files_warning 0
1792 1793 1794 1795
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
1796
	global files_warning
S
Shawn O. Pearce 已提交
1797

1798 1799
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
1800

1801 1802 1803
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
1804

1805 1806
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
1807

1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819
	set to_display [lsort [array names file_states]]
	set display_limit [get_config gui.maxfilesdisplayed]
	if {[llength $to_display] > $display_limit} {
		if {!$files_warning} {
			# do not repeatedly warn:
			set files_warning 1
			info_popup [mc "Displaying only %s of %s files." \
				$display_limit [llength $to_display]]
		}
		set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
	}
	foreach path $to_display {
1820 1821 1822 1823 1824 1825 1826 1827
		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
1828
		}
S
Shawn O. Pearce 已提交
1829

1830 1831 1832 1833
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
1834
		}
1835 1836 1837
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
1838 1839 1840
		}
	}

1841 1842
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
1843 1844
}

1845 1846
######################################################################
##
1847
## icons
1848

1849 1850 1851 1852 1853 1854 1855 1856
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 已提交
1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875

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

1876 1877 1878 1879
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 已提交
1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911
   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_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

1912 1913 1914 1915 1916 1917 1918 1919 1920
image create bitmap file_statechange -background white -foreground green -data {
#define file_merge_width 14
#define file_merge_height 15
static unsigned char file_statechange_bits[] = {
   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
   0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

1921
set ui_index .vpane.files.index.list
1922
set ui_workdir .vpane.files.workdir.list
1923 1924

set all_icons(_$ui_index)   file_plain
1925
set all_icons(A$ui_index)   file_plain
1926 1927 1928
set all_icons(M$ui_index)   file_fulltick
set all_icons(D$ui_index)   file_removed
set all_icons(U$ui_index)   file_merge
1929
set all_icons(T$ui_index)   file_statechange
1930 1931 1932 1933

set all_icons(_$ui_workdir) file_plain
set all_icons(M$ui_workdir) file_mod
set all_icons(D$ui_workdir) file_question
1934
set all_icons(U$ui_workdir) file_merge
1935
set all_icons(O$ui_workdir) file_plain
1936
set all_icons(T$ui_workdir) file_statechange
1937

1938
set max_status_desc 0
S
Shawn O. Pearce 已提交
1939
foreach i {
1940 1941 1942 1943 1944 1945 1946
		{__ {mc "Unmodified"}}

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

1947 1948 1949
		{_T {mc "File type changed, not staged"}}
		{T_ {mc "File type changed, staged"}}

1950 1951 1952 1953 1954 1955 1956 1957 1958
		{_O {mc "Untracked, not staged"}}
		{A_ {mc "Staged for commit"}}
		{AM {mc "Portions staged for commit"}}
		{AD {mc "Staged for commit, missing"}}

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

1959
		{_U {mc "Requires merge resolution"}}
1960 1961 1962 1963
		{U_ {mc "Requires merge resolution"}}
		{UU {mc "Requires merge resolution"}}
		{UM {mc "Requires merge resolution"}}
		{UD {mc "Requires merge resolution"}}
1964
		{UT {mc "Requires merge resolution"}}
S
Shawn O. Pearce 已提交
1965
	} {
1966 1967 1968
	set text [eval [lindex $i 1]]
	if {$max_status_desc < [string length $text]} {
		set max_status_desc [string length $text]
1969
	}
1970
	set all_descs([lindex $i 0]) $text
S
Shawn O. Pearce 已提交
1971
}
1972
unset i
S
Shawn O. Pearce 已提交
1973 1974 1975 1976 1977

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

1978 1979 1980 1981 1982 1983 1984 1985 1986
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}
}

1987 1988 1989 1990 1991
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
1992
	font configure ${font}italic -size $sz
1993 1994
}

S
Shawn O. Pearce 已提交
1995 1996 1997 1998
######################################################################
##
## ui commands

1999
set starting_gitk_msg [mc "Starting gitk... please wait..."]
2000

2001 2002
proc do_gitk {revs {is_submodule false}} {
	global current_diff_path file_states current_diff_side ui_index
2003
	global _gitdir _gitworktree
2004

2005 2006 2007
	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
2008
	set exe [_which gitk -script]
2009
	set cmd [list [info nameofexecutable] $exe]
2010 2011
	if {$exe eq {}} {
		error_popup [mc "Couldn't find gitk in PATH"]
S
Shawn O. Pearce 已提交
2012
	} else {
2013 2014 2015 2016
		global env

		set pwd [pwd]

2017
		if {!$is_submodule} {
2018
			if {![is_bare]} {
2019 2020
				cd $_gitworktree
			}
2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040
		} else {
			cd $current_diff_path
			if {$revs eq {--}} {
				set s $file_states($current_diff_path)
				set old_sha1 {}
				set new_sha1 {}
				switch -glob -- [lindex $s 0] {
				M_ { set old_sha1 [lindex [lindex $s 2] 1] }
				_M { set old_sha1 [lindex [lindex $s 3] 1] }
				MM {
					if {$current_diff_side eq $ui_index} {
						set old_sha1 [lindex [lindex $s 2] 1]
						set new_sha1 [lindex [lindex $s 3] 1]
					} else {
						set old_sha1 [lindex [lindex $s 3] 1]
					}
				}
				}
				set revs $old_sha1...$new_sha1
			}
2041 2042 2043 2044 2045 2046 2047
			# GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
			# we've been using for the main repository, so unset them.
			# TODO we could make life easier (start up faster?) for gitk
			# by setting these to the appropriate values to allow gitk
			# to skip the heuristics to find their proper value
			unset env(GIT_DIR)
			unset env(GIT_WORK_TREE)
2048
		}
2049
		eval exec $cmd $revs "--" "--" &
2050

2051 2052
		set env(GIT_DIR) $_gitdir
		set env(GIT_WORK_TREE) $_gitworktree
2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067
		cd $pwd

		ui_status $::starting_gitk_msg
		after 10000 {
			ui_ready $starting_gitk_msg
		}
	}
}

proc do_git_gui {} {
	global current_diff_path

	# -- Always start git gui through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
2068
	set exe [list [_which git]]
2069 2070 2071 2072
	if {$exe eq {}} {
		error_popup [mc "Couldn't find git gui in PATH"]
	} else {
		global env
2073
		global _gitdir _gitworktree
2074

2075 2076 2077 2078
		# see note in do_gitk about unsetting these vars when
		# running tools in a submodule
		unset env(GIT_DIR)
		unset env(GIT_WORK_TREE)
2079 2080 2081 2082 2083 2084

		set pwd [pwd]
		cd $current_diff_path

		eval exec $exe gui &

2085 2086
		set env(GIT_DIR) $_gitdir
		set env(GIT_WORK_TREE) $_gitworktree
2087 2088
		cd $pwd

2089
		ui_status $::starting_gitk_msg
2090
		after 10000 {
2091
			ui_ready $starting_gitk_msg
2092
		}
S
Shawn O. Pearce 已提交
2093 2094 2095
	}
}

2096
proc do_explore {} {
2097
	global _gitworktree
2098 2099 2100 2101 2102 2103 2104 2105 2106
	set explorer {}
	if {[is_Cygwin] || [is_Windows]} {
		set explorer "explorer.exe"
	} elseif {[is_MacOSX]} {
		set explorer "open"
	} else {
		# freedesktop.org-conforming system is our best shot
		set explorer "xdg-open"
	}
2107
	eval exec $explorer $_gitworktree &
2108 2109
}

2110
set is_quitting 0
2111
set ret_code    1
2112

2113 2114 2115 2116 2117 2118 2119
proc terminate_me {win} {
	global ret_code
	if {$win ne {.}} return
	exit $ret_code
}

proc do_quit {{rc {1}}} {
2120
	global ui_comm is_quitting repo_config commit_type
2121
	global GITGUI_BCK_exists GITGUI_BCK_i
2122
	global ui_comm_spell
2123
	global ret_code use_ttk
2124

2125 2126
	if {$is_quitting} return
	set is_quitting 1
2127

2128 2129 2130 2131
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
2132 2133 2134
		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
			file rename -force [gitdir GITGUI_BCK] $save
			set GITGUI_BCK_exists 0
2135
		} else {
2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150
			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}
			}
		}

2151 2152 2153 2154 2155 2156
		# -- Cancel our spellchecker if its running.
		#
		if {[info exists ui_comm_spell]} {
			$ui_comm_spell stop
		}

2157 2158 2159 2160 2161
		# -- Remove our editor backup, its not needed.
		#
		after cancel $GITGUI_BCK_i
		if {$GITGUI_BCK_exists} {
			catch {file delete [gitdir GITGUI_BCK]}
2162 2163
		}

2164 2165
		# -- Stash our current window geometry into this repository.
		#
2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178
		set cfg_wmstate [wm state .]
		if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
			set rc_wmstate {}
		}
		if {$cfg_wmstate ne $rc_wmstate} {
			catch {git config gui.wmstate $cfg_wmstate}
		}
		if {$cfg_wmstate eq {zoomed}} {
			# on Windows wm geometry will lie about window
			# position (but not size) when window is zoomed
			# restore the window before querying wm geometry
			wm state . normal
		}
2179 2180
		set cfg_geometry [list]
		lappend cfg_geometry [wm geometry .]
2181 2182 2183 2184 2185 2186 2187
		if {$use_ttk} {
			lappend cfg_geometry [.vpane sashpos 0]
			lappend cfg_geometry [.vpane.files sashpos 0]
		} else {
			lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
			lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
		}
2188 2189 2190 2191
		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
			set rc_geometry {}
		}
		if {$cfg_geometry ne $rc_geometry} {
2192
			catch {git config gui.geometry $cfg_geometry}
2193
		}
2194 2195
	}

2196
	set ret_code $rc
2197 2198 2199 2200 2201

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

S
Shawn O. Pearce 已提交
2202 2203 2204 2205
	destroy .
}

proc do_rescan {} {
2206
	rescan ui_ready
S
Shawn O. Pearce 已提交
2207 2208
}

2209
proc ui_do_rescan {} {
2210
	rescan {force_first_diff ui_ready}
2211 2212
}

2213
proc do_commit {} {
2214
	commit_tree
2215 2216
}

2217
proc next_diff {{after {}}} {
2218
	global next_diff_p next_diff_w next_diff_i
2219
	show_diff $next_diff_p $next_diff_w {} {} $after
2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303
}

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

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

	return $lid
}

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

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

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

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

		incr idx $delta
	}

	return {}
}

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

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

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

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

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

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

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

2304
proc select_first_diff {after} {
2305 2306 2307 2308
	global ui_workdir

	if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
	    [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2309 2310 2311
		next_diff $after
	} else {
		uplevel #0 $after
2312
	}
2313 2314
}

2315 2316
proc force_first_diff {after} {
	global ui_workdir current_diff_path file_states
2317 2318 2319

	if {[info exists file_states($current_diff_path)]} {
		set state [lindex $file_states($current_diff_path) 0]
2320 2321 2322
	} else {
		set state {OO}
	}
2323

2324 2325 2326 2327 2328 2329 2330 2331 2332
	set reselect 0
	if {[string first {U} $state] >= 0} {
		# Already a conflict, do nothing
	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
		set reselect 1
	} elseif {[string index $state 1] ne {O}} {
		# Already a diff & no conflicts, do nothing
	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
		set reselect 1
2333 2334
	}

2335 2336 2337 2338 2339
	if {$reselect} {
		next_diff $after
	} else {
		uplevel #0 $after
	}
2340 2341
}

2342
proc toggle_or_diff {w x y} {
2343
	global file_states file_lists current_diff_path ui_index ui_workdir
2344
	global last_clicked selected_paths
2345

S
Shawn O. Pearce 已提交
2346 2347 2348
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
2349 2350 2351 2352 2353 2354 2355 2356 2357
	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
2358
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
2359

2360
	# Determine the state of the file
2361 2362
	if {[info exists file_states($path)]} {
		set state [lindex $file_states($path) 0]
2363 2364 2365 2366 2367
	} else {
		set state {__}
	}

	# Restage the file, or simply show the diff
2368
	if {$col == 0 && $y > 1} {
2369 2370
		# Conflicts need special handling
		if {[string first {U} $state] >= 0} {
2371 2372 2373
			# $w must always be $ui_workdir, but...
			if {$w ne $ui_workdir} { set lno {} }
			merge_stage_workdir $path $lno
2374 2375 2376
			return
		}

2377 2378 2379 2380 2381 2382 2383
		if {[string index $state 1] eq {O}} {
			set mmask {}
		} else {
			set mmask {[^O]}
		}

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

2385
		if {$w eq $ui_index} {
2386
			update_indexinfo \
2387
				"Unstaging [short_path $path] from commit" \
2388
				[list $path] \
2389
				[concat $after [list ui_ready]]
2390
		} elseif {$w eq $ui_workdir} {
2391
			update_index \
2392
				"Adding [short_path $path]" \
2393
				[list $path] \
2394
				[concat $after [list ui_ready]]
2395
		}
2396
	} else {
2397
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
2398 2399 2400
	}
}

2401
proc add_one_to_selection {w x y} {
2402
	global file_lists last_clicked selected_paths
2403

2404
	set lno [lindex [split [$w index @$x,$y] .] 0]
2405 2406 2407 2408 2409
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
2410

2411 2412 2413 2414 2415 2416
	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
	}

2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430
	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} {
2431
	global file_lists last_clicked selected_paths
2432 2433 2434 2435

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

2438
	set lno [lindex [split [$w index @$x,$y] .] 0]
2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453
	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 已提交
2454 2455
}

2456 2457 2458 2459 2460 2461 2462 2463 2464 2465
proc show_more_context {} {
	global repo_config
	if {$repo_config(gui.diffcontext) < 99} {
		incr repo_config(gui.diffcontext)
		reshow_diff
	}
}

proc show_less_context {} {
	global repo_config
2466
	if {$repo_config(gui.diffcontext) > 1} {
2467 2468 2469 2470 2471
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}
}

S
Shawn O. Pearce 已提交
2472 2473
######################################################################
##
2474
## ui construction
2475

2476 2477
set ui_comm {}

S
Shawn O. Pearce 已提交
2478
# -- Menu Bar
2479
#
2480
menu .mbar -tearoff 0
2481 2482 2483 2484 2485 2486
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple
}
2487 2488
.mbar add cascade -label [mc Repository] -menu .mbar.repository
.mbar add cascade -label [mc Edit] -menu .mbar.edit
2489
if {[is_enabled branch]} {
2490
	.mbar add cascade -label [mc Branch] -menu .mbar.branch
S
Shawn O. Pearce 已提交
2491
}
2492
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2493
	.mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2494
}
2495
if {[is_enabled transport]} {
2496
	.mbar add cascade -label [mc Merge] -menu .mbar.merge
2497
	.mbar add cascade -label [mc Remote] -menu .mbar.remote
2498
}
2499 2500 2501
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	.mbar add cascade -label [mc Tools] -menu .mbar.tools
}
S
Shawn O. Pearce 已提交
2502

2503
# -- Repository Menu
2504
#
2505
menu .mbar.repository
2506

2507 2508 2509 2510 2511 2512
if {![is_bare]} {
	.mbar.repository add command \
		-label [mc "Explore Working Copy"] \
		-command {do_explore}
	.mbar.repository add separator
}
2513

2514
.mbar.repository add command \
2515
	-label [mc "Browse Current Branch's Files"] \
2516
	-command {browser::new $current_branch}
2517
set ui_browse_current [.mbar.repository index last]
2518
.mbar.repository add command \
2519
	-label [mc "Browse Branch Files..."] \
2520
	-command browser_open::dialog
2521 2522
.mbar.repository add separator

2523
.mbar.repository add command \
2524
	-label [mc "Visualize Current Branch's History"] \
2525
	-command {do_gitk $current_branch}
2526
set ui_visualize_current [.mbar.repository index last]
2527
.mbar.repository add command \
2528
	-label [mc "Visualize All Branch History"] \
2529
	-command {do_gitk --all}
2530
.mbar.repository add separator
2531

2532 2533 2534
proc current_branch_write {args} {
	global current_branch
	.mbar.repository entryconf $::ui_browse_current \
2535
		-label [mc "Browse %s's Files" $current_branch]
2536
	.mbar.repository entryconf $::ui_visualize_current \
2537
		-label [mc "Visualize %s's History" $current_branch]
2538 2539 2540
}
trace add variable current_branch write current_branch_write

2541
if {[is_enabled multicommit]} {
2542
	.mbar.repository add command -label [mc "Database Statistics"] \
2543
		-command do_stats
2544

2545
	.mbar.repository add command -label [mc "Compress Database"] \
2546
		-command do_gc
2547

2548
	.mbar.repository add command -label [mc "Verify Database"] \
2549
		-command do_fsck_objects
2550

2551
	.mbar.repository add separator
2552

2553 2554
	if {[is_Cygwin]} {
		.mbar.repository add command \
2555
			-label [mc "Create Desktop Icon"] \
2556
			-command do_cygwin_shortcut
2557
	} elseif {[is_Windows]} {
2558
		.mbar.repository add command \
2559
			-label [mc "Create Desktop Icon"] \
2560
			-command do_windows_shortcut
2561
	} elseif {[is_MacOSX]} {
2562
		.mbar.repository add command \
2563
			-label [mc "Create Desktop Icon"] \
2564
			-command do_macosx_app
2565
	}
2566
}
2567

2568 2569 2570 2571 2572 2573 2574
if {[is_MacOSX]} {
	proc ::tk::mac::Quit {args} { do_quit }
} else {
	.mbar.repository add command -label [mc Quit] \
		-command do_quit \
		-accelerator $M1T-Q
}
S
Shawn O. Pearce 已提交
2575

2576 2577 2578
# -- Edit Menu
#
menu .mbar.edit
2579
.mbar.edit add command -label [mc Undo] \
2580
	-command {catch {[focus] edit undo}} \
2581
	-accelerator $M1T-Z
2582
.mbar.edit add command -label [mc Redo] \
2583
	-command {catch {[focus] edit redo}} \
2584
	-accelerator $M1T-Y
2585
.mbar.edit add separator
2586
.mbar.edit add command -label [mc Cut] \
2587
	-command {catch {tk_textCut [focus]}} \
2588
	-accelerator $M1T-X
2589
.mbar.edit add command -label [mc Copy] \
2590
	-command {catch {tk_textCopy [focus]}} \
2591
	-accelerator $M1T-C
2592
.mbar.edit add command -label [mc Paste] \
2593
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
2594
	-accelerator $M1T-V
2595
.mbar.edit add command -label [mc Delete] \
2596
	-command {catch {[focus] delete sel.first sel.last}} \
2597
	-accelerator Del
2598
.mbar.edit add separator
2599
.mbar.edit add command -label [mc "Select All"] \
2600
	-command {catch {[focus] tag add sel 0.0 end}} \
2601
	-accelerator $M1T-A
2602

2603 2604
# -- Branch Menu
#
2605
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
2606 2607
	menu .mbar.branch

2608
	.mbar.branch add command -label [mc "Create..."] \
2609
		-command branch_create::dialog \
2610
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
2611 2612 2613
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2614
	.mbar.branch add command -label [mc "Checkout..."] \
2615 2616 2617 2618 2619
		-command branch_checkout::dialog \
		-accelerator $M1T-O
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2620
	.mbar.branch add command -label [mc "Rename..."] \
2621 2622 2623 2624
		-command branch_rename::dialog
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

2625
	.mbar.branch add command -label [mc "Delete..."] \
2626
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
2627 2628
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
2629

2630
	.mbar.branch add command -label [mc "Reset..."] \
2631
		-command merge::reset_hard
2632 2633
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
2634 2635
}

S
Shawn O. Pearce 已提交
2636
# -- Commit Menu
2637
#
2638 2639 2640 2641 2642 2643 2644 2645
proc commit_btn_caption {} {
	if {[is_enabled nocommit]} {
		return [mc "Done"]
	} else {
		return [mc Commit@@verb]
	}
}

2646 2647 2648
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	menu .mbar.commit

2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667
	if {![is_enabled nocommit]} {
		.mbar.commit add radiobutton \
			-label [mc "New Commit"] \
			-command do_select_commit_type \
			-variable selected_commit_type \
			-value new
		lappend disable_on_lock \
			[list .mbar.commit entryconf [.mbar.commit index last] -state]

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

		.mbar.commit add separator
	}
2668

2669
	.mbar.commit add command -label [mc Rescan] \
2670
		-command ui_do_rescan \
2671
		-accelerator F5
2672 2673
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2674

2675
	.mbar.commit add command -label [mc "Stage To Commit"] \
2676 2677
		-command do_add_selection \
		-accelerator $M1T-T
2678 2679
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2680

2681
	.mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2682
		-command do_add_all \
2683
		-accelerator $M1T-I
2684 2685
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2686

2687
	.mbar.commit add command -label [mc "Unstage From Commit"] \
2688 2689
		-command do_unstage_selection \
		-accelerator $M1T-U
2690 2691
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2692

2693
	.mbar.commit add command -label [mc "Revert Changes"] \
2694 2695
		-command do_revert_selection \
		-accelerator $M1T-J
2696 2697
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
2698

2699
	.mbar.commit add separator
2700

2701 2702
	.mbar.commit add command -label [mc "Show Less Context"] \
		-command show_less_context \
2703
		-accelerator $M1T-\-
2704 2705 2706

	.mbar.commit add command -label [mc "Show More Context"] \
		-command show_more_context \
2707
		-accelerator $M1T-=
2708 2709 2710

	.mbar.commit add separator

2711
	if {![is_enabled nocommitmsg]} {
2712 2713 2714 2715
		.mbar.commit add command -label [mc "Sign Off"] \
			-command do_signoff \
			-accelerator $M1T-S
	}
2716

2717
	.mbar.commit add command -label [commit_btn_caption] \
2718
		-command do_commit \
2719
		-accelerator $M1T-Return
2720 2721 2722
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
2723

2724 2725 2726 2727
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
2728
	.mbar.merge add command -label [mc "Local Merge..."] \
2729 2730
		-command merge::dialog \
		-accelerator $M1T-M
2731 2732
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
2733
	.mbar.merge add command -label [mc "Abort Merge..."] \
2734
		-command merge::reset_hard
2735 2736 2737 2738 2739 2740 2741
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
}

# -- Transport Menu
#
if {[is_enabled transport]} {
2742
	menu .mbar.remote
2743

2744 2745 2746 2747
	.mbar.remote add command \
		-label [mc "Add..."] \
		-command remote_add::dialog \
		-accelerator $M1T-A
2748 2749
	.mbar.remote add command \
		-label [mc "Push..."] \
2750 2751
		-command do_push_anywhere \
		-accelerator $M1T-P
2752
	.mbar.remote add command \
2753
		-label [mc "Delete Branch..."] \
2754
		-command remote_branch_delete::dialog
2755 2756
}

S
Shawn O. Pearce 已提交
2757
if {[is_MacOSX]} {
2758
	proc ::tk::mac::ShowPreferences {} {do_options}
S
Shawn O. Pearce 已提交
2759 2760 2761 2762
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
2763
	.mbar.edit add command -label [mc "Options..."] \
2764
		-command do_options
2765
}
2766

2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780
# -- Tools Menu
#
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	set tools_menubar .mbar.tools
	menu $tools_menubar
	$tools_menubar add separator
	$tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
	$tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
	set tools_tailcnt 3
	if {[array names repo_config guitool.*.cmd] ne {}} {
		tools_populate_all
	}
}

2781 2782
# -- Help Menu
#
2783
.mbar add cascade -label [mc Help] -menu .mbar.help
2784
menu .mbar.help
S
Shawn O. Pearce 已提交
2785

2786 2787 2788 2789 2790
if {[is_MacOSX]} {
	.mbar.apple add command -label [mc "About %s" [appname]] \
		-command do_about
	.mbar.apple add separator
} else {
2791
	.mbar.help add command -label [mc "About %s" [appname]] \
2792
		-command do_about
S
Shawn O. Pearce 已提交
2793
}
2794
. configure -menu .mbar
2795

2796 2797 2798
set doc_path [githtmldir]
if {$doc_path ne {}} {
	set doc_path [file join $doc_path index.html]
2799

2800 2801 2802
	if {[is_Cygwin]} {
		set doc_path [exec cygpath --mixed $doc_path]
	}
2803 2804 2805 2806 2807 2808 2809 2810
}

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

2811 2812
proc start_browser {url} {
	git "web--browse" $url
2813
}
2814 2815 2816

.mbar.help add command -label [mc "Online Documentation"] \
	-command [list start_browser $doc_url]
2817 2818 2819 2820

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

2821
unset doc_path doc_url
S
Shawn O. Pearce 已提交
2822

2823 2824
# -- Standard bindings
#
2825
wm protocol . WM_DELETE_WINDOW do_quit
2826 2827 2828 2829 2830
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]}

2831 2832 2833 2834 2835 2836
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850
proc normalize_relpath {path} {
	set elements {}
	foreach item [file split $path] {
		if {$item eq {.}} continue
		if {$item eq {..} && [llength $elements] > 0
		    && [lindex $elements end] ne {..}} {
			set elements [lrange $elements 0 end-1]
			continue
		}
		lappend elements $item
	}
	return [eval file join $elements]
}

2851 2852
# -- Not a normal commit type invocation?  Do that instead!
#
2853
switch -- $subcommand {
2854
browser -
2855
blame {
2856 2857 2858 2859 2860
	if {$subcommand eq "blame"} {
		set subcommand_args {[--line=<num>] rev? path}
	} else {
		set subcommand_args {rev? path}
	}
2861
	if {$argv eq {}} usage
2862
	set head {}
2863
	set path {}
2864
	set jump_spec {}
2865 2866 2867 2868
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
2869
			set path [normalize_relpath $_prefix$a]
2870 2871 2872
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
2873 2874
				if {$head ne {}} usage
				set head $path
2875 2876 2877
				set path {}
			}
			set is_path 1
2878 2879 2880
		} elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
			if {$jump_spec ne {} || $head ne {}} usage
			set jump_spec [list $lnum]
2881 2882 2883
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
2884
			set is_path 1
2885 2886 2887 2888 2889 2890
		} else {
			usage
		}
	}
	unset is_path

2891
	if {$head ne {} && $path eq {}} {
2892
		set path [normalize_relpath $_prefix$head]
2893 2894 2895
		set head {}
	}

2896
	if {$head eq {}} {
2897
		load_current_branch
2898
	} else {
2899 2900 2901 2902 2903 2904 2905 2906
		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
			if {[catch {
					set head [git rev-parse --verify $head]
				} err]} {
				puts stderr $err
				exit 1
			}
		}
2907
		set current_branch $head
2908
	}
2909

2910 2911
	switch -- $subcommand {
	browser {
2912
		if {$jump_spec ne {}} usage
2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924
		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]} {
2925
			puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2926 2927
			exit 1
		}
2928
		blame::new $head $path $jump_spec
2929
	}
2930
	}
2931 2932 2933 2934 2935 2936
	return
}
citool -
gui {
	if {[llength $argv] != 0} {
		puts -nonewline stderr "usage: $argv0"
2937 2938
		if {$subcommand ne {gui}
			&& [file tail $argv0] ne "git-$subcommand"} {
2939 2940 2941 2942 2943 2944
			puts -nonewline stderr " $subcommand"
		}
		puts stderr {}
		exit 1
	}
	# fall through to setup UI for commits
2945 2946
}
default {
2947
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2948 2949 2950 2951
	exit 1
}
}

2952 2953
# -- Branch Control
#
2954 2955 2956
${NS}::frame .branch
if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
${NS}::label .branch.l1 \
2957
	-text [mc "Current Branch:"] \
2958
	-anchor w \
2959
	-justify left
2960
${NS}::label .branch.cb \
2961 2962
	-textvariable current_branch \
	-anchor w \
2963
	-justify left
2964 2965 2966 2967
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
2968
# -- Main Window Layout
2969
#
2970 2971 2972 2973 2974 2975 2976
${NS}::panedwindow .vpane -orient horizontal
${NS}::panedwindow .vpane.files -orient vertical
if {$use_ttk} {
	.vpane add .vpane.files
} else {
	.vpane add .vpane.files -sticky nsew -height 100 -width 200
}
S
Shawn O. Pearce 已提交
2977 2978 2979
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
2980
#
2981 2982 2983
${NS}::frame .vpane.files.index -height 100 -width 200
tlabel .vpane.files.index.title \
	-text [mc "Staged Changes (Will Commit)"] \
2984 2985 2986
	-background lightgreen -foreground black
text $ui_index -background white -foreground black \
	-borderwidth 0 \
2987
	-width 20 -height 10 \
2988
	-wrap none \
2989
	-cursor $cursor_ptr \
2990 2991
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
2992
	-state disabled
2993 2994
${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
S
Shawn O. Pearce 已提交
2995
pack .vpane.files.index.title -side top -fill x
2996 2997
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
2998 2999
pack $ui_index -side left -fill both -expand 1

3000
# -- Working Directory File List
3001
#
3002 3003
${NS}::frame .vpane.files.workdir -height 100 -width 200
tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3004 3005 3006
	-background lightsalmon -foreground black
text $ui_workdir -background white -foreground black \
	-borderwidth 0 \
3007
	-width 20 -height 10 \
3008
	-wrap none \
3009
	-cursor $cursor_ptr \
3010 3011
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
3012
	-state disabled
3013 3014
${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3015
pack .vpane.files.workdir.title -side top -fill x
3016 3017
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
3018
pack $ui_workdir -side left -fill both -expand 1
3019

3020 3021 3022 3023 3024 3025
.vpane.files add .vpane.files.workdir
.vpane.files add .vpane.files.index
if {!$use_ttk} {
	.vpane.files paneconfigure .vpane.files.workdir -sticky news
	.vpane.files paneconfigure .vpane.files.index -sticky news
}
S
Shawn O. Pearce 已提交
3026

3027
foreach i [list $ui_index $ui_workdir] {
3028 3029
	rmsel_tag $i
	$i tag conf in_diff -background [$i tag cget in_sel -background]
3030 3031
}
unset i
3032

3033
# -- Diff and Commit Area
3034
#
3035 3036 3037
${NS}::frame .vpane.lower -height 300 -width 400
${NS}::frame .vpane.lower.commarea
${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3038 3039
pack .vpane.lower.diff -fill both -expand 1
pack .vpane.lower.commarea -side bottom -fill x
3040 3041
.vpane add .vpane.lower
if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
S
Shawn O. Pearce 已提交
3042 3043

# -- Commit Area Buttons
3044
#
3045 3046
${NS}::frame .vpane.lower.commarea.buttons
${NS}::label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
3047
	-anchor w \
3048
	-justify left
3049 3050
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
3051

3052
${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3053
	-command ui_do_rescan
3054
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3055 3056
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
3057

3058
${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3059
	-command do_add_all
3060
pack .vpane.lower.commarea.buttons.incall -side top -fill x
3061 3062
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
3063

3064
if {![is_enabled nocommitmsg]} {
3065
	${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3066 3067 3068
		-command do_signoff
	pack .vpane.lower.commarea.buttons.signoff -side top -fill x
}
3069

3070
${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3071
	-command do_commit
3072
pack .vpane.lower.commarea.buttons.commit -side top -fill x
3073 3074
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
3075

3076
if {![is_enabled nocommit]} {
3077
	${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3078 3079
		-command do_push_anywhere
	pack .vpane.lower.commarea.buttons.push -side top -fill x
3080 3081
}

S
Shawn O. Pearce 已提交
3082
# -- Commit Message Buffer
3083
#
3084 3085
${NS}::frame .vpane.lower.commarea.buffer
${NS}::frame .vpane.lower.commarea.buffer.header
3086
set ui_comm .vpane.lower.commarea.buffer.t
3087
set ui_coml .vpane.lower.commarea.buffer.header.l
3088 3089

if {![is_enabled nocommit]} {
3090
	${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3091 3092 3093 3094 3095 3096
		-text [mc "New Commit"] \
		-command do_select_commit_type \
		-variable selected_commit_type \
		-value new
	lappend disable_on_lock \
		[list .vpane.lower.commarea.buffer.header.new conf -state]
3097
	${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3098 3099 3100 3101 3102 3103 3104 3105
		-text [mc "Amend Last Commit"] \
		-command do_select_commit_type \
		-variable selected_commit_type \
		-value amend
	lappend disable_on_lock \
		[list .vpane.lower.commarea.buffer.header.amend conf -state]
}

3106
${NS}::label $ui_coml \
S
Shawn O. Pearce 已提交
3107
	-anchor w \
3108
	-justify left
3109 3110 3111
proc trace_commit_type {varname args} {
	global ui_coml commit_type
	switch -glob -- $commit_type {
3112 3113 3114 3115 3116 3117
	initial       {set txt [mc "Initial Commit Message:"]}
	amend         {set txt [mc "Amended Commit Message:"]}
	amend-initial {set txt [mc "Amended Initial Commit Message:"]}
	amend-merge   {set txt [mc "Amended Merge Commit Message:"]}
	merge         {set txt [mc "Merge Commit Message:"]}
	*             {set txt [mc "Commit Message:"]}
3118 3119 3120 3121
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
3122
pack $ui_coml -side left -fill x
3123 3124 3125 3126 3127

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

3129 3130
text $ui_comm -background white -foreground black \
	-borderwidth 1 \
3131
	-undo true \
3132
	-maxundo 20 \
3133
	-autoseparators true \
S
Shawn O. Pearce 已提交
3134
	-relief sunken \
3135
	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3136
	-font font_diff \
3137
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3138
${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3139
	-command [list $ui_comm yview]
3140
pack .vpane.lower.commarea.buffer.header -side top -fill x
3141
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
3142
pack $ui_comm -side left -fill y
3143 3144
pack .vpane.lower.commarea.buffer -side left -fill y

3145 3146
# -- Commit Message Buffer Context Menu
#
3147 3148 3149
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
3150
	-label [mc Cut] \
3151 3152
	-command {tk_textCut $ui_comm}
$ctxm add command \
3153
	-label [mc Copy] \
3154 3155
	-command {tk_textCopy $ui_comm}
$ctxm add command \
3156
	-label [mc Paste] \
3157 3158
	-command {tk_textPaste $ui_comm}
$ctxm add command \
3159
	-label [mc Delete] \
3160
	-command {catch {$ui_comm delete sel.first sel.last}}
3161 3162
$ctxm add separator
$ctxm add command \
3163
	-label [mc "Select All"] \
3164
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3165
$ctxm add command \
3166
	-label [mc "Copy All"] \
3167
	-command {
3168 3169 3170
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
3171 3172 3173
	}
$ctxm add separator
$ctxm add command \
3174
	-label [mc "Sign Off"] \
3175
	-command do_signoff
3176
set ui_comm_ctxm $ctxm
3177

3178
# -- Diff Header
3179
#
3180 3181 3182
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
3183 3184 3185 3186 3187
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
3188
		set p $current_diff_path
3189
		set s [mapdesc [lindex $file_states($p) 0] $p]
3190
		set f [mc "File:"]
3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201
		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
	}
}
3202
trace add variable current_diff_path write trace_current_diff_path
3203

3204 3205
gold_frame .vpane.lower.diff.header
tlabel .vpane.lower.diff.header.status \
3206
	-background gold \
3207
	-foreground black \
3208 3209
	-width $max_status_desc \
	-anchor w \
3210
	-justify left
3211
tlabel .vpane.lower.diff.header.file \
3212
	-background gold \
3213
	-foreground black \
3214
	-anchor w \
3215
	-justify left
3216
tlabel .vpane.lower.diff.header.path \
3217
	-background gold \
3218
	-foreground black \
3219
	-anchor w \
3220
	-justify left
3221 3222 3223 3224 3225 3226
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 \
3227
	-label [mc Copy] \
3228 3229 3230 3231 3232
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
3233
			-- $current_diff_path
3234
	}
3235 3236
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3237 3238

# -- Diff Body
3239
#
3240
${NS}::frame .vpane.lower.diff.body
3241
set ui_diff .vpane.lower.diff.body.t
3242 3243
text $ui_diff -background white -foreground black \
	-borderwidth 0 \
3244
	-width 80 -height 5 -wrap none \
3245
	-font font_diff \
3246 3247 3248
	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
	-yscrollcommand {.vpane.lower.diff.body.sby set} \
	-state disabled
3249
${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3250
	-command [list $ui_diff xview]
3251
${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3252 3253 3254 3255 3256 3257 3258
	-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

3259
$ui_diff tag conf d_cr -elide true
3260 3261
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
3262 3263
$ui_diff tag conf d_- -foreground red

3264
$ui_diff tag conf d_++ -foreground {#00a000}
3265 3266
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
3267 3268
	-foreground {#00a000} \
	-background {#e2effa}
3269 3270
$ui_diff tag conf d_-s \
	-foreground red \
3271
	-background {#e2effa}
3272
$ui_diff tag conf d_s+ \
3273 3274
	-foreground {#00a000} \
	-background ivory1
3275 3276
$ui_diff tag conf d_s- \
	-foreground red \
3277
	-background ivory1
3278 3279 3280 3281 3282 3283 3284 3285 3286 3287

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

3289 3290
$ui_diff tag raise sel

3291 3292
# -- Diff Body Context Menu
#
3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324

proc create_common_diff_popup {ctxm} {
	$ctxm add command \
		-label [mc Refresh] \
		-command reshow_diff
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc Copy] \
		-command {tk_textCopy $ui_diff}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Select All"] \
		-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Copy All"] \
		-command {
			$ui_diff tag add sel 0.0 end
			tk_textCopy $ui_diff
			$ui_diff tag remove sel 0.0 end
		}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
	$ctxm add command \
		-label [mc "Decrease Font Size"] \
		-command {incr_font_size font_diff -1}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add command \
		-label [mc "Increase Font Size"] \
		-command {incr_font_size font_diff 1}
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
3325 3326 3327 3328 3329 3330 3331 3332
	set emenu $ctxm.enc
	menu $emenu
	build_encoding_menu $emenu [list force_diff_encoding]
	$ctxm add cascade \
		-label [mc "Encoding"] \
		-menu $emenu
	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
	$ctxm add separator
3333 3334 3335 3336
	$ctxm add command -label [mc "Options..."] \
		-command do_options
}

3337 3338
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
3339 3340 3341 3342 3343
$ctxm add command \
	-label [mc "Apply/Reverse Hunk"] \
	-command {apply_hunk $cursorX $cursorY}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3344 3345
$ctxm add command \
	-label [mc "Apply/Reverse Line"] \
3346
	-command {apply_range_or_line $cursorX $cursorY; do_rescan}
3347 3348
set ui_diff_applyline [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3349
$ctxm add separator
3350 3351 3352 3353 3354 3355 3356 3357 3358
$ctxm add command \
	-label [mc "Show Less Context"] \
	-command show_less_context
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label [mc "Show More Context"] \
	-command show_more_context
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
3359 3360 3361 3362
create_common_diff_popup $ctxm

set ctxmmg .vpane.lower.diff.body.ctxmmg
menu $ctxmmg -tearoff 0
3363 3364 3365 3366 3367
$ctxmmg add command \
	-label [mc "Run Merge Tool"] \
	-command {merge_resolve_tool}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add separator
3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380
$ctxmmg add command \
	-label [mc "Use Remote Version"] \
	-command {merge_resolve_one 3}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add command \
	-label [mc "Use Local Version"] \
	-command {merge_resolve_one 2}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add command \
	-label [mc "Revert To Base"] \
	-command {merge_resolve_one 1}
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add separator
3381 3382 3383 3384 3385 3386 3387 3388 3389
$ctxmmg add command \
	-label [mc "Show Less Context"] \
	-command show_less_context
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add command \
	-label [mc "Show More Context"] \
	-command show_more_context
lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
$ctxmmg add separator
3390 3391
create_common_diff_popup $ctxmmg

3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414
set ctxmsm .vpane.lower.diff.body.ctxmsm
menu $ctxmsm -tearoff 0
$ctxmsm add command \
	-label [mc "Visualize These Changes In The Submodule"] \
	-command {do_gitk -- true}
lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
$ctxmsm add command \
	-label [mc "Visualize Current Branch History In The Submodule"] \
	-command {do_gitk {} true}
lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
$ctxmsm add command \
	-label [mc "Visualize All Branch History In The Submodule"] \
	-command {do_gitk --all true}
lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
$ctxmsm add separator
$ctxmsm add command \
	-label [mc "Start git gui In The Submodule"] \
	-command {do_git_gui}
lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
$ctxmsm add separator
create_common_diff_popup $ctxmsm

proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3415
	global current_diff_path file_states
3416 3417
	set ::cursorX $x
	set ::cursorY $y
3418 3419
	if {[info exists file_states($current_diff_path)]} {
		set state [lindex $file_states($current_diff_path) 0]
3420
	} else {
3421 3422
		set state {__}
	}
3423
	if {[string first {U} $state] >= 0} {
3424
		tk_popup $ctxmmg $X $Y
3425 3426
	} elseif {$::is_submodule_diff} {
		tk_popup $ctxmsm $X $Y
3427
	} else {
3428
		set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3429 3430
		if {$::ui_index eq $::current_diff_side} {
			set l [mc "Unstage Hunk From Commit"]
3431 3432 3433 3434 3435
			if {$has_range} {
				set t [mc "Unstage Lines From Commit"]
			} else {
				set t [mc "Unstage Line From Commit"]
			}
3436 3437
		} else {
			set l [mc "Stage Hunk For Commit"]
3438 3439 3440 3441 3442
			if {$has_range} {
				set t [mc "Stage Lines For Commit"]
			} else {
				set t [mc "Stage Line For Commit"]
			}
3443
		}
3444
		if {$::is_3way_diff
3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456
			|| $current_diff_path eq {}
			|| {__} eq $state
			|| {_O} eq $state
			|| {_T} eq $state
			|| {T_} eq $state} {
			set s disabled
		} else {
			set s normal
		}
		$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
		$ctxm entryconf $::ui_diff_applyline -state $s -label $t
		tk_popup $ctxm $X $Y
3457
	}
3458
}
3459
bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3460

S
Shawn O. Pearce 已提交
3461
# -- Status Bar
3462
#
3463
set main_status [::status_bar::new .status]
S
Shawn O. Pearce 已提交
3464
pack .status -anchor w -side bottom -fill x
3465
$main_status show [mc "Initializing..."]
S
Shawn O. Pearce 已提交
3466

3467
# -- Load geometry
3468
#
3469
catch {
3470
set gm $repo_config(gui.geometry)
3471
wm geometry . [lindex $gm 0]
3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482
if {$use_ttk} {
	.vpane sashpos 0 [lindex $gm 1]
	.vpane.files sashpos 0 [lindex $gm 2]
} else {
	.vpane sash place 0 \
		[lindex $gm 1] \
		[lindex [.vpane sash coord 0] 1]
	.vpane.files sash place 0 \
		[lindex [.vpane.files sash coord 0] 0] \
		[lindex $gm 2]
}
3483
unset gm
3484
}
3485

3486 3487 3488 3489 3490 3491 3492 3493
# -- Load window state
#
catch {
set gws $repo_config(gui.wmstate)
wm state . $gws
unset gws
}

S
Shawn O. Pearce 已提交
3494
# -- Key Bindings
3495
#
3496
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3497 3498
bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3499 3500 3501 3502
bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3503 3504
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3505 3506 3507 3508 3509 3510 3511 3512
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}
3513 3514 3515 3516 3517
bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3518 3519 3520 3521 3522 3523 3524 3525 3526

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}
3527 3528 3529 3530
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}
3531 3532 3533 3534 3535 3536
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}
3537
bind $ui_diff <Button-1>   {focus %W}
3538

3539
if {[is_enabled branch]} {
3540 3541
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
3542 3543
	bind . <$M1B-Key-o> branch_checkout::dialog
	bind . <$M1B-Key-O> branch_checkout::dialog
3544 3545
	bind . <$M1B-Key-m> merge::dialog
	bind . <$M1B-Key-M> merge::dialog
3546
}
3547 3548 3549 3550
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
3551

3552 3553 3554
bind .   <Key-F5>     ui_do_rescan
bind .   <$M1B-Key-r> ui_do_rescan
bind .   <$M1B-Key-R> ui_do_rescan
3555 3556
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
3557 3558
bind .   <$M1B-Key-t> do_add_selection
bind .   <$M1B-Key-T> do_add_selection
3559 3560
bind .   <$M1B-Key-j> do_revert_selection
bind .   <$M1B-Key-J> do_revert_selection
3561 3562
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
3563 3564 3565 3566 3567
bind .   <$M1B-Key-minus> {show_less_context;break}
bind .   <$M1B-Key-KP_Subtract> {show_less_context;break}
bind .   <$M1B-Key-equal> {show_more_context;break}
bind .   <$M1B-Key-plus> {show_more_context;break}
bind .   <$M1B-Key-KP_Add> {show_more_context;break}
3568
bind .   <$M1B-Key-Return> do_commit
3569
foreach i [list $ui_index $ui_workdir] {
3570 3571 3572
	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 已提交
3573
}
3574 3575 3576
unset i

set file_lists($ui_index) [list]
3577
set file_lists($ui_workdir) [list]
3578

3579
wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
S
Shawn O. Pearce 已提交
3580
focus -force $ui_comm
3581

3582 3583 3584
# -- 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.
3585
#
3586
if {[is_Cygwin]} {
3587 3588
	set ignored_env 0
	set suggest_user {}
3589
	set msg [mc "Possible environment issues exist.
3590 3591 3592

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

3595
" [appname]]
3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617
	foreach name [array names env] {
		switch -regexp -- $name {
		{^GIT_INDEX_FILE$} -
		{^GIT_OBJECT_DIRECTORY$} -
		{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
		{^GIT_DIFF_OPTS$} -
		{^GIT_EXTERNAL_DIFF$} -
		{^GIT_PAGER$} -
		{^GIT_TRACE$} -
		{^GIT_CONFIG$} -
		{^GIT_(AUTHOR|COMMITTER)_DATE$} {
			append msg " - $name\n"
			incr ignored_env
		}
		{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
			append msg " - $name\n"
			incr ignored_env
			set suggest_user $name
		}
		}
	}
	if {$ignored_env > 0} {
3618
		append msg [mc "
3619
This is due to a known issue with the
3620
Tcl binary distributed by Cygwin."]
3621 3622

		if {$suggest_user ne {}} {
3623
			append msg [mc "
3624

3625
A good replacement for %s
3626 3627 3628
is placing values for the user.name and
user.email settings into your personal
~/.gitconfig file.
3629
" $suggest_user]
3630 3631 3632 3633 3634 3635
		}
		warn_popup $msg
	}
	unset ignored_env msg suggest_user name
}

3636 3637
# -- Only initialize complex UI if we are going to stay running.
#
3638
if {[is_enabled transport]} {
3639
	load_all_remotes
3640

3641
	set n [.mbar.remote index end]
3642
	populate_remotes_menu
3643 3644
	set n [expr {[.mbar.remote index end] - $n}]
	if {$n > 0} {
3645
		if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3646 3647 3648
		.mbar.remote insert $n separator
	}
	unset n
3649
}
3650

3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701
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
3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725

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

3728
lock_index begin-read
3729 3730 3731
if {![winfo ismapped .]} {
	wm deiconify .
}
3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742
after 1 {
	if {[is_enabled initialamend]} {
		force_amend
	} else {
		do_rescan
	}

	if {[is_enabled nocommitmsg]} {
		$ui_comm configure -state disabled -background gray
	}
}
3743 3744 3745
if {[is_enabled multicommit]} {
	after 1000 hint_gc
}
3746 3747 3748
if {[is_enabled retcode]} {
	bind . <Destroy> {+terminate_me %W}
}
3749 3750 3751
if {$picked && [is_config_true gui.autoexplore]} {
	do_explore
}
3752 3753 3754 3755 3756 3757

# Local variables:
# mode: tcl
# indent-tabs-mode: t
# tab-width: 4
# End: