git-gui.sh 97.5 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
	unlock_index
	display_all_files
	reshow_diff
528
	uplevel #0 $after
S
Shawn O. Pearce 已提交
529 530
}

531 532 533 534 535 536 537 538 539 540
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 已提交
541 542 543 544 545
######################################################################
##
## diff

proc clear_diff {} {
546
	global ui_diff current_diff_path ui_index ui_workdir
S
Shawn O. Pearce 已提交
547 548 549 550

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

552
	set current_diff_path {}
553 554

	$ui_index tag remove in_diff 0.0 end
555
	$ui_workdir tag remove in_diff 0.0 end
S
Shawn O. Pearce 已提交
556 557
}

558
proc reshow_diff {} {
559 560
	global ui_status_value file_states
	global current_diff_path current_diff_side
561

562 563
	if {$current_diff_path eq {}
		|| [catch {set s $file_states($current_diff_path)}]} {
564
		clear_diff
565
	} else {
566
		show_diff $current_diff_path $current_diff_side
567 568 569
	}
}

570
proc handle_empty_diff {} {
571
	global current_diff_path file_states file_lists
572

573
	set path $current_diff_path
574
	set s $file_states($path)
575
	if {[lindex $s 0] ne {_M}} return
576 577 578 579 580

	info_popup "No differences detected.

[short_path $path] has no changes.

581 582 583 584 585 586 587 588 589
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.
590 591 592 593 594 595
"
	if {[catch {exec git update-index -- $path} err]} {
		error_popup "Failed to refresh index:\n\n$err"
	}

	clear_diff
596
	display_file $path __
597 598
}

599
proc show_diff {path w {lno {}}} {
600
	global file_states file_lists
601
	global is_3way_diff diff_active repo_config
602 603
	global ui_diff ui_status_value ui_index ui_workdir
	global current_diff_path current_diff_side
S
Shawn O. Pearce 已提交
604

605
	if {$diff_active || ![lock_index read]} return
S
Shawn O. Pearce 已提交
606 607

	clear_diff
608
	if {$w eq {} || $lno == {}} {
609 610 611 612 613 614 615 616
		foreach w [array names file_lists] {
			set lno [lsearch -sorted $file_lists($w) $path]
			if {$lno >= 0} {
				incr lno
				break
			}
		}
	}
617
	if {$w ne {} && $lno >= 1} {
618
		$w tag add in_diff $lno.0 [expr {$lno + 1}].0
619 620
	}

S
Shawn O. Pearce 已提交
621 622
	set s $file_states($path)
	set m [lindex $s 0]
623
	set is_3way_diff 0
S
Shawn O. Pearce 已提交
624
	set diff_active 1
625
	set current_diff_path $path
626
	set current_diff_side $w
627
	set ui_status_value "Loading diff of [escape_path $path]..."
S
Shawn O. Pearce 已提交
628

629 630 631
	# - Git won't give us the diff, there's nothing to compare to!
	#
	if {$m eq {_O}} {
S
Shawn O. Pearce 已提交
632 633 634 635 636
		if {[catch {
				set fd [open $path r]
				set content [read $fd]
				close $fd
			} err ]} {
637
			set diff_active 0
638
			unlock_index
639
			set ui_status_value "Unable to display [escape_path $path]"
640
			error_popup "Error loading file:\n\n$err"
S
Shawn O. Pearce 已提交
641 642 643 644 645
			return
		}
		$ui_diff conf -state normal
		$ui_diff insert end $content
		$ui_diff conf -state disabled
646 647 648
		set diff_active 0
		unlock_index
		set ui_status_value {Ready.}
S
Shawn O. Pearce 已提交
649 650
		return
	}
651 652 653 654 655 656

	set cmd [list | git]
	if {$w eq $ui_index} {
		lappend cmd diff-index
		lappend cmd --cached
	} elseif {$w eq $ui_workdir} {
657 658 659 660 661
		if {[string index $m 0] eq {U}} {
			lappend cmd diff
		} else {
			lappend cmd diff-files
		}
S
Shawn O. Pearce 已提交
662 663
	}

664 665 666 667 668 669 670 671
	lappend cmd -p
	lappend cmd --no-color
	if {$repo_config(gui.diffcontext) > 0} {
		lappend cmd "-U$repo_config(gui.diffcontext)"
	}
	if {$w eq $ui_index} {
		lappend cmd [PARENT]
	}
672 673 674
	lappend cmd --
	lappend cmd $path

S
Shawn O. Pearce 已提交
675
	if {[catch {set fd [open $cmd r]} err]} {
676
		set diff_active 0
677
		unlock_index
678
		set ui_status_value "Unable to display [escape_path $path]"
679
		error_popup "Error loading diff:\n\n$err"
S
Shawn O. Pearce 已提交
680 681 682
		return
	}

683
	fconfigure $fd -blocking 0 -translation auto
S
Shawn O. Pearce 已提交
684 685 686 687
	fileevent $fd readable [list read_diff $fd]
}

proc read_diff {fd} {
688
	global ui_diff ui_status_value is_3way_diff diff_active
689
	global repo_config
S
Shawn O. Pearce 已提交
690

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

703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718
		# -- 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 已提交
719 720
			default {set tags {}}
			}
721
			set line [string replace $line 0 1 $op]
S
Shawn O. Pearce 已提交
722
		} else {
723 724 725 726
			switch -- [string index $line 0] {
			@ {set tags d_@}
			+ {set tags d_+}
			- {set tags d_-}
S
Shawn O. Pearce 已提交
727 728 729 730
			default {set tags {}}
			}
		}
		$ui_diff insert end $line $tags
731
		$ui_diff insert end "\n" $tags
S
Shawn O. Pearce 已提交
732
	}
733
	$ui_diff conf -state disabled
S
Shawn O. Pearce 已提交
734 735 736 737

	if {[eof $fd]} {
		close $fd
		set diff_active 0
738
		unlock_index
S
Shawn O. Pearce 已提交
739
		set ui_status_value {Ready.}
740

741 742
		if {$repo_config(gui.trustmtime) eq {true}
			&& [$ui_diff index end] eq {2.0}} {
743 744
			handle_empty_diff
		}
S
Shawn O. Pearce 已提交
745 746 747
	}
}

748 749 750 751
######################################################################
##
## commit

752
proc load_last_commit {} {
753
	global HEAD PARENT MERGE_HEAD commit_type ui_comm
754

755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772
	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.
}
773 774 775 776
		return
	}

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

792 793 794 795 796 797 798
	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}
799
	}
800 801 802 803

	$ui_comm delete 0.0 end
	$ui_comm insert end $msg
	$ui_comm edit reset
804
	$ui_comm edit modified false
805
	rescan {set ui_status_value {Ready.}}
806 807
}

808 809 810 811 812 813
proc create_new_commit {} {
	global commit_type ui_comm

	set commit_type normal
	$ui_comm delete 0.0 end
	$ui_comm edit reset
814
	$ui_comm edit modified false
815 816 817
	rescan {set ui_status_value {Ready.}}
}

818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837
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
}

838
proc commit_tree {} {
839
	global HEAD commit_type file_states ui_comm repo_config
840
	global ui_status_value pch_error
841

842
	if {![lock_index update]} return
843
	if {[committer_ident] eq {}} return
844 845 846

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

854 855 856
Another Git program has modified this repository
since the last scan.  A rescan must be performed
before another commit can be created.
857

858
The rescan will be automatically started now.
859 860
}
		unlock_index
861
		rescan {set ui_status_value {Ready.}}
862 863 864 865 866 867 868
		return
	}

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

877
File [short_path $path] has merge conflicts.
878
You must resolve them and include the file before committing.
879 880 881 882 883 884 885
"
			unlock_index
			return
		}
		default {
			error_popup "Unknown file state [lindex $s 0] detected.

886
File [short_path $path] cannot be committed by this program.
887 888 889 890 891
"
		}
		}
	}
	if {!$files_ready} {
892
		error_popup {No included files to commit.
893

894
You must include at least 1 file before you can commit.
895 896 897 898 899 900 901 902
}
		unlock_index
		return
	}

	# -- A message is required.
	#
	set msg [string trim [$ui_comm get 1.0 end]]
903
	if {$msg eq {}} {
904 905 906 907 908 909 910 911 912 913 914 915
		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
	}

916 917
	# -- Run the pre-commit hook.
	#
918
	set pchook [gitdir hooks pre-commit]
919 920 921

	# On Cygwin [file executable] might lie so we need to ask
	# the shell if the hook is executable.  Yes that's annoying.
922 923
	#
	if {[is_Windows] && [file isfile $pchook]} {
924 925 926 927
		set pchook [list sh -c [concat \
			"if test -x \"$pchook\";" \
			"then exec \"$pchook\" 2>&1;" \
			"fi"]]
928
	} elseif {[file executable $pchook]} {
929
		set pchook [list $pchook |& cat]
930
	} else {
931 932
		commit_writetree $curHEAD $msg
		return
933
	}
934 935 936 937 938 939 940

	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]
941 942
}

943
proc commit_prehook_wait {fd_ph curHEAD msg} {
944
	global pch_error ui_status_value
945 946 947 948 949 950 951 952

	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
953
		} else {
954
			commit_writetree $curHEAD $msg
955
		}
956
		set pch_error {}
957
		return
958
	}
959
	fconfigure $fd_ph -blocking 0
960 961
}

962
proc commit_writetree {curHEAD msg} {
963
	global ui_status_value
964 965 966

	set ui_status_value {Committing changes...}
	set fd_wt [open "| git write-tree" r]
967 968
	fileevent $fd_wt readable \
		[list commit_committree $fd_wt $curHEAD $msg]
969 970
}

971
proc commit_committree {fd_wt curHEAD msg} {
972
	global HEAD PARENT MERGE_HEAD commit_type
973
	global single_commit
974
	global ui_status_value ui_comm selected_commit_type
975
	global file_states selected_paths rescan_active
976 977

	gets $fd_wt tree_id
978
	if {$tree_id eq {} || [catch {close $fd_wt} err]} {
979
		error_popup "write-tree failed:\n\n$err"
980 981 982 983 984 985 986 987
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Create the commit.
	#
	set cmd [list git commit-tree $tree_id]
988 989 990 991
	set parents [concat $PARENT $MERGE_HEAD]
	if {[llength $parents] > 0} {
		foreach p $parents {
			lappend cmd -p $p
992
		}
993
	} else {
994 995 996 997 998
		# 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]} {
999
		error_popup "commit-tree failed:\n\n$err"
1000 1001 1002 1003 1004 1005 1006 1007
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Update the HEAD ref.
	#
	set reflogm commit
1008
	if {$commit_type ne {normal}} {
1009 1010 1011 1012
		append reflogm " ($commit_type)"
	}
	set i [string first "\n" $msg]
	if {$i >= 0} {
1013
		append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1014 1015 1016
	} else {
		append reflogm {: } $msg
	}
1017
	set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1018
	if {[catch {eval exec $cmd} err]} {
1019
		error_popup "update-ref failed:\n\n$err"
1020 1021 1022 1023 1024 1025 1026
		set ui_status_value {Commit failed.}
		unlock_index
		return
	}

	# -- Cleanup after ourselves.
	#
1027 1028 1029 1030
	catch {file delete [gitdir MERGE_HEAD]}
	catch {file delete [gitdir MERGE_MSG]}
	catch {file delete [gitdir SQUASH_MSG]}
	catch {file delete [gitdir GITGUI_MSG]}
1031 1032 1033

	# -- Let rerere do its thing.
	#
1034
	if {[file isdirectory [gitdir rr-cache]]} {
1035 1036 1037
		catch {exec git rerere}
	}

1038 1039
	# -- Run the post-commit hook.
	#
1040
	set pchook [gitdir hooks post-commit]
1041
	if {[is_Windows] && [file isfile $pchook]} {
1042 1043 1044 1045 1046 1047 1048
		set pchook [list sh -c [concat \
			"if test -x \"$pchook\";" \
			"then exec \"$pchook\";" \
			"fi"]]
	} elseif {![file executable $pchook]} {
		set pchook {}
	}
1049
	if {$pchook ne {}} {
1050 1051 1052
		catch {exec $pchook &}
	}

1053
	$ui_comm delete 0.0 end
1054
	$ui_comm edit reset
1055
	$ui_comm edit modified false
1056 1057 1058

	if {$single_commit} do_quit

1059
	# -- Update in memory status
1060
	#
1061
	set selected_commit_type new
1062
	set commit_type normal
1063 1064
	set HEAD $cmt_id
	set PARENT $cmt_id
1065
	set MERGE_HEAD [list]
1066 1067 1068 1069 1070

	foreach path [array names file_states] {
		set s $file_states($path)
		set m [lindex $s 0]
		switch -glob -- $m {
1071 1072 1073 1074 1075 1076
		_O -
		_M -
		_D {continue}
		__ -
		A_ -
		M_ -
1077
		D_ {
1078
			unset file_states($path)
1079
			catch {unset selected_paths($path)}
1080 1081 1082 1083 1084 1085 1086
		}
		DO {
			set file_states($path) [list _O [lindex $s 1] {} {}]
		}
		AM -
		AD -
		MM -
1087
		MD {
1088 1089 1090 1091 1092 1093
			set file_states($path) [list \
				_[string index $m 1] \
				[lindex $s 1] \
				[lindex $s 3] \
				{}]
		}
1094 1095 1096 1097
		}
	}

	display_all_files
1098
	unlock_index
1099 1100 1101
	reshow_diff
	set ui_status_value \
		"Changes committed as [string range $cmt_id 0 7]."
1102 1103
}

1104 1105 1106 1107 1108 1109 1110
######################################################################
##
## fetch pull push

proc fetch_from {remote} {
	set w [new_console "fetch $remote" \
		"Fetching new changes from $remote"]
1111
	set cmd [list git fetch]
1112
	lappend cmd $remote
1113
	console_exec $w $cmd
1114 1115
}

1116
proc pull_remote {remote branch} {
1117
	global HEAD commit_type file_states repo_config
1118

1119
	if {![lock_index update]} return
1120 1121 1122

	# -- Our in memory state should match the repository.
	#
1123 1124
	repository_state curType curHEAD curMERGE_HEAD
	if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1125
		info_popup {Last scanned state does not match repository state.
1126

1127 1128 1129 1130 1131
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.
1132 1133
}
		unlock_index
1134
		rescan {set ui_status_value {Ready.}}
1135 1136 1137 1138 1139 1140 1141 1142
		return
	}

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

1143 1144 1145
You should not perform a pull with unmodified
files in your working directory as Git will be
unable to recover from an incorrect merge.
1146

1147 1148
You should commit or revert all changes before
starting a pull operation.
1149 1150 1151 1152 1153
}
		unlock_index
		return
	}

1154 1155 1156
	set w [new_console "pull $remote $branch" \
		"Pulling new changes from branch $branch in $remote"]
	set cmd [list git pull]
1157
	if {$repo_config(gui.pullsummary) eq {false}} {
1158 1159
		lappend cmd --no-summary
	}
1160 1161 1162 1163 1164 1165
	lappend cmd $remote
	lappend cmd $branch
	console_exec $w $cmd [list post_pull_remote $remote $branch]
}

proc post_pull_remote {remote branch success} {
1166
	global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1167 1168
	global ui_status_value

1169
	unlock_index
1170
	if {$success} {
1171
		repository_state commit_type HEAD MERGE_HEAD
1172
		set PARENT $HEAD
1173
		set selected_commit_type new
1174
		set ui_status_value "Pulling $branch from $remote complete."
1175
	} else {
1176 1177
		rescan [list set ui_status_value \
			"Conflicts detected while pulling $branch from $remote."]
1178 1179 1180
	}
}

1181 1182 1183
proc push_to {remote} {
	set w [new_console "push $remote" \
		"Pushing changes to $remote"]
1184
	set cmd [list git push]
1185
	lappend cmd $remote
1186
	console_exec $w $cmd
1187 1188
}

S
Shawn O. Pearce 已提交
1189 1190 1191 1192
######################################################################
##
## ui helpers

1193
proc mapicon {w state path} {
S
Shawn O. Pearce 已提交
1194 1195
	global all_icons

1196 1197
	if {[catch {set r $all_icons($state$w)}]} {
		puts "error: no icon for $w state={$state} $path"
S
Shawn O. Pearce 已提交
1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212
		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
}

1213 1214 1215 1216 1217
proc escape_path {path} {
	regsub -all "\n" $path "\\n" path
	return $path
}

1218 1219 1220 1221
proc short_path {path} {
	return [escape_path [lindex [file split $path] end]]
}

1222
set next_icon_id 0
1223
set null_sha1 [string repeat 0 40]
1224

1225
proc merge_state {path new_state {head_info {}} {index_info {}}} {
1226
	global file_states next_icon_id null_sha1
S
Shawn O. Pearce 已提交
1227

1228 1229 1230 1231 1232 1233
	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 已提交
1234
	} else {
1235 1236
		set state [lindex $info 0]
		set icon [lindex $info 1]
1237 1238
		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
		if {$index_info eq {}} {set index_info [lindex $info 3]}
S
Shawn O. Pearce 已提交
1239 1240
	}

1241 1242 1243 1244 1245
	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 已提交
1246

1247 1248 1249
	if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
		set head_info [list 0 $null_sha1]
	} elseif {$s0 ne {_} && [string index $state 0] eq {_}
1250 1251
		&& $head_info eq {}} {
		set head_info $index_info
S
Shawn O. Pearce 已提交
1252 1253
	}

1254 1255 1256
	set file_states($path) [list $s0$s1 $icon \
		$head_info $index_info \
		]
1257
	return $state
S
Shawn O. Pearce 已提交
1258 1259
}

1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
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 已提交
1291
proc display_file {path state} {
1292 1293
	global file_states selected_paths
	global ui_index ui_workdir
S
Shawn O. Pearce 已提交
1294 1295 1296

	set old_m [merge_state $path $state]
	set s $file_states($path)
1297
	set new_m [lindex $s 0]
1298 1299
	set icon_name [lindex $s 1]

1300 1301 1302 1303
	set s [string index $new_m 0]
	if {$s eq {U}} {
		set s _
	}
1304
	display_file_helper	$ui_index $path $icon_name \
1305 1306 1307 1308 1309 1310 1311
		[string index $old_m 0] $s

	if {[string index $new_m 0] eq {U}} {
		set s U
	} else {
		set s [string index $new_m 1]
	}
1312
	display_file_helper	$ui_workdir $path $icon_name \
1313
		[string index $old_m 1] $s
S
Shawn O. Pearce 已提交
1314

1315 1316 1317 1318
	if {$new_m eq {__}} {
		unset file_states($path)
		catch {unset selected_paths($path)}
	}
1319
}
1320

1321 1322
proc display_all_files_helper {w path icon_name m} {
	global file_lists
1323

1324 1325 1326 1327 1328 1329 1330
	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"
1331
}
S
Shawn O. Pearce 已提交
1332

1333
proc display_all_files {} {
1334
	global ui_index ui_workdir
1335
	global file_states file_lists
1336
	global last_clicked
1337 1338

	$ui_index conf -state normal
1339
	$ui_workdir conf -state normal
1340

1341
	$ui_index delete 0.0 end
1342
	$ui_workdir delete 0.0 end
1343
	set last_clicked {}
1344

1345
	set file_lists($ui_index) [list]
1346
	set file_lists($ui_workdir) [list]
1347

1348 1349 1350
	foreach path [lsort [array names file_states]] {
		set s $file_states($path)
		set m [lindex $s 0]
1351 1352
		set icon_name [lindex $s 1]

1353 1354
		set s [string index $m 0]
		if {$s ne {U} && $s ne {_}} {
1355
			display_all_files_helper $ui_index $path \
1356
				$icon_name $s
1357
		}
1358 1359 1360 1361 1362 1363 1364

		if {[string index $m 0] eq {U}} {
			set s U
		} else {
			set s [string index $m 1]
		}
		if {$s ne {_}} {
1365
			display_all_files_helper $ui_workdir $path \
1366
				$icon_name $s
1367
		}
S
Shawn O. Pearce 已提交
1368
	}
1369 1370

	$ui_index conf -state disabled
1371
	$ui_workdir conf -state disabled
S
Shawn O. Pearce 已提交
1372 1373
}

1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408
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
1409
	global file_states current_diff_path
1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427

	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}
1428
		D_ {set new _D}
1429 1430 1431 1432 1433 1434
		D? {set new _?}
		?? {continue}
		}
		set info [lindex $s 2]
		if {$info eq {}} continue

1435
		puts -nonewline $fd "$info\t$path\0"
1436 1437 1438 1439 1440 1441 1442 1443 1444 1445
		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}]]
}

1446
proc update_index {msg pathList after} {
1447
	global update_index_cp ui_status_value
1448

1449
	if {![lock_index update]} return
1450

1451
	set update_index_cp 0
1452
	set pathList [lsort $pathList]
1453 1454 1455 1456 1457
	set totalCnt [llength $pathList]
	set batch [expr {int($totalCnt * .01) + 1}]
	if {$batch > 25} {set batch 25}

	set ui_status_value [format \
1458
		"$msg... %i/%i files (%.2f%%)" \
1459 1460 1461 1462
		$update_index_cp \
		$totalCnt \
		0.0]
	set fd [open "| git update-index --add --remove -z --stdin" w]
1463 1464 1465 1466 1467
	fconfigure $fd \
		-blocking 0 \
		-buffering full \
		-buffersize 512 \
		-translation binary
1468 1469 1470 1471 1472 1473
	fileevent $fd writable [list \
		write_update_index \
		$fd \
		$pathList \
		$totalCnt \
		$batch \
1474 1475
		$msg \
		$after \
1476 1477 1478
		]
}

1479
proc write_update_index {fd pathList totalCnt batch msg after} {
1480
	global update_index_cp ui_status_value
1481
	global file_states current_diff_path
1482

1483 1484 1485
	if {$update_index_cp >= $totalCnt} {
		close $fd
		unlock_index
1486
		uplevel #0 $after
1487
		return
1488 1489
	}

1490 1491 1492 1493 1494 1495
	for {set i $batch} \
		{$update_index_cp < $totalCnt && $i > 0} \
		{incr i -1} {
		set path [lindex $pathList $update_index_cp]
		incr update_index_cp

1496
		switch -glob -- [lindex $file_states($path) 0] {
1497 1498
		AD {set new __}
		?D {set new D_}
1499
		_O -
1500
		AM {set new A_}
1501 1502 1503 1504 1505 1506 1507
		U? {
			if {[file exists $path]} {
				set new M_
			} else {
				set new D_
			}
		}
1508
		?M {set new M_}
1509
		?? {continue}
1510
		}
1511
		puts -nonewline $fd "$path\0"
1512
		display_file $path $new
S
Shawn O. Pearce 已提交
1513 1514
	}

1515
	set ui_status_value [format \
1516
		"$msg... %i/%i files (%.2f%%)" \
1517 1518 1519
		$update_index_cp \
		$totalCnt \
		[expr {100.0 * $update_index_cp / $totalCnt}]]
S
Shawn O. Pearce 已提交
1520 1521
}

1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562
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
1563
	global file_states current_diff_path
1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577

	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] {
1578 1579 1580 1581 1582 1583
		U? {continue}
		?M -
		?D {
			puts -nonewline $fd "$path\0"
			display_file $path ?_
		}
1584 1585 1586 1587 1588 1589 1590 1591 1592 1593
		}
	}

	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 已提交
1594 1595 1596 1597
######################################################################
##
## branch management

1598 1599
proc load_all_heads {} {
	global all_heads tracking_branches
S
Shawn O. Pearce 已提交
1600

1601
	set all_heads [list]
S
Shawn O. Pearce 已提交
1602 1603 1604 1605 1606
	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} {
1607 1608
		if {![catch {set info $tracking_branches($line)}]} continue
		if {![regsub ^refs/heads/ $line {} name]} continue
1609
		lappend all_heads $name
S
Shawn O. Pearce 已提交
1610 1611 1612
	}
	close $fd

1613
	set all_heads [lsort $all_heads]
S
Shawn O. Pearce 已提交
1614 1615
}

1616
proc populate_branch_menu {} {
1617
	global all_heads disable_on_lock
S
Shawn O. Pearce 已提交
1618

1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634
	set m .mbar.branch
	set last [$m index last]
	for {set i 0} {$i <= $last} {incr i} {
		if {[$m type $i] eq {separator}} {
			$m delete $i last
			set new_dol [list]
			foreach a $disable_on_lock {
				if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
					lappend new_dol $a
				}
			}
			set disable_on_lock $new_dol
			break
		}
	}

S
Shawn O. Pearce 已提交
1635
	$m add separator
1636
	foreach b $all_heads {
S
Shawn O. Pearce 已提交
1637 1638
		$m add radiobutton \
			-label $b \
1639
			-command [list switch_branch $b] \
S
Shawn O. Pearce 已提交
1640 1641 1642 1643 1644 1645 1646 1647
			-variable current_branch \
			-value $b \
			-font font_ui
		lappend disable_on_lock \
			[list $m entryconf [$m index last] -state]
	}
}

1648 1649
proc do_create_branch_action {w} {
	global all_heads null_sha1
1650 1651
	global create_branch_checkout create_branch_revtype
	global create_branch_head create_branch_trackinghead
1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677

	set newbranch [string trim [$w.name.t get 0.0 end]]
	if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
		tk_messageBox \
			-icon error \
			-type ok \
			-title [wm title $w] \
			-parent $w \
			-message "Branch '$newbranch' already exists."
		focus $w.name.t
		return
	}
	if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
		tk_messageBox \
			-icon error \
			-type ok \
			-title [wm title $w] \
			-parent $w \
			-message "We do not like '$newbranch' as a branch name."
		focus $w.name.t
		return
	}

	set rev {}
	switch -- $create_branch_revtype {
	head {set rev $create_branch_head}
1678
	tracking {set rev $create_branch_trackinghead}
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
	expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
	}
	if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
		tk_messageBox \
			-icon error \
			-type ok \
			-title [wm title $w] \
			-parent $w \
			-message "Invalid starting revision: $rev"
		return
	}
	set cmd [list git update-ref]
	lappend cmd -m
	lappend cmd "branch: Created from $rev"
	lappend cmd "refs/heads/$newbranch"
	lappend cmd $cmt
	lappend cmd $null_sha1
	if {[catch {eval exec $cmd} err]} {
		tk_messageBox \
			-icon error \
			-type ok \
			-title [wm title $w] \
			-parent $w \
			-message "Failed to create '$newbranch'.\n\n$err"
		return
	}

	lappend all_heads $newbranch
	set all_heads [lsort $all_heads]
	populate_branch_menu
	destroy $w
1710 1711 1712
	if {$create_branch_checkout} {
		switch_branch $newbranch
	}
1713 1714
}

1715
proc do_create_branch {} {
1716 1717 1718
	global all_heads current_branch tracking_branches
	global create_branch_checkout create_branch_revtype
	global create_branch_head create_branch_trackinghead
1719

1720
	set create_branch_checkout 1
1721 1722
	set create_branch_revtype head
	set create_branch_head $current_branch
1723
	set create_branch_trackinghead {}
1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749

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

	label $w.header -text {Create New Branch} \
		-font font_uibold
	pack $w.header -side top -fill x

	frame $w.buttons
	button $w.buttons.create -text Create \
		-font font_ui \
		-default active \
		-command [list do_create_branch_action $w]
	pack $w.buttons.create -side right
	button $w.buttons.cancel -text {Cancel} \
		-font font_ui \
		-command [list destroy $w]
	pack $w.buttons.cancel -side right -padx 5
	pack $w.buttons -side bottom -fill x -pady 10 -padx 10

	labelframe $w.name \
		-text {Branch Description} \
		-font font_ui
	label $w.name.l -text {Name:} -font font_ui
	text $w.name.t \
1750 1751
		-borderwidth 1 \
		-relief sunken \
1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770
		-height 1 \
		-width 40 \
		-font font_ui
	bind $w.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
	bind $w.name.t <Key-Tab> "focus $w.from.exp.t;break"
	bind $w.name.t <Key-Return> "do_create_branch_action $w;break"
	bind $w.name.t <Key> {
		if {{%K} ne {BackSpace}
			&& {%K} ne {Tab}
			&& {%K} ne {Escape}
			&& {%K} ne {Return}} {
			if {%k <= 32} break
			if {[string first %A {~^:?*[}] >= 0} break
		}
	}
	pack $w.name.l -side left -padx 5
	pack $w.name.t -side left -fill x -expand 1
	pack $w.name -anchor nw -fill x -pady 5 -padx 5

1771 1772 1773 1774 1775 1776 1777 1778 1779 1780
	set all_trackings [list]
	foreach b [array names tracking_branches] {
		regsub ^refs/(heads|remotes)/ $b {} b
		lappend all_trackings $b
	}
	set all_trackings [lsort -unique $all_trackings]
	if {$all_trackings ne {}} {
		set create_branch_trackinghead [lindex $all_trackings 0]
	}

1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792
	labelframe $w.from \
		-text {Starting Revision} \
		-font font_ui
	frame $w.from.head
	radiobutton $w.from.head.r \
		-text {Local Branch:} \
		-value head \
		-variable create_branch_revtype \
		-font font_ui
	eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
	pack $w.from.head.r -side left
	pack $w.from.head.m -side left
1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803
	frame $w.from.tracking
	radiobutton $w.from.tracking.r \
		-text {Tracking Branch:} \
		-value tracking \
		-variable create_branch_revtype \
		-font font_ui
	eval tk_optionMenu $w.from.tracking.m \
		create_branch_trackinghead \
		$all_trackings
	pack $w.from.tracking.r -side left
	pack $w.from.tracking.m -side left
1804 1805 1806 1807 1808 1809 1810
	frame $w.from.exp
	radiobutton $w.from.exp.r \
		-text {Revision Expression:} \
		-value expression \
		-variable create_branch_revtype \
		-font font_ui
	text $w.from.exp.t \
1811 1812
		-borderwidth 1 \
		-relief sunken \
1813 1814 1815 1816 1817 1818 1819 1820 1821
		-height 1 \
		-width 50 \
		-font font_ui
	bind $w.from.exp.t <Shift-Key-Tab> "focus $w.name.t;break"
	bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
	bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
	pack $w.from.exp.r -side left
	pack $w.from.exp.t -side left -fill x -expand 1
	pack $w.from.head -padx 5 -fill x -expand 1
1822
	pack $w.from.tracking -padx 5 -fill x -expand 1
1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840
	pack $w.from.exp -padx 5 -fill x -expand 1
	pack $w.from -anchor nw -fill x -pady 5 -padx 5

	labelframe $w.postActions \
		-text {Post Creation Actions} \
		-font font_ui
	checkbutton $w.postActions.checkout \
		-text {Checkout after creation} \
		-variable create_branch_checkout \
		-font font_ui
	pack $w.postActions.checkout -anchor nw
	pack $w.postActions -anchor nw -fill x -pady 5 -padx 5

	bind $w <Visibility> "grab $w; focus $w.name.t"
	bind $w <Key-Escape> "destroy $w"
	bind $w <Key-Return> "do_create_branch_action $w;break"
	wm title $w "[appname] ([reponame]): Create Branch"
	tkwait window $w
1841 1842
}

1843 1844 1845 1846 1847
proc do_delete_branch_action {w} {
	global all_heads
	global delete_branch_checkhead delete_branch_head

	set to_delete [list]
1848
	set not_merged [list]
1849 1850 1851 1852
	foreach i [$w.list.l curselection] {
		set b [$w.list.l get $i]
		if {[catch {set o [exec git rev-parse --verify $b]}]} continue
		if {$delete_branch_checkhead} {
1853
			if {$b eq $delete_branch_head} continue
1854
			if {[catch {set m [exec git merge-base $o $delete_branch_head]}]} continue
1855 1856 1857 1858
			if {$o ne $m} {
				lappend not_merged $b
				continue
			}
1859 1860 1861
		}
		lappend to_delete [list $b $o]
	}
1862 1863 1864 1865
	if {$not_merged ne {}} {
		set msg "The following branches are not completely merged into $delete_branch_head:

 - [join $not_merged "\n - "]"
1866 1867 1868 1869 1870
		tk_messageBox \
			-icon info \
			-type ok \
			-title [wm title $w] \
			-parent $w \
1871
			-message $msg
1872
	}
1873 1874 1875
	if {$to_delete eq {}} return
	if {!$delete_branch_checkhead} {
		set msg {Recovering deleted branches is difficult.
1876

1877 1878 1879 1880 1881 1882 1883 1884 1885
Delete the selected branches?}
		if {[tk_messageBox \
			-icon warning \
			-type yesno \
			-title [wm title $w] \
			-parent $w \
			-message $msg] ne yes} {
			return
		}
1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915
	}

	set failed {}
	foreach i $to_delete {
		set b [lindex $i 0]
		set o [lindex $i 1]
		if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
			append failed " - $b: $err\n"
		} else {
			set x [lsearch -sorted $all_heads $b]
			if {$x >= 0} {
				set all_heads [lreplace $all_heads $x $x]
			}
		}
	}

	if {$failed ne {}} {
		tk_messageBox \
			-icon error \
			-type ok \
			-title [wm title $w] \
			-parent $w \
			-message "Failed to delete branches:\n$failed"
	}

	set all_heads [lsort $all_heads]
	populate_branch_menu
	destroy $w
}

1916
proc do_delete_branch {} {
1917
	global all_heads tracking_branches current_branch
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 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957
	global delete_branch_checkhead delete_branch_head

	set delete_branch_checkhead 1
	set delete_branch_head $current_branch

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

	label $w.header -text {Delete Local Branch} \
		-font font_uibold
	pack $w.header -side top -fill x

	frame $w.buttons
	button $w.buttons.create -text Delete \
		-font font_ui \
		-command [list do_delete_branch_action $w]
	pack $w.buttons.create -side right
	button $w.buttons.cancel -text {Cancel} \
		-font font_ui \
		-command [list destroy $w]
	pack $w.buttons.cancel -side right -padx 5
	pack $w.buttons -side bottom -fill x -pady 10 -padx 10

	labelframe $w.list \
		-text {Local Branches} \
		-font font_ui
	listbox $w.list.l \
		-height 10 \
		-width 50 \
		-selectmode extended \
		-font font_ui
	foreach h $all_heads {
		if {$h ne $current_branch} {
			$w.list.l insert end $h
		}
	}
	pack $w.list.l -fill both -pady 5 -padx 5
	pack $w.list -fill both -pady 5 -padx 5

1958 1959 1960 1961 1962 1963
	set all_trackings [list]
	foreach b [array names tracking_branches] {
		regsub ^refs/(heads|remotes)/ $b {} b
		lappend all_trackings $b
	}

1964 1965 1966 1967 1968
	labelframe $w.validate \
		-text {Only Delete If} \
		-font font_ui
	frame $w.validate.head
	checkbutton $w.validate.head.r \
1969
		-text {Already Merged Into:} \
1970 1971
		-variable delete_branch_checkhead \
		-font font_ui
1972 1973 1974
	eval tk_optionMenu $w.validate.head.m delete_branch_head \
		$all_heads \
		[lsort -unique $all_trackings]
1975 1976 1977 1978 1979 1980 1981 1982 1983
	pack $w.validate.head.r -side left
	pack $w.validate.head.m -side left
	pack $w.validate.head -padx 5 -fill x -expand 1
	pack $w.validate -anchor nw -fill x -pady 5 -padx 5

	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
	wm title $w "[appname] ([reponame]): Delete Branch"
	tkwait window $w
1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030
}

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

2031 2032
######################################################################
##
2033
## remote management
2034

2035
proc load_all_remotes {} {
2036
	global repo_config
2037
	global all_remotes tracking_branches
2038 2039

	set all_remotes [list]
2040 2041
	array unset tracking_branches

2042
	set rm_dir [gitdir remotes]
2043
	if {[file isdirectory $rm_dir]} {
2044
		set all_remotes [glob \
2045 2046 2047
			-types f \
			-tails \
			-nocomplain \
2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063
			-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
			}
		}
2064 2065
	}

2066
	foreach line [array names repo_config remote.*.url] {
2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078
		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]
2079 2080 2081 2082 2083 2084
		}
	}

	set all_remotes [lsort -unique $all_remotes]
}

2085
proc populate_fetch_menu {m} {
2086
	global all_remotes repo_config
2087

2088 2089 2090 2091 2092 2093 2094 2095
	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 {
2096
				set fd [open [gitdir remotes $r] r]
2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116
				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} {
2117
	global all_remotes repo_config
2118 2119 2120 2121 2122 2123 2124 2125 2126

	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 {
2127
				set fd [open [gitdir remotes $r] r]
2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143
				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
		}
2144 2145 2146
	}
}

2147
proc populate_pull_menu {m} {
2148
	global repo_config all_remotes disable_on_lock
2149 2150

	foreach remote $all_remotes {
2151
		set rb_list [list]
2152 2153
		if {[array get repo_config remote.$remote.url] ne {}} {
			if {[array get repo_config remote.$remote.fetch] ne {}} {
2154 2155 2156 2157 2158
				foreach line $repo_config(remote.$remote.fetch) {
					if {[regexp {^([^:]+):} $line line rb]} {
						lappend rb_list $rb
					}
				}
2159 2160 2161
			}
		} else {
			catch {
2162
				set fd [open [gitdir remotes $remote] r]
2163 2164
				while {[gets $fd line] >= 0} {
					if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2165
						lappend rb_list $rb
2166 2167 2168 2169 2170 2171
					}
				}
				close $fd
			}
		}

2172 2173
		foreach rb $rb_list {
			regsub ^refs/heads/ $rb {} rb_short
2174 2175 2176
			$m add command \
				-label "Branch $rb_short from $remote..." \
				-command [list pull_remote $remote $rb] \
2177
				-font font_ui
2178 2179
			lappend disable_on_lock \
				[list $m entryconf [$m index last] -state]
2180 2181 2182 2183
		}
	}
}

S
Shawn O. Pearce 已提交
2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214
######################################################################
##
## 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

2215 2216 2217 2218
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 已提交
2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259
   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

2260
set ui_index .vpane.files.index.list
2261
set ui_workdir .vpane.files.workdir.list
2262 2263 2264 2265 2266 2267 2268 2269 2270 2271

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
2272
set all_icons(U$ui_workdir) file_merge
2273 2274
set all_icons(O$ui_workdir) file_plain

2275
set max_status_desc 0
S
Shawn O. Pearce 已提交
2276
foreach i {
2277 2278
		{__ "Unmodified"}

2279 2280 2281 2282 2283 2284 2285 2286 2287
		{_M "Modified, not staged"}
		{M_ "Staged for commit"}
		{MM "Portions staged for commit"}
		{MD "Staged for commit, missing"}

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

		{_D "Missing"}
2290 2291
		{D_ "Staged for removal"}
		{DO "Staged for removal, still present"}
2292

2293
		{U_ "Requires merge resolution"}
2294
		{UU "Requires merge resolution"}
2295 2296
		{UM "Requires merge resolution"}
		{UD "Requires merge resolution"}
S
Shawn O. Pearce 已提交
2297
	} {
2298 2299
	if {$max_status_desc < [string length [lindex $i 1]]} {
		set max_status_desc [string length [lindex $i 1]]
2300
	}
2301
	set all_descs([lindex $i 0]) [lindex $i 1]
S
Shawn O. Pearce 已提交
2302
}
2303
unset i
S
Shawn O. Pearce 已提交
2304 2305 2306 2307 2308

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

2309 2310
proc is_MacOSX {} {
	global tcl_platform tk_library
2311
	if {[tk windowingsystem] eq {aqua}} {
2312 2313 2314 2315 2316
		return 1
	}
	return 0
}

2317 2318 2319 2320 2321 2322 2323 2324
proc is_Windows {} {
	global tcl_platform
	if {$tcl_platform(platform) eq {windows}} {
		return 1
	}
	return 0
}

2325 2326 2327 2328 2329 2330 2331
proc bind_button3 {w cmd} {
	bind $w <Any-Button-3> $cmd
	if {[is_MacOSX]} {
		bind $w <Control-Button-1> $cmd
	}
}

2332 2333 2334 2335 2336 2337 2338
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
}

2339 2340 2341 2342 2343 2344 2345 2346
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 \
2347
		-font font_uibold
2348 2349 2350 2351
	text $w.m.t \
		-background white -borderwidth 1 \
		-relief sunken \
		-width 80 -height 10 \
2352
		-font font_diff \
2353 2354 2355 2356 2357
		-yscrollcommand [list $w.m.sby set]
	label $w.m.l2 \
		-text {You must correct the above errors before committing.} \
		-anchor w \
		-justify left \
2358
		-font font_uibold
2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370
	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 \
2371
		-font font_ui \
2372
		-command "destroy $w"
2373
	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2374 2375 2376

	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Return> "destroy $w"
2377
	wm title $w "[appname] ([reponame]): error"
2378 2379 2380
	tkwait window $w
}

2381 2382 2383
set next_console_id 0

proc new_console {short_title long_title} {
2384 2385 2386 2387 2388 2389 2390
	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} {
2391
	global console_cr console_data M1B
2392

2393
	set console_cr($w) 1.0
2394 2395
	toplevel $w
	frame $w.m
2396
	label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2397 2398
		-anchor w \
		-justify left \
2399
		-font font_uibold
2400 2401 2402 2403
	text $w.m.t \
		-background white -borderwidth 1 \
		-relief sunken \
		-width 80 -height 10 \
2404
		-font font_diff \
2405 2406
		-state disabled \
		-yscrollcommand [list $w.m.sby set]
2407 2408
	label $w.m.s -text {Working... please wait...} \
		-anchor w \
2409
		-justify left \
2410
		-font font_uibold
2411 2412
	scrollbar $w.m.sby -command [list $w.m.t yview]
	pack $w.m.l1 -side top -fill x
2413
	pack $w.m.s -side bottom -fill x
2414 2415 2416 2417
	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

2418 2419
	menu $w.ctxm -tearoff 0
	$w.ctxm add command -label "Copy" \
2420
		-font font_ui \
2421 2422
		-command "tk_textCopy $w.m.t"
	$w.ctxm add command -label "Select All" \
2423
		-font font_ui \
2424 2425
		-command "$w.m.t tag add sel 0.0 end"
	$w.ctxm add command -label "Copy All" \
2426
		-font font_ui \
2427 2428 2429 2430 2431 2432
		-command "
			$w.m.t tag add sel 0.0 end
			tk_textCopy $w.m.t
			$w.m.t tag remove sel 0.0 end
		"

2433
	button $w.ok -text {Close} \
2434
		-font font_ui \
2435 2436
		-state disabled \
		-command "destroy $w"
2437
	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2438

2439
	bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2440 2441
	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"
2442
	bind $w <Visibility> "focus $w"
2443
	wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2444 2445 2446
	return $w
}

2447
proc console_exec {w cmd {after {}}} {
2448 2449 2450
	# -- Windows tosses the enviroment when we exec our child.
	#    But most users need that so we have to relogin. :-(
	#
2451
	if {[is_Windows]} {
2452 2453 2454 2455 2456 2457 2458 2459 2460
		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]
2461
	fconfigure $fd_f -blocking 0 -translation binary
2462
	fileevent $fd_f readable [list console_read $w $fd_f $after]
2463 2464
}

2465
proc console_read {w fd after} {
2466
	global console_cr console_data
2467 2468

	set buf [read $fd]
2469
	if {$buf ne {}} {
2470 2471 2472 2473 2474 2475 2476
		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]
2477 2478
			if {$cr < 0} {set cr [expr {$n + 1}]}
			if {$lf < 0} {set lf [expr {$n + 1}]}
2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491

			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
			}
2492
		}
2493 2494
		$w.m.t conf -state disabled
		$w.m.t see end
2495 2496
	}

2497
	fconfigure $fd -blocking 1
2498
	if {[eof $fd]} {
2499
		if {[catch {close $fd}]} {
2500
			if {![winfo exists $w]} {console_init $w}
2501
			$w.m.s conf -background red -text {Error: Command Failed}
2502
			$w.ok conf -state normal
2503
			set ok 0
2504
		} elseif {[winfo exists $w]} {
2505
			$w.m.s conf -background green -text {Success}
2506
			$w.ok conf -state normal
2507
			set ok 1
2508
		}
2509
		array unset console_cr $w
2510
		array unset console_data $w
2511
		if {$after ne {}} {
2512 2513
			uplevel #0 $after $ok
		}
2514
		return
2515
	}
2516
	fconfigure $fd -blocking 0
2517 2518
}

S
Shawn O. Pearce 已提交
2519 2520 2521 2522
######################################################################
##
## ui commands

2523
set starting_gitk_msg {Starting gitk... please wait...}
2524

2525
proc do_gitk {revs} {
2526
	global ui_status_value starting_gitk_msg
2527

2528 2529 2530 2531
	set cmd gitk
	if {$revs ne {}} {
		append cmd { }
		append cmd $revs
2532
	}
2533
	if {[is_Windows]} {
2534 2535 2536 2537 2538 2539
		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 已提交
2540
	} else {
2541 2542 2543 2544 2545 2546
		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 已提交
2547 2548 2549
	}
}

2550 2551 2552
proc do_gc {} {
	set w [new_console {gc} {Compressing the object database}]
	console_exec $w {git gc}
2553 2554
}

2555
proc do_fsck_objects {} {
2556 2557
	set w [new_console {fsck-objects} \
		{Verifying the object database with fsck-objects}]
2558 2559 2560 2561 2562 2563 2564
	set cmd [list git fsck-objects]
	lappend cmd --full
	lappend cmd --cache
	lappend cmd --strict
	console_exec $w $cmd
}

2565
set is_quitting 0
2566

S
Shawn O. Pearce 已提交
2567
proc do_quit {} {
2568
	global ui_comm is_quitting repo_config commit_type
2569

2570 2571
	if {$is_quitting} return
	set is_quitting 1
2572

2573 2574
	# -- Stash our current commit buffer.
	#
2575
	set save [gitdir GITGUI_MSG]
2576
	set msg [string trim [$ui_comm get 0.0 end]]
2577 2578 2579
	if {![string match amend* $commit_type]
		&& [$ui_comm edit modified]
		&& $msg ne {}} {
2580 2581 2582 2583 2584
		catch {
			set fd [open $save w]
			puts $fd [string trim [$ui_comm get 0.0 end]]
			close $fd
		}
2585 2586
	} else {
		catch {file delete $save}
2587 2588
	}

2589 2590 2591 2592 2593 2594 2595 2596 2597
	# -- 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 {}
	}
2598
	if {$cfg_geometry ne $rc_geometry} {
2599 2600 2601
		catch {exec git repo-config gui.geometry $cfg_geometry}
	}

S
Shawn O. Pearce 已提交
2602 2603 2604 2605
	destroy .
}

proc do_rescan {} {
2606
	rescan {set ui_status_value {Ready.}}
S
Shawn O. Pearce 已提交
2607 2608
}

2609
proc unstage_helper {txt paths} {
2610
	global file_states current_diff_path
2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621

	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
2622
			if {$path eq $current_diff_path} {
2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637
				set after {reshow_diff;}
			}
		}
		}
	}
	if {$pathList eq {}} {
		unlock_index
	} else {
		update_indexinfo \
			$txt \
			$pathList \
			[concat $after {set ui_status_value {Ready.}}]
	}
}

2638
proc do_unstage_selection {} {
2639
	global current_diff_path selected_paths
2640 2641

	if {[array size selected_paths] > 0} {
2642 2643
		unstage_helper \
			{Unstaging selected files from commit} \
2644
			[array names selected_paths]
2645
	} elseif {$current_diff_path ne {}} {
2646
		unstage_helper \
2647 2648
			"Unstaging [short_path $current_diff_path] from commit" \
			[list $current_diff_path]
2649 2650 2651
	}
}

2652
proc add_helper {txt paths} {
2653
	global file_states current_diff_path
2654 2655 2656 2657

	if {![lock_index begin-update]} return

	set pathList [list]
2658
	set after {}
2659
	foreach path $paths {
2660
		switch -glob -- [lindex $file_states($path) 0] {
2661 2662 2663 2664
		_O -
		?M -
		?D -
		U? {
2665
			lappend pathList $path
2666
			if {$path eq $current_diff_path} {
2667 2668 2669
				set after {reshow_diff;}
			}
		}
2670
		}
2671
	}
2672
	if {$pathList eq {}} {
2673 2674
		unlock_index
	} else {
2675
		update_index \
2676
			$txt \
2677
			$pathList \
2678
			[concat $after {set ui_status_value {Ready to commit.}}]
2679 2680 2681
	}
}

2682
proc do_add_selection {} {
2683
	global current_diff_path selected_paths
2684 2685

	if {[array size selected_paths] > 0} {
2686
		add_helper \
2687
			{Adding selected files} \
2688
			[array names selected_paths]
2689
	} elseif {$current_diff_path ne {}} {
2690
		add_helper \
2691 2692
			"Adding [short_path $current_diff_path]" \
			[list $current_diff_path]
2693 2694 2695
	}
}

2696
proc do_add_all {} {
2697
	global file_states
2698 2699 2700

	set paths [list]
	foreach path [array names file_states] {
2701 2702 2703 2704
		switch -glob -- [lindex $file_states($path) 0] {
		U? {continue}
		?M -
		?D {lappend paths $path}
2705 2706
		}
	}
2707
	add_helper {Adding all changed files} $paths
2708 2709
}

2710
proc revert_helper {txt paths} {
2711
	global file_states current_diff_path
2712 2713 2714 2715 2716 2717 2718

	if {![lock_index begin-update]} return

	set pathList [list]
	set after {}
	foreach path $paths {
		switch -glob -- [lindex $file_states($path) 0] {
2719 2720 2721
		U? {continue}
		?M -
		?D {
2722
			lappend pathList $path
2723
			if {$path eq $current_diff_path} {
2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741
				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 \
2742
		"[appname] ([reponame])" \
2743
		"Revert changes in $s?
2744

2745
Any unadded changes will be permanently lost by the revert." \
2746
		question \
2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761
		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 {} {
2762
	global current_diff_path selected_paths
2763 2764 2765 2766 2767

	if {[array size selected_paths] > 0} {
		revert_helper \
			{Reverting selected files} \
			[array names selected_paths]
2768
	} elseif {$current_diff_path ne {}} {
2769
		revert_helper \
2770 2771
			"Reverting [short_path $current_diff_path]" \
			[list $current_diff_path]
2772 2773 2774
	}
}

2775
proc do_signoff {} {
2776
	global ui_comm
2777

2778 2779
	set me [committer_ident]
	if {$me eq {}} return
2780

2781
	set sob "Signed-off-by: $me"
2782
	set last [$ui_comm get {end -1c linestart} {end -1c}]
2783
	if {$last ne $sob} {
2784
		$ui_comm edit separator
2785
		if {$last ne {}
2786 2787 2788 2789
			&& ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
			$ui_comm insert end "\n"
		}
		$ui_comm insert end "\n$sob"
2790
		$ui_comm edit separator
2791
		$ui_comm see end
2792 2793 2794
	}
}

2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807
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]} {
2808
			set selected_commit_type new
2809 2810
		}
	}
2811 2812
}

2813
proc do_commit {} {
2814
	commit_tree
2815 2816
}

S
Shawn O. Pearce 已提交
2817
proc do_about {} {
2818
	global appvers copyright
2819
	global tcl_patchLevel tk_patchLevel
S
Shawn O. Pearce 已提交
2820 2821 2822 2823 2824

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

2825
	label $w.header -text "About [appname]" \
S
Shawn O. Pearce 已提交
2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836
		-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 \
2837
		-text "[appname] - a commit creation tool for Git.
2838
$copyright" \
S
Shawn O. Pearce 已提交
2839 2840 2841 2842 2843 2844 2845 2846
		-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

2847
	set v {}
2848
	append v "[appname] version $appvers\n"
2849 2850
	append v "[exec git version]\n"
	append v "\n"
2851 2852 2853 2854 2855 2856 2857
	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 已提交
2858
	label $w.vers \
2859
		-text $v \
S
Shawn O. Pearce 已提交
2860 2861 2862 2863 2864 2865 2866 2867
		-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

2868 2869 2870 2871 2872 2873 2874 2875 2876
	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 已提交
2877 2878
	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
2879
	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2880
	wm title $w "About [appname]"
S
Shawn O. Pearce 已提交
2881 2882 2883
	tkwait window $w
}

2884
proc do_options {} {
2885
	global repo_config global_config font_descs
2886 2887 2888 2889 2890 2891 2892
	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)
	}
2893 2894 2895 2896 2897 2898 2899
	load_config 1
	foreach name [array names repo_config] {
		switch -- $name {
		gui.diffcontext {continue}
		}
		set repo_config_new($name) $repo_config($name)
	}
2900 2901 2902 2903 2904 2905
	foreach name [array names global_config] {
		set global_config_new($name) $global_config($name)
	}

	set w .options_editor
	toplevel $w
2906
	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2907

2908
	label $w.header -text "[appname] Options" \
2909 2910 2911 2912
		-font font_uibold
	pack $w.header -side top -fill x

	frame $w.buttons
2913 2914 2915 2916
	button $w.buttons.restore -text {Restore Defaults} \
		-font font_ui \
		-command do_restore_defaults
	pack $w.buttons.restore -side left
2917 2918
	button $w.buttons.save -text Save \
		-font font_ui \
2919
		-command [list do_save_config $w]
2920 2921 2922
	pack $w.buttons.save -side right
	button $w.buttons.cancel -text {Cancel} \
		-font font_ui \
2923
		-command [list destroy $w]
2924
	pack $w.buttons.cancel -side right -padx 5
2925
	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2926

2927
	labelframe $w.repo -text "[reponame] Repository" \
2928
		-font font_ui \
2929 2930
		-relief raised -borderwidth 2
	labelframe $w.global -text {Global (All Repositories)} \
2931
		-font font_ui \
2932 2933 2934 2935 2936
		-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 {
2937 2938 2939
		{b pullsummary {Show Pull Summary}}
		{b trustmtime  {Trust File Modification Timestamps}}
		{i diffcontext {Number of Diff Context Lines}}
2940
		} {
2941 2942 2943
		set type [lindex $option 0]
		set name [lindex $option 1]
		set text [lindex $option 2]
2944
		foreach f {repo global} {
2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966
			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
			}
			}
2967 2968 2969
		}
	}

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

2997 2998
	bind $w <Visibility> "grab $w; focus $w"
	bind $w <Key-Escape> "destroy $w"
2999
	wm title $w "[appname] ([reponame]): Options"
3000 3001 3002
	tkwait window $w
}

3003
proc do_restore_defaults {} {
3004
	global font_descs default_config repo_config
3005 3006 3007 3008 3009 3010 3011 3012 3013
	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]
3014
		set repo_config(gui.$name) $default_config(gui.$name)
3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031
	}
	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"
	}
3032
	reshow_diff
3033 3034 3035
	destroy $w
}

3036
proc do_windows_shortcut {} {
3037
	global argv0
3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049

	if {[catch {
		set desktop [exec cygpath \
			--windows \
			--absolute \
			--long-name \
			--desktop]
		}]} {
			set desktop .
	}
	set fn [tk_getSaveFile \
		-parent . \
3050
		-title "[appname] ([reponame]): Create Desktop Icon" \
3051
		-initialdir $desktop \
3052
		-initialfile "Git [reponame].bat"]
3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066
	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 \
3067
					[gitdir]]
3068 3069 3070 3071
				set gw [exec cygpath \
					--windows \
					--absolute \
					[file dirname [gitdir]]]
3072 3073
				regsub -all ' $me "'\\''" me
				regsub -all ' $gd "'\\''" gd
3074 3075
				puts $fd "@ECHO Entering $gw"
				puts $fd "@ECHO Starting git-gui... please wait..."
3076
				puts -nonewline $fd "@\"$sh\" --login -c \""
3077 3078
				puts -nonewline $fd "GIT_DIR='$gd'"
				puts -nonewline $fd " '$me'"
3079 3080 3081 3082 3083 3084 3085 3086
				puts $fd "&\""
				close $fd
			} err]} {
			error_popup "Cannot write script:\n\n$err"
		}
	}
}

3087
proc do_macosx_app {} {
3088
	global argv0 env
3089 3090 3091

	set fn [tk_getSaveFile \
		-parent . \
3092
		-title "[appname] ([reponame]): Create Desktop Icon" \
3093
		-initialdir [file join $env(HOME) Desktop] \
3094
		-initialfile "Git [reponame].app"]
3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128
	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]
3129
				set gd [file normalize [gitdir]]
3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151
				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"
		}
	}
}

3152
proc toggle_or_diff {w x y} {
3153
	global file_states file_lists current_diff_path ui_index ui_workdir
3154
	global last_clicked selected_paths
3155

S
Shawn O. Pearce 已提交
3156 3157 3158
	set pos [split [$w index @$x,$y] .]
	set lno [lindex $pos 0]
	set col [lindex $pos 1]
3159 3160 3161 3162 3163 3164 3165 3166 3167
	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
3168
	$ui_workdir tag remove in_sel 0.0 end
S
Shawn O. Pearce 已提交
3169

3170
	if {$col == 0} {
3171
		if {$current_diff_path eq $path} {
3172 3173 3174 3175
			set after {reshow_diff;}
		} else {
			set after {}
		}
3176
		if {$w eq $ui_index} {
3177
			update_indexinfo \
3178
				"Unstaging [short_path $path] from commit" \
3179 3180
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
3181
		} elseif {$w eq $ui_workdir} {
3182
			update_index \
3183
				"Adding [short_path $path]" \
3184 3185 3186
				[list $path] \
				[concat $after {set ui_status_value {Ready.}}]
		}
3187
	} else {
3188
		show_diff $path $w $lno
S
Shawn O. Pearce 已提交
3189 3190 3191
	}
}

3192
proc add_one_to_selection {w x y} {
3193
	global file_lists last_clicked selected_paths
3194

3195
	set lno [lindex [split [$w index @$x,$y] .] 0]
3196 3197 3198 3199 3200
	set path [lindex $file_lists($w) [expr {$lno - 1}]]
	if {$path eq {}} {
		set last_clicked {}
		return
	}
S
Shawn O. Pearce 已提交
3201

3202 3203 3204 3205 3206 3207
	if {$last_clicked ne {}
		&& [lindex $last_clicked 0] ne $w} {
		array unset selected_paths
		[lindex $last_clicked 0] tag remove in_sel 0.0 end
	}

3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221
	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} {
3222
	global file_lists last_clicked selected_paths
3223 3224 3225 3226

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

3229
	set lno [lindex [split [$w index @$x,$y] .] 0]
3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244
	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 已提交
3245 3246 3247 3248
}

######################################################################
##
3249
## config defaults
S
Shawn O. Pearce 已提交
3250

3251
set cursor_ptr arrow
3252 3253 3254 3255 3256 3257 3258 3259
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
}

3260 3261
font create font_uibold
font create font_diffbold
S
Shawn O. Pearce 已提交
3262

3263
if {[is_Windows]} {
3264 3265 3266 3267 3268
	set M1B Control
	set M1T Ctrl
} elseif {[is_MacOSX]} {
	set M1B M1
	set M1T Cmd
3269 3270 3271
} else {
	set M1B M1
	set M1T M1
3272 3273
}

3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294
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
3295
set default_config(gui.pullsummary) true
3296
set default_config(gui.diffcontext) 5
3297 3298 3299 3300 3301 3302
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}}
}
3303
load_config 0
3304 3305 3306 3307 3308 3309
apply_config

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

S
Shawn O. Pearce 已提交
3310
# -- Menu Bar
3311
#
3312
menu .mbar -tearoff 0
3313
.mbar add cascade -label Repository -menu .mbar.repository
3314
.mbar add cascade -label Edit -menu .mbar.edit
S
Shawn O. Pearce 已提交
3315 3316 3317
if {!$single_commit} {
	.mbar add cascade -label Branch -menu .mbar.branch
}
S
Shawn O. Pearce 已提交
3318
.mbar add cascade -label Commit -menu .mbar.commit
3319 3320 3321 3322 3323
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 已提交
3324 3325
. configure -menu .mbar

3326
# -- Repository Menu
3327
#
3328
menu .mbar.repository
3329 3330 3331
.mbar.repository add command \
	-label {Visualize Current Branch} \
	-command {do_gitk {}} \
3332
	-font font_ui
3333 3334 3335 3336 3337 3338
if {![is_MacOSX]} {
	.mbar.repository add command \
		-label {Visualize All Branches} \
		-command {do_gitk {--all}} \
		-font font_ui
}
3339
.mbar.repository add separator
3340

3341
if {!$single_commit} {
3342 3343
	.mbar.repository add command -label {Compress Database} \
		-command do_gc \
3344
		-font font_ui
3345

3346
	.mbar.repository add command -label {Verify Database} \
3347 3348 3349
		-command do_fsck_objects \
		-font font_ui

3350
	.mbar.repository add separator
3351

3352
	if {[is_Windows]} {
3353
		.mbar.repository add command \
3354 3355 3356
			-label {Create Desktop Icon} \
			-command do_windows_shortcut \
			-font font_ui
3357
	} elseif {[is_MacOSX]} {
3358
		.mbar.repository add command \
3359 3360 3361
			-label {Create Desktop Icon} \
			-command do_macosx_app \
			-font font_ui
3362
	}
3363
}
3364

3365
.mbar.repository add command -label Quit \
S
Shawn O. Pearce 已提交
3366
	-command do_quit \
3367
	-accelerator $M1T-Q \
3368
	-font font_ui
S
Shawn O. Pearce 已提交
3369

3370 3371 3372 3373 3374 3375
# -- Edit Menu
#
menu .mbar.edit
.mbar.edit add command -label Undo \
	-command {catch {[focus] edit undo}} \
	-accelerator $M1T-Z \
3376
	-font font_ui
3377 3378 3379
.mbar.edit add command -label Redo \
	-command {catch {[focus] edit redo}} \
	-accelerator $M1T-Y \
3380
	-font font_ui
3381 3382 3383 3384
.mbar.edit add separator
.mbar.edit add command -label Cut \
	-command {catch {tk_textCut [focus]}} \
	-accelerator $M1T-X \
3385
	-font font_ui
3386 3387 3388
.mbar.edit add command -label Copy \
	-command {catch {tk_textCopy [focus]}} \
	-accelerator $M1T-C \
3389
	-font font_ui
3390 3391 3392
.mbar.edit add command -label Paste \
	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
	-accelerator $M1T-V \
3393
	-font font_ui
3394 3395 3396
.mbar.edit add command -label Delete \
	-command {catch {[focus] delete sel.first sel.last}} \
	-accelerator Del \
3397
	-font font_ui
3398 3399 3400 3401
.mbar.edit add separator
.mbar.edit add command -label {Select All} \
	-command {catch {[focus] tag add sel 0.0 end}} \
	-accelerator $M1T-A \
3402
	-font font_ui
3403

3404 3405
# -- Branch Menu
#
S
Shawn O. Pearce 已提交
3406 3407 3408 3409 3410
if {!$single_commit} {
	menu .mbar.branch

	.mbar.branch add command -label {Create...} \
		-command do_create_branch \
3411
		-accelerator $M1T-N \
S
Shawn O. Pearce 已提交
3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422
		-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 已提交
3423
# -- Commit Menu
3424
#
S
Shawn O. Pearce 已提交
3425
menu .mbar.commit
3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440

.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 \
3441
	-font font_ui
3442 3443
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3444 3445 3446 3447 3448 3449

.mbar.commit add separator

.mbar.commit add command -label Rescan \
	-command do_rescan \
	-accelerator F5 \
3450
	-font font_ui
3451 3452
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3453

3454
.mbar.commit add command -label {Add To Commit} \
3455
	-command do_add_selection \
3456 3457 3458
	-font font_ui
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3459

3460
.mbar.commit add command -label {Add All To Commit} \
3461
	-command do_add_all \
3462
	-accelerator $M1T-I \
3463
	-font font_ui
3464 3465
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
3466

3467 3468
.mbar.commit add command -label {Unstage From Commit} \
	-command do_unstage_selection \
3469 3470 3471 3472 3473 3474 3475 3476 3477 3478
	-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]

3479 3480
.mbar.commit add separator

3481 3482
.mbar.commit add command -label {Sign Off} \
	-command do_signoff \
3483
	-accelerator $M1T-S \
3484
	-font font_ui
3485

3486 3487
.mbar.commit add command -label Commit \
	-command do_commit \
3488
	-accelerator $M1T-Return \
3489
	-font font_ui
3490 3491
lappend disable_on_lock \
	[list .mbar.commit entryconf [.mbar.commit index last] -state]
S
Shawn O. Pearce 已提交
3492

3493 3494
# -- Transport menus
#
3495 3496 3497 3498 3499
if {!$single_commit} {
	menu .mbar.fetch
	menu .mbar.pull
	menu .mbar.push
}
3500

S
Shawn O. Pearce 已提交
3501 3502 3503 3504 3505 3506
if {[is_MacOSX]} {
	# -- Apple Menu (Mac OS X only)
	#
	.mbar add cascade -label Apple -menu .mbar.apple
	menu .mbar.apple

3507
	.mbar.apple add command -label "About [appname]" \
S
Shawn O. Pearce 已提交
3508 3509
		-command do_about \
		-font font_ui
3510
	.mbar.apple add command -label "[appname] Options..." \
S
Shawn O. Pearce 已提交
3511 3512 3513 3514 3515 3516 3517 3518 3519 3520
		-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

3521 3522
	# -- Tools Menu
	#
3523 3524
	if {[file exists /usr/local/miga/lib/gui-miga]
		&& [file exists .pvcsrc]} {
3525
	proc do_miga {} {
3526
		global ui_status_value
3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550
		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 已提交
3551 3552 3553 3554 3555
	# -- Help Menu
	#
	.mbar add cascade -label Help -menu .mbar.help
	menu .mbar.help

3556
	.mbar.help add command -label "About [appname]" \
S
Shawn O. Pearce 已提交
3557 3558 3559
		-command do_about \
		-font font_ui
}
S
Shawn O. Pearce 已提交
3560 3561


3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580
# -- 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 已提交
3581
# -- Main Window Layout
3582
#
S
Shawn O. Pearce 已提交
3583 3584
panedwindow .vpane -orient vertical
panedwindow .vpane.files -orient horizontal
3585
.vpane add .vpane.files -sticky nsew -height 100 -width 400
S
Shawn O. Pearce 已提交
3586 3587 3588
pack .vpane -anchor n -side top -fill both -expand 1

# -- Index File List
3589
#
S
Shawn O. Pearce 已提交
3590
frame .vpane.files.index -height 100 -width 400
3591
label .vpane.files.index.title -text {Changes To Be Committed} \
S
Shawn O. Pearce 已提交
3592
	-background green \
3593
	-font font_ui
S
Shawn O. Pearce 已提交
3594 3595
text $ui_index -background white -borderwidth 0 \
	-width 40 -height 10 \
3596
	-font font_ui \
3597
	-cursor $cursor_ptr \
S
Shawn O. Pearce 已提交
3598 3599 3600 3601 3602 3603 3604 3605
	-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

3606
# -- Working Directory File List
3607
#
3608
frame .vpane.files.workdir -height 100 -width 100
3609
label .vpane.files.workdir.title -text {Changed But Not Updated} \
S
Shawn O. Pearce 已提交
3610
	-background red \
3611
	-font font_ui
3612
text $ui_workdir -background white -borderwidth 0 \
S
Shawn O. Pearce 已提交
3613
	-width 40 -height 10 \
3614
	-font font_ui \
3615
	-cursor $cursor_ptr \
3616
	-yscrollcommand {.vpane.files.workdir.sb set} \
S
Shawn O. Pearce 已提交
3617
	-state disabled
3618 3619 3620 3621 3622
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 已提交
3623

3624
foreach i [list $ui_index $ui_workdir] {
3625 3626 3627 3628 3629 3630
	$i tag conf in_diff -font font_uibold
	$i tag conf in_sel \
		-background [$i cget -foreground] \
		-foreground [$i cget -background]
}
unset i
3631

3632
# -- Diff and Commit Area
3633
#
3634
frame .vpane.lower -height 300 -width 400
3635 3636 3637 3638 3639
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 已提交
3640 3641

# -- Commit Area Buttons
3642
#
3643 3644
frame .vpane.lower.commarea.buttons
label .vpane.lower.commarea.buttons.l -text {} \
S
Shawn O. Pearce 已提交
3645 3646
	-anchor w \
	-justify left \
3647
	-font font_ui
3648 3649
pack .vpane.lower.commarea.buttons.l -side top -fill x
pack .vpane.lower.commarea.buttons -side left -fill y
3650

3651
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
S
Shawn O. Pearce 已提交
3652
	-command do_rescan \
3653
	-font font_ui
3654
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3655 3656
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.rescan conf -state}
3657

3658
button .vpane.lower.commarea.buttons.incall -text {Add All} \
3659
	-command do_add_all \
3660
	-font font_ui
3661
pack .vpane.lower.commarea.buttons.incall -side top -fill x
3662 3663
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.incall conf -state}
3664

3665
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3666
	-command do_signoff \
3667
	-font font_ui
3668
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3669

3670
button .vpane.lower.commarea.buttons.commit -text {Commit} \
S
Shawn O. Pearce 已提交
3671
	-command do_commit \
3672
	-font font_ui
3673
pack .vpane.lower.commarea.buttons.commit -side top -fill x
3674 3675
lappend disable_on_lock \
	{.vpane.lower.commarea.buttons.commit conf -state}
S
Shawn O. Pearce 已提交
3676 3677

# -- Commit Message Buffer
3678
#
3679
frame .vpane.lower.commarea.buffer
3680
frame .vpane.lower.commarea.buffer.header
3681
set ui_comm .vpane.lower.commarea.buffer.t
3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698
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]
3699
label $ui_coml \
S
Shawn O. Pearce 已提交
3700 3701
	-anchor w \
	-justify left \
3702
	-font font_ui
3703 3704 3705 3706 3707 3708
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:}}
3709
	amend-merge   {set txt {Amended Merge Commit Message:}}
3710 3711 3712 3713 3714 3715
	merge         {set txt {Merge Commit Message:}}
	*             {set txt {Commit Message:}}
	}
	$ui_coml conf -text $txt
}
trace add variable commit_type write trace_commit_type
3716 3717 3718 3719
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 已提交
3720
text $ui_comm -background white -borderwidth 1 \
3721
	-undo true \
3722
	-maxundo 20 \
3723
	-autoseparators true \
S
Shawn O. Pearce 已提交
3724
	-relief sunken \
3725
	-width 75 -height 9 -wrap none \
3726
	-font font_diff \
3727
	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3728 3729
scrollbar .vpane.lower.commarea.buffer.sby \
	-command [list $ui_comm yview]
3730
pack .vpane.lower.commarea.buffer.header -side top -fill x
3731
pack .vpane.lower.commarea.buffer.sby -side right -fill y
S
Shawn O. Pearce 已提交
3732
pack $ui_comm -side left -fill y
3733 3734
pack .vpane.lower.commarea.buffer -side left -fill y

3735 3736
# -- Commit Message Buffer Context Menu
#
3737 3738 3739 3740
set ctxm .vpane.lower.commarea.buffer.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Cut} \
3741
	-font font_ui \
3742 3743 3744
	-command {tk_textCut $ui_comm}
$ctxm add command \
	-label {Copy} \
3745
	-font font_ui \
3746 3747 3748
	-command {tk_textCopy $ui_comm}
$ctxm add command \
	-label {Paste} \
3749
	-font font_ui \
3750 3751 3752
	-command {tk_textPaste $ui_comm}
$ctxm add command \
	-label {Delete} \
3753
	-font font_ui \
3754 3755 3756 3757
	-command {$ui_comm delete sel.first sel.last}
$ctxm add separator
$ctxm add command \
	-label {Select All} \
3758
	-font font_ui \
3759 3760 3761
	-command {$ui_comm tag add sel 0.0 end}
$ctxm add command \
	-label {Copy All} \
3762
	-font font_ui \
3763
	-command {
3764 3765 3766
		$ui_comm tag add sel 0.0 end
		tk_textCopy $ui_comm
		$ui_comm tag remove sel 0.0 end
3767 3768 3769 3770
	}
$ctxm add separator
$ctxm add command \
	-label {Sign Off} \
3771
	-font font_ui \
3772
	-command do_signoff
3773
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3774

3775
# -- Diff Header
3776
#
3777
set current_diff_path {}
3778
set diff_actions [list]
3779 3780 3781
proc trace_current_diff_path {varname args} {
	global current_diff_path diff_actions file_states
	if {$current_diff_path eq {}} {
3782 3783 3784 3785 3786
		set s {}
		set f {}
		set p {}
		set o disabled
	} else {
3787
		set p $current_diff_path
3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800
		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
	}
}
3801
trace add variable current_diff_path write trace_current_diff_path
3802

3803
frame .vpane.lower.diff.header -background orange
3804
label .vpane.lower.diff.header.status \
3805 3806 3807 3808 3809
	-background orange \
	-width $max_status_desc \
	-anchor w \
	-justify left \
	-font font_ui
3810
label .vpane.lower.diff.header.file \
3811
	-background orange \
3812 3813
	-anchor w \
	-justify left \
3814
	-font font_ui
3815
label .vpane.lower.diff.header.path \
3816
	-background orange \
3817 3818
	-anchor w \
	-justify left \
3819
	-font font_ui
3820 3821 3822 3823 3824 3825 3826
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} \
3827
	-font font_ui \
3828 3829 3830 3831 3832
	-command {
		clipboard clear
		clipboard append \
			-format STRING \
			-type STRING \
3833
			-- $current_diff_path
3834
	}
3835 3836
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3837 3838

# -- Diff Body
3839
#
3840 3841 3842 3843
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 \
3844
	-font font_diff \
3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857
	-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

3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868
$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 已提交
3869

3870 3871
# -- Diff Body Context Menu
#
3872 3873 3874 3875
set ctxm .vpane.lower.diff.body.ctxm
menu $ctxm -tearoff 0
$ctxm add command \
	-label {Copy} \
3876
	-font font_ui \
3877 3878 3879 3880
	-command {tk_textCopy $ui_diff}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Select All} \
3881
	-font font_ui \
3882 3883 3884 3885
	-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} \
3886
	-font font_ui \
3887
	-command {
3888 3889 3890
		$ui_diff tag add sel 0.0 end
		tk_textCopy $ui_diff
		$ui_diff tag remove sel 0.0 end
3891 3892 3893 3894 3895
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Decrease Font Size} \
3896 3897
	-font font_ui \
	-command {incr_font_size font_diff -1}
3898 3899 3900
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Increase Font Size} \
3901 3902
	-font font_ui \
	-command {incr_font_size font_diff 1}
3903 3904 3905 3906
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command \
	-label {Show Less Context} \
3907
	-font font_ui \
3908
	-command {if {$repo_config(gui.diffcontext) >= 2} {
3909 3910 3911
		incr repo_config(gui.diffcontext) -1
		reshow_diff
	}}
3912 3913 3914
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add command \
	-label {Show More Context} \
3915
	-font font_ui \
3916
	-command {
3917 3918
		incr repo_config(gui.diffcontext)
		reshow_diff
3919 3920 3921 3922
	}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
$ctxm add command -label {Options...} \
3923 3924
	-font font_ui \
	-command do_options
3925
bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3926

S
Shawn O. Pearce 已提交
3927
# -- Status Bar
3928
#
S
Shawn O. Pearce 已提交
3929 3930 3931 3932 3933 3934
set ui_status_value {Initializing...}
label .status -textvariable ui_status_value \
	-anchor w \
	-justify left \
	-borderwidth 1 \
	-relief sunken \
3935
	-font font_ui
S
Shawn O. Pearce 已提交
3936 3937
pack .status -anchor w -side bottom -fill x

3938
# -- Load geometry
3939
#
3940
catch {
3941
set gm $repo_config(gui.geometry)
3942 3943 3944 3945 3946 3947 3948 3949
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
3950
}
3951

S
Shawn O. Pearce 已提交
3952
# -- Key Bindings
3953
#
3954
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3955 3956
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973
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}
3974 3975 3976 3977
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}
3978

3979 3980 3981 3982 3983
if {!$single_commit} {
	bind . <$M1B-Key-n> do_create_branch
	bind . <$M1B-Key-N> do_create_branch
}

3984 3985 3986 3987 3988 3989
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
3990 3991
bind .   <$M1B-Key-i> do_add_all
bind .   <$M1B-Key-I> do_add_all
3992 3993 3994 3995 3996
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]}
3997
foreach i [list $ui_index $ui_workdir] {
3998 3999 4000
	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 已提交
4001
}
4002 4003 4004
unset i

set file_lists($ui_index) [list]
4005
set file_lists($ui_workdir) [list]
4006 4007 4008

set HEAD {}
set PARENT {}
4009
set MERGE_HEAD [list]
4010 4011
set commit_type {}
set empty_tree {}
4012
set current_branch {}
4013
set current_diff_path {}
4014
set selected_commit_type new
S
Shawn O. Pearce 已提交
4015

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

4019 4020 4021
# -- 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.
4022 4023 4024 4025 4026 4027 4028 4029
#
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
4030
by [appname]:
4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073

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

4074 4075
# -- Only initialize complex UI if we are going to stay running.
#
4076 4077
if {!$single_commit} {
	load_all_remotes
4078
	load_all_heads
4079

4080
	populate_branch_menu
4081
	populate_fetch_menu .mbar.fetch
4082
	populate_pull_menu .mbar.pull
4083
	populate_push_menu .mbar.push
4084
}
4085

4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106
# -- 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
}

4107
lock_index begin-read
4108
after 1 do_rescan