From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2010 16:28:30 +0000 (-0700)
Subject: Merge git://repo.or.cz/git-gui into pt/git-gui
X-Git-Tag: v1.7.2.2~29^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c01a29c74ff991faf3012882fbf676b182b8893f;p=git.git

Merge git://repo.or.cz/git-gui into pt/git-gui

* git://repo.or.cz/git-gui:
  git-gui: fix size and position of window panes on startup
  git-gui: mc cannot be used before msgcat has been loaded
  git-gui: use textconv filter for diff and blame
  git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
  git-gui: fix shortcut creation on cygwin
  git-gui: fix PATH environment for mingw development environment
  git-gui: fix usage of _gitworktree when creating shortcut for windows
  git-gui: fix "Explore Working Copy" for Windows again
  git-gui: fix usage of themed widgets variable
  git-gui: Handle failure of core.worktree to identify the working directory.
  git-gui: check whether systems nice command works or disable it
---

c01a29c74ff991faf3012882fbf676b182b8893f
diff --cc git-gui/git-gui.sh
index 7d5451198,000000000..bb104895a
mode 100755,000000..100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@@ -1,3751 -1,0 +1,3802 @@@
 +#!/bin/sh
 +# Tcl ignores the next line -*- tcl -*- \
 + if test "z$*" = zversion \
 + || test "z$*" = z--version; \
 + then \
 +	echo 'git-gui version @@GITGUI_VERSION@@'; \
 +	exit; \
 + fi; \
 + argv0=$0; \
 + exec wish "$argv0" -- "$@"
 +
 +set appvers {@@GITGUI_VERSION@@}
 +set copyright [encoding convertfrom utf-8 {
 +Copyright © 2006, 2007 Shawn Pearce, et. al.
 +
 +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}]
 +
 +######################################################################
 +##
 +## Tcl/Tk sanity check
 +
 +if {[catch {package require Tcl 8.4} err]
 + || [catch {package require Tk  8.4} err]
 +} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
- 		-title [mc "git-gui: fatal error"] \
++		-title "git-gui: fatal error" \
 +		-message $err
 +	exit 1
 +}
 +
 +catch {rename send {}} ; # What an evil concept...
 +
 +######################################################################
 +##
 +## locate our library
 +
 +set oguilib {@@GITGUI_LIBDIR@@}
 +set oguirel {@@GITGUI_RELATIVE@@}
 +if {$oguirel eq {1}} {
 +	set oguilib [file dirname [file normalize $argv0]]
 +	if {[file tail $oguilib] eq {git-core}} {
 +		set oguilib [file dirname $oguilib]
 +	}
 +	set oguilib [file dirname $oguilib]
 +	set oguilib [file join $oguilib share git-gui lib]
 +	set oguimsg [file join $oguilib msgs]
 +} elseif {[string match @@* $oguirel]} {
 +	set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +	set oguimsg [file join [file dirname [file normalize $argv0]] po]
 +} else {
 +	set oguimsg [file join $oguilib msgs]
 +}
 +unset oguirel
 +
 +######################################################################
 +##
 +## enable verbose loading?
 +
 +if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
 +	unset _verbose
 +	rename auto_load real__auto_load
 +	proc auto_load {name args} {
 +		puts stderr "auto_load $name"
 +		return [uplevel 1 real__auto_load $name $args]
 +	}
 +	rename source real__source
 +	proc source {name} {
 +		puts stderr "source    $name"
 +		uplevel 1 real__source $name
 +	}
 +}
 +
 +######################################################################
 +##
 +## Internationalization (i18n) through msgcat and gettext. See
 +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
 +
 +package require msgcat
 +
 +proc _mc_trim {fmt} {
 +	set cmk [string first @@ $fmt]
 +	if {$cmk > 0} {
 +		return [string range $fmt 0 [expr {$cmk - 1}]]
 +	}
 +	return $fmt
 +}
 +
 +proc mc {en_fmt args} {
 +	set fmt [_mc_trim [::msgcat::mc $en_fmt]]
 +	if {[catch {set msg [eval [list format $fmt] $args]} err]} {
 +		set msg [eval [list format [_mc_trim $en_fmt]] $args]
 +	}
 +	return $msg
 +}
 +
 +proc strcat {args} {
 +	return [join $args {}]
 +}
 +
 +::msgcat::mcload $oguimsg
 +unset oguimsg
 +
 +######################################################################
 +##
 +## read only globals
 +
 +set _appname {Git Gui}
 +set _gitdir {}
 +set _gitworktree {}
 +set _isbare {}
 +set _gitexec {}
 +set _githtmldir {}
 +set _reponame {}
 +set _iscygwin {}
 +set _search_path {}
 +
 +set _trace [lsearch -exact $argv --trace]
 +if {$_trace >= 0} {
 +	set argv [lreplace $argv $_trace $_trace]
 +	set _trace 1
 +} else {
 +	set _trace 0
 +}
 +
 +proc appname {} {
 +	global _appname
 +	return $_appname
 +}
 +
 +proc gitdir {args} {
 +	global _gitdir
 +	if {$args eq {}} {
 +		return $_gitdir
 +	}
 +	return [eval [list file join $_gitdir] $args]
 +}
 +
 +proc gitexec {args} {
 +	global _gitexec
 +	if {$_gitexec eq {}} {
 +		if {[catch {set _gitexec [git --exec-path]} err]} {
 +			error "Git not installed?\n\n$err"
 +		}
 +		if {[is_Cygwin]} {
 +			set _gitexec [exec cygpath \
 +				--windows \
 +				--absolute \
 +				$_gitexec]
 +		} else {
 +			set _gitexec [file normalize $_gitexec]
 +		}
 +	}
 +	if {$args eq {}} {
 +		return $_gitexec
 +	}
 +	return [eval [list file join $_gitexec] $args]
 +}
 +
 +proc githtmldir {args} {
 +	global _githtmldir
 +	if {$_githtmldir eq {}} {
 +		if {[catch {set _githtmldir [git --html-path]}]} {
 +			# Git not installed or option not yet supported
 +			return {}
 +		}
 +		if {[is_Cygwin]} {
 +			set _githtmldir [exec cygpath \
 +				--windows \
 +				--absolute \
 +				$_githtmldir]
 +		} else {
 +			set _githtmldir [file normalize $_githtmldir]
 +		}
 +	}
 +	if {$args eq {}} {
 +		return $_githtmldir
 +	}
 +	return [eval [list file join $_githtmldir] $args]
 +}
 +
 +proc reponame {} {
 +	return $::_reponame
 +}
 +
 +proc is_MacOSX {} {
 +	if {[tk windowingsystem] eq {aqua}} {
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc is_Windows {} {
 +	if {$::tcl_platform(platform) eq {windows}} {
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc is_Cygwin {} {
 +	global _iscygwin
 +	if {$_iscygwin eq {}} {
 +		if {$::tcl_platform(platform) eq {windows}} {
 +			if {[catch {set p [exec cygpath --windir]} err]} {
 +				set _iscygwin 0
 +			} else {
 +				set _iscygwin 1
 +			}
 +		} else {
 +			set _iscygwin 0
 +		}
 +	}
 +	return $_iscygwin
 +}
 +
 +proc is_enabled {option} {
 +	global enabled_options
 +	if {[catch {set on $enabled_options($option)}]} {return 0}
 +	return $on
 +}
 +
 +proc enable_option {option} {
 +	global enabled_options
 +	set enabled_options($option) 1
 +}
 +
 +proc disable_option {option} {
 +	global enabled_options
 +	set enabled_options($option) 0
 +}
 +
 +######################################################################
 +##
 +## config
 +
 +proc is_many_config {name} {
 +	switch -glob -- $name {
 +	gui.recentrepo -
 +	remote.*.fetch -
 +	remote.*.push
 +		{return 1}
 +	*
 +		{return 0}
 +	}
 +}
 +
 +proc is_config_true {name} {
 +	global repo_config
 +	if {[catch {set v $repo_config($name)}]} {
 +		return 0
 +	} elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
 +		return 1
 +	} else {
 +		return 0
 +	}
 +}
 +
++proc is_config_false {name} {
++	global repo_config
++	if {[catch {set v $repo_config($name)}]} {
++		return 0
++	} elseif {$v eq {false} || $v eq {0} || $v eq {no}} {
++		return 1
++	} else {
++		return 0
++	}
++}
++
 +proc get_config {name} {
 +	global repo_config
 +	if {[catch {set v $repo_config($name)}]} {
 +		return {}
 +	} else {
 +		return $v
 +	}
 +}
 +
 +proc is_bare {} {
 +	global _isbare
 +	global _gitdir
 +	global _gitworktree
 +
 +	if {$_isbare eq {}} {
 +		if {[catch {
 +			set _bare [git rev-parse --is-bare-repository]
 +			switch  -- $_bare {
 +			true { set _isbare 1 }
 +			false { set _isbare 0}
 +			default { throw }
 +			}
 +		}]} {
 +			if {[is_config_true core.bare]
 +				|| ($_gitworktree eq {}
 +					&& [lindex [file split $_gitdir] end] ne {.git})} {
 +				set _isbare 1
 +			} else {
 +				set _isbare 0
 +			}
 +		}
 +	}
 +	return $_isbare
 +}
 +
 +######################################################################
 +##
 +## handy utils
 +
 +proc _trace_exec {cmd} {
 +	if {!$::_trace} return
 +	set d {}
 +	foreach v $cmd {
 +		if {$d ne {}} {
 +			append d { }
 +		}
 +		if {[regexp {[ \t\r\n'"$?*]} $v]} {
 +			set v [sq $v]
 +		}
 +		append d $v
 +	}
 +	puts stderr $d
 +}
 +
++#'"  fix poor old emacs font-lock mode
++
 +proc _git_cmd {name} {
 +	global _git_cmd_path
 +
 +	if {[catch {set v $_git_cmd_path($name)}]} {
 +		switch -- $name {
 +		  version   -
 +		--version   -
 +		--exec-path { return [list $::_git $name] }
 +		}
 +
 +		set p [gitexec git-$name$::_search_exe]
 +		if {[file exists $p]} {
 +			set v [list $p]
 +		} elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
 +			# Try to determine what sort of magic will make
 +			# git-$name go and do its thing, because native
 +			# Tcl on Windows doesn't know it.
 +			#
 +			set p [gitexec git-$name]
 +			set f [open $p r]
 +			set s [gets $f]
 +			close $f
 +
 +			switch -glob -- [lindex $s 0] {
 +			#!*sh     { set i sh     }
 +			#!*perl   { set i perl   }
 +			#!*python { set i python }
 +			default   { error "git-$name is not supported: $s" }
 +			}
 +
 +			upvar #0 _$i interp
 +			if {![info exists interp]} {
 +				set interp [_which $i]
 +			}
 +			if {$interp eq {}} {
 +				error "git-$name requires $i (not in PATH)"
 +			}
 +			set v [concat [list $interp] [lrange $s 1 end] [list $p]]
 +		} else {
 +			# Assume it is builtin to git somehow and we
 +			# aren't actually able to see a file for it.
 +			#
 +			set v [list $::_git $name]
 +		}
 +		set _git_cmd_path($name) $v
 +	}
 +	return $v
 +}
 +
 +proc _which {what args} {
 +	global env _search_exe _search_path
 +
 +	if {$_search_path eq {}} {
 +		if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
 +			set _search_path [split [exec cygpath \
 +				--windows \
 +				--path \
 +				--absolute \
 +				$env(PATH)] {;}]
 +			set _search_exe .exe
 +		} elseif {[is_Windows]} {
 +			set gitguidir [file dirname [info script]]
 +			regsub -all ";" $gitguidir "\\;" gitguidir
 +			set env(PATH) "$gitguidir;$env(PATH)"
 +			set _search_path [split $env(PATH) {;}]
 +			set _search_exe .exe
 +		} else {
 +			set _search_path [split $env(PATH) :]
 +			set _search_exe {}
 +		}
 +	}
 +
 +	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
 +		set suffix {}
 +	} else {
 +		set suffix $_search_exe
 +	}
 +
 +	foreach p $_search_path {
 +		set p [file join $p $what$suffix]
 +		if {[file exists $p]} {
 +			return [file normalize $p]
 +		}
 +	}
 +	return {}
 +}
 +
 +proc _lappend_nice {cmd_var} {
 +	global _nice
 +	upvar $cmd_var cmd
 +
 +	if {![info exists _nice]} {
 +		set _nice [_which nice]
++		if {[catch {exec $_nice git version}]} {
++			set _nice {}
++		}
 +	}
 +	if {$_nice ne {}} {
 +		lappend cmd $_nice
 +	}
 +}
 +
 +proc git {args} {
 +	set opt [list]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	_trace_exec [concat $opt $cmdp $args]
 +	set result [eval exec $opt $cmdp $args]
 +	if {$::_trace} {
 +		puts stderr "< $result"
 +	}
 +	return $result
 +}
 +
 +proc _open_stdout_stderr {cmd} {
 +	_trace_exec $cmd
 +	if {[catch {
 +			set fd [open [concat [list | ] $cmd] r]
 +		} err]} {
 +		if {   [lindex $cmd end] eq {2>@1}
 +		    && $err eq {can not find channel named "1"}
 +			} {
 +			# Older versions of Tcl 8.4 don't have this 2>@1 IO
 +			# redirect operator.  Fallback to |& cat for those.
 +			# The command was not actually started, so its safe
 +			# to try to start it a second time.
 +			#
 +			set fd [open [concat \
 +				[list | ] \
 +				[lrange $cmd 0 end-1] \
 +				[list |& cat] \
 +				] r]
 +		} else {
 +			error $err
 +		}
 +	}
 +	fconfigure $fd -eofchar {}
 +	return $fd
 +}
 +
 +proc git_read {args} {
 +	set opt [list]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		--stderr {
 +			lappend args 2>@1
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	return [_open_stdout_stderr [concat $opt $cmdp $args]]
 +}
 +
 +proc git_write {args} {
 +	set opt [list]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	_trace_exec [concat $opt $cmdp $args]
 +	return [open [concat [list | ] $opt $cmdp $args] w]
 +}
 +
 +proc githook_read {hook_name args} {
 +	set pchook [gitdir hooks $hook_name]
 +	lappend args 2>@1
 +
 +	# On Windows [file executable] might lie so we need to ask
 +	# the shell if the hook is executable.  Yes that's annoying.
 +	#
 +	if {[is_Windows]} {
 +		upvar #0 _sh interp
 +		if {![info exists interp]} {
 +			set interp [_which sh]
 +		}
 +		if {$interp eq {}} {
 +			error "hook execution requires sh (not in PATH)"
 +		}
 +
 +		set scr {if test -x "$1";then exec "$@";fi}
 +		set sh_c [list $interp -c $scr $interp $pchook]
 +		return [_open_stdout_stderr [concat $sh_c $args]]
 +	}
 +
 +	if {[file executable $pchook]} {
 +		return [_open_stdout_stderr [concat [list $pchook] $args]]
 +	}
 +
 +	return {}
 +}
 +
 +proc kill_file_process {fd} {
 +	set process [pid $fd]
 +
 +	catch {
 +		if {[is_Windows]} {
 +			# Use a Cygwin-specific flag to allow killing
 +			# native Windows processes
 +			exec kill -f $process
 +		} else {
 +			exec kill $process
 +		}
 +	}
 +}
 +
 +proc gitattr {path attr default} {
 +	if {[catch {set r [git check-attr $attr -- $path]}]} {
 +		set r unspecified
 +	} else {
 +		set r [join [lrange [split $r :] 2 end] :]
 +		regsub {^ } $r {} r
 +	}
 +	if {$r eq {unspecified}} {
 +		return $default
 +	}
 +	return $r
 +}
 +
 +proc sq {value} {
 +	regsub -all ' $value "'\\''" value
 +	return "'$value'"
 +}
 +
 +proc load_current_branch {} {
 +	global current_branch is_detached
 +
 +	set fd [open [gitdir HEAD] r]
 +	if {[gets $fd ref] < 1} {
 +		set ref {}
 +	}
 +	close $fd
 +
 +	set pfx {ref: refs/heads/}
 +	set len [string length $pfx]
 +	if {[string equal -length $len $pfx $ref]} {
 +		# We're on a branch.  It might not exist.  But
 +		# HEAD looks good enough to be a branch.
 +		#
 +		set current_branch [string range $ref $len end]
 +		set is_detached 0
 +	} else {
 +		# Assume this is a detached head.
 +		#
 +		set current_branch HEAD
 +		set is_detached 1
 +	}
 +}
 +
 +auto_load tk_optionMenu
 +rename tk_optionMenu real__tkOptionMenu
 +proc tk_optionMenu {w varName args} {
 +	set m [eval real__tkOptionMenu $w $varName $args]
 +	$m configure -font font_ui
 +	$w configure -font font_ui
 +	return $m
 +}
 +
 +proc rmsel_tag {text} {
 +	$text tag conf sel \
 +		-background [$text cget -background] \
 +		-foreground [$text cget -foreground] \
 +		-borderwidth 0
 +	$text tag conf in_sel -background lightgray
 +	bind $text <Motion> break
 +	return $text
 +}
 +
++wm withdraw .
 +set root_exists 0
 +bind . <Visibility> {
 +	bind . <Visibility> {}
 +	set root_exists 1
 +}
 +
 +if {[is_Windows]} {
 +	wm iconbitmap . -default $oguilib/git-gui.ico
 +	set ::tk::AlwaysShowSelection 1
 +
 +	# Spoof an X11 display for SSH
 +	if {![info exists env(DISPLAY)]} {
 +		set env(DISPLAY) :9999
 +	}
 +} else {
 +	catch {
 +		image create photo gitlogo -width 16 -height 16
 +
 +		gitlogo put #33CC33 -to  7  0  9  2
 +		gitlogo put #33CC33 -to  4  2 12  4
 +		gitlogo put #33CC33 -to  7  4  9  6
 +		gitlogo put #CC3333 -to  4  6 12  8
 +		gitlogo put gray26  -to  4  9  6 10
 +		gitlogo put gray26  -to  3 10  6 12
 +		gitlogo put gray26  -to  8  9 13 11
 +		gitlogo put gray26  -to  8 11 10 12
 +		gitlogo put gray26  -to 11 11 13 14
 +		gitlogo put gray26  -to  3 12  5 14
 +		gitlogo put gray26  -to  5 13
 +		gitlogo put gray26  -to 10 13
 +		gitlogo put gray26  -to  4 14 12 15
 +		gitlogo put gray26  -to  5 15 11 16
 +		gitlogo redither
 +
 +		wm iconphoto . -default gitlogo
 +	}
 +}
 +
 +######################################################################
 +##
 +## config defaults
 +
 +set cursor_ptr arrow
 +font create font_ui
 +if {[lsearch -exact [font names] TkDefaultFont] != -1} {
 +	eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
 +	eval [linsert [font actual TkFixedFont] 0 font create font_diff]
 +} else {
 +	font create font_diff -family Courier -size 10
 +	catch {
 +		label .dummy
 +		eval font configure font_ui [font actual [.dummy cget -font]]
 +		destroy .dummy
 +	}
 +}
 +
 +font create font_uiitalic
 +font create font_uibold
 +font create font_diffbold
 +font create font_diffitalic
 +
 +foreach class {Button Checkbutton Entry Label
 +		Labelframe Listbox Message
 +		Radiobutton Spinbox Text} {
 +	option add *$class.font font_ui
 +}
 +if {![is_MacOSX]} {
 +	option add *Menu.font font_ui
 +	option add *Entry.borderWidth 1 startupFile
 +	option add *Entry.relief sunken startupFile
 +	option add *RadioButton.anchor w startupFile
 +}
 +unset class
 +
 +if {[is_Windows] || [is_MacOSX]} {
 +	option add *Menu.tearOff 0
 +}
 +
 +if {[is_MacOSX]} {
 +	set M1B M1
 +	set M1T Cmd
 +} else {
 +	set M1B Control
 +	set M1T Ctrl
 +}
 +
 +proc bind_button3 {w cmd} {
 +	bind $w <Any-Button-3> $cmd
 +	if {[is_MacOSX]} {
 +		# Mac OS X sends Button-2 on right click through three-button mouse,
 +		# or through trackpad right-clicking (two-finger touch + click).
 +		bind $w <Any-Button-2> $cmd
 +		bind $w <Control-Button-1> $cmd
 +	}
 +}
 +
 +proc apply_config {} {
 +	global repo_config font_descs
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		if {[catch {
 +			set need_weight 1
 +			foreach {cn cv} $repo_config(gui.$name) {
 +				if {$cn eq {-weight}} {
 +					set need_weight 0
 +				}
 +				font configure $font $cn $cv
 +			}
 +			if {$need_weight} {
 +				font configure $font -weight normal
 +			}
 +			} err]} {
 +			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
 +		}
 +		foreach {cn cv} [font configure $font] {
 +			font configure ${font}bold $cn $cv
 +			font configure ${font}italic $cn $cv
 +		}
 +		font configure ${font}bold -weight bold
 +		font configure ${font}italic -slant italic
 +	}
 +
 +	global use_ttk NS
 +	set use_ttk 0
 +	set NS {}
 +	if {$repo_config(gui.usettk)} {
 +		set use_ttk [package vsatisfies [package provide Tk] 8.5]
 +		if {$use_ttk} {
 +			set NS ttk
 +			bind [winfo class .] <<ThemeChanged>> [list InitTheme]
 +			pave_toplevel .
 +		}
 +	}
 +}
 +
 +set default_config(branch.autosetupmerge) true
 +set default_config(merge.tool) {}
 +set default_config(mergetool.keepbackup) true
 +set default_config(merge.diffstat) true
 +set default_config(merge.summary) false
 +set default_config(merge.verbosity) 2
 +set default_config(user.name) {}
 +set default_config(user.email) {}
 +
 +set default_config(gui.encoding) [encoding system]
 +set default_config(gui.matchtrackingbranch) false
++set default_config(gui.textconv) true
 +set default_config(gui.pruneduringfetch) false
 +set default_config(gui.trustmtime) false
 +set default_config(gui.fastcopyblame) false
 +set default_config(gui.copyblamethreshold) 40
 +set default_config(gui.blamehistoryctx) 7
 +set default_config(gui.diffcontext) 5
 +set default_config(gui.commitmsgwidth) 75
 +set default_config(gui.newbranchtemplate) {}
 +set default_config(gui.spellingdictionary) {}
 +set default_config(gui.fontui) [font configure font_ui]
 +set default_config(gui.fontdiff) [font configure font_diff]
 +# TODO: this option should be added to the git-config documentation
 +set default_config(gui.maxfilesdisplayed) 5000
 +set default_config(gui.usettk) 1
 +set font_descs {
 +	{fontui   font_ui   {mc "Main Font"}}
 +	{fontdiff font_diff {mc "Diff/Console Font"}}
 +}
 +
 +######################################################################
 +##
 +## find git
 +
 +set _git  [_which git]
 +if {$_git eq {}} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message [mc "Cannot find git in PATH."]
 +	exit 1
 +}
 +
 +######################################################################
 +##
 +## version check
 +
 +if {[catch {set _git_version [git --version]} err]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message "Cannot determine Git version:
 +
 +$err
 +
 +[appname] requires Git 1.5.0 or later."
 +	exit 1
 +}
 +if {![regsub {^git version } $_git_version {} _git_version]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
 +	exit 1
 +}
 +
 +set _real_git_version $_git_version
 +regsub -- {[\-\.]dirty$} $_git_version {} _git_version
 +regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 +regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
 +regsub {\.GIT$} $_git_version {} _git_version
 +regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
 +
 +if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
 +	catch {wm withdraw .}
 +	if {[tk_messageBox \
 +		-icon warning \
 +		-type yesno \
 +		-default no \
 +		-title "[appname]: warning" \
 +		 -message [mc "Git version cannot be determined.
 +
 +%s claims it is version '%s'.
 +
 +%s requires at least Git 1.5.0 or later.
 +
 +Assume '%s' is version 1.5.0?
 +" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
 +		set _git_version 1.5.0
 +	} else {
 +		exit 1
 +	}
 +}
 +unset _real_git_version
 +
 +proc git-version {args} {
 +	global _git_version
 +
 +	switch [llength $args] {
 +	0 {
 +		return $_git_version
 +	}
 +
 +	2 {
 +		set op [lindex $args 0]
 +		set vr [lindex $args 1]
 +		set cm [package vcompare $_git_version $vr]
 +		return [expr $cm $op 0]
 +	}
 +
 +	4 {
 +		set type [lindex $args 0]
 +		set name [lindex $args 1]
 +		set parm [lindex $args 2]
 +		set body [lindex $args 3]
 +
 +		if {($type ne {proc} && $type ne {method})} {
 +			error "Invalid arguments to git-version"
 +		}
 +		if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
 +			error "Last arm of $type $name must be default"
 +		}
 +
 +		foreach {op vr cb} [lrange $body 0 end-2] {
 +			if {[git-version $op $vr]} {
 +				return [uplevel [list $type $name $parm $cb]]
 +			}
 +		}
 +
 +		return [uplevel [list $type $name $parm [lindex $body end]]]
 +	}
 +
 +	default {
 +		error "git-version >= x"
 +	}
 +
 +	}
 +}
 +
 +if {[git-version < 1.5]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message "[appname] requires Git 1.5.0 or later.
 +
 +You are using [git-version]:
 +
 +[git --version]"
 +	exit 1
 +}
 +
 +######################################################################
 +##
 +## configure our library
 +
 +set idx [file join $oguilib tclIndex]
 +if {[catch {set fd [open $idx r]} err]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message $err
 +	exit 1
 +}
 +if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
 +	set idx [list]
 +	while {[gets $fd n] >= 0} {
 +		if {$n ne {} && ![string match #* $n]} {
 +			lappend idx $n
 +		}
 +	}
 +} else {
 +	set idx {}
 +}
 +close $fd
 +
 +if {$idx ne {}} {
 +	set loaded [list]
 +	foreach p $idx {
 +		if {[lsearch -exact $loaded $p] >= 0} continue
 +		source [file join $oguilib $p]
 +		lappend loaded $p
 +	}
 +	unset loaded p
 +} else {
 +	set auto_path [concat [list $oguilib] $auto_path]
 +}
 +unset -nocomplain idx fd
 +
 +######################################################################
 +##
 +## config file parsing
 +
 +git-version proc _parse_config {arr_name args} {
 +	>= 1.5.3 {
 +		upvar $arr_name arr
 +		array unset arr
 +		set buf {}
 +		catch {
 +			set fd_rc [eval \
 +				[list git_read config] \
 +				$args \
 +				[list --null --list]]
 +			fconfigure $fd_rc -translation binary
 +			set buf [read $fd_rc]
 +			close $fd_rc
 +		}
 +		foreach line [split $buf "\0"] {
 +			if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
 +				if {[is_many_config $name]} {
 +					lappend arr($name) $value
 +				} else {
 +					set arr($name) $value
 +				}
 +			}
 +		}
 +	}
 +	default {
 +		upvar $arr_name arr
 +		array unset arr
 +		catch {
 +			set fd_rc [eval [list git_read config --list] $args]
 +			while {[gets $fd_rc line] >= 0} {
 +				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
 +					if {[is_many_config $name]} {
 +						lappend arr($name) $value
 +					} else {
 +						set arr($name) $value
 +					}
 +				}
 +			}
 +			close $fd_rc
 +		}
 +	}
 +}
 +
 +proc load_config {include_global} {
 +	global repo_config global_config system_config default_config
 +
 +	if {$include_global} {
 +		_parse_config system_config --system
 +		_parse_config global_config --global
 +	}
 +	_parse_config repo_config
 +
 +	foreach name [array names default_config] {
 +		if {[catch {set v $system_config($name)}]} {
 +			set system_config($name) $default_config($name)
 +		}
 +	}
 +	foreach name [array names system_config] {
 +		if {[catch {set v $global_config($name)}]} {
 +			set global_config($name) $system_config($name)
 +		}
 +		if {[catch {set v $repo_config($name)}]} {
 +			set repo_config($name) $system_config($name)
 +		}
 +	}
 +}
 +
 +######################################################################
 +##
 +## feature option selection
 +
 +if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
 +	unset _junk
 +} else {
 +	set subcommand gui
 +}
 +if {$subcommand eq {gui.sh}} {
 +	set subcommand gui
 +}
 +if {$subcommand eq {gui} && [llength $argv] > 0} {
 +	set subcommand [lindex $argv 0]
 +	set argv [lrange $argv 1 end]
 +}
 +
 +enable_option multicommit
 +enable_option branch
 +enable_option transport
 +disable_option bare
 +
 +switch -- $subcommand {
 +browser -
 +blame {
 +	enable_option bare
 +
 +	disable_option multicommit
 +	disable_option branch
 +	disable_option transport
 +}
 +citool {
 +	enable_option singlecommit
 +	enable_option retcode
 +
 +	disable_option multicommit
 +	disable_option branch
 +	disable_option transport
 +
 +	while {[llength $argv] > 0} {
 +		set a [lindex $argv 0]
 +		switch -- $a {
 +		--amend {
 +			enable_option initialamend
 +		}
 +		--nocommit {
 +			enable_option nocommit
 +			enable_option nocommitmsg
 +		}
 +		--commitmsg {
 +			disable_option nocommitmsg
 +		}
 +		default {
 +			break
 +		}
 +		}
 +
 +		set argv [lrange $argv 1 end]
 +	}
 +}
 +}
 +
 +######################################################################
 +##
 +## execution environment
 +
 +set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
 +
 +# Suggest our implementation of askpass, if none is set
 +if {![info exists env(SSH_ASKPASS)]} {
 +	set env(SSH_ASKPASS) [gitexec git-gui--askpass]
 +}
 +
 +######################################################################
 +##
 +## repository setup
 +
 +set picked 0
 +if {[catch {
 +		set _gitdir $env(GIT_DIR)
 +		set _prefix {}
 +		}]
 +	&& [catch {
 +		# beware that from the .git dir this sets _gitdir to .
 +		# and _prefix to the empty string
 +		set _gitdir [git rev-parse --git-dir]
 +		set _prefix [git rev-parse --show-prefix]
 +	} err]} {
 +	load_config 1
 +	apply_config
 +	choose_repository::pick
 +	set picked 1
 +}
 +
 +# we expand the _gitdir when it's just a single dot (i.e. when we're being
 +# run from the .git dir itself) lest the routines to find the worktree
 +# get confused
 +if {$_gitdir eq "."} {
 +	set _gitdir [pwd]
 +}
 +
 +if {![file isdirectory $_gitdir] && [is_Cygwin]} {
 +	catch {set _gitdir [exec cygpath --windows $_gitdir]}
 +}
 +if {![file isdirectory $_gitdir]} {
 +	catch {wm withdraw .}
 +	error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
 +	exit 1
 +}
 +# _gitdir exists, so try loading the config
 +load_config 0
 +apply_config
 +# try to set work tree from environment, falling back to core.worktree
 +if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
 +	set _gitworktree [get_config core.worktree]
++	if {$_gitworktree eq ""} {
++		set _gitworktree [file dirname [file normalize $_gitdir]]
++	}
 +}
 +if {$_prefix ne {}} {
 +	if {$_gitworktree eq {}} {
 +		regsub -all {[^/]+/} $_prefix ../ cdup
 +	} else {
 +		set cdup $_gitworktree
 +	}
 +	if {[catch {cd $cdup} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
 +		exit 1
 +	}
 +	set _gitworktree [pwd]
 +	unset cdup
 +} elseif {![is_enabled bare]} {
 +	if {[is_bare]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
 +		exit 1
 +	}
 +	if {$_gitworktree eq {}} {
 +		set _gitworktree [file dirname $_gitdir]
 +	}
 +	if {[catch {cd $_gitworktree} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
 +		exit 1
 +	}
 +	set _gitworktree [pwd]
 +}
 +set _reponame [file split [file normalize $_gitdir]]
 +if {[lindex $_reponame end] eq {.git}} {
 +	set _reponame [lindex $_reponame end-1]
 +} else {
 +	set _reponame [lindex $_reponame end]
 +}
 +
 +set env(GIT_DIR) $_gitdir
 +set env(GIT_WORK_TREE) $_gitworktree
 +
 +######################################################################
 +##
 +## global init
 +
 +set current_diff_path {}
 +set current_diff_side {}
 +set diff_actions [list]
 +
 +set HEAD {}
 +set PARENT {}
 +set MERGE_HEAD [list]
 +set commit_type {}
 +set empty_tree {}
 +set current_branch {}
 +set is_detached 0
 +set current_diff_path {}
 +set is_3way_diff 0
 +set is_submodule_diff 0
 +set is_conflict_diff 0
 +set selected_commit_type new
 +set diff_empty_count 0
 +
 +set nullid "0000000000000000000000000000000000000000"
 +set nullid2 "0000000000000000000000000000000000000001"
 +
 +######################################################################
 +##
 +## task management
 +
 +set rescan_active 0
 +set diff_active 0
 +set last_clicked {}
 +
 +set disable_on_lock [list]
 +set index_lock_type none
 +
 +proc lock_index {type} {
 +	global index_lock_type disable_on_lock
 +
 +	if {$index_lock_type eq {none}} {
 +		set index_lock_type $type
 +		foreach w $disable_on_lock {
 +			uplevel #0 $w disabled
 +		}
 +		return 1
 +	} elseif {$index_lock_type eq "begin-$type"} {
 +		set index_lock_type $type
 +		return 1
 +	}
 +	return 0
 +}
 +
 +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
 +
 +proc repository_state {ctvar hdvar mhvar} {
 +	global current_branch
 +	upvar $ctvar ct $hdvar hd $mhvar mh
 +
 +	set mh [list]
 +
 +	load_current_branch
 +	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
 +		set hd {}
 +		set ct initial
 +		return
 +	}
 +
 +	set merge_head [gitdir MERGE_HEAD]
 +	if {[file exists $merge_head]} {
 +		set ct merge
 +		set fd_mh [open $merge_head r]
 +		while {[gets $fd_mh line] >= 0} {
 +			lappend mh $line
 +		}
 +		close $fd_mh
 +		return
 +	}
 +
 +	set ct normal
 +}
 +
 +proc PARENT {} {
 +	global PARENT empty_tree
 +
 +	set p [lindex $PARENT 0]
 +	if {$p ne {}} {
 +		return $p
 +	}
 +	if {$empty_tree eq {}} {
 +		set empty_tree [git mktree << {}]
 +	}
 +	return $empty_tree
 +}
 +
 +proc force_amend {} {
 +	global selected_commit_type
 +	global HEAD PARENT MERGE_HEAD commit_type
 +
 +	repository_state newType newHEAD newMERGE_HEAD
 +	set HEAD $newHEAD
 +	set PARENT $newHEAD
 +	set MERGE_HEAD $newMERGE_HEAD
 +	set commit_type $newType
 +
 +	set selected_commit_type amend
 +	do_select_commit_type
 +}
 +
 +proc rescan {after {honor_trustmtime 1}} {
 +	global HEAD PARENT MERGE_HEAD commit_type
 +	global ui_index ui_workdir ui_comm
 +	global rescan_active file_states
 +	global repo_config
 +
 +	if {$rescan_active > 0 || ![lock_index read]} return
 +
 +	repository_state newType newHEAD newMERGE_HEAD
 +	if {[string match amend* $commit_type]
 +		&& $newType eq {normal}
 +		&& $newHEAD eq $HEAD} {
 +	} else {
 +		set HEAD $newHEAD
 +		set PARENT $newHEAD
 +		set MERGE_HEAD $newMERGE_HEAD
 +		set commit_type $newType
 +	}
 +
 +	array unset file_states
 +
 +	if {!$::GITGUI_BCK_exists &&
 +		(![$ui_comm edit modified]
 +		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
 +		if {[string match amend* $commit_type]} {
 +		} elseif {[load_message GITGUI_MSG]} {
 +		} elseif {[run_prepare_commit_msg_hook]} {
 +		} elseif {[load_message MERGE_MSG]} {
 +		} elseif {[load_message SQUASH_MSG]} {
 +		}
 +		$ui_comm edit reset
 +		$ui_comm edit modified false
 +	}
 +
 +	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
 +		rescan_stage2 {} $after
 +	} else {
 +		set rescan_active 1
 +		ui_status [mc "Refreshing file status..."]
 +		set fd_rf [git_read update-index \
 +			-q \
 +			--unmerged \
 +			--ignore-missing \
 +			--refresh \
 +			]
 +		fconfigure $fd_rf -blocking 0 -translation binary
 +		fileevent $fd_rf readable \
 +			[list rescan_stage2 $fd_rf $after]
 +	}
 +}
 +
 +if {[is_Cygwin]} {
 +	set is_git_info_exclude {}
 +	proc have_info_exclude {} {
 +		global is_git_info_exclude
 +
 +		if {$is_git_info_exclude eq {}} {
 +			if {[catch {exec test -f [gitdir info exclude]}]} {
 +				set is_git_info_exclude 0
 +			} else {
 +				set is_git_info_exclude 1
 +			}
 +		}
 +		return $is_git_info_exclude
 +	}
 +} else {
 +	proc have_info_exclude {} {
 +		return [file readable [gitdir info exclude]]
 +	}
 +}
 +
 +proc rescan_stage2 {fd after} {
 +	global rescan_active buf_rdi buf_rdf buf_rlo
 +
 +	if {$fd ne {}} {
 +		read $fd
 +		if {![eof $fd]} return
 +		close $fd
 +	}
 +
 +	set ls_others [list --exclude-per-directory=.gitignore]
 +	if {[have_info_exclude]} {
 +		lappend ls_others "--exclude-from=[gitdir info exclude]"
 +	}
 +	set user_exclude [get_config core.excludesfile]
 +	if {$user_exclude ne {} && [file readable $user_exclude]} {
 +		lappend ls_others "--exclude-from=$user_exclude"
 +	}
 +
 +	set buf_rdi {}
 +	set buf_rdf {}
 +	set buf_rlo {}
 +
 +	set rescan_active 3
 +	ui_status [mc "Scanning for modified files ..."]
 +	set fd_di [git_read diff-index --cached -z [PARENT]]
 +	set fd_df [git_read diff-files -z]
 +	set fd_lo [eval git_read ls-files --others -z $ls_others]
 +
 +	fconfigure $fd_di -blocking 0 -translation binary -encoding binary
 +	fconfigure $fd_df -blocking 0 -translation binary -encoding binary
 +	fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
 +	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]
 +}
 +
 +proc load_message {file} {
 +	global ui_comm
 +
 +	set f [gitdir $file]
 +	if {[file isfile $f]} {
 +		if {[catch {set fd [open $f r]}]} {
 +			return 0
 +		}
 +		fconfigure $fd -eofchar {}
 +		set content [string trim [read $fd]]
 +		close $fd
 +		regsub -all -line {[ \r\t]+$} $content {} content
 +		$ui_comm delete 0.0 end
 +		$ui_comm insert end $content
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc run_prepare_commit_msg_hook {} {
 +	global pch_error
 +
 +	# prepare-commit-msg requires PREPARE_COMMIT_MSG exist.  From git-gui
 +	# it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
 +	# empty file but existant file.
 +
 +	set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
 +
 +	if {[file isfile [gitdir MERGE_MSG]]} {
 +		set pcm_source "merge"
 +		set fd_mm [open [gitdir MERGE_MSG] r]
 +		puts -nonewline $fd_pcm [read $fd_mm]
 +		close $fd_mm
 +	} elseif {[file isfile [gitdir SQUASH_MSG]]} {
 +		set pcm_source "squash"
 +		set fd_sm [open [gitdir SQUASH_MSG] r]
 +		puts -nonewline $fd_pcm [read $fd_sm]
 +		close $fd_sm
 +	} else {
 +		set pcm_source ""
 +	}
 +
 +	close $fd_pcm
 +
 +	set fd_ph [githook_read prepare-commit-msg \
 +			[gitdir PREPARE_COMMIT_MSG] $pcm_source]
 +	if {$fd_ph eq {}} {
 +		catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 +		return 0;
 +	}
 +
 +	ui_status [mc "Calling prepare-commit-msg hook..."]
 +	set pch_error {}
 +
 +	fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +	fileevent $fd_ph readable \
 +		[list prepare_commit_msg_hook_wait $fd_ph]
 +
 +	return 1;
 +}
 +
 +proc prepare_commit_msg_hook_wait {fd_ph} {
 +	global pch_error
 +
 +	append pch_error [read $fd_ph]
 +	fconfigure $fd_ph -blocking 1
 +	if {[eof $fd_ph]} {
 +		if {[catch {close $fd_ph}]} {
 +			ui_status [mc "Commit declined by prepare-commit-msg hook."]
 +			hook_failed_popup prepare-commit-msg $pch_error
 +			catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 +			exit 1
 +		} else {
 +			load_message PREPARE_COMMIT_MSG
 +		}
 +		set pch_error {}
 +		catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 +		return
 +        }
 +	fconfigure $fd_ph -blocking 0
 +	catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 +}
 +
 +proc read_diff_index {fd after} {
 +	global buf_rdi
 +
 +	append buf_rdi [read $fd]
 +	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
 +		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
 +		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
 +		merge_state \
 +			[encoding convertfrom $p] \
 +			[lindex $i 4]? \
 +			[list [lindex $i 0] [lindex $i 2]] \
 +			[list]
 +		set c $z2
 +		incr c
 +	}
 +	if {$c < $n} {
 +		set buf_rdi [string range $buf_rdi $c end]
 +	} else {
 +		set buf_rdi {}
 +	}
 +
 +	rescan_done $fd buf_rdi $after
 +}
 +
 +proc read_diff_files {fd after} {
 +	global buf_rdf
 +
 +	append buf_rdf [read $fd]
 +	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
 +		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
 +		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
 +		merge_state \
 +			[encoding convertfrom $p] \
 +			?[lindex $i 4] \
 +			[list] \
 +			[list [lindex $i 0] [lindex $i 2]]
 +		set c $z2
 +		incr c
 +	}
 +	if {$c < $n} {
 +		set buf_rdf [string range $buf_rdf $c end]
 +	} else {
 +		set buf_rdf {}
 +	}
 +
 +	rescan_done $fd buf_rdf $after
 +}
 +
 +proc read_ls_others {fd after} {
 +	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] {
 +		set p [encoding convertfrom $p]
 +		if {[string index $p end] eq {/}} {
 +			set p [string range $p 0 end-1]
 +		}
 +		merge_state $p ?O
 +	}
 +	rescan_done $fd buf_rlo $after
 +}
 +
 +proc rescan_done {fd buf after} {
 +	global rescan_active current_diff_path
 +	global file_states repo_config
 +	upvar $buf to_clear
 +
 +	if {![eof $fd]} return
 +	set to_clear {}
 +	close $fd
 +	if {[incr rescan_active -1] > 0} return
 +
 +	prune_selection
 +	unlock_index
 +	display_all_files
 +	if {$current_diff_path ne {}} { reshow_diff $after }
 +	if {$current_diff_path eq {}} { select_first_diff $after }
 +}
 +
 +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)
 +		}
 +	}
 +}
 +
 +######################################################################
 +##
 +## ui helpers
 +
 +proc mapicon {w state path} {
 +	global all_icons
 +
 +	if {[catch {set r $all_icons($state$w)}]} {
 +		puts "error: no icon for $w state={$state} $path"
 +		return file_plain
 +	}
 +	return $r
 +}
 +
 +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
 +}
 +
 +proc ui_status {msg} {
 +	global main_status
 +	if {[info exists main_status]} {
 +		$main_status show $msg
 +	}
 +}
 +
 +proc ui_ready {{test {}}} {
 +	global main_status
 +	if {[info exists main_status]} {
 +		$main_status show [mc "Ready."] $test
 +	}
 +}
 +
 +proc escape_path {path} {
 +	regsub -all {\\} $path "\\\\" path
 +	regsub -all "\n" $path "\\n" path
 +	return $path
 +}
 +
 +proc short_path {path} {
 +	return [escape_path [lindex [file split $path] end]]
 +}
 +
 +set next_icon_id 0
 +set null_sha1 [string repeat 0 40]
 +
 +proc merge_state {path new_state {head_info {}} {index_info {}}} {
 +	global file_states next_icon_id null_sha1
 +
 +	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]
 +	} else {
 +		set state [lindex $info 0]
 +		set icon [lindex $info 1]
 +		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
 +		if {$index_info eq {}} {set index_info [lindex $info 3]}
 +	}
 +
 +	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 _}
 +
 +	if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
 +		set head_info [list 0 $null_sha1]
 +	} elseif {$s0 ne {_} && [string index $state 0] eq {_}
 +		&& $head_info eq {}} {
 +		set head_info $index_info
 +	} elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
 +		set index_info $head_info
 +		set head_info {}
 +	}
 +
 +	set file_states($path) [list $s0$s1 $icon \
 +		$head_info $index_info \
 +		]
 +	return $state
 +}
 +
 +proc display_file_helper {w path icon_name old_m new_m} {
 +	global file_lists
 +
 +	if {$new_m eq {_}} {
 +		set lno [lsearch -sorted -exact $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 -exact $file_lists($w) $path]
 +		incr lno
 +		$w conf -state normal
 +		$w image create $lno.0 \
 +			-align center -padx 5 -pady 1 \
 +			-name $icon_name \
 +			-image [mapicon $w $new_m $path]
 +		$w insert $lno.1 "[escape_path $path]\n"
 +		$w conf -state disabled
 +	} elseif {$old_m ne $new_m} {
 +		$w conf -state normal
 +		$w image conf $icon_name -image [mapicon $w $new_m $path]
 +		$w conf -state disabled
 +	}
 +}
 +
 +proc display_file {path state} {
 +	global file_states selected_paths
 +	global ui_index ui_workdir
 +
 +	set old_m [merge_state $path $state]
 +	set s $file_states($path)
 +	set new_m [lindex $s 0]
 +	set icon_name [lindex $s 1]
 +
 +	set o [string index $old_m 0]
 +	set n [string index $new_m 0]
 +	if {$o eq {U}} {
 +		set o _
 +	}
 +	if {$n eq {U}} {
 +		set n _
 +	}
 +	display_file_helper	$ui_index $path $icon_name $o $n
 +
 +	if {[string index $old_m 0] eq {U}} {
 +		set o U
 +	} else {
 +		set o [string index $old_m 1]
 +	}
 +	if {[string index $new_m 0] eq {U}} {
 +		set n U
 +	} else {
 +		set n [string index $new_m 1]
 +	}
 +	display_file_helper	$ui_workdir $path $icon_name $o $n
 +
 +	if {$new_m eq {__}} {
 +		unset file_states($path)
 +		catch {unset selected_paths($path)}
 +	}
 +}
 +
 +proc display_all_files_helper {w path icon_name m} {
 +	global file_lists
 +
 +	lappend file_lists($w) $path
 +	set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
 +	$w image create end \
 +		-align center -padx 5 -pady 1 \
 +		-name $icon_name \
 +		-image [mapicon $w $m $path]
 +	$w insert end "[escape_path $path]\n"
 +}
 +
 +set files_warning 0
 +proc display_all_files {} {
 +	global ui_index ui_workdir
 +	global file_states file_lists
 +	global last_clicked
 +	global files_warning
 +
 +	$ui_index conf -state normal
 +	$ui_workdir conf -state normal
 +
 +	$ui_index delete 0.0 end
 +	$ui_workdir delete 0.0 end
 +	set last_clicked {}
 +
 +	set file_lists($ui_index) [list]
 +	set file_lists($ui_workdir) [list]
 +
 +	set to_display [lsort [array names file_states]]
 +	set display_limit [get_config gui.maxfilesdisplayed]
 +	if {[llength $to_display] > $display_limit} {
 +		if {!$files_warning} {
 +			# do not repeatedly warn:
 +			set files_warning 1
 +			info_popup [mc "Displaying only %s of %s files." \
 +				$display_limit [llength $to_display]]
 +		}
 +		set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
 +	}
 +	foreach path $to_display {
 +		set s $file_states($path)
 +		set m [lindex $s 0]
 +		set icon_name [lindex $s 1]
 +
 +		set s [string index $m 0]
 +		if {$s ne {U} && $s ne {_}} {
 +			display_all_files_helper $ui_index $path \
 +				$icon_name $s
 +		}
 +
 +		if {[string index $m 0] eq {U}} {
 +			set s U
 +		} else {
 +			set s [string index $m 1]
 +		}
 +		if {$s ne {_}} {
 +			display_all_files_helper $ui_workdir $path \
 +				$icon_name $s
 +		}
 +	}
 +
 +	$ui_index conf -state disabled
 +	$ui_workdir conf -state disabled
 +}
 +
 +######################################################################
 +##
 +## 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
 +
 +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[] = {
 +   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_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
 +
 +image create bitmap file_statechange -background white -foreground green -data {
 +#define file_merge_width 14
 +#define file_merge_height 15
 +static unsigned char file_statechange_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
 +   0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +set ui_index .vpane.files.index.list
 +set ui_workdir .vpane.files.workdir.list
 +
 +set all_icons(_$ui_index)   file_plain
 +set all_icons(A$ui_index)   file_plain
 +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(T$ui_index)   file_statechange
 +
 +set all_icons(_$ui_workdir) file_plain
 +set all_icons(M$ui_workdir) file_mod
 +set all_icons(D$ui_workdir) file_question
 +set all_icons(U$ui_workdir) file_merge
 +set all_icons(O$ui_workdir) file_plain
 +set all_icons(T$ui_workdir) file_statechange
 +
 +set max_status_desc 0
 +foreach i {
 +		{__ {mc "Unmodified"}}
 +
 +		{_M {mc "Modified, not staged"}}
 +		{M_ {mc "Staged for commit"}}
 +		{MM {mc "Portions staged for commit"}}
 +		{MD {mc "Staged for commit, missing"}}
 +
 +		{_T {mc "File type changed, not staged"}}
 +		{T_ {mc "File type changed, staged"}}
 +
 +		{_O {mc "Untracked, not staged"}}
 +		{A_ {mc "Staged for commit"}}
 +		{AM {mc "Portions staged for commit"}}
 +		{AD {mc "Staged for commit, missing"}}
 +
 +		{_D {mc "Missing"}}
 +		{D_ {mc "Staged for removal"}}
 +		{DO {mc "Staged for removal, still present"}}
 +
 +		{_U {mc "Requires merge resolution"}}
 +		{U_ {mc "Requires merge resolution"}}
 +		{UU {mc "Requires merge resolution"}}
 +		{UM {mc "Requires merge resolution"}}
 +		{UD {mc "Requires merge resolution"}}
 +		{UT {mc "Requires merge resolution"}}
 +	} {
 +	set text [eval [lindex $i 1]]
 +	if {$max_status_desc < [string length $text]} {
 +		set max_status_desc [string length $text]
 +	}
 +	set all_descs([lindex $i 0]) $text
 +}
 +unset i
 +
 +######################################################################
 +##
 +## util
 +
 +proc scrollbar2many {list mode args} {
 +	foreach w $list {eval $w $mode $args}
 +}
 +
 +proc many2scrollbar {list mode sb top bottom} {
 +	$sb set $top $bottom
 +	foreach w $list {$w $mode moveto $top}
 +}
 +
 +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
 +	font configure ${font}italic -size $sz
 +}
 +
 +######################################################################
 +##
 +## ui commands
 +
 +set starting_gitk_msg [mc "Starting gitk... please wait..."]
 +
 +proc do_gitk {revs {is_submodule false}} {
 +	global current_diff_path file_states current_diff_side ui_index
 +	global _gitdir _gitworktree
 +
 +	# -- Always start gitk through whatever we were loaded with.  This
 +	#    lets us bypass using shell process on Windows systems.
 +	#
 +	set exe [_which gitk -script]
 +	set cmd [list [info nameofexecutable] $exe]
 +	if {$exe eq {}} {
 +		error_popup [mc "Couldn't find gitk in PATH"]
 +	} else {
 +		global env
 +
 +		set pwd [pwd]
 +
 +		if {!$is_submodule} {
 +			if {![is_bare]} {
 +				cd $_gitworktree
 +			}
 +		} else {
 +			cd $current_diff_path
 +			if {$revs eq {--}} {
 +				set s $file_states($current_diff_path)
 +				set old_sha1 {}
 +				set new_sha1 {}
 +				switch -glob -- [lindex $s 0] {
 +				M_ { set old_sha1 [lindex [lindex $s 2] 1] }
 +				_M { set old_sha1 [lindex [lindex $s 3] 1] }
 +				MM {
 +					if {$current_diff_side eq $ui_index} {
 +						set old_sha1 [lindex [lindex $s 2] 1]
 +						set new_sha1 [lindex [lindex $s 3] 1]
 +					} else {
 +						set old_sha1 [lindex [lindex $s 3] 1]
 +					}
 +				}
 +				}
 +				set revs $old_sha1...$new_sha1
 +			}
 +			# GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
 +			# we've been using for the main repository, so unset them.
 +			# TODO we could make life easier (start up faster?) for gitk
 +			# by setting these to the appropriate values to allow gitk
 +			# to skip the heuristics to find their proper value
 +			unset env(GIT_DIR)
 +			unset env(GIT_WORK_TREE)
 +		}
 +		eval exec $cmd $revs "--" "--" &
 +
 +		set env(GIT_DIR) $_gitdir
 +		set env(GIT_WORK_TREE) $_gitworktree
 +		cd $pwd
 +
 +		ui_status $::starting_gitk_msg
 +		after 10000 {
 +			ui_ready $starting_gitk_msg
 +		}
 +	}
 +}
 +
 +proc do_git_gui {} {
 +	global current_diff_path
 +
 +	# -- Always start git gui through whatever we were loaded with.  This
 +	#    lets us bypass using shell process on Windows systems.
 +	#
 +	set exe [list [_which git]]
 +	if {$exe eq {}} {
 +		error_popup [mc "Couldn't find git gui in PATH"]
 +	} else {
 +		global env
 +		global _gitdir _gitworktree
 +
 +		# see note in do_gitk about unsetting these vars when
 +		# running tools in a submodule
 +		unset env(GIT_DIR)
 +		unset env(GIT_WORK_TREE)
 +
 +		set pwd [pwd]
 +		cd $current_diff_path
 +
 +		eval exec $exe gui &
 +
 +		set env(GIT_DIR) $_gitdir
 +		set env(GIT_WORK_TREE) $_gitworktree
 +		cd $pwd
 +
 +		ui_status $::starting_gitk_msg
 +		after 10000 {
 +			ui_ready $starting_gitk_msg
 +		}
 +	}
 +}
 +
 +proc do_explore {} {
 +	global _gitworktree
 +	set explorer {}
 +	if {[is_Cygwin] || [is_Windows]} {
 +		set explorer "explorer.exe"
 +	} elseif {[is_MacOSX]} {
 +		set explorer "open"
 +	} else {
 +		# freedesktop.org-conforming system is our best shot
 +		set explorer "xdg-open"
 +	}
- 	eval exec $explorer $_gitworktree &
++	eval exec $explorer [list [file nativename $_gitworktree]] &
 +}
 +
 +set is_quitting 0
 +set ret_code    1
 +
 +proc terminate_me {win} {
 +	global ret_code
 +	if {$win ne {.}} return
 +	exit $ret_code
 +}
 +
 +proc do_quit {{rc {1}}} {
 +	global ui_comm is_quitting repo_config commit_type
 +	global GITGUI_BCK_exists GITGUI_BCK_i
 +	global ui_comm_spell
 +	global ret_code use_ttk
 +
 +	if {$is_quitting} return
 +	set is_quitting 1
 +
 +	if {[winfo exists $ui_comm]} {
 +		# -- Stash our current commit buffer.
 +		#
 +		set save [gitdir GITGUI_MSG]
 +		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
 +			file rename -force [gitdir GITGUI_BCK] $save
 +			set GITGUI_BCK_exists 0
 +		} else {
 +			set msg [string trim [$ui_comm get 0.0 end]]
 +			regsub -all -line {[ \r\t]+$} $msg {} msg
 +			if {(![string match amend* $commit_type]
 +				|| [$ui_comm edit modified])
 +				&& $msg ne {}} {
 +				catch {
 +					set fd [open $save w]
 +					puts -nonewline $fd $msg
 +					close $fd
 +				}
 +			} else {
 +				catch {file delete $save}
 +			}
 +		}
 +
 +		# -- Cancel our spellchecker if its running.
 +		#
 +		if {[info exists ui_comm_spell]} {
 +			$ui_comm_spell stop
 +		}
 +
 +		# -- Remove our editor backup, its not needed.
 +		#
 +		after cancel $GITGUI_BCK_i
 +		if {$GITGUI_BCK_exists} {
 +			catch {file delete [gitdir GITGUI_BCK]}
 +		}
 +
 +		# -- Stash our current window geometry into this repository.
 +		#
 +		set cfg_wmstate [wm state .]
 +		if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
 +			set rc_wmstate {}
 +		}
 +		if {$cfg_wmstate ne $rc_wmstate} {
 +			catch {git config gui.wmstate $cfg_wmstate}
 +		}
 +		if {$cfg_wmstate eq {zoomed}} {
 +			# on Windows wm geometry will lie about window
 +			# position (but not size) when window is zoomed
 +			# restore the window before querying wm geometry
 +			wm state . normal
 +		}
 +		set cfg_geometry [list]
 +		lappend cfg_geometry [wm geometry .]
 +		if {$use_ttk} {
 +			lappend cfg_geometry [.vpane sashpos 0]
 +			lappend cfg_geometry [.vpane.files sashpos 0]
 +		} else {
 +			lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
 +			lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
 +		}
 +		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
 +			set rc_geometry {}
 +		}
 +		if {$cfg_geometry ne $rc_geometry} {
 +			catch {git config gui.geometry $cfg_geometry}
 +		}
 +	}
 +
 +	set ret_code $rc
 +
 +	# Briefly enable send again, working around Tk bug
 +	# http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
 +	tk appname [appname]
 +
 +	destroy .
 +}
 +
 +proc do_rescan {} {
 +	rescan ui_ready
 +}
 +
 +proc ui_do_rescan {} {
 +	rescan {force_first_diff ui_ready}
 +}
 +
 +proc do_commit {} {
 +	commit_tree
 +}
 +
 +proc next_diff {{after {}}} {
 +	global next_diff_p next_diff_w next_diff_i
 +	show_diff $next_diff_p $next_diff_w {} {} $after
 +}
 +
 +proc find_anchor_pos {lst name} {
 +	set lid [lsearch -sorted -exact $lst $name]
 +
 +	if {$lid == -1} {
 +		set lid 0
 +		foreach lname $lst {
 +			if {$lname >= $name} break
 +			incr lid
 +		}
 +	}
 +
 +	return $lid
 +}
 +
 +proc find_file_from {flist idx delta path mmask} {
 +	global file_states
 +
 +	set len [llength $flist]
 +	while {$idx >= 0 && $idx < $len} {
 +		set name [lindex $flist $idx]
 +
 +		if {$name ne $path && [info exists file_states($name)]} {
 +			set state [lindex $file_states($name) 0]
 +
 +			if {$mmask eq {} || [regexp $mmask $state]} {
 +				return $idx
 +			}
 +		}
 +
 +		incr idx $delta
 +	}
 +
 +	return {}
 +}
 +
 +proc find_next_diff {w path {lno {}} {mmask {}}} {
 +	global next_diff_p next_diff_w next_diff_i
 +	global file_lists ui_index ui_workdir
 +
 +	set flist $file_lists($w)
 +	if {$lno eq {}} {
 +		set lno [find_anchor_pos $flist $path]
 +	} else {
 +		incr lno -1
 +	}
 +
 +	if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
 +		if {$w eq $ui_index} {
 +			set mmask "^$mmask"
 +		} else {
 +			set mmask "$mmask\$"
 +		}
 +	}
 +
 +	set idx [find_file_from $flist $lno 1 $path $mmask]
 +	if {$idx eq {}} {
 +		incr lno -1
 +		set idx [find_file_from $flist $lno -1 $path $mmask]
 +	}
 +
 +	if {$idx ne {}} {
 +		set next_diff_w $w
 +		set next_diff_p [lindex $flist $idx]
 +		set next_diff_i [expr {$idx+1}]
 +		return 1
 +	} else {
 +		return 0
 +	}
 +}
 +
 +proc next_diff_after_action {w path {lno {}} {mmask {}}} {
 +	global current_diff_path
 +
 +	if {$path ne $current_diff_path} {
 +		return {}
 +	} elseif {[find_next_diff $w $path $lno $mmask]} {
 +		return {next_diff;}
 +	} else {
 +		return {reshow_diff;}
 +	}
 +}
 +
 +proc select_first_diff {after} {
 +	global ui_workdir
 +
 +	if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
 +	    [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
 +		next_diff $after
 +	} else {
 +		uplevel #0 $after
 +	}
 +}
 +
 +proc force_first_diff {after} {
 +	global ui_workdir current_diff_path file_states
 +
 +	if {[info exists file_states($current_diff_path)]} {
 +		set state [lindex $file_states($current_diff_path) 0]
 +	} else {
 +		set state {OO}
 +	}
 +
 +	set reselect 0
 +	if {[string first {U} $state] >= 0} {
 +		# Already a conflict, do nothing
 +	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
 +		set reselect 1
 +	} elseif {[string index $state 1] ne {O}} {
 +		# Already a diff & no conflicts, do nothing
 +	} elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
 +		set reselect 1
 +	}
 +
 +	if {$reselect} {
 +		next_diff $after
 +	} else {
 +		uplevel #0 $after
 +	}
 +}
 +
 +proc toggle_or_diff {w x y} {
 +	global file_states file_lists current_diff_path ui_index ui_workdir
 +	global last_clicked selected_paths
 +
 +	set pos [split [$w index @$x,$y] .]
 +	set lno [lindex $pos 0]
 +	set col [lindex $pos 1]
 +	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
 +	$ui_workdir tag remove in_sel 0.0 end
 +
 +	# Determine the state of the file
 +	if {[info exists file_states($path)]} {
 +		set state [lindex $file_states($path) 0]
 +	} else {
 +		set state {__}
 +	}
 +
 +	# Restage the file, or simply show the diff
 +	if {$col == 0 && $y > 1} {
 +		# Conflicts need special handling
 +		if {[string first {U} $state] >= 0} {
 +			# $w must always be $ui_workdir, but...
 +			if {$w ne $ui_workdir} { set lno {} }
 +			merge_stage_workdir $path $lno
 +			return
 +		}
 +
 +		if {[string index $state 1] eq {O}} {
 +			set mmask {}
 +		} else {
 +			set mmask {[^O]}
 +		}
 +
 +		set after [next_diff_after_action $w $path $lno $mmask]
 +
 +		if {$w eq $ui_index} {
 +			update_indexinfo \
 +				"Unstaging [short_path $path] from commit" \
 +				[list $path] \
 +				[concat $after [list ui_ready]]
 +		} elseif {$w eq $ui_workdir} {
 +			update_index \
 +				"Adding [short_path $path]" \
 +				[list $path] \
 +				[concat $after [list ui_ready]]
 +		}
 +	} else {
 +		show_diff $path $w $lno
 +	}
 +}
 +
 +proc add_one_to_selection {w x y} {
 +	global file_lists last_clicked selected_paths
 +
 +	set lno [lindex [split [$w index @$x,$y] .] 0]
 +	set path [lindex $file_lists($w) [expr {$lno - 1}]]
 +	if {$path eq {}} {
 +		set last_clicked {}
 +		return
 +	}
 +
 +	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
 +	}
 +
 +	set last_clicked [list $w $lno]
 +	if {[catch {set in_sel $selected_paths($path)}]} {
 +		set in_sel 0
 +	}
 +	if {$in_sel} {
 +		unset selected_paths($path)
 +		$w tag remove in_sel $lno.0 [expr {$lno + 1}].0
 +	} else {
 +		set selected_paths($path) 1
 +		$w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +	}
 +}
 +
 +proc add_range_to_selection {w x y} {
 +	global file_lists last_clicked selected_paths
 +
 +	if {[lindex $last_clicked 0] ne $w} {
 +		toggle_or_diff $w $x $y
 +		return
 +	}
 +
 +	set lno [lindex [split [$w index @$x,$y] .] 0]
 +	set lc [lindex $last_clicked 1]
 +	if {$lc < $lno} {
 +		set begin $lc
 +		set end $lno
 +	} else {
 +		set begin $lno
 +		set end $lc
 +	}
 +
 +	foreach path [lrange $file_lists($w) \
 +		[expr {$begin - 1}] \
 +		[expr {$end - 1}]] {
 +		set selected_paths($path) 1
 +	}
 +	$w tag add in_sel $begin.0 [expr {$end + 1}].0
 +}
 +
 +proc show_more_context {} {
 +	global repo_config
 +	if {$repo_config(gui.diffcontext) < 99} {
 +		incr repo_config(gui.diffcontext)
 +		reshow_diff
 +	}
 +}
 +
 +proc show_less_context {} {
 +	global repo_config
 +	if {$repo_config(gui.diffcontext) > 1} {
 +		incr repo_config(gui.diffcontext) -1
 +		reshow_diff
 +	}
 +}
 +
 +######################################################################
 +##
 +## ui construction
 +
 +set ui_comm {}
 +
 +# -- Menu Bar
 +#
 +menu .mbar -tearoff 0
 +if {[is_MacOSX]} {
 +	# -- Apple Menu (Mac OS X only)
 +	#
 +	.mbar add cascade -label Apple -menu .mbar.apple
 +	menu .mbar.apple
 +}
 +.mbar add cascade -label [mc Repository] -menu .mbar.repository
 +.mbar add cascade -label [mc Edit] -menu .mbar.edit
 +if {[is_enabled branch]} {
 +	.mbar add cascade -label [mc Branch] -menu .mbar.branch
 +}
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	.mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
 +}
 +if {[is_enabled transport]} {
 +	.mbar add cascade -label [mc Merge] -menu .mbar.merge
 +	.mbar add cascade -label [mc Remote] -menu .mbar.remote
 +}
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	.mbar add cascade -label [mc Tools] -menu .mbar.tools
 +}
 +
 +# -- Repository Menu
 +#
 +menu .mbar.repository
 +
 +if {![is_bare]} {
 +	.mbar.repository add command \
 +		-label [mc "Explore Working Copy"] \
 +		-command {do_explore}
 +	.mbar.repository add separator
 +}
 +
 +.mbar.repository add command \
 +	-label [mc "Browse Current Branch's Files"] \
 +	-command {browser::new $current_branch}
 +set ui_browse_current [.mbar.repository index last]
 +.mbar.repository add command \
 +	-label [mc "Browse Branch Files..."] \
 +	-command browser_open::dialog
 +.mbar.repository add separator
 +
 +.mbar.repository add command \
 +	-label [mc "Visualize Current Branch's History"] \
 +	-command {do_gitk $current_branch}
 +set ui_visualize_current [.mbar.repository index last]
 +.mbar.repository add command \
 +	-label [mc "Visualize All Branch History"] \
 +	-command {do_gitk --all}
 +.mbar.repository add separator
 +
 +proc current_branch_write {args} {
 +	global current_branch
 +	.mbar.repository entryconf $::ui_browse_current \
 +		-label [mc "Browse %s's Files" $current_branch]
 +	.mbar.repository entryconf $::ui_visualize_current \
 +		-label [mc "Visualize %s's History" $current_branch]
 +}
 +trace add variable current_branch write current_branch_write
 +
 +if {[is_enabled multicommit]} {
 +	.mbar.repository add command -label [mc "Database Statistics"] \
 +		-command do_stats
 +
 +	.mbar.repository add command -label [mc "Compress Database"] \
 +		-command do_gc
 +
 +	.mbar.repository add command -label [mc "Verify Database"] \
 +		-command do_fsck_objects
 +
 +	.mbar.repository add separator
 +
 +	if {[is_Cygwin]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_cygwin_shortcut
 +	} elseif {[is_Windows]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_windows_shortcut
 +	} elseif {[is_MacOSX]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_macosx_app
 +	}
 +}
 +
 +if {[is_MacOSX]} {
 +	proc ::tk::mac::Quit {args} { do_quit }
 +} else {
 +	.mbar.repository add command -label [mc Quit] \
 +		-command do_quit \
 +		-accelerator $M1T-Q
 +}
 +
 +# -- Edit Menu
 +#
 +menu .mbar.edit
 +.mbar.edit add command -label [mc Undo] \
 +	-command {catch {[focus] edit undo}} \
 +	-accelerator $M1T-Z
 +.mbar.edit add command -label [mc Redo] \
 +	-command {catch {[focus] edit redo}} \
 +	-accelerator $M1T-Y
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc Cut] \
 +	-command {catch {tk_textCut [focus]}} \
 +	-accelerator $M1T-X
 +.mbar.edit add command -label [mc Copy] \
 +	-command {catch {tk_textCopy [focus]}} \
 +	-accelerator $M1T-C
 +.mbar.edit add command -label [mc Paste] \
 +	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
 +	-accelerator $M1T-V
 +.mbar.edit add command -label [mc Delete] \
 +	-command {catch {[focus] delete sel.first sel.last}} \
 +	-accelerator Del
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc "Select All"] \
 +	-command {catch {[focus] tag add sel 0.0 end}} \
 +	-accelerator $M1T-A
 +
 +# -- Branch Menu
 +#
 +if {[is_enabled branch]} {
 +	menu .mbar.branch
 +
 +	.mbar.branch add command -label [mc "Create..."] \
 +		-command branch_create::dialog \
 +		-accelerator $M1T-N
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Checkout..."] \
 +		-command branch_checkout::dialog \
 +		-accelerator $M1T-O
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Rename..."] \
 +		-command branch_rename::dialog
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Delete..."] \
 +		-command branch_delete::dialog
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Reset..."] \
 +		-command merge::reset_hard
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +}
 +
 +# -- Commit Menu
 +#
 +proc commit_btn_caption {} {
 +	if {[is_enabled nocommit]} {
 +		return [mc "Done"]
 +	} else {
 +		return [mc Commit@@verb]
 +	}
 +}
 +
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	menu .mbar.commit
 +
 +	if {![is_enabled nocommit]} {
 +		.mbar.commit add radiobutton \
 +			-label [mc "New Commit"] \
 +			-command do_select_commit_type \
 +			-variable selected_commit_type \
 +			-value new
 +		lappend disable_on_lock \
 +			[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +		.mbar.commit add radiobutton \
 +			-label [mc "Amend Last Commit"] \
 +			-command do_select_commit_type \
 +			-variable selected_commit_type \
 +			-value amend
 +		lappend disable_on_lock \
 +			[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +		.mbar.commit add separator
 +	}
 +
 +	.mbar.commit add command -label [mc Rescan] \
 +		-command ui_do_rescan \
 +		-accelerator F5
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Stage To Commit"] \
 +		-command do_add_selection \
 +		-accelerator $M1T-T
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
 +		-command do_add_all \
 +		-accelerator $M1T-I
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Unstage From Commit"] \
 +		-command do_unstage_selection \
 +		-accelerator $M1T-U
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Revert Changes"] \
 +		-command do_revert_selection \
 +		-accelerator $M1T-J
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add separator
 +
 +	.mbar.commit add command -label [mc "Show Less Context"] \
 +		-command show_less_context \
 +		-accelerator $M1T-\-
 +
 +	.mbar.commit add command -label [mc "Show More Context"] \
 +		-command show_more_context \
 +		-accelerator $M1T-=
 +
 +	.mbar.commit add separator
 +
 +	if {![is_enabled nocommitmsg]} {
 +		.mbar.commit add command -label [mc "Sign Off"] \
 +			-command do_signoff \
 +			-accelerator $M1T-S
 +	}
 +
 +	.mbar.commit add command -label [commit_btn_caption] \
 +		-command do_commit \
 +		-accelerator $M1T-Return
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +}
 +
 +# -- Merge Menu
 +#
 +if {[is_enabled branch]} {
 +	menu .mbar.merge
 +	.mbar.merge add command -label [mc "Local Merge..."] \
 +		-command merge::dialog \
 +		-accelerator $M1T-M
 +	lappend disable_on_lock \
 +		[list .mbar.merge entryconf [.mbar.merge index last] -state]
 +	.mbar.merge add command -label [mc "Abort Merge..."] \
 +		-command merge::reset_hard
 +	lappend disable_on_lock \
 +		[list .mbar.merge entryconf [.mbar.merge index last] -state]
 +}
 +
 +# -- Transport Menu
 +#
 +if {[is_enabled transport]} {
 +	menu .mbar.remote
 +
 +	.mbar.remote add command \
 +		-label [mc "Add..."] \
 +		-command remote_add::dialog \
 +		-accelerator $M1T-A
 +	.mbar.remote add command \
 +		-label [mc "Push..."] \
 +		-command do_push_anywhere \
 +		-accelerator $M1T-P
 +	.mbar.remote add command \
 +		-label [mc "Delete Branch..."] \
 +		-command remote_branch_delete::dialog
 +}
 +
 +if {[is_MacOSX]} {
 +	proc ::tk::mac::ShowPreferences {} {do_options}
 +} else {
 +	# -- Edit Menu
 +	#
 +	.mbar.edit add separator
 +	.mbar.edit add command -label [mc "Options..."] \
 +		-command do_options
 +}
 +
 +# -- Tools Menu
 +#
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	set tools_menubar .mbar.tools
 +	menu $tools_menubar
 +	$tools_menubar add separator
 +	$tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
 +	$tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
 +	set tools_tailcnt 3
 +	if {[array names repo_config guitool.*.cmd] ne {}} {
 +		tools_populate_all
 +	}
 +}
 +
 +# -- Help Menu
 +#
 +.mbar add cascade -label [mc Help] -menu .mbar.help
 +menu .mbar.help
 +
 +if {[is_MacOSX]} {
 +	.mbar.apple add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +	.mbar.apple add separator
 +} else {
 +	.mbar.help add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +}
 +. configure -menu .mbar
 +
 +set doc_path [githtmldir]
 +if {$doc_path ne {}} {
 +	set doc_path [file join $doc_path index.html]
 +
 +	if {[is_Cygwin]} {
 +		set doc_path [exec cygpath --mixed $doc_path]
 +	}
 +}
 +
 +if {[file isfile $doc_path]} {
 +	set doc_url "file:$doc_path"
 +} else {
 +	set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
 +}
 +
 +proc start_browser {url} {
 +	git "web--browse" $url
 +}
 +
 +.mbar.help add command -label [mc "Online Documentation"] \
 +	-command [list start_browser $doc_url]
 +
 +.mbar.help add command -label [mc "Show SSH Key"] \
 +	-command do_ssh_key
 +
 +unset doc_path doc_url
 +
 +# -- Standard bindings
 +#
 +wm protocol . WM_DELETE_WINDOW do_quit
 +bind all <$M1B-Key-q> do_quit
 +bind all <$M1B-Key-Q> do_quit
 +bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
 +bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
 +
 +set subcommand_args {}
 +proc usage {} {
 +	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
 +	exit 1
 +}
 +
 +proc normalize_relpath {path} {
 +	set elements {}
 +	foreach item [file split $path] {
 +		if {$item eq {.}} continue
 +		if {$item eq {..} && [llength $elements] > 0
 +		    && [lindex $elements end] ne {..}} {
 +			set elements [lrange $elements 0 end-1]
 +			continue
 +		}
 +		lappend elements $item
 +	}
 +	return [eval file join $elements]
 +}
 +
 +# -- Not a normal commit type invocation?  Do that instead!
 +#
 +switch -- $subcommand {
 +browser -
 +blame {
 +	if {$subcommand eq "blame"} {
 +		set subcommand_args {[--line=<num>] rev? path}
 +	} else {
 +		set subcommand_args {rev? path}
 +	}
 +	if {$argv eq {}} usage
 +	set head {}
 +	set path {}
 +	set jump_spec {}
 +	set is_path 0
 +	foreach a $argv {
 +		if {$is_path || [file exists $_prefix$a]} {
 +			if {$path ne {}} usage
 +			set path [normalize_relpath $_prefix$a]
 +			break
 +		} elseif {$a eq {--}} {
 +			if {$path ne {}} {
 +				if {$head ne {}} usage
 +				set head $path
 +				set path {}
 +			}
 +			set is_path 1
 +		} elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
 +			if {$jump_spec ne {} || $head ne {}} usage
 +			set jump_spec [list $lnum]
 +		} elseif {$head eq {}} {
 +			if {$head ne {}} usage
 +			set head $a
 +			set is_path 1
 +		} else {
 +			usage
 +		}
 +	}
 +	unset is_path
 +
 +	if {$head ne {} && $path eq {}} {
 +		set path [normalize_relpath $_prefix$head]
 +		set head {}
 +	}
 +
 +	if {$head eq {}} {
 +		load_current_branch
 +	} else {
 +		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
 +			if {[catch {
 +					set head [git rev-parse --verify $head]
 +				} err]} {
 +				puts stderr $err
 +				exit 1
 +			}
 +		}
 +		set current_branch $head
 +	}
 +
++	wm deiconify .
 +	switch -- $subcommand {
 +	browser {
 +		if {$jump_spec ne {}} usage
 +		if {$head eq {}} {
 +			if {$path ne {} && [file isdirectory $path]} {
 +				set head $current_branch
 +			} else {
 +				set head $path
 +				set path {}
 +			}
 +		}
 +		browser::new $head $path
 +	}
 +	blame   {
 +		if {$head eq {} && ![file exists $path]} {
 +			puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
 +			exit 1
 +		}
 +		blame::new $head $path $jump_spec
 +	}
 +	}
 +	return
 +}
 +citool -
 +gui {
 +	if {[llength $argv] != 0} {
 +		puts -nonewline stderr "usage: $argv0"
 +		if {$subcommand ne {gui}
 +			&& [file tail $argv0] ne "git-$subcommand"} {
 +			puts -nonewline stderr " $subcommand"
 +		}
 +		puts stderr {}
 +		exit 1
 +	}
 +	# fall through to setup UI for commits
 +}
 +default {
 +	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
 +	exit 1
 +}
 +}
 +
 +# -- Branch Control
 +#
 +${NS}::frame .branch
 +if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
 +${NS}::label .branch.l1 \
 +	-text [mc "Current Branch:"] \
 +	-anchor w \
 +	-justify left
 +${NS}::label .branch.cb \
 +	-textvariable current_branch \
 +	-anchor w \
 +	-justify left
 +pack .branch.l1 -side left
 +pack .branch.cb -side left -fill x
 +pack .branch -side top -fill x
 +
 +# -- Main Window Layout
 +#
 +${NS}::panedwindow .vpane -orient horizontal
 +${NS}::panedwindow .vpane.files -orient vertical
 +if {$use_ttk} {
 +	.vpane add .vpane.files
 +} else {
 +	.vpane add .vpane.files -sticky nsew -height 100 -width 200
 +}
 +pack .vpane -anchor n -side top -fill both -expand 1
 +
 +# -- Index File List
 +#
 +${NS}::frame .vpane.files.index -height 100 -width 200
 +tlabel .vpane.files.index.title \
 +	-text [mc "Staged Changes (Will Commit)"] \
 +	-background lightgreen -foreground black
 +text $ui_index -background white -foreground black \
 +	-borderwidth 0 \
 +	-width 20 -height 10 \
 +	-wrap none \
 +	-cursor $cursor_ptr \
 +	-xscrollcommand {.vpane.files.index.sx set} \
 +	-yscrollcommand {.vpane.files.index.sy set} \
 +	-state disabled
 +${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
 +${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
 +pack .vpane.files.index.title -side top -fill x
 +pack .vpane.files.index.sx -side bottom -fill x
 +pack .vpane.files.index.sy -side right -fill y
 +pack $ui_index -side left -fill both -expand 1
 +
 +# -- Working Directory File List
 +#
 +${NS}::frame .vpane.files.workdir -height 100 -width 200
 +tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 +	-background lightsalmon -foreground black
 +text $ui_workdir -background white -foreground black \
 +	-borderwidth 0 \
 +	-width 20 -height 10 \
 +	-wrap none \
 +	-cursor $cursor_ptr \
 +	-xscrollcommand {.vpane.files.workdir.sx set} \
 +	-yscrollcommand {.vpane.files.workdir.sy set} \
 +	-state disabled
 +${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
 +${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
 +pack .vpane.files.workdir.title -side top -fill x
 +pack .vpane.files.workdir.sx -side bottom -fill x
 +pack .vpane.files.workdir.sy -side right -fill y
 +pack $ui_workdir -side left -fill both -expand 1
 +
 +.vpane.files add .vpane.files.workdir
 +.vpane.files add .vpane.files.index
 +if {!$use_ttk} {
 +	.vpane.files paneconfigure .vpane.files.workdir -sticky news
 +	.vpane.files paneconfigure .vpane.files.index -sticky news
 +}
 +
 +foreach i [list $ui_index $ui_workdir] {
 +	rmsel_tag $i
 +	$i tag conf in_diff -background [$i tag cget in_sel -background]
 +}
 +unset i
 +
 +# -- Diff and Commit Area
 +#
 +${NS}::frame .vpane.lower -height 300 -width 400
 +${NS}::frame .vpane.lower.commarea
 +${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
 +pack .vpane.lower.diff -fill both -expand 1
 +pack .vpane.lower.commarea -side bottom -fill x
 +.vpane add .vpane.lower
 +if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
 +
 +# -- Commit Area Buttons
 +#
 +${NS}::frame .vpane.lower.commarea.buttons
 +${NS}::label .vpane.lower.commarea.buttons.l -text {} \
 +	-anchor w \
 +	-justify left
 +pack .vpane.lower.commarea.buttons.l -side top -fill x
 +pack .vpane.lower.commarea.buttons -side left -fill y
 +
 +${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
 +	-command ui_do_rescan
 +pack .vpane.lower.commarea.buttons.rescan -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.rescan conf -state}
 +
 +${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
 +	-command do_add_all
 +pack .vpane.lower.commarea.buttons.incall -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.incall conf -state}
 +
 +if {![is_enabled nocommitmsg]} {
 +	${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
 +		-command do_signoff
 +	pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 +}
 +
 +${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
 +	-command do_commit
 +pack .vpane.lower.commarea.buttons.commit -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.commit conf -state}
 +
 +if {![is_enabled nocommit]} {
 +	${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
 +		-command do_push_anywhere
 +	pack .vpane.lower.commarea.buttons.push -side top -fill x
 +}
 +
 +# -- Commit Message Buffer
 +#
 +${NS}::frame .vpane.lower.commarea.buffer
 +${NS}::frame .vpane.lower.commarea.buffer.header
 +set ui_comm .vpane.lower.commarea.buffer.t
 +set ui_coml .vpane.lower.commarea.buffer.header.l
 +
 +if {![is_enabled nocommit]} {
 +	${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
 +		-text [mc "New Commit"] \
 +		-command do_select_commit_type \
 +		-variable selected_commit_type \
 +		-value new
 +	lappend disable_on_lock \
 +		[list .vpane.lower.commarea.buffer.header.new conf -state]
 +	${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
 +		-text [mc "Amend Last Commit"] \
 +		-command do_select_commit_type \
 +		-variable selected_commit_type \
 +		-value amend
 +	lappend disable_on_lock \
 +		[list .vpane.lower.commarea.buffer.header.amend conf -state]
 +}
 +
 +${NS}::label $ui_coml \
 +	-anchor w \
 +	-justify left
 +proc trace_commit_type {varname args} {
 +	global ui_coml commit_type
 +	switch -glob -- $commit_type {
 +	initial       {set txt [mc "Initial Commit Message:"]}
 +	amend         {set txt [mc "Amended Commit Message:"]}
 +	amend-initial {set txt [mc "Amended Initial Commit Message:"]}
 +	amend-merge   {set txt [mc "Amended Merge Commit Message:"]}
 +	merge         {set txt [mc "Merge Commit Message:"]}
 +	*             {set txt [mc "Commit Message:"]}
 +	}
 +	$ui_coml conf -text $txt
 +}
 +trace add variable commit_type write trace_commit_type
 +pack $ui_coml -side left -fill x
 +
 +if {![is_enabled nocommit]} {
 +	pack .vpane.lower.commarea.buffer.header.amend -side right
 +	pack .vpane.lower.commarea.buffer.header.new -side right
 +}
 +
 +text $ui_comm -background white -foreground black \
 +	-borderwidth 1 \
 +	-undo true \
 +	-maxundo 20 \
 +	-autoseparators true \
 +	-relief sunken \
 +	-width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
 +	-font font_diff \
 +	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 +${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
 +	-command [list $ui_comm yview]
 +pack .vpane.lower.commarea.buffer.header -side top -fill x
 +pack .vpane.lower.commarea.buffer.sby -side right -fill y
 +pack $ui_comm -side left -fill y
 +pack .vpane.lower.commarea.buffer -side left -fill y
 +
 +# -- Commit Message Buffer Context Menu
 +#
 +set ctxm .vpane.lower.commarea.buffer.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +	-label [mc Cut] \
 +	-command {tk_textCut $ui_comm}
 +$ctxm add command \
 +	-label [mc Copy] \
 +	-command {tk_textCopy $ui_comm}
 +$ctxm add command \
 +	-label [mc Paste] \
 +	-command {tk_textPaste $ui_comm}
 +$ctxm add command \
 +	-label [mc Delete] \
 +	-command {catch {$ui_comm delete sel.first sel.last}}
 +$ctxm add separator
 +$ctxm add command \
 +	-label [mc "Select All"] \
 +	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
 +$ctxm add command \
 +	-label [mc "Copy All"] \
 +	-command {
 +		$ui_comm tag add sel 0.0 end
 +		tk_textCopy $ui_comm
 +		$ui_comm tag remove sel 0.0 end
 +	}
 +$ctxm add separator
 +$ctxm add command \
 +	-label [mc "Sign Off"] \
 +	-command do_signoff
 +set ui_comm_ctxm $ctxm
 +
 +# -- Diff Header
 +#
 +proc trace_current_diff_path {varname args} {
 +	global current_diff_path diff_actions file_states
 +	if {$current_diff_path eq {}} {
 +		set s {}
 +		set f {}
 +		set p {}
 +		set o disabled
 +	} else {
 +		set p $current_diff_path
 +		set s [mapdesc [lindex $file_states($p) 0] $p]
 +		set f [mc "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
 +	}
 +}
 +trace add variable current_diff_path write trace_current_diff_path
 +
 +gold_frame .vpane.lower.diff.header
 +tlabel .vpane.lower.diff.header.status \
 +	-background gold \
 +	-foreground black \
 +	-width $max_status_desc \
 +	-anchor w \
 +	-justify left
 +tlabel .vpane.lower.diff.header.file \
 +	-background gold \
 +	-foreground black \
 +	-anchor w \
 +	-justify left
 +tlabel .vpane.lower.diff.header.path \
 +	-background gold \
 +	-foreground black \
 +	-anchor w \
 +	-justify left
 +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 [mc Copy] \
 +	-command {
 +		clipboard clear
 +		clipboard append \
 +			-format STRING \
 +			-type STRING \
 +			-- $current_diff_path
 +	}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
 +
 +# -- Diff Body
 +#
 +${NS}::frame .vpane.lower.diff.body
 +set ui_diff .vpane.lower.diff.body.t
 +text $ui_diff -background white -foreground black \
 +	-borderwidth 0 \
 +	-width 80 -height 5 -wrap none \
 +	-font font_diff \
 +	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
 +	-yscrollcommand {.vpane.lower.diff.body.sby set} \
 +	-state disabled
 +${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
 +	-command [list $ui_diff xview]
 +${NS}::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
 +
 +$ui_diff tag conf d_cr -elide true
 +$ui_diff tag conf d_@ -foreground blue -font font_diffbold
 +$ui_diff tag conf d_+ -foreground {#00a000}
 +$ui_diff tag conf d_- -foreground red
 +
 +$ui_diff tag conf d_++ -foreground {#00a000}
 +$ui_diff tag conf d_-- -foreground red
 +$ui_diff tag conf d_+s \
 +	-foreground {#00a000} \
 +	-background {#e2effa}
 +$ui_diff tag conf d_-s \
 +	-foreground red \
 +	-background {#e2effa}
 +$ui_diff tag conf d_s+ \
 +	-foreground {#00a000} \
 +	-background ivory1
 +$ui_diff tag conf d_s- \
 +	-foreground red \
 +	-background ivory1
 +
 +$ui_diff tag conf d<<<<<<< \
 +	-foreground orange \
 +	-font font_diffbold
 +$ui_diff tag conf d======= \
 +	-foreground orange \
 +	-font font_diffbold
 +$ui_diff tag conf d>>>>>>> \
 +	-foreground orange \
 +	-font font_diffbold
 +
 +$ui_diff tag raise sel
 +
 +# -- Diff Body Context Menu
 +#
 +
 +proc create_common_diff_popup {ctxm} {
 +	$ctxm add command \
 +		-label [mc Refresh] \
 +		-command reshow_diff
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add command \
 +		-label [mc Copy] \
 +		-command {tk_textCopy $ui_diff}
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add command \
 +		-label [mc "Select All"] \
 +		-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add command \
 +		-label [mc "Copy All"] \
 +		-command {
 +			$ui_diff tag add sel 0.0 end
 +			tk_textCopy $ui_diff
 +			$ui_diff tag remove sel 0.0 end
 +		}
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add separator
 +	$ctxm add command \
 +		-label [mc "Decrease Font Size"] \
 +		-command {incr_font_size font_diff -1}
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add command \
 +		-label [mc "Increase Font Size"] \
 +		-command {incr_font_size font_diff 1}
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add separator
 +	set emenu $ctxm.enc
 +	menu $emenu
 +	build_encoding_menu $emenu [list force_diff_encoding]
 +	$ctxm add cascade \
 +		-label [mc "Encoding"] \
 +		-menu $emenu
 +	lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +	$ctxm add separator
 +	$ctxm add command -label [mc "Options..."] \
 +		-command do_options
 +}
 +
 +set ctxm .vpane.lower.diff.body.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +	-label [mc "Apply/Reverse Hunk"] \
 +	-command {apply_hunk $cursorX $cursorY}
 +set ui_diff_applyhunk [$ctxm index last]
 +lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
 +$ctxm add command \
 +	-label [mc "Apply/Reverse Line"] \
 +	-command {apply_range_or_line $cursorX $cursorY; do_rescan}
 +set ui_diff_applyline [$ctxm index last]
 +lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
 +$ctxm add separator
 +$ctxm add command \
 +	-label [mc "Show Less Context"] \
 +	-command show_less_context
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc "Show More Context"] \
 +	-command show_more_context
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add separator
 +create_common_diff_popup $ctxm
 +
 +set ctxmmg .vpane.lower.diff.body.ctxmmg
 +menu $ctxmmg -tearoff 0
 +$ctxmmg add command \
 +	-label [mc "Run Merge Tool"] \
 +	-command {merge_resolve_tool}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add separator
 +$ctxmmg add command \
 +	-label [mc "Use Remote Version"] \
 +	-command {merge_resolve_one 3}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add command \
 +	-label [mc "Use Local Version"] \
 +	-command {merge_resolve_one 2}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add command \
 +	-label [mc "Revert To Base"] \
 +	-command {merge_resolve_one 1}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add separator
 +$ctxmmg add command \
 +	-label [mc "Show Less Context"] \
 +	-command show_less_context
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add command \
 +	-label [mc "Show More Context"] \
 +	-command show_more_context
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add separator
 +create_common_diff_popup $ctxmmg
 +
 +set ctxmsm .vpane.lower.diff.body.ctxmsm
 +menu $ctxmsm -tearoff 0
 +$ctxmsm add command \
 +	-label [mc "Visualize These Changes In The Submodule"] \
 +	-command {do_gitk -- true}
 +lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
 +$ctxmsm add command \
 +	-label [mc "Visualize Current Branch History In The Submodule"] \
 +	-command {do_gitk {} true}
 +lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
 +$ctxmsm add command \
 +	-label [mc "Visualize All Branch History In The Submodule"] \
 +	-command {do_gitk --all true}
 +lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
 +$ctxmsm add separator
 +$ctxmsm add command \
 +	-label [mc "Start git gui In The Submodule"] \
 +	-command {do_git_gui}
 +lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
 +$ctxmsm add separator
 +create_common_diff_popup $ctxmsm
 +
++proc has_textconv {path} {
++	if {[is_config_false gui.textconv]} {
++		return 0
++	}
++	set filter [gitattr $path diff set]
++	set textconv [get_config [join [list diff $filter textconv] .]]
++	if {$filter ne {set} && $textconv ne {}} {
++		return 1
++	} else {
++		return 0
++	}
++}
++
 +proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
 +	global current_diff_path file_states
 +	set ::cursorX $x
 +	set ::cursorY $y
 +	if {[info exists file_states($current_diff_path)]} {
 +		set state [lindex $file_states($current_diff_path) 0]
 +	} else {
 +		set state {__}
 +	}
 +	if {[string first {U} $state] >= 0} {
 +		tk_popup $ctxmmg $X $Y
 +	} elseif {$::is_submodule_diff} {
 +		tk_popup $ctxmsm $X $Y
 +	} else {
 +		set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
 +		if {$::ui_index eq $::current_diff_side} {
 +			set l [mc "Unstage Hunk From Commit"]
 +			if {$has_range} {
 +				set t [mc "Unstage Lines From Commit"]
 +			} else {
 +				set t [mc "Unstage Line From Commit"]
 +			}
 +		} else {
 +			set l [mc "Stage Hunk For Commit"]
 +			if {$has_range} {
 +				set t [mc "Stage Lines For Commit"]
 +			} else {
 +				set t [mc "Stage Line For Commit"]
 +			}
 +		}
 +		if {$::is_3way_diff
 +			|| $current_diff_path eq {}
 +			|| {__} eq $state
 +			|| {_O} eq $state
 +			|| {_T} eq $state
- 			|| {T_} eq $state} {
++			|| {T_} eq $state
++			|| [has_textconv $current_diff_path]} {
 +			set s disabled
 +		} else {
 +			set s normal
 +		}
 +		$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
 +		$ctxm entryconf $::ui_diff_applyline -state $s -label $t
 +		tk_popup $ctxm $X $Y
 +	}
 +}
 +bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
 +
 +# -- Status Bar
 +#
 +set main_status [::status_bar::new .status]
 +pack .status -anchor w -side bottom -fill x
 +$main_status show [mc "Initializing..."]
 +
 +# -- Load geometry
 +#
- catch {
- set gm $repo_config(gui.geometry)
- wm geometry . [lindex $gm 0]
- if {$use_ttk} {
- 	.vpane sashpos 0 [lindex $gm 1]
- 	.vpane.files sashpos 0 [lindex $gm 2]
- } else {
- 	.vpane sash place 0 \
- 		[lindex $gm 1] \
- 		[lindex [.vpane sash coord 0] 1]
- 	.vpane.files sash place 0 \
- 		[lindex [.vpane.files sash coord 0] 0] \
- 		[lindex $gm 2]
++proc on_ttk_pane_mapped {w pane pos} {
++	bind $w <Map> {}
++	after 0 [list after idle [list $w sashpos $pane $pos]]
++}
++proc on_tk_pane_mapped {w pane x y} {
++	bind $w <Map> {}
++	after 0 [list after idle [list $w sash place $pane $x $y]]
++}
++proc on_application_mapped {} {
++	global repo_config use_ttk
++	bind . <Map> {}
++	set gm $repo_config(gui.geometry)
++	if {$use_ttk} {
++		bind .vpane <Map> \
++		    [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
++		bind .vpane.files <Map> \
++		    [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
++	} else {
++		bind .vpane <Map> \
++		    [list on_tk_pane_mapped %W 0 \
++			 [lindex $gm 1] \
++			 [lindex [.vpane sash coord 0] 1]]
++		bind .vpane.files <Map> \
++		    [list on_tk_pane_mapped %W 0 \
++			 [lindex [.vpane.files sash coord 0] 0] \
++			 [lindex $gm 2]]
++	}
++	wm geometry . [lindex $gm 0]
 +}
- unset gm
++if {[info exists repo_config(gui.geometry)]} {
++	bind . <Map> [list on_application_mapped]
++	wm geometry . [lindex $repo_config(gui.geometry) 0]
 +}
 +
 +# -- Load window state
 +#
- catch {
- set gws $repo_config(gui.wmstate)
- wm state . $gws
- unset gws
++if {[info exists repo_config(gui.wmstate)]} {
++	catch {wm state . $repo_config(gui.wmstate)}
 +}
 +
 +# -- Key Bindings
 +#
 +bind $ui_comm <$M1B-Key-Return> {do_commit;break}
 +bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
 +bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
 +bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
 +bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
 +bind $ui_comm <$M1B-Key-i> {do_add_all;break}
 +bind $ui_comm <$M1B-Key-I> {do_add_all;break}
 +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_comm <$M1B-Key-minus> {show_less_context;break}
 +bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
 +bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
 +bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
 +bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;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}
 +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}
 +bind $ui_diff <Key-k>         {catch {%W yview scroll -1 units};break}
 +bind $ui_diff <Key-j>         {catch {%W yview scroll  1 units};break}
 +bind $ui_diff <Key-h>         {catch {%W xview scroll -1 units};break}
 +bind $ui_diff <Key-l>         {catch {%W xview scroll  1 units};break}
 +bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
 +bind $ui_diff <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 +bind $ui_diff <Button-1>   {focus %W}
 +
 +if {[is_enabled branch]} {
 +	bind . <$M1B-Key-n> branch_create::dialog
 +	bind . <$M1B-Key-N> branch_create::dialog
 +	bind . <$M1B-Key-o> branch_checkout::dialog
 +	bind . <$M1B-Key-O> branch_checkout::dialog
 +	bind . <$M1B-Key-m> merge::dialog
 +	bind . <$M1B-Key-M> merge::dialog
 +}
 +if {[is_enabled transport]} {
 +	bind . <$M1B-Key-p> do_push_anywhere
 +	bind . <$M1B-Key-P> do_push_anywhere
 +}
 +
 +bind .   <Key-F5>     ui_do_rescan
 +bind .   <$M1B-Key-r> ui_do_rescan
 +bind .   <$M1B-Key-R> ui_do_rescan
 +bind .   <$M1B-Key-s> do_signoff
 +bind .   <$M1B-Key-S> do_signoff
 +bind .   <$M1B-Key-t> do_add_selection
 +bind .   <$M1B-Key-T> do_add_selection
 +bind .   <$M1B-Key-j> do_revert_selection
 +bind .   <$M1B-Key-J> do_revert_selection
 +bind .   <$M1B-Key-i> do_add_all
 +bind .   <$M1B-Key-I> do_add_all
 +bind .   <$M1B-Key-minus> {show_less_context;break}
 +bind .   <$M1B-Key-KP_Subtract> {show_less_context;break}
 +bind .   <$M1B-Key-equal> {show_more_context;break}
 +bind .   <$M1B-Key-plus> {show_more_context;break}
 +bind .   <$M1B-Key-KP_Add> {show_more_context;break}
 +bind .   <$M1B-Key-Return> do_commit
 +foreach i [list $ui_index $ui_workdir] {
 +	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"
 +}
 +unset i
 +
 +set file_lists($ui_index) [list]
 +set file_lists($ui_workdir) [list]
 +
 +wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
 +focus -force $ui_comm
 +
 +# -- 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.
 +#
 +if {[is_Cygwin]} {
 +	set ignored_env 0
 +	set suggest_user {}
 +	set msg [mc "Possible environment issues exist.
 +
 +The following environment variables are probably
 +going to be ignored by any Git subprocess run
 +by %s:
 +
 +" [appname]]
 +	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_(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 [mc "
 +This is due to a known issue with the
 +Tcl binary distributed by Cygwin."]
 +
 +		if {$suggest_user ne {}} {
 +			append msg [mc "
 +
 +A good replacement for %s
 +is placing values for the user.name and
 +user.email settings into your personal
 +~/.gitconfig file.
 +" $suggest_user]
 +		}
 +		warn_popup $msg
 +	}
 +	unset ignored_env msg suggest_user name
 +}
 +
 +# -- Only initialize complex UI if we are going to stay running.
 +#
 +if {[is_enabled transport]} {
 +	load_all_remotes
 +
 +	set n [.mbar.remote index end]
 +	populate_remotes_menu
 +	set n [expr {[.mbar.remote index end] - $n}]
 +	if {$n > 0} {
 +		if {[.mbar.remote type 0] eq "tearoff"} { incr n }
 +		.mbar.remote insert $n separator
 +	}
 +	unset n
 +}
 +
 +if {[winfo exists $ui_comm]} {
 +	set GITGUI_BCK_exists [load_message GITGUI_BCK]
 +
 +	# -- If both our backup and message files exist use the
 +	#    newer of the two files to initialize the buffer.
 +	#
 +	if {$GITGUI_BCK_exists} {
 +		set m [gitdir GITGUI_MSG]
 +		if {[file isfile $m]} {
 +			if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
 +				catch {file delete [gitdir GITGUI_MSG]}
 +			} else {
 +				$ui_comm delete 0.0 end
 +				$ui_comm edit reset
 +				$ui_comm edit modified false
 +				catch {file delete [gitdir GITGUI_BCK]}
 +				set GITGUI_BCK_exists 0
 +			}
 +		}
 +		unset m
 +	}
 +
 +	proc backup_commit_buffer {} {
 +		global ui_comm GITGUI_BCK_exists
 +
 +		set m [$ui_comm edit modified]
 +		if {$m || $GITGUI_BCK_exists} {
 +			set msg [string trim [$ui_comm get 0.0 end]]
 +			regsub -all -line {[ \r\t]+$} $msg {} msg
 +
 +			if {$msg eq {}} {
 +				if {$GITGUI_BCK_exists} {
 +					catch {file delete [gitdir GITGUI_BCK]}
 +					set GITGUI_BCK_exists 0
 +				}
 +			} elseif {$m} {
 +				catch {
 +					set fd [open [gitdir GITGUI_BCK] w]
 +					puts -nonewline $fd $msg
 +					close $fd
 +					set GITGUI_BCK_exists 1
 +				}
 +			}
 +
 +			$ui_comm edit modified false
 +		}
 +
 +		set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
 +	}
 +
 +	backup_commit_buffer
 +
 +	# -- If the user has aspell available we can drive it
 +	#    in pipe mode to spellcheck the commit message.
 +	#
 +	set spell_cmd [list |]
 +	set spell_dict [get_config gui.spellingdictionary]
 +	lappend spell_cmd aspell
 +	if {$spell_dict ne {}} {
 +		lappend spell_cmd --master=$spell_dict
 +	}
 +	lappend spell_cmd --mode=none
 +	lappend spell_cmd --encoding=utf-8
 +	lappend spell_cmd pipe
 +	if {$spell_dict eq {none}
 +	 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
 +		bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
 +	} else {
 +		set ui_comm_spell [spellcheck::init \
 +			$spell_fd \
 +			$ui_comm \
 +			$ui_comm_ctxm \
 +		]
 +	}
 +	unset -nocomplain spell_cmd spell_fd spell_err spell_dict
 +}
 +
 +lock_index begin-read
 +if {![winfo ismapped .]} {
 +	wm deiconify .
 +}
 +after 1 {
 +	if {[is_enabled initialamend]} {
 +		force_amend
 +	} else {
 +		do_rescan
 +	}
 +
 +	if {[is_enabled nocommitmsg]} {
 +		$ui_comm configure -state disabled -background gray
 +	}
 +}
 +if {[is_enabled multicommit]} {
 +	after 1000 hint_gc
 +}
 +if {[is_enabled retcode]} {
 +	bind . <Destroy> {+terminate_me %W}
 +}
 +if {$picked && [is_config_true gui.autoexplore]} {
 +	do_explore
 +}
 +
 +# Local variables:
 +# mode: tcl
 +# indent-tabs-mode: t
 +# tab-width: 4
 +# End:
diff --cc git-gui/lib/blame.tcl
index 786b50b8c,000000000..2137ec968
mode 100644,000000..100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@@ -1,1315 -1,0 +1,1332 @@@
 +# git-gui blame viewer
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +class blame {
 +
 +image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
 +
 +# Persistant data (survives loads)
 +#
 +field history {}; # viewer history: {commit path}
 +field header    ; # array commit,key -> header field
 +
 +# Tk UI control paths
 +#
 +field w          ; # top window in this viewer
 +field w_back     ; # our back button
 +field w_path     ; # label showing the current file path
 +field w_columns  ; # list of all column widgets in the viewer
 +field w_line     ; # text column: all line numbers
 +field w_amov     ; # text column: annotations + move tracking
 +field w_asim     ; # text column: annotations (simple computation)
 +field w_file     ; # text column: actual file data
 +field w_cviewer  ; # pane showing commit message
 +field finder     ; # find mini-dialog frame
 +field status     ; # status mega-widget instance
 +field old_height ; # last known height of $w.file_pane
 +
 +
 +# Tk UI colors
 +#
 +variable active_color #c0edc5
 +variable group_colors {
 +	#d6d6d6
 +	#e1e1e1
 +	#ececec
 +}
 +
 +# Current blame data; cleared/reset on each load
 +#
 +field commit               ; # input commit to blame
 +field path                 ; # input filename to view in $commit
 +
 +field current_fd        {} ; # background process running
 +field highlight_line    -1 ; # current line selected
 +field highlight_column  {} ; # current commit column selected
 +field highlight_commit  {} ; # sha1 of commit selected
 +
 +field total_lines       0  ; # total length of file
 +field blame_lines       0  ; # number of lines computed
 +field amov_data            ; # list of {commit origfile origline}
 +field asim_data            ; # list of {commit origfile origline}
 +
 +field r_commit             ; # commit currently being parsed
 +field r_orig_line          ; # original line number
 +field r_final_line         ; # final line number
 +field r_line_count         ; # lines in this region
 +
 +field tooltip_wm        {} ; # Current tooltip toplevel, if open
 +field tooltip_t         {} ; # Text widget in $tooltip_wm
 +field tooltip_timer     {} ; # Current timer event for our tooltip
 +field tooltip_commit    {} ; # Commit(s) in tooltip
 +
 +constructor new {i_commit i_path i_jump} {
 +	global cursor_ptr M1B M1T have_tk85 use_ttk NS
 +	variable active_color
 +	variable group_colors
 +
 +	set commit $i_commit
 +	set path   $i_path
 +
 +	make_toplevel top w
 +	wm title $top [append "[appname] ([reponame]): " [mc "File Viewer"]]
 +
 +	set font_w [font measure font_diff "0"]
 +
 +	gold_frame $w.header
 +	tlabel $w.header.commit_l \
 +		-text [mc "Commit:"] \
 +		-background gold \
 +		-foreground black \
 +		-anchor w \
 +		-justify left
 +	set w_back $w.header.commit_b
 +	tlabel $w_back \
 +		-image ::blame::img_back_arrow \
 +		-borderwidth 0 \
 +		-relief flat \
 +		-state disabled \
 +		-background gold \
 +		-foreground black \
 +		-activebackground gold
 +	bind $w_back <Button-1> "
 +		if {\[$w_back cget -state\] eq {normal}} {
 +			[cb _history_menu]
 +		}
 +		"
 +	tlabel $w.header.commit \
 +		-textvariable @commit \
 +		-background gold \
 +		-foreground black \
 +		-anchor w \
 +		-justify left
 +	tlabel $w.header.path_l \
 +		-text [mc "File:"] \
 +		-background gold \
 +		-foreground black \
 +		-anchor w \
 +		-justify left
 +	set w_path $w.header.path
 +	tlabel $w_path \
 +		-background gold \
 +		-foreground black \
 +		-anchor w \
 +		-justify left
 +	pack $w.header.commit_l -side left
 +	pack $w_back -side left
 +	pack $w.header.commit -side left
 +	pack $w_path -fill x -side right
 +	pack $w.header.path_l -side right
 +
 +	panedwindow $w.file_pane -orient vertical -borderwidth 0 -sashwidth 3
 +	frame $w.file_pane.out -relief flat -borderwidth 1
 +	frame $w.file_pane.cm -relief sunken -borderwidth 1
 +	$w.file_pane add $w.file_pane.out \
 +		-sticky nsew \
 +		-minsize 100 \
 +		-height 100 \
 +		-width 100
 +	$w.file_pane add $w.file_pane.cm \
 +		-sticky nsew \
 +		-minsize 25 \
 +		-height 25 \
 +		-width 100
 +
 +	set w_line $w.file_pane.out.linenumber_t
 +	text $w_line \
 +		-takefocus 0 \
 +		-highlightthickness 0 \
 +		-padx 0 -pady 0 \
 +		-background white \
 +		-foreground black \
 +		-borderwidth 0 \
 +		-state disabled \
 +		-wrap none \
 +		-height 40 \
 +		-width 6 \
 +		-font font_diff
 +	$w_line tag conf linenumber -justify right -rmargin 5
 +
 +	set w_amov $w.file_pane.out.amove_t
 +	text $w_amov \
 +		-takefocus 0 \
 +		-highlightthickness 0 \
 +		-padx 0 -pady 0 \
 +		-background white \
 +		-foreground black \
 +		-borderwidth 0 \
 +		-state disabled \
 +		-wrap none \
 +		-height 40 \
 +		-width 5 \
 +		-font font_diff
 +	$w_amov tag conf author_abbr -justify right -rmargin 5
 +	$w_amov tag conf curr_commit
 +	$w_amov tag conf prior_commit -foreground blue -underline 1
 +	$w_amov tag bind prior_commit \
 +		<Button-1> \
 +		"[cb _load_commit $w_amov @amov_data @%x,%y];break"
 +
 +	set w_asim $w.file_pane.out.asimple_t
 +	text $w_asim \
 +		-takefocus 0 \
 +		-highlightthickness 0 \
 +		-padx 0 -pady 0 \
 +		-background white \
 +		-foreground black \
 +		-borderwidth 0 \
 +		-state disabled \
 +		-wrap none \
 +		-height 40 \
 +		-width 4 \
 +		-font font_diff
 +	$w_asim tag conf author_abbr -justify right
 +	$w_asim tag conf curr_commit
 +	$w_asim tag conf prior_commit -foreground blue -underline 1
 +	$w_asim tag bind prior_commit \
 +		<Button-1> \
 +		"[cb _load_commit $w_asim @asim_data @%x,%y];break"
 +
 +	set w_file $w.file_pane.out.file_t
 +	text $w_file \
 +		-takefocus 0 \
 +		-highlightthickness 0 \
 +		-padx 0 -pady 0 \
 +		-background white \
 +		-foreground black \
 +		-borderwidth 0 \
 +		-state disabled \
 +		-wrap none \
 +		-height 40 \
 +		-width 80 \
 +		-xscrollcommand [list $w.file_pane.out.sbx set] \
 +		-font font_diff
 +	if {$have_tk85} {
 +		$w_file configure -inactiveselectbackground darkblue
 +	}
 +	$w_file tag conf found \
 +		-background yellow
 +
 +	set w_columns [list $w_amov $w_asim $w_line $w_file]
 +
 +	${NS}::scrollbar $w.file_pane.out.sbx \
 +		-orient h \
 +		-command [list $w_file xview]
 +	${NS}::scrollbar $w.file_pane.out.sby \
 +		-orient v \
 +		-command [list scrollbar2many $w_columns yview]
 +	eval grid $w_columns $w.file_pane.out.sby -sticky nsew
 +	grid conf \
 +		$w.file_pane.out.sbx \
 +		-column [expr {[llength $w_columns] - 1}] \
 +		-sticky we
 +	grid columnconfigure \
 +		$w.file_pane.out \
 +		[expr {[llength $w_columns] - 1}] \
 +		-weight 1
 +	grid rowconfigure $w.file_pane.out 0 -weight 1
 +
 +	set finder [::searchbar::new \
 +		$w.file_pane.out.ff $w_file \
 +		-column [expr {[llength $w_columns] - 1}] \
 +		]
 +
 +	set w_cviewer $w.file_pane.cm.t
 +	text $w_cviewer \
 +		-background white \
 +		-foreground black \
 +		-borderwidth 0 \
 +		-state disabled \
 +		-wrap none \
 +		-height 10 \
 +		-width 80 \
 +		-xscrollcommand [list $w.file_pane.cm.sbx set] \
 +		-yscrollcommand [list $w.file_pane.cm.sby set] \
 +		-font font_diff
 +	$w_cviewer tag conf still_loading \
 +		-font font_uiitalic \
 +		-justify center
 +	$w_cviewer tag conf header_key \
 +		-tabs {3c} \
 +		-background $active_color \
 +		-font font_uibold
 +	$w_cviewer tag conf header_val \
 +		-background $active_color \
 +		-font font_ui
 +	$w_cviewer tag raise sel
 +	${NS}::scrollbar $w.file_pane.cm.sbx \
 +		-orient h \
 +		-command [list $w_cviewer xview]
 +	${NS}::scrollbar $w.file_pane.cm.sby \
 +		-orient v \
 +		-command [list $w_cviewer yview]
 +	pack $w.file_pane.cm.sby -side right -fill y
 +	pack $w.file_pane.cm.sbx -side bottom -fill x
 +	pack $w_cviewer -expand 1 -fill both
 +
 +	set status [::status_bar::new $w.status]
 +
 +	menu $w.ctxm -tearoff 0
 +	$w.ctxm add command \
 +		-label [mc "Copy Commit"] \
 +		-command [cb _copycommit]
 +	$w.ctxm add separator
 +	$w.ctxm add command \
 +		-label [mc "Find Text..."] \
 +		-accelerator F7 \
 +		-command [list searchbar::show $finder]
 +	menu $w.ctxm.enc
 +	build_encoding_menu $w.ctxm.enc [cb _setencoding]
 +	$w.ctxm add cascade \
 +		-label [mc "Encoding"] \
 +		-menu $w.ctxm.enc
 +	$w.ctxm add command \
 +		-label [mc "Do Full Copy Detection"] \
 +		-command [cb _fullcopyblame]
 +	$w.ctxm add separator
 +	$w.ctxm add command \
 +		-label [mc "Show History Context"] \
 +		-command [cb _gitkcommit]
 +	$w.ctxm add command \
 +		-label [mc "Blame Parent Commit"] \
 +		-command [cb _blameparent]
 +
 +	foreach i $w_columns {
 +		for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +			$i tag conf color$g -background [lindex $group_colors $g]
 +		}
 +
 +		if {$i eq $w_file} {
 +			$w_file tag raise found
 +		}
 +		$i tag raise sel
 +
 +		$i conf -cursor $cursor_ptr
 +		$i conf -yscrollcommand \
 +			"[list ::searchbar::scrolled $finder]
 +			 [list many2scrollbar $w_columns yview $w.file_pane.out.sby]"
 +		bind $i <Button-1> "
 +			[cb _hide_tooltip]
 +			[cb _click $i @%x,%y]
 +			focus $i
 +		"
 +		bind $i <Any-Motion>  [cb _show_tooltip $i @%x,%y]
 +		bind $i <Any-Enter>   [cb _hide_tooltip]
 +		bind $i <Any-Leave>   [cb _hide_tooltip]
 +		bind_button3 $i "
 +			[cb _hide_tooltip]
 +			set cursorX %x
 +			set cursorY %y
 +			set cursorW %W
 +			tk_popup $w.ctxm %X %Y
 +		"
 +		bind $i <Shift-Tab> "[list focus $w_cviewer];break"
 +		bind $i <Tab>       "[cb _focus_search $w_cviewer];break"
 +	}
 +
 +	foreach i [concat $w_columns $w_cviewer] {
 +		bind $i <Key-Up>        {catch {%W yview scroll -1 units};break}
 +		bind $i <Key-Down>      {catch {%W yview scroll  1 units};break}
 +		bind $i <Key-Left>      {catch {%W xview scroll -1 units};break}
 +		bind $i <Key-Right>     {catch {%W xview scroll  1 units};break}
 +		bind $i <Key-k>         {catch {%W yview scroll -1 units};break}
 +		bind $i <Key-j>         {catch {%W yview scroll  1 units};break}
 +		bind $i <Key-h>         {catch {%W xview scroll -1 units};break}
 +		bind $i <Key-l>         {catch {%W xview scroll  1 units};break}
 +		bind $i <Control-Key-b> {catch {%W yview scroll -1 pages};break}
 +		bind $i <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 +	}
 +
 +	bind $w_cviewer <Shift-Tab> "[cb _focus_search $w_file];break"
 +	bind $w_cviewer <Tab>       "[list focus $w_file];break"
 +	bind $w_cviewer <Button-1>   [list focus $w_cviewer]
 +	bind $w_file    <Visibility> [cb _focus_search $w_file]
 +	bind $top       <F7>         [list searchbar::show $finder]
 +	bind $top       <Escape>     [list searchbar::hide $finder]
 +	bind $top       <F3>         [list searchbar::find_next $finder]
 +	bind $top       <Shift-F3>   [list searchbar::find_prev $finder]
 +	catch { bind $top <Shift-Key-XF86_Switch_VT_3> [list searchbar::find_prev $finder] }
 +
 +	grid configure $w.header -sticky ew
 +	grid configure $w.file_pane -sticky nsew
 +	grid configure $w.status -sticky ew
 +	grid columnconfigure $top 0 -weight 1
 +	grid rowconfigure $top 0 -weight 0
 +	grid rowconfigure $top 1 -weight 1
 +	grid rowconfigure $top 2 -weight 0
 +
 +	set req_w [winfo reqwidth  $top]
 +	set req_h [winfo reqheight $top]
 +	set scr_w [expr {[winfo screenwidth $top] - 40}]
 +	set scr_h [expr {[winfo screenheight $top] - 120}]
 +	set opt_w [expr {$font_w * (80 + 5*3 + 3)}]
 +	if {$req_w < $opt_w} {set req_w $opt_w}
 +	if {$req_w > $scr_w} {set req_w $scr_w}
 +	set opt_h [expr {$req_w*4/3}]
 +	if {$req_h < $scr_h} {set req_h $scr_h}
 +	if {$req_h > $opt_h} {set req_h $opt_h}
 +	set g "${req_w}x${req_h}"
 +	wm geometry $top $g
 +	update
 +
 +	set old_height [winfo height $w.file_pane]
 +	$w.file_pane sash place 0 \
 +		[lindex [$w.file_pane sash coord 0] 0] \
 +		[expr {int($old_height * 0.80)}]
 +	bind $w.file_pane <Configure> \
 +	"if {{$w.file_pane} eq {%W}} {[cb _resize %h]}"
 +
 +	wm protocol $top WM_DELETE_WINDOW "destroy $top"
 +	bind $top <Destroy> [cb _handle_destroy %W]
 +
 +	_load $this $i_jump
 +}
 +
 +method _focus_search {win} {
 +	if {[searchbar::visible $finder]} {
 +		focus [searchbar::editor $finder]
 +	} else {
 +		focus $win
 +	}
 +}
 +
 +method _handle_destroy {win} {
 +	if {$win eq $w} {
 +		_kill $this
 +		delete_this
 +	}
 +}
 +
 +method _kill {} {
 +	if {$current_fd ne {}} {
 +		kill_file_process $current_fd
 +		catch {close $current_fd}
 +		set current_fd {}
 +	}
 +}
 +
 +method _load {jump} {
 +	variable group_colors
 +
 +	_hide_tooltip $this
 +
 +	if {$total_lines != 0 || $current_fd ne {}} {
 +		_kill $this
 +
 +		foreach i $w_columns {
 +			$i conf -state normal
 +			$i delete 0.0 end
 +			foreach g [$i tag names] {
 +				if {[regexp {^g[0-9a-f]{40}$} $g]} {
 +					$i tag delete $g
 +				}
 +			}
 +			$i conf -state disabled
 +		}
 +
 +		$w_cviewer conf -state normal
 +		$w_cviewer delete 0.0 end
 +		$w_cviewer conf -state disabled
 +
 +		set highlight_line -1
 +		set highlight_column {}
 +		set highlight_commit {}
 +		set total_lines 0
 +	}
 +
 +	if {$history eq {}} {
 +		$w_back conf -state disabled
 +	} else {
 +		$w_back conf -state normal
 +	}
 +
 +	# Index 0 is always empty.  There is never line 0 as
 +	# we use only 1 based lines, as that matches both with
 +	# git-blame output and with Tk's text widget.
 +	#
 +	set amov_data [list [list]]
 +	set asim_data [list [list]]
 +
 +	$status show [mc "Reading %s..." "$commit:[escape_path $path]"]
 +	$w_path conf -text [escape_path $path]
++
++	set do_textconv 0
++	if {![is_config_false gui.textconv] && [git-version >= 1.7.2]} {
++		set filter [gitattr $path diff set]
++		set textconv [get_config [join [list diff $filter textconv] .]]
++		if {$filter ne {set} && $textconv ne {}} {
++			set do_textconv 1
++		}
++	}
 +	if {$commit eq {}} {
- 		set fd [open $path r]
++		if {$do_textconv ne 0} {
++			set fd [open |[list $textconv $path] r]
++		} else {
++			set fd [open $path r]
++		}
 +		fconfigure $fd -eofchar {}
 +	} else {
- 		set fd [git_read cat-file blob "$commit:$path"]
++		if {$do_textconv ne 0} {
++			set fd [git_read cat-file --textconv "$commit:$path"]
++		} else {
++			set fd [git_read cat-file blob "$commit:$path"]
++		}
 +	}
 +	fconfigure $fd \
 +		-blocking 0 \
 +		-translation lf \
 +		-encoding [get_path_encoding $path]
 +	fileevent $fd readable [cb _read_file $fd $jump]
 +	set current_fd $fd
 +}
 +
 +method _history_menu {} {
 +	set m $w.backmenu
 +	if {[winfo exists $m]} {
 +		$m delete 0 end
 +	} else {
 +		menu $m -tearoff 0
 +	}
 +
 +	for {set i [expr {[llength $history] - 1}]
 +		} {$i >= 0} {incr i -1} {
 +		set e [lindex $history $i]
 +		set c [lindex $e 0]
 +		set f [lindex $e 1]
 +
 +		if {[regexp {^[0-9a-f]{40}$} $c]} {
 +			set t [string range $c 0 8]...
 +		} elseif {$c eq {}} {
 +			set t {Working Directory}
 +		} else {
 +			set t $c
 +		}
 +		if {![catch {set summary $header($c,summary)}]} {
 +			append t " $summary"
 +			if {[string length $t] > 70} {
 +				set t [string range $t 0 66]...
 +			}
 +		}
 +
 +		$m add command -label $t -command [cb _goback $i]
 +	}
 +	set X [winfo rootx $w_back]
 +	set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}]
 +	tk_popup $m $X $Y
 +}
 +
 +method _goback {i} {
 +	set dat [lindex $history $i]
 +	set history [lrange $history 0 [expr {$i - 1}]]
 +	set commit [lindex $dat 0]
 +	set path [lindex $dat 1]
 +	_load $this [lrange $dat 2 5]
 +}
 +
 +method _read_file {fd jump} {
 +	if {$fd ne $current_fd} {
 +		catch {close $fd}
 +		return
 +	}
 +
 +	foreach i $w_columns {$i conf -state normal}
 +	while {[gets $fd line] >= 0} {
 +		regsub "\r\$" $line {} line
 +		incr total_lines
 +		lappend amov_data {}
 +		lappend asim_data {}
 +
 +		if {$total_lines > 1} {
 +			foreach i $w_columns {$i insert end "\n"}
 +		}
 +
 +		$w_line insert end "$total_lines" linenumber
 +		$w_file insert end "$line"
 +	}
 +
 +	set ln_wc [expr {[string length $total_lines] + 2}]
 +	if {[$w_line cget -width] < $ln_wc} {
 +		$w_line conf -width $ln_wc
 +	}
 +
 +	foreach i $w_columns {$i conf -state disabled}
 +
 +	if {[eof $fd]} {
 +		close $fd
 +
 +		# If we don't force Tk to update the widgets *right now*
 +		# none of our jump commands will cause a change in the UI.
 +		#
 +		update
 +
 +		if {[llength $jump] == 1} {
 +			set highlight_line [lindex $jump 0]
 +			$w_file see "$highlight_line.0"
 +		} elseif {[llength $jump] == 4} {
 +			set highlight_column [lindex $jump 0]
 +			set highlight_line [lindex $jump 1]
 +			$w_file xview moveto [lindex $jump 2]
 +			$w_file yview moveto [lindex $jump 3]
 +		}
 +
 +		_exec_blame $this $w_asim @asim_data \
 +			[list] \
 +			[mc "Loading copy/move tracking annotations..."]
 +	}
 +} ifdeleted { catch {close $fd} }
 +
 +method _exec_blame {cur_w cur_d options cur_s} {
 +	lappend options --incremental --encoding=utf-8
 +	if {$commit eq {}} {
 +		lappend options --contents $path
 +	} else {
 +		lappend options $commit
 +	}
 +	lappend options -- $path
 +	set fd [eval git_read --nice blame $options]
 +	fconfigure $fd -blocking 0 -translation lf -encoding utf-8
 +	fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
 +	set current_fd $fd
 +	set blame_lines 0
 +
 +	$status start \
 +		$cur_s \
 +		[mc "lines annotated"]
 +}
 +
 +method _read_blame {fd cur_w cur_d} {
 +	upvar #0 $cur_d line_data
 +	variable group_colors
 +
 +	if {$fd ne $current_fd} {
 +		catch {close $fd}
 +		return
 +	}
 +
 +	$cur_w conf -state normal
 +	while {[gets $fd line] >= 0} {
 +		if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
 +			cmit original_line final_line line_count]} {
 +			set r_commit     $cmit
 +			set r_orig_line  $original_line
 +			set r_final_line $final_line
 +			set r_line_count $line_count
 +		} elseif {[string match {filename *} $line]} {
 +			set file [string range $line 9 end]
 +			set n    $r_line_count
 +			set lno  $r_final_line
 +			set oln  $r_orig_line
 +			set cmit $r_commit
 +
 +			if {[regexp {^0{40}$} $cmit]} {
 +				set commit_abbr work
 +				set commit_type curr_commit
 +			} elseif {$cmit eq $commit} {
 +				set commit_abbr this
 +				set commit_type curr_commit
 +			} else {
 +				set commit_type prior_commit
 +				set commit_abbr [string range $cmit 0 3]
 +			}
 +
 +			set author_abbr {}
 +			set a_name {}
 +			catch {set a_name $header($cmit,author)}
 +			while {$a_name ne {}} {
 +				if {$author_abbr ne {}
 +					&& [string index $a_name 0] eq {'}} {
 +					regsub {^'[^']+'\s+} $a_name {} a_name
 +				}
 +				if {![regexp {^([[:upper:]])} $a_name _a]} break
 +				append author_abbr $_a
 +				unset _a
 +				if {![regsub \
 +					{^[[:upper:]][^\s]*\s+} \
 +					$a_name {} a_name ]} break
 +			}
 +			if {$author_abbr eq {}} {
 +				set author_abbr { |}
 +			} else {
 +				set author_abbr [string range $author_abbr 0 3]
 +			}
 +			unset a_name
 +
 +			set first_lno $lno
 +			while {
 +			   $first_lno > 1
 +			&& $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0]
 +			&& $file eq [lindex $line_data [expr {$first_lno - 1}] 1]
 +			} {
 +				incr first_lno -1
 +			}
 +
 +			set color {}
 +			if {$first_lno < $lno} {
 +				foreach g [$w_file tag names $first_lno.0] {
 +					if {[regexp {^color[0-9]+$} $g]} {
 +						set color $g
 +						break
 +					}
 +				}
 +			} else {
 +				set i [lsort [concat \
 +					[$w_file tag names "[expr {$first_lno - 1}].0"] \
 +					[$w_file tag names "[expr {$lno + $n}].0"] \
 +					]]
 +				for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +					if {[lsearch -sorted -exact $i color$g] == -1} {
 +						set color color$g
 +						break
 +					}
 +				}
 +			}
 +			if {$color eq {}} {
 +				set color color0
 +			}
 +
 +			while {$n > 0} {
 +				set lno_e "$lno.0 lineend + 1c"
 +				if {[lindex $line_data $lno] ne {}} {
 +					set g [lindex $line_data $lno 0]
 +					foreach i $w_columns {
 +						$i tag remove g$g $lno.0 $lno_e
 +					}
 +				}
 +				lset line_data $lno [list $cmit $file $oln]
 +
 +				$cur_w delete $lno.0 "$lno.0 lineend"
 +				if {$lno == $first_lno} {
 +					$cur_w insert $lno.0 $commit_abbr $commit_type
 +				} elseif {$lno == [expr {$first_lno + 1}]} {
 +					$cur_w insert $lno.0 $author_abbr author_abbr
 +				} else {
 +					$cur_w insert $lno.0 { |}
 +				}
 +
 +				foreach i $w_columns {
 +					if {$cur_w eq $w_amov} {
 +						for {set g 0} \
 +							{$g < [llength $group_colors]} \
 +							{incr g} {
 +							$i tag remove color$g $lno.0 $lno_e
 +						}
 +						$i tag add $color $lno.0 $lno_e
 +					}
 +					$i tag add g$cmit $lno.0 $lno_e
 +				}
 +
 +				if {$highlight_column eq $cur_w} {
 +					if {$highlight_line == -1
 +					 && [lindex [$w_file yview] 0] == 0} {
 +						$w_file see $lno.0
 +						set highlight_line $lno
 +					}
 +					if {$highlight_line == $lno} {
 +						_showcommit $this $cur_w $lno
 +					}
 +				}
 +
 +				incr n -1
 +				incr lno
 +				incr oln
 +				incr blame_lines
 +			}
 +
 +			while {
 +			   $cmit eq [lindex $line_data $lno 0]
 +			&& $file eq [lindex $line_data $lno 1]
 +			} {
 +				$cur_w delete $lno.0 "$lno.0 lineend"
 +
 +				if {$lno == $first_lno} {
 +					$cur_w insert $lno.0 $commit_abbr $commit_type
 +				} elseif {$lno == [expr {$first_lno + 1}]} {
 +					$cur_w insert $lno.0 $author_abbr author_abbr
 +				} else {
 +					$cur_w insert $lno.0 { |}
 +				}
 +
 +				if {$cur_w eq $w_amov} {
 +					foreach i $w_columns {
 +						for {set g 0} \
 +							{$g < [llength $group_colors]} \
 +							{incr g} {
 +							$i tag remove color$g $lno.0 $lno_e
 +						}
 +						$i tag add $color $lno.0 $lno_e
 +					}
 +				}
 +
 +				incr lno
 +			}
 +
 +		} elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} {
 +			set header($r_commit,$key) $data
 +		}
 +	}
 +	$cur_w conf -state disabled
 +
 +	if {[eof $fd]} {
 +		close $fd
 +		if {$cur_w eq $w_asim} {
 +			# Switches for original location detection
 +			set threshold [get_config gui.copyblamethreshold]
 +			set original_options [list "-C$threshold"]
 +
 +			if {![is_config_true gui.fastcopyblame]} {
 +				# thorough copy search; insert before the threshold
 +				set original_options [linsert $original_options 0 -C]
 +			}
 +			if {[git-version >= 1.5.3]} {
 +				lappend original_options -w ; # ignore indentation changes
 +			}
 +
 +			_exec_blame $this $w_amov @amov_data \
 +				$original_options \
 +				[mc "Loading original location annotations..."]
 +		} else {
 +			set current_fd {}
 +			$status stop [mc "Annotation complete."]
 +		}
 +	} else {
 +		$status update $blame_lines $total_lines
 +	}
 +} ifdeleted { catch {close $fd} }
 +
 +method _find_commit_bound {data_list start_idx delta} {
 +	upvar #0 $data_list line_data
 +	set pos $start_idx
 +	set limit       [expr {[llength $line_data] - 1}]
 +	set base_commit [lindex $line_data $pos 0]
 +
 +	while {$pos > 0 && $pos < $limit} {
 +		set new_pos [expr {$pos + $delta}]
 +		if {[lindex $line_data $new_pos 0] ne $base_commit} {
 +			return $pos
 +		}
 +
 +		set pos $new_pos
 +	}
 +
 +	return $pos
 +}
 +
 +method _fullcopyblame {} {
 +	if {$current_fd ne {}} {
 +		tk_messageBox \
 +			-icon error \
 +			-type ok \
 +			-title [mc "Busy"] \
 +			-message [mc "Annotation process is already running."]
 +
 +		return
 +	}
 +
 +	# Switches for original location detection
 +	set threshold [get_config gui.copyblamethreshold]
 +	set original_options [list -C -C "-C$threshold"]
 +
 +	if {[git-version >= 1.5.3]} {
 +		lappend original_options -w ; # ignore indentation changes
 +	}
 +
 +	# Find the line range
 +	set pos @$::cursorX,$::cursorY
 +	set lno [lindex [split [$::cursorW index $pos] .] 0]
 +	set min_amov_lno [_find_commit_bound $this @amov_data $lno -1]
 +	set max_amov_lno [_find_commit_bound $this @amov_data $lno 1]
 +	set min_asim_lno [_find_commit_bound $this @asim_data $lno -1]
 +	set max_asim_lno [_find_commit_bound $this @asim_data $lno 1]
 +
 +	if {$min_asim_lno < $min_amov_lno} {
 +		set min_amov_lno $min_asim_lno
 +	}
 +
 +	if {$max_asim_lno > $max_amov_lno} {
 +		set max_amov_lno $max_asim_lno
 +	}
 +
 +	lappend original_options -L "$min_amov_lno,$max_amov_lno"
 +
 +	# Clear lines
 +	for {set i $min_amov_lno} {$i <= $max_amov_lno} {incr i} {
 +		lset amov_data $i [list ]
 +	}
 +
 +	# Start the back-end process
 +	_exec_blame $this $w_amov @amov_data \
 +		$original_options \
 +		[mc "Running thorough copy detection..."]
 +}
 +
 +method _click {cur_w pos} {
 +	set lno [lindex [split [$cur_w index $pos] .] 0]
 +	_showcommit $this $cur_w $lno
 +}
 +
 +method _setencoding {enc} {
 +	force_path_encoding $path $enc
 +	_load $this [list \
 +		$highlight_column \
 +		$highlight_line \
 +		[lindex [$w_file xview] 0] \
 +		[lindex [$w_file yview] 0] \
 +		]
 +}
 +
 +method _load_commit {cur_w cur_d pos} {
 +	upvar #0 $cur_d line_data
 +	set lno [lindex [split [$cur_w index $pos] .] 0]
 +	set dat [lindex $line_data $lno]
 +	if {$dat ne {}} {
 +		_load_new_commit $this  \
 +			[lindex $dat 0] \
 +			[lindex $dat 1] \
 +			[list [lindex $dat 2]]
 +	}
 +}
 +
 +method _load_new_commit {new_commit new_path jump} {
 +	lappend history [list \
 +		$commit $path \
 +		$highlight_column \
 +		$highlight_line \
 +		[lindex [$w_file xview] 0] \
 +		[lindex [$w_file yview] 0] \
 +		]
 +
 +	set commit $new_commit
 +	set path   $new_path
 +	_load $this $jump
 +}
 +
 +method _showcommit {cur_w lno} {
 +	global repo_config
 +	variable active_color
 +
 +	if {$highlight_commit ne {}} {
 +		foreach i $w_columns {
 +			$i tag conf g$highlight_commit -background {}
 +			$i tag lower g$highlight_commit
 +		}
 +	}
 +
 +	if {$cur_w eq $w_asim} {
 +		set dat [lindex $asim_data $lno]
 +		set highlight_column $w_asim
 +	} else {
 +		set dat [lindex $amov_data $lno]
 +		set highlight_column $w_amov
 +	}
 +
 +	$w_cviewer conf -state normal
 +	$w_cviewer delete 0.0 end
 +
 +	if {$dat eq {}} {
 +		set cmit {}
 +		$w_cviewer insert end [mc "Loading annotation..."] still_loading
 +	} else {
 +		set cmit [lindex $dat 0]
 +		set file [lindex $dat 1]
 +
 +		foreach i $w_columns {
 +			$i tag conf g$cmit -background $active_color
 +			$i tag raise g$cmit
 +			if {$i eq $w_file} {
 +				$w_file tag raise found
 +			}
 +			$i tag raise sel
 +		}
 +
 +		set author_name {}
 +		set author_email {}
 +		set author_time {}
 +		catch {set author_name $header($cmit,author)}
 +		catch {set author_email $header($cmit,author-mail)}
 +		catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +		set committer_name {}
 +		set committer_email {}
 +		set committer_time {}
 +		catch {set committer_name $header($cmit,committer)}
 +		catch {set committer_email $header($cmit,committer-mail)}
 +		catch {set committer_time [format_date $header($cmit,committer-time)]}
 +
 +		if {[catch {set msg $header($cmit,message)}]} {
 +			set msg {}
 +			catch {
 +				set fd [git_read cat-file commit $cmit]
 +				fconfigure $fd -encoding binary -translation lf
 +				# By default commits are assumed to be in utf-8
 +				set enc utf-8
 +				while {[gets $fd line] > 0} {
 +					if {[string match {encoding *} $line]} {
 +						set enc [string tolower [string range $line 9 end]]
 +					}
 +				}
 +				set msg [read $fd]
 +				close $fd
 +
 +				set enc [tcl_encoding $enc]
 +				if {$enc ne {}} {
 +					set msg [encoding convertfrom $enc $msg]
 +				}
 +				set msg [string trim $msg]
 +			}
 +			set header($cmit,message) $msg
 +		}
 +
 +		$w_cviewer insert end "commit $cmit\n" header_key
 +		$w_cviewer insert end [strcat [mc "Author:"] "\t"] header_key
 +		$w_cviewer insert end "$author_name $author_email" header_val
 +		$w_cviewer insert end "  $author_time\n" header_val
 +
 +		$w_cviewer insert end [strcat [mc "Committer:"] "\t"] header_key
 +		$w_cviewer insert end "$committer_name $committer_email" header_val
 +		$w_cviewer insert end "  $committer_time\n" header_val
 +
 +		if {$file ne $path} {
 +			$w_cviewer insert end [strcat [mc "Original File:"] "\t"] header_key
 +			$w_cviewer insert end "[escape_path $file]\n" header_val
 +		}
 +
 +		$w_cviewer insert end "\n$msg"
 +	}
 +	$w_cviewer conf -state disabled
 +
 +	set highlight_line $lno
 +	set highlight_commit $cmit
 +
 +	if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} {
 +		_hide_tooltip $this
 +	}
 +}
 +
 +method _get_click_amov_info {} {
 +	set pos @$::cursorX,$::cursorY
 +	set lno [lindex [split [$::cursorW index $pos] .] 0]
 +	return [lindex $amov_data $lno]
 +}
 +
 +method _copycommit {} {
 +	set dat [_get_click_amov_info $this]
 +	if {$dat ne {}} {
 +		clipboard clear
 +		clipboard append \
 +			-format STRING \
 +			-type STRING \
 +			-- [lindex $dat 0]
 +	}
 +}
 +
 +method _format_offset_date {base offset} {
 +	set exval [expr {$base + $offset*24*60*60}]
 +	return [clock format $exval -format {%Y-%m-%d}]
 +}
 +
 +method _gitkcommit {} {
 +	global nullid
 +
 +	set dat [_get_click_amov_info $this]
 +	if {$dat ne {}} {
 +		set cmit [lindex $dat 0]
 +
 +		# If the line belongs to the working copy, use HEAD instead
 +		if {$cmit eq $nullid} {
 +			if {[catch {set cmit [git rev-parse --verify HEAD]} err]} {
 +				error_popup [strcat [mc "Cannot find HEAD commit:"] "\n\n$err"]
 +				return;
 +			}
 +		}
 +
 +		set radius [get_config gui.blamehistoryctx]
 +		set cmdline [list --select-commit=$cmit]
 +
 +                if {$radius > 0} {
 +			set author_time {}
 +			set committer_time {}
 +
 +			catch {set author_time $header($cmit,author-time)}
 +			catch {set committer_time $header($cmit,committer-time)}
 +
 +			if {$committer_time eq {}} {
 +				set committer_time $author_time
 +			}
 +
 +			set after_time [_format_offset_date $this $committer_time [expr {-$radius}]]
 +			set before_time [_format_offset_date $this $committer_time $radius]
 +
 +			lappend cmdline --after=$after_time --before=$before_time
 +		}
 +
 +		lappend cmdline $cmit
 +
 +		set base_rev "HEAD"
 +		if {$commit ne {}} {
 +			set base_rev $commit
 +		}
 +
 +		if {$base_rev ne $cmit} {
 +			lappend cmdline $base_rev
 +		}
 +
 +		do_gitk $cmdline
 +	}
 +}
 +
 +method _blameparent {} {
 +	global nullid
 +
 +	set dat [_get_click_amov_info $this]
 +	if {$dat ne {}} {
 +		set cmit [lindex $dat 0]
 +		set new_path [lindex $dat 1]
 +
 +		# Allow using Blame Parent on lines modified in the working copy
 +		if {$cmit eq $nullid} {
 +			set parent_ref "HEAD"
 +		} else {
 +			set parent_ref "$cmit^"
 +		}
 +		if {[catch {set cparent [git rev-parse --verify $parent_ref]} err]} {
 +			error_popup [strcat [mc "Cannot find parent commit:"] "\n\n$err"]
 +			return;
 +		}
 +
 +		_kill $this
 +
 +		# Generate a diff between the commit and its parent,
 +		# and use the hunks to update the line number.
 +		# Request zero context to simplify calculations.
 +		if {$cmit eq $nullid} {
 +			set diffcmd [list diff-index --unified=0 $cparent -- $new_path]
 +		} else {
 +			set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path]
 +		}
 +		if {[catch {set fd [eval git_read $diffcmd]} err]} {
 +			$status stop [mc "Unable to display parent"]
 +			error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 +			return
 +		}
 +
 +		set r_orig_line [lindex $dat 2]
 +
 +		fconfigure $fd \
 +			-blocking 0 \
 +			-encoding binary \
 +			-translation binary
 +		fileevent $fd readable [cb _read_diff_load_commit \
 +			$fd $cparent $new_path $r_orig_line]
 +		set current_fd $fd
 +	}
 +}
 +
 +method _read_diff_load_commit {fd cparent new_path tline} {
 +	if {$fd ne $current_fd} {
 +		catch {close $fd}
 +		return
 +	}
 +
 +	while {[gets $fd line] >= 0} {
 +		if {[regexp {^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@} $line line \
 +			old_line osz old_size new_line nsz new_size]} {
 +
 +			if {$osz eq {}} { set old_size 1 }
 +			if {$nsz eq {}} { set new_size 1 }
 +
 +			if {$new_line <= $tline} {
 +				if {[expr {$new_line + $new_size}] > $tline} {
 +					# Target line within the hunk
 +					set line_shift [expr {
 +						($new_size-$old_size)*($tline-$new_line)/$new_size
 +						}]
 +				} else {
 +					set line_shift [expr {$new_size-$old_size}]
 +				}
 +
 +				set r_orig_line [expr {$r_orig_line - $line_shift}]
 +			}
 +		}
 +	}
 +
 +	if {[eof $fd]} {
 +		close $fd;
 +		set current_fd {}
 +
 +		_load_new_commit $this  \
 +			$cparent        \
 +			$new_path       \
 +			[list $r_orig_line]
 +	}
 +} ifdeleted { catch {close $fd} }
 +
 +method _show_tooltip {cur_w pos} {
 +	if {$tooltip_wm ne {}} {
 +		_open_tooltip $this $cur_w
 +	} elseif {$tooltip_timer eq {}} {
 +		set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
 +	}
 +}
 +
 +method _open_tooltip {cur_w} {
 +	set tooltip_timer {}
 +	set pos_x [winfo pointerx $cur_w]
 +	set pos_y [winfo pointery $cur_w]
 +	if {[winfo containing $pos_x $pos_y] ne $cur_w} {
 +		_hide_tooltip $this
 +		return
 +	}
 +
 +	if {$tooltip_wm ne "$cur_w.tooltip"} {
 +		_hide_tooltip $this
 +
 +		set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
 +		wm overrideredirect $tooltip_wm 1
 +		wm transient $tooltip_wm [winfo toplevel $cur_w]
 +		set tooltip_t $tooltip_wm.label
 +		text $tooltip_t \
 +			-takefocus 0 \
 +			-highlightthickness 0 \
 +			-relief flat \
 +			-borderwidth 0 \
 +			-wrap none \
 +			-background lightyellow \
 +			-foreground black
 +		$tooltip_t tag conf section_header -font font_uibold
 +		pack $tooltip_t
 +	} else {
 +		$tooltip_t conf -state normal
 +		$tooltip_t delete 0.0 end
 +	}
 +
 +	set pos @[join [list \
 +		[expr {$pos_x - [winfo rootx $cur_w]}] \
 +		[expr {$pos_y - [winfo rooty $cur_w]}]] ,]
 +	set lno [lindex [split [$cur_w index $pos] .] 0]
 +	if {$cur_w eq $w_amov} {
 +		set dat [lindex $amov_data $lno]
 +		set org {}
 +	} else {
 +		set dat [lindex $asim_data $lno]
 +		set org [lindex $amov_data $lno]
 +	}
 +
 +	if {$dat eq {}} {
 +		_hide_tooltip $this
 +		return
 +	}
 +
 +	set cmit [lindex $dat 0]
 +	set tooltip_commit [list $cmit]
 +
 +	set author_name {}
 +	set summary     {}
 +	set author_time {}
 +	catch {set author_name $header($cmit,author)}
 +	catch {set summary     $header($cmit,summary)}
 +	catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +	$tooltip_t insert end "commit $cmit\n"
 +	$tooltip_t insert end "$author_name  $author_time\n"
 +	$tooltip_t insert end "$summary"
 +
 +	if {$org ne {} && [lindex $org 0] ne $cmit} {
 +		set save [$tooltip_t get 0.0 end]
 +		$tooltip_t delete 0.0 end
 +
 +		set cmit [lindex $org 0]
 +		set file [lindex $org 1]
 +		lappend tooltip_commit $cmit
 +
 +		set author_name {}
 +		set summary     {}
 +		set author_time {}
 +		catch {set author_name $header($cmit,author)}
 +		catch {set summary     $header($cmit,summary)}
 +		catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +		$tooltip_t insert end [strcat [mc "Originally By:"] "\n"] section_header
 +		$tooltip_t insert end "commit $cmit\n"
 +		$tooltip_t insert end "$author_name  $author_time\n"
 +		$tooltip_t insert end "$summary\n"
 +
 +		if {$file ne $path} {
 +			$tooltip_t insert end [strcat [mc "In File:"] " "] section_header
 +			$tooltip_t insert end "$file\n"
 +		}
 +
 +		$tooltip_t insert end "\n"
 +		$tooltip_t insert end [strcat [mc "Copied Or Moved Here By:"] "\n"] section_header
 +		$tooltip_t insert end $save
 +	}
 +
 +	$tooltip_t conf -state disabled
 +	_position_tooltip $this
 +
 +	# On MacOS raising a window causes it to acquire focus.
 +	# Tk 8.5 on MacOS seems to properly support wm transient,
 +	# so we can safely counter the effect there.
 +	if {$::have_tk85 && [is_MacOSX]} {
 +		update
 +		if {$w eq {}} {
 +			raise .
 +		} else {
 +			raise $w
 +		}
 +	}
 +}
 +
 +method _position_tooltip {} {
 +	set max_h [lindex [split [$tooltip_t index end] .] 0]
 +	set max_w 0
 +	for {set i 1} {$i <= $max_h} {incr i} {
 +		set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1]
 +		if {$c > $max_w} {set max_w $c}
 +	}
 +	$tooltip_t conf -width $max_w -height $max_h
 +
 +	set req_w [winfo reqwidth  $tooltip_t]
 +	set req_h [winfo reqheight $tooltip_t]
 +	set pos_x [expr {[winfo pointerx .] +  5}]
 +	set pos_y [expr {[winfo pointery .] + 10}]
 +
 +	set g "${req_w}x${req_h}"
 +	if {$pos_x >= 0} {append g +}
 +	append g $pos_x
 +	if {$pos_y >= 0} {append g +}
 +	append g $pos_y
 +
 +	wm geometry $tooltip_wm $g
 +	if {![is_MacOSX]} {
 +		raise $tooltip_wm
 +	}
 +}
 +
 +method _hide_tooltip {} {
 +	if {$tooltip_wm ne {}} {
 +		destroy $tooltip_wm
 +		set tooltip_wm {}
 +		set tooltip_commit {}
 +	}
 +	if {$tooltip_timer ne {}} {
 +		after cancel $tooltip_timer
 +		set tooltip_timer {}
 +	}
 +}
 +
 +method _resize {new_height} {
 +	set diff [expr {$new_height - $old_height}]
 +	if {$diff == 0} return
 +
 +	set my [expr {[winfo height $w.file_pane] - 25}]
 +	set o [$w.file_pane sash coord 0]
 +	set ox [lindex $o 0]
 +	set oy [expr {[lindex $o 1] + $diff}]
 +	if {$oy < 0}   {set oy 0}
 +	if {$oy > $my} {set oy $my}
 +	$w.file_pane sash place 0 $ox $oy
 +
 +	set old_height $new_height
 +}
 +
 +}
diff --cc git-gui/lib/choose_repository.tcl
index 64f06748b,000000000..fae119286
mode 100644,000000..100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@@ -1,1077 -1,0 +1,1082 @@@
 +# git-gui Git repository chooser
 +# Copyright (C) 2007 Shawn Pearce
 +
 +class choose_repository {
 +
 +field top
 +field w
 +field w_body      ; # Widget holding the center content
 +field w_next      ; # Next button
 +field w_quit      ; # Quit button
 +field o_cons      ; # Console object (if active)
 +field w_types     ; # List of type buttons in clone
 +field w_recentlist ; # Listbox containing recent repositories
 +field w_localpath  ; # Entry widget bound to local_path
 +
 +field done              0 ; # Finished picking the repository?
 +field local_path       {} ; # Where this repository is locally
 +field origin_url       {} ; # Where we are cloning from
 +field origin_name  origin ; # What we shall call 'origin'
 +field clone_type hardlink ; # Type of clone to construct
 +field readtree_err        ; # Error output from read-tree (if any)
 +field sorted_recent       ; # recent repositories (sorted)
 +
 +constructor pick {} {
 +	global M1T M1B use_ttk NS
 +
 +	make_dialog top w
 +	wm title $top [mc "Git Gui"]
 +
 +	if {$top eq {.}} {
 +		menu $w.mbar -tearoff 0
 +		$top configure -menu $w.mbar
 +
 +		set m_repo $w.mbar.repository
 +		$w.mbar add cascade \
 +			-label [mc Repository] \
 +			-menu $m_repo
 +		menu $m_repo
 +
 +		if {[is_MacOSX]} {
 +			$w.mbar add cascade -label Apple -menu .mbar.apple
 +			menu $w.mbar.apple
 +			$w.mbar.apple add command \
 +				-label [mc "About %s" [appname]] \
 +				-command do_about
 +			$w.mbar.apple add command \
 +				-label [mc "Show SSH Key"] \
 +				-command do_ssh_key
 +		} else {
 +			$w.mbar add cascade -label [mc Help] -menu $w.mbar.help
 +			menu $w.mbar.help
 +			$w.mbar.help add command \
 +				-label [mc "About %s" [appname]] \
 +				-command do_about
 +			$w.mbar.help add command \
 +				-label [mc "Show SSH Key"] \
 +				-command do_ssh_key
 +		}
 +
 +		wm protocol $top WM_DELETE_WINDOW exit
 +		bind $top <$M1B-q> exit
 +		bind $top <$M1B-Q> exit
 +		bind $top <Key-Escape> exit
 +	} else {
 +		wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
 +		bind $top <Key-Escape> [list destroy $top]
 +		set m_repo {}
 +	}
 +
 +	pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10
 +
 +	set w_body $w.body
 +	set opts $w_body.options
 +	${NS}::frame $w_body
 +	text $opts \
 +		-cursor $::cursor_ptr \
 +		-relief flat \
 +		-background [get_bg_color $w_body] \
 +		-wrap none \
 +		-spacing1 5 \
 +		-width 50 \
 +		-height 3
 +	pack $opts -anchor w -fill x
 +
 +	$opts tag conf link_new -foreground blue -underline 1
 +	$opts tag bind link_new <1> [cb _next new]
 +	$opts insert end [mc "Create New Repository"] link_new
 +	$opts insert end "\n"
 +	if {$m_repo ne {}} {
 +		$m_repo add command \
 +			-command [cb _next new] \
 +			-accelerator $M1T-N \
 +			-label [mc "New..."]
 +		bind $top <$M1B-n> [cb _next new]
 +		bind $top <$M1B-N> [cb _next new]
 +	}
 +
 +	$opts tag conf link_clone -foreground blue -underline 1
 +	$opts tag bind link_clone <1> [cb _next clone]
 +	$opts insert end [mc "Clone Existing Repository"] link_clone
 +	$opts insert end "\n"
 +	if {$m_repo ne {}} {
++		if {[tk windowingsystem] eq "win32"} {
++			set key L
++		} else {
++			set key C
++		}
 +		$m_repo add command \
 +			-command [cb _next clone] \
- 			-accelerator $M1T-C \
++			-accelerator $M1T-$key \
 +			-label [mc "Clone..."]
- 		bind $top <$M1B-c> [cb _next clone]
- 		bind $top <$M1B-C> [cb _next clone]
++		bind $top <$M1B-[string tolower $key]> [cb _next clone]
++		bind $top <$M1B-[string toupper $key]> [cb _next clone]
 +	}
 +
 +	$opts tag conf link_open -foreground blue -underline 1
 +	$opts tag bind link_open <1> [cb _next open]
 +	$opts insert end [mc "Open Existing Repository"] link_open
 +	$opts insert end "\n"
 +	if {$m_repo ne {}} {
 +		$m_repo add command \
 +			-command [cb _next open] \
 +			-accelerator $M1T-O \
 +			-label [mc "Open..."]
 +		bind $top <$M1B-o> [cb _next open]
 +		bind $top <$M1B-O> [cb _next open]
 +	}
 +
 +	$opts conf -state disabled
 +
 +	set sorted_recent [_get_recentrepos]
 +	if {[llength $sorted_recent] > 0} {
 +		if {$m_repo ne {}} {
 +			$m_repo add separator
 +			$m_repo add command \
 +				-state disabled \
 +				-label [mc "Recent Repositories"]
 +		}
 +
 +		${NS}::label $w_body.space
 +		${NS}::label $w_body.recentlabel \
 +			-anchor w \
 +			-text [mc "Open Recent Repository:"]
 +		set w_recentlist $w_body.recentlist
 +		text $w_recentlist \
 +			-cursor $::cursor_ptr \
 +			-relief flat \
 +			-background [get_bg_color $w_body.recentlabel] \
 +			-wrap none \
 +			-width 50 \
 +			-height 10
 +		$w_recentlist tag conf link \
 +			-foreground blue \
 +			-underline 1
 +		set home $::env(HOME)
 +		if {[is_Cygwin]} {
 +			set home [exec cygpath --windows --absolute $home]
 +		}
 +		set home "[file normalize $home]/"
 +		set hlen [string length $home]
 +		foreach p $sorted_recent {
 +			set path $p
 +			if {[string equal -length $hlen $home $p]} {
 +				set p "~/[string range $p $hlen end]"
 +			}
 +			regsub -all "\n" $p "\\n" p
 +			$w_recentlist insert end $p link
 +			$w_recentlist insert end "\n"
 +
 +			if {$m_repo ne {}} {
 +				$m_repo add command \
 +					-command [cb _open_recent_path $path] \
 +					-label "    $p"
 +			}
 +		}
 +		$w_recentlist conf -state disabled
 +		$w_recentlist tag bind link <1> [cb _open_recent %x,%y]
 +		pack $w_body.space -anchor w -fill x
 +		pack $w_body.recentlabel -anchor w -fill x
 +		pack $w_recentlist -anchor w -fill x
 +	}
 +	pack $w_body -fill x -padx 10 -pady 10
 +
 +	${NS}::frame $w.buttons
 +	set w_next $w.buttons.next
 +	set w_quit $w.buttons.quit
 +	${NS}::button $w_quit \
 +		-text [mc "Quit"] \
 +		-command exit
 +	pack $w_quit -side right -padx 5
 +	pack $w.buttons -side bottom -fill x -padx 10 -pady 10
 +
 +	if {$m_repo ne {}} {
 +		$m_repo add separator
 +		$m_repo add command \
 +			-label [mc Quit] \
 +			-command exit \
 +			-accelerator $M1T-Q
 +	}
 +
 +	bind $top <Return> [cb _invoke_next]
 +	bind $top <Visibility> "
 +		[cb _center]
 +		grab $top
 +		focus $top
 +		bind $top <Visibility> {}
 +	"
 +	wm deiconify $top
 +	tkwait variable @done
 +
 +	grab release $top
 +	if {$top eq {.}} {
 +		eval destroy [winfo children $top]
 +	}
 +}
 +
 +proc _home {} {
 +	if {[catch {set h $::env(HOME)}]
 +		|| ![file isdirectory $h]} {
 +		set h .
 +	}
 +	return $h
 +}
 +
 +method _center {} {
 +	set nx [winfo reqwidth $top]
 +	set ny [winfo reqheight $top]
 +	set rx [expr {([winfo screenwidth  $top] - $nx) / 3}]
 +	set ry [expr {([winfo screenheight $top] - $ny) / 3}]
 +	wm geometry $top [format {+%d+%d} $rx $ry]
 +}
 +
 +method _invoke_next {} {
 +	if {[winfo exists $w_next]} {
 +		uplevel #0 [$w_next cget -command]
 +	}
 +}
 +
 +proc _get_recentrepos {} {
 +	set recent [list]
 +	foreach p [get_config gui.recentrepo] {
 +		if {[_is_git [file join $p .git]]} {
 +			lappend recent $p
 +		} else {
 +			_unset_recentrepo $p
 +		}
 +	}
 +	return [lsort $recent]
 +}
 +
 +proc _unset_recentrepo {p} {
 +	regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p
 +	git config --global --unset gui.recentrepo "^$p\$"
 +	load_config 1
 +}
 +
 +proc _append_recentrepos {path} {
 +	set path [file normalize $path]
 +	set recent [get_config gui.recentrepo]
 +
 +	if {[lindex $recent end] eq $path} {
 +		return
 +	}
 +
 +	set i [lsearch $recent $path]
 +	if {$i >= 0} {
 +		_unset_recentrepo $path
 +		set recent [lreplace $recent $i $i]
 +	}
 +
 +	lappend recent $path
 +	git config --global --add gui.recentrepo $path
 +	load_config 1
 +
 +	while {[llength $recent] > 10} {
 +		_unset_recentrepo [lindex $recent 0]
 +		set recent [lrange $recent 1 end]
 +	}
 +}
 +
 +method _open_recent {xy} {
 +	set id [lindex [split [$w_recentlist index @$xy] .] 0]
 +	set local_path [lindex $sorted_recent [expr {$id - 1}]]
 +	_do_open2 $this
 +}
 +
 +method _open_recent_path {p} {
 +	set local_path $p
 +	_do_open2 $this
 +}
 +
 +method _next {action} {
 +	global NS
 +	destroy $w_body
 +	if {![winfo exists $w_next]} {
 +		${NS}::button $w_next -default active
 +		pack $w_next -side right -padx 5 -before $w_quit
 +	}
 +	_do_$action $this
 +}
 +
 +method _write_local_path {args} {
 +	if {$local_path eq {}} {
 +		$w_next conf -state disabled
 +	} else {
 +		$w_next conf -state normal
 +	}
 +}
 +
 +method _git_init {} {
 +	if {[catch {file mkdir $local_path} err]} {
 +		error_popup [strcat \
 +			[mc "Failed to create repository %s:" $local_path] \
 +			"\n\n$err"]
 +		return 0
 +	}
 +
 +	if {[catch {cd $local_path} err]} {
 +		error_popup [strcat \
 +			[mc "Failed to create repository %s:" $local_path] \
 +			"\n\n$err"]
 +		return 0
 +	}
 +
 +	if {[catch {git init} err]} {
 +		error_popup [strcat \
 +			[mc "Failed to create repository %s:" $local_path] \
 +			"\n\n$err"]
 +		return 0
 +	}
 +
 +	_append_recentrepos [pwd]
 +	set ::_gitdir .git
 +	set ::_prefix {}
 +	return 1
 +}
 +
 +proc _is_git {path} {
 +	if {[file exists [file join $path HEAD]]
 +	 && [file exists [file join $path objects]]
 +	 && [file exists [file join $path config]]} {
 +		return 1
 +	}
 +	if {[is_Cygwin]} {
 +		if {[file exists [file join $path HEAD]]
 +		 && [file exists [file join $path objects.lnk]]
 +		 && [file exists [file join $path config.lnk]]} {
 +			return 1
 +		}
 +	}
 +	return 0
 +}
 +
 +proc _objdir {path} {
 +	set objdir [file join $path .git objects]
 +	if {[file isdirectory $objdir]} {
 +		return $objdir
 +	}
 +
 +	set objdir [file join $path objects]
 +	if {[file isdirectory $objdir]} {
 +		return $objdir
 +	}
 +
 +	if {[is_Cygwin]} {
 +		set objdir [file join $path .git objects.lnk]
 +		if {[file isfile $objdir]} {
 +			return [win32_read_lnk $objdir]
 +		}
 +
 +		set objdir [file join $path objects.lnk]
 +		if {[file isfile $objdir]} {
 +			return [win32_read_lnk $objdir]
 +		}
 +	}
 +
 +	return {}
 +}
 +
 +######################################################################
 +##
 +## Create New Repository
 +
 +method _do_new {} {
 +	global use_ttk NS
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_new2] \
 +		-text [mc "Create"]
 +
 +	${NS}::frame $w_body
 +	${NS}::label $w_body.h \
 +		-font font_uibold -anchor center \
 +		-text [mc "Create New Repository"]
 +	pack $w_body.h -side top -fill x -pady 10
 +	pack $w_body -fill x -padx 10
 +
 +	${NS}::frame $w_body.where
 +	${NS}::label $w_body.where.l -text [mc "Directory:"]
 +	${NS}::entry $w_body.where.t \
 +		-textvariable @local_path \
 +		-width 50
 +	${NS}::button $w_body.where.b \
 +		-text [mc "Browse"] \
 +		-command [cb _new_local_path]
 +	set w_localpath $w_body.where.t
 +
 +	grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
 +	pack $w_body.where -fill x
 +
 +	grid columnconfigure $w_body.where 1 -weight 1
 +
 +	trace add variable @local_path write [cb _write_local_path]
 +	bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
 +	update
 +	focus $w_body.where.t
 +}
 +
 +method _new_local_path {} {
 +	if {$local_path ne {}} {
 +		set p [file dirname $local_path]
 +	} else {
 +		set p [_home]
 +	}
 +
 +	set p [tk_chooseDirectory \
 +		-initialdir $p \
 +		-parent $top \
 +		-title [mc "Git Repository"] \
 +		-mustexist false]
 +	if {$p eq {}} return
 +
 +	set p [file normalize $p]
 +	if {![_new_ok $p]} {
 +		return
 +	}
 +	set local_path $p
 +	$w_localpath icursor end
 +}
 +
 +method _do_new2 {} {
 +	if {![_new_ok $local_path]} {
 +		return
 +	}
 +	if {![_git_init $this]} {
 +		return
 +	}
 +	set done 1
 +}
 +
 +proc _new_ok {p} {
 +	if {[file isdirectory $p]} {
 +		if {[_is_git [file join $p .git]]} {
 +			error_popup [mc "Directory %s already exists." $p]
 +			return 0
 +		}
 +	} elseif {[file exists $p]} {
 +		error_popup [mc "File %s already exists." $p]
 +		return 0
 +	}
 +	return 1
 +}
 +
 +######################################################################
 +##
 +## Clone Existing Repository
 +
 +method _do_clone {} {
 +	global use_ttk NS
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_clone2] \
 +		-text [mc "Clone"]
 +
 +	${NS}::frame $w_body
 +	${NS}::label $w_body.h \
 +		-font font_uibold -anchor center \
 +		-text [mc "Clone Existing Repository"]
 +	pack $w_body.h -side top -fill x -pady 10
 +	pack $w_body -fill x -padx 10
 +
 +	set args $w_body.args
 +	${NS}::frame $w_body.args
 +	pack $args -fill both
 +
 +	${NS}::label $args.origin_l -text [mc "Source Location:"]
 +	${NS}::entry $args.origin_t \
 +		-textvariable @origin_url \
 +		-width 50
 +	${NS}::button $args.origin_b \
 +		-text [mc "Browse"] \
 +		-command [cb _open_origin]
 +	grid $args.origin_l $args.origin_t $args.origin_b -sticky ew
 +
 +	${NS}::label $args.where_l -text [mc "Target Directory:"]
 +	${NS}::entry $args.where_t \
 +		-textvariable @local_path \
 +		-width 50
 +	${NS}::button $args.where_b \
 +		-text [mc "Browse"] \
 +		-command [cb _new_local_path]
 +	grid $args.where_l $args.where_t $args.where_b -sticky ew
 +	set w_localpath $args.where_t
 +
 +	${NS}::label $args.type_l -text [mc "Clone Type:"]
 +	${NS}::frame $args.type_f
 +	set w_types [list]
 +	lappend w_types [${NS}::radiobutton $args.type_f.hardlink \
 +		-state disabled \
 +		-text [mc "Standard (Fast, Semi-Redundant, Hardlinks)"] \
 +		-variable @clone_type \
 +		-value hardlink]
 +	lappend w_types [${NS}::radiobutton $args.type_f.full \
 +		-state disabled \
 +		-text [mc "Full Copy (Slower, Redundant Backup)"] \
 +		-variable @clone_type \
 +		-value full]
 +	lappend w_types [${NS}::radiobutton $args.type_f.shared \
 +		-state disabled \
 +		-text [mc "Shared (Fastest, Not Recommended, No Backup)"] \
 +		-variable @clone_type \
 +		-value shared]
 +	foreach r $w_types {
 +		pack $r -anchor w
 +	}
 +	grid $args.type_l $args.type_f -sticky new
 +
 +	grid columnconfigure $args 1 -weight 1
 +
 +	trace add variable @local_path write [cb _update_clone]
 +	trace add variable @origin_url write [cb _update_clone]
 +	bind $w_body.h <Destroy> "
 +		[list trace remove variable @local_path write [cb _update_clone]]
 +		[list trace remove variable @origin_url write [cb _update_clone]]
 +	"
 +	update
 +	focus $args.origin_t
 +}
 +
 +method _open_origin {} {
 +	if {$origin_url ne {} && [file isdirectory $origin_url]} {
 +		set p $origin_url
 +	} else {
 +		set p [_home]
 +	}
 +
 +	set p [tk_chooseDirectory \
 +		-initialdir $p \
 +		-parent $top \
 +		-title [mc "Git Repository"] \
 +		-mustexist true]
 +	if {$p eq {}} return
 +
 +	set p [file normalize $p]
 +	if {![_is_git [file join $p .git]] && ![_is_git $p]} {
 +		error_popup [mc "Not a Git repository: %s" [file tail $p]]
 +		return
 +	}
 +	set origin_url $p
 +}
 +
 +method _update_clone {args} {
 +	if {$local_path ne {} && $origin_url ne {}} {
 +		$w_next conf -state normal
 +	} else {
 +		$w_next conf -state disabled
 +	}
 +
 +	if {$origin_url ne {} &&
 +		(  [_is_git [file join $origin_url .git]]
 +		|| [_is_git $origin_url])} {
 +		set e normal
 +		if {[[lindex $w_types 0] cget -state] eq {disabled}} {
 +			set clone_type hardlink
 +		}
 +	} else {
 +		set e disabled
 +		set clone_type full
 +	}
 +
 +	foreach r $w_types {
 +		$r conf -state $e
 +	}
 +}
 +
 +method _do_clone2 {} {
 +	if {[file isdirectory $origin_url]} {
 +		set origin_url [file normalize $origin_url]
 +	}
 +
 +	if {$clone_type eq {hardlink} && ![file isdirectory $origin_url]} {
 +		error_popup [mc "Standard only available for local repository."]
 +		return
 +	}
 +	if {$clone_type eq {shared} && ![file isdirectory $origin_url]} {
 +		error_popup [mc "Shared only available for local repository."]
 +		return
 +	}
 +
 +	if {$clone_type eq {hardlink} || $clone_type eq {shared}} {
 +		set objdir [_objdir $origin_url]
 +		if {$objdir eq {}} {
 +			error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
 +			return
 +		}
 +	}
 +
 +	set giturl $origin_url
 +	if {[is_Cygwin] && [file isdirectory $giturl]} {
 +		set giturl [exec cygpath --unix --absolute $giturl]
 +		if {$clone_type eq {shared}} {
 +			set objdir [exec cygpath --unix --absolute $objdir]
 +		}
 +	}
 +
 +	if {[file exists $local_path]} {
 +		error_popup [mc "Location %s already exists." $local_path]
 +		return
 +	}
 +
 +	if {![_git_init $this]} return
 +	set local_path [pwd]
 +
 +	if {[catch {
 +			git config remote.$origin_name.url $giturl
 +			git config remote.$origin_name.fetch +refs/heads/*:refs/remotes/$origin_name/*
 +		} err]} {
 +		error_popup [strcat [mc "Failed to configure origin"] "\n\n$err"]
 +		return
 +	}
 +
 +	destroy $w_body $w_next
 +
 +	switch -exact -- $clone_type {
 +	hardlink {
 +		set o_cons [status_bar::two_line $w_body]
 +		pack $w_body -fill x -padx 10 -pady 10
 +
 +		$o_cons start \
 +			[mc "Counting objects"] \
 +			[mc "buckets"]
 +		update
 +
 +		if {[file exists [file join $objdir info alternates]]} {
 +			set pwd [pwd]
 +			if {[catch {
 +				file mkdir [gitdir objects info]
 +				set f_in [open [file join $objdir info alternates] r]
 +				set f_cp [open [gitdir objects info alternates] w]
 +				fconfigure $f_in -translation binary -encoding binary
 +				fconfigure $f_cp -translation binary -encoding binary
 +				cd $objdir
 +				while {[gets $f_in line] >= 0} {
 +					if {[is_Cygwin]} {
 +						puts $f_cp [exec cygpath --unix --absolute $line]
 +					} else {
 +						puts $f_cp [file normalize $line]
 +					}
 +				}
 +				close $f_in
 +				close $f_cp
 +				cd $pwd
 +			} err]} {
 +				catch {cd $pwd}
 +				_clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err]
 +				return
 +			}
 +		}
 +
 +		set tolink  [list]
 +		set buckets [glob \
 +			-tails \
 +			-nocomplain \
 +			-directory [file join $objdir] ??]
 +		set bcnt [expr {[llength $buckets] + 2}]
 +		set bcur 1
 +		$o_cons update $bcur $bcnt
 +		update
 +
 +		file mkdir [file join .git objects pack]
 +		foreach i [glob -tails -nocomplain \
 +			-directory [file join $objdir pack] *] {
 +			lappend tolink [file join pack $i]
 +		}
 +		$o_cons update [incr bcur] $bcnt
 +		update
 +
 +		foreach i $buckets {
 +			file mkdir [file join .git objects $i]
 +			foreach j [glob -tails -nocomplain \
 +				-directory [file join $objdir $i] *] {
 +				lappend tolink [file join $i $j]
 +			}
 +			$o_cons update [incr bcur] $bcnt
 +			update
 +		}
 +		$o_cons stop
 +
 +		if {$tolink eq {}} {
 +			info_popup [strcat \
 +				[mc "Nothing to clone from %s." $origin_url] \
 +				"\n" \
 +				[mc "The 'master' branch has not been initialized."] \
 +				]
 +			destroy $w_body
 +			set done 1
 +			return
 +		}
 +
 +		set i [lindex $tolink 0]
 +		if {[catch {
 +				file link -hard \
 +					[file join .git objects $i] \
 +					[file join $objdir $i]
 +			} err]} {
 +			info_popup [mc "Hardlinks are unavailable.  Falling back to copying."]
 +			set i [_copy_files $this $objdir $tolink]
 +		} else {
 +			set i [_link_files $this $objdir [lrange $tolink 1 end]]
 +		}
 +		if {!$i} return
 +
 +		destroy $w_body
 +	}
 +	full {
 +		set o_cons [console::embed \
 +			$w_body \
 +			[mc "Cloning from %s" $origin_url]]
 +		pack $w_body -fill both -expand 1 -padx 10
 +		$o_cons exec \
 +			[list git fetch --no-tags -k $origin_name] \
 +			[cb _do_clone_tags]
 +	}
 +	shared {
 +		set fd [open [gitdir objects info alternates] w]
 +		fconfigure $fd -translation binary
 +		puts $fd $objdir
 +		close $fd
 +	}
 +	}
 +
 +	if {$clone_type eq {hardlink} || $clone_type eq {shared}} {
 +		if {![_clone_refs $this]} return
 +		set pwd [pwd]
 +		if {[catch {
 +				cd $origin_url
 +				set HEAD [git rev-parse --verify HEAD^0]
 +			} err]} {
 +			_clone_failed $this [mc "Not a Git repository: %s" [file tail $origin_url]]
 +			return 0
 +		}
 +		cd $pwd
 +		_do_clone_checkout $this $HEAD
 +	}
 +}
 +
 +method _copy_files {objdir tocopy} {
 +	$o_cons start \
 +		[mc "Copying objects"] \
 +		[mc "KiB"]
 +	set tot 0
 +	set cmp 0
 +	foreach p $tocopy {
 +		incr tot [file size [file join $objdir $p]]
 +	}
 +	foreach p $tocopy {
 +		if {[catch {
 +				set f_in [open [file join $objdir $p] r]
 +				set f_cp [open [file join .git objects $p] w]
 +				fconfigure $f_in -translation binary -encoding binary
 +				fconfigure $f_cp -translation binary -encoding binary
 +
 +				while {![eof $f_in]} {
 +					incr cmp [fcopy $f_in $f_cp -size 16384]
 +					$o_cons update \
 +						[expr {$cmp / 1024}] \
 +						[expr {$tot / 1024}]
 +					update
 +				}
 +
 +				close $f_in
 +				close $f_cp
 +			} err]} {
 +			_clone_failed $this [mc "Unable to copy object: %s" $err]
 +			return 0
 +		}
 +	}
 +	return 1
 +}
 +
 +method _link_files {objdir tolink} {
 +	set total [llength $tolink]
 +	$o_cons start \
 +		[mc "Linking objects"] \
 +		[mc "objects"]
 +	for {set i 0} {$i < $total} {} {
 +		set p [lindex $tolink $i]
 +		if {[catch {
 +				file link -hard \
 +					[file join .git objects $p] \
 +					[file join $objdir $p]
 +			} err]} {
 +			_clone_failed $this [mc "Unable to hardlink object: %s" $err]
 +			return 0
 +		}
 +
 +		incr i
 +		if {$i % 5 == 0} {
 +			$o_cons update $i $total
 +			update
 +		}
 +	}
 +	return 1
 +}
 +
 +method _clone_refs {} {
 +	set pwd [pwd]
 +	if {[catch {cd $origin_url} err]} {
 +		error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
 +		return 0
 +	}
 +	set fd_in [git_read for-each-ref \
 +		--tcl \
 +		{--format=list %(refname) %(objectname) %(*objectname)}]
 +	cd $pwd
 +
 +	set fd [open [gitdir packed-refs] w]
 +	fconfigure $fd -translation binary
 +	puts $fd "# pack-refs with: peeled"
 +	while {[gets $fd_in line] >= 0} {
 +		set line [eval $line]
 +		set refn [lindex $line 0]
 +		set robj [lindex $line 1]
 +		set tobj [lindex $line 2]
 +
 +		if {[regsub ^refs/heads/ $refn \
 +			"refs/remotes/$origin_name/" refn]} {
 +			puts $fd "$robj $refn"
 +		} elseif {[string match refs/tags/* $refn]} {
 +			puts $fd "$robj $refn"
 +			if {$tobj ne {}} {
 +				puts $fd "^$tobj"
 +			}
 +		}
 +	}
 +	close $fd_in
 +	close $fd
 +	return 1
 +}
 +
 +method _do_clone_tags {ok} {
 +	if {$ok} {
 +		$o_cons exec \
 +			[list git fetch --tags -k $origin_name] \
 +			[cb _do_clone_HEAD]
 +	} else {
 +		$o_cons done $ok
 +		_clone_failed $this [mc "Cannot fetch branches and objects.  See console output for details."]
 +	}
 +}
 +
 +method _do_clone_HEAD {ok} {
 +	if {$ok} {
 +		$o_cons exec \
 +			[list git fetch $origin_name HEAD] \
 +			[cb _do_clone_full_end]
 +	} else {
 +		$o_cons done $ok
 +		_clone_failed $this [mc "Cannot fetch tags.  See console output for details."]
 +	}
 +}
 +
 +method _do_clone_full_end {ok} {
 +	$o_cons done $ok
 +
 +	if {$ok} {
 +		destroy $w_body
 +
 +		set HEAD {}
 +		if {[file exists [gitdir FETCH_HEAD]]} {
 +			set fd [open [gitdir FETCH_HEAD] r]
 +			while {[gets $fd line] >= 0} {
 +				if {[regexp "^(.{40})\t\t" $line line HEAD]} {
 +					break
 +				}
 +			}
 +			close $fd
 +		}
 +
 +		catch {git pack-refs}
 +		_do_clone_checkout $this $HEAD
 +	} else {
 +		_clone_failed $this [mc "Cannot determine HEAD.  See console output for details."]
 +	}
 +}
 +
 +method _clone_failed {{why {}}} {
 +	if {[catch {file delete -force $local_path} err]} {
 +		set why [strcat \
 +			$why \
 +			"\n\n" \
 +			[mc "Unable to cleanup %s" $local_path] \
 +			"\n\n" \
 +			$err]
 +	}
 +	if {$why ne {}} {
 +		update
 +		error_popup [strcat [mc "Clone failed."] "\n" $why]
 +	}
 +}
 +
 +method _do_clone_checkout {HEAD} {
 +	if {$HEAD eq {}} {
 +		info_popup [strcat \
 +			[mc "No default branch obtained."] \
 +			"\n" \
 +			[mc "The 'master' branch has not been initialized."] \
 +			]
 +		set done 1
 +		return
 +	}
 +	if {[catch {
 +			git update-ref HEAD $HEAD^0
 +		} err]} {
 +		info_popup [strcat \
 +			[mc "Cannot resolve %s as a commit." $HEAD^0] \
 +			"\n  $err" \
 +			"\n" \
 +			[mc "The 'master' branch has not been initialized."] \
 +			]
 +		set done 1
 +		return
 +	}
 +
 +	set o_cons [status_bar::two_line $w_body]
 +	pack $w_body -fill x -padx 10 -pady 10
 +	$o_cons start \
 +		[mc "Creating working directory"] \
 +		[mc "files"]
 +
 +	set readtree_err {}
 +	set fd [git_read --stderr read-tree \
 +		-m \
 +		-u \
 +		-v \
 +		HEAD \
 +		HEAD \
 +		]
 +	fconfigure $fd -blocking 0 -translation binary
 +	fileevent $fd readable [cb _readtree_wait $fd]
 +}
 +
 +method _readtree_wait {fd} {
 +	set buf [read $fd]
 +	$o_cons update_meter $buf
 +	append readtree_err $buf
 +
 +	fconfigure $fd -blocking 1
 +	if {![eof $fd]} {
 +		fconfigure $fd -blocking 0
 +		return
 +	}
 +
 +	if {[catch {close $fd}]} {
 +		set err $readtree_err
 +		regsub {^fatal: } $err {} err
 +		error_popup [strcat \
 +			[mc "Initial file checkout failed."] \
 +			"\n\n$err"]
 +		return
 +	}
 +
 +	# -- Run the post-checkout hook.
 +	#
 +	set fd_ph [githook_read post-checkout [string repeat 0 40] \
 +		[git rev-parse HEAD] 1]
 +	if {$fd_ph ne {}} {
 +		global pch_error
 +		set pch_error {}
 +		fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +		fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph]
 +	} else {
 +		set done 1
 +	}
 +}
 +
 +method _postcheckout_wait {fd_ph} {
 +	global pch_error
 +
 +	append pch_error [read $fd_ph]
 +	fconfigure $fd_ph -blocking 1
 +	if {[eof $fd_ph]} {
 +		if {[catch {close $fd_ph}]} {
 +			hook_failed_popup post-checkout $pch_error 0
 +		}
 +		unset pch_error
 +		set done 1
 +		return
 +	}
 +	fconfigure $fd_ph -blocking 0
 +}
 +
 +######################################################################
 +##
 +## Open Existing Repository
 +
 +method _do_open {} {
 +	global NS
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_open2] \
 +		-text [mc "Open"]
 +
 +	${NS}::frame $w_body
 +	${NS}::label $w_body.h \
 +		-font font_uibold -anchor center \
 +		-text [mc "Open Existing Repository"]
 +	pack $w_body.h -side top -fill x -pady 10
 +	pack $w_body -fill x -padx 10
 +
 +	${NS}::frame $w_body.where
 +	${NS}::label $w_body.where.l -text [mc "Repository:"]
 +	${NS}::entry $w_body.where.t \
 +		-textvariable @local_path \
 +		-width 50
 +	${NS}::button $w_body.where.b \
 +		-text [mc "Browse"] \
 +		-command [cb _open_local_path]
 +
 +	grid $w_body.where.l $w_body.where.t $w_body.where.b -sticky ew
 +	pack $w_body.where -fill x
 +
 +	grid columnconfigure $w_body.where 1 -weight 1
 +
 +	trace add variable @local_path write [cb _write_local_path]
 +	bind $w_body.h <Destroy> [list trace remove variable @local_path write [cb _write_local_path]]
 +	update
 +	focus $w_body.where.t
 +}
 +
 +method _open_local_path {} {
 +	if {$local_path ne {}} {
 +		set p $local_path
 +	} else {
 +		set p [_home]
 +	}
 +
 +	set p [tk_chooseDirectory \
 +		-initialdir $p \
 +		-parent $top \
 +		-title [mc "Git Repository"] \
 +		-mustexist true]
 +	if {$p eq {}} return
 +
 +	set p [file normalize $p]
 +	if {![_is_git [file join $p .git]]} {
 +		error_popup [mc "Not a Git repository: %s" [file tail $p]]
 +		return
 +	}
 +	set local_path $p
 +}
 +
 +method _do_open2 {} {
 +	if {![_is_git [file join $local_path .git]]} {
 +		error_popup [mc "Not a Git repository: %s" [file tail $local_path]]
 +		return
 +	}
 +
 +	if {[catch {cd $local_path} err]} {
 +		error_popup [strcat \
 +			[mc "Failed to open repository %s:" $local_path] \
 +			"\n\n$err"]
 +		return
 +	}
 +
 +	_append_recentrepos [pwd]
 +	set ::_gitdir .git
 +	set ::_prefix {}
 +	set done 1
 +}
 +
 +}
diff --cc git-gui/lib/diff.tcl
index ec8c11eeb,000000000..c62875027
mode 100644,000000..100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@@ -1,730 -1,0 +1,733 @@@
 +# git-gui diff viewer
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc clear_diff {} {
 +	global ui_diff current_diff_path current_diff_header
 +	global ui_index ui_workdir
 +
 +	$ui_diff conf -state normal
 +	$ui_diff delete 0.0 end
 +	$ui_diff conf -state disabled
 +
 +	set current_diff_path {}
 +	set current_diff_header {}
 +
 +	$ui_index tag remove in_diff 0.0 end
 +	$ui_workdir tag remove in_diff 0.0 end
 +}
 +
 +proc reshow_diff {{after {}}} {
 +	global file_states file_lists
 +	global current_diff_path current_diff_side
 +	global ui_diff
 +
 +	set p $current_diff_path
 +	if {$p eq {}} {
 +		# No diff is being shown.
 +	} elseif {$current_diff_side eq {}} {
 +		clear_diff
 +	} elseif {[catch {set s $file_states($p)}]
 +		|| [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
 +
 +		if {[find_next_diff $current_diff_side $p {} {[^O]}]} {
 +			next_diff $after
 +		} else {
 +			clear_diff
 +		}
 +	} else {
 +		set save_pos [lindex [$ui_diff yview] 0]
 +		show_diff $p $current_diff_side {} $save_pos $after
 +	}
 +}
 +
 +proc force_diff_encoding {enc} {
 +	global current_diff_path
 +	
 +	if {$current_diff_path ne {}} {
 +		force_path_encoding $current_diff_path $enc
 +		reshow_diff
 +	}
 +}
 +
 +proc handle_empty_diff {} {
 +	global current_diff_path file_states file_lists
 +	global diff_empty_count
 +
 +	set path $current_diff_path
 +	set s $file_states($path)
- 	if {[lindex $s 0] ne {_M}} return
++	if {[lindex $s 0] ne {_M} || [has_textconv $path]} return
 +
 +	# Prevent infinite rescan loops
 +	incr diff_empty_count
 +	if {$diff_empty_count > 1} return
 +
 +	info_popup [mc "No differences detected.
 +
 +%s has no changes.
 +
 +The modification date of this file was updated by another application, but the content within the file was not changed.
 +
 +A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
 +
 +	clear_diff
 +	display_file $path __
 +	rescan ui_ready 0
 +}
 +
 +proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
 +	global file_states file_lists
 +	global is_3way_diff is_conflict_diff diff_active repo_config
 +	global ui_diff ui_index ui_workdir
 +	global current_diff_path current_diff_side current_diff_header
 +	global current_diff_queue
 +
 +	if {$diff_active || ![lock_index read]} return
 +
 +	clear_diff
 +	if {$lno == {}} {
 +		set lno [lsearch -sorted -exact $file_lists($w) $path]
 +		if {$lno >= 0} {
 +			incr lno
 +		}
 +	}
 +	if {$lno >= 1} {
 +		$w tag add in_diff $lno.0 [expr {$lno + 1}].0
 +		$w see $lno.0
 +	}
 +
 +	set s $file_states($path)
 +	set m [lindex $s 0]
 +	set is_conflict_diff 0
 +	set current_diff_path $path
 +	set current_diff_side $w
 +	set current_diff_queue {}
 +	ui_status [mc "Loading diff of %s..." [escape_path $path]]
 +
 +	set cont_info [list $scroll_pos $callback]
 +
 +	if {[string first {U} $m] >= 0} {
 +		merge_load_stages $path [list show_unmerged_diff $cont_info]
 +	} elseif {$m eq {_O}} {
 +		show_other_diff $path $w $m $cont_info
 +	} else {
 +		start_show_diff $cont_info
 +	}
 +}
 +
 +proc show_unmerged_diff {cont_info} {
 +	global current_diff_path current_diff_side
 +	global merge_stages ui_diff is_conflict_diff
 +	global current_diff_queue
 +
 +	if {$merge_stages(2) eq {}} {
 +		set is_conflict_diff 1
 +		lappend current_diff_queue \
 +			[list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \
 +			    [list ":1:$current_diff_path" ":3:$current_diff_path"]]
 +	} elseif {$merge_stages(3) eq {}} {
 +		set is_conflict_diff 1
 +		lappend current_diff_queue \
 +			[list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \
 +			    [list ":1:$current_diff_path" ":2:$current_diff_path"]]
 +	} elseif {[lindex $merge_stages(1) 0] eq {120000}
 +		|| [lindex $merge_stages(2) 0] eq {120000}
 +		|| [lindex $merge_stages(3) 0] eq {120000}} {
 +		set is_conflict_diff 1
 +		lappend current_diff_queue \
 +			[list [mc "LOCAL:\n"] d======= \
 +			    [list ":1:$current_diff_path" ":2:$current_diff_path"]]
 +		lappend current_diff_queue \
 +			[list [mc "REMOTE:\n"] d======= \
 +			    [list ":1:$current_diff_path" ":3:$current_diff_path"]]
 +	} else {
 +		start_show_diff $cont_info
 +		return
 +	}
 +
 +	advance_diff_queue $cont_info
 +}
 +
 +proc advance_diff_queue {cont_info} {
 +	global current_diff_queue ui_diff
 +
 +	set item [lindex $current_diff_queue 0]
 +	set current_diff_queue [lrange $current_diff_queue 1 end]
 +
 +	$ui_diff conf -state normal
 +	$ui_diff insert end [lindex $item 0] [lindex $item 1]
 +	$ui_diff conf -state disabled
 +
 +	start_show_diff $cont_info [lindex $item 2]
 +}
 +
 +proc show_other_diff {path w m cont_info} {
 +	global file_states file_lists
 +	global is_3way_diff diff_active repo_config
 +	global ui_diff ui_index ui_workdir
 +	global current_diff_path current_diff_side current_diff_header
 +
 +	# - Git won't give us the diff, there's nothing to compare to!
 +	#
 +	if {$m eq {_O}} {
 +		set max_sz 100000
 +		set type unknown
 +		if {[catch {
 +				set type [file type $path]
 +				switch -- $type {
 +				directory {
 +					set type submodule
 +					set content {}
 +					set sz 0
 +				}
 +				link {
 +					set content [file readlink $path]
 +					set sz [string length $content]
 +				}
 +				file {
 +					set fd [open $path r]
 +					fconfigure $fd \
 +						-eofchar {} \
 +						-encoding [get_path_encoding $path]
 +					set content [read $fd $max_sz]
 +					close $fd
 +					set sz [file size $path]
 +				}
 +				default {
 +					error "'$type' not supported"
 +				}
 +				}
 +			} err ]} {
 +			set diff_active 0
 +			unlock_index
 +			ui_status [mc "Unable to display %s" [escape_path $path]]
 +			error_popup [strcat [mc "Error loading file:"] "\n\n$err"]
 +			return
 +		}
 +		$ui_diff conf -state normal
 +		if {$type eq {submodule}} {
 +			$ui_diff insert end [append \
 +				"* " \
 +				[mc "Git Repository (subproject)"] \
 +				"\n"] d_@
 +		} elseif {![catch {set type [exec file $path]}]} {
 +			set n [string length $path]
 +			if {[string equal -length $n $path $type]} {
 +				set type [string range $type $n end]
 +				regsub {^:?\s*} $type {} type
 +			}
 +			$ui_diff insert end "* $type\n" d_@
 +		}
 +		if {[string first "\0" $content] != -1} {
 +			$ui_diff insert end \
 +				[mc "* Binary file (not showing content)."] \
 +				d_@
 +		} else {
 +			if {$sz > $max_sz} {
 +				$ui_diff insert end [mc \
 +"* Untracked file is %d bytes.
 +* Showing only first %d bytes.
 +" $sz $max_sz] d_@
 +			}
 +			$ui_diff insert end $content
 +			if {$sz > $max_sz} {
 +				$ui_diff insert end [mc "
 +* Untracked file clipped here by %s.
 +* To see the entire file, use an external editor.
 +" [appname]] d_@
 +			}
 +		}
 +		$ui_diff conf -state disabled
 +		set diff_active 0
 +		unlock_index
 +		set scroll_pos [lindex $cont_info 0]
 +		if {$scroll_pos ne {}} {
 +			update
 +			$ui_diff yview moveto $scroll_pos
 +		}
 +		ui_ready
 +		set callback [lindex $cont_info 1]
 +		if {$callback ne {}} {
 +			eval $callback
 +		}
 +		return
 +	}
 +}
 +
 +proc start_show_diff {cont_info {add_opts {}}} {
 +	global file_states file_lists
 +	global is_3way_diff is_submodule_diff diff_active repo_config
 +	global ui_diff ui_index ui_workdir
 +	global current_diff_path current_diff_side current_diff_header
 +
 +	set path $current_diff_path
 +	set w $current_diff_side
 +
 +	set s $file_states($path)
 +	set m [lindex $s 0]
 +	set is_3way_diff 0
 +	set is_submodule_diff 0
 +	set diff_active 1
 +	set current_diff_header {}
 +
 +	set cmd [list]
 +	if {$w eq $ui_index} {
 +		lappend cmd diff-index
 +		lappend cmd --cached
 +	} elseif {$w eq $ui_workdir} {
 +		if {[string first {U} $m] >= 0} {
 +			lappend cmd diff
 +		} else {
 +			lappend cmd diff-files
 +		}
 +	}
++	if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
++		lappend cmd --textconv
++	}
 +
 +	if {[string match {160000 *} [lindex $s 2]]
 +	 || [string match {160000 *} [lindex $s 3]]} {
 +		set is_submodule_diff 1
 +
 +		if {[git-version >= "1.6.6"]} {
 +			lappend cmd --submodule
 +		}
 +	}
 +
 +	lappend cmd -p
 +	lappend cmd --no-color
 +	if {$repo_config(gui.diffcontext) >= 1} {
 +		lappend cmd "-U$repo_config(gui.diffcontext)"
 +	}
 +	if {$w eq $ui_index} {
 +		lappend cmd [PARENT]
 +	}
 +	if {$add_opts ne {}} {
 +		eval lappend cmd $add_opts
 +	} else {
 +		lappend cmd --
 +		lappend cmd $path
 +	}
 +
 +	if {$is_submodule_diff && [git-version < "1.6.6"]} {
 +		if {$w eq $ui_index} {
 +			set cmd [list submodule summary --cached -- $path]
 +		} else {
 +			set cmd [list submodule summary --files -- $path]
 +		}
 +	}
 +
 +	if {[catch {set fd [eval git_read --nice $cmd]} err]} {
 +		set diff_active 0
 +		unlock_index
 +		ui_status [mc "Unable to display %s" [escape_path $path]]
 +		error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 +		return
 +	}
 +
 +	set ::current_diff_inheader 1
 +	fconfigure $fd \
 +		-blocking 0 \
 +		-encoding [get_path_encoding $path] \
 +		-translation lf
 +	fileevent $fd readable [list read_diff $fd $cont_info]
 +}
 +
 +proc read_diff {fd cont_info} {
 +	global ui_diff diff_active is_submodule_diff
 +	global is_3way_diff is_conflict_diff current_diff_header
 +	global current_diff_queue
 +	global diff_empty_count
 +
 +	$ui_diff conf -state normal
 +	while {[gets $fd line] >= 0} {
 +		# -- Cleanup uninteresting diff header lines.
 +		#
 +		if {$::current_diff_inheader} {
 +			if {   [string match {diff --git *}      $line]
 +			    || [string match {diff --cc *}       $line]
 +			    || [string match {diff --combined *} $line]
 +			    || [string match {--- *}             $line]
 +			    || [string match {+++ *}             $line]} {
 +				append current_diff_header $line "\n"
 +				continue
 +			}
 +		}
 +		if {[string match {index *} $line]} continue
 +		if {$line eq {deleted file mode 120000}} {
 +			set line "deleted symlink"
 +		}
 +		set ::current_diff_inheader 0
 +
 +		# -- Automatically detect if this is a 3 way diff.
 +		#
 +		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 +
 +		if {[string match {mode *} $line]
 +			|| [string match {new file *} $line]
 +			|| [regexp {^(old|new) mode *} $line]
 +			|| [string match {deleted file *} $line]
 +			|| [string match {deleted symlink} $line]
 +			|| [string match {Binary files * and * differ} $line]
 +			|| $line eq {\ No newline at end of file}
 +			|| [regexp {^\* Unmerged path } $line]} {
 +			set tags {}
 +		} elseif {$is_3way_diff} {
 +			set op [string range $line 0 1]
 +			switch -- $op {
 +			{  } {set tags {}}
 +			{@@} {set tags d_@}
 +			{ +} {set tags d_s+}
 +			{ -} {set tags d_s-}
 +			{+ } {set tags d_+s}
 +			{- } {set tags d_-s}
 +			{--} {set tags d_--}
 +			{++} {
 +				if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
 +					set is_conflict_diff 1
 +					set line [string replace $line 0 1 {  }]
 +					set tags d$op
 +				} else {
 +					set tags d_++
 +				}
 +			}
 +			default {
 +				puts "error: Unhandled 3 way diff marker: {$op}"
 +				set tags {}
 +			}
 +			}
 +		} elseif {$is_submodule_diff} {
 +			if {$line == ""} continue
 +			if {[regexp {^Submodule } $line]} {
 +				set tags d_@
 +			} elseif {[regexp {^\* } $line]} {
 +				set line [string replace $line 0 1 {Submodule }]
 +				set tags d_@
 +			} else {
 +				set op [string range $line 0 2]
 +				switch -- $op {
 +				{  <} {set tags d_-}
 +				{  >} {set tags d_+}
 +				{  W} {set tags {}}
 +				default {
 +					puts "error: Unhandled submodule diff marker: {$op}"
 +					set tags {}
 +				}
 +				}
 +			}
 +		} else {
 +			set op [string index $line 0]
 +			switch -- $op {
 +			{ } {set tags {}}
 +			{@} {set tags d_@}
 +			{-} {set tags d_-}
 +			{+} {
 +				if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
 +					set is_conflict_diff 1
 +					set tags d$op
 +				} else {
 +					set tags d_+
 +				}
 +			}
 +			default {
 +				puts "error: Unhandled 2 way diff marker: {$op}"
 +				set tags {}
 +			}
 +			}
 +		}
 +		$ui_diff insert end $line $tags
 +		if {[string index $line end] eq "\r"} {
 +			$ui_diff tag add d_cr {end - 2c}
 +		}
 +		$ui_diff insert end "\n" $tags
 +	}
 +	$ui_diff conf -state disabled
 +
 +	if {[eof $fd]} {
 +		close $fd
 +
 +		if {$current_diff_queue ne {}} {
 +			advance_diff_queue $cont_info
 +			return
 +		}
 +
 +		set diff_active 0
 +		unlock_index
 +		set scroll_pos [lindex $cont_info 0]
 +		if {$scroll_pos ne {}} {
 +			update
 +			$ui_diff yview moveto $scroll_pos
 +		}
 +		ui_ready
 +
 +		if {[$ui_diff index end] eq {2.0}} {
 +			handle_empty_diff
 +		} else {
 +			set diff_empty_count 0
 +		}
 +
 +		set callback [lindex $cont_info 1]
 +		if {$callback ne {}} {
 +			eval $callback
 +		}
 +	}
 +}
 +
 +proc apply_hunk {x y} {
 +	global current_diff_path current_diff_header current_diff_side
 +	global ui_diff ui_index file_states
 +
 +	if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +	if {![lock_index apply_hunk]} return
 +
 +	set apply_cmd {apply --cached --whitespace=nowarn}
 +	set mi [lindex $file_states($current_diff_path) 0]
 +	if {$current_diff_side eq $ui_index} {
 +		set failed_msg [mc "Failed to unstage selected hunk."]
 +		lappend apply_cmd --reverse
 +		if {[string index $mi 0] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	} else {
 +		set failed_msg [mc "Failed to stage selected hunk."]
 +		if {[string index $mi 1] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	}
 +
 +	set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
 +	set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
 +	if {$s_lno eq {}} {
 +		unlock_index
 +		return
 +	}
 +
 +	set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
 +	if {$e_lno eq {}} {
 +		set e_lno end
 +	}
 +
 +	if {[catch {
 +		set enc [get_path_encoding $current_diff_path]
 +		set p [eval git_write $apply_cmd]
 +		fconfigure $p -translation binary -encoding $enc
 +		puts -nonewline $p $current_diff_header
 +		puts -nonewline $p [$ui_diff get $s_lno $e_lno]
 +		close $p} err]} {
 +		error_popup [append $failed_msg "\n\n$err"]
 +		unlock_index
 +		return
 +	}
 +
 +	$ui_diff conf -state normal
 +	$ui_diff delete $s_lno $e_lno
 +	$ui_diff conf -state disabled
 +
 +	if {[$ui_diff get 1.0 end] eq "\n"} {
 +		set o _
 +	} else {
 +		set o ?
 +	}
 +
 +	if {$current_diff_side eq $ui_index} {
 +		set mi ${o}M
 +	} elseif {[string index $mi 0] eq {_}} {
 +		set mi M$o
 +	} else {
 +		set mi ?$o
 +	}
 +	unlock_index
 +	display_file $current_diff_path $mi
 +	# This should trigger shift to the next changed file
 +	if {$o eq {_}} {
 +		reshow_diff
 +	}
 +}
 +
 +proc apply_range_or_line {x y} {
 +	global current_diff_path current_diff_header current_diff_side
 +	global ui_diff ui_index file_states
 +
 +	set selected [$ui_diff tag nextrange sel 0.0]
 +
 +	if {$selected == {}} {
 +		set first [$ui_diff index "@$x,$y"]
 +		set last $first
 +	} else {
 +		set first [lindex $selected 0]
 +		set last [lindex $selected 1]
 +	}
 +
 +	set first_l [$ui_diff index "$first linestart"]
 +	set last_l [$ui_diff index "$last lineend"]
 +
 +	if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +	if {![lock_index apply_hunk]} return
 +
 +	set apply_cmd {apply --cached --whitespace=nowarn}
 +	set mi [lindex $file_states($current_diff_path) 0]
 +	if {$current_diff_side eq $ui_index} {
 +		set failed_msg [mc "Failed to unstage selected line."]
 +		set to_context {+}
 +		lappend apply_cmd --reverse
 +		if {[string index $mi 0] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	} else {
 +		set failed_msg [mc "Failed to stage selected line."]
 +		set to_context {-}
 +		if {[string index $mi 1] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	}
 +
 +	set wholepatch {}
 +
 +	while {$first_l < $last_l} {
 +		set i_l [$ui_diff search -backwards -regexp ^@@ $first_l 0.0]
 +		if {$i_l eq {}} {
 +			# If there's not a @@ above, then the selected range
 +			# must have come before the first_l @@
 +			set i_l [$ui_diff search -regexp ^@@ $first_l $last_l]
 +		}
 +		if {$i_l eq {}} {
 +			unlock_index
 +			return
 +		}
 +		# $i_l is now at the beginning of a line
 +
 +		# pick start line number from hunk header
 +		set hh [$ui_diff get $i_l "$i_l + 1 lines"]
 +		set hh [lindex [split $hh ,] 0]
 +		set hln [lindex [split $hh -] 1]
 +
 +		# There is a special situation to take care of. Consider this
 +		# hunk:
 +		#
 +		#    @@ -10,4 +10,4 @@
 +		#     context before
 +		#    -old 1
 +		#    -old 2
 +		#    +new 1
 +		#    +new 2
 +		#     context after
 +		#
 +		# We used to keep the context lines in the order they appear in
 +		# the hunk. But then it is not possible to correctly stage only
 +		# "-old 1" and "+new 1" - it would result in this staged text:
 +		#
 +		#    context before
 +		#    old 2
 +		#    new 1
 +		#    context after
 +		#
 +		# (By symmetry it is not possible to *un*stage "old 2" and "new
 +		# 2".)
 +		#
 +		# We resolve the problem by introducing an asymmetry, namely,
 +		# when a "+" line is *staged*, it is moved in front of the
 +		# context lines that are generated from the "-" lines that are
 +		# immediately before the "+" block. That is, we construct this
 +		# patch:
 +		#
 +		#    @@ -10,4 +10,5 @@
 +		#     context before
 +		#    +new 1
 +		#     old 1
 +		#     old 2
 +		#     context after
 +		#
 +		# But we do *not* treat "-" lines that are *un*staged in a
 +		# special way.
 +		#
 +		# With this asymmetry it is possible to stage the change "old
 +		# 1" -> "new 1" directly, and to stage the change "old 2" ->
 +		# "new 2" by first staging the entire hunk and then unstaging
 +		# the change "old 1" -> "new 1".
 +		#
 +		# Applying multiple lines adds complexity to the special
 +		# situation.  The pre_context must be moved after the entire
 +		# first block of consecutive staged "+" lines, so that
 +		# staging both additions gives the following patch:
 +		#
 +		#    @@ -10,4 +10,6 @@
 +		#     context before
 +		#    +new 1
 +		#    +new 2
 +		#     old 1
 +		#     old 2
 +		#     context after
 +
 +		# This is non-empty if and only if we are _staging_ changes;
 +		# then it accumulates the consecutive "-" lines (after
 +		# converting them to context lines) in order to be moved after
 +		# "+" change lines.
 +		set pre_context {}
 +
 +		set n 0
 +		set m 0
 +		set i_l [$ui_diff index "$i_l + 1 lines"]
 +		set patch {}
 +		while {[$ui_diff compare $i_l < "end - 1 chars"] &&
 +		       [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} {
 +			set next_l [$ui_diff index "$i_l + 1 lines"]
 +			set c1 [$ui_diff get $i_l]
 +			if {[$ui_diff compare $first_l <= $i_l] &&
 +			    [$ui_diff compare $i_l < $last_l] &&
 +			    ($c1 eq {-} || $c1 eq {+})} {
 +				# a line to stage/unstage
 +				set ln [$ui_diff get $i_l $next_l]
 +				if {$c1 eq {-}} {
 +					set n [expr $n+1]
 +					set patch "$patch$pre_context$ln"
 +					set pre_context {}
 +				} else {
 +					set m [expr $m+1]
 +					set patch "$patch$ln"
 +				}
 +			} elseif {$c1 ne {-} && $c1 ne {+}} {
 +				# context line
 +				set ln [$ui_diff get $i_l $next_l]
 +				set patch "$patch$pre_context$ln"
 +				set n [expr $n+1]
 +				set m [expr $m+1]
 +				set pre_context {}
 +			} elseif {$c1 eq $to_context} {
 +				# turn change line into context line
 +				set ln [$ui_diff get "$i_l + 1 chars" $next_l]
 +				if {$c1 eq {-}} {
 +					set pre_context "$pre_context $ln"
 +				} else {
 +					set patch "$patch $ln"
 +				}
 +				set n [expr $n+1]
 +				set m [expr $m+1]
 +			} else {
 +				# a change in the opposite direction of
 +				# to_context which is outside the range of
 +				# lines to apply.
 +				set patch "$patch$pre_context"
 +				set pre_context {}
 +			}
 +			set i_l $next_l
 +		}
 +		set patch "$patch$pre_context"
 +		set wholepatch "$wholepatch@@ -$hln,$n +$hln,$m @@\n$patch"
 +		set first_l [$ui_diff index "$next_l + 1 lines"]
 +	}
 +
 +	if {[catch {
 +		set enc [get_path_encoding $current_diff_path]
 +		set p [eval git_write $apply_cmd]
 +		fconfigure $p -translation binary -encoding $enc
 +		puts -nonewline $p $current_diff_header
 +		puts -nonewline $p $wholepatch
 +		close $p} err]} {
 +		error_popup [append $failed_msg "\n\n$err"]
 +	}
 +
 +	unlock_index
 +}
diff --cc git-gui/lib/option.tcl
index d4c5e45c8,000000000..3807c8d28
mode 100644,000000..100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@@ -1,325 -1,0 +1,326 @@@
 +# git-gui options editor
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc config_check_encodings {} {
 +	global repo_config_new global_config_new
 +
 +	set enc $global_config_new(gui.encoding)
 +	if {$enc eq {}} {
 +		set global_config_new(gui.encoding) [encoding system]
 +	} elseif {[tcl_encoding $enc] eq {}} {
 +		error_popup [mc "Invalid global encoding '%s'" $enc]
 +		return 0
 +	}
 +
 +	set enc $repo_config_new(gui.encoding)
 +	if {$enc eq {}} {
 +		set repo_config_new(gui.encoding) [encoding system]
 +	} elseif {[tcl_encoding $enc] eq {}} {
 +		error_popup [mc "Invalid repo encoding '%s'" $enc]
 +		return 0
 +	}
 +
 +	return 1
 +}
 +
 +proc save_config {} {
 +	global default_config font_descs
 +	global repo_config global_config system_config
 +	global repo_config_new global_config_new
 +	global ui_comm_spell
 +
 +	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)
 +		font configure ${font}italic \
 +			-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] {
 +		set value $global_config_new($name)
 +		if {$value ne $global_config($name)} {
 +			if {$value eq $system_config($name)} {
 +				catch {git config --global --unset $name}
 +			} else {
 +				regsub -all "\[{}\]" $value {"} value
 +				git config --global $name $value
 +			}
 +			set global_config($name) $value
 +			if {$value eq $repo_config($name)} {
 +				catch {git config --unset $name}
 +				set repo_config($name) $value
 +			}
 +		}
 +	}
 +
 +	foreach name [array names default_config] {
 +		set value $repo_config_new($name)
 +		if {$value ne $repo_config($name)} {
 +			if {$value eq $global_config($name)} {
 +				catch {git config --unset $name}
 +			} else {
 +				regsub -all "\[{}\]" $value {"} value
 +				git config $name $value
 +			}
 +			set repo_config($name) $value
 +		}
 +	}
 +
 +	if {[info exists repo_config(gui.spellingdictionary)]} {
 +		set value $repo_config(gui.spellingdictionary)
 +		if {$value eq {none}} {
 +			if {[info exists ui_comm_spell]} {
 +				$ui_comm_spell stop
 +			}
 +		} elseif {[info exists ui_comm_spell]} {
 +			$ui_comm_spell lang $value
 +		}
 +	}
 +}
 +
 +proc do_options {} {
 +	global repo_config global_config font_descs
 +	global repo_config_new global_config_new
 +	global ui_comm_spell use_ttk NS
 +
 +	array unset repo_config_new
 +	array unset global_config_new
 +	foreach name [array names repo_config] {
 +		set repo_config_new($name) $repo_config($name)
 +	}
 +	load_config 1
 +	foreach name [array names repo_config] {
 +		switch -- $name {
 +		gui.diffcontext {continue}
 +		}
 +		set repo_config_new($name) $repo_config($name)
 +	}
 +	foreach name [array names global_config] {
 +		set global_config_new($name) $global_config($name)
 +	}
 +
 +	set w .options_editor
 +	Dialog $w
 +	wm withdraw $w
 +	wm transient $w [winfo parent $w]
 +	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
 +	${NS}::frame $w.buttons
 +	${NS}::button $w.buttons.restore -text [mc "Restore Defaults"] \
 +		-default normal \
 +		-command do_restore_defaults
 +	pack $w.buttons.restore -side left
 +	${NS}::button $w.buttons.save -text [mc Save] \
 +		-default active \
 +		-command [list do_save_config $w]
 +	pack $w.buttons.save -side right
 +	${NS}::button $w.buttons.cancel -text [mc "Cancel"] \
 +		-default normal \
 +		-command [list destroy $w]
 +	pack $w.buttons.cancel -side right -padx 5
 +	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +	${NS}::labelframe $w.repo -text [mc "%s Repository" [reponame]]
 +	${NS}::labelframe $w.global -text [mc "Global (All Repositories)"]
 +	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
 +
 +	set optid 0
 +	foreach option {
 +		{t user.name {mc "User Name"}}
 +		{t user.email {mc "Email Address"}}
 +
 +		{b merge.summary {mc "Summarize Merge Commits"}}
 +		{i-1..5 merge.verbosity {mc "Merge Verbosity"}}
 +		{b merge.diffstat {mc "Show Diffstat After Merge"}}
 +		{t merge.tool {mc "Use Merge Tool"}}
 +
 +		{b gui.trustmtime  {mc "Trust File Modification Timestamps"}}
 +		{b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
 +		{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
++		{b gui.textconv {mc "Use Textconv For Diffs and Blames"}}
 +		{b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
 +		{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
 +		{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
 +		{i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
 +		{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
 +		{t gui.newbranchtemplate {mc "New Branch Name Template"}}
 +		{c gui.encoding {mc "Default File Contents Encoding"}}
 +		} {
 +		set type [lindex $option 0]
 +		set name [lindex $option 1]
 +		set text [eval [lindex $option 2]]
 +		incr optid
 +		foreach f {repo global} {
 +			switch -glob -- $type {
 +			b {
 +				${NS}::checkbutton $w.$f.$optid -text $text \
 +					-variable ${f}_config_new($name) \
 +					-onvalue true \
 +					-offvalue false
 +				pack $w.$f.$optid -side top -anchor w
 +			}
 +			i-* {
 +				regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
 +				${NS}::frame $w.$f.$optid
 +				${NS}::label $w.$f.$optid.l -text "$text:"
 +				pack $w.$f.$optid.l -side left -anchor w -fill x
 +				tspinbox $w.$f.$optid.v \
 +					-textvariable ${f}_config_new($name) \
 +					-from $min \
 +					-to $max \
 +					-increment 1 \
 +					-width [expr {1 + [string length $max]}]
 +				bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
 +				pack $w.$f.$optid.v -side right -anchor e -padx 5
 +				pack $w.$f.$optid -side top -anchor w -fill x
 +			}
 +			c -
 +			t {
 +				${NS}::frame $w.$f.$optid
 +				${NS}::label $w.$f.$optid.l -text "$text:"
 +				${NS}::entry $w.$f.$optid.v \
 +					-width 20 \
 +					-textvariable ${f}_config_new($name)
 +				pack $w.$f.$optid.l -side left -anchor w
 +				pack $w.$f.$optid.v -side left -anchor w \
 +					-fill x -expand 1 \
 +					-padx 5
 +				if {$type eq {c}} {
 +					menu $w.$f.$optid.m
 +					build_encoding_menu $w.$f.$optid.m \
 +						[list set ${f}_config_new($name)] 1
 +					${NS}::button $w.$f.$optid.b \
 +						-text [mc "Change"] \
 +						-command [list popup_btn_menu \
 +							$w.$f.$optid.m $w.$f.$optid.b]
 +					pack $w.$f.$optid.b -side left -anchor w
 +				}
 +				pack $w.$f.$optid -side top -anchor w -fill x
 +			}
 +			}
 +		}
 +	}
 +
 +	set all_dicts [linsert \
 +		[spellcheck::available_langs] \
 +		0 \
 +		none]
 +	incr optid
 +	foreach f {repo global} {
 +		if {![info exists ${f}_config_new(gui.spellingdictionary)]} {
 +			if {[info exists ui_comm_spell]} {
 +				set value [$ui_comm_spell lang]
 +			} else {
 +				set value none
 +			}
 +			set ${f}_config_new(gui.spellingdictionary) $value
 +		}
 +
 +		${NS}::frame $w.$f.$optid
 +		${NS}::label $w.$f.$optid.l -text [mc "Spelling Dictionary:"]
 +		if {$use_ttk} {
 +			ttk::combobox $w.$f.$optid.v \
 +				-textvariable ${f}_config_new(gui.spellingdictionary) \
 +				-values $all_dicts -state readonly
 +		} else {
 +			eval tk_optionMenu $w.$f.$optid.v \
 +				${f}_config_new(gui.spellingdictionary) \
 +				$all_dicts
 +		}
 +		pack $w.$f.$optid.l -side left -anchor w -fill x
 +		pack $w.$f.$optid.v -side right -anchor e -padx 5
 +		pack $w.$f.$optid -side top -anchor w -fill x
 +	}
 +	unset all_dicts
 +
 +	set all_fonts [lsort [font families]]
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		set text [eval [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]
 +
 +		${NS}::frame $w.global.$name
 +		${NS}::label $w.global.$name.l -text "$text:"
 +		${NS}::button $w.global.$name.b \
 +			-text [mc "Change Font"] \
 +			-command [list \
 +				tchoosefont \
 +				$w \
 +				[mc "Choose %s" $text] \
 +				global_config_new(gui.$font^^family) \
 +				global_config_new(gui.$font^^size) \
 +				]
 +		${NS}::label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
 +		${NS}::label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
 +		${NS}::label $w.global.$name.pt -text [mc "pt."]
 +		pack $w.global.$name.l -side left -anchor w
 +		pack $w.global.$name.b -side right -anchor e
 +		pack $w.global.$name.pt -side right -anchor w
 +		pack $w.global.$name.s -side right -anchor w
 +		pack $w.global.$name.f -side right -anchor w
 +		pack $w.global.$name -side top -anchor w -fill x
 +	}
 +
 +	bind $w <Visibility> "grab $w; focus $w.buttons.save"
 +	bind $w <Key-Escape> "destroy $w"
 +	bind $w <Key-Return> [list do_save_config $w]
 +
 +	if {[is_MacOSX]} {
 +		set t [mc "Preferences"]
 +	} else {
 +		set t [mc "Options"]
 +	}
 +	wm title $w "[appname] ([reponame]): $t"
 +	wm deiconify $w
 +	tkwait window $w
 +}
 +
 +proc do_restore_defaults {} {
 +	global font_descs default_config repo_config system_config
 +	global repo_config_new global_config_new
 +
 +	foreach name [array names default_config] {
 +		set repo_config_new($name) $system_config($name)
 +		set global_config_new($name) $system_config($name)
 +	}
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set repo_config(gui.$name) $system_config(gui.$name)
 +	}
 +	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 {![config_check_encodings]} return
 +	if {[catch {save_config} err]} {
 +		error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"]
 +	}
 +	reshow_diff
 +	destroy $w
 +}
diff --cc git-gui/lib/shortcut.tcl
index 79c1888e1,000000000..78878ef89
mode 100644,000000..100644
--- a/git-gui/lib/shortcut.tcl
+++ b/git-gui/lib/shortcut.tcl
@@@ -1,140 -1,0 +1,140 @@@
 +# git-gui desktop icon creators
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc do_windows_shortcut {} {
 +	global _gitworktree
 +	set fn [tk_getSaveFile \
 +		-parent . \
 +		-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
 +		-initialfile "Git [reponame].lnk"]
 +	if {$fn != {}} {
 +		if {[file extension $fn] ne {.lnk}} {
 +			set fn ${fn}.lnk
 +		}
 +		if {[catch {
 +				win32_create_lnk $fn [list \
 +					[info nameofexecutable] \
 +					[file normalize $::argv0] \
 +					] \
- 					[file normalize [$_gitworktree]]
++					[file normalize $_gitworktree]
 +			} err]} {
 +			error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
 +		}
 +	}
 +}
 +
 +proc do_cygwin_shortcut {} {
 +	global argv0 _gitworktree
 +
 +	if {[catch {
 +		set desktop [exec cygpath \
 +			--windows \
 +			--absolute \
 +			--long-name \
 +			--desktop]
 +		}]} {
 +			set desktop .
 +	}
 +	set fn [tk_getSaveFile \
 +		-parent . \
 +		-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
 +		-initialdir $desktop \
 +		-initialfile "Git [reponame].lnk"]
 +	if {$fn != {}} {
 +		if {[file extension $fn] ne {.lnk}} {
 +			set fn ${fn}.lnk
 +		}
 +		if {[catch {
 +				set sh [exec cygpath \
 +					--windows \
 +					--absolute \
 +					/bin/sh.exe]
 +				set me [exec cygpath \
 +					--unix \
 +					--absolute \
 +					$argv0]
 +				win32_create_lnk $fn [list \
 +					$sh -c \
 +					"CHERE_INVOKING=1 source /etc/profile;[sq $me] &" \
 +					] \
- 					[file normalize [$_gitworktree]]
++					[file normalize $_gitworktree]
 +			} err]} {
 +			error_popup [strcat [mc "Cannot write shortcut:"] "\n\n$err"]
 +		}
 +	}
 +}
 +
 +proc do_macosx_app {} {
 +	global argv0 env
 +
 +	set fn [tk_getSaveFile \
 +		-parent . \
 +		-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \
 +		-initialdir [file join $env(HOME) Desktop] \
 +		-initialfile "Git [reponame].app"]
 +	if {$fn != {}} {
 +		if {[file extension $fn] ne {.app}} {
 +			set fn ${fn}.app
 +		}
 +		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]
 +				puts $fd "#!/bin/sh"
 +				foreach name [lsort [array names env]] {
 +					set value $env($name)
 +					switch -- $name {
 +					GIT_DIR { set value [file normalize [gitdir]] }
 +					}
 +
 +					switch -glob -- $name {
 +					SSH_* -
 +					GIT_* {
 +						puts $fd "if test \"z\$$name\" = z; then"
 +						puts $fd "  export $name=[sq $value]"
 +						puts $fd "fi &&"
 +					}
 +					}
 +				}
 +				puts $fd "export PATH=[sq [file dirname $::_git]]:\$PATH &&"
 +				puts $fd "cd [sq [file normalize [pwd]]] &&"
 +				puts $fd "exec \\"
 +				puts $fd " [sq [info nameofexecutable]] \\"
 +				puts $fd " [sq [file normalize $argv0]]"
 +				close $fd
 +
 +				file attributes $exe -permissions u+x,g+x,o+x
 +			} err]} {
 +			error_popup [strcat [mc "Cannot write icon:"] "\n\n$err"]
 +		}
 +	}
 +}
diff --cc git-gui/lib/status_bar.tcl
index 5fe3aad38,000000000..95cb44991
mode 100644,000000..100644
--- a/git-gui/lib/status_bar.tcl
+++ b/git-gui/lib/status_bar.tcl
@@@ -1,129 -1,0 +1,130 @@@
 +# git-gui status bar mega-widget
 +# Copyright (C) 2007 Shawn Pearce
 +
 +class status_bar {
 +
 +field w         ; # our own window path
 +field w_l       ; # text widget we draw messages into
 +field w_c       ; # canvas we draw a progress bar into
 +field c_pack    ; # script to pack the canvas with
 +field status  {}; # single line of text we show
 +field prefix  {}; # text we format into status
 +field units   {}; # unit of progress
 +field meter   {}; # current core git progress meter (if active)
 +
 +constructor new {path} {
 +	global use_ttk NS
 +	set w $path
 +	set w_l $w.l
 +	set w_c $w.c
 +
 +	${NS}::frame $w
 +	if {!$use_ttk} {
 +		$w configure -borderwidth 1 -relief sunken
 +	}
 +	${NS}::label $w_l \
 +		-textvariable @status \
 +		-anchor w \
 +		-justify left
 +	pack $w_l -side left
 +	set c_pack [cb _oneline_pack]
 +
 +	bind $w <Destroy> [cb _delete %W]
 +	return $this
 +}
 +
 +method _oneline_pack {} {
 +	$w_c conf -width 100
 +	pack $w_c -side right
 +}
 +
 +constructor two_line {path} {
++	global NS
 +	set w $path
 +	set w_l $w.l
 +	set w_c $w.c
 +
 +	${NS}::frame $w
 +	${NS}::label $w_l \
 +		-textvariable @status \
 +		-anchor w \
 +		-justify left
 +	pack $w_l -anchor w -fill x
 +	set c_pack [list pack $w_c -fill x]
 +
 +	bind $w <Destroy> [cb _delete %W]
 +	return $this
 +}
 +
 +method start {msg uds} {
 +	if {[winfo exists $w_c]} {
 +		$w_c coords bar 0 0 0 20
 +	} else {
 +		canvas $w_c \
 +			-height [expr {int([winfo reqheight $w_l] * 0.6)}] \
 +			-borderwidth 1 \
 +			-relief groove \
 +			-highlightt 0
 +		$w_c create rectangle 0 0 0 20 -tags bar -fill navy
 +		eval $c_pack
 +	}
 +
 +	set status $msg
 +	set prefix $msg
 +	set units  $uds
 +	set meter  {}
 +}
 +
 +method update {have total} {
 +	set pdone 0
 +	if {$total > 0} {
 +		set pdone [expr {100 * $have / $total}]
 +		set cdone [expr {[winfo width $w_c] * $have / $total}]
 +	}
 +
 +	set prec [string length [format %i $total]]
 +	set status [mc "%s ... %*i of %*i %s (%3i%%)" \
 +		$prefix \
 +		$prec $have \
 +		$prec $total \
 +		$units $pdone]
 +	$w_c coords bar 0 0 $cdone 20
 +}
 +
 +method update_meter {buf} {
 +	append meter $buf
 +	set r [string last "\r" $meter]
 +	if {$r == -1} {
 +		return
 +	}
 +
 +	set prior [string range $meter 0 $r]
 +	set meter [string range $meter [expr {$r + 1}] end]
 +	set p "\\((\\d+)/(\\d+)\\)"
 +	if {[regexp ":\\s*\\d+% $p\(?:, done.\\s*\n|\\s*\r)\$" $prior _j a b]} {
 +		update $this $a $b
 +	} elseif {[regexp "$p\\s+done\r\$" $prior _j a b]} {
 +		update $this $a $b
 +	}
 +}
 +
 +method stop {{msg {}}} {
 +	destroy $w_c
 +	if {$msg ne {}} {
 +		set status $msg
 +	}
 +}
 +
 +method show {msg {test {}}} {
 +	if {$test eq {} || $status eq $test} {
 +		set status $msg
 +	}
 +}
 +
 +method _delete {current} {
 +	if {$current eq $w} {
 +		delete_this
 +	}
 +}
 +
 +}
diff --cc git-gui/lib/win32.tcl
index d7f93d045,000000000..db91ab84a
mode 100644,000000..100644
--- a/git-gui/lib/win32.tcl
+++ b/git-gui/lib/win32.tcl
@@@ -1,26 -1,0 +1,26 @@@
 +# git-gui Misc. native Windows 32 support
 +# Copyright (C) 2007 Shawn Pearce
 +
 +proc win32_read_lnk {lnk_path} {
 +	return [exec cscript.exe \
 +		/E:jscript \
 +		/nologo \
 +		[file join $::oguilib win32_shortcut.js] \
 +		$lnk_path]
 +}
 +
 +proc win32_create_lnk {lnk_path lnk_exec lnk_dir} {
 +	global oguilib
 +
 +	set lnk_args [lrange $lnk_exec 1 end]
 +	set lnk_exec [lindex $lnk_exec 0]
 +
 +	eval [list exec wscript.exe \
 +		/E:jscript \
 +		/nologo \
- 		[file join $oguilib win32_shortcut.js] \
++		[file nativename [file join $oguilib win32_shortcut.js]] \
 +		$lnk_path \
- 		[file join $oguilib git-gui.ico] \
++		[file nativename [file join $oguilib git-gui.ico]] \
 +		$lnk_dir \
 +		$lnk_exec] $lnk_args
 +}
diff --cc git-gui/windows/git-gui.sh
index 66bbb2f8f,000000000..b1845c505
mode 100644,000000..100644
--- a/git-gui/windows/git-gui.sh
+++ b/git-gui/windows/git-gui.sh
@@@ -1,24 -1,0 +1,25 @@@
 +#!/bin/sh
 +# Tcl ignores the next line -*- tcl -*- \
 +exec wish "$0" -- "$@"
 +
 +if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
 +	set workdir [lindex $argv 1]
 +	cd $workdir
 +	if {[lindex [file split $workdir] end] eq {.git}} {
 +		# Workaround for Explorer right click "Git GUI Here" on .git/
 +		cd ..
 +	}
 +	set argv [lrange $argv 2 end]
 +	incr argc -2
 +}
 +
- set bindir [file dirname \
++set basedir [file dirname \
 +            [file dirname \
 +             [file dirname [info script]]]]
- set bindir [file join $bindir bin]
++set bindir [file join $basedir bin]
++set bindir "$bindir;[file join $basedir mingw bin]"
 +regsub -all ";" $bindir "\\;" bindir
 +set env(PATH) "$bindir;$env(PATH)"
 +unset bindir
 +
 +source [file join [file dirname [info script]] git-gui.tcl]