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 1124
		DM {
			set file_states($path) [list \
				_[string index $m 1] \
				[lindex $s 1] \
				[lindex $s 3] \
				{}]
		}
1125 1126 1127 1128
		}
	}

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

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

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

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

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

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

1158 1159 1160 1161 1162
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.
1163 1164
}
		unlock_index
1165
		rescan {set ui_status_value {Ready.}}
1166 1167 1168 1169 1170 1171 1172 1173
		return
	}

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

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

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

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

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

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

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

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

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

1227 1228
	if {[catch {set r $all_icons($state$w)}]} {
		puts "error: no icon for $w state={$state} $path"
S
Shawn O. Pearce 已提交
1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
		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
}

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

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

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

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

1259 1260 1261 1262 1263 1264
	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 已提交
1265
	} else {
1266 1267
		set state [lindex $info 0]
		set icon [lindex $info 1]
1268 1269
		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
		if {$index_info eq {}} {set index_info [lindex $info 3]}
S
Shawn O. Pearce 已提交
1270 1271
	}

1272 1273 1274 1275 1276
	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 已提交
1277

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

1285 1286 1287
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
1288
	return $state
S
Shawn O. Pearce 已提交
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 1321
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 已提交
1322
proc display_file {path state} {
1323 1324
	global file_states selected_paths
	global ui_index ui_workdir
S
Shawn O. Pearce 已提交
1325 1326 1327

	set old_m [merge_state $path $state]
	set s $file_states($path)
1328
	set new_m [lindex $s 0]
1329 1330 1331 1332 1333 1334 1335 1336
	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 已提交
1337

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

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

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

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

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

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

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

1371 1372 1373
	foreach path [lsort [array names file_states]] {
		set s $file_states($path)
		set m [lindex $s 0]
1374 1375 1376 1377 1378
		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]
1379
		}
1380 1381 1382
		if {[string index $m 1] ne {_}} {
			display_all_files_helper $ui_workdir $path \
				$icon_name [string index $m 1]
1383
		}
S
Shawn O. Pearce 已提交
1384
	}
1385 1386

	$ui_index conf -state disabled
1387
	$ui_workdir conf -state disabled
S
Shawn O. Pearce 已提交
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 1443
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}
1444
		D_ {set new _D}
1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
		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}]]
}

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

1468
	if {![lock_index update]} return
1469

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

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

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

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

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

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

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

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

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

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

1539
	set ui_status_value [format \
1540
		"$msg... %i/%i files (%.2f%%)" \
1541 1542 1543
		$update_index_cp \
		$totalCnt \
		[expr {100.0 * $update_index_cp / $totalCnt}]]
S
Shawn O. Pearce 已提交
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 1623
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 已提交
1624 1625 1626 1627
######################################################################
##
## branch management

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

1631
	set all_heads [list]
S
Shawn O. Pearce 已提交
1632 1633 1634 1635 1636
	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} {
1637 1638
		if {![catch {set info $tracking_branches($line)}]} continue
		if {![regsub ^refs/heads/ $line {} name]} continue
1639
		lappend all_heads $name
S
Shawn O. Pearce 已提交
1640 1641 1642
	}
	close $fd

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

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

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

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

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

1715 1716
######################################################################
##
1717
## remote management
1718

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

	set all_remotes [list]
1724 1725
	array unset tracking_branches

1726
	set rm_dir [gitdir remotes]
1727
	if {[file isdirectory $rm_dir]} {
1728
		set all_remotes [glob \
1729 1730 1731
			-types f \
			-tails \
			-nocomplain \
1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747
			-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
			}
		}
1748 1749
	}

1750
	foreach line [array names repo_config remote.*.url] {
1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762
		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]
1763 1764 1765 1766 1767 1768
		}
	}

	set all_remotes [lsort -unique $all_remotes]
}

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

1772 1773 1774 1775 1776 1777 1778 1779
	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 {
1780
				set fd [open [gitdir remotes $r] r]
1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800
				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} {
1801
	global all_remotes repo_config
1802 1803 1804 1805 1806 1807 1808 1809 1810

	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 {
1811
				set fd [open [gitdir remotes $r] r]
1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827
				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
		}
1828 1829 1830
	}
}

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

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

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

S
Shawn O. Pearce 已提交
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 1898
######################################################################
##
## 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

1899 1900 1901 1902
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 已提交
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 1943
   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

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

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

1958
set max_status_desc 0
S
Shawn O. Pearce 已提交
1959
foreach i {
1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978
		{__ "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 已提交
1979
	} {
1980 1981
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
1982
	}
1983
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
1984
}
1985
unset i
S
Shawn O. Pearce 已提交
1986 1987 1988 1989 1990

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

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

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

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

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

2021 2022 2023 2024 2025 2026 2027 2028
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 \
2029
		-font font_uibold
2030 2031 2032 2033
	text $w.m.t \
		-background white -borderwidth 1 \
		-relief sunken \
		-width 80 -height 10 \
2034
		-font font_diff \
2035 2036 2037 2038 2039
		-yscrollcommand [list $w.m.sby set]
	label $w.m.l2 \
		-text {You must correct the above errors before committing.} \
		-anchor w \
		-justify left \
2040
		-font font_uibold
2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052
	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 \
2053
		-font font_ui \
2054
		-command "destroy $w"
2055
	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2056 2057 2058

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

2063 2064 2065
set next_console_id 0

proc new_console {short_title long_title} {
2066 2067 2068 2069 2070 2071 2072
	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} {
2073
	global console_cr console_data M1B
2074

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

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

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

2121
	bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2122 2123
	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"
2124
	bind $w <Visibility> "focus $w"
2125
	wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2126 2127 2128
	return $w
}

2129
proc console_exec {w cmd {after {}}} {
2130 2131 2132
	# -- Windows tosses the enviroment when we exec our child.
	#    But most users need that so we have to relogin. :-(
	#
2133
	if {[is_Windows]} {
2134 2135 2136 2137 2138 2139 2140 2141 2142
		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]
2143
	fconfigure $fd_f -blocking 0 -translation binary
2144
	fileevent $fd_f readable [list console_read $w $fd_f $after]
2145 2146
}

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

	set buf [read $fd]
2151
	if {$buf ne {}} {
2152 2153 2154 2155 2156 2157 2158
		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]
2159 2160
			if {$cr < 0} {set cr [expr {$n + 1}]}
			if {$lf < 0} {set lf [expr {$n + 1}]}
2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173

			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
			}
2174
		}
2175 2176
		$w.m.t conf -state disabled
		$w.m.t see end
2177 2178
	}

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

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

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

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

2210 2211 2212 2213
	set cmd gitk
	if {$revs ne {}} {
		append cmd { }
		append cmd $revs
2214
	}
2215
	if {[is_Windows]} {
2216 2217 2218 2219 2220 2221
		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 已提交
2222
	} else {
2223 2224 2225 2226 2227 2228
		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 已提交
2229 2230 2231
	}
}

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

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

2247
set is_quitting 0
2248

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

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

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

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

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

proc do_rescan {} {
2288
	rescan {set ui_status_value {Ready.}}
S
Shawn O. Pearce 已提交
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 2333
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]
	}
}

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

	if {![lock_index begin-update]} return

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

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

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

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

	set paths [list]
	foreach path [array names file_states] {
		switch -- [lindex $file_states($path) 0] {
		AM -
		AD -
		MM -
2391
		MD -
2392 2393 2394 2395
		_M -
		_D {lappend paths $path}
		}
	}
2396
	include_helper \
2397
		{Adding all modified files} \
2398
		$paths
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 2435
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 \
2436
		"[appname] ([reponame])" \
2437
		"Revert changes in $s?
2438

2439
Any unadded changes will be permanently lost by the revert." \
2440
		question \
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 2468
		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]
	}
}

2469
proc do_signoff {} {
2470
	global ui_comm
2471

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

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

2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501
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]} {
2502
			set selected_commit_type new
2503 2504
		}
	}
2505 2506
}

2507
proc do_commit {} {
2508
	commit_tree
2509 2510
}

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

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

2519
	label $w.header -text "About [appname]" \
S
Shawn O. Pearce 已提交
2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530
		-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 \
2531
		-text "[appname] - a commit creation tool for Git.
2532
$copyright" \
S
Shawn O. Pearce 已提交
2533 2534 2535 2536 2537 2538 2539 2540
		-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

2541
	set v {}
2542
	append v "[appname] version $appvers\n"
2543 2544
	append v "[exec git version]\n"
	append v "\n"
2545 2546 2547 2548 2549 2550 2551
	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 已提交
2552
	label $w.vers \
2553
		-text $v \
S
Shawn O. Pearce 已提交
2554 2555 2556 2557 2558 2559 2560 2561
		-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

2562 2563 2564 2565 2566 2567 2568 2569 2570
	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 已提交
2571 2572
	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
2573
	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2574
	wm title $w "About [appname]"
S
Shawn O. Pearce 已提交
2575 2576 2577
	tkwait window $w
}

2578
proc do_options {} {
2579
	global repo_config global_config font_descs
2580 2581 2582 2583 2584 2585 2586
	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)
	}
2587 2588 2589 2590 2591 2592 2593
	load_config 1
	foreach name [array names repo_config] {
		switch -- $name {
		gui.diffcontext {continue}
		}
		set repo_config_new($name) $repo_config($name)
	}
2594 2595 2596 2597 2598 2599
	foreach name [array names global_config] {
		set global_config_new($name) $global_config($name)
	}

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

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

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

2621
	labelframe $w.repo -text "[reponame] Repository" \
2622
		-font font_ui \
2623 2624
		-relief raised -borderwidth 2
	labelframe $w.global -text {Global (All Repositories)} \
2625
		-font font_ui \
2626 2627 2628 2629 2630
		-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 {
2631
		{b partialinclude {Allow Partially Added Files}}
2632 2633 2634
		{b pullsummary {Show Pull Summary}}
		{b trustmtime  {Trust File Modification Timestamps}}
		{i diffcontext {Number of Diff Context Lines}}
2635
		} {
2636 2637 2638
		set type [lindex $option 0]
		set name [lindex $option 1]
		set text [lindex $option 2]
2639
		foreach f {repo global} {
2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661
			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
			}
			}
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 2691
	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
	}

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

2698
proc do_restore_defaults {} {
2699
	global font_descs default_config repo_config
2700 2701 2702 2703 2704 2705 2706 2707 2708
	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]
2709
		set repo_config(gui.$name) $default_config(gui.$name)
2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726
	}
	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"
	}
2727
	reshow_diff
2728 2729 2730
	destroy $w
}

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

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

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

	set fn [tk_getSaveFile \
		-parent . \
2787
		-title "[appname] ([reponame]): Create Desktop Icon" \
2788
		-initialdir [file join $env(HOME) Desktop] \
2789
		-initialfile "Git [reponame].app"]
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 2823
	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]
2824
				set gd [file normalize [gitdir]]
2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846
				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"
		}
	}
}

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

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

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

2894
proc add_one_to_selection {w x y} {
2895
	global file_lists
2896
	global last_clicked selected_paths
2897

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

2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926
	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 已提交
2927
	}
2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945

	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 已提交
2946 2947 2948 2949
}

######################################################################
##
2950
## config defaults
S
Shawn O. Pearce 已提交
2951

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

2961 2962
font create font_uibold
font create font_diffbold
S
Shawn O. Pearce 已提交
2963

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

2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995
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
2996
set default_config(gui.pullsummary) true
2997
set default_config(gui.partialinclude) false
2998
set default_config(gui.diffcontext) 5
2999 3000 3001 3002 3003 3004
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}}
}
3005
load_config 0
3006 3007 3008 3009 3010 3011
apply_config

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

S
Shawn O. Pearce 已提交
3012
# -- Menu Bar
3013
#
3014
menu .mbar -tearoff 0
3015
.mbar add cascade -label Repository -menu .mbar.repository
3016
.mbar add cascade -label Edit -menu .mbar.edit
S
Shawn O. Pearce 已提交
3017 3018 3019
if {!$single_commit} {
	.mbar add cascade -label Branch -menu .mbar.branch
}
S
Shawn O. Pearce 已提交
3020
.mbar add cascade -label Commit -menu .mbar.commit
3021 3022 3023 3024 3025
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 已提交
3026 3027
. configure -menu .mbar

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

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

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

3052
	.mbar.repository add separator
3053

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

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

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

3106 3107
# -- Branch Menu
#
S
Shawn O. Pearce 已提交
3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123
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 已提交
3124
# -- Commit Menu
3125
#
S
Shawn O. Pearce 已提交
3126
menu .mbar.commit
3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141

.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 \
3142
	-font font_ui
3143 3144
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3145 3146 3147 3148 3149 3150

.mbar.commit add separator

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

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

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

3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179
.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]

3180 3181
.mbar.commit add separator

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

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

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

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

3208
	.mbar.apple add command -label "About [appname]" \
S
Shawn O. Pearce 已提交
3209 3210
		-command do_about \
		-font font_ui
3211
	.mbar.apple add command -label "[appname] Options..." \
S
Shawn O. Pearce 已提交
3212 3213 3214 3215 3216 3217 3218 3219 3220 3221
		-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

3222 3223
	# -- Tools Menu
	#
3224 3225
	if {[file exists /usr/local/miga/lib/gui-miga]
		&& [file exists .pvcsrc]} {
3226
	proc do_miga {} {
3227
		global ui_status_value
3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251
		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 已提交
3252 3253 3254 3255 3256
	# -- Help Menu
	#
	.mbar add cascade -label Help -menu .mbar.help
	menu .mbar.help

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


3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281
# -- 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 已提交
3282
# -- Main Window Layout
3283
#
S
Shawn O. Pearce 已提交
3284 3285
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
3286
.vpane add .vpane.files -sticky nsew -height 100 -width 400
S
Shawn O. Pearce 已提交
3287 3288 3289
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
3290
#
S
Shawn O. Pearce 已提交
3291
frame .vpane.files.index -height 100 -width 400
3292
label .vpane.files.index.title -text {Changes To Be Committed} \
S
Shawn O. Pearce 已提交
3293
	-background green \
3294
	-font font_ui
S
Shawn O. Pearce 已提交
3295 3296
text $ui_index -background white -borderwidth 0 \
	-width 40 -height 10 \
3297
	-font font_ui \
3298
	-cursor $cursor_ptr \
S
Shawn O. Pearce 已提交
3299 3300 3301 3302 3303 3304 3305 3306
	-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

3307
# -- Working Directory File List
3308
#
3309
frame .vpane.files.workdir -height 100 -width 100
3310
label .vpane.files.workdir.title -text {Changed But Not Updated} \
S
Shawn O. Pearce 已提交
3311
	-background red \
3312
	-font font_ui
3313
text $ui_workdir -background white -borderwidth 0 \
S
Shawn O. Pearce 已提交
3314
	-width 40 -height 10 \
3315
	-font font_ui \
3316
	-cursor $cursor_ptr \
3317
	-yscrollcommand {.vpane.files.workdir.sb set} \
S
Shawn O. Pearce 已提交
3318
	-state disabled
3319 3320 3321 3322 3323
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 已提交
3324

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

3333
# -- Diff and Commit Area
3334
#
3335
frame .vpane.lower -height 300 -width 400
3336 3337 3338 3339 3340
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 已提交
3341 3342

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

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

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

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

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

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

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

3476
# -- Diff Header
3477
#
3478 3479
set current_diff {}
set diff_actions [list]
3480
proc trace_current_diff {varname args} {
3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501
	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
	}
}
3502
trace add variable current_diff write trace_current_diff
3503

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

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

3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569
$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 已提交
3570

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

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

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

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

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

set file_lists($ui_index) [list]
3701
set file_lists($ui_workdir) [list]
3702 3703 3704

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

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

3715 3716 3717
# -- 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.
3718 3719 3720 3721 3722 3723 3724 3725
#
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
3726
by [appname]:
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 3768 3769

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

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

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

3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802
# -- 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
}

3803
lock_index begin-read
3804
after 1 do_rescan