From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Feb 2008 19:23:59 +0000 (-0800)
Subject: Merge branch 'maint' of git://repo.or.cz/git-gui into maint
X-Git-Tag: v1.5.4.3~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e98d6df75260312e906278705f78f2eee39cc8fc;p=git.git

Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' of git://repo.or.cz/git-gui:
  git-gui: Focus insertion point at end of strings in repository chooser
  git-gui: Avoid hardcoded Windows paths in Cygwin package files
  git-gui: Default TCL_PATH to same location as TCLTK_PATH
  git-gui: Paper bag fix error dialogs opening over the main window
  git-gui: Ensure error dialogs always appear over all other windows
  git-gui: relax "dirty" version detection
  git-gui: support Git Gui.app under OS X 10.5
---

e98d6df75260312e906278705f78f2eee39cc8fc
diff --cc git-gui/Makefile
index 34438cdf5,000000000..01e0a46ba
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,311 -1,0 +1,334 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +# Define NO_MSGFMT if you do not have msgfmt from the GNU gettext
 +# package and want to use our rough pure Tcl po->msg translator.
 +# TCL_PATH must be vaild for this to work.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +	@$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
++uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_MAIN := git-gui
 +GITGUI_BUILT_INS = git-citool
 +ALL_LIBFILES = $(wildcard lib/*.tcl)
 +PRELOAD_FILES = lib/class.tcl
 +NONTCL_LIBFILES = \
 +	lib/git-gui.ico \
 +	$(wildcard lib/win32_*.js) \
 +#end NONTCL_LIBFILES
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef sharedir
 +	sharedir := $(dir $(gitexecdir))share
 +endif
 +
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +RM_RF     ?= rm -rf
 +RMDIR     ?= rmdir
 +
 +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
 +INSTALL_D1 =
 +INSTALL_R0 = $(INSTALL) -m 644 # space is required here
 +INSTALL_R1 =
 +INSTALL_X0 = $(INSTALL) -m 755 # space is required here
 +INSTALL_X1 =
 +INSTALL_A0 = find # space is required here
 +INSTALL_A1 = | cpio -pud
 +INSTALL_L0 = rm -f # space is required here
 +INSTALL_L1 = && ln # space is required here
 +INSTALL_L2 =
 +INSTALL_L3 =
 +
 +REMOVE_D0  = $(RMDIR) # space is required here
 +REMOVE_D1  = || true
 +REMOVE_F0  = $(RM_RF) # space is required here
 +REMOVE_F1  =
 +CLEAN_DST  = true
 +
 +ifndef V
 +	QUIET          = @
 +	QUIET_GEN      = $(QUIET)echo '   ' GEN '$@' &&
 +	QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
 +	QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ && v=`
 +	QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
 +	QUIET_2DEVNULL = 2>/dev/null
 +
 +	INSTALL_D0 = dir=
 +	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
 +	INSTALL_R0 = src=
 +	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
 +	INSTALL_X0 = src=
 +	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
 +	INSTALL_A0 = src=
 +	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
 +
 +	INSTALL_L0 = dst=
 +	INSTALL_L1 = && src=
 +	INSTALL_L2 = && dst=
 +	INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
 +
 +	CLEAN_DST = echo ' ' UNINSTALL
 +	REMOVE_D0 = dir=
 +	REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true
 +	REMOVE_F0 = dst=
 +	REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
 +endif
 +
- TCL_PATH   ?= tclsh
 +TCLTK_PATH ?= wish
- TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
++ifeq (./,$(dir $(TCLTK_PATH)))
++	TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH))
++else
++	TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
++endif
++
++ifeq ($(uname_S),Darwin)
++	TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
++	ifeq ($(shell expr "$(uname_R)" : '9\.'),2)
++		TKFRAMEWORK = /System/Library/Frameworks/Tk.framework/Resources/Wish\ Shell.app
++	endif
++	TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
++endif
 +
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +endif
 +
 +-include config.mak
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
 +
 +gg_libdir ?= $(sharedir)/git-gui/lib
 +libdir_SQ  = $(subst ','\'',$(gg_libdir))
 +libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir_sed_in)))
 +exedir     = $(dir $(gitexecdir))share/git-gui/lib
 +
 +GITGUI_SCRIPT   := $$0
 +GITGUI_RELATIVE :=
 +GITGUI_MACOSXAPP :=
 +
 +ifeq ($(uname_O),Cygwin)
 +	GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
- 	gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
++
++	# Is this a Cygwin Tcl/Tk binary?  If so it knows how to do
++	# POSIX path translation just like cygpath does and we must
++	# keep libdir in POSIX format so Cygwin packages of git-gui
++	# work no matter where the user installs them.
++	#
++	ifeq ($(shell echo 'puts [file normalize /]' | '$(TCL_PATH_SQ)'),$(shell cygpath --mixed --absolute /))
++		gg_libdir_sed_in := $(gg_libdir)
++	else
++		gg_libdir_sed_in := $(shell cygpath --windows --absolute "$(gg_libdir)")
++	endif
 +else
 +	ifeq ($(exedir),$(gg_libdir))
 +		GITGUI_RELATIVE := 1
 +	endif
 +	gg_libdir_sed_in := $(gg_libdir)
 +endif
 +ifeq ($(uname_S),Darwin)
 +	ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
 +		GITGUI_MACOSXAPP := YesPlease
 +	endif
 +endif
 +ifneq (,$(findstring MINGW,$(uname_S)))
 +	NO_MSGFMT=1
 +	GITGUI_WINDOWS_WRAPPER := YesPlease
 +endif
 +
 +ifdef GITGUI_MACOSXAPP
 +GITGUI_MAIN := git-gui.tcl
 +
 +git-gui: GIT-VERSION-FILE GIT-GUI-VARS
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	echo '#!$(SHELL_PATH_SQ)' >$@+ && \
 +	echo 'if test "z$$*" = zversion ||' >>$@+ && \
 +	echo '   test "z$$*" = z--version' >>$@+ && \
 +	echo then >>$@+ && \
 +	echo '	'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
 +	echo else >>$@+ && \
- 	echo '	'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\' \
++	echo '	'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/$(subst \,,$(TKEXECUTABLE))'\' \
 +		'"$$0" "$$@"' >>$@+ && \
 +	echo fi >>$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
 +		macosx/Info.plist \
 +		macosx/git-gui.icns \
 +		macosx/AppMain.tcl \
- 		$(TKFRAMEWORK)/Contents/MacOS/Wish
++		$(TKFRAMEWORK)/Contents/MacOS/$(TKEXECUTABLE)
 +	$(QUIET_GEN)rm -rf '$@' '$@'+ && \
 +	mkdir -p '$@'+/Contents/MacOS && \
 +	mkdir -p '$@'+/Contents/Resources/Scripts && \
- 	cp '$(subst ','\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \
++	cp '$(subst ','\'',$(subst \,,$(TKFRAMEWORK)/Contents/MacOS/$(TKEXECUTABLE)))' \
 +		'$@'+/Contents/MacOS && \
 +	cp macosx/git-gui.icns '$@'+/Contents/Resources && \
 +	sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
++		-e 's/@@GITGUI_TKEXECUTABLE@@/$(TKEXECUTABLE)/g' \
 +		macosx/Info.plist \
 +		>'$@'+/Contents/Info.plist && \
 +	sed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \
 +		-e 's|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
 +		macosx/AppMain.tcl \
 +		>'$@'+/Contents/Resources/Scripts/AppMain.tcl && \
 +	mv '$@'+ '$@'
 +endif
 +
 +ifdef GITGUI_WINDOWS_WRAPPER
 +GITGUI_MAIN := git-gui.tcl
 +
 +git-gui: windows/git-gui.sh
 +	cp $< $@
 +endif
 +
 +$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +		-e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
 +		-e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \
 +		-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +		-e 's|@@GITGUI_RELATIVE@@|$(GITGUI_RELATIVE)|' \
 +		-e '$(GITGUI_RELATIVE)s|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
 +		git-gui.sh >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +	MSGFMT ?= msgfmt
 +	ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
 +		MSGFMT := $(TCL_PATH) po/po2msg.sh
 +	endif
 +endif
 +
 +msgsdir     = $(gg_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +PO_TEMPLATE = po/git-gui.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
 +	$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)
 +update-po:: $(PO_TEMPLATE)
 +	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +	$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1)
 +
 +lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
 +	$(QUIET_INDEX)if echo \
 +	  $(foreach p,$(PRELOAD_FILES),source $p\;) \
 +	  auto_mkindex lib '*.tcl' \
 +	| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
 +	else \
 +	 echo 1>&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
 +	 rm -f $@ ; \
 +	 echo '# Autogenerated by git-gui Makefile' >$@ && \
 +	 echo >>$@ && \
 +	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
 +	 echo >>$@ ; \
 +	fi
 +
 +TRACK_VARS = \
 +	$(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
 +	$(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
 +	$(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
 +	$(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
 +	$(subst ','\'',gg_libdir='$(libdir_SQ)') \
 +	GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \
 +#end TRACK_VARS
 +
 +GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
 +	@VARS='$(TRACK_VARS)'; \
 +	if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
 +		echo 1>&2 "    * new locations or Tcl/Tk interpreter"; \
 +		echo 1>$@ "$$VARS"; \
 +	fi
 +
 +ifdef GITGUI_MACOSXAPP
 +all:: git-gui Git\ Gui.app
 +endif
 +ifdef GITGUI_WINDOWS_WRAPPER
 +all:: git-gui
 +endif
 +all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
 +
 +install: all
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +endif
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +ifdef GITGUI_MACOSXAPP
 +	$(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +endif
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall:
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
 +	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1)
 +endif
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
 +ifdef GITGUI_MACOSXAPP
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1)
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1)
 +endif
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
 +
 +dist-version:
 +	@mkdir -p $(TARDIR)
 +	@echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
 +	$(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg
 +	$(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS
 +ifdef GITGUI_MACOSXAPP
 +	$(RM_RF) 'Git Gui.app'* git-gui
 +endif
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(RM_RF) git-gui
 +endif
 +
 +.PHONY: all install uninstall dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE
 +.PHONY: .FORCE-GIT-GUI-VARS
diff --cc git-gui/git-gui.sh
index f42e461fd,000000000..04bd42576
mode 100755,000000..100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@@ -1,2869 -1,0 +1,2869 @@@
 +#!/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"] \
 +		-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 dirname [file normalize $argv0]]]
 +	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 _gitexec {}
 +set _reponame {}
 +set _iscygwin {}
 +set _search_path {}
 +
 +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 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 get_config {name} {
 +	global repo_config
 +	if {[catch {set v $repo_config($name)}]} {
 +		return {}
 +	} else {
 +		return $v
 +	}
 +}
 +
 +######################################################################
 +##
 +## handy utils
 +
 +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} {
 +	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 {}
 +		}
 +	}
 +
 +	foreach p $_search_path {
 +		set p [file join $p $what$_search_exe]
 +		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 {$_nice ne {}} {
 +		lappend cmd $_nice
 +	}
 +}
 +
 +proc git {args} {
 +	set opt [list exec]
 +
 +	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]
 +
 +	return [eval $opt $cmdp $args]
 +}
 +
 +proc _open_stdout_stderr {cmd} {
 +	if {[catch {
 +			set fd [open $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 \
 +				[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]
 +
 +	return [open [concat $opt $cmdp $args] w]
 +}
 +
 +proc githook_read {hook_name args} {
 +	set pchook [gitdir hooks $hook_name]
 +	lappend args 2>@1
 +
 +	# On Cygwin [file executable] might lie so we need to ask
 +	# the shell if the hook is executable.  Yes that's annoying.
 +	#
 +	if {[is_Cygwin]} {
 +		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 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
 +}
 +
 +set root_exists 0
 +bind . <Visibility> {
 +	bind . <Visibility> {}
 +	set root_exists 1
 +}
 +
 +if {[is_Windows]} {
 +	wm iconbitmap . -default $oguilib/git-gui.ico
 +}
 +
 +######################################################################
 +##
 +## config defaults
 +
 +set cursor_ptr arrow
 +font create font_diff -family Courier -size 10
 +font create font_ui
 +catch {
 +	label .dummy
 +	eval font configure font_ui [font actual [.dummy cget -font]]
 +	destroy .dummy
 +}
 +
 +font create font_uiitalic
 +font create font_uibold
 +font create font_diffbold
 +font create font_diffitalic
 +
 +foreach class {Button Checkbutton Entry Label
 +		Labelframe Listbox Menu Message
 +		Radiobutton Spinbox Text} {
 +	option add *$class.font font_ui
 +}
 +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
 +	}
 +}
 +
 +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.matchtrackingbranch) false
 +set default_config(gui.pruneduringfetch) false
 +set default_config(gui.trustmtime) false
 +set default_config(gui.diffcontext) 5
 +set default_config(gui.newbranchtemplate) {}
 +set default_config(gui.fontui) [font configure font_ui]
 +set default_config(gui.fontdiff) [font configure font_diff]
 +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 -- {[\-\.]dirty$} $_git_version {} _git_version
 +regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 +regsub {\.rc[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 default_config
 +
 +	if {$include_global} {
 +		_parse_config global_config --global
 +	}
 +	_parse_config repo_config
 +
 +	foreach name [array names default_config] {
 +		if {[catch {set v $global_config($name)}]} {
 +			set global_config($name) $default_config($name)
 +		}
 +		if {[catch {set v $repo_config($name)}]} {
 +			set repo_config($name) $default_config($name)
 +		}
 +	}
 +}
 +
 +######################################################################
 +##
 +## 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
 +
 +	disable_option multicommit
 +	disable_option branch
 +	disable_option transport
 +}
 +}
 +
 +######################################################################
 +##
 +## repository setup
 +
 +if {[catch {
 +		set _gitdir $env(GIT_DIR)
 +		set _prefix {}
 +		}]
 +	&& [catch {
 +		set _gitdir [git rev-parse --git-dir]
 +		set _prefix [git rev-parse --show-prefix]
 +	} err]} {
 +	load_config 1
 +	apply_config
 +	choose_repository::pick
 +}
 +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
 +}
 +if {$_prefix ne {}} {
 +	regsub -all {[^/]+/} $_prefix ../ cdup
 +	if {[catch {cd $cdup} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
 +		exit 1
 +	}
 +	unset cdup
 +} elseif {![is_enabled bare]} {
 +	if {[lindex [file split $_gitdir] end] ne {.git}} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
 +		exit 1
 +	}
 +	if {[catch {cd [file dirname $_gitdir]} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
 +		exit 1
 +	}
 +}
 +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]
 +}
 +
 +######################################################################
 +##
 +## 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 selected_commit_type new
 +
 +######################################################################
 +##
 +## 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 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 {[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_link {}
 +	set is_git_info_exclude {}
 +	proc have_info_exclude {} {
 +		global is_git_info_link is_git_info_exclude
 +
 +		if {$is_git_info_link eq {}} {
 +			set is_git_info_link [file isfile [gitdir info.lnk]]
 +		}
 +
 +		if {$is_git_info_link} {
 +			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 {
 +			return [file readable [gitdir 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 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
 +	uplevel #0 $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
 +	}
 +
 +	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"
 +}
 +
 +proc display_all_files {} {
 +	global ui_index ui_workdir
 +	global file_states file_lists
 +	global last_clicked
 +
 +	$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]
 +
 +	foreach path [lsort [array names file_states]] {
 +		set s $file_states($path)
 +		set m [lindex $s 0]
 +		set icon_name [lindex $s 1]
 +
 +		set s [string index $m 0]
 +		if {$s ne {U} && $s ne {_}} {
 +			display_all_files_helper $ui_index $path \
 +				$icon_name $s
 +		}
 +
 +		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_parttick -background white -foreground "#005050" -data {
 +#define parttick_width 14
 +#define parttick_height 15
 +static unsigned char parttick_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
 +   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
 +   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_question -background white -foreground black -data {
 +#define file_question_width 14
 +#define file_question_height 15
 +static unsigned char file_question_bits[] = {
 +   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
 +   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
 +   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_removed -background white -foreground red -data {
 +#define file_removed_width 14
 +#define file_removed_height 15
 +static unsigned char file_removed_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
 +   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
 +   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_merge -background white -foreground blue -data {
 +#define file_merge_width 14
 +#define file_merge_height 15
 +static unsigned char file_merge_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
 +   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +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_fulltick
 +set all_icons(M$ui_index)   file_fulltick
 +set all_icons(D$ui_index)   file_removed
 +set all_icons(U$ui_index)   file_merge
 +
 +set all_icons(_$ui_workdir) file_plain
 +set all_icons(M$ui_workdir) file_mod
 +set all_icons(D$ui_workdir) file_question
 +set all_icons(U$ui_workdir) file_merge
 +set all_icons(O$ui_workdir) file_plain
 +
 +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"}}
 +
 +		{_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"}}
 +		{UU {mc "Requires merge resolution"}}
 +		{UM {mc "Requires merge resolution"}}
 +		{UD {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} {
 +	# -- Always start gitk through whatever we were loaded with.  This
 +	#    lets us bypass using shell process on Windows systems.
 +	#
 +	set exe [file join [file dirname $::_git] gitk]
 +	set cmd [list [info nameofexecutable] $exe]
 +	if {! [file exists $exe]} {
 +		error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
 +	} else {
 +		global env
 +
 +		if {[info exists env(GIT_DIR)]} {
 +			set old_GIT_DIR $env(GIT_DIR)
 +		} else {
 +			set old_GIT_DIR {}
 +		}
 +
 +		set pwd [pwd]
 +		cd [file dirname [gitdir]]
 +		set env(GIT_DIR) [file tail [gitdir]]
 +
 +		eval exec $cmd $revs &
 +
 +		if {$old_GIT_DIR eq {}} {
 +			unset env(GIT_DIR)
 +		} else {
 +			set env(GIT_DIR) $old_GIT_DIR
 +		}
 +		cd $pwd
 +
 +		ui_status $::starting_gitk_msg
 +		after 10000 {
 +			ui_ready $starting_gitk_msg
 +		}
 +	}
 +}
 +
 +set is_quitting 0
 +
 +proc do_quit {} {
 +	global ui_comm is_quitting repo_config commit_type
 +	global GITGUI_BCK_exists GITGUI_BCK_i
 +
 +	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}
 +			}
 +		}
 +
 +		# -- 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_geometry [list]
 +		lappend cfg_geometry [wm geometry .]
 +		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}
 +		}
 +	}
 +
 +	destroy .
 +}
 +
 +proc do_rescan {} {
 +	rescan ui_ready
 +}
 +
 +proc do_commit {} {
 +	commit_tree
 +}
 +
 +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
 +
 +	if {$col == 0} {
 +		if {$current_diff_path eq $path} {
 +			set after {reshow_diff;}
 +		} else {
 +			set after {}
 +		}
 +		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
 +}
 +
 +######################################################################
 +##
 +## ui construction
 +
 +load_config 0
 +apply_config
 +set ui_comm {}
 +
 +# -- Menu Bar
 +#
 +menu .mbar -tearoff 0
 +.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
 +}
 +. configure -menu .mbar
 +
 +# -- Repository Menu
 +#
 +menu .mbar.repository
 +
 +.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
 +	}
 +}
 +
 +.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
 +#
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	menu .mbar.commit
 +
 +	.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 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
 +	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
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add separator
 +
 +	.mbar.commit add command -label [mc "Sign Off"] \
 +		-command do_signoff \
 +		-accelerator $M1T-S
 +
 +	.mbar.commit add command -label [mc Commit@@verb] \
 +		-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 "Push..."] \
 +		-command do_push_anywhere \
 +		-accelerator $M1T-P
 +	.mbar.remote add command \
 +		-label [mc "Delete..."] \
 +		-command remote_branch_delete::dialog
 +}
 +
 +if {[is_MacOSX]} {
 +	# -- Apple Menu (Mac OS X only)
 +	#
 +	.mbar add cascade -label [mc Apple] -menu .mbar.apple
 +	menu .mbar.apple
 +
 +	.mbar.apple add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +	.mbar.apple add separator
 +	.mbar.apple add command \
 +		-label [mc "Preferences..."] \
 +		-command do_options \
 +		-accelerator $M1T-,
 +	bind . <$M1B-,> do_options
 +} else {
 +	# -- Edit Menu
 +	#
 +	.mbar.edit add separator
 +	.mbar.edit add command -label [mc "Options..."] \
 +		-command do_options
 +}
 +
 +# -- Help Menu
 +#
 +.mbar add cascade -label [mc Help] -menu .mbar.help
 +menu .mbar.help
 +
 +if {![is_MacOSX]} {
 +	.mbar.help add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +}
 +
 +set browser {}
 +catch {set browser $repo_config(instaweb.browser)}
 +set doc_path [file dirname [gitexec]]
 +set doc_path [file join $doc_path Documentation index.html]
 +
 +if {[is_Cygwin]} {
 +	set doc_path [exec cygpath --mixed $doc_path]
 +}
 +
 +if {$browser eq {}} {
 +	if {[is_MacOSX]} {
 +		set browser open
 +	} elseif {[is_Cygwin]} {
 +		set program_files [file dirname [exec cygpath --windir]]
 +		set program_files [file join $program_files {Program Files}]
 +		set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
 +		set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
 +		if {[file exists $firefox]} {
 +			set browser $firefox
 +		} elseif {[file exists $ie]} {
 +			set browser $ie
 +		}
 +		unset program_files firefox ie
 +	}
 +}
 +
 +if {[file isfile $doc_path]} {
 +	set doc_url "file:$doc_path"
 +} else {
 +	set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
 +}
 +
 +if {$browser ne {}} {
 +	.mbar.help add command -label [mc "Online Documentation"] \
 +		-command [list exec $browser $doc_url &]
 +}
 +unset browser 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
 +}
 +
 +# -- Not a normal commit type invocation?  Do that instead!
 +#
 +switch -- $subcommand {
 +browser -
 +blame {
 +	set subcommand_args {rev? path}
 +	if {$argv eq {}} usage
 +	set head {}
 +	set path {}
 +	set is_path 0
 +	foreach a $argv {
 +		if {$is_path || [file exists $_prefix$a]} {
 +			if {$path ne {}} usage
 +			set path $_prefix$a
 +			break
 +		} elseif {$a eq {--}} {
 +			if {$path ne {}} {
 +				if {$head ne {}} usage
 +				set head $path
 +				set path {}
 +			}
 +			set is_path 1
 +		} 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 $_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
 +	}
 +
 +	switch -- $subcommand {
 +	browser {
 +		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
 +	}
 +	}
 +	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
 +#
 +frame .branch \
 +	-borderwidth 1 \
 +	-relief sunken
 +label .branch.l1 \
 +	-text [mc "Current Branch:"] \
 +	-anchor w \
 +	-justify left
 +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
 +#
 +panedwindow .vpane -orient horizontal
 +panedwindow .vpane.files -orient vertical
 +.vpane add .vpane.files -sticky nsew -height 100 -width 200
 +pack .vpane -anchor n -side top -fill both -expand 1
 +
 +# -- Index File List
 +#
 +frame .vpane.files.index -height 100 -width 200
 +label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
 +	-background lightgreen
 +text $ui_index -background white -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
 +scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
 +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
 +#
 +frame .vpane.files.workdir -height 100 -width 200
 +label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 +	-background lightsalmon
 +text $ui_workdir -background white -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
 +scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
 +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 -sticky nsew
 +.vpane.files add .vpane.files.index -sticky nsew
 +
 +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
 +#
 +frame .vpane.lower -height 300 -width 400
 +frame .vpane.lower.commarea
 +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 -sticky nsew
 +
 +# -- Commit Area Buttons
 +#
 +frame .vpane.lower.commarea.buttons
 +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
 +
 +button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
 +	-command do_rescan
 +pack .vpane.lower.commarea.buttons.rescan -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.rescan conf -state}
 +
 +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}
 +
 +button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
 +	-command do_signoff
 +pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 +
 +button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
 +	-command do_commit
 +pack .vpane.lower.commarea.buttons.commit -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.commit conf -state}
 +
 +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
 +#
 +frame .vpane.lower.commarea.buffer
 +frame .vpane.lower.commarea.buffer.header
 +set ui_comm .vpane.lower.commarea.buffer.t
 +set ui_coml .vpane.lower.commarea.buffer.header.l
 +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]
 +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]
 +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
 +pack .vpane.lower.commarea.buffer.header.amend -side right
 +pack .vpane.lower.commarea.buffer.header.new -side right
 +
 +text $ui_comm -background white -borderwidth 1 \
 +	-undo true \
 +	-maxundo 20 \
 +	-autoseparators true \
 +	-relief sunken \
 +	-width 75 -height 9 -wrap none \
 +	-font font_diff \
 +	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 +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 {$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
 +bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
 +
 +# -- 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
 +
 +frame .vpane.lower.diff.header -background gold
 +label .vpane.lower.diff.header.status \
 +	-background gold \
 +	-width $max_status_desc \
 +	-anchor w \
 +	-justify left
 +label .vpane.lower.diff.header.file \
 +	-background gold \
 +	-anchor w \
 +	-justify left
 +label .vpane.lower.diff.header.path \
 +	-background gold \
 +	-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
 +#
 +frame .vpane.lower.diff.body
 +set ui_diff .vpane.lower.diff.body.t
 +text $ui_diff -background white -borderwidth 0 \
 +	-width 80 -height 15 -wrap none \
 +	-font font_diff \
 +	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
 +	-yscrollcommand {.vpane.lower.diff.body.sby set} \
 +	-state disabled
 +scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
 +	-command [list $ui_diff xview]
 +scrollbar .vpane.lower.diff.body.sby -orient vertical \
 +	-command [list $ui_diff yview]
 +pack .vpane.lower.diff.body.sbx -side bottom -fill x
 +pack .vpane.lower.diff.body.sby -side right -fill y
 +pack $ui_diff -side left -fill both -expand 1
 +pack .vpane.lower.diff.header -side top -fill x
 +pack .vpane.lower.diff.body -side bottom -fill both -expand 1
 +
 +$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
 +#
 +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 separator
 +$ctxm add command \
 +	-label [mc "Show Less Context"] \
 +	-command {if {$repo_config(gui.diffcontext) >= 1} {
 +		incr repo_config(gui.diffcontext) -1
 +		reshow_diff
 +	}}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc "Show More Context"] \
 +	-command {if {$repo_config(gui.diffcontext) < 99} {
 +		incr repo_config(gui.diffcontext)
 +		reshow_diff
 +	}}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add separator
 +$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
 +$ctxm add command -label [mc "Options..."] \
 +	-command do_options
 +proc popup_diff_menu {ctxm x y X Y} {
 +	global current_diff_path file_states
 +	set ::cursorX $x
 +	set ::cursorY $y
 +	if {$::ui_index eq $::current_diff_side} {
 +		set l [mc "Unstage Hunk From Commit"]
 +	} else {
 +		set l [mc "Stage Hunk For Commit"]
 +	}
 +	if {$::is_3way_diff
 +		|| $current_diff_path eq {}
 +		|| ![info exists file_states($current_diff_path)]
 +		|| {_O} eq [lindex $file_states($current_diff_path) 0]} {
 +		set s disabled
 +	} else {
 +		set s normal
 +	}
 +	$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
 +	tk_popup $ctxm $X $Y
 +}
 +bind_button3 $ui_diff [list popup_diff_menu $ctxm %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]
 +.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]
 +unset gm
 +}
 +
 +# -- 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-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_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>     do_rescan
 +bind .   <$M1B-Key-r> do_rescan
 +bind .   <$M1B-Key-R> 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-i> do_add_all
 +bind .   <$M1B-Key-I> do_add_all
 +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 [file dirname [gitdir]]]"
 +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_CONFIG_LOCAL$} -
 +		{^GIT_(AUTHOR|COMMITTER)_DATE$} {
 +			append msg " - $name\n"
 +			incr ignored_env
 +		}
 +		{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
 +			append msg " - $name\n"
 +			incr ignored_env
 +			set suggest_user $name
 +		}
 +		}
 +	}
 +	if {$ignored_env > 0} {
 +		append msg [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_push_menu
 +	populate_fetch_menu
 +	set n [expr {[.mbar.remote index end] - $n}]
 +	if {$n > 0} {
 +		.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
 +}
 +
 +lock_index begin-read
 +if {![winfo ismapped .]} {
 +	wm deiconify .
 +}
 +after 1 do_rescan
 +if {[is_enabled multicommit]} {
 +	after 1000 hint_gc
 +}
diff --cc git-gui/lib/choose_repository.tcl
index 86faf24cc,000000000..0adcf9d95
mode 100644,000000..100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@@ -1,1038 -1,0 +1,1042 @@@
 +# 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
 +
 +	make_toplevel 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 [mc Apple] -menu .mbar.apple
 +			menu $w.mbar.apple
 +			$w.mbar.apple add command \
 +				-label [mc "About %s" [appname]] \
 +				-command do_about
 +		} 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
 +		}
 +
 +		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
 +	frame $w_body
 +	text $opts \
 +		-cursor $::cursor_ptr \
 +		-relief flat \
 +		-background [$w_body cget -background] \
 +		-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 {}} {
 +		$m_repo add command \
 +			-command [cb _next clone] \
 +			-accelerator $M1T-C \
 +			-label [mc "Clone..."]
 +		bind $top <$M1B-c> [cb _next clone]
 +		bind $top <$M1B-C> [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"]
 +		}
 +
 +		label $w_body.space
 +		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 [$w_body.recentlabel cget -background] \
 +			-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
 +
 +	frame $w.buttons
 +	set w_next $w.buttons.next
 +	set w_quit $w.buttons.quit
 +	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
 +
 +	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
 +		}
 +	}
 +	return [lsort $recent]
 +}
 +
 +proc _unset_recentrepo {p} {
 +	regsub -all -- {([()\[\]{}\.^$+*?\\])} $p {\\\1} p
 +	git config --global --unset gui.recentrepo "^$p\$"
 +}
 +
 +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
 +
 +	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} {
 +	destroy $w_body
 +	if {![winfo exists $w_next]} {
 +		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 {} {
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_new2] \
 +		-text [mc "Create"]
 +
 +	frame $w_body
 +	label $w_body.h \
 +		-font font_uibold \
 +		-text [mc "Create New Repository"]
 +	pack $w_body.h -side top -fill x -pady 10
 +	pack $w_body -fill x -padx 10
 +
 +	frame $w_body.where
 +	label $w_body.where.l -text [mc "Directory:"]
 +	entry $w_body.where.t \
 +		-textvariable @local_path \
 +		-font font_diff \
 +		-width 50
 +	button $w_body.where.b \
 +		-text [mc "Browse"] \
 +		-command [cb _new_local_path]
++	set w_localpath $w_body.where.t
 +
 +	pack $w_body.where.b -side right
 +	pack $w_body.where.l -side left
 +	pack $w_body.where.t -fill x
 +	pack $w_body.where -fill x
 +
 +	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 {} {
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_clone2] \
 +		-text [mc "Clone"]
 +
 +	frame $w_body
 +	label $w_body.h \
 +		-font font_uibold \
 +		-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
 +	frame $w_body.args
 +	pack $args -fill both
 +
 +	label $args.origin_l -text [mc "URL:"]
 +	entry $args.origin_t \
 +		-textvariable @origin_url \
 +		-font font_diff \
 +		-width 50
 +	button $args.origin_b \
 +		-text [mc "Browse"] \
 +		-command [cb _open_origin]
 +	grid $args.origin_l $args.origin_t $args.origin_b -sticky ew
 +
 +	label $args.where_l -text [mc "Directory:"]
 +	entry $args.where_t \
 +		-textvariable @local_path \
 +		-font font_diff \
 +		-width 50
 +	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
 +
 +	label $args.type_l -text [mc "Clone Type:"]
 +	frame $args.type_f
 +	set w_types [list]
 +	lappend w_types [radiobutton $args.type_f.hardlink \
 +		-state disabled \
 +		-anchor w \
 +		-text [mc "Standard (Fast, Semi-Redundant, Hardlinks)"] \
 +		-variable @clone_type \
 +		-value hardlink]
 +	lappend w_types [radiobutton $args.type_f.full \
 +		-state disabled \
 +		-anchor w \
 +		-text [mc "Full Copy (Slower, Redundant Backup)"] \
 +		-variable @clone_type \
 +		-value full]
 +	lappend w_types [radiobutton $args.type_f.shared \
 +		-state disabled \
 +		-anchor w \
 +		-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
 +	}
 +
 +	set done 1
 +}
 +
 +######################################################################
 +##
 +## Open Existing Repository
 +
 +method _do_open {} {
 +	$w_next conf \
 +		-state disabled \
 +		-command [cb _do_open2] \
 +		-text [mc "Open"]
 +
 +	frame $w_body
 +	label $w_body.h \
 +		-font font_uibold \
 +		-text [mc "Open Existing Repository"]
 +	pack $w_body.h -side top -fill x -pady 10
 +	pack $w_body -fill x -padx 10
 +
 +	frame $w_body.where
 +	label $w_body.where.l -text [mc "Repository:"]
 +	entry $w_body.where.t \
 +		-textvariable @local_path \
 +		-font font_diff \
 +		-width 50
 +	button $w_body.where.b \
 +		-text [mc "Browse"] \
 +		-command [cb _open_local_path]
 +
 +	pack $w_body.where.b -side right
 +	pack $w_body.where.l -side left
 +	pack $w_body.where.t -fill x
 +	pack $w_body.where -fill x
 +
 +	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/error.tcl
index 0fdd7531d,000000000..08a24622c
mode 100644,000000..100644
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
@@@ -1,106 -1,0 +1,114 @@@
 +# git-gui branch (create/delete) support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
++proc _error_parent {} {
++	set p [grab current .]
++	if {$p eq {}} {
++		return .
++	}
++	return $p
++}
++
 +proc error_popup {msg} {
 +	set title [appname]
 +	if {[reponame] ne {}} {
 +		append title " ([reponame])"
 +	}
 +	set cmd [list tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [append "$title: " [mc "error"]] \
 +		-message $msg]
- 	if {[winfo ismapped .]} {
- 		lappend cmd -parent .
++	if {[winfo ismapped [_error_parent]]} {
++		lappend cmd -parent [_error_parent]
 +	}
 +	eval $cmd
 +}
 +
 +proc warn_popup {msg} {
 +	set title [appname]
 +	if {[reponame] ne {}} {
 +		append title " ([reponame])"
 +	}
 +	set cmd [list tk_messageBox \
 +		-icon warning \
 +		-type ok \
 +		-title [append "$title: " [mc "warning"]] \
 +		-message $msg]
- 	if {[winfo ismapped .]} {
- 		lappend cmd -parent .
++	if {[winfo ismapped [_error_parent]]} {
++		lappend cmd -parent [_error_parent]
 +	}
 +	eval $cmd
 +}
 +
- proc info_popup {msg {parent .}} {
++proc info_popup {msg} {
 +	set title [appname]
 +	if {[reponame] ne {}} {
 +		append title " ([reponame])"
 +	}
 +	tk_messageBox \
 +		-parent $parent \
 +		-icon info \
 +		-type ok \
 +		-title $title \
 +		-message $msg
 +}
 +
 +proc ask_popup {msg} {
 +	set title [appname]
 +	if {[reponame] ne {}} {
 +		append title " ([reponame])"
 +	}
 +	set cmd [list tk_messageBox \
 +		-icon question \
 +		-type yesno \
 +		-title $title \
 +		-message $msg]
- 	if {[winfo ismapped .]} {
- 		lappend cmd -parent .
++	if {[winfo ismapped [_error_parent]]} {
++		lappend cmd -parent [_error_parent]
 +	}
 +	eval $cmd
 +}
 +
 +proc hook_failed_popup {hook msg {is_fatal 1}} {
 +	set w .hookfail
 +	toplevel $w
 +
 +	frame $w.m
 +	label $w.m.l1 -text "$hook hook failed:" \
 +		-anchor w \
 +		-justify left \
 +		-font font_uibold
 +	text $w.m.t \
 +		-background white -borderwidth 1 \
 +		-relief sunken \
 +		-width 80 -height 10 \
 +		-font font_diff \
 +		-yscrollcommand [list $w.m.sby set]
 +	scrollbar $w.m.sby -command [list $w.m.t yview]
 +	pack $w.m.l1 -side top -fill x
 +	if {$is_fatal} {
 +		label $w.m.l2 \
 +			-text [mc "You must correct the above errors before committing."] \
 +			-anchor w \
 +			-justify left \
 +			-font font_uibold
 +		pack $w.m.l2 -side bottom -fill x
 +	}
 +	pack $w.m.sby -side right -fill y
 +	pack $w.m.t -side left -fill both -expand 1
 +	pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
 +
 +	$w.m.t insert 1.0 $msg
 +	$w.m.t conf -state disabled
 +
 +	button $w.ok -text OK \
 +		-width 15 \
 +		-command "destroy $w"
 +	pack $w.ok -side bottom -anchor e -pady 10 -padx 10
 +
 +	bind $w <Visibility> "grab $w; focus $w"
 +	bind $w <Key-Return> "destroy $w"
 +	wm title $w [strcat "[appname] ([reponame]): " [mc "error"]]
 +	tkwait window $w
 +}
diff --cc git-gui/macosx/Info.plist
index 99913ec57,000000000..b3bf15fa1
mode 100644,000000..100644
--- a/git-gui/macosx/Info.plist
+++ b/git-gui/macosx/Info.plist
@@@ -1,28 -1,0 +1,28 @@@
 +<?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>Wish</string>
++	<string>@@GITGUI_TKEXECUTABLE@@</string>
 +	<key>CFBundleGetInfoString</key>
 +	<string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string>
 +	<key>CFBundleIconFile</key>
 +	<string>git-gui.icns</string>
 +	<key>CFBundleIdentifier</key>
 +	<string>cz.or.repo.git-gui</string>
 +	<key>CFBundleInfoDictionaryVersion</key>
 +	<string>6.0</string>
 +	<key>CFBundleName</key>
 +	<string>Git Gui</string>
 +	<key>CFBundlePackageType</key>
 +	<string>APPL</string>
 +	<key>CFBundleShortVersionString</key>
 +	<string>@@GITGUI_VERSION@@</string>
 +	<key>CFBundleSignature</key>
 +	<string>GITg</string>
 +	<key>CFBundleVersion</key>
 +	<string>@@GITGUI_VERSION@@</string>
 +</dict>
 +</plist>