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

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

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

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

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

29
######################################################################
30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
##
## Tcl/Tk sanity check

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

45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
######################################################################
##
## enable verbose loading?

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

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

set oguilib {@@GITGUI_LIBDIR@@}
68 69 70 71 72
set oguirel {@@GITGUI_RELATIVE@@}
if {$oguirel eq {1}} {
	set oguilib [file dirname [file dirname [file normalize $argv0]]]
	set oguilib [file join $oguilib share git-gui lib]
} elseif {[string match @@* $oguirel]} {
73 74
	set oguilib [file join [file dirname [file normalize $argv0]] lib]
}
75

76
set idx [file join $oguilib tclIndex]
77 78 79 80 81 82 83 84 85 86 87 88 89 90
if {[catch {set fd [open $idx r]} err]} {
	catch {wm withdraw .}
	tk_messageBox \
		-icon error \
		-type ok \
		-title "git-gui: fatal error" \
		-message $err
	exit 1
}
if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
	set idx [list]
	while {[gets $fd n] >= 0} {
		if {$n ne {} && ![string match #* $n]} {
			lappend idx $n
91 92
		}
	}
93 94
} else {
	set idx {}
95
}
96 97
close $fd

98 99 100 101 102 103 104 105 106 107 108
if {$idx ne {}} {
	set loaded [list]
	foreach p $idx {
		if {[lsearch -exact $loaded $p] >= 0} continue
		source [file join $oguilib $p]
		lappend loaded $p
	}
	unset loaded p
} else {
	set auto_path [concat [list $oguilib] $auto_path]
}
109
unset -nocomplain oguirel idx fd
110

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

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

proc appname {} {
	global _appname
	return $_appname
}

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

134 135 136
proc gitexec {args} {
	global _gitexec
	if {$_gitexec eq {}} {
137
		if {[catch {set _gitexec [git --exec-path]} err]} {
138 139 140 141 142 143 144 145 146
			error "Git not installed?\n\n$err"
		}
	}
	if {$args eq {}} {
		return $_gitexec
	}
	return [eval [concat [list file join $_gitexec] $args]]
}

147 148 149 150
proc reponame {} {
	global _reponame
	return $_reponame
}
151

152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
proc is_MacOSX {} {
	global tcl_platform tk_library
	if {[tk windowingsystem] eq {aqua}} {
		return 1
	}
	return 0
}

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

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

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

200 201 202 203
######################################################################
##
## config

204 205 206 207 208 209 210 211 212
proc is_many_config {name} {
	switch -glob -- $name {
	remote.*.fetch -
	remote.*.push
		{return 1}
	*
		{return 0}
	}
}
213

214 215 216 217 218 219 220 221 222 223 224
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
	}
}

225 226 227 228 229 230 231 232 233
proc get_config {name} {
	global repo_config
	if {[catch {set v $repo_config($name)}]} {
		return {}
	} else {
		return $v
	}
}

234
proc load_config {include_global} {
235 236 237
	global repo_config global_config default_config

	array unset global_config
238 239
	if {$include_global} {
		catch {
240
			set fd_rc [open "| git config --global --list" r]
241 242 243 244 245 246 247
			while {[gets $fd_rc line] >= 0} {
				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
					if {[is_many_config $name]} {
						lappend global_config($name) $value
					} else {
						set global_config($name) $value
					}
248 249
				}
			}
250
			close $fd_rc
251 252
		}
	}
253 254

	array unset repo_config
255
	catch {
256
		set fd_rc [open "| git config --list" r]
257 258
		while {[gets $fd_rc line] >= 0} {
			if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
259 260 261 262 263
				if {[is_many_config $name]} {
					lappend repo_config($name) $value
				} else {
					set repo_config($name) $value
				}
264 265 266 267 268
			}
		}
		close $fd_rc
	}

269 270 271 272 273 274 275
	foreach name [array names default_config] {
		if {[catch {set v $global_config($name)}]} {
			set global_config($name) $default_config($name)
		}
		if {[catch {set v $repo_config($name)}]} {
			set repo_config($name) $default_config($name)
		}
276 277 278
	}
}

279 280 281 282 283 284 285 286
######################################################################
##
## handy utils

proc git {args} {
	return [eval exec git $args]
}

287 288 289 290 291 292 293 294 295 296 297
proc current-branch {} {
	set ref {}
	set fd [open [gitdir HEAD] r]
	if {[gets $fd ref] <16
	 || ![regsub {^ref: refs/heads/} $ref {} ref]} {
		set ref {}
	}
	close $fd
	return $ref
}

298 299 300 301 302 303 304 305 306
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
}

307 308 309 310
######################################################################
##
## version check

311
if {[catch {set _git_version [git --version]} err]} {
312 313 314 315 316
	catch {wm withdraw .}
	error_popup "Cannot determine Git version:

$err

317 318 319 320 321 322
[appname] requires Git 1.5.0 or later."
	exit 1
}
if {![regsub {^git version } $_git_version {} _git_version]} {
	catch {wm withdraw .}
	error_popup "Cannot parse Git version string:\n\n$_git_version"
323 324
	exit 1
}
325 326 327 328 329 330 331 332 333
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
regsub {\.rc[0-9]+$} $_git_version {} _git_version

proc git-version {args} {
	global _git_version

	switch [llength $args] {
	0 {
		return $_git_version
334
	}
335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372

	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]} {
373
	catch {wm withdraw .}
374 375 376 377 378
	error_popup "[appname] requires Git 1.5.0 or later.

You are using [git-version]:

[git --version]"
379 380 381
	exit 1
}

382 383 384 385
######################################################################
##
## repository setup

386 387 388 389 390 391 392 393
if {[catch {
		set _gitdir $env(GIT_DIR)
		set _prefix {}
		}]
	&& [catch {
		set _gitdir [git rev-parse --git-dir]
		set _prefix [git rev-parse --show-prefix]
	} err]} {
394 395
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
396 397
	exit 1
}
398 399 400
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
	catch {set _gitdir [exec cygpath --unix $_gitdir]}
}
401
if {![file isdirectory $_gitdir]} {
402
	catch {wm withdraw .}
403
	error_popup "Git directory not found:\n\n$_gitdir"
404 405
	exit 1
}
406
if {[lindex [file split $_gitdir] end] ne {.git}} {
407
	catch {wm withdraw .}
408
	error_popup "Cannot use funny .git directory:\n\n$_gitdir"
409 410
	exit 1
}
411
if {[catch {cd [file dirname $_gitdir]} err]} {
412
	catch {wm withdraw .}
413
	error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
414
	exit 1
415
}
416 417
set _reponame [lindex [file split \
	[file normalize [file dirname $_gitdir]]] \
418
	end]
419

420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437
######################################################################
##
## global init

set current_diff_path {}
set current_diff_side {}
set diff_actions [list]
set ui_status_value {Initializing...}

set HEAD {}
set PARENT {}
set MERGE_HEAD [list]
set commit_type {}
set empty_tree {}
set current_branch {}
set current_diff_path {}
set selected_commit_type new

S
Shawn O. Pearce 已提交
438 439
######################################################################
##
440
## task management
S
Shawn O. Pearce 已提交
441

442
set rescan_active 0
443
set diff_active 0
444
set last_clicked {}
445

446 447 448 449 450
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
451

452
	if {$index_lock_type eq {none}} {
453 454 455 456 457
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
458
	} elseif {$index_lock_type eq "begin-$type"} {
459
		set index_lock_type $type
460 461 462 463
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
464

465 466 467 468 469 470 471 472 473 474 475 476 477
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

478
proc repository_state {ctvar hdvar mhvar} {
479
	global current_branch
480 481 482
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
483

484
	set current_branch [current-branch]
485
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
486
		set hd {}
487
		set ct initial
488 489 490
		return
	}

491
	set merge_head [gitdir MERGE_HEAD]
492
	if {[file exists $merge_head]} {
493
		set ct merge
494 495 496 497 498 499
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
500
	}
501 502

	set ct normal
503 504
}

505 506 507
proc PARENT {} {
	global PARENT empty_tree

508 509 510
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
511 512
	}
	if {$empty_tree eq {}} {
513
		set empty_tree [git mktree << {}]
514 515 516 517
	}
	return $empty_tree
}

518
proc rescan {after {honor_trustmtime 1}} {
519
	global HEAD PARENT MERGE_HEAD commit_type
520
	global ui_index ui_workdir ui_status_value ui_comm
521
	global rescan_active file_states
522
	global repo_config
S
Shawn O. Pearce 已提交
523

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

526
	repository_state newType newHEAD newMERGE_HEAD
527
	if {[string match amend* $commit_type]
528 529
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
530
	} else {
531 532 533 534
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
535 536
	}

S
Shawn O. Pearce 已提交
537 538
	array unset file_states

539
	if {![$ui_comm edit modified]
540
		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
541 542
		if {[string match amend* $commit_type]} {
		} elseif {[load_message GITGUI_MSG]} {
543 544 545
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
546
		$ui_comm edit reset
547
		$ui_comm edit modified false
548 549
	}

550
	if {[is_enabled branch]} {
551 552 553 554
		load_all_heads
		populate_branch_menu
	}

555
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
556
		rescan_stage2 {} $after
557
	} else {
558
		set rescan_active 1
559
		set ui_status_value {Refreshing file status...}
560 561 562 563 564 565
		set cmd [list git update-index]
		lappend cmd -q
		lappend cmd --unmerged
		lappend cmd --ignore-missing
		lappend cmd --refresh
		set fd_rf [open "| $cmd" r]
566
		fconfigure $fd_rf -blocking 0 -translation binary
567
		fileevent $fd_rf readable \
568
			[list rescan_stage2 $fd_rf $after]
569
	}
570 571
}

572
proc rescan_stage2 {fd after} {
573
	global ui_status_value
574
	global rescan_active buf_rdi buf_rdf buf_rlo
575

576
	if {$fd ne {}} {
577 578 579 580
		read $fd
		if {![eof $fd]} return
		close $fd
	}
581

S
Shawn O. Pearce 已提交
582 583
	set ls_others [list | git ls-files --others -z \
		--exclude-per-directory=.gitignore]
584
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
585 586 587 588
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}

589 590 591 592
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

593
	set rescan_active 3
594
	set ui_status_value {Scanning for modified files ...}
595
	set fd_di [open "| git diff-index --cached -z [PARENT]" r]
S
Shawn O. Pearce 已提交
596 597 598
	set fd_df [open "| git diff-files -z" r]
	set fd_lo [open $ls_others r]

599 600 601
	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
602 603 604
	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 已提交
605 606
}

607
proc load_message {file} {
608
	global ui_comm
609

610
	set f [gitdir $file]
611
	if {[file isfile $f]} {
612 613 614
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
615
		set content [string trim [read $fd]]
616
		close $fd
617
		regsub -all -line {[ \r\t]+$} $content {} content
618 619 620 621 622 623 624
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

625
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
626 627 628
	global buf_rdi

	append buf_rdi [read $fd]
629 630 631 632 633 634 635 636 637 638
	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
639
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
640
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
641
		merge_state \
642
			[encoding convertfrom $p] \
643 644
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
645 646
			[list]
		set c $z2
647
		incr c
S
Shawn O. Pearce 已提交
648
	}
649 650 651 652 653 654
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

655
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
656 657
}

658
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
659 660 661
	global buf_rdf

	append buf_rdf [read $fd]
662 663 664 665 666 667 668 669 670 671
	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
672
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
673
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
674
		merge_state \
675
			[encoding convertfrom $p] \
676
			?[lindex $i 4] \
677
			[list] \
678
			[list [lindex $i 0] [lindex $i 2]]
679
		set c $z2
680
		incr c
681 682 683 684 685
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
686
	}
687

688
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
689 690
}

691
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
692 693 694 695 696 697
	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] {
698
		merge_state [encoding convertfrom $p] ?O
S
Shawn O. Pearce 已提交
699
	}
700
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
701 702
}

703
proc rescan_done {fd buf after} {
704
	global rescan_active current_diff_path
705
	global file_states repo_config
706
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
707

708 709 710
	if {![eof $fd]} return
	set to_clear {}
	close $fd
711
	if {[incr rescan_active -1] > 0} return
712

713
	prune_selection
714 715
	unlock_index
	display_all_files
716
	if {$current_diff_path ne {}} reshow_diff
717
	uplevel #0 $after
S
Shawn O. Pearce 已提交
718 719
}

720 721 722 723 724 725 726 727 728 729
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 已提交
730 731
######################################################################
##
732
## ui helpers
S
Shawn O. Pearce 已提交
733

734 735 736 737 738 739 740 741 742
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 已提交
743

744 745
proc mapdesc {state path} {
	global all_descs
746

747 748 749 750 751 752
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
753

754 755 756 757
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
758 759
}

760 761
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
762 763
}

764 765
set next_icon_id 0
set null_sha1 [string repeat 0 40]
766

767 768
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
769

770 771
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
772

773 774 775 776 777 778 779 780 781
	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]}
	}
782

783 784
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
785

786 787
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
788

789 790 791 792 793 794
	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
	}
795

796 797 798 799 800
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
801

802 803
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
804

805
	if {$new_m eq {_}} {
806
		set lno [lsearch -sorted -exact $file_lists($w) $path]
807
		if {$lno >= 0} {
808
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
809
			incr lno
810 811 812
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
813
		}
814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829
	} 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
830
	}
831 832 833 834 835
}

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

837
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
838
	set s $file_states($path)
839 840
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
841

842 843 844 845 846 847 848
	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 已提交
849
	}
850
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
851

852 853 854 855
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
856
	}
857 858 859 860
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
861
	}
862 863 864 865 866
	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 已提交
867
	}
868
}
S
Shawn O. Pearce 已提交
869

870 871 872 873 874 875 876 877 878 879
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 已提交
880 881
}

882 883 884 885
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
S
Shawn O. Pearce 已提交
886

887 888
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
889

890 891 892
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
893

894 895
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
896

897 898 899 900 901 902 903 904 905
	foreach path [lsort [array names file_states]] {
		set s $file_states($path)
		set m [lindex $s 0]
		set icon_name [lindex $s 1]

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

908 909 910 911
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
912
		}
913 914 915
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
916 917 918
		}
	}

919 920
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
921 922
}

923 924
######################################################################
##
925
## icons
926

927 928 929 930 931 932 933 934
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 已提交
935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953

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

954 955 956 957
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 已提交
958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998
   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
} -maskdata $filemask

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

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

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

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

999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023
set file_dir_data {
#define file_width 18
#define file_height 18
static unsigned char file_bits[] = {
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
  0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
  0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
  0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
}
image create bitmap file_dir -background white -foreground blue \
	-data $file_dir_data -maskdata $file_dir_data
unset file_dir_data

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

1025
set ui_index .vpane.files.index.list
1026
set ui_workdir .vpane.files.workdir.list
1027 1028 1029 1030 1031 1032 1033 1034 1035 1036

set all_icons(_$ui_index)   file_plain
set all_icons(A$ui_index)   file_fulltick
set all_icons(M$ui_index)   file_fulltick
set all_icons(D$ui_index)   file_removed
set all_icons(U$ui_index)   file_merge

set all_icons(_$ui_workdir) file_plain
set all_icons(M$ui_workdir) file_mod
set all_icons(D$ui_workdir) file_question
1037
set all_icons(U$ui_workdir) file_merge
1038 1039
set all_icons(O$ui_workdir) file_plain

1040
set max_status_desc 0
S
Shawn O. Pearce 已提交
1041
foreach i {
1042 1043
		{__ "Unmodified"}

1044 1045 1046 1047 1048 1049 1050 1051 1052
		{_M "Modified, not staged"}
		{M_ "Staged for commit"}
		{MM "Portions staged for commit"}
		{MD "Staged for commit, missing"}

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

		{_D "Missing"}
1055 1056
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
1057

1058
		{U_ "Requires merge resolution"}
1059
		{UU "Requires merge resolution"}
1060 1061
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
1062
	} {
1063 1064
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1065
	}
1066
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1067
}
1068
unset i
S
Shawn O. Pearce 已提交
1069 1070 1071 1072 1073

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

1074 1075 1076 1077 1078 1079 1080
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		bind $w <Control-Button-1> $cmd
	}
}

1081 1082 1083 1084 1085 1086 1087 1088 1089
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}
}

1090 1091 1092 1093 1094
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
1095
	font configure ${font}italic -size $sz
1096 1097
}

S
Shawn O. Pearce 已提交
1098 1099 1100 1101
######################################################################
##
## ui commands

1102
set starting_gitk_msg {Starting gitk... please wait...}
1103

1104
proc do_gitk {revs} {
1105 1106 1107 1108 1109
	global env ui_status_value starting_gitk_msg

	# -- Always start gitk through whatever we were loaded with.  This
	#    lets us bypass using shell process on Windows systems.
	#
1110
	set cmd [list [info nameofexecutable]]
1111 1112
	set exe [gitexec gitk]
	lappend cmd $exe
1113 1114 1115
	if {$revs ne {}} {
		append cmd { }
		append cmd $revs
1116
	}
1117

1118 1119
	if {! [file exists $exe]} {
		error_popup "Unable to start gitk:\n\n$exe does not exist"
S
Shawn O. Pearce 已提交
1120
	} else {
1121
		eval exec $cmd &
1122 1123 1124 1125 1126 1127
		set ui_status_value $starting_gitk_msg
		after 10000 {
			if {$ui_status_value eq $starting_gitk_msg} {
				set ui_status_value {Ready.}
			}
		}
S
Shawn O. Pearce 已提交
1128 1129 1130
	}
}

1131
set is_quitting 0
1132

S
Shawn O. Pearce 已提交
1133
proc do_quit {} {
1134
	global ui_comm is_quitting repo_config commit_type
1135

1136 1137
	if {$is_quitting} return
	set is_quitting 1
1138

1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154
	if {[winfo exists $ui_comm]} {
		# -- Stash our current commit buffer.
		#
		set save [gitdir GITGUI_MSG]
		set msg [string trim [$ui_comm get 0.0 end]]
		regsub -all -line {[ \r\t]+$} $msg {} msg
		if {(![string match amend* $commit_type]
			|| [$ui_comm edit modified])
			&& $msg ne {}} {
			catch {
				set fd [open $save w]
				puts -nonewline $fd $msg
				close $fd
			}
		} else {
			catch {file delete $save}
1155 1156
		}

1157 1158 1159 1160 1161 1162 1163 1164 1165 1166
		# -- Stash our current window geometry into this repository.
		#
		set cfg_geometry [list]
		lappend cfg_geometry [wm geometry .]
		lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
		lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
			set rc_geometry {}
		}
		if {$cfg_geometry ne $rc_geometry} {
1167
			catch {git config gui.geometry $cfg_geometry}
1168
		}
1169 1170
	}

S
Shawn O. Pearce 已提交
1171 1172 1173 1174
	destroy .
}

proc do_rescan {} {
1175
	rescan {set ui_status_value {Ready.}}
S
Shawn O. Pearce 已提交
1176 1177
}

1178
proc do_commit {} {
1179
	commit_tree
1180 1181
}

1182
proc toggle_or_diff {w x y} {
1183
	global file_states file_lists current_diff_path ui_index ui_workdir
1184
	global last_clicked selected_paths
1185

S
Shawn O. Pearce 已提交
1186 1187 1188
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
1189 1190 1191 1192 1193 1194 1195 1196 1197
	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
1198
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
1199

1200
	if {$col == 0} {
1201
		if {$current_diff_path eq $path} {
1202 1203 1204 1205
			set after {reshow_diff;}
		} else {
			set after {}
		}
1206
		if {$w eq $ui_index} {
1207
			update_indexinfo \
1208
				"Unstaging [short_path $path] from commit" \
1209 1210
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
1211
		} elseif {$w eq $ui_workdir} {
1212
			update_index \
1213
				"Adding [short_path $path]" \
1214 1215 1216
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
		}
1217
	} else {
1218
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
1219 1220 1221
	}
}

1222
proc add_one_to_selection {w x y} {
1223
	global file_lists last_clicked selected_paths
1224

1225
	set lno [lindex [split [$w index @$x,$y] .] 0]
1226 1227 1228 1229 1230
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
1231

1232 1233 1234 1235 1236 1237
	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
	}

1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251
	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} {
1252
	global file_lists last_clicked selected_paths
1253 1254 1255 1256

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

1259
	set lno [lindex [split [$w index @$x,$y] .] 0]
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274
	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 已提交
1275 1276 1277 1278
}

######################################################################
##
1279
## config defaults
S
Shawn O. Pearce 已提交
1280

1281
set cursor_ptr arrow
1282 1283 1284 1285 1286 1287 1288 1289
font create font_diff -family Courier -size 10
font create font_ui
catch {
	label .dummy
	eval font configure font_ui [font actual [.dummy cget -font]]
	destroy .dummy
}

1290
font create font_uiitalic
1291 1292
font create font_uibold
font create font_diffbold
1293
font create font_diffitalic
S
Shawn O. Pearce 已提交
1294

1295 1296
foreach class {Button Checkbutton Entry Label
		Labelframe Listbox Menu Message
1297
		Radiobutton Spinbox Text} {
1298 1299 1300 1301
	option add *$class.font font_ui
}
unset class

1302 1303 1304 1305
if {[is_Windows] || [is_MacOSX]} {
	option add *Menu.tearOff 0
}

1306
if {[is_MacOSX]} {
1307 1308
	set M1B M1
	set M1T Cmd
1309
} else {
1310 1311
	set M1B Control
	set M1T Ctrl
1312 1313
}

1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328
proc apply_config {} {
	global repo_config font_descs

	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		if {[catch {
			foreach {cn cv} $repo_config(gui.$name) {
				font configure $font $cn $cv
			}
			} err]} {
			error_popup "Invalid font specified in gui.$name:\n\n$err"
		}
		foreach {cn cv} [font configure $font] {
			font configure ${font}bold $cn $cv
1329
			font configure ${font}italic $cn $cv
1330 1331
		}
		font configure ${font}bold -weight bold
1332
		font configure ${font}italic -slant italic
1333 1334 1335
	}
}

1336
set default_config(merge.diffstat) true
1337
set default_config(merge.summary) false
1338
set default_config(merge.verbosity) 2
1339 1340 1341
set default_config(user.name) {}
set default_config(user.email) {}

1342
set default_config(gui.pruneduringfetch) false
1343
set default_config(gui.trustmtime) false
1344
set default_config(gui.diffcontext) 5
1345
set default_config(gui.newbranchtemplate) {}
1346 1347 1348 1349 1350 1351
set default_config(gui.fontui) [font configure font_ui]
set default_config(gui.fontdiff) [font configure font_diff]
set font_descs {
	{fontui   font_ui   {Main Font}}
	{fontdiff font_diff {Diff/Console Font}}
}
1352
load_config 0
1353 1354
apply_config

1355 1356 1357 1358
######################################################################
##
## feature option selection

1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371
if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
	unset _junk
} else {
	set subcommand gui
}
if {$subcommand eq {gui.sh}} {
	set subcommand gui
}
if {$subcommand eq {gui} && [llength $argv] > 0} {
	set subcommand [lindex $argv 0]
	set argv [lrange $argv 1 end]
}

1372 1373 1374 1375
enable_option multicommit
enable_option branch
enable_option transport

1376
switch -- $subcommand {
1377
browser -
1378
blame {
1379 1380 1381 1382
	disable_option multicommit
	disable_option branch
	disable_option transport
}
1383 1384
citool {
	enable_option singlecommit
1385 1386 1387 1388 1389 1390 1391

	disable_option multicommit
	disable_option branch
	disable_option transport
}
}

1392 1393 1394 1395
######################################################################
##
## ui construction

1396 1397
set ui_comm {}

S
Shawn O. Pearce 已提交
1398
# -- Menu Bar
1399
#
1400
menu .mbar -tearoff 0
1401 1402
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
1403
if {[is_enabled branch]} {
1404
	.mbar add cascade -label Branch -menu .mbar.branch
S
Shawn O. Pearce 已提交
1405
}
1406
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1407
	.mbar add cascade -label Commit -menu .mbar.commit
1408
}
1409
if {[is_enabled transport]} {
1410 1411 1412
	.mbar add cascade -label Merge -menu .mbar.merge
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Push -menu .mbar.push
1413
}
S
Shawn O. Pearce 已提交
1414 1415
. configure -menu .mbar

1416
# -- Repository Menu
1417
#
1418
menu .mbar.repository
1419 1420 1421

.mbar.repository add command \
	-label {Browse Current Branch} \
1422
	-command {browser::new $current_branch}
1423
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1424 1425
.mbar.repository add separator

1426 1427
.mbar.repository add command \
	-label {Visualize Current Branch} \
1428
	-command {do_gitk $current_branch}
1429
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1430 1431
.mbar.repository add command \
	-label {Visualize All Branches} \
1432
	-command {do_gitk --all}
1433
.mbar.repository add separator
1434

1435
if {[is_enabled multicommit]} {
1436
	.mbar.repository add command -label {Database Statistics} \
1437
		-command do_stats
1438

1439
	.mbar.repository add command -label {Compress Database} \
1440
		-command do_gc
1441

1442
	.mbar.repository add command -label {Verify Database} \
1443
		-command do_fsck_objects
1444

1445
	.mbar.repository add separator
1446

1447 1448 1449
	if {[is_Cygwin]} {
		.mbar.repository add command \
			-label {Create Desktop Icon} \
1450
			-command do_cygwin_shortcut
1451
	} elseif {[is_Windows]} {
1452
		.mbar.repository add command \
1453
			-label {Create Desktop Icon} \
1454
			-command do_windows_shortcut
1455
	} elseif {[is_MacOSX]} {
1456
		.mbar.repository add command \
1457
			-label {Create Desktop Icon} \
1458
			-command do_macosx_app
1459
	}
1460
}
1461

1462
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
1463
	-command do_quit \
1464
	-accelerator $M1T-Q
S
Shawn O. Pearce 已提交
1465

1466 1467 1468 1469 1470
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
1471
	-accelerator $M1T-Z
1472 1473
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
1474
	-accelerator $M1T-Y
1475 1476 1477
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
1478
	-accelerator $M1T-X
1479 1480
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
1481
	-accelerator $M1T-C
1482 1483
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
1484
	-accelerator $M1T-V
1485 1486
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
1487
	-accelerator Del
1488 1489 1490
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
1491
	-accelerator $M1T-A
1492

1493 1494
# -- Branch Menu
#
1495
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
1496 1497 1498
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
1499
		-command branch_create::dialog \
1500
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
1501 1502 1503
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

1504 1505 1506 1507 1508
	.mbar.branch add command -label {Rename...} \
		-command branch_rename::dialog
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

S
Shawn O. Pearce 已提交
1509
	.mbar.branch add command -label {Delete...} \
1510
		-command branch_delete::dialog
S
Shawn O. Pearce 已提交
1511 1512
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
1513 1514

	.mbar.branch add command -label {Reset...} \
1515
		-command merge::reset_hard
1516 1517
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
1518 1519
}

S
Shawn O. Pearce 已提交
1520
# -- Commit Menu
1521
#
1522 1523 1524 1525 1526 1527 1528
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
	menu .mbar.commit

	.mbar.commit add radiobutton \
		-label {New Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1529
		-value new
1530 1531
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1532

1533 1534 1535 1536
	.mbar.commit add radiobutton \
		-label {Amend Last Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1537
		-value amend
1538 1539
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1540

1541
	.mbar.commit add separator
1542

1543 1544
	.mbar.commit add command -label Rescan \
		-command do_rescan \
1545
		-accelerator F5
1546 1547
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1548

1549
	.mbar.commit add command -label {Add To Commit} \
1550
		-command do_add_selection
1551 1552
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1553

1554
	.mbar.commit add command -label {Add Existing To Commit} \
1555
		-command do_add_all \
1556
		-accelerator $M1T-I
1557 1558
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1559

1560
	.mbar.commit add command -label {Unstage From Commit} \
1561
		-command do_unstage_selection
1562 1563
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1564

1565
	.mbar.commit add command -label {Revert Changes} \
1566
		-command do_revert_selection
1567 1568
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1569

1570
	.mbar.commit add separator
1571

1572 1573
	.mbar.commit add command -label {Sign Off} \
		-command do_signoff \
1574
		-accelerator $M1T-S
1575

1576 1577
	.mbar.commit add command -label Commit \
		-command do_commit \
1578
		-accelerator $M1T-Return
1579 1580 1581
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
1582

1583 1584 1585 1586 1587
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
	.mbar.merge add command -label {Local Merge...} \
1588
		-command merge::dialog
1589 1590 1591
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
	.mbar.merge add command -label {Abort Merge...} \
1592
		-command merge::reset_hard
1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]

}

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

	menu .mbar.push
	.mbar.push add command -label {Push...} \
1605 1606
		-command do_push_anywhere \
		-accelerator $M1T-P
1607 1608
	.mbar.push add command -label {Delete...} \
		-command remote_branch_delete::dialog
1609 1610
}

S
Shawn O. Pearce 已提交
1611 1612 1613 1614 1615 1616
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

1617
	.mbar.apple add command -label "About [appname]" \
1618
		-command do_about
1619
	.mbar.apple add command -label "Options..." \
1620
		-command do_options
S
Shawn O. Pearce 已提交
1621 1622 1623 1624 1625
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
1626
		-command do_options
S
Shawn O. Pearce 已提交
1627

1628 1629
	# -- Tools Menu
	#
1630
	if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
1631
	proc do_miga {} {
1632
		global ui_status_value
1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650
		if {![lock_index update]} return
		set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
		set miga_fd [open "|$cmd" r]
		fconfigure $miga_fd -blocking 0
		fileevent $miga_fd readable [list miga_done $miga_fd]
		set ui_status_value {Running miga...}
	}
	proc miga_done {fd} {
		read $fd 512
		if {[eof $fd]} {
			close $fd
			unlock_index
			rescan [list set ui_status_value {Ready.}]
		}
	}
	.mbar add cascade -label Tools -menu .mbar.tools
	menu .mbar.tools
	.mbar.tools add command -label "Migrate" \
1651
		-command do_miga
1652 1653 1654
	lappend disable_on_lock \
		[list .mbar.tools entryconf [.mbar.tools index last] -state]
	}
1655
}
1656

1657 1658
# -- Help Menu
#
1659
.mbar add cascade -label Help -menu .mbar.help
1660
menu .mbar.help
S
Shawn O. Pearce 已提交
1661

1662
if {![is_MacOSX]} {
1663
	.mbar.help add command -label "About [appname]" \
1664
		-command do_about
S
Shawn O. Pearce 已提交
1665
}
S
Shawn O. Pearce 已提交
1666

1667 1668
set browser {}
catch {set browser $repo_config(instaweb.browser)}
1669
set doc_path [file dirname [gitexec]]
1670 1671
set doc_path [file join $doc_path Documentation index.html]

1672
if {[is_Cygwin]} {
1673
	set doc_path [exec cygpath --mixed $doc_path]
1674 1675 1676 1677 1678
}

if {$browser eq {}} {
	if {[is_MacOSX]} {
		set browser open
1679
	} elseif {[is_Cygwin]} {
1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700
		set program_files [file dirname [exec cygpath --windir]]
		set program_files [file join $program_files {Program Files}]
		set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
		set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
		if {[file exists $firefox]} {
			set browser $firefox
		} elseif {[file exists $ie]} {
			set browser $ie
		}
		unset program_files firefox ie
	}
}

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

if {$browser ne {}} {
	.mbar.help add command -label {Online Documentation} \
1701
		-command [list exec $browser $doc_url &]
1702 1703
}
unset browser doc_path doc_url
S
Shawn O. Pearce 已提交
1704

1705 1706
# -- Standard bindings
#
1707
wm protocol . WM_DELETE_WINDOW do_quit
1708 1709 1710 1711 1712
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]}

1713 1714 1715 1716 1717 1718
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

1719 1720
# -- Not a normal commit type invocation?  Do that instead!
#
1721
switch -- $subcommand {
1722
browser {
1723 1724
	set subcommand_args {rev?}
	switch [llength $argv] {
1725 1726
	0 { set current_branch [current-branch] }
	1 { set current_branch [lindex $argv 0] }
1727
	default usage
1728
	}
1729
	browser::new $current_branch
1730 1731
	return
}
1732
blame {
1733
	set subcommand_args {rev? path?}
1734
	set head {}
1735 1736 1737 1738 1739
	set path {}
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
1740
			set path $_prefix$a
1741 1742 1743
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
1744 1745
				if {$head ne {}} usage
				set head $path
1746 1747 1748
				set path {}
			}
			set is_path 1
1749 1750 1751
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
1752 1753 1754 1755 1756 1757
		} else {
			usage
		}
	}
	unset is_path

1758
	if {$head eq {}} {
1759
		set current_branch [current-branch]
1760 1761
	} else {
		set current_branch $head
1762
	}
1763 1764 1765

	if {$path eq {}} usage
	blame::new $head $path
1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778
	return
}
citool -
gui {
	if {[llength $argv] != 0} {
		puts -nonewline stderr "usage: $argv0"
		if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
			puts -nonewline stderr " $subcommand"
		}
		puts stderr {}
		exit 1
	}
	# fall through to setup UI for commits
1779 1780
}
default {
1781
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
1782 1783 1784 1785
	exit 1
}
}

1786 1787 1788 1789 1790 1791 1792 1793
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
1794
	-justify left
1795 1796 1797
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
1798
	-justify left
1799 1800 1801 1802
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
1803
# -- Main Window Layout
1804
#
S
Shawn O. Pearce 已提交
1805 1806
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
1807
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
1808 1809 1810
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
1811
#
1812
frame .vpane.files.index -height 100 -width 200
1813
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
1814
	-background lightgreen
S
Shawn O. Pearce 已提交
1815
text $ui_index -background white -borderwidth 0 \
1816
	-width 20 -height 10 \
1817
	-wrap none \
1818
	-cursor $cursor_ptr \
1819 1820
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
1821
	-state disabled
1822 1823
scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
S
Shawn O. Pearce 已提交
1824
pack .vpane.files.index.title -side top -fill x
1825 1826
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
1827 1828 1829
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

1830
# -- Working Directory File List
1831
#
1832
frame .vpane.files.workdir -height 100 -width 200
1833
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
1834
	-background lightsalmon
1835
text $ui_workdir -background white -borderwidth 0 \
1836
	-width 20 -height 10 \
1837
	-wrap none \
1838
	-cursor $cursor_ptr \
1839 1840
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
1841
	-state disabled
1842 1843
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
1844
pack .vpane.files.workdir.title -side top -fill x
1845 1846
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
1847 1848
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
1849

1850
foreach i [list $ui_index $ui_workdir] {
1851 1852
	$i tag conf in_diff -background lightgray
	$i tag conf in_sel  -background lightgray
1853 1854
}
unset i
1855

1856
# -- Diff and Commit Area
1857
#
1858
frame .vpane.lower -height 300 -width 400
1859 1860 1861 1862
frame .vpane.lower.commarea
frame .vpane.lower.diff -relief sunken -borderwidth 1
pack .vpane.lower.commarea -side top -fill x
pack .vpane.lower.diff -side bottom -fill both -expand 1
1863
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
1864 1865

# -- Commit Area Buttons
1866
#
1867 1868
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
1869
	-anchor w \
1870
	-justify left
1871 1872
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
1873

1874
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
1875
	-command do_rescan
1876
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
1877 1878
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
1879

1880
button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
1881
	-command do_add_all
1882
pack .vpane.lower.commarea.buttons.incall -side top -fill x
1883 1884
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
1885

1886
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1887
	-command do_signoff
1888
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
1889

1890
button .vpane.lower.commarea.buttons.commit -text {Commit} \
1891
	-command do_commit
1892
pack .vpane.lower.commarea.buttons.commit -side top -fill x
1893 1894
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
1895

1896 1897 1898 1899
button .vpane.lower.commarea.buttons.push -text {Push} \
	-command do_push_anywhere
pack .vpane.lower.commarea.buttons.push -side top -fill x

S
Shawn O. Pearce 已提交
1900
# -- Commit Message Buffer
1901
#
1902
frame .vpane.lower.commarea.buffer
1903
frame .vpane.lower.commarea.buffer.header
1904
set ui_comm .vpane.lower.commarea.buffer.t
1905 1906 1907 1908 1909
set ui_coml .vpane.lower.commarea.buffer.header.l
radiobutton .vpane.lower.commarea.buffer.header.new \
	-text {New Commit} \
	-command do_select_commit_type \
	-variable selected_commit_type \
1910
	-value new
1911 1912 1913 1914 1915 1916
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.new conf -state]
radiobutton .vpane.lower.commarea.buffer.header.amend \
	-text {Amend Last Commit} \
	-command do_select_commit_type \
	-variable selected_commit_type \
1917
	-value amend
1918 1919
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
1920
label $ui_coml \
S
Shawn O. Pearce 已提交
1921
	-anchor w \
1922
	-justify left
1923 1924 1925 1926 1927 1928
proc trace_commit_type {varname args} {
	global ui_coml commit_type
	switch -glob -- $commit_type {
	initial       {set txt {Initial Commit Message:}}
	amend         {set txt {Amended Commit Message:}}
	amend-initial {set txt {Amended Initial Commit Message:}}
1929
	amend-merge   {set txt {Amended Merge Commit Message:}}
1930 1931 1932 1933 1934 1935
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
1936 1937 1938 1939
pack $ui_coml -side left -fill x
pack .vpane.lower.commarea.buffer.header.amend -side right
pack .vpane.lower.commarea.buffer.header.new -side right

S
Shawn O. Pearce 已提交
1940
text $ui_comm -background white -borderwidth 1 \
1941
	-undo true \
1942
	-maxundo 20 \
1943
	-autoseparators true \
S
Shawn O. Pearce 已提交
1944
	-relief sunken \
1945
	-width 75 -height 9 -wrap none \
1946
	-font font_diff \
1947
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
1948 1949
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
1950
pack .vpane.lower.commarea.buffer.header -side top -fill x
1951
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
1952
pack $ui_comm -side left -fill y
1953 1954
pack .vpane.lower.commarea.buffer -side left -fill y

1955 1956
# -- Commit Message Buffer Context Menu
#
1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Cut} \
	-command {tk_textCut $ui_comm}
$ctxm add command \
	-label {Copy} \
	-command {tk_textCopy $ui_comm}
$ctxm add command \
	-label {Paste} \
	-command {tk_textPaste $ui_comm}
$ctxm add command \
	-label {Delete} \
	-command {$ui_comm delete sel.first sel.last}
$ctxm add separator
$ctxm add command \
	-label {Select All} \
1974
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
1975 1976 1977
$ctxm add command \
	-label {Copy All} \
	-command {
1978 1979 1980
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
1981 1982 1983 1984
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
1985
	-command do_signoff
1986
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
1987

1988
# -- Diff Header
1989
#
1990 1991 1992
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
1993 1994 1995 1996 1997
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
1998
		set p $current_diff_path
1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011
		set s [mapdesc [lindex $file_states($p) 0] $p]
		set f {File:}
		set p [escape_path $p]
		set o normal
	}

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

2014
frame .vpane.lower.diff.header -background gold
2015
label .vpane.lower.diff.header.status \
2016
	-background gold \
2017 2018
	-width $max_status_desc \
	-anchor w \
2019
	-justify left
2020
label .vpane.lower.diff.header.file \
2021
	-background gold \
2022
	-anchor w \
2023
	-justify left
2024
label .vpane.lower.diff.header.path \
2025
	-background gold \
2026
	-anchor w \
2027
	-justify left
2028 2029 2030 2031 2032 2033 2034
pack .vpane.lower.diff.header.status -side left
pack .vpane.lower.diff.header.file -side left
pack .vpane.lower.diff.header.path -fill x
set ctxm .vpane.lower.diff.header.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Copy} \
2035 2036 2037 2038 2039
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
2040
			-- $current_diff_path
2041
	}
2042 2043
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2044 2045

# -- Diff Body
2046
#
2047 2048 2049 2050
frame .vpane.lower.diff.body
set ui_diff .vpane.lower.diff.body.t
text $ui_diff -background white -borderwidth 0 \
	-width 80 -height 15 -wrap none \
2051
	-font font_diff \
2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064
	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
	-yscrollcommand {.vpane.lower.diff.body.sby set} \
	-state disabled
scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
	-command [list $ui_diff xview]
scrollbar .vpane.lower.diff.body.sby -orient vertical \
	-command [list $ui_diff yview]
pack .vpane.lower.diff.body.sbx -side bottom -fill x
pack .vpane.lower.diff.body.sby -side right -fill y
pack $ui_diff -side left -fill both -expand 1
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1

2065
$ui_diff tag conf d_cr -elide true
2066 2067
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
2068 2069
$ui_diff tag conf d_- -foreground red

2070
$ui_diff tag conf d_++ -foreground {#00a000}
2071 2072
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
2073 2074
	-foreground {#00a000} \
	-background {#e2effa}
2075 2076
$ui_diff tag conf d_-s \
	-foreground red \
2077
	-background {#e2effa}
2078
$ui_diff tag conf d_s+ \
2079 2080
	-foreground {#00a000} \
	-background ivory1
2081 2082
$ui_diff tag conf d_s- \
	-foreground red \
2083
	-background ivory1
2084 2085 2086 2087 2088 2089 2090 2091 2092 2093

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

2095 2096
$ui_diff tag raise sel

2097 2098
# -- Diff Body Context Menu
#
2099 2100
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
2101 2102 2103
$ctxm add command \
	-label {Refresh} \
	-command reshow_diff
2104
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2105 2106 2107 2108 2109 2110
$ctxm add command \
	-label {Copy} \
	-command {tk_textCopy $ui_diff}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Select All} \
2111
	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2112 2113 2114 2115
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
	-command {
2116 2117 2118
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
2119 2120 2121
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
2122 2123 2124 2125 2126 2127
$ctxm add command \
	-label {Apply/Reverse Hunk} \
	-command {apply_hunk $cursorX $cursorY}
set ui_diff_applyhunk [$ctxm index last]
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
$ctxm add separator
2128 2129
$ctxm add command \
	-label {Decrease Font Size} \
2130
	-command {incr_font_size font_diff -1}
2131 2132 2133
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
2134
	-command {incr_font_size font_diff 1}
2135 2136 2137 2138
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
2139
	-command {if {$repo_config(gui.diffcontext) >= 1} {
2140 2141 2142
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
2143 2144 2145
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
2146
	-command {if {$repo_config(gui.diffcontext) < 99} {
2147 2148
		incr repo_config(gui.diffcontext)
		reshow_diff
2149
	}}
2150 2151 2152
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
2153
	-command do_options
2154 2155 2156 2157 2158 2159 2160 2161 2162 2163
bind_button3 $ui_diff "
	set cursorX %x
	set cursorY %y
	if {\$ui_index eq \$current_diff_side} {
		$ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
	} else {
		$ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
	}
	tk_popup $ctxm %X %Y
"
2164
unset ui_diff_applyhunk
2165

S
Shawn O. Pearce 已提交
2166
# -- Status Bar
2167
#
S
Shawn O. Pearce 已提交
2168 2169 2170 2171
label .status -textvariable ui_status_value \
	-anchor w \
	-justify left \
	-borderwidth 1 \
2172
	-relief sunken
S
Shawn O. Pearce 已提交
2173 2174
pack .status -anchor w -side bottom -fill x

2175
# -- Load geometry
2176
#
2177
catch {
2178
set gm $repo_config(gui.geometry)
2179 2180 2181 2182 2183 2184 2185 2186
wm geometry . [lindex $gm 0]
.vpane sash place 0 \
	[lindex [.vpane sash coord 0] 0] \
	[lindex $gm 1]
.vpane.files sash place 0 \
	[lindex $gm 2] \
	[lindex [.vpane.files sash coord 0] 1]
unset gm
2187
}
2188

S
Shawn O. Pearce 已提交
2189
# -- Key Bindings
2190
#
2191
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2192 2193
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210
bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}

bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
bind $ui_diff <$M1B-Key-v> {break}
bind $ui_diff <$M1B-Key-V> {break}
bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2211 2212 2213 2214
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}
2215 2216 2217 2218 2219 2220
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}
2221
bind $ui_diff <Button-1>   {focus %W}
2222

2223
if {[is_enabled branch]} {
2224 2225
	bind . <$M1B-Key-n> branch_create::dialog
	bind . <$M1B-Key-N> branch_create::dialog
2226
}
2227 2228 2229 2230
if {[is_enabled transport]} {
	bind . <$M1B-Key-p> do_push_anywhere
	bind . <$M1B-Key-P> do_push_anywhere
}
2231

2232 2233 2234
bind .   <Key-F5>     do_rescan
bind .   <$M1B-Key-r> do_rescan
bind .   <$M1B-Key-R> do_rescan
2235 2236
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
2237 2238
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
2239
bind .   <$M1B-Key-Return> do_commit
2240
foreach i [list $ui_index $ui_workdir] {
2241 2242 2243
	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 已提交
2244
}
2245 2246 2247
unset i

set file_lists($ui_index) [list]
2248
set file_lists($ui_workdir) [list]
2249

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

2253 2254 2255
# -- 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.
2256
#
2257
if {[is_Cygwin]} {
2258 2259 2260 2261 2262 2263
	set ignored_env 0
	set suggest_user {}
	set msg "Possible environment issues exist.

The following environment variables are probably
going to be ignored by any Git subprocess run
2264
by [appname]:
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 2304 2305 2306 2307

"
	foreach name [array names env] {
		switch -regexp -- $name {
		{^GIT_INDEX_FILE$} -
		{^GIT_OBJECT_DIRECTORY$} -
		{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
		{^GIT_DIFF_OPTS$} -
		{^GIT_EXTERNAL_DIFF$} -
		{^GIT_PAGER$} -
		{^GIT_TRACE$} -
		{^GIT_CONFIG$} -
		{^GIT_CONFIG_LOCAL$} -
		{^GIT_(AUTHOR|COMMITTER)_DATE$} {
			append msg " - $name\n"
			incr ignored_env
		}
		{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
			append msg " - $name\n"
			incr ignored_env
			set suggest_user $name
		}
		}
	}
	if {$ignored_env > 0} {
		append msg "
This is due to a known issue with the
Tcl binary distributed by Cygwin."

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

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

2308 2309
# -- Only initialize complex UI if we are going to stay running.
#
2310
if {[is_enabled transport]} {
2311
	load_all_remotes
2312
	load_all_heads
2313

2314
	populate_branch_menu
2315 2316
	populate_fetch_menu
	populate_push_menu
2317
}
2318

2319 2320
# -- Only suggest a gc run if we are going to stay running.
#
2321
if {[is_enabled multicommit]} {
2322 2323
	set object_limit 2000
	if {[is_Windows]} {set object_limit 200}
2324
	regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
2325 2326 2327 2328
	if {$objects_current >= $object_limit} {
		if {[ask_popup \
			"This repository currently has $objects_current loose objects.

2329
To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2330 2331 2332 2333 2334 2335 2336 2337

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

2338
lock_index begin-read
2339
after 1 do_rescan