git-gui.sh 55.9 KB
Newer Older
1
#!/bin/sh
S
Shawn O. Pearce 已提交
2 3 4
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@"

5
set appvers {@@GITGUI_VERSION@@}
6
set copyright {
7
Copyright  2006, 2007 Shawn Pearce, et. al.
8

9 10 11 12 13 14 15 16 17 18 19 20 21
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 已提交
22

23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
######################################################################
##
## 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
	}
}

41 42 43 44 45
######################################################################
##
## configure our library

set oguilib {@@GITGUI_LIBDIR@@}
46 47 48 49 50
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]} {
51 52
	set oguilib [file join [file dirname [file normalize $argv0]] lib]
}
53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
set idx [file join $oguilib tclIndex]
catch {
	set fd [open $idx r]
	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
		puts $p
		source [file join $oguilib $p]
		lappend loaded $p
	}
	unset loaded p
} else {
	set auto_path [concat [list $oguilib] $auto_path]
}
80
unset -nocomplain oguirel idx fd
81

82 83 84 85 86 87
######################################################################
##
## read only globals

set _appname [lindex [file split $argv0] end]
set _gitdir {}
88
set _gitexec {}
89
set _reponame {}
90
set _iscygwin {}
91 92 93 94 95 96

proc appname {} {
	global _appname
	return $_appname
}

97
proc gitdir {args} {
98
	global _gitdir
99 100 101 102
	if {$args eq {}} {
		return $_gitdir
	}
	return [eval [concat [list file join $_gitdir] $args]]
103 104
}

105 106 107
proc gitexec {args} {
	global _gitexec
	if {$_gitexec eq {}} {
108
		if {[catch {set _gitexec [git --exec-path]} err]} {
109 110 111 112 113 114 115 116 117
			error "Git not installed?\n\n$err"
		}
	}
	if {$args eq {}} {
		return $_gitexec
	}
	return [eval [concat [list file join $_gitexec] $args]]
}

118 119 120 121
proc reponame {} {
	global _reponame
	return $_reponame
}
122

123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
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
}

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

171 172 173 174
######################################################################
##
## config

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

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

196
proc load_config {include_global} {
197 198 199
	global repo_config global_config default_config

	array unset global_config
200 201
	if {$include_global} {
		catch {
202
			set fd_rc [open "| git config --global --list" r]
203 204 205 206 207 208 209
			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
					}
210 211
				}
			}
212
			close $fd_rc
213 214
		}
	}
215 216

	array unset repo_config
217
	catch {
218
		set fd_rc [open "| git config --list" r]
219 220
		while {[gets $fd_rc line] >= 0} {
			if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
221 222 223 224 225
				if {[is_many_config $name]} {
					lappend repo_config($name) $value
				} else {
					set repo_config($name) $value
				}
226 227 228 229 230
			}
		}
		close $fd_rc
	}

231 232 233 234 235 236 237
	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)
		}
238 239 240
	}
}

241 242 243 244 245 246 247 248
######################################################################
##
## handy utils

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

249 250 251 252 253 254 255 256 257
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
}

258 259 260 261
######################################################################
##
## version check

262 263 264 265 266
if {{--version} eq $argv || {version} eq $argv} {
	puts "git-gui version $appvers"
	exit
}

267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294
set req_maj 1
set req_min 5

if {[catch {set v [git --version]} err]} {
	catch {wm withdraw .}
	error_popup "Cannot determine Git version:

$err

[appname] requires Git $req_maj.$req_min or later."
	exit 1
}
if {[regexp {^git version (\d+)\.(\d+)} $v _junk act_maj act_min]} {
	if {$act_maj < $req_maj
		|| ($act_maj == $req_maj && $act_min < $req_min)} {
		catch {wm withdraw .}
		error_popup "[appname] requires Git $req_maj.$req_min or later.

You are using $v."
		exit 1
	}
} else {
	catch {wm withdraw .}
	error_popup "Cannot parse Git version string:\n\n$v"
	exit 1
}
unset -nocomplain v _junk act_maj act_min req_maj req_min

295 296 297 298
######################################################################
##
## repository setup

299 300 301 302 303 304 305 306
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]} {
307 308
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
309 310
	exit 1
}
311 312 313
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
	catch {set _gitdir [exec cygpath --unix $_gitdir]}
}
314
if {![file isdirectory $_gitdir]} {
315
	catch {wm withdraw .}
316
	error_popup "Git directory not found:\n\n$_gitdir"
317 318
	exit 1
}
319
if {[lindex [file split $_gitdir] end] ne {.git}} {
320
	catch {wm withdraw .}
321
	error_popup "Cannot use funny .git directory:\n\n$_gitdir"
322 323
	exit 1
}
324
if {[catch {cd [file dirname $_gitdir]} err]} {
325
	catch {wm withdraw .}
326
	error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
327
	exit 1
328
}
329 330
set _reponame [lindex [file split \
	[file normalize [file dirname $_gitdir]]] \
331
	end]
332

333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350
######################################################################
##
## 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 已提交
351 352
######################################################################
##
353
## task management
S
Shawn O. Pearce 已提交
354

355
set rescan_active 0
356
set diff_active 0
357
set last_clicked {}
358

359 360 361 362 363
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
364

365
	if {$index_lock_type eq {none}} {
366 367 368 369 370
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
371
	} elseif {$index_lock_type eq "begin-$type"} {
372
		set index_lock_type $type
373 374 375 376
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
377

378 379 380 381 382 383 384 385 386 387 388 389 390
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

391
proc repository_state {ctvar hdvar mhvar} {
392
	global current_branch
393 394 395
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
396

397
	if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
398 399
		set current_branch {}
	} else {
400
		regsub ^refs/((heads|tags|remotes)/)? \
401 402 403 404 405
			$current_branch \
			{} \
			current_branch
	}

406
	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
407
		set hd {}
408
		set ct initial
409 410 411
		return
	}

412
	set merge_head [gitdir MERGE_HEAD]
413
	if {[file exists $merge_head]} {
414
		set ct merge
415 416 417 418 419 420
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
421
	}
422 423

	set ct normal
424 425
}

426 427 428
proc PARENT {} {
	global PARENT empty_tree

429 430 431
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
432 433
	}
	if {$empty_tree eq {}} {
434
		set empty_tree [git mktree << {}]
435 436 437 438
	}
	return $empty_tree
}

439
proc rescan {after {honor_trustmtime 1}} {
440
	global HEAD PARENT MERGE_HEAD commit_type
441
	global ui_index ui_workdir ui_status_value ui_comm
442
	global rescan_active file_states
443
	global repo_config
S
Shawn O. Pearce 已提交
444

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

447
	repository_state newType newHEAD newMERGE_HEAD
448
	if {[string match amend* $commit_type]
449 450
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
451
	} else {
452 453 454 455
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
456 457
	}

S
Shawn O. Pearce 已提交
458 459
	array unset file_states

460
	if {![$ui_comm edit modified]
461
		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
462 463 464 465
		if {[load_message GITGUI_MSG]} {
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
466
		$ui_comm edit reset
467
		$ui_comm edit modified false
468 469
	}

470
	if {[is_enabled branch]} {
471 472 473 474
		load_all_heads
		populate_branch_menu
	}

475
	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
476
		rescan_stage2 {} $after
477
	} else {
478
		set rescan_active 1
479
		set ui_status_value {Refreshing file status...}
480 481 482 483 484 485
		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]
486
		fconfigure $fd_rf -blocking 0 -translation binary
487
		fileevent $fd_rf readable \
488
			[list rescan_stage2 $fd_rf $after]
489
	}
490 491
}

492
proc rescan_stage2 {fd after} {
493
	global ui_status_value
494
	global rescan_active buf_rdi buf_rdf buf_rlo
495

496
	if {$fd ne {}} {
497 498 499 500
		read $fd
		if {![eof $fd]} return
		close $fd
	}
501

S
Shawn O. Pearce 已提交
502 503
	set ls_others [list | git ls-files --others -z \
		--exclude-per-directory=.gitignore]
504
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
505 506 507 508
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}

509 510 511 512
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

513
	set rescan_active 3
514
	set ui_status_value {Scanning for modified files ...}
515
	set fd_di [open "| git diff-index --cached -z [PARENT]" r]
S
Shawn O. Pearce 已提交
516 517 518
	set fd_df [open "| git diff-files -z" r]
	set fd_lo [open $ls_others r]

519 520 521
	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
522 523 524
	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 已提交
525 526
}

527
proc load_message {file} {
528
	global ui_comm
529

530
	set f [gitdir $file]
531
	if {[file isfile $f]} {
532 533 534
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
535
		set content [string trim [read $fd]]
536
		close $fd
537
		regsub -all -line {[ \r\t]+$} $content {} content
538 539 540 541 542 543 544
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

545
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
546 547 548
	global buf_rdi

	append buf_rdi [read $fd]
549 550 551 552 553 554 555 556 557 558
	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
559
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
560
		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
561
		merge_state \
562
			[encoding convertfrom $p] \
563 564
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
565 566
			[list]
		set c $z2
567
		incr c
S
Shawn O. Pearce 已提交
568
	}
569 570 571 572 573 574
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

575
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
576 577
}

578
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
579 580 581
	global buf_rdf

	append buf_rdf [read $fd]
582 583 584 585 586 587 588 589 590 591
	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
592
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
593
		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
594
		merge_state \
595
			[encoding convertfrom $p] \
596
			?[lindex $i 4] \
597
			[list] \
598
			[list [lindex $i 0] [lindex $i 2]]
599
		set c $z2
600
		incr c
601 602 603 604 605
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
606
	}
607

608
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
609 610
}

611
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
612 613 614 615 616 617
	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] {
618
		merge_state [encoding convertfrom $p] ?O
S
Shawn O. Pearce 已提交
619
	}
620
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
621 622
}

623
proc rescan_done {fd buf after} {
624
	global rescan_active current_diff_path
625
	global file_states repo_config
626
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
627

628 629 630
	if {![eof $fd]} return
	set to_clear {}
	close $fd
631
	if {[incr rescan_active -1] > 0} return
632

633
	prune_selection
634 635
	unlock_index
	display_all_files
636
	if {$current_diff_path ne {}} reshow_diff
637
	uplevel #0 $after
S
Shawn O. Pearce 已提交
638 639
}

640 641 642 643 644 645 646 647 648 649
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 已提交
650 651
######################################################################
##
652
## ui helpers
S
Shawn O. Pearce 已提交
653

654 655 656 657 658 659 660 661 662
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 已提交
663

664 665
proc mapdesc {state path} {
	global all_descs
666

667 668 669 670 671 672
	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}
673

674 675 676 677
proc escape_path {path} {
	regsub -all {\\} $path "\\\\" path
	regsub -all "\n" $path "\\n" path
	return $path
S
Shawn O. Pearce 已提交
678 679
}

680 681
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
682 683
}

684 685
set next_icon_id 0
set null_sha1 [string repeat 0 40]
686

687 688
proc merge_state {path new_state {head_info {}} {index_info {}}} {
	global file_states next_icon_id null_sha1
689

690 691
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]
692

693 694 695 696 697 698 699 700 701
	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]}
	}
702

703 704
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}
705

706 707
	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
708

709 710 711 712 713 714
	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
	}
715

716 717 718 719 720
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
	return $state
}
S
Shawn O. Pearce 已提交
721

722 723
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists
S
Shawn O. Pearce 已提交
724

725
	if {$new_m eq {_}} {
726
		set lno [lsearch -sorted -exact $file_lists($w) $path]
727
		if {$lno >= 0} {
728
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
729
			incr lno
730 731 732
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
733
		}
734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749
	} 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
750
	}
751 752 753 754 755
}

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

757
	set old_m [merge_state $path $state]
S
Shawn O. Pearce 已提交
758
	set s $file_states($path)
759 760
	set new_m [lindex $s 0]
	set icon_name [lindex $s 1]
761

762 763 764 765 766 767 768
	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 已提交
769
	}
770
	display_file_helper	$ui_index $path $icon_name $o $n
S
Shawn O. Pearce 已提交
771

772 773 774 775
	if {[string index $old_m 0] eq {U}} {
		set o U
	} else {
		set o [string index $old_m 1]
776
	}
777 778 779 780
	if {[string index $new_m 0] eq {U}} {
		set n U
	} else {
		set n [string index $new_m 1]
781
	}
782 783 784 785 786
	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 已提交
787
	}
788
}
S
Shawn O. Pearce 已提交
789

790 791 792 793 794 795 796 797 798 799
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 已提交
800 801
}

802 803 804 805
proc display_all_files {} {
	global ui_index ui_workdir
	global file_states file_lists
	global last_clicked
S
Shawn O. Pearce 已提交
806

807 808
	$ui_index conf -state normal
	$ui_workdir conf -state normal
S
Shawn O. Pearce 已提交
809

810 811 812
	$ui_index delete 0.0 end
	$ui_workdir delete 0.0 end
	set last_clicked {}
S
Shawn O. Pearce 已提交
813

814 815
	set file_lists($ui_index) [list]
	set file_lists($ui_workdir) [list]
816

817 818 819 820 821 822 823 824 825
	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
826
		}
S
Shawn O. Pearce 已提交
827

828 829 830 831
		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
832
		}
833 834 835
		if {$s ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name $s
836 837 838
		}
	}

839 840
	$ui_index conf -state disabled
	$ui_workdir conf -state disabled
841 842
}

843 844
######################################################################
##
845
## icons
846

847 848 849 850 851 852 853 854
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 已提交
855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873

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

874 875 876 877
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 已提交
878 879 880 881 882 883 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
   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

919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943
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
944

945
set ui_index .vpane.files.index.list
946
set ui_workdir .vpane.files.workdir.list
947 948 949 950 951 952 953 954 955 956

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
957
set all_icons(U$ui_workdir) file_merge
958 959
set all_icons(O$ui_workdir) file_plain

960
set max_status_desc 0
S
Shawn O. Pearce 已提交
961
foreach i {
962 963
		{__ "Unmodified"}

964 965 966 967 968 969 970 971 972
		{_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"}
973 974

		{_D "Missing"}
975 976
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
977

978
		{U_ "Requires merge resolution"}
979
		{UU "Requires merge resolution"}
980 981
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
982
	} {
983 984
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
985
	}
986
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
987
}
988
unset i
S
Shawn O. Pearce 已提交
989 990 991 992 993

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

994 995 996 997 998 999 1000
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		bind $w <Control-Button-1> $cmd
	}
}

1001 1002 1003 1004 1005 1006 1007 1008 1009
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}
}

1010 1011 1012 1013 1014 1015 1016
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
}

S
Shawn O. Pearce 已提交
1017 1018 1019 1020
######################################################################
##
## ui commands

1021
set starting_gitk_msg {Starting gitk... please wait...}
1022

1023
proc do_gitk {revs} {
1024 1025 1026 1027 1028
	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.
	#
1029
	set cmd [list [info nameofexecutable]]
1030
	lappend cmd [gitexec gitk]
1031 1032 1033
	if {$revs ne {}} {
		append cmd { }
		append cmd $revs
1034
	}
1035

1036
	if {[catch {eval exec $cmd &} err]} {
1037
		error_popup "Failed to start gitk:\n\n$err"
S
Shawn O. Pearce 已提交
1038
	} else {
1039 1040 1041 1042 1043 1044
		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 已提交
1045 1046 1047
	}
}

1048
set is_quitting 0
1049

S
Shawn O. Pearce 已提交
1050
proc do_quit {} {
1051
	global ui_comm is_quitting repo_config commit_type
1052

1053 1054
	if {$is_quitting} return
	set is_quitting 1
1055

1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071
	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}
1072 1073
		}

1074 1075 1076 1077 1078 1079 1080 1081 1082 1083
		# -- 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} {
1084
			catch {git config gui.geometry $cfg_geometry}
1085
		}
1086 1087
	}

S
Shawn O. Pearce 已提交
1088 1089 1090 1091
	destroy .
}

proc do_rescan {} {
1092
	rescan {set ui_status_value {Ready.}}
S
Shawn O. Pearce 已提交
1093 1094
}

1095
proc do_commit {} {
1096
	commit_tree
1097 1098
}

1099
proc toggle_or_diff {w x y} {
1100
	global file_states file_lists current_diff_path ui_index ui_workdir
1101
	global last_clicked selected_paths
1102

S
Shawn O. Pearce 已提交
1103 1104 1105
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
1106 1107 1108 1109 1110 1111 1112 1113 1114
	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
1115
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
1116

1117
	if {$col == 0} {
1118
		if {$current_diff_path eq $path} {
1119 1120 1121 1122
			set after {reshow_diff;}
		} else {
			set after {}
		}
1123
		if {$w eq $ui_index} {
1124
			update_indexinfo \
1125
				"Unstaging [short_path $path] from commit" \
1126 1127
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
1128
		} elseif {$w eq $ui_workdir} {
1129
			update_index \
1130
				"Adding [short_path $path]" \
1131 1132 1133
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
		}
1134
	} else {
1135
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
1136 1137 1138
	}
}

1139
proc add_one_to_selection {w x y} {
1140
	global file_lists last_clicked selected_paths
1141

1142
	set lno [lindex [split [$w index @$x,$y] .] 0]
1143 1144 1145 1146 1147
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
1148

1149 1150 1151 1152 1153 1154
	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
	}

1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
	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} {
1169
	global file_lists last_clicked selected_paths
1170 1171 1172 1173

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

1176
	set lno [lindex [split [$w index @$x,$y] .] 0]
1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191
	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 已提交
1192 1193 1194 1195
}

######################################################################
##
1196
## config defaults
S
Shawn O. Pearce 已提交
1197

1198
set cursor_ptr arrow
1199 1200 1201 1202 1203 1204 1205 1206
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
}

1207 1208
font create font_uibold
font create font_diffbold
S
Shawn O. Pearce 已提交
1209

1210 1211 1212 1213 1214 1215 1216
foreach class {Button Checkbutton Entry Label
		Labelframe Listbox Menu Message
		Radiobutton Text} {
	option add *$class.font font_ui
}
unset class

1217
if {[is_MacOSX]} {
1218 1219
	set M1B M1
	set M1T Cmd
1220
} else {
1221 1222
	set M1B Control
	set M1T Ctrl
1223 1224
}

1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244
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
		}
		font configure ${font}bold -weight bold
	}
}

1245
set default_config(merge.summary) false
1246
set default_config(merge.verbosity) 2
1247 1248 1249
set default_config(user.name) {}
set default_config(user.email) {}

1250
set default_config(gui.pruneduringfetch) false
1251
set default_config(gui.trustmtime) false
1252
set default_config(gui.diffcontext) 5
1253
set default_config(gui.newbranchtemplate) {}
1254 1255 1256 1257 1258 1259
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}}
}
1260
load_config 0
1261 1262
apply_config

1263 1264 1265 1266
######################################################################
##
## feature option selection

1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279
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]
}

1280 1281 1282 1283
enable_option multicommit
enable_option branch
enable_option transport

1284
switch -- $subcommand {
1285
browser -
1286
blame {
1287 1288 1289 1290
	disable_option multicommit
	disable_option branch
	disable_option transport
}
1291 1292
citool {
	enable_option singlecommit
1293 1294 1295 1296 1297 1298 1299

	disable_option multicommit
	disable_option branch
	disable_option transport
}
}

1300 1301 1302 1303
######################################################################
##
## ui construction

1304 1305
set ui_comm {}

S
Shawn O. Pearce 已提交
1306
# -- Menu Bar
1307
#
1308
menu .mbar -tearoff 0
1309 1310
.mbar add cascade -label Repository -menu .mbar.repository
.mbar add cascade -label Edit -menu .mbar.edit
1311
if {[is_enabled branch]} {
1312
	.mbar add cascade -label Branch -menu .mbar.branch
S
Shawn O. Pearce 已提交
1313
}
1314
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1315
	.mbar add cascade -label Commit -menu .mbar.commit
1316
}
1317
if {[is_enabled transport]} {
1318 1319 1320
	.mbar add cascade -label Merge -menu .mbar.merge
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Push -menu .mbar.push
1321
}
S
Shawn O. Pearce 已提交
1322 1323
. configure -menu .mbar

1324
# -- Repository Menu
1325
#
1326
menu .mbar.repository
1327 1328 1329

.mbar.repository add command \
	-label {Browse Current Branch} \
1330
	-command {browser::new $current_branch}
1331
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1332 1333
.mbar.repository add separator

1334 1335
.mbar.repository add command \
	-label {Visualize Current Branch} \
1336
	-command {do_gitk $current_branch}
1337
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1338 1339
.mbar.repository add command \
	-label {Visualize All Branches} \
1340
	-command {do_gitk --all}
1341
.mbar.repository add separator
1342

1343
if {[is_enabled multicommit]} {
1344
	.mbar.repository add command -label {Database Statistics} \
1345
		-command do_stats
1346

1347
	.mbar.repository add command -label {Compress Database} \
1348
		-command do_gc
1349

1350
	.mbar.repository add command -label {Verify Database} \
1351
		-command do_fsck_objects
1352

1353
	.mbar.repository add separator
1354

1355 1356 1357
	if {[is_Cygwin]} {
		.mbar.repository add command \
			-label {Create Desktop Icon} \
1358
			-command do_cygwin_shortcut
1359
	} elseif {[is_Windows]} {
1360
		.mbar.repository add command \
1361
			-label {Create Desktop Icon} \
1362
			-command do_windows_shortcut
1363
	} elseif {[is_MacOSX]} {
1364
		.mbar.repository add command \
1365
			-label {Create Desktop Icon} \
1366
			-command do_macosx_app
1367
	}
1368
}
1369

1370
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
1371
	-command do_quit \
1372
	-accelerator $M1T-Q
S
Shawn O. Pearce 已提交
1373

1374 1375 1376 1377 1378
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
1379
	-accelerator $M1T-Z
1380 1381
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
1382
	-accelerator $M1T-Y
1383 1384 1385
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
1386
	-accelerator $M1T-X
1387 1388
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
1389
	-accelerator $M1T-C
1390 1391
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
1392
	-accelerator $M1T-V
1393 1394
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
1395
	-accelerator Del
1396 1397 1398
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
1399
	-accelerator $M1T-A
1400

1401 1402
# -- Branch Menu
#
1403
if {[is_enabled branch]} {
S
Shawn O. Pearce 已提交
1404 1405 1406 1407
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
		-command do_create_branch \
1408
		-accelerator $M1T-N
S
Shawn O. Pearce 已提交
1409 1410 1411 1412
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

	.mbar.branch add command -label {Delete...} \
1413
		-command do_delete_branch
S
Shawn O. Pearce 已提交
1414 1415
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
1416 1417

	.mbar.branch add command -label {Reset...} \
1418
		-command merge::reset_hard
1419 1420
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
S
Shawn O. Pearce 已提交
1421 1422
}

S
Shawn O. Pearce 已提交
1423
# -- Commit Menu
1424
#
1425 1426 1427 1428 1429 1430 1431
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 \
1432
		-value new
1433 1434
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1435

1436 1437 1438 1439
	.mbar.commit add radiobutton \
		-label {Amend Last Commit} \
		-command do_select_commit_type \
		-variable selected_commit_type \
1440
		-value amend
1441 1442
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1443

1444
	.mbar.commit add separator
1445

1446 1447
	.mbar.commit add command -label Rescan \
		-command do_rescan \
1448
		-accelerator F5
1449 1450
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1451

1452
	.mbar.commit add command -label {Add To Commit} \
1453
		-command do_add_selection
1454 1455
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1456

1457
	.mbar.commit add command -label {Add Existing To Commit} \
1458
		-command do_add_all \
1459
		-accelerator $M1T-I
1460 1461
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1462

1463
	.mbar.commit add command -label {Unstage From Commit} \
1464
		-command do_unstage_selection
1465 1466
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1467

1468
	.mbar.commit add command -label {Revert Changes} \
1469
		-command do_revert_selection
1470 1471
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
1472

1473
	.mbar.commit add separator
1474

1475 1476
	.mbar.commit add command -label {Sign Off} \
		-command do_signoff \
1477
		-accelerator $M1T-S
1478

1479 1480
	.mbar.commit add command -label Commit \
		-command do_commit \
1481
		-accelerator $M1T-Return
1482 1483 1484
	lappend disable_on_lock \
		[list .mbar.commit entryconf [.mbar.commit index last] -state]
}
S
Shawn O. Pearce 已提交
1485

1486 1487 1488 1489 1490
# -- Merge Menu
#
if {[is_enabled branch]} {
	menu .mbar.merge
	.mbar.merge add command -label {Local Merge...} \
1491
		-command merge::dialog
1492 1493 1494
	lappend disable_on_lock \
		[list .mbar.merge entryconf [.mbar.merge index last] -state]
	.mbar.merge add command -label {Abort Merge...} \
1495
		-command merge::reset_hard
1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507
	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...} \
1508
		-command do_push_anywhere
1509 1510
}

S
Shawn O. Pearce 已提交
1511 1512 1513 1514 1515 1516
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

1517
	.mbar.apple add command -label "About [appname]" \
1518
		-command do_about
1519
	.mbar.apple add command -label "Options..." \
1520
		-command do_options
S
Shawn O. Pearce 已提交
1521 1522 1523 1524 1525
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
1526
		-command do_options
S
Shawn O. Pearce 已提交
1527

1528 1529
	# -- Tools Menu
	#
1530 1531
	if {[file exists /usr/local/miga/lib/gui-miga]
		&& [file exists .pvcsrc]} {
1532
	proc do_miga {} {
1533
		global ui_status_value
1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
		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" \
1552
		-command do_miga
1553 1554 1555
	lappend disable_on_lock \
		[list .mbar.tools entryconf [.mbar.tools index last] -state]
	}
1556
}
1557

1558 1559
# -- Help Menu
#
1560
.mbar add cascade -label Help -menu .mbar.help
1561
menu .mbar.help
S
Shawn O. Pearce 已提交
1562

1563
if {![is_MacOSX]} {
1564
	.mbar.help add command -label "About [appname]" \
1565
		-command do_about
S
Shawn O. Pearce 已提交
1566
}
S
Shawn O. Pearce 已提交
1567

1568 1569
set browser {}
catch {set browser $repo_config(instaweb.browser)}
1570
set doc_path [file dirname [gitexec]]
1571 1572
set doc_path [file join $doc_path Documentation index.html]

1573
if {[is_Cygwin]} {
1574
	set doc_path [exec cygpath --mixed $doc_path]
1575 1576 1577 1578 1579
}

if {$browser eq {}} {
	if {[is_MacOSX]} {
		set browser open
1580
	} elseif {[is_Cygwin]} {
1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601
		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} \
1602
		-command [list exec $browser $doc_url &]
1603 1604
}
unset browser doc_path doc_url
S
Shawn O. Pearce 已提交
1605

1606 1607 1608 1609 1610 1611 1612 1613
# -- Standard bindings
#
bind .   <Destroy> do_quit
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]}

1614 1615 1616 1617 1618 1619
set subcommand_args {}
proc usage {} {
	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
	exit 1
}

1620 1621
# -- Not a normal commit type invocation?  Do that instead!
#
1622
switch -- $subcommand {
1623
browser {
1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634
	set subcommand_args {rev?}
	switch [llength $argv] {
	0 {
		set current_branch [git symbolic-ref HEAD]
		regsub ^refs/((heads|tags|remotes)/)? \
			$current_branch {} current_branch
	}
	1 {
		set current_branch [lindex $argv 0]
	}
	default usage
1635
	}
1636
	browser::new $current_branch
1637 1638
	return
}
1639
blame {
1640
	set subcommand_args {rev? path?}
1641
	set head {}
1642 1643 1644 1645 1646
	set path {}
	set is_path 0
	foreach a $argv {
		if {$is_path || [file exists $_prefix$a]} {
			if {$path ne {}} usage
1647
			set path $_prefix$a
1648 1649 1650
			break
		} elseif {$a eq {--}} {
			if {$path ne {}} {
1651 1652
				if {$head ne {}} usage
				set head $path
1653 1654 1655
				set path {}
			}
			set is_path 1
1656 1657 1658
		} elseif {$head eq {}} {
			if {$head ne {}} usage
			set head $a
1659 1660 1661 1662 1663 1664
		} else {
			usage
		}
	}
	unset is_path

1665
	if {$head eq {}} {
1666 1667 1668
		set current_branch [git symbolic-ref HEAD]
		regsub ^refs/((heads|tags|remotes)/)? \
			$current_branch {} current_branch
1669 1670
	} else {
		set current_branch $head
1671
	}
1672 1673 1674

	if {$path eq {}} usage
	blame::new $head $path
1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687
	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
1688 1689
}
default {
1690
	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
1691 1692 1693 1694
	exit 1
}
}

1695 1696 1697 1698 1699 1700 1701 1702
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
1703
	-justify left
1704 1705 1706
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
1707
	-justify left
1708 1709 1710 1711
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
1712
# -- Main Window Layout
1713
#
S
Shawn O. Pearce 已提交
1714 1715
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
1716
.vpane add .vpane.files -sticky nsew -height 100 -width 200
S
Shawn O. Pearce 已提交
1717 1718 1719
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
1720
#
1721
frame .vpane.files.index -height 100 -width 200
1722
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
1723
	-background green
S
Shawn O. Pearce 已提交
1724
text $ui_index -background white -borderwidth 0 \
1725
	-width 20 -height 10 \
1726
	-wrap none \
1727
	-cursor $cursor_ptr \
1728 1729
	-xscrollcommand {.vpane.files.index.sx set} \
	-yscrollcommand {.vpane.files.index.sy set} \
S
Shawn O. Pearce 已提交
1730
	-state disabled
1731 1732
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 已提交
1733
pack .vpane.files.index.title -side top -fill x
1734 1735
pack .vpane.files.index.sx -side bottom -fill x
pack .vpane.files.index.sy -side right -fill y
S
Shawn O. Pearce 已提交
1736 1737 1738
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

1739
# -- Working Directory File List
1740
#
1741
frame .vpane.files.workdir -height 100 -width 200
1742
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
1743
	-background red
1744
text $ui_workdir -background white -borderwidth 0 \
1745
	-width 20 -height 10 \
1746
	-wrap none \
1747
	-cursor $cursor_ptr \
1748 1749
	-xscrollcommand {.vpane.files.workdir.sx set} \
	-yscrollcommand {.vpane.files.workdir.sy set} \
S
Shawn O. Pearce 已提交
1750
	-state disabled
1751 1752
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
1753
pack .vpane.files.workdir.title -side top -fill x
1754 1755
pack .vpane.files.workdir.sx -side bottom -fill x
pack .vpane.files.workdir.sy -side right -fill y
1756 1757
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
1758

1759
foreach i [list $ui_index $ui_workdir] {
1760 1761 1762 1763 1764 1765
	$i tag conf in_diff -font font_uibold
	$i tag conf in_sel \
		-background [$i cget -foreground] \
		-foreground [$i cget -background]
}
unset i
1766

1767
# -- Diff and Commit Area
1768
#
1769
frame .vpane.lower -height 300 -width 400
1770 1771 1772 1773
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
1774
.vpane add .vpane.lower -sticky nsew
S
Shawn O. Pearce 已提交
1775 1776

# -- Commit Area Buttons
1777
#
1778 1779
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
1780
	-anchor w \
1781
	-justify left
1782 1783
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
1784

1785
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
1786
	-command do_rescan
1787
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
1788 1789
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
1790

1791
button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
1792
	-command do_add_all
1793
pack .vpane.lower.commarea.buttons.incall -side top -fill x
1794 1795
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
1796

1797
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1798
	-command do_signoff
1799
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
1800

1801
button .vpane.lower.commarea.buttons.commit -text {Commit} \
1802
	-command do_commit
1803
pack .vpane.lower.commarea.buttons.commit -side top -fill x
1804 1805
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
1806 1807

# -- Commit Message Buffer
1808
#
1809
frame .vpane.lower.commarea.buffer
1810
frame .vpane.lower.commarea.buffer.header
1811
set ui_comm .vpane.lower.commarea.buffer.t
1812 1813 1814 1815 1816
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 \
1817
	-value new
1818 1819 1820 1821 1822 1823
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 \
1824
	-value amend
1825 1826
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
1827
label $ui_coml \
S
Shawn O. Pearce 已提交
1828
	-anchor w \
1829
	-justify left
1830 1831 1832 1833 1834 1835
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:}}
1836
	amend-merge   {set txt {Amended Merge Commit Message:}}
1837 1838 1839 1840 1841 1842
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
1843 1844 1845 1846
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 已提交
1847
text $ui_comm -background white -borderwidth 1 \
1848
	-undo true \
1849
	-maxundo 20 \
1850
	-autoseparators true \
S
Shawn O. Pearce 已提交
1851
	-relief sunken \
1852
	-width 75 -height 9 -wrap none \
1853
	-font font_diff \
1854
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
1855 1856
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
1857
pack .vpane.lower.commarea.buffer.header -side top -fill x
1858
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
1859
pack $ui_comm -side left -fill y
1860 1861
pack .vpane.lower.commarea.buffer -side left -fill y

1862 1863
# -- Commit Message Buffer Context Menu
#
1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880
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} \
1881
	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
1882 1883 1884
$ctxm add command \
	-label {Copy All} \
	-command {
1885 1886 1887
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
1888 1889 1890 1891
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
1892
	-command do_signoff
1893
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
1894

1895
# -- Diff Header
1896
#
1897 1898 1899
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
1900 1901 1902 1903 1904
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
1905
		set p $current_diff_path
1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918
		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
	}
}
1919
trace add variable current_diff_path write trace_current_diff_path
1920

1921
frame .vpane.lower.diff.header -background orange
1922
label .vpane.lower.diff.header.status \
1923 1924 1925
	-background orange \
	-width $max_status_desc \
	-anchor w \
1926
	-justify left
1927
label .vpane.lower.diff.header.file \
1928
	-background orange \
1929
	-anchor w \
1930
	-justify left
1931
label .vpane.lower.diff.header.path \
1932
	-background orange \
1933
	-anchor w \
1934
	-justify left
1935 1936 1937 1938 1939 1940 1941
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} \
1942 1943 1944 1945 1946
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
1947
			-- $current_diff_path
1948
	}
1949 1950
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
1951 1952

# -- Diff Body
1953
#
1954 1955 1956 1957
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 \
1958
	-font font_diff \
1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971
	-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

1972
$ui_diff tag conf d_cr -elide true
1973 1974
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
$ui_diff tag conf d_+ -foreground {#00a000}
1975 1976
$ui_diff tag conf d_- -foreground red

1977
$ui_diff tag conf d_++ -foreground {#00a000}
1978 1979
$ui_diff tag conf d_-- -foreground red
$ui_diff tag conf d_+s \
1980 1981
	-foreground {#00a000} \
	-background {#e2effa}
1982 1983
$ui_diff tag conf d_-s \
	-foreground red \
1984
	-background {#e2effa}
1985
$ui_diff tag conf d_s+ \
1986 1987
	-foreground {#00a000} \
	-background ivory1
1988 1989
$ui_diff tag conf d_s- \
	-foreground red \
1990
	-background ivory1
1991 1992 1993 1994 1995 1996 1997 1998 1999 2000

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

2002 2003
$ui_diff tag raise sel

2004 2005
# -- Diff Body Context Menu
#
2006 2007
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
2008 2009 2010
$ctxm add command \
	-label {Refresh} \
	-command reshow_diff
2011
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2012 2013 2014 2015 2016 2017
$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} \
2018
	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2019 2020 2021 2022
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
	-command {
2023 2024 2025
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
2026 2027 2028
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
2029 2030 2031 2032 2033 2034
$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
2035 2036
$ctxm add command \
	-label {Decrease Font Size} \
2037
	-command {incr_font_size font_diff -1}
2038 2039 2040
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
2041
	-command {incr_font_size font_diff 1}
2042 2043 2044 2045 2046
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
	-command {if {$repo_config(gui.diffcontext) >= 2} {
2047 2048 2049
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
2050 2051 2052 2053
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
	-command {
2054 2055
		incr repo_config(gui.diffcontext)
		reshow_diff
2056 2057 2058 2059
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
2060
	-command do_options
2061 2062 2063 2064 2065 2066 2067 2068 2069 2070
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
"
2071
unset ui_diff_applyhunk
2072

S
Shawn O. Pearce 已提交
2073
# -- Status Bar
2074
#
S
Shawn O. Pearce 已提交
2075 2076 2077 2078
label .status -textvariable ui_status_value \
	-anchor w \
	-justify left \
	-borderwidth 1 \
2079
	-relief sunken
S
Shawn O. Pearce 已提交
2080 2081
pack .status -anchor w -side bottom -fill x

2082
# -- Load geometry
2083
#
2084
catch {
2085
set gm $repo_config(gui.geometry)
2086 2087 2088 2089 2090 2091 2092 2093
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
2094
}
2095

S
Shawn O. Pearce 已提交
2096
# -- Key Bindings
2097
#
2098
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2099 2100
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117
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}
2118 2119 2120 2121
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}
2122 2123 2124 2125 2126 2127
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}
2128
bind $ui_diff <Button-1>   {focus %W}
2129

2130
if {[is_enabled branch]} {
2131 2132 2133 2134
	bind . <$M1B-Key-n> do_create_branch
	bind . <$M1B-Key-N> do_create_branch
}

2135 2136 2137 2138 2139
bind all <Key-F5> do_rescan
bind all <$M1B-Key-r> do_rescan
bind all <$M1B-Key-R> do_rescan
bind .   <$M1B-Key-s> do_signoff
bind .   <$M1B-Key-S> do_signoff
2140 2141
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
2142
bind .   <$M1B-Key-Return> do_commit
2143
foreach i [list $ui_index $ui_workdir] {
2144 2145 2146
	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 已提交
2147
}
2148 2149 2150
unset i

set file_lists($ui_index) [list]
2151
set file_lists($ui_workdir) [list]
2152

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

2156 2157 2158
# -- 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.
2159
#
2160
if {[is_Cygwin]} {
2161 2162 2163 2164 2165 2166
	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
2167
by [appname]:
2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210

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

2211 2212
# -- Only initialize complex UI if we are going to stay running.
#
2213
if {[is_enabled transport]} {
2214
	load_all_remotes
2215
	load_all_heads
2216

2217
	populate_branch_menu
2218 2219
	populate_fetch_menu
	populate_push_menu
2220
}
2221

2222 2223
# -- Only suggest a gc run if we are going to stay running.
#
2224
if {[is_enabled multicommit]} {
2225 2226
	set object_limit 2000
	if {[is_Windows]} {set object_limit 200}
2227
	regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
2228 2229 2230 2231
	if {$objects_current >= $object_limit} {
		if {[ask_popup \
			"This repository currently has $objects_current loose objects.

2232
To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2233 2234 2235 2236 2237 2238 2239 2240

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

2241
lock_index begin-read
2242
after 1 do_rescan