git-gui.sh 88.7 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 {@@GIT_VERSION@@}
6
set copyright {
7
Copyright  2006, 2007 Shawn Pearce, Paul Mackerras.
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
######################################################################
##
## read only globals

set _appname [lindex [file split $argv0] end]
set _gitdir {}
set _reponame {}

proc appname {} {
	global _appname
	return $_appname
}

36
proc gitdir {args} {
37
	global _gitdir
38 39 40 41
	if {$args eq {}} {
		return $_gitdir
	}
	return [eval [concat [list file join $_gitdir] $args]]
42 43 44 45 46 47
}

proc reponame {} {
	global _reponame
	return $_reponame
}
48

49 50 51 52
######################################################################
##
## config

53 54 55 56 57 58 59 60 61
proc is_many_config {name} {
	switch -glob -- $name {
	remote.*.fetch -
	remote.*.push
		{return 1}
	*
		{return 0}
	}
}
62

63
proc load_config {include_global} {
64 65 66
	global repo_config global_config default_config

	array unset global_config
67 68 69 70 71 72 73 74 75 76
	if {$include_global} {
		catch {
			set fd_rc [open "| git repo-config --global --list" r]
			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
					}
77 78
				}
			}
79
			close $fd_rc
80 81
		}
	}
82 83

	array unset repo_config
84 85 86 87
	catch {
		set fd_rc [open "| git repo-config --list" r]
		while {[gets $fd_rc line] >= 0} {
			if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
88 89 90 91 92
				if {[is_many_config $name]} {
					lappend repo_config($name) $value
				} else {
					set repo_config($name) $value
				}
93 94 95 96 97
			}
		}
		close $fd_rc
	}

98 99 100 101 102 103 104
	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)
		}
105 106 107
	}
}

108
proc save_config {} {
109 110
	global default_config font_descs
	global repo_config global_config
111
	global repo_config_new global_config_new
112

113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		font configure $font \
			-family $global_config_new(gui.$font^^family) \
			-size $global_config_new(gui.$font^^size)
		font configure ${font}bold \
			-family $global_config_new(gui.$font^^family) \
			-size $global_config_new(gui.$font^^size)
		set global_config_new(gui.$name) [font configure $font]
		unset global_config_new(gui.$font^^family)
		unset global_config_new(gui.$font^^size)
	}

	foreach name [array names default_config] {
128
		set value $global_config_new($name)
129 130
		if {$value ne $global_config($name)} {
			if {$value eq $default_config($name)} {
131 132
				catch {exec git repo-config --global --unset $name}
			} else {
133 134
				regsub -all "\[{}\]" $value {"} value
				exec git repo-config --global $name $value
135 136
			}
			set global_config($name) $value
137
			if {$value eq $repo_config($name)} {
138 139 140 141
				catch {exec git repo-config --unset $name}
				set repo_config($name) $value
			}
		}
142 143
	}

144
	foreach name [array names default_config] {
145
		set value $repo_config_new($name)
146 147
		if {$value ne $repo_config($name)} {
			if {$value eq $global_config($name)} {
148 149
				catch {exec git repo-config --unset $name}
			} else {
150 151
				regsub -all "\[{}\]" $value {"} value
				exec git repo-config $name $value
152 153 154
			}
			set repo_config($name) $value
		}
155 156 157
	}
}

158
proc error_popup {msg} {
159 160 161
	set title [appname]
	if {[reponame] ne {}} {
		append title " ([reponame])"
162
	}
163
	set cmd [list tk_messageBox \
164 165 166
		-icon error \
		-type ok \
		-title "$title: error" \
167 168 169 170 171
		-message $msg]
	if {[winfo ismapped .]} {
		lappend cmd -parent .
	}
	eval $cmd
172 173
}

174
proc warn_popup {msg} {
175 176 177
	set title [appname]
	if {[reponame] ne {}} {
		append title " ([reponame])"
178 179 180 181 182 183 184 185 186 187 188 189
	}
	set cmd [list tk_messageBox \
		-icon warning \
		-type ok \
		-title "$title: warning" \
		-message $msg]
	if {[winfo ismapped .]} {
		lappend cmd -parent .
	}
	eval $cmd
}

190
proc info_popup {msg} {
191 192 193
	set title [appname]
	if {[reponame] ne {}} {
		append title " ([reponame])"
194 195 196
	}
	tk_messageBox \
		-parent . \
197
		-icon info \
198 199 200 201 202
		-type ok \
		-title $title \
		-message $msg
}

203
proc ask_popup {msg} {
204 205 206
	set title [appname]
	if {[reponame] ne {}} {
		append title " ([reponame])"
207 208 209 210 211 212 213 214 215
	}
	return [tk_messageBox \
		-parent . \
		-icon question \
		-type yesno \
		-title $title \
		-message $msg]
}

216 217 218 219
######################################################################
##
## repository setup

220 221
if {   [catch {set _gitdir $env(GIT_DIR)}]
	&& [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
222 223
	catch {wm withdraw .}
	error_popup "Cannot find the git directory:\n\n$err"
224 225
	exit 1
}
226
if {![file isdirectory $_gitdir]} {
227
	catch {wm withdraw .}
228
	error_popup "Git directory not found:\n\n$_gitdir"
229 230
	exit 1
}
231
if {[lindex [file split $_gitdir] end] ne {.git}} {
232 233 234 235
	catch {wm withdraw .}
	error_popup "Cannot use funny .git directory:\n\n$gitdir"
	exit 1
}
236
if {[catch {cd [file dirname $_gitdir]} err]} {
237
	catch {wm withdraw .}
238
	error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
239
	exit 1
240
}
241 242
set _reponame [lindex [file split \
	[file normalize [file dirname $_gitdir]]] \
243
	end]
244

245
set single_commit 0
246
if {[appname] eq {git-citool}} {
247 248 249
	set single_commit 1
}

S
Shawn O. Pearce 已提交
250 251
######################################################################
##
252
## task management
S
Shawn O. Pearce 已提交
253

254
set rescan_active 0
255
set diff_active 0
256
set last_clicked {}
257

258 259 260 261 262
set disable_on_lock [list]
set index_lock_type none

proc lock_index {type} {
	global index_lock_type disable_on_lock
263

264
	if {$index_lock_type eq {none}} {
265 266 267 268 269
		set index_lock_type $type
		foreach w $disable_on_lock {
			uplevel #0 $w disabled
		}
		return 1
270
	} elseif {$index_lock_type eq "begin-$type"} {
271
		set index_lock_type $type
272 273 274 275
		return 1
	}
	return 0
}
S
Shawn O. Pearce 已提交
276

277 278 279 280 281 282 283 284 285 286 287 288 289
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

290
proc repository_state {ctvar hdvar mhvar} {
291
	global current_branch
292 293 294
	upvar $ctvar ct $hdvar hd $mhvar mh

	set mh [list]
295

296 297 298
	if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
		set current_branch {}
	} else {
299
		regsub ^refs/((heads|tags|remotes)/)? \
300 301 302 303 304
			$current_branch \
			{} \
			current_branch
	}

305
	if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
306
		set hd {}
307
		set ct initial
308 309 310
		return
	}

311
	set merge_head [gitdir MERGE_HEAD]
312
	if {[file exists $merge_head]} {
313
		set ct merge
314 315 316 317 318 319
		set fd_mh [open $merge_head r]
		while {[gets $fd_mh line] >= 0} {
			lappend mh $line
		}
		close $fd_mh
		return
320
	}
321 322

	set ct normal
323 324
}

325 326 327
proc PARENT {} {
	global PARENT empty_tree

328 329 330
	set p [lindex $PARENT 0]
	if {$p ne {}} {
		return $p
331 332 333 334 335 336 337
	}
	if {$empty_tree eq {}} {
		set empty_tree [exec git mktree << {}]
	}
	return $empty_tree
}

338
proc rescan {after} {
339
	global HEAD PARENT MERGE_HEAD commit_type
340
	global ui_index ui_workdir ui_status_value ui_comm
341
	global rescan_active file_states
342
	global repo_config
S
Shawn O. Pearce 已提交
343

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

346
	repository_state newType newHEAD newMERGE_HEAD
347
	if {[string match amend* $commit_type]
348 349
		&& $newType eq {normal}
		&& $newHEAD eq $HEAD} {
350
	} else {
351 352 353 354
		set HEAD $newHEAD
		set PARENT $newHEAD
		set MERGE_HEAD $newMERGE_HEAD
		set commit_type $newType
355 356
	}

S
Shawn O. Pearce 已提交
357 358
	array unset file_states

359
	if {![$ui_comm edit modified]
360
		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
361 362 363 364
		if {[load_message GITGUI_MSG]} {
		} elseif {[load_message MERGE_MSG]} {
		} elseif {[load_message SQUASH_MSG]} {
		}
365
		$ui_comm edit reset
366
		$ui_comm edit modified false
367 368
	}

369
	if {$repo_config(gui.trustmtime) eq {true}} {
370
		rescan_stage2 {} $after
371
	} else {
372
		set rescan_active 1
373
		set ui_status_value {Refreshing file status...}
374 375 376 377 378 379
		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]
380
		fconfigure $fd_rf -blocking 0 -translation binary
381
		fileevent $fd_rf readable \
382
			[list rescan_stage2 $fd_rf $after]
383
	}
384 385
}

386
proc rescan_stage2 {fd after} {
387
	global ui_status_value
388
	global rescan_active buf_rdi buf_rdf buf_rlo
389

390
	if {$fd ne {}} {
391 392 393 394
		read $fd
		if {![eof $fd]} return
		close $fd
	}
395

S
Shawn O. Pearce 已提交
396 397
	set ls_others [list | git ls-files --others -z \
		--exclude-per-directory=.gitignore]
398
	set info_exclude [gitdir info exclude]
S
Shawn O. Pearce 已提交
399 400 401 402
	if {[file readable $info_exclude]} {
		lappend ls_others "--exclude-from=$info_exclude"
	}

403 404 405 406
	set buf_rdi {}
	set buf_rdf {}
	set buf_rlo {}

407
	set rescan_active 3
408
	set ui_status_value {Scanning for modified files ...}
409
	set fd_di [open "| git diff-index --cached -z [PARENT]" r]
S
Shawn O. Pearce 已提交
410 411 412 413 414 415
	set fd_df [open "| git diff-files -z" r]
	set fd_lo [open $ls_others r]

	fconfigure $fd_di -blocking 0 -translation binary
	fconfigure $fd_df -blocking 0 -translation binary
	fconfigure $fd_lo -blocking 0 -translation binary
416 417 418
	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 已提交
419 420
}

421
proc load_message {file} {
422
	global ui_comm
423

424
	set f [gitdir $file]
425
	if {[file isfile $f]} {
426 427 428
		if {[catch {set fd [open $f r]}]} {
			return 0
		}
429
		set content [string trim [read $fd]]
430 431 432 433 434 435 436 437
		close $fd
		$ui_comm delete 0.0 end
		$ui_comm insert end $content
		return 1
	}
	return 0
}

438
proc read_diff_index {fd after} {
S
Shawn O. Pearce 已提交
439 440 441
	global buf_rdi

	append buf_rdi [read $fd]
442 443 444 445 446 447 448 449 450 451
	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
452
		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
453 454
		merge_state \
			[string range $buf_rdi $z1 [expr {$z2 - 1}]] \
455 456
			[lindex $i 4]? \
			[list [lindex $i 0] [lindex $i 2]] \
457 458
			[list]
		set c $z2
459
		incr c
S
Shawn O. Pearce 已提交
460
	}
461 462 463 464 465 466
	if {$c < $n} {
		set buf_rdi [string range $buf_rdi $c end]
	} else {
		set buf_rdi {}
	}

467
	rescan_done $fd buf_rdi $after
S
Shawn O. Pearce 已提交
468 469
}

470
proc read_diff_files {fd after} {
S
Shawn O. Pearce 已提交
471 472 473
	global buf_rdf

	append buf_rdf [read $fd]
474 475 476 477 478 479 480 481 482 483
	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
484
		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
485 486
		merge_state \
			[string range $buf_rdf $z1 [expr {$z2 - 1}]] \
487
			?[lindex $i 4] \
488
			[list] \
489
			[list [lindex $i 0] [lindex $i 2]]
490
		set c $z2
491
		incr c
492 493 494 495 496
	}
	if {$c < $n} {
		set buf_rdf [string range $buf_rdf $c end]
	} else {
		set buf_rdf {}
S
Shawn O. Pearce 已提交
497
	}
498

499
	rescan_done $fd buf_rdf $after
S
Shawn O. Pearce 已提交
500 501
}

502
proc read_ls_others {fd after} {
S
Shawn O. Pearce 已提交
503 504 505 506 507 508
	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] {
509
		merge_state $p ?O
S
Shawn O. Pearce 已提交
510
	}
511
	rescan_done $fd buf_rlo $after
S
Shawn O. Pearce 已提交
512 513
}

514 515
proc rescan_done {fd buf after} {
	global rescan_active
516
	global file_states repo_config
517
	upvar $buf to_clear
S
Shawn O. Pearce 已提交
518

519 520 521
	if {![eof $fd]} return
	set to_clear {}
	close $fd
522
	if {[incr rescan_active -1] > 0} return
523

524
	prune_selection
525 526 527 528
	unlock_index
	display_all_files

	if {$repo_config(gui.partialinclude) ne {true}} {
529
		set pathList [list]
530 531
		foreach path [array names file_states] {
			switch -- [lindex $file_states($path) 0] {
532 533
			A? -
			M? {lappend pathList $path}
534 535 536
			}
		}
		if {$pathList ne {}} {
537 538 539 540
			update_index \
				"Updating included files" \
				$pathList \
				[concat {reshow_diff;} $after]
541
			return
S
Shawn O. Pearce 已提交
542 543
		}
	}
544 545

	reshow_diff
546
	uplevel #0 $after
S
Shawn O. Pearce 已提交
547 548
}

549 550 551 552 553 554 555 556 557 558
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 已提交
559 560 561 562 563
######################################################################
##
## diff

proc clear_diff {} {
564
	global ui_diff current_diff ui_index ui_workdir
S
Shawn O. Pearce 已提交
565 566 567 568

	$ui_diff conf -state normal
	$ui_diff delete 0.0 end
	$ui_diff conf -state disabled
569

570
	set current_diff {}
571 572

	$ui_index tag remove in_diff 0.0 end
573
	$ui_workdir tag remove in_diff 0.0 end
S
Shawn O. Pearce 已提交
574 575
}

576
proc reshow_diff {} {
577
	global current_diff ui_status_value file_states
578

579 580
	if {$current_diff eq {}
		|| [catch {set s $file_states($current_diff)}]} {
581
		clear_diff
582
	} else {
583
		show_diff $current_diff
584 585 586
	}
}

587
proc handle_empty_diff {} {
588
	global current_diff file_states file_lists
589

590
	set path $current_diff
591
	set s $file_states($path)
592
	if {[lindex $s 0] ne {_M}} return
593 594 595 596 597

	info_popup "No differences detected.

[short_path $path] has no changes.

598 599 600 601 602 603 604 605 606
The modification date of this file was updated
by another application and you currently have
the Trust File Modification Timestamps option
enabled, so Git did not automatically detect
that there are no content differences in this
file.

This file will now be removed from the modified
files list, to prevent possible confusion.
607 608 609 610 611 612
"
	if {[catch {exec git update-index -- $path} err]} {
		error_popup "Failed to refresh index:\n\n$err"
	}

	clear_diff
613
	display_file $path __
614 615
}

616 617
proc show_diff {path {w {}} {lno {}}} {
	global file_states file_lists
618
	global is_3way_diff diff_active repo_config
619
	global ui_diff current_diff ui_status_value
S
Shawn O. Pearce 已提交
620

621
	if {$diff_active || ![lock_index read]} return
S
Shawn O. Pearce 已提交
622 623

	clear_diff
624
	if {$w eq {} || $lno == {}} {
625 626 627 628 629 630 631 632
		foreach w [array names file_lists] {
			set lno [lsearch -sorted $file_lists($w) $path]
			if {$lno >= 0} {
				incr lno
				break
			}
		}
	}
633
	if {$w ne {} && $lno >= 1} {
634
		$w tag add in_diff $lno.0 [expr {$lno + 1}].0
635 636
	}

S
Shawn O. Pearce 已提交
637 638
	set s $file_states($path)
	set m [lindex $s 0]
639
	set is_3way_diff 0
S
Shawn O. Pearce 已提交
640
	set diff_active 1
641
	set current_diff $path
642
	set ui_status_value "Loading diff of [escape_path $path]..."
S
Shawn O. Pearce 已提交
643

644 645
	set cmd [list | git diff-index]
	lappend cmd --no-color
646 647 648
	if {$repo_config(gui.diffcontext) > 0} {
		lappend cmd "-U$repo_config(gui.diffcontext)"
	}
649 650
	lappend cmd -p

S
Shawn O. Pearce 已提交
651 652
	switch $m {
	MM {
653
		lappend cmd -c
S
Shawn O. Pearce 已提交
654 655 656 657 658 659 660
	}
	_O {
		if {[catch {
				set fd [open $path r]
				set content [read $fd]
				close $fd
			} err ]} {
661
			set diff_active 0
662
			unlock_index
663
			set ui_status_value "Unable to display [escape_path $path]"
664
			error_popup "Error loading file:\n\n$err"
S
Shawn O. Pearce 已提交
665 666 667 668 669
			return
		}
		$ui_diff conf -state normal
		$ui_diff insert end $content
		$ui_diff conf -state disabled
670 671 672
		set diff_active 0
		unlock_index
		set ui_status_value {Ready.}
S
Shawn O. Pearce 已提交
673 674 675 676
		return
	}
	}

677
	lappend cmd [PARENT]
678 679 680
	lappend cmd --
	lappend cmd $path

S
Shawn O. Pearce 已提交
681
	if {[catch {set fd [open $cmd r]} err]} {
682
		set diff_active 0
683
		unlock_index
684
		set ui_status_value "Unable to display [escape_path $path]"
685
		error_popup "Error loading diff:\n\n$err"
S
Shawn O. Pearce 已提交
686 687 688
		return
	}

689
	fconfigure $fd -blocking 0 -translation auto
S
Shawn O. Pearce 已提交
690 691 692 693
	fileevent $fd readable [list read_diff $fd]
}

proc read_diff {fd} {
694
	global ui_diff ui_status_value is_3way_diff diff_active
695
	global repo_config
S
Shawn O. Pearce 已提交
696

697
	$ui_diff conf -state normal
S
Shawn O. Pearce 已提交
698
	while {[gets $fd line] >= 0} {
699 700 701
		# -- Cleanup uninteresting diff header lines.
		#
		if {[string match {diff --git *}      $line]} continue
702
		if {[string match {diff --combined *} $line]} continue
703 704
		if {[string match {--- *}             $line]} continue
		if {[string match {+++ *}             $line]} continue
705 706 707
		if {$line eq {deleted file mode 120000}} {
			set line "deleted symlink"
		}
S
Shawn O. Pearce 已提交
708

709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724
		# -- Automatically detect if this is a 3 way diff.
		#
		if {[string match {@@@ *} $line]} {set is_3way_diff 1}

		# -- Reformat a 3 way diff, 'cause its too weird.
		#
		if {$is_3way_diff} {
			set op [string range $line 0 1]
			switch -- $op {
			{@@} {set tags d_@}
			{++} {set tags d_+ ; set op { +}}
			{--} {set tags d_- ; set op { -}}
			{ +} {set tags d_++; set op {++}}
			{ -} {set tags d_--; set op {--}}
			{+ } {set tags d_-+; set op {-+}}
			{- } {set tags d_+-; set op {+-}}
S
Shawn O. Pearce 已提交
725 726
			default {set tags {}}
			}
727
			set line [string replace $line 0 1 $op]
S
Shawn O. Pearce 已提交
728
		} else {
729 730 731 732
			switch -- [string index $line 0] {
			@ {set tags d_@}
			+ {set tags d_+}
			- {set tags d_-}
S
Shawn O. Pearce 已提交
733 734 735 736
			default {set tags {}}
			}
		}
		$ui_diff insert end $line $tags
737
		$ui_diff insert end "\n" $tags
S
Shawn O. Pearce 已提交
738
	}
739
	$ui_diff conf -state disabled
S
Shawn O. Pearce 已提交
740 741 742 743

	if {[eof $fd]} {
		close $fd
		set diff_active 0
744
		unlock_index
S
Shawn O. Pearce 已提交
745
		set ui_status_value {Ready.}
746

747 748
		if {$repo_config(gui.trustmtime) eq {true}
			&& [$ui_diff index end] eq {2.0}} {
749 750
			handle_empty_diff
		}
S
Shawn O. Pearce 已提交
751 752 753
	}
}

754 755 756 757
######################################################################
##
## commit

758
proc load_last_commit {} {
759
	global HEAD PARENT MERGE_HEAD commit_type ui_comm
760

761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778
	if {[llength $PARENT] == 0} {
		error_popup {There is nothing to amend.

You are about to create the initial commit.
There is no commit before this to amend.
}
		return
	}

	repository_state curType curHEAD curMERGE_HEAD
	if {$curType eq {merge}} {
		error_popup {Cannot amend while merging.

You are currently in the middle of a merge that
has not been fully completed.  You cannot amend
the prior commit unless you first abort the
current merge activity.
}
779 780 781 782
		return
	}

	set msg {}
783
	set parents [list]
784
	if {[catch {
785
			set fd [open "| git cat-file commit $curHEAD" r]
786 787
			while {[gets $fd line] > 0} {
				if {[string match {parent *} $line]} {
788
					lappend parents [string range $line 7 end]
789 790 791 792 793
				}
			}
			set msg [string trim [read $fd]]
			close $fd
		} err]} {
794
		error_popup "Error loading commit data for amend:\n\n$err"
795 796 797
		return
	}

798 799 800 801 802 803 804
	set HEAD $curHEAD
	set PARENT $parents
	set MERGE_HEAD [list]
	switch -- [llength $parents] {
	0       {set commit_type amend-initial}
	1       {set commit_type amend}
	default {set commit_type amend-merge}
805
	}
806 807 808 809

	$ui_comm delete 0.0 end
	$ui_comm insert end $msg
	$ui_comm edit reset
810
	$ui_comm edit modified false
811
	rescan {set ui_status_value {Ready.}}
812 813
}

814 815 816 817 818 819
proc create_new_commit {} {
	global commit_type ui_comm

	set commit_type normal
	$ui_comm delete 0.0 end
	$ui_comm edit reset
820
	$ui_comm edit modified false
821 822 823
	rescan {set ui_status_value {Ready.}}
}

824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843
set GIT_COMMITTER_IDENT {}

proc committer_ident {} {
	global GIT_COMMITTER_IDENT

	if {$GIT_COMMITTER_IDENT eq {}} {
		if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
			error_popup "Unable to obtain your identity:\n\n$err"
			return {}
		}
		if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
			$me me GIT_COMMITTER_IDENT]} {
			error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
			return {}
		}
	}

	return $GIT_COMMITTER_IDENT
}

844
proc commit_tree {} {
845
	global HEAD commit_type file_states ui_comm repo_config
846

847
	if {![lock_index update]} return
848
	if {[committer_ident] eq {}} return
849 850 851

	# -- Our in memory state should match the repository.
	#
852
	repository_state curType curHEAD curMERGE_HEAD
853
	if {[string match amend* $commit_type]
854
		&& $curType eq {normal}
855
		&& $curHEAD eq $HEAD} {
856
	} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
857
		info_popup {Last scanned state does not match repository state.
858

859 860 861
Another Git program has modified this repository
since the last scan.  A rescan must be performed
before another commit can be created.
862

863
The rescan will be automatically started now.
864 865
}
		unlock_index
866
		rescan {set ui_status_value {Ready.}}
867 868 869 870 871 872 873
		return
	}

	# -- At least one file should differ in the index.
	#
	set files_ready 0
	foreach path [array names file_states] {
874
		switch -glob -- [lindex $file_states($path) 0] {
875 876 877 878 879
		_? {continue}
		A? -
		D? -
		M? {set files_ready 1; break}
		U? {
880 881
			error_popup "Unmerged files cannot be committed.

882
File [short_path $path] has merge conflicts.
883
You must resolve them and include the file before committing.
884 885 886 887 888 889 890
"
			unlock_index
			return
		}
		default {
			error_popup "Unknown file state [lindex $s 0] detected.

891
File [short_path $path] cannot be committed by this program.
892 893 894 895 896
"
		}
		}
	}
	if {!$files_ready} {
897
		error_popup {No included files to commit.
898

899
You must include at least 1 file before you can commit.
900 901 902 903 904 905 906 907
}
		unlock_index
		return
	}

	# -- A message is required.
	#
	set msg [string trim [$ui_comm get 1.0 end]]
908
	if {$msg eq {}} {
909 910 911 912 913 914 915 916 917 918 919 920
		error_popup {Please supply a commit message.

A good commit message has the following format:

- First line: Describe in one sentance what you did.
- Second line: Blank
- Remaining lines: Describe why this change is good.
}
		unlock_index
		return
	}

921
	# -- Update included files if partialincludes are off.
922
	#
923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945
	if {$repo_config(gui.partialinclude) ne {true}} {
		set pathList [list]
		foreach path [array names file_states] {
			switch -glob -- [lindex $file_states($path) 0] {
			A? -
			M? {lappend pathList $path}
			}
		}
		if {$pathList ne {}} {
			unlock_index
			update_index \
				"Updating included files" \
				$pathList \
				[concat {lock_index update;} \
					[list commit_prehook $curHEAD $msg]]
			return
		}
	}

	commit_prehook $curHEAD $msg
}

proc commit_prehook {curHEAD msg} {
946
	global ui_status_value pch_error
947

948
	set pchook [gitdir hooks pre-commit]
949 950 951

	# On Cygwin [file executable] might lie so we need to ask
	# the shell if the hook is executable.  Yes that's annoying.
952 953
	#
	if {[is_Windows] && [file isfile $pchook]} {
954 955 956 957
		set pchook [list sh -c [concat \
			"if test -x \"$pchook\";" \
			"then exec \"$pchook\" 2>&1;" \
			"fi"]]
958
	} elseif {[file executable $pchook]} {
959
		set pchook [list $pchook |& cat]
960
	} else {
961 962
		commit_writetree $curHEAD $msg
		return
963
	}
964 965 966 967 968 969 970

	set ui_status_value {Calling pre-commit hook...}
	set pch_error {}
	set fd_ph [open "| $pchook" r]
	fconfigure $fd_ph -blocking 0 -translation binary
	fileevent $fd_ph readable \
		[list commit_prehook_wait $fd_ph $curHEAD $msg]
971 972
}

973
proc commit_prehook_wait {fd_ph curHEAD msg} {
974
	global pch_error ui_status_value
975 976 977 978 979 980 981 982

	append pch_error [read $fd_ph]
	fconfigure $fd_ph -blocking 1
	if {[eof $fd_ph]} {
		if {[catch {close $fd_ph}]} {
			set ui_status_value {Commit declined by pre-commit hook.}
			hook_failed_popup pre-commit $pch_error
			unlock_index
983
		} else {
984
			commit_writetree $curHEAD $msg
985
		}
986
		set pch_error {}
987
		return
988
	}
989
	fconfigure $fd_ph -blocking 0
990 991
}

992
proc commit_writetree {curHEAD msg} {
993
	global ui_status_value
994 995 996

	set ui_status_value {Committing changes...}
	set fd_wt [open "| git write-tree" r]
997 998
	fileevent $fd_wt readable \
		[list commit_committree $fd_wt $curHEAD $msg]
999 1000
}

1001
proc commit_committree {fd_wt curHEAD msg} {
1002
	global HEAD PARENT MERGE_HEAD commit_type
1003
	global single_commit
1004
	global ui_status_value ui_comm selected_commit_type
1005
	global file_states selected_paths rescan_active
1006 1007

	gets $fd_wt tree_id
1008
	if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1009
		error_popup "write-tree failed:\n\n$err"
1010 1011 1012 1013 1014 1015 1016 1017
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Create the commit.
	#
	set cmd [list git commit-tree $tree_id]
1018 1019 1020 1021
	set parents [concat $PARENT $MERGE_HEAD]
	if {[llength $parents] > 0} {
		foreach p $parents {
			lappend cmd -p $p
1022
		}
1023
	} else {
1024 1025 1026 1027 1028
		# git commit-tree writes to stderr during initial commit.
		lappend cmd 2>/dev/null
	}
	lappend cmd << $msg
	if {[catch {set cmt_id [eval exec $cmd]} err]} {
1029
		error_popup "commit-tree failed:\n\n$err"
1030 1031 1032 1033 1034 1035 1036 1037
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Update the HEAD ref.
	#
	set reflogm commit
1038
	if {$commit_type ne {normal}} {
1039 1040 1041 1042
		append reflogm " ($commit_type)"
	}
	set i [string first "\n" $msg]
	if {$i >= 0} {
1043
		append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1044 1045 1046
	} else {
		append reflogm {: } $msg
	}
1047
	set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1048
	if {[catch {eval exec $cmd} err]} {
1049
		error_popup "update-ref failed:\n\n$err"
1050 1051 1052 1053 1054 1055 1056
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Cleanup after ourselves.
	#
1057 1058 1059 1060
	catch {file delete [gitdir MERGE_HEAD]}
	catch {file delete [gitdir MERGE_MSG]}
	catch {file delete [gitdir SQUASH_MSG]}
	catch {file delete [gitdir GITGUI_MSG]}
1061 1062 1063

	# -- Let rerere do its thing.
	#
1064
	if {[file isdirectory [gitdir rr-cache]]} {
1065 1066 1067
		catch {exec git rerere}
	}

1068 1069
	# -- Run the post-commit hook.
	#
1070
	set pchook [gitdir hooks post-commit]
1071
	if {[is_Windows] && [file isfile $pchook]} {
1072 1073 1074 1075 1076 1077 1078
		set pchook [list sh -c [concat \
			"if test -x \"$pchook\";" \
			"then exec \"$pchook\";" \
			"fi"]]
	} elseif {![file executable $pchook]} {
		set pchook {}
	}
1079
	if {$pchook ne {}} {
1080 1081 1082
		catch {exec $pchook &}
	}

1083
	$ui_comm delete 0.0 end
1084
	$ui_comm edit reset
1085
	$ui_comm edit modified false
1086 1087 1088

	if {$single_commit} do_quit

1089
	# -- Update in memory status
1090
	#
1091
	set selected_commit_type new
1092
	set commit_type normal
1093 1094
	set HEAD $cmt_id
	set PARENT $cmt_id
1095
	set MERGE_HEAD [list]
1096 1097 1098 1099 1100

	foreach path [array names file_states] {
		set s $file_states($path)
		set m [lindex $s 0]
		switch -glob -- $m {
1101 1102 1103 1104 1105 1106
		_O -
		_M -
		_D {continue}
		__ -
		A_ -
		M_ -
1107
		D_ {
1108
			unset file_states($path)
1109
			catch {unset selected_paths($path)}
1110 1111 1112 1113 1114 1115 1116
		}
		DO {
			set file_states($path) [list _O [lindex $s 1] {} {}]
		}
		AM -
		AD -
		MM -
1117
		MD {
1118 1119 1120 1121 1122 1123
			set file_states($path) [list \
				_[string index $m 1] \
				[lindex $s 1] \
				[lindex $s 3] \
				{}]
		}
1124 1125 1126 1127
		}
	}

	display_all_files
1128
	unlock_index
1129 1130 1131
	reshow_diff
	set ui_status_value \
		"Changes committed as [string range $cmt_id 0 7]."
1132 1133
}

1134 1135 1136 1137 1138 1139 1140
######################################################################
##
## fetch pull push

proc fetch_from {remote} {
	set w [new_console "fetch $remote" \
		"Fetching new changes from $remote"]
1141
	set cmd [list git fetch]
1142
	lappend cmd $remote
1143
	console_exec $w $cmd
1144 1145
}

1146
proc pull_remote {remote branch} {
1147
	global HEAD commit_type file_states repo_config
1148

1149
	if {![lock_index update]} return
1150 1151 1152

	# -- Our in memory state should match the repository.
	#
1153 1154
	repository_state curType curHEAD curMERGE_HEAD
	if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1155
		info_popup {Last scanned state does not match repository state.
1156

1157 1158 1159 1160 1161
Another Git program has modified this repository
since the last scan.  A rescan must be performed
before a pull operation can be started.

The rescan will be automatically started now.
1162 1163
}
		unlock_index
1164
		rescan {set ui_status_value {Ready.}}
1165 1166 1167 1168 1169 1170 1171 1172
		return
	}

	# -- No differences should exist before a pull.
	#
	if {[array size file_states] != 0} {
		error_popup {Uncommitted but modified files are present.

1173 1174 1175
You should not perform a pull with unmodified
files in your working directory as Git will be
unable to recover from an incorrect merge.
1176

1177 1178
You should commit or revert all changes before
starting a pull operation.
1179 1180 1181 1182 1183
}
		unlock_index
		return
	}

1184 1185 1186
	set w [new_console "pull $remote $branch" \
		"Pulling new changes from branch $branch in $remote"]
	set cmd [list git pull]
1187
	if {$repo_config(gui.pullsummary) eq {false}} {
1188 1189
		lappend cmd --no-summary
	}
1190 1191 1192 1193 1194 1195
	lappend cmd $remote
	lappend cmd $branch
	console_exec $w $cmd [list post_pull_remote $remote $branch]
}

proc post_pull_remote {remote branch success} {
1196
	global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1197 1198
	global ui_status_value

1199
	unlock_index
1200
	if {$success} {
1201
		repository_state commit_type HEAD MERGE_HEAD
1202
		set PARENT $HEAD
1203
		set selected_commit_type new
1204
		set ui_status_value "Pulling $branch from $remote complete."
1205
	} else {
1206 1207
		rescan [list set ui_status_value \
			"Conflicts detected while pulling $branch from $remote."]
1208 1209 1210
	}
}

1211 1212 1213
proc push_to {remote} {
	set w [new_console "push $remote" \
		"Pushing changes to $remote"]
1214
	set cmd [list git push]
1215
	lappend cmd $remote
1216
	console_exec $w $cmd
1217 1218
}

S
Shawn O. Pearce 已提交
1219 1220 1221 1222
######################################################################
##
## ui helpers

1223
proc mapicon {w state path} {
S
Shawn O. Pearce 已提交
1224 1225
	global all_icons

1226 1227
	if {[catch {set r $all_icons($state$w)}]} {
		puts "error: no icon for $w state={$state} $path"
S
Shawn O. Pearce 已提交
1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242
		return file_plain
	}
	return $r
}

proc mapdesc {state path} {
	global all_descs

	if {[catch {set r $all_descs($state)}]} {
		puts "error: no desc for state={$state} $path"
		return $state
	}
	return $r
}

1243 1244 1245 1246 1247
proc escape_path {path} {
	regsub -all "\n" $path "\\n" path
	return $path
}

1248 1249 1250 1251
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
}

1252
set next_icon_id 0
1253
set null_sha1 [string repeat 0 40]
1254

1255
proc merge_state {path new_state {head_info {}} {index_info {}}} {
1256
	global file_states next_icon_id null_sha1
S
Shawn O. Pearce 已提交
1257

1258 1259 1260 1261 1262 1263
	set s0 [string index $new_state 0]
	set s1 [string index $new_state 1]

	if {[catch {set info $file_states($path)}]} {
		set state __
		set icon n[incr next_icon_id]
S
Shawn O. Pearce 已提交
1264
	} else {
1265 1266
		set state [lindex $info 0]
		set icon [lindex $info 1]
1267 1268
		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
		if {$index_info eq {}} {set index_info [lindex $info 3]}
S
Shawn O. Pearce 已提交
1269 1270
	}

1271 1272 1273 1274 1275
	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
	elseif {$s0 eq {_}} {set s0 _}

	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
	elseif {$s1 eq {_}} {set s1 _}
S
Shawn O. Pearce 已提交
1276

1277 1278 1279
	if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
		set head_info [list 0 $null_sha1]
	} elseif {$s0 ne {_} && [string index $state 0] eq {_}
1280 1281
		&& $head_info eq {}} {
		set head_info $index_info
S
Shawn O. Pearce 已提交
1282 1283
	}

1284 1285 1286
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
1287
	return $state
S
Shawn O. Pearce 已提交
1288 1289
}

1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320
proc display_file_helper {w path icon_name old_m new_m} {
	global file_lists

	if {$new_m eq {_}} {
		set lno [lsearch -sorted $file_lists($w) $path]
		if {$lno >= 0} {
			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
			incr lno
			$w conf -state normal
			$w delete $lno.0 [expr {$lno + 1}].0
			$w conf -state disabled
		}
	} 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 $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
	}
}

S
Shawn O. Pearce 已提交
1321
proc display_file {path state} {
1322 1323
	global file_states selected_paths
	global ui_index ui_workdir
S
Shawn O. Pearce 已提交
1324 1325 1326

	set old_m [merge_state $path $state]
	set s $file_states($path)
1327
	set new_m [lindex $s 0]
1328 1329 1330 1331 1332 1333 1334 1335
	set icon_name [lindex $s 1]

	display_file_helper	$ui_index $path $icon_name \
		[string index $old_m 0] \
		[string index $new_m 0]
	display_file_helper	$ui_workdir $path $icon_name \
		[string index $old_m 1] \
		[string index $new_m 1]
S
Shawn O. Pearce 已提交
1336

1337 1338 1339 1340
	if {$new_m eq {__}} {
		unset file_states($path)
		catch {unset selected_paths($path)}
	}
1341
}
1342

1343 1344
proc display_all_files_helper {w path icon_name m} {
	global file_lists
1345

1346 1347 1348 1349 1350 1351 1352
	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"
1353
}
S
Shawn O. Pearce 已提交
1354

1355
proc display_all_files {} {
1356
	global ui_index ui_workdir
1357 1358
	global file_states file_lists
	global last_clicked selected_paths
1359 1360

	$ui_index conf -state normal
1361
	$ui_workdir conf -state normal
1362

1363
	$ui_index delete 0.0 end
1364
	$ui_workdir delete 0.0 end
1365
	set last_clicked {}
1366

1367
	set file_lists($ui_index) [list]
1368
	set file_lists($ui_workdir) [list]
1369

1370 1371 1372
	foreach path [lsort [array names file_states]] {
		set s $file_states($path)
		set m [lindex $s 0]
1373 1374 1375 1376 1377
		set icon_name [lindex $s 1]

		if {[string index $m 0] ne {_}} {
			display_all_files_helper $ui_index $path \
				$icon_name [string index $m 0]
1378
		}
1379 1380 1381
		if {[string index $m 1] ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name [string index $m 1]
1382
		}
S
Shawn O. Pearce 已提交
1383
	}
1384 1385

	$ui_index conf -state disabled
1386
	$ui_workdir conf -state disabled
S
Shawn O. Pearce 已提交
1387 1388
}

1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442
proc update_indexinfo {msg pathList after} {
	global update_index_cp ui_status_value

	if {![lock_index update]} return

	set update_index_cp 0
	set pathList [lsort $pathList]
	set totalCnt [llength $pathList]
	set batch [expr {int($totalCnt * .01) + 1}]
	if {$batch > 25} {set batch 25}

	set ui_status_value [format \
		"$msg... %i/%i files (%.2f%%)" \
		$update_index_cp \
		$totalCnt \
		0.0]
	set fd [open "| git update-index -z --index-info" w]
	fconfigure $fd \
		-blocking 0 \
		-buffering full \
		-buffersize 512 \
		-translation binary
	fileevent $fd writable [list \
		write_update_indexinfo \
		$fd \
		$pathList \
		$totalCnt \
		$batch \
		$msg \
		$after \
		]
}

proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
	global update_index_cp ui_status_value
	global file_states current_diff

	if {$update_index_cp >= $totalCnt} {
		close $fd
		unlock_index
		uplevel #0 $after
		return
	}

	for {set i $batch} \
		{$update_index_cp < $totalCnt && $i > 0} \
		{incr i -1} {
		set path [lindex $pathList $update_index_cp]
		incr update_index_cp

		set s $file_states($path)
		switch -glob -- [lindex $s 0] {
		A? {set new _O}
		M? {set new _M}
1443
		D_ {set new _D}
1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463
		D? {set new _?}
		?? {continue}
		}
		set info [lindex $s 2]
		if {$info eq {}} continue

		puts -nonewline $fd $info
		puts -nonewline $fd "\t"
		puts -nonewline $fd $path
		puts -nonewline $fd "\0"
		display_file $path $new
	}

	set ui_status_value [format \
		"$msg... %i/%i files (%.2f%%)" \
		$update_index_cp \
		$totalCnt \
		[expr {100.0 * $update_index_cp / $totalCnt}]]
}

1464
proc update_index {msg pathList after} {
1465
	global update_index_cp ui_status_value
1466

1467
	if {![lock_index update]} return
1468

1469
	set update_index_cp 0
1470
	set pathList [lsort $pathList]
1471 1472 1473 1474 1475
	set totalCnt [llength $pathList]
	set batch [expr {int($totalCnt * .01) + 1}]
	if {$batch > 25} {set batch 25}

	set ui_status_value [format \
1476
		"$msg... %i/%i files (%.2f%%)" \
1477 1478 1479 1480
		$update_index_cp \
		$totalCnt \
		0.0]
	set fd [open "| git update-index --add --remove -z --stdin" w]
1481 1482 1483 1484 1485
	fconfigure $fd \
		-blocking 0 \
		-buffering full \
		-buffersize 512 \
		-translation binary
1486 1487 1488 1489 1490 1491
	fileevent $fd writable [list \
		write_update_index \
		$fd \
		$pathList \
		$totalCnt \
		$batch \
1492 1493
		$msg \
		$after \
1494 1495 1496
		]
}

1497
proc write_update_index {fd pathList totalCnt batch msg after} {
1498
	global update_index_cp ui_status_value
1499
	global file_states current_diff
1500

1501 1502 1503
	if {$update_index_cp >= $totalCnt} {
		close $fd
		unlock_index
1504
		uplevel #0 $after
1505
		return
1506 1507
	}

1508 1509 1510 1511 1512 1513
	for {set i $batch} \
		{$update_index_cp < $totalCnt && $i > 0} \
		{incr i -1} {
		set path [lindex $pathList $update_index_cp]
		incr update_index_cp

1514
		switch -glob -- [lindex $file_states($path) 0] {
1515
		AD -
1516
		MD -
1517
		UD -
1518
		_D {set new D_}
1519 1520 1521

		_M -
		MM -
1522 1523
		UM -
		U_ -
1524
		M_ {set new M_}
1525 1526 1527

		_O -
		AM -
1528
		A_ {set new A_}
1529 1530

		?? {continue}
1531
		}
S
Shawn O. Pearce 已提交
1532

1533 1534 1535
		puts -nonewline $fd $path
		puts -nonewline $fd "\0"
		display_file $path $new
S
Shawn O. Pearce 已提交
1536 1537
	}

1538
	set ui_status_value [format \
1539
		"$msg... %i/%i files (%.2f%%)" \
1540 1541 1542
		$update_index_cp \
		$totalCnt \
		[expr {100.0 * $update_index_cp / $totalCnt}]]
S
Shawn O. Pearce 已提交
1543 1544
}

1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622
proc checkout_index {msg pathList after} {
	global update_index_cp ui_status_value

	if {![lock_index update]} return

	set update_index_cp 0
	set pathList [lsort $pathList]
	set totalCnt [llength $pathList]
	set batch [expr {int($totalCnt * .01) + 1}]
	if {$batch > 25} {set batch 25}

	set ui_status_value [format \
		"$msg... %i/%i files (%.2f%%)" \
		$update_index_cp \
		$totalCnt \
		0.0]
	set cmd [list git checkout-index]
	lappend cmd --index
	lappend cmd --quiet
	lappend cmd --force
	lappend cmd -z
	lappend cmd --stdin
	set fd [open "| $cmd " w]
	fconfigure $fd \
		-blocking 0 \
		-buffering full \
		-buffersize 512 \
		-translation binary
	fileevent $fd writable [list \
		write_checkout_index \
		$fd \
		$pathList \
		$totalCnt \
		$batch \
		$msg \
		$after \
		]
}

proc write_checkout_index {fd pathList totalCnt batch msg after} {
	global update_index_cp ui_status_value
	global file_states current_diff

	if {$update_index_cp >= $totalCnt} {
		close $fd
		unlock_index
		uplevel #0 $after
		return
	}

	for {set i $batch} \
		{$update_index_cp < $totalCnt && $i > 0} \
		{incr i -1} {
		set path [lindex $pathList $update_index_cp]
		incr update_index_cp

		switch -glob -- [lindex $file_states($path) 0] {
		AM -
		AD {set new A_}
		MM -
		MD {set new M_}
		_M -
		_D {set new __}
		?? {continue}
		}

		puts -nonewline $fd $path
		puts -nonewline $fd "\0"
		display_file $path $new
	}

	set ui_status_value [format \
		"$msg... %i/%i files (%.2f%%)" \
		$update_index_cp \
		$totalCnt \
		[expr {100.0 * $update_index_cp / $totalCnt}]]
}

S
Shawn O. Pearce 已提交
1623 1624 1625 1626
######################################################################
##
## branch management

1627 1628
proc load_all_heads {} {
	global all_heads tracking_branches
S
Shawn O. Pearce 已提交
1629

1630
	set all_heads [list]
S
Shawn O. Pearce 已提交
1631 1632 1633 1634 1635
	set cmd [list git for-each-ref]
	lappend cmd --format=%(refname)
	lappend cmd refs/heads
	set fd [open "| $cmd" r]
	while {[gets $fd line] > 0} {
1636 1637
		if {![catch {set info $tracking_branches($line)}]} continue
		if {![regsub ^refs/heads/ $line {} name]} continue
1638
		lappend all_heads $name
S
Shawn O. Pearce 已提交
1639 1640 1641
	}
	close $fd

1642
	set all_heads [lsort $all_heads]
S
Shawn O. Pearce 已提交
1643 1644 1645
}

proc populate_branch_menu {m} {
1646
	global all_heads disable_on_lock
S
Shawn O. Pearce 已提交
1647 1648

	$m add separator
1649
	foreach b $all_heads {
S
Shawn O. Pearce 已提交
1650 1651
		$m add radiobutton \
			-label $b \
1652
			-command [list switch_branch $b] \
S
Shawn O. Pearce 已提交
1653 1654 1655 1656 1657 1658 1659 1660
			-variable current_branch \
			-value $b \
			-font font_ui
		lappend disable_on_lock \
			[list $m entryconf [$m index last] -state]
	}
}

1661
proc do_create_branch {} {
1662 1663 1664
	error "NOT IMPLEMENTED"
}

1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713
proc do_delete_branch {} {
	error "NOT IMPLEMENTED"
}

proc switch_branch {b} {
	global HEAD commit_type file_states current_branch
	global selected_commit_type ui_comm

	if {![lock_index switch]} return

	# -- Backup the selected branch (repository_state resets it)
	#
	set new_branch $current_branch

	# -- Our in memory state should match the repository.
	#
	repository_state curType curHEAD curMERGE_HEAD
	if {[string match amend* $commit_type]
		&& $curType eq {normal}
		&& $curHEAD eq $HEAD} {
	} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
		info_popup {Last scanned state does not match repository state.

Another Git program has modified this repository
since the last scan.  A rescan must be performed
before the current branch can be changed.

The rescan will be automatically started now.
}
		unlock_index
		rescan {set ui_status_value {Ready.}}
		return
	}

	# -- Toss the message buffer if we are in amend mode.
	#
	if {[string match amend* $curType]} {
		$ui_comm delete 0.0 end
		$ui_comm edit reset
		$ui_comm edit modified false
	}

	set selected_commit_type new
	set current_branch $new_branch

	unlock_index
	error "NOT FINISHED"
}

1714 1715
######################################################################
##
1716
## remote management
1717

1718
proc load_all_remotes {} {
1719
	global repo_config
1720
	global all_remotes tracking_branches
1721 1722

	set all_remotes [list]
1723 1724
	array unset tracking_branches

1725
	set rm_dir [gitdir remotes]
1726
	if {[file isdirectory $rm_dir]} {
1727
		set all_remotes [glob \
1728 1729 1730
			-types f \
			-tails \
			-nocomplain \
1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746
			-directory $rm_dir *]

		foreach name $all_remotes {
			catch {
				set fd [open [file join $rm_dir $name] r]
				while {[gets $fd line] >= 0} {
					if {![regexp {^Pull:[ 	]*([^:]+):(.+)$} \
						$line line src dst]} continue
					if {![regexp ^refs/ $dst]} {
						set dst "refs/heads/$dst"
					}
					set tracking_branches($dst) [list $name $src]
				}
				close $fd
			}
		}
1747 1748
	}

1749
	foreach line [array names repo_config remote.*.url] {
1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761
		if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
		lappend all_remotes $name

		if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
			set fl {}
		}
		foreach line $fl {
			if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
			if {![regexp ^refs/ $dst]} {
				set dst "refs/heads/$dst"
			}
			set tracking_branches($dst) [list $name $src]
1762 1763 1764 1765 1766 1767
		}
	}

	set all_remotes [lsort -unique $all_remotes]
}

1768
proc populate_fetch_menu {m} {
1769
	global all_remotes repo_config
1770

1771 1772 1773 1774 1775 1776 1777 1778
	foreach r $all_remotes {
		set enable 0
		if {![catch {set a $repo_config(remote.$r.url)}]} {
			if {![catch {set a $repo_config(remote.$r.fetch)}]} {
				set enable 1
			}
		} else {
			catch {
1779
				set fd [open [gitdir remotes $r] r]
1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799
				while {[gets $fd n] >= 0} {
					if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
						set enable 1
						break
					}
				}
				close $fd
			}
		}

		if {$enable} {
			$m add command \
				-label "Fetch from $r..." \
				-command [list fetch_from $r] \
				-font font_ui
		}
	}
}

proc populate_push_menu {m} {
1800
	global all_remotes repo_config
1801 1802 1803 1804 1805 1806 1807 1808 1809

	foreach r $all_remotes {
		set enable 0
		if {![catch {set a $repo_config(remote.$r.url)}]} {
			if {![catch {set a $repo_config(remote.$r.push)}]} {
				set enable 1
			}
		} else {
			catch {
1810
				set fd [open [gitdir remotes $r] r]
1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826
				while {[gets $fd n] >= 0} {
					if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
						set enable 1
						break
					}
				}
				close $fd
			}
		}

		if {$enable} {
			$m add command \
				-label "Push to $r..." \
				-command [list push_to $r] \
				-font font_ui
		}
1827 1828 1829
	}
}

1830
proc populate_pull_menu {m} {
1831
	global repo_config all_remotes disable_on_lock
1832 1833

	foreach remote $all_remotes {
1834
		set rb_list [list]
1835 1836
		if {[array get repo_config remote.$remote.url] ne {}} {
			if {[array get repo_config remote.$remote.fetch] ne {}} {
1837 1838 1839 1840 1841
				foreach line $repo_config(remote.$remote.fetch) {
					if {[regexp {^([^:]+):} $line line rb]} {
						lappend rb_list $rb
					}
				}
1842 1843 1844
			}
		} else {
			catch {
1845
				set fd [open [gitdir remotes $remote] r]
1846 1847
				while {[gets $fd line] >= 0} {
					if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1848
						lappend rb_list $rb
1849 1850 1851 1852 1853 1854
					}
				}
				close $fd
			}
		}

1855 1856
		foreach rb $rb_list {
			regsub ^refs/heads/ $rb {} rb_short
1857 1858 1859
			$m add command \
				-label "Branch $rb_short from $remote..." \
				-command [list pull_remote $remote $rb] \
1860
				-font font_ui
1861 1862
			lappend disable_on_lock \
				[list $m entryconf [$m index last] -state]
1863 1864 1865 1866
		}
	}
}

S
Shawn O. Pearce 已提交
1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897
######################################################################
##
## icons

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

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

1898 1899 1900 1901
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 已提交
1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942
   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

1943
set ui_index .vpane.files.index.list
1944
set ui_workdir .vpane.files.workdir.list
1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956

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
set all_icons(O$ui_workdir) file_plain

1957
set max_status_desc 0
S
Shawn O. Pearce 已提交
1958
foreach i {
1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977
		{__ "Unmodified"}
		{_M "Modified"}
		{M_ "Added to commit"}
		{MM "Partially added"}
		{MD "Added (but gone)"}

		{_O "Untracked"}
		{A_ "Added by commit"}
		{AM "Partially added"}
		{AD "Added (but gone)"}

		{_D "Missing"}
		{D_ "Removed by commit"}
		{DO "Removed (still exists)"}
		{DM "Removed (but modified)"}

		{UD "Merge conflicts"}
		{UM "Merge conflicts"}
		{U_ "Merge conflicts"}
S
Shawn O. Pearce 已提交
1978
	} {
1979 1980
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1981
	}
1982
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1983
}
1984
unset i
S
Shawn O. Pearce 已提交
1985 1986 1987 1988 1989

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

1990 1991
proc is_MacOSX {} {
	global tcl_platform tk_library
1992
	if {[tk windowingsystem] eq {aqua}} {
1993 1994 1995 1996 1997
		return 1
	}
	return 0
}

1998 1999 2000 2001 2002 2003 2004 2005
proc is_Windows {} {
	global tcl_platform
	if {$tcl_platform(platform) eq {windows}} {
		return 1
	}
	return 0
}

2006 2007 2008 2009 2010 2011 2012
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		bind $w <Control-Button-1> $cmd
	}
}

2013 2014 2015 2016 2017 2018 2019
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
}

2020 2021 2022 2023 2024 2025 2026 2027
proc hook_failed_popup {hook msg} {
	set w .hookfail
	toplevel $w

	frame $w.m
	label $w.m.l1 -text "$hook hook failed:" \
		-anchor w \
		-justify left \
2028
		-font font_uibold
2029 2030 2031 2032
	text $w.m.t \
		-background white -borderwidth 1 \
		-relief sunken \
		-width 80 -height 10 \
2033
		-font font_diff \
2034 2035 2036 2037 2038
		-yscrollcommand [list $w.m.sby set]
	label $w.m.l2 \
		-text {You must correct the above errors before committing.} \
		-anchor w \
		-justify left \
2039
		-font font_uibold
2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051
	scrollbar $w.m.sby -command [list $w.m.t yview]
	pack $w.m.l1 -side top -fill x
	pack $w.m.l2 -side bottom -fill x
	pack $w.m.sby -side right -fill y
	pack $w.m.t -side left -fill both -expand 1
	pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10

	$w.m.t insert 1.0 $msg
	$w.m.t conf -state disabled

	button $w.ok -text OK \
		-width 15 \
2052
		-font font_ui \
2053
		-command "destroy $w"
2054
	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2055 2056 2057

	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Return> "destroy $w"
2058
	wm title $w "[appname] ([reponame]): error"
2059 2060 2061
	tkwait window $w
}

2062 2063 2064
set next_console_id 0

proc new_console {short_title long_title} {
2065 2066 2067 2068 2069 2070 2071
	global next_console_id console_data
	set w .console[incr next_console_id]
	set console_data($w) [list $short_title $long_title]
	return [console_init $w]
}

proc console_init {w} {
2072
	global console_cr console_data M1B
2073

2074
	set console_cr($w) 1.0
2075 2076
	toplevel $w
	frame $w.m
2077
	label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2078 2079
		-anchor w \
		-justify left \
2080
		-font font_uibold
2081 2082 2083 2084
	text $w.m.t \
		-background white -borderwidth 1 \
		-relief sunken \
		-width 80 -height 10 \
2085
		-font font_diff \
2086 2087
		-state disabled \
		-yscrollcommand [list $w.m.sby set]
2088 2089
	label $w.m.s -text {Working... please wait...} \
		-anchor w \
2090
		-justify left \
2091
		-font font_uibold
2092 2093
	scrollbar $w.m.sby -command [list $w.m.t yview]
	pack $w.m.l1 -side top -fill x
2094
	pack $w.m.s -side bottom -fill x
2095 2096 2097 2098
	pack $w.m.sby -side right -fill y
	pack $w.m.t -side left -fill both -expand 1
	pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10

2099 2100
	menu $w.ctxm -tearoff 0
	$w.ctxm add command -label "Copy" \
2101
		-font font_ui \
2102 2103
		-command "tk_textCopy $w.m.t"
	$w.ctxm add command -label "Select All" \
2104
		-font font_ui \
2105 2106
		-command "$w.m.t tag add sel 0.0 end"
	$w.ctxm add command -label "Copy All" \
2107
		-font font_ui \
2108 2109 2110 2111 2112 2113
		-command "
			$w.m.t tag add sel 0.0 end
			tk_textCopy $w.m.t
			$w.m.t tag remove sel 0.0 end
		"

2114
	button $w.ok -text {Close} \
2115
		-font font_ui \
2116 2117
		-state disabled \
		-command "destroy $w"
2118
	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2119

2120
	bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2121 2122
	bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
	bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2123
	bind $w <Visibility> "focus $w"
2124
	wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2125 2126 2127
	return $w
}

2128
proc console_exec {w cmd {after {}}} {
2129 2130 2131
	# -- Windows tosses the enviroment when we exec our child.
	#    But most users need that so we have to relogin. :-(
	#
2132
	if {[is_Windows]} {
2133 2134 2135 2136 2137 2138 2139 2140 2141
		set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
	}

	# -- Tcl won't let us redirect both stdout and stderr to
	#    the same pipe.  So pass it through cat...
	#
	set cmd [concat | $cmd |& cat]

	set fd_f [open $cmd r]
2142
	fconfigure $fd_f -blocking 0 -translation binary
2143
	fileevent $fd_f readable [list console_read $w $fd_f $after]
2144 2145
}

2146
proc console_read {w fd after} {
2147
	global console_cr console_data
2148 2149

	set buf [read $fd]
2150
	if {$buf ne {}} {
2151 2152 2153 2154 2155 2156 2157
		if {![winfo exists $w]} {console_init $w}
		$w.m.t conf -state normal
		set c 0
		set n [string length $buf]
		while {$c < $n} {
			set cr [string first "\r" $buf $c]
			set lf [string first "\n" $buf $c]
2158 2159
			if {$cr < 0} {set cr [expr {$n + 1}]}
			if {$lf < 0} {set lf [expr {$n + 1}]}
2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172

			if {$lf < $cr} {
				$w.m.t insert end [string range $buf $c $lf]
				set console_cr($w) [$w.m.t index {end -1c}]
				set c $lf
				incr c
			} else {
				$w.m.t delete $console_cr($w) end
				$w.m.t insert end "\n"
				$w.m.t insert end [string range $buf $c $cr]
				set c $cr
				incr c
			}
2173
		}
2174 2175
		$w.m.t conf -state disabled
		$w.m.t see end
2176 2177
	}

2178
	fconfigure $fd -blocking 1
2179
	if {[eof $fd]} {
2180
		if {[catch {close $fd}]} {
2181
			if {![winfo exists $w]} {console_init $w}
2182
			$w.m.s conf -background red -text {Error: Command Failed}
2183
			$w.ok conf -state normal
2184
			set ok 0
2185
		} elseif {[winfo exists $w]} {
2186
			$w.m.s conf -background green -text {Success}
2187
			$w.ok conf -state normal
2188
			set ok 1
2189
		}
2190
		array unset console_cr $w
2191
		array unset console_data $w
2192
		if {$after ne {}} {
2193 2194
			uplevel #0 $after $ok
		}
2195
		return
2196
	}
2197
	fconfigure $fd -blocking 0
2198 2199
}

S
Shawn O. Pearce 已提交
2200 2201 2202 2203
######################################################################
##
## ui commands

2204
set starting_gitk_msg {Starting gitk... please wait...}
2205

2206
proc do_gitk {revs} {
2207
	global ui_status_value starting_gitk_msg
2208

2209 2210 2211 2212
	set cmd gitk
	if {$revs ne {}} {
		append cmd { }
		append cmd $revs
2213
	}
2214
	if {[is_Windows]} {
2215 2216 2217 2218 2219 2220
		set cmd "sh -c \"exec $cmd\""
	}
	append cmd { &}

	if {[catch {eval exec $cmd} err]} {
		error_popup "Failed to start gitk:\n\n$err"
S
Shawn O. Pearce 已提交
2221
	} else {
2222 2223 2224 2225 2226 2227
		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 已提交
2228 2229 2230
	}
}

2231 2232 2233
proc do_gc {} {
	set w [new_console {gc} {Compressing the object database}]
	console_exec $w {git gc}
2234 2235
}

2236
proc do_fsck_objects {} {
2237 2238
	set w [new_console {fsck-objects} \
		{Verifying the object database with fsck-objects}]
2239 2240 2241 2242 2243 2244 2245
	set cmd [list git fsck-objects]
	lappend cmd --full
	lappend cmd --cache
	lappend cmd --strict
	console_exec $w $cmd
}

2246
set is_quitting 0
2247

S
Shawn O. Pearce 已提交
2248
proc do_quit {} {
2249
	global ui_comm is_quitting repo_config commit_type
2250

2251 2252
	if {$is_quitting} return
	set is_quitting 1
2253

2254 2255
	# -- Stash our current commit buffer.
	#
2256
	set save [gitdir GITGUI_MSG]
2257
	set msg [string trim [$ui_comm get 0.0 end]]
2258 2259 2260
	if {![string match amend* $commit_type]
		&& [$ui_comm edit modified]
		&& $msg ne {}} {
2261 2262 2263 2264 2265
		catch {
			set fd [open $save w]
			puts $fd [string trim [$ui_comm get 0.0 end]]
			close $fd
		}
2266 2267
	} else {
		catch {file delete $save}
2268 2269
	}

2270 2271 2272 2273 2274 2275 2276 2277 2278
	# -- 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 {}
	}
2279
	if {$cfg_geometry ne $rc_geometry} {
2280 2281 2282
		catch {exec git repo-config gui.geometry $cfg_geometry}
	}

S
Shawn O. Pearce 已提交
2283 2284 2285 2286
	destroy .
}

proc do_rescan {} {
2287
	rescan {set ui_status_value {Ready.}}
S
Shawn O. Pearce 已提交
2288 2289
}

2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332
proc remove_helper {txt paths} {
	global file_states current_diff

	if {![lock_index begin-update]} return

	set pathList [list]
	set after {}
	foreach path $paths {
		switch -glob -- [lindex $file_states($path) 0] {
		A? -
		M? -
		D? {
			lappend pathList $path
			if {$path eq $current_diff} {
				set after {reshow_diff;}
			}
		}
		}
	}
	if {$pathList eq {}} {
		unlock_index
	} else {
		update_indexinfo \
			$txt \
			$pathList \
			[concat $after {set ui_status_value {Ready.}}]
	}
}

proc do_remove_selection {} {
	global current_diff selected_paths

	if {[array size selected_paths] > 0} {
		remove_helper \
			{Removing selected files from commit} \
			[array names selected_paths]
	} elseif {$current_diff ne {}} {
		remove_helper \
			"Removing [short_path $current_diff] from commit" \
			[list $current_diff]
	}
}

2333
proc include_helper {txt paths} {
2334
	global file_states current_diff
2335 2336 2337 2338

	if {![lock_index begin-update]} return

	set pathList [list]
2339
	set after {}
2340
	foreach path $paths {
2341
		switch -glob -- [lindex $file_states($path) 0] {
2342
		AM -
2343
		AD -
2344
		MM -
2345
		MD -
2346
		U? -
2347
		_M -
2348 2349
		_D -
		_O {
2350 2351 2352 2353 2354
			lappend pathList $path
			if {$path eq $current_diff} {
				set after {reshow_diff;}
			}
		}
2355
		}
2356
	}
2357
	if {$pathList eq {}} {
2358 2359
		unlock_index
	} else {
2360
		update_index \
2361
			$txt \
2362
			$pathList \
2363
			[concat $after {set ui_status_value {Ready to commit.}}]
2364 2365 2366
	}
}

2367 2368 2369 2370 2371
proc do_include_selection {} {
	global current_diff selected_paths

	if {[array size selected_paths] > 0} {
		include_helper \
2372
			{Adding selected files} \
2373 2374 2375
			[array names selected_paths]
	} elseif {$current_diff ne {}} {
		include_helper \
2376
			"Adding [short_path $current_diff]" \
2377 2378 2379 2380 2381 2382
			[list $current_diff]
	}
}

proc do_include_all {} {
	global file_states
2383 2384 2385 2386 2387 2388 2389

	set paths [list]
	foreach path [array names file_states] {
		switch -- [lindex $file_states($path) 0] {
		AM -
		AD -
		MM -
2390
		MD -
2391 2392 2393 2394
		_M -
		_D {lappend paths $path}
		}
	}
2395
	include_helper \
2396
		{Adding all modified files} \
2397
		$paths
2398 2399
}

2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434
proc revert_helper {txt paths} {
	global file_states current_diff

	if {![lock_index begin-update]} return

	set pathList [list]
	set after {}
	foreach path $paths {
		switch -glob -- [lindex $file_states($path) 0] {
		AM -
		AD -
		MM -
		MD -
		_M -
		_D {
			lappend pathList $path
			if {$path eq $current_diff} {
				set after {reshow_diff;}
			}
		}
		}
	}

	set n [llength $pathList]
	if {$n == 0} {
		unlock_index
		return
	} elseif {$n == 1} {
		set s "[short_path [lindex $pathList]]"
	} else {
		set s "these $n files"
	}

	set reply [tk_dialog \
		.confirm_revert \
2435
		"[appname] ([reponame])" \
2436
		"Revert changes in $s?
2437

2438
Any unadded changes will be permanently lost by the revert." \
2439
		question \
2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467
		1 \
		{Do Nothing} \
		{Revert Changes} \
		]
	if {$reply == 1} {
		checkout_index \
			$txt \
			$pathList \
			[concat $after {set ui_status_value {Ready.}}]
	} else {
		unlock_index
	}
}

proc do_revert_selection {} {
	global current_diff selected_paths

	if {[array size selected_paths] > 0} {
		revert_helper \
			{Reverting selected files} \
			[array names selected_paths]
	} elseif {$current_diff ne {}} {
		revert_helper \
			"Reverting [short_path $current_diff]" \
			[list $current_diff]
	}
}

2468
proc do_signoff {} {
2469
	global ui_comm
2470

2471 2472
	set me [committer_ident]
	if {$me eq {}} return
2473

2474
	set sob "Signed-off-by: $me"
2475
	set last [$ui_comm get {end -1c linestart} {end -1c}]
2476
	if {$last ne $sob} {
2477
		$ui_comm edit separator
2478
		if {$last ne {}
2479 2480 2481 2482
			&& ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
			$ui_comm insert end "\n"
		}
		$ui_comm insert end "\n$sob"
2483
		$ui_comm edit separator
2484
		$ui_comm see end
2485 2486 2487
	}
}

2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500
proc do_select_commit_type {} {
	global commit_type selected_commit_type

	if {$selected_commit_type eq {new}
		&& [string match amend* $commit_type]} {
		create_new_commit
	} elseif {$selected_commit_type eq {amend}
		&& ![string match amend* $commit_type]} {
		load_last_commit

		# The amend request was rejected...
		#
		if {![string match amend* $commit_type]} {
2501
			set selected_commit_type new
2502 2503
		}
	}
2504 2505
}

2506
proc do_commit {} {
2507
	commit_tree
2508 2509
}

S
Shawn O. Pearce 已提交
2510
proc do_about {} {
2511
	global appvers copyright
2512
	global tcl_patchLevel tk_patchLevel
S
Shawn O. Pearce 已提交
2513 2514 2515 2516 2517

	set w .about_dialog
	toplevel $w
	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"

2518
	label $w.header -text "About [appname]" \
S
Shawn O. Pearce 已提交
2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529
		-font font_uibold
	pack $w.header -side top -fill x

	frame $w.buttons
	button $w.buttons.close -text {Close} \
		-font font_ui \
		-command [list destroy $w]
	pack $w.buttons.close -side right
	pack $w.buttons -side bottom -fill x -pady 10 -padx 10

	label $w.desc \
2530
		-text "[appname] - a commit creation tool for Git.
2531
$copyright" \
S
Shawn O. Pearce 已提交
2532 2533 2534 2535 2536 2537 2538 2539
		-padx 5 -pady 5 \
		-justify left \
		-anchor w \
		-borderwidth 1 \
		-relief solid \
		-font font_ui
	pack $w.desc -side top -fill x -padx 5 -pady 5

2540
	set v {}
2541
	append v "[appname] version $appvers\n"
2542 2543
	append v "[exec git version]\n"
	append v "\n"
2544 2545 2546 2547 2548 2549 2550
	if {$tcl_patchLevel eq $tk_patchLevel} {
		append v "Tcl/Tk version $tcl_patchLevel"
	} else {
		append v "Tcl version $tcl_patchLevel"
		append v ", Tk version $tk_patchLevel"
	}

S
Shawn O. Pearce 已提交
2551
	label $w.vers \
2552
		-text $v \
S
Shawn O. Pearce 已提交
2553 2554 2555 2556 2557 2558 2559 2560
		-padx 5 -pady 5 \
		-justify left \
		-anchor w \
		-borderwidth 1 \
		-relief solid \
		-font font_ui
	pack $w.vers -side top -fill x -padx 5 -pady 5

2561 2562 2563 2564 2565 2566 2567 2568 2569
	menu $w.ctxm -tearoff 0
	$w.ctxm add command \
		-label {Copy} \
		-font font_ui \
		-command "
		clipboard clear
		clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
	"

S
Shawn O. Pearce 已提交
2570 2571
	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
2572
	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2573
	wm title $w "About [appname]"
S
Shawn O. Pearce 已提交
2574 2575 2576
	tkwait window $w
}

2577
proc do_options {} {
2578
	global repo_config global_config font_descs
2579 2580 2581 2582 2583 2584 2585
	global repo_config_new global_config_new

	array unset repo_config_new
	array unset global_config_new
	foreach name [array names repo_config] {
		set repo_config_new($name) $repo_config($name)
	}
2586 2587 2588 2589 2590 2591 2592
	load_config 1
	foreach name [array names repo_config] {
		switch -- $name {
		gui.diffcontext {continue}
		}
		set repo_config_new($name) $repo_config($name)
	}
2593 2594 2595 2596 2597 2598
	foreach name [array names global_config] {
		set global_config_new($name) $global_config($name)
	}

	set w .options_editor
	toplevel $w
2599
	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2600

2601
	label $w.header -text "[appname] Options" \
2602 2603 2604 2605
		-font font_uibold
	pack $w.header -side top -fill x

	frame $w.buttons
2606 2607 2608 2609
	button $w.buttons.restore -text {Restore Defaults} \
		-font font_ui \
		-command do_restore_defaults
	pack $w.buttons.restore -side left
2610 2611
	button $w.buttons.save -text Save \
		-font font_ui \
2612
		-command [list do_save_config $w]
2613 2614 2615
	pack $w.buttons.save -side right
	button $w.buttons.cancel -text {Cancel} \
		-font font_ui \
2616
		-command [list destroy $w]
2617
	pack $w.buttons.cancel -side right
2618
	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2619

2620
	labelframe $w.repo -text "[reponame] Repository" \
2621
		-font font_ui \
2622 2623
		-relief raised -borderwidth 2
	labelframe $w.global -text {Global (All Repositories)} \
2624
		-font font_ui \
2625 2626 2627 2628 2629
		-relief raised -borderwidth 2
	pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
	pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5

	foreach option {
2630
		{b partialinclude {Allow Partially Added Files}}
2631 2632 2633
		{b pullsummary {Show Pull Summary}}
		{b trustmtime  {Trust File Modification Timestamps}}
		{i diffcontext {Number of Diff Context Lines}}
2634
		} {
2635 2636 2637
		set type [lindex $option 0]
		set name [lindex $option 1]
		set text [lindex $option 2]
2638
		foreach f {repo global} {
2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660
			switch $type {
			b {
				checkbutton $w.$f.$name -text $text \
					-variable ${f}_config_new(gui.$name) \
					-onvalue true \
					-offvalue false \
					-font font_ui
				pack $w.$f.$name -side top -anchor w
			}
			i {
				frame $w.$f.$name
				label $w.$f.$name.l -text "$text:" -font font_ui
				pack $w.$f.$name.l -side left -anchor w -fill x
				spinbox $w.$f.$name.v \
					-textvariable ${f}_config_new(gui.$name) \
					-from 1 -to 99 -increment 1 \
					-width 3 \
					-font font_ui
				pack $w.$f.$name.v -side right -anchor e
				pack $w.$f.$name -side top -anchor w -fill x
			}
			}
2661 2662 2663
		}
	}

2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690
	set all_fonts [lsort [font families]]
	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		set text [lindex $option 2]

		set global_config_new(gui.$font^^family) \
			[font configure $font -family]
		set global_config_new(gui.$font^^size) \
			[font configure $font -size]

		frame $w.global.$name
		label $w.global.$name.l -text "$text:" -font font_ui
		pack $w.global.$name.l -side left -anchor w -fill x
		eval tk_optionMenu $w.global.$name.family \
			global_config_new(gui.$font^^family) \
			$all_fonts
		spinbox $w.global.$name.size \
			-textvariable global_config_new(gui.$font^^size) \
			-from 2 -to 80 -increment 1 \
			-width 3 \
			-font font_ui
		pack $w.global.$name.size -side right -anchor e
		pack $w.global.$name.family -side right -anchor e
		pack $w.global.$name -side top -anchor w -fill x
	}

2691 2692
	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
2693
	wm title $w "[appname] ([reponame]): Options"
2694 2695 2696
	tkwait window $w
}

2697
proc do_restore_defaults {} {
2698
	global font_descs default_config repo_config
2699 2700 2701 2702 2703 2704 2705 2706 2707
	global repo_config_new global_config_new

	foreach name [array names default_config] {
		set repo_config_new($name) $default_config($name)
		set global_config_new($name) $default_config($name)
	}

	foreach option $font_descs {
		set name [lindex $option 0]
2708
		set repo_config(gui.$name) $default_config(gui.$name)
2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725
	}
	apply_config

	foreach option $font_descs {
		set name [lindex $option 0]
		set font [lindex $option 1]
		set global_config_new(gui.$font^^family) \
			[font configure $font -family]
		set global_config_new(gui.$font^^size) \
			[font configure $font -size]
	}
}

proc do_save_config {w} {
	if {[catch {save_config} err]} {
		error_popup "Failed to completely save options:\n\n$err"
	}
2726
	reshow_diff
2727 2728 2729
	destroy $w
}

2730
proc do_windows_shortcut {} {
2731
	global argv0
2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743

	if {[catch {
		set desktop [exec cygpath \
			--windows \
			--absolute \
			--long-name \
			--desktop]
		}]} {
			set desktop .
	}
	set fn [tk_getSaveFile \
		-parent . \
2744
		-title "[appname] ([reponame]): Create Desktop Icon" \
2745
		-initialdir $desktop \
2746
		-initialfile "Git [reponame].bat"]
2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760
	if {$fn != {}} {
		if {[catch {
				set fd [open $fn w]
				set sh [exec cygpath \
					--windows \
					--absolute \
					/bin/sh]
				set me [exec cygpath \
					--unix \
					--absolute \
					$argv0]
				set gd [exec cygpath \
					--unix \
					--absolute \
2761
					[gitdir]]
2762 2763 2764 2765
				set gw [exec cygpath \
					--windows \
					--absolute \
					[file dirname [gitdir]]]
2766 2767
				regsub -all ' $me "'\\''" me
				regsub -all ' $gd "'\\''" gd
2768 2769
				puts $fd "@ECHO Entering $gw"
				puts $fd "@ECHO Starting git-gui... please wait..."
2770
				puts -nonewline $fd "@\"$sh\" --login -c \""
2771 2772
				puts -nonewline $fd "GIT_DIR='$gd'"
				puts -nonewline $fd " '$me'"
2773 2774 2775 2776 2777 2778 2779 2780
				puts $fd "&\""
				close $fd
			} err]} {
			error_popup "Cannot write script:\n\n$err"
		}
	}
}

2781
proc do_macosx_app {} {
2782
	global argv0 env
2783 2784 2785

	set fn [tk_getSaveFile \
		-parent . \
2786
		-title "[appname] ([reponame]): Create Desktop Icon" \
2787
		-initialdir [file join $env(HOME) Desktop] \
2788
		-initialfile "Git [reponame].app"]
2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822
	if {$fn != {}} {
		if {[catch {
				set Contents [file join $fn Contents]
				set MacOS [file join $Contents MacOS]
				set exe [file join $MacOS git-gui]

				file mkdir $MacOS

				set fd [open [file join $Contents Info.plist] w]
				puts $fd {<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>git-gui</string>
	<key>CFBundleIdentifier</key>
	<string>org.spearce.git-gui</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundlePackageType</key>
	<string>APPL</string>
	<key>CFBundleSignature</key>
	<string>????</string>
	<key>CFBundleVersion</key>
	<string>1.0</string>
	<key>NSPrincipalClass</key>
	<string>NSApplication</string>
</dict>
</plist>}
				close $fd

				set fd [open $exe w]
2823
				set gd [file normalize [gitdir]]
2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845
				set ep [file normalize [exec git --exec-path]]
				regsub -all ' $gd "'\\''" gd
				regsub -all ' $ep "'\\''" ep
				puts $fd "#!/bin/sh"
				foreach name [array names env] {
					if {[string match GIT_* $name]} {
						regsub -all ' $env($name) "'\\''" v
						puts $fd "export $name='$v'"
					}
				}
				puts $fd "export PATH='$ep':\$PATH"
				puts $fd "export GIT_DIR='$gd'"
				puts $fd "exec [file normalize $argv0]"
				close $fd

				file attributes $exe -permissions u+x,g+x,o+x
			} err]} {
			error_popup "Cannot write icon:\n\n$err"
		}
	}
}

2846
proc toggle_or_diff {w x y} {
2847
	global file_states file_lists current_diff ui_index ui_workdir
2848
	global last_clicked selected_paths
2849

S
Shawn O. Pearce 已提交
2850 2851 2852
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
2853 2854 2855 2856 2857 2858 2859 2860 2861
	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
2862
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
2863

2864
	if {$col == 0} {
2865 2866 2867 2868 2869
		if {$current_diff eq $path} {
			set after {reshow_diff;}
		} else {
			set after {}
		}
2870 2871 2872
		switch -glob -- [lindex $file_states($path) 0] {
		A_ -
		M_ -
2873
		D_ -
2874
		DO {
2875 2876 2877 2878 2879 2880 2881
			update_indexinfo \
				"Removing [short_path $path] from commit" \
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
		}
		?? {
			update_index \
2882
				"Adding [short_path $path]" \
2883 2884 2885 2886
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
		}
		}
2887
	} else {
2888
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
2889 2890 2891
	}
}

2892
proc add_one_to_selection {w x y} {
2893
	global file_lists
2894
	global last_clicked selected_paths
2895

S
Shawn O. Pearce 已提交
2896 2897 2898
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
2899 2900 2901 2902 2903
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
2904

2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924
	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} {
	global file_lists
	global last_clicked selected_paths

	if {[lindex $last_clicked 0] ne $w} {
		toggle_or_diff $w $x $y
		return
S
Shawn O. Pearce 已提交
2925
	}
2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943

	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	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 已提交
2944 2945 2946 2947
}

######################################################################
##
2948
## config defaults
S
Shawn O. Pearce 已提交
2949

2950
set cursor_ptr arrow
2951 2952 2953 2954 2955 2956 2957 2958
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
}

2959 2960
font create font_uibold
font create font_diffbold
S
Shawn O. Pearce 已提交
2961

2962
if {[is_Windows]} {
2963 2964 2965 2966 2967
	set M1B Control
	set M1T Ctrl
} elseif {[is_MacOSX]} {
	set M1B M1
	set M1T Cmd
2968 2969 2970
} else {
	set M1B M1
	set M1T M1
2971 2972
}

2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993
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
	}
}

set default_config(gui.trustmtime) false
2994
set default_config(gui.pullsummary) true
2995
set default_config(gui.partialinclude) false
2996
set default_config(gui.diffcontext) 5
2997 2998 2999 3000 3001 3002
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}}
}
3003
load_config 0
3004 3005 3006 3007 3008 3009
apply_config

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

S
Shawn O. Pearce 已提交
3010
# -- Menu Bar
3011
#
3012
menu .mbar -tearoff 0
3013
.mbar add cascade -label Repository -menu .mbar.repository
3014
.mbar add cascade -label Edit -menu .mbar.edit
S
Shawn O. Pearce 已提交
3015 3016 3017
if {!$single_commit} {
	.mbar add cascade -label Branch -menu .mbar.branch
}
S
Shawn O. Pearce 已提交
3018
.mbar add cascade -label Commit -menu .mbar.commit
3019 3020 3021 3022 3023
if {!$single_commit} {
	.mbar add cascade -label Fetch -menu .mbar.fetch
	.mbar add cascade -label Pull -menu .mbar.pull
	.mbar add cascade -label Push -menu .mbar.push
}
S
Shawn O. Pearce 已提交
3024 3025
. configure -menu .mbar

3026
# -- Repository Menu
3027
#
3028
menu .mbar.repository
3029 3030 3031
.mbar.repository add command \
	-label {Visualize Current Branch} \
	-command {do_gitk {}} \
3032
	-font font_ui
3033 3034 3035 3036 3037 3038
if {![is_MacOSX]} {
	.mbar.repository add command \
		-label {Visualize All Branches} \
		-command {do_gitk {--all}} \
		-font font_ui
}
3039
.mbar.repository add separator
3040

3041
if {!$single_commit} {
3042 3043
	.mbar.repository add command -label {Compress Database} \
		-command do_gc \
3044
		-font font_ui
3045

3046
	.mbar.repository add command -label {Verify Database} \
3047 3048 3049
		-command do_fsck_objects \
		-font font_ui

3050
	.mbar.repository add separator
3051

3052
	if {[is_Windows]} {
3053
		.mbar.repository add command \
3054 3055 3056
			-label {Create Desktop Icon} \
			-command do_windows_shortcut \
			-font font_ui
3057
	} elseif {[is_MacOSX]} {
3058
		.mbar.repository add command \
3059 3060 3061
			-label {Create Desktop Icon} \
			-command do_macosx_app \
			-font font_ui
3062
	}
3063
}
3064

3065
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
3066
	-command do_quit \
3067
	-accelerator $M1T-Q \
3068
	-font font_ui
S
Shawn O. Pearce 已提交
3069

3070 3071 3072 3073 3074 3075
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
	-accelerator $M1T-Z \
3076
	-font font_ui
3077 3078 3079
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
	-accelerator $M1T-Y \
3080
	-font font_ui
3081 3082 3083 3084
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
	-accelerator $M1T-X \
3085
	-font font_ui
3086 3087 3088
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
	-accelerator $M1T-C \
3089
	-font font_ui
3090 3091 3092
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
	-accelerator $M1T-V \
3093
	-font font_ui
3094 3095 3096
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
	-accelerator Del \
3097
	-font font_ui
3098 3099 3100 3101
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
	-accelerator $M1T-A \
3102
	-font font_ui
3103

3104 3105
# -- Branch Menu
#
S
Shawn O. Pearce 已提交
3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121
if {!$single_commit} {
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
		-command do_create_branch \
		-font font_ui
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]

	.mbar.branch add command -label {Delete...} \
		-command do_delete_branch \
		-font font_ui
	lappend disable_on_lock [list .mbar.branch entryconf \
		[.mbar.branch index last] -state]
}

S
Shawn O. Pearce 已提交
3122
# -- Commit Menu
3123
#
S
Shawn O. Pearce 已提交
3124
menu .mbar.commit
3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139

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

.mbar.commit add radiobutton \
	-label {Amend Last Commit} \
	-command do_select_commit_type \
	-variable selected_commit_type \
	-value amend \
3140
	-font font_ui
3141 3142
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3143 3144 3145 3146 3147 3148

.mbar.commit add separator

.mbar.commit add command -label Rescan \
	-command do_rescan \
	-accelerator F5 \
3149
	-font font_ui
3150 3151
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3152

3153
.mbar.commit add command -label {Add To Commit} \
3154 3155 3156 3157
	-command do_include_selection \
	-font font_ui
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3158

3159
.mbar.commit add command -label {Add All To Commit} \
3160
	-command do_include_all \
3161
	-accelerator $M1T-I \
3162
	-font font_ui
3163 3164
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3165

3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177
.mbar.commit add command -label {Remove From Commit} \
	-command do_remove_selection \
	-font font_ui
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]

.mbar.commit add command -label {Revert Changes} \
	-command do_revert_selection \
	-font font_ui
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]

3178 3179
.mbar.commit add separator

3180 3181
.mbar.commit add command -label {Sign Off} \
	-command do_signoff \
3182
	-accelerator $M1T-S \
3183
	-font font_ui
3184

3185 3186
.mbar.commit add command -label Commit \
	-command do_commit \
3187
	-accelerator $M1T-Return \
3188
	-font font_ui
3189 3190
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
S
Shawn O. Pearce 已提交
3191

3192 3193
# -- Transport menus
#
3194 3195 3196 3197 3198
if {!$single_commit} {
	menu .mbar.fetch
	menu .mbar.pull
	menu .mbar.push
}
3199

S
Shawn O. Pearce 已提交
3200 3201 3202 3203 3204 3205
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

3206
	.mbar.apple add command -label "About [appname]" \
S
Shawn O. Pearce 已提交
3207 3208
		-command do_about \
		-font font_ui
3209
	.mbar.apple add command -label "[appname] Options..." \
S
Shawn O. Pearce 已提交
3210 3211 3212 3213 3214 3215 3216 3217 3218 3219
		-command do_options \
		-font font_ui
} else {
	# -- Edit Menu
	#
	.mbar.edit add separator
	.mbar.edit add command -label {Options...} \
		-command do_options \
		-font font_ui

3220 3221
	# -- Tools Menu
	#
3222 3223
	if {[file exists /usr/local/miga/lib/gui-miga]
		&& [file exists .pvcsrc]} {
3224
	proc do_miga {} {
3225
		global ui_status_value
3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249
		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" \
		-command do_miga \
		-font font_ui
	lappend disable_on_lock \
		[list .mbar.tools entryconf [.mbar.tools index last] -state]
	}

S
Shawn O. Pearce 已提交
3250 3251 3252 3253 3254
	# -- Help Menu
	#
	.mbar add cascade -label Help -menu .mbar.help
	menu .mbar.help

3255
	.mbar.help add command -label "About [appname]" \
S
Shawn O. Pearce 已提交
3256 3257 3258
		-command do_about \
		-font font_ui
}
S
Shawn O. Pearce 已提交
3259 3260


3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279
# -- Branch Control
#
frame .branch \
	-borderwidth 1 \
	-relief sunken
label .branch.l1 \
	-text {Current Branch:} \
	-anchor w \
	-justify left \
	-font font_ui
label .branch.cb \
	-textvariable current_branch \
	-anchor w \
	-justify left \
	-font font_ui
pack .branch.l1 -side left
pack .branch.cb -side left -fill x
pack .branch -side top -fill x

S
Shawn O. Pearce 已提交
3280
# -- Main Window Layout
3281
#
S
Shawn O. Pearce 已提交
3282 3283
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
3284
.vpane add .vpane.files -sticky nsew -height 100 -width 400
S
Shawn O. Pearce 已提交
3285 3286 3287
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
3288
#
S
Shawn O. Pearce 已提交
3289
frame .vpane.files.index -height 100 -width 400
3290
label .vpane.files.index.title -text {Changes To Be Committed} \
S
Shawn O. Pearce 已提交
3291
	-background green \
3292
	-font font_ui
S
Shawn O. Pearce 已提交
3293 3294
text $ui_index -background white -borderwidth 0 \
	-width 40 -height 10 \
3295
	-font font_ui \
3296
	-cursor $cursor_ptr \
S
Shawn O. Pearce 已提交
3297 3298 3299 3300 3301 3302 3303 3304
	-yscrollcommand {.vpane.files.index.sb set} \
	-state disabled
scrollbar .vpane.files.index.sb -command [list $ui_index yview]
pack .vpane.files.index.title -side top -fill x
pack .vpane.files.index.sb -side right -fill y
pack $ui_index -side left -fill both -expand 1
.vpane.files add .vpane.files.index -sticky nsew

3305
# -- Working Directory File List
3306
#
3307
frame .vpane.files.workdir -height 100 -width 100
3308
label .vpane.files.workdir.title -text {Changed But Not Updated} \
S
Shawn O. Pearce 已提交
3309
	-background red \
3310
	-font font_ui
3311
text $ui_workdir -background white -borderwidth 0 \
S
Shawn O. Pearce 已提交
3312
	-width 40 -height 10 \
3313
	-font font_ui \
3314
	-cursor $cursor_ptr \
3315
	-yscrollcommand {.vpane.files.workdir.sb set} \
S
Shawn O. Pearce 已提交
3316
	-state disabled
3317 3318 3319 3320 3321
scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
pack .vpane.files.workdir.title -side top -fill x
pack .vpane.files.workdir.sb -side right -fill y
pack $ui_workdir -side left -fill both -expand 1
.vpane.files add .vpane.files.workdir -sticky nsew
S
Shawn O. Pearce 已提交
3322

3323
foreach i [list $ui_index $ui_workdir] {
3324 3325 3326 3327 3328 3329
	$i tag conf in_diff -font font_uibold
	$i tag conf in_sel \
		-background [$i cget -foreground] \
		-foreground [$i cget -background]
}
unset i
3330

3331
# -- Diff and Commit Area
3332
#
3333
frame .vpane.lower -height 300 -width 400
3334 3335 3336 3337 3338
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
.vpane add .vpane.lower -stick nsew
S
Shawn O. Pearce 已提交
3339 3340

# -- Commit Area Buttons
3341
#
3342 3343
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
3344 3345
	-anchor w \
	-justify left \
3346
	-font font_ui
3347 3348
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
3349

3350
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
S
Shawn O. Pearce 已提交
3351
	-command do_rescan \
3352
	-font font_ui
3353
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3354 3355
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
3356

3357
button .vpane.lower.commarea.buttons.incall -text {Add All} \
3358
	-command do_include_all \
3359
	-font font_ui
3360
pack .vpane.lower.commarea.buttons.incall -side top -fill x
3361 3362
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
3363

3364
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3365
	-command do_signoff \
3366
	-font font_ui
3367
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3368

3369
button .vpane.lower.commarea.buttons.commit -text {Commit} \
S
Shawn O. Pearce 已提交
3370
	-command do_commit \
3371
	-font font_ui
3372
pack .vpane.lower.commarea.buttons.commit -side top -fill x
3373 3374
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
3375 3376

# -- Commit Message Buffer
3377
#
3378
frame .vpane.lower.commarea.buffer
3379
frame .vpane.lower.commarea.buffer.header
3380
set ui_comm .vpane.lower.commarea.buffer.t
3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397
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 \
	-value new \
	-font font_ui
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 \
	-value amend \
	-font font_ui
lappend disable_on_lock \
	[list .vpane.lower.commarea.buffer.header.amend conf -state]
3398
label $ui_coml \
S
Shawn O. Pearce 已提交
3399 3400
	-anchor w \
	-justify left \
3401
	-font font_ui
3402 3403 3404 3405 3406 3407
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:}}
3408
	amend-merge   {set txt {Amended Merge Commit Message:}}
3409 3410 3411 3412 3413 3414
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
3415 3416 3417 3418
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 已提交
3419
text $ui_comm -background white -borderwidth 1 \
3420
	-undo true \
3421
	-maxundo 20 \
3422
	-autoseparators true \
S
Shawn O. Pearce 已提交
3423
	-relief sunken \
3424
	-width 75 -height 9 -wrap none \
3425
	-font font_diff \
3426
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3427 3428
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
3429
pack .vpane.lower.commarea.buffer.header -side top -fill x
3430
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
3431
pack $ui_comm -side left -fill y
3432 3433
pack .vpane.lower.commarea.buffer -side left -fill y

3434 3435
# -- Commit Message Buffer Context Menu
#
3436 3437 3438 3439
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Cut} \
3440
	-font font_ui \
3441 3442 3443
	-command {tk_textCut $ui_comm}
$ctxm add command \
	-label {Copy} \
3444
	-font font_ui \
3445 3446 3447
	-command {tk_textCopy $ui_comm}
$ctxm add command \
	-label {Paste} \
3448
	-font font_ui \
3449 3450 3451
	-command {tk_textPaste $ui_comm}
$ctxm add command \
	-label {Delete} \
3452
	-font font_ui \
3453 3454 3455 3456
	-command {$ui_comm delete sel.first sel.last}
$ctxm add separator
$ctxm add command \
	-label {Select All} \
3457
	-font font_ui \
3458 3459 3460
	-command {$ui_comm tag add sel 0.0 end}
$ctxm add command \
	-label {Copy All} \
3461
	-font font_ui \
3462
	-command {
3463 3464 3465
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
3466 3467 3468 3469
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
3470
	-font font_ui \
3471
	-command do_signoff
3472
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3473

3474
# -- Diff Header
3475
#
3476 3477
set current_diff {}
set diff_actions [list]
3478
proc trace_current_diff {varname args} {
3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499
	global current_diff diff_actions file_states
	if {$current_diff eq {}} {
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
		set p $current_diff
		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
	}
}
3500
trace add variable current_diff write trace_current_diff
3501

3502
frame .vpane.lower.diff.header -background orange
3503
label .vpane.lower.diff.header.status \
3504 3505 3506 3507 3508
	-background orange \
	-width $max_status_desc \
	-anchor w \
	-justify left \
	-font font_ui
3509
label .vpane.lower.diff.header.file \
3510
	-background orange \
3511 3512
	-anchor w \
	-justify left \
3513
	-font font_ui
3514
label .vpane.lower.diff.header.path \
3515
	-background orange \
3516 3517
	-anchor w \
	-justify left \
3518
	-font font_ui
3519 3520 3521 3522 3523 3524 3525
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} \
3526
	-font font_ui \
3527 3528 3529 3530 3531
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
3532
			-- $current_diff
3533
	}
3534 3535
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3536 3537

# -- Diff Body
3538
#
3539 3540 3541 3542
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 \
3543
	-font font_diff \
3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556
	-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

3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567
$ui_diff tag conf d_@ -font font_diffbold
$ui_diff tag conf d_+  -foreground blue
$ui_diff tag conf d_-  -foreground red
$ui_diff tag conf d_++ -foreground {#00a000}
$ui_diff tag conf d_-- -foreground {#a000a0}
$ui_diff tag conf d_+- \
	-foreground red \
	-background {light goldenrod yellow}
$ui_diff tag conf d_-+ \
	-foreground blue \
	-background azure2
S
Shawn O. Pearce 已提交
3568

3569 3570
# -- Diff Body Context Menu
#
3571 3572 3573 3574
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Copy} \
3575
	-font font_ui \
3576 3577 3578 3579
	-command {tk_textCopy $ui_diff}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Select All} \
3580
	-font font_ui \
3581 3582 3583 3584
	-command {$ui_diff tag add sel 0.0 end}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Copy All} \
3585
	-font font_ui \
3586
	-command {
3587 3588 3589
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
3590 3591 3592 3593 3594
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Decrease Font Size} \
3595 3596
	-font font_ui \
	-command {incr_font_size font_diff -1}
3597 3598 3599
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
3600 3601
	-font font_ui \
	-command {incr_font_size font_diff 1}
3602 3603 3604 3605
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
3606
	-font font_ui \
3607
	-command {if {$repo_config(gui.diffcontext) >= 2} {
3608 3609 3610
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
3611 3612 3613
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
3614
	-font font_ui \
3615
	-command {
3616 3617
		incr repo_config(gui.diffcontext)
		reshow_diff
3618 3619 3620 3621
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
3622 3623
	-font font_ui \
	-command do_options
3624
bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3625

S
Shawn O. Pearce 已提交
3626
# -- Status Bar
3627
#
S
Shawn O. Pearce 已提交
3628 3629 3630 3631 3632 3633
set ui_status_value {Initializing...}
label .status -textvariable ui_status_value \
	-anchor w \
	-justify left \
	-borderwidth 1 \
	-relief sunken \
3634
	-font font_ui
S
Shawn O. Pearce 已提交
3635 3636
pack .status -anchor w -side bottom -fill x

3637
# -- Load geometry
3638
#
3639
catch {
3640
set gm $repo_config(gui.geometry)
3641 3642 3643 3644 3645 3646 3647 3648
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
3649
}
3650

S
Shawn O. Pearce 已提交
3651
# -- Key Bindings
3652
#
3653
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3654 3655
bind $ui_comm <$M1B-Key-i> {do_include_all;break}
bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672
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}
3673 3674 3675 3676
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}
3677

3678 3679 3680 3681 3682 3683
bind .   <Destroy> do_quit
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
3684 3685
bind .   <$M1B-Key-i> do_include_all
bind .   <$M1B-Key-I> do_include_all
3686 3687 3688 3689 3690
bind .   <$M1B-Key-Return> do_commit
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]}
3691
foreach i [list $ui_index $ui_workdir] {
3692 3693 3694
	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 已提交
3695
}
3696 3697 3698
unset i

set file_lists($ui_index) [list]
3699
set file_lists($ui_workdir) [list]
3700 3701 3702

set HEAD {}
set PARENT {}
3703
set MERGE_HEAD [list]
3704 3705
set commit_type {}
set empty_tree {}
3706
set current_branch {}
3707
set current_diff {}
3708
set selected_commit_type new
S
Shawn O. Pearce 已提交
3709

3710
wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
S
Shawn O. Pearce 已提交
3711
focus -force $ui_comm
3712

3713 3714 3715
# -- 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.
3716 3717 3718 3719 3720 3721 3722 3723
#
if {[is_Windows]} {
	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
3724
by [appname]:
3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767

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

3768 3769
# -- Only initialize complex UI if we are going to stay running.
#
3770 3771
if {!$single_commit} {
	load_all_remotes
3772
	load_all_heads
3773

S
Shawn O. Pearce 已提交
3774
	populate_branch_menu .mbar.branch
3775
	populate_fetch_menu .mbar.fetch
3776
	populate_pull_menu .mbar.pull
3777
	populate_push_menu .mbar.push
3778
}
3779

3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800
# -- Only suggest a gc run if we are going to stay running.
#
if {!$single_commit} {
	set object_limit 2000
	if {[is_Windows]} {set object_limit 200}
	regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
	if {$objects_current >= $object_limit} {
		if {[ask_popup \
			"This repository currently has $objects_current loose objects.

To maintain optimal performance it is strongly
recommended that you compress the database
when more than $object_limit loose objects exist.

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

3801
lock_index begin-read
3802
after 1 do_rescan