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

* 'master' of git://repo.or.cz/git-gui: (50 commits)
  git-gui: Minor refactoring of merge command line in merge support
  git-gui: Use more modern looking icons in the tree browser
  git-gui: Don't offer to stage hunks from untracked files
  git-gui: Make sure remotes are loaded when picking revisions
  git-gui: Use progress bar while resetting/aborting files
  git-gui: Honor core.excludesfile when listing extra files
  git-gui: Unify wording to say "to stage" instead of "to add"
  git-gui: Don't kill modified commit message buffer with merge templates
  git-gui: Remove usernames from absolute SSH urls during merging
  git-gui: Format tracking branch merges as though they were pulls
  git-gui: Cleanup bindings within merge dialog
  git-gui: Replace merge dialog with our revision picker widget
  git-gui: Show ref last update times in revision chooser tooltips
  git-gui: Display commit/tag/remote info in tooltip of revision picker
  git-gui: Save remote urls obtained from config/remotes setup
  git-gui: Avoid unnecessary symbolic-ref call during checkout
  git-gui: Refactor current branch menu items to make i18n easier
  git-gui: Refactor diff popup into a procedure to ease i18n work
  git-gui: Paper bag fix quitting crash after commit
  git-gui: Clarify meaning of add tracked menu option
  ...

diff --cc git-gui/git-gui.sh
index 2077261e647904d9871479411263d0fdcbb79662,0000000000000000000000000000000000000000..671b8873f27e68f8ed2c93efd6734f583f8b7500
mode 100755,000000..100755
--- 1/git-gui/git-gui.sh
--- /dev/null
+++ b/git-gui/git-gui.sh
@@@ -1,2574 -1,0 +1,2641 @@@
-       global _reponame
-       return $_reponame
 +#!/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; \
 + exec wish "$0" -- "$@"
 +
 +set appvers {@@GITGUI_VERSION@@}
 +set copyright {
 +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 "git-gui: fatal error" \
 +              -message $err
 +      exit 1
 +}
 +
 +######################################################################
 +##
 +## 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
 +      }
 +}
 +
 +######################################################################
 +##
 +## configure 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]
 +} elseif {[string match @@* $oguirel]} {
 +      set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +}
 +
 +set idx [file join $oguilib tclIndex]
 +if {[catch {set fd [open $idx r]} err]} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title "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 oguirel idx fd
 +
 +######################################################################
 +##
 +## read only globals
 +
 +set _appname [lindex [file split $argv0] end]
 +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 {} {
-       global tcl_platform tk_library
++      return $::_reponame
 +}
 +
 +proc is_MacOSX {} {
-       global tcl_platform
-       if {$tcl_platform(platform) eq {windows}} {
 +      if {[tk windowingsystem] eq {aqua}} {
 +              return 1
 +      }
 +      return 0
 +}
 +
 +proc is_Windows {} {
-       global tcl_platform _iscygwin
++      if {$::tcl_platform(platform) eq {windows}} {
 +              return 1
 +      }
 +      return 0
 +}
 +
 +proc is_Cygwin {} {
-               if {$tcl_platform(platform) eq {windows}} {
++      global _iscygwin
 +      if {$_iscygwin eq {}} {
-                       global _nice
-                       if {$_nice ne {}} {
-                               lappend opt $_nice
-                       }
++              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 {
 +      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
 +      }
 +}
 +
 +proc load_config {include_global} {
 +      global repo_config global_config default_config
 +
 +      array unset global_config
 +      if {$include_global} {
 +              catch {
 +                      set fd_rc [git_read config --global --list]
 +                      while {[gets $fd_rc line] >= 0} {
 +                              if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
 +                                      if {[is_many_config $name]} {
 +                                              lappend global_config($name) $value
 +                                      } else {
 +                                              set global_config($name) $value
 +                                      }
 +                              }
 +                      }
 +                      close $fd_rc
 +              }
 +      }
 +
 +      array unset repo_config
 +      catch {
 +              set fd_rc [git_read config --list]
 +              while {[gets $fd_rc line] >= 0} {
 +                      if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
 +                              if {[is_many_config $name]} {
 +                                      lappend repo_config($name) $value
 +                              } else {
 +                                      set repo_config($name) $value
 +                              }
 +                      }
 +              }
 +              close $fd_rc
 +      }
 +
 +      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)
 +              }
 +      }
 +}
 +
 +######################################################################
 +##
 +## 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 -- $s {
 +                      #!*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 [list $interp $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]} {
 +                      set _search_path [split [exec cygpath \
 +                              --windows \
 +                              --path \
 +                              --absolute \
 +                              $env(PATH)] {;}]
 +                      set _search_exe .exe
 +              } elseif {[is_Windows]} {
 +                      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 {
-                       global _nice
-                       if {$_nice ne {}} {
-                               lappend opt $_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 {
-                       global _nice
-                       if {$_nice ne {}} {
-                               lappend opt $_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 {
- set _nice [_which 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 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
 +}
 +
 +######################################################################
 +##
 +## find git
 +
 +set _git  [_which git]
 +if {$_git eq {}} {
 +      catch {wm withdraw .}
 +      error_popup "Cannot find git in PATH."
 +      exit 1
 +}
- if {[lindex [file split $_gitdir] end] ne {.git}} {
-       catch {wm withdraw .}
-       error_popup "Cannot use funny .git directory:\n\n$_gitdir"
-       exit 1
 +
 +######################################################################
 +##
 +## version check
 +
 +if {[catch {set _git_version [git --version]} err]} {
 +      catch {wm withdraw .}
 +      error_popup "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 .}
 +      error_popup "Cannot parse Git version string:\n\n$_git_version"
 +      exit 1
 +}
++
++set _real_git_version $_git_version
++regsub -- {-dirty$} $_git_version {} _git_version
 +regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 +regsub {\.rc[0-9]+$} $_git_version {} _git_version
++regsub {\.GIT$} $_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 "Git version cannot be determined.
++
++$_git claims it is version '$_real_git_version'.
++
++[appname] requires at least Git 1.5.0 or later.
++
++Assume '$_real_git_version' is version 1.5.0?
++"] 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 .}
 +      error_popup "[appname] requires Git 1.5.0 or later.
 +
 +You are using [git-version]:
 +
 +[git --version]"
 +      exit 1
 +}
 +
++######################################################################
++##
++## feature option selection
++
++if {[regexp {^git-(.+)$} [appname] _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]} {
 +      catch {wm withdraw .}
 +      error_popup "Cannot find the git directory:\n\n$err"
 +      exit 1
 +}
 +if {![file isdirectory $_gitdir] && [is_Cygwin]} {
 +      catch {set _gitdir [exec cygpath --unix $_gitdir]}
 +}
 +if {![file isdirectory $_gitdir]} {
 +      catch {wm withdraw .}
 +      error_popup "Git directory not found:\n\n$_gitdir"
 +      exit 1
 +}
- if {[catch {cd [file dirname $_gitdir]} err]} {
-       catch {wm withdraw .}
-       error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
-       exit 1
++if {![is_enabled bare]} {
++      if {[lindex [file split $_gitdir] end] ne {.git}} {
++              catch {wm withdraw .}
++              error_popup "Cannot use funny .git directory:\n\n$_gitdir"
++              exit 1
++      }
++      if {[catch {cd [file dirname $_gitdir]} err]} {
++              catch {wm withdraw .}
++              error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
++              exit 1
++      }
 +}
- set _reponame [lindex [file split \
-       [file normalize [file dirname $_gitdir]]] \
-       end]
++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]
 +}
-       if {![$ui_comm edit modified]
-               || [string trim [$ui_comm get 0.0 end]] eq {}} {
 +
 +######################################################################
 +##
 +## 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 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
 +
- set file_dir_data {
- #define file_width 18
- #define file_height 18
- static unsigned char file_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
-   0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
-   0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
-   0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
- }
- image create bitmap file_dir -background white -foreground blue \
-       -data $file_dir_data -maskdata $file_dir_data
- unset file_dir_data
- 
- set file_uplevel_data {
- #define up_width 15
- #define up_height 15
- static unsigned char up_bits[] = {
-   0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
-   0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
-   0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
- }
- image create bitmap file_uplevel -background white -foreground red \
-       -data $file_uplevel_data -maskdata $file_uplevel_data
- unset file_uplevel_data
- 
++      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 {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]
 +      }
 +}
 +
 +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]
 +      set info_exclude [gitdir info exclude]
 +      if {[file readable $info_exclude]} {
 +              lappend ls_others "--exclude-from=$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 {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] {
 +              merge_state [encoding convertfrom $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} {
 +      $::main_status show $msg
 +}
 +
 +proc ui_ready {{test {}}} {
 +      $::main_status show {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 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
-                       }
 +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 {
 +              {__ "Unmodified"}
 +
 +              {_M "Modified, not staged"}
 +              {M_ "Staged for commit"}
 +              {MM "Portions staged for commit"}
 +              {MD "Staged for commit, missing"}
 +
 +              {_O "Untracked, not staged"}
 +              {A_ "Staged for commit"}
 +              {AM "Portions staged for commit"}
 +              {AD "Staged for commit, missing"}
 +
 +              {_D "Missing"}
 +              {D_ "Staged for removal"}
 +              {DO "Staged for removal, still present"}
 +
 +              {U_ "Requires merge resolution"}
 +              {UU "Requires merge resolution"}
 +              {UM "Requires merge resolution"}
 +              {UD "Requires merge resolution"}
 +      } {
 +      if {$max_status_desc < [string length [lindex $i 1]]} {
 +              set max_status_desc [string length [lindex $i 1]]
 +      }
 +      set all_descs([lindex $i 0]) [lindex $i 1]
 +}
 +unset i
 +
 +######################################################################
 +##
 +## util
 +
 +proc bind_button3 {w cmd} {
 +      bind $w <Any-Button-3> $cmd
 +      if {[is_MacOSX]} {
 +              bind $w <Control-Button-1> $cmd
 +      }
 +}
 +
 +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 {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 "Unable to start gitk:\n\n$exe does not exist"
 +      } else {
 +              eval exec $cmd $revs &
 +              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]
-                       catch {file delete $save}
++              if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
++                      file rename -force [gitdir GITGUI_BCK] $save
++                      set GITGUI_BCK_exists 0
 +              } else {
- ######################################################################
- ##
- ## feature option selection
- 
- if {[regexp {^git-(.+)$} [appname] _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
- 
- switch -- $subcommand {
- browser -
- blame {
-       disable_option multicommit
-       disable_option branch
-       disable_option transport
- }
- citool {
-       enable_option singlecommit
- 
-       disable_option multicommit
-       disable_option branch
-       disable_option transport
- }
- }
- 
++                      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] 1]
 +              lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
 +              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
 +}
 +
 +######################################################################
 +##
 +## 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 apply_config {} {
 +      global repo_config font_descs
 +
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set font [lindex $option 1]
 +              if {[catch {
 +                      foreach {cn cv} $repo_config(gui.$name) {
 +                              font configure $font $cn $cv
 +                      }
 +                      } err]} {
 +                      error_popup "Invalid font specified in gui.$name:\n\n$err"
 +              }
 +              foreach {cn cv} [font configure $font] {
 +                      font configure ${font}bold $cn $cv
 +                      font configure ${font}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   {Main Font}}
 +      {fontdiff font_diff {Diff/Console Font}}
 +}
 +load_config 0
 +apply_config
 +
-       -label {Browse Current Branch} \
 +######################################################################
 +##
 +## ui construction
 +
 +set ui_comm {}
 +
 +# -- Menu Bar
 +#
 +menu .mbar -tearoff 0
 +.mbar add cascade -label Repository -menu .mbar.repository
 +.mbar add cascade -label Edit -menu .mbar.edit
 +if {[is_enabled branch]} {
 +      .mbar add cascade -label Branch -menu .mbar.branch
 +}
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +      .mbar add cascade -label Commit -menu .mbar.commit
 +}
 +if {[is_enabled transport]} {
 +      .mbar add cascade -label Merge -menu .mbar.merge
 +      .mbar add cascade -label Fetch -menu .mbar.fetch
 +      .mbar add cascade -label Push -menu .mbar.push
 +}
 +. configure -menu .mbar
 +
 +# -- Repository Menu
 +#
 +menu .mbar.repository
 +
 +.mbar.repository add command \
- trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
++      -label {Browse Current Branch's Files} \
 +      -command {browser::new $current_branch}
-       -label {Visualize Current Branch} \
++set ui_browse_current [.mbar.repository index last]
++.mbar.repository add command \
++      -label {Browse Branch Files...} \
++      -command browser_open::dialog
 +.mbar.repository add separator
 +
 +.mbar.repository add command \
- trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
++      -label {Visualize Current Branch's History} \
 +      -command {do_gitk $current_branch}
-       -label {Visualize All Branches} \
++set ui_visualize_current [.mbar.repository index last]
 +.mbar.repository add command \
-       .mbar.commit add command -label {Add To Commit} \
++      -label {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 "Browse $current_branch's Files"
++      .mbar.repository entryconf $::ui_visualize_current \
++              -label "Visualize $current_branch's History"
++}
++trace add variable current_branch write current_branch_write
++
 +if {[is_enabled multicommit]} {
 +      .mbar.repository add command -label {Database Statistics} \
 +              -command do_stats
 +
 +      .mbar.repository add command -label {Compress Database} \
 +              -command do_gc
 +
 +      .mbar.repository add command -label {Verify Database} \
 +              -command do_fsck_objects
 +
 +      .mbar.repository add separator
 +
 +      if {[is_Cygwin]} {
 +              .mbar.repository add command \
 +                      -label {Create Desktop Icon} \
 +                      -command do_cygwin_shortcut
 +      } elseif {[is_Windows]} {
 +              .mbar.repository add command \
 +                      -label {Create Desktop Icon} \
 +                      -command do_windows_shortcut
 +      } elseif {[is_MacOSX]} {
 +              .mbar.repository add command \
 +                      -label {Create Desktop Icon} \
 +                      -command do_macosx_app
 +      }
 +}
 +
 +.mbar.repository add command -label Quit \
 +      -command do_quit \
 +      -accelerator $M1T-Q
 +
 +# -- Edit Menu
 +#
 +menu .mbar.edit
 +.mbar.edit add command -label Undo \
 +      -command {catch {[focus] edit undo}} \
 +      -accelerator $M1T-Z
 +.mbar.edit add command -label Redo \
 +      -command {catch {[focus] edit redo}} \
 +      -accelerator $M1T-Y
 +.mbar.edit add separator
 +.mbar.edit add command -label Cut \
 +      -command {catch {tk_textCut [focus]}} \
 +      -accelerator $M1T-X
 +.mbar.edit add command -label Copy \
 +      -command {catch {tk_textCopy [focus]}} \
 +      -accelerator $M1T-C
 +.mbar.edit add command -label Paste \
 +      -command {catch {tk_textPaste [focus]; [focus] see insert}} \
 +      -accelerator $M1T-V
 +.mbar.edit add command -label Delete \
 +      -command {catch {[focus] delete sel.first sel.last}} \
 +      -accelerator Del
 +.mbar.edit add separator
 +.mbar.edit add command -label {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 {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 {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 {Rename...} \
 +              -command branch_rename::dialog
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label {Delete...} \
 +              -command branch_delete::dialog
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label {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 {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 {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 Rescan \
 +              -command do_rescan \
 +              -accelerator F5
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
-       .mbar.commit add command -label {Add Existing To Commit} \
++      .mbar.commit add command -label {Stage To Commit} \
 +              -command do_add_selection
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
-               -command merge::dialog
++      .mbar.commit add command -label {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 {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 {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 {Sign Off} \
 +              -command do_signoff \
 +              -accelerator $M1T-S
 +
 +      .mbar.commit add command -label Commit \
 +              -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 {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 {Abort Merge...} \
 +              -command merge::reset_hard
 +      lappend disable_on_lock \
 +              [list .mbar.merge entryconf [.mbar.merge index last] -state]
- 
-       # -- Tools Menu
-       #
-       if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
-       proc do_miga {} {
-               if {![lock_index update]} return
-               set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
-               set miga_fd [open "|$cmd" r]
-               fconfigure $miga_fd -blocking 0
-               fileevent $miga_fd readable [list miga_done $miga_fd]
-               ui_status {Running miga...}
-       }
-       proc miga_done {fd} {
-               read $fd 512
-               if {[eof $fd]} {
-                       close $fd
-                       unlock_index
-                       rescan ui_ready
-               }
-       }
-       .mbar add cascade -label Tools -menu .mbar.tools
-       menu .mbar.tools
-       .mbar.tools add command -label "Migrate" \
-               -command do_miga
-       lappend disable_on_lock \
-               [list .mbar.tools entryconf [.mbar.tools index last] -state]
-       }
 +}
 +
 +# -- Transport Menu
 +#
 +if {[is_enabled transport]} {
 +      menu .mbar.fetch
 +
 +      menu .mbar.push
 +      .mbar.push add command -label {Push...} \
 +              -command do_push_anywhere \
 +              -accelerator $M1T-P
 +      .mbar.push add command -label {Delete...} \
 +              -command remote_branch_delete::dialog
 +}
 +
 +if {[is_MacOSX]} {
 +      # -- Apple Menu (Mac OS X only)
 +      #
 +      .mbar add cascade -label Apple -menu .mbar.apple
 +      menu .mbar.apple
 +
 +      .mbar.apple add command -label "About [appname]" \
 +              -command do_about
 +      .mbar.apple add command -label "Options..." \
 +              -command do_options
 +} else {
 +      # -- Edit Menu
 +      #
 +      .mbar.edit add separator
 +      .mbar.edit add command -label {Options...} \
 +              -command do_options
- browser {
-       set subcommand_args {rev?}
-       switch [llength $argv] {
-       0 { load_current_branch }
-       1 {
-               set current_branch [lindex $argv 0]
-               if {[regexp {^[0-9a-f]{1,39}$} $current_branch]} {
-                       if {[catch {
-                                       set current_branch \
-                                       [git rev-parse --verify $current_branch]
-                               } err]} {
-                               puts stderr $err
-                               exit 1
-                       }
-               }
-       }
-       default usage
-       }
-       browser::new $current_branch
-       return
- }
 +}
 +
 +# -- Help Menu
 +#
 +.mbar add cascade -label Help -menu .mbar.help
 +menu .mbar.help
 +
 +if {![is_MacOSX]} {
 +      .mbar.help add command -label "About [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 {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 {
-       set subcommand_args {rev? path?}
++browser -
 +blame {
-       if {$path eq {}} usage
-       blame::new $head $path
++      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
 +      }
 +
- button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
++      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 "fatal: cannot stat path $path: No such file or directory"
++                      exit 1
++              }
++              blame::new $head $path
++      }
++      }
 +      return
 +}
 +citool -
 +gui {
 +      if {[llength $argv] != 0} {
 +              puts -nonewline stderr "usage: $argv0"
 +              if {$subcommand ne {gui} && [appname] 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 {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 vertical
 +panedwindow .vpane.files -orient horizontal
 +.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 {Staged Changes (Will Be Committed)} \
 +      -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
 +.vpane.files add .vpane.files.index -sticky nsew
 +
 +# -- Working Directory File List
 +#
 +frame .vpane.files.workdir -height 100 -width 200
 +label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
 +      -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
 +
 +foreach i [list $ui_index $ui_workdir] {
 +      $i tag conf in_diff -background lightgray
 +      $i tag conf in_sel  -background lightgray
 +}
 +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.commarea -side top -fill x
 +pack .vpane.lower.diff -side bottom -fill both -expand 1
 +.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 {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}
 +
- bind_button3 $ui_diff "
-       set cursorX %x
-       set cursorY %y
-       if {\$ui_index eq \$current_diff_side} {
-               $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
++button .vpane.lower.commarea.buttons.incall -text {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 {Sign Off} \
 +      -command do_signoff
 +pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 +
 +button .vpane.lower.commarea.buttons.commit -text {Commit} \
 +      -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 {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 {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 {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 {Initial Commit Message:}}
 +      amend         {set txt {Amended Commit Message:}}
 +      amend-initial {set txt {Amended Initial Commit Message:}}
 +      amend-merge   {set txt {Amended Merge Commit Message:}}
 +      merge         {set txt {Merge Commit Message:}}
 +      *             {set txt {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 {Cut} \
 +      -command {tk_textCut $ui_comm}
 +$ctxm add command \
 +      -label {Copy} \
 +      -command {tk_textCopy $ui_comm}
 +$ctxm add command \
 +      -label {Paste} \
 +      -command {tk_textPaste $ui_comm}
 +$ctxm add command \
 +      -label {Delete} \
 +      -command {$ui_comm delete sel.first sel.last}
 +$ctxm add separator
 +$ctxm add command \
 +      -label {Select All} \
 +      -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
 +$ctxm add command \
 +      -label {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 {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 {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 {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 {Refresh} \
 +      -command reshow_diff
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +      -label {Copy} \
 +      -command {tk_textCopy $ui_diff}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +      -label {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 {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 {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 {Decrease Font Size} \
 +      -command {incr_font_size font_diff -1}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +      -label {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 {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 {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 {Options...} \
 +      -command do_options
-               $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
++proc popup_diff_menu {ctxm x y X Y} {
++      set ::cursorX $x
++      set ::cursorY $y
++      if {$::ui_index eq $::current_diff_side} {
++              $ctxm entryconf $::ui_diff_applyhunk \
++                      -state normal \
++                      -label {Unstage Hunk From Commit}
++      } elseif {{_O} eq [lindex $::file_states($::current_diff_path) 0]} {
++              $ctxm entryconf $::ui_diff_applyhunk \
++                      -state disabled \
++                      -label {Stage Hunk For Commit}
 +      } else {
-       tk_popup $ctxm %X %Y
- "
- unset ui_diff_applyhunk
++              $ctxm entryconf $::ui_diff_applyhunk \
++                      -state normal \
++                      -label {Stage Hunk For Commit}
 +      }
- # -- Only suggest a gc run if we are going to stay running.
- #
- if {[is_enabled multicommit]} {
-       set object_limit 2000
-       if {[is_Windows]} {set object_limit 200}
-       regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
-       if {$objects_current >= $object_limit} {
-               if {[ask_popup \
-                       "This repository currently has $objects_current loose objects.
++      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 {Initializing...}
 +
 +# -- Load geometry
 +#
 +catch {
 +set gm $repo_config(gui.geometry)
 +wm geometry . [lindex $gm 0]
 +.vpane sash place 0 \
 +      [lindex [.vpane sash coord 0] 0] \
 +      [lindex $gm 1]
 +.vpane.files sash place 0 \
 +      [lindex $gm 2] \
 +      [lindex [.vpane.files sash coord 0] 1]
 +unset gm
 +}
 +
 +# -- Key Bindings
 +#
 +bind $ui_comm <$M1B-Key-Return> {do_commit;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-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 "Possible environment issues exist.
 +
 +The following environment variables are probably
 +going to be ignored by any Git subprocess run
 +by [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 "
 +This is due to a known issue with the
 +Tcl binary distributed by Cygwin."
 +
 +              if {$suggest_user ne {}} {
 +                      append msg "
 +
 +A good replacement for $suggest_user
 +is placing values for the user.name and
 +user.email settings into your personal
 +~/.gitconfig file.
 +"
 +              }
 +              warn_popup $msg
 +      }
 +      unset ignored_env msg suggest_user name
 +}
 +
 +# -- Only initialize complex UI if we are going to stay running.
 +#
 +if {[is_enabled transport]} {
 +      load_all_remotes
 +
 +      populate_fetch_menu
 +      populate_push_menu
 +}
 +
- To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
++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
++      }
 +
- Compress the database now?"] eq yes} {
-                       do_gc
++      proc backup_commit_buffer {} {
++              global ui_comm GITGUI_BCK_exists
 +
-       unset object_limit _junk objects_current
++              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/blame.tcl
index 4bdb9a27a3dbcc60957f1a4eaed123faf3952bac,0000000000000000000000000000000000000000..96072847a2ffeec814f499657744e5ed4f8988c0
mode 100644,000000..100644
--- 1/git-gui/lib/blame.tcl
--- /dev/null
+++ b/git-gui/lib/blame.tcl
@@@ -1,981 -1,0 +1,992 @@@
-                               set msg [encoding convertfrom $enc [read $fd]]
-                               set msg [string trim $msg]
 +# git-gui blame viewer
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +class blame {
 +
 +image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
 +
 +# Persistant data (survives loads)
 +#
 +field history {}; # viewer history: {commit path}
 +field header    ; # array commit,key -> header field
 +
 +# Tk UI control paths
 +#
 +field w          ; # top window in this viewer
 +field w_back     ; # our back button
 +field w_path     ; # label showing the current file path
 +field w_columns  ; # list of all column widgets in the viewer
 +field w_line     ; # text column: all line numbers
 +field w_amov     ; # text column: annotations + move tracking
 +field w_asim     ; # text column: annotations (simple computation)
 +field w_file     ; # text column: actual file data
 +field w_cviewer  ; # pane showing commit message
 +field status     ; # status mega-widget instance
 +field old_height ; # last known height of $w.file_pane
 +
 +# Tk UI colors
 +#
 +variable active_color #c0edc5
 +variable group_colors {
 +      #d6d6d6
 +      #e1e1e1
 +      #ececec
 +}
 +
 +# Switches for original location detection
 +#
 +variable original_options [list -C -C]
 +if {[git-version >= 1.5.3]} {
 +      lappend original_options -w ; # ignore indentation changes
 +}
 +
 +# Current blame data; cleared/reset on each load
 +#
 +field commit               ; # input commit to blame
 +field path                 ; # input filename to view in $commit
 +
 +field current_fd        {} ; # background process running
 +field highlight_line    -1 ; # current line selected
 +field highlight_column  {} ; # current commit column selected
 +field highlight_commit  {} ; # sha1 of commit selected
 +
 +field total_lines       0  ; # total length of file
 +field blame_lines       0  ; # number of lines computed
 +field amov_data            ; # list of {commit origfile origline}
 +field asim_data            ; # list of {commit origfile origline}
 +
 +field r_commit             ; # commit currently being parsed
 +field r_orig_line          ; # original line number
 +field r_final_line         ; # final line number
 +field r_line_count         ; # lines in this region
 +
 +field tooltip_wm        {} ; # Current tooltip toplevel, if open
 +field tooltip_t         {} ; # Text widget in $tooltip_wm
 +field tooltip_timer     {} ; # Current timer event for our tooltip
 +field tooltip_commit    {} ; # Commit(s) in tooltip
 +
 +constructor new {i_commit i_path} {
 +      global cursor_ptr
 +      variable active_color
 +      variable group_colors
 +
 +      set commit $i_commit
 +      set path   $i_path
 +
 +      make_toplevel top w
 +      wm title $top "[appname] ([reponame]): File Viewer"
 +
 +      frame $w.header -background gold
 +      label $w.header.commit_l \
 +              -text {Commit:} \
 +              -background gold \
 +              -anchor w \
 +              -justify left
 +      set w_back $w.header.commit_b
 +      label $w_back \
 +              -image ::blame::img_back_arrow \
 +              -borderwidth 0 \
 +              -relief flat \
 +              -state disabled \
 +              -background gold \
 +              -activebackground gold
 +      bind $w_back <Button-1> "
 +              if {\[$w_back cget -state\] eq {normal}} {
 +                      [cb _history_menu]
 +              }
 +              "
 +      label $w.header.commit \
 +              -textvariable @commit \
 +              -background gold \
 +              -anchor w \
 +              -justify left
 +      label $w.header.path_l \
 +              -text {File:} \
 +              -background gold \
 +              -anchor w \
 +              -justify left
 +      set w_path $w.header.path
 +      label $w_path \
 +              -background gold \
 +              -anchor w \
 +              -justify left
 +      pack $w.header.commit_l -side left
 +      pack $w_back -side left
 +      pack $w.header.commit -side left
 +      pack $w_path -fill x -side right
 +      pack $w.header.path_l -side right
 +
 +      panedwindow $w.file_pane -orient vertical
 +      frame $w.file_pane.out
 +      frame $w.file_pane.cm
 +      $w.file_pane add $w.file_pane.out \
 +              -sticky nsew \
 +              -minsize 100 \
 +              -height 100 \
 +              -width 100
 +      $w.file_pane add $w.file_pane.cm \
 +              -sticky nsew \
 +              -minsize 25 \
 +              -height 25 \
 +              -width 100
 +
 +      set w_line $w.file_pane.out.linenumber_t
 +      text $w_line \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 6 \
 +              -font font_diff
 +      $w_line tag conf linenumber -justify right -rmargin 5
 +
 +      set w_amov $w.file_pane.out.amove_t
 +      text $w_amov \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 5 \
 +              -font font_diff
 +      $w_amov tag conf author_abbr -justify right -rmargin 5
 +      $w_amov tag conf curr_commit
 +      $w_amov tag conf prior_commit -foreground blue -underline 1
 +      $w_amov tag bind prior_commit \
 +              <Button-1> \
 +              "[cb _load_commit $w_amov @amov_data @%x,%y];break"
 +
 +      set w_asim $w.file_pane.out.asimple_t
 +      text $w_asim \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 4 \
 +              -font font_diff
 +      $w_asim tag conf author_abbr -justify right
 +      $w_asim tag conf curr_commit
 +      $w_asim tag conf prior_commit -foreground blue -underline 1
 +      $w_asim tag bind prior_commit \
 +              <Button-1> \
 +              "[cb _load_commit $w_asim @asim_data @%x,%y];break"
 +
 +      set w_file $w.file_pane.out.file_t
 +      text $w_file \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 80 \
 +              -xscrollcommand [list $w.file_pane.out.sbx set] \
 +              -font font_diff
 +
 +      set w_columns [list $w_amov $w_asim $w_line $w_file]
 +
 +      scrollbar $w.file_pane.out.sbx \
 +              -orient h \
 +              -command [list $w_file xview]
 +      scrollbar $w.file_pane.out.sby \
 +              -orient v \
 +              -command [list scrollbar2many $w_columns yview]
 +      eval grid $w_columns $w.file_pane.out.sby -sticky nsew
 +      grid conf \
 +              $w.file_pane.out.sbx \
 +              -column [expr {[llength $w_columns] - 1}] \
 +              -sticky we
 +      grid columnconfigure \
 +              $w.file_pane.out \
 +              [expr {[llength $w_columns] - 1}] \
 +              -weight 1
 +      grid rowconfigure $w.file_pane.out 0 -weight 1
 +
 +      set w_cviewer $w.file_pane.cm.t
 +      text $w_cviewer \
 +              -background white -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 10 \
 +              -width 80 \
 +              -xscrollcommand [list $w.file_pane.cm.sbx set] \
 +              -yscrollcommand [list $w.file_pane.cm.sby set] \
 +              -font font_diff
 +      $w_cviewer tag conf still_loading \
 +              -font font_uiitalic \
 +              -justify center
 +      $w_cviewer tag conf header_key \
 +              -tabs {3c} \
 +              -background $active_color \
 +              -font font_uibold
 +      $w_cviewer tag conf header_val \
 +              -background $active_color \
 +              -font font_ui
 +      $w_cviewer tag raise sel
 +      scrollbar $w.file_pane.cm.sbx \
 +              -orient h \
 +              -command [list $w_cviewer xview]
 +      scrollbar $w.file_pane.cm.sby \
 +              -orient v \
 +              -command [list $w_cviewer yview]
 +      pack $w.file_pane.cm.sby -side right -fill y
 +      pack $w.file_pane.cm.sbx -side bottom -fill x
 +      pack $w_cviewer -expand 1 -fill both
 +
 +      set status [::status_bar::new $w.status]
 +
 +      menu $w.ctxm -tearoff 0
 +      $w.ctxm add command \
 +              -label "Copy Commit" \
 +              -command [cb _copycommit]
 +
 +      foreach i $w_columns {
 +              for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +                      $i tag conf color$g -background [lindex $group_colors $g]
 +              }
 +
 +              $i conf -cursor $cursor_ptr
 +              $i conf -yscrollcommand [list many2scrollbar \
 +                      $w_columns yview $w.file_pane.out.sby]
 +              bind $i <Button-1> "
 +                      [cb _hide_tooltip]
 +                      [cb _click $i @%x,%y]
 +                      focus $i
 +              "
 +              bind $i <Any-Motion>  [cb _show_tooltip $i @%x,%y]
 +              bind $i <Any-Enter>   [cb _hide_tooltip]
 +              bind $i <Any-Leave>   [cb _hide_tooltip]
 +              bind_button3 $i "
 +                      [cb _hide_tooltip]
 +                      set cursorX %x
 +                      set cursorY %y
 +                      set cursorW %W
 +                      tk_popup $w.ctxm %X %Y
 +              "
 +              bind $i <Shift-Tab> "[list focus $w_cviewer];break"
 +              bind $i <Tab>       "[list focus $w_cviewer];break"
 +      }
 +
 +      foreach i [concat $w_columns $w_cviewer] {
 +              bind $i <Key-Up>        {catch {%W yview scroll -1 units};break}
 +              bind $i <Key-Down>      {catch {%W yview scroll  1 units};break}
 +              bind $i <Key-Left>      {catch {%W xview scroll -1 units};break}
 +              bind $i <Key-Right>     {catch {%W xview scroll  1 units};break}
 +              bind $i <Key-k>         {catch {%W yview scroll -1 units};break}
 +              bind $i <Key-j>         {catch {%W yview scroll  1 units};break}
 +              bind $i <Key-h>         {catch {%W xview scroll -1 units};break}
 +              bind $i <Key-l>         {catch {%W xview scroll  1 units};break}
 +              bind $i <Control-Key-b> {catch {%W yview scroll -1 pages};break}
 +              bind $i <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 +      }
 +
 +      bind $w_cviewer <Shift-Tab> "[list focus $w_file];break"
 +      bind $w_cviewer <Tab>       "[list focus $w_file];break"
 +      bind $w_cviewer <Button-1> [list focus $w_cviewer]
 +      bind $w_file    <Visibility> [list focus $w_file]
 +
 +      grid configure $w.header -sticky ew
 +      grid configure $w.file_pane -sticky nsew
 +      grid configure $w.status -sticky ew
 +      grid columnconfigure $top 0 -weight 1
 +      grid rowconfigure $top 0 -weight 0
 +      grid rowconfigure $top 1 -weight 1
 +      grid rowconfigure $top 2 -weight 0
 +
 +      set req_w [winfo reqwidth  $top]
 +      set req_h [winfo reqheight $top]
 +      set scr_h [expr {[winfo screenheight $top] - 100}]
 +      if {$req_w < 600} {set req_w 600}
 +      if {$req_h < $scr_h} {set req_h $scr_h}
 +      set g "${req_w}x${req_h}"
 +      wm geometry $top $g
 +      update
 +
 +      set old_height [winfo height $w.file_pane]
 +      $w.file_pane sash place 0 \
 +              [lindex [$w.file_pane sash coord 0] 0] \
 +              [expr {int($old_height * 0.70)}]
 +      bind $w.file_pane <Configure> \
 +      "if {{$w.file_pane} eq {%W}} {[cb _resize %h]}"
 +
 +      _load $this {}
 +}
 +
 +method _load {jump} {
 +      variable group_colors
 +
 +      _hide_tooltip $this
 +
 +      if {$total_lines != 0 || $current_fd ne {}} {
 +              if {$current_fd ne {}} {
 +                      catch {close $current_fd}
 +                      set current_fd {}
 +              }
 +
 +              foreach i $w_columns {
 +                      $i conf -state normal
 +                      $i delete 0.0 end
 +                      foreach g [$i tag names] {
 +                              if {[regexp {^g[0-9a-f]{40}$} $g]} {
 +                                      $i tag delete $g
 +                              }
 +                      }
 +                      $i conf -state disabled
 +              }
 +
 +              $w_cviewer conf -state normal
 +              $w_cviewer delete 0.0 end
 +              $w_cviewer conf -state disabled
 +
 +              set highlight_line -1
 +              set highlight_column {}
 +              set highlight_commit {}
 +              set total_lines 0
 +      }
 +
 +      if {$history eq {}} {
 +              $w_back conf -state disabled
 +      } else {
 +              $w_back conf -state normal
 +      }
 +
 +      # Index 0 is always empty.  There is never line 0 as
 +      # we use only 1 based lines, as that matches both with
 +      # git-blame output and with Tk's text widget.
 +      #
 +      set amov_data [list [list]]
 +      set asim_data [list [list]]
 +
 +      $status show "Reading $commit:[escape_path $path]..."
 +      $w_path conf -text [escape_path $path]
 +      if {$commit eq {}} {
 +              set fd [open $path r]
++              fconfigure $fd -eofchar {}
 +      } else {
 +              set fd [git_read cat-file blob "$commit:$path"]
 +      }
 +      fconfigure $fd -blocking 0 -translation lf -encoding binary
 +      fileevent $fd readable [cb _read_file $fd $jump]
 +      set current_fd $fd
 +}
 +
 +method _history_menu {} {
 +      set m $w.backmenu
 +      if {[winfo exists $m]} {
 +              $m delete 0 end
 +      } else {
 +              menu $m -tearoff 0
 +      }
 +
 +      for {set i [expr {[llength $history] - 1}]
 +              } {$i >= 0} {incr i -1} {
 +              set e [lindex $history $i]
 +              set c [lindex $e 0]
 +              set f [lindex $e 1]
 +
 +              if {[regexp {^[0-9a-f]{40}$} $c]} {
 +                      set t [string range $c 0 8]...
 +              } elseif {$c eq {}} {
 +                      set t {Working Directory}
 +              } else {
 +                      set t $c
 +              }
 +              if {![catch {set summary $header($c,summary)}]} {
 +                      append t " $summary"
 +                      if {[string length $t] > 70} {
 +                              set t [string range $t 0 66]...
 +                      }
 +              }
 +
 +              $m add command -label $t -command [cb _goback $i]
 +      }
 +      set X [winfo rootx $w_back]
 +      set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}]
 +      tk_popup $m $X $Y
 +}
 +
 +method _goback {i} {
 +      set dat [lindex $history $i]
 +      set history [lrange $history 0 [expr {$i - 1}]]
 +      set commit [lindex $dat 0]
 +      set path [lindex $dat 1]
 +      _load $this [lrange $dat 2 5]
 +}
 +
 +method _read_file {fd jump} {
 +      if {$fd ne $current_fd} {
 +              catch {close $fd}
 +              return
 +      }
 +
 +      foreach i $w_columns {$i conf -state normal}
 +      while {[gets $fd line] >= 0} {
 +              regsub "\r\$" $line {} line
 +              incr total_lines
 +              lappend amov_data {}
 +              lappend asim_data {}
 +
 +              if {$total_lines > 1} {
 +                      foreach i $w_columns {$i insert end "\n"}
 +              }
 +
 +              $w_line insert end "$total_lines" linenumber
 +              $w_file insert end "$line"
 +      }
 +
 +      set ln_wc [expr {[string length $total_lines] + 2}]
 +      if {[$w_line cget -width] < $ln_wc} {
 +              $w_line conf -width $ln_wc
 +      }
 +
 +      foreach i $w_columns {$i conf -state disabled}
 +
 +      if {[eof $fd]} {
 +              close $fd
 +
 +              # If we don't force Tk to update the widgets *right now*
 +              # none of our jump commands will cause a change in the UI.
 +              #
 +              update
 +
 +              if {[llength $jump] == 1} {
 +                      set highlight_line [lindex $jump 0]
 +                      $w_file see "$highlight_line.0"
 +              } elseif {[llength $jump] == 4} {
 +                      set highlight_column [lindex $jump 0]
 +                      set highlight_line [lindex $jump 1]
 +                      $w_file xview moveto [lindex $jump 2]
 +                      $w_file yview moveto [lindex $jump 3]
 +              }
 +
 +              _exec_blame $this $w_asim @asim_data \
 +                      [list] \
 +                      { copy/move tracking}
 +      }
 +} ifdeleted { catch {close $fd} }
 +
 +method _exec_blame {cur_w cur_d options cur_s} {
 +      lappend options --incremental
 +      if {$commit eq {}} {
 +              lappend options --contents $path
 +      } else {
 +              lappend options $commit
 +      }
 +      lappend options -- $path
 +      set fd [eval git_read --nice blame $options]
 +      fconfigure $fd -blocking 0 -translation lf -encoding binary
 +      fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
 +      set current_fd $fd
 +      set blame_lines 0
 +
 +      $status start \
 +              "Loading$cur_s annotations..." \
 +              {lines annotated}
 +}
 +
 +method _read_blame {fd cur_w cur_d} {
 +      upvar #0 $cur_d line_data
 +      variable group_colors
 +      variable original_options
 +
 +      if {$fd ne $current_fd} {
 +              catch {close $fd}
 +              return
 +      }
 +
 +      $cur_w conf -state normal
 +      while {[gets $fd line] >= 0} {
 +              if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
 +                      cmit original_line final_line line_count]} {
 +                      set r_commit     $cmit
 +                      set r_orig_line  $original_line
 +                      set r_final_line $final_line
 +                      set r_line_count $line_count
 +              } elseif {[string match {filename *} $line]} {
 +                      set file [string range $line 9 end]
 +                      set n    $r_line_count
 +                      set lno  $r_final_line
 +                      set oln  $r_orig_line
 +                      set cmit $r_commit
 +
 +                      if {[regexp {^0{40}$} $cmit]} {
 +                              set commit_abbr work
 +                              set commit_type curr_commit
 +                      } elseif {$cmit eq $commit} {
 +                              set commit_abbr this
 +                              set commit_type curr_commit
 +                      } else {
 +                              set commit_type prior_commit
 +                              set commit_abbr [string range $cmit 0 3]
 +                      }
 +
 +                      set author_abbr {}
 +                      set a_name {}
 +                      catch {set a_name $header($cmit,author)}
 +                      while {$a_name ne {}} {
 +                              if {$author_abbr ne {}
 +                                      && [string index $a_name 0] eq {'}} {
 +                                      regsub {^'[^']+'\s+} $a_name {} a_name
 +                              }
 +                              if {![regexp {^([[:upper:]])} $a_name _a]} break
 +                              append author_abbr $_a
 +                              unset _a
 +                              if {![regsub \
 +                                      {^[[:upper:]][^\s]*\s+} \
 +                                      $a_name {} a_name ]} break
 +                      }
 +                      if {$author_abbr eq {}} {
 +                              set author_abbr { |}
 +                      } else {
 +                              set author_abbr [string range $author_abbr 0 3]
 +                      }
 +                      unset a_name
 +
 +                      set first_lno $lno
 +                      while {
 +                         $first_lno > 1
 +                      && $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0]
 +                      && $file eq [lindex $line_data [expr {$first_lno - 1}] 1]
 +                      } {
 +                              incr first_lno -1
 +                      }
 +
 +                      set color {}
 +                      if {$first_lno < $lno} {
 +                              foreach g [$w_file tag names $first_lno.0] {
 +                                      if {[regexp {^color[0-9]+$} $g]} {
 +                                              set color $g
 +                                              break
 +                                      }
 +                              }
 +                      } else {
 +                              set i [lsort [concat \
 +                                      [$w_file tag names "[expr {$first_lno - 1}].0"] \
 +                                      [$w_file tag names "[expr {$lno + $n}].0"] \
 +                                      ]]
 +                              for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +                                      if {[lsearch -sorted -exact $i color$g] == -1} {
 +                                              set color color$g
 +                                              break
 +                                      }
 +                              }
 +                      }
 +                      if {$color eq {}} {
 +                              set color color0
 +                      }
 +
 +                      while {$n > 0} {
 +                              set lno_e "$lno.0 lineend + 1c"
 +                              if {[lindex $line_data $lno] ne {}} {
 +                                      set g [lindex $line_data $lno 0]
 +                                      foreach i $w_columns {
 +                                              $i tag remove g$g $lno.0 $lno_e
 +                                      }
 +                              }
 +                              lset line_data $lno [list $cmit $file $oln]
 +
 +                              $cur_w delete $lno.0 "$lno.0 lineend"
 +                              if {$lno == $first_lno} {
 +                                      $cur_w insert $lno.0 $commit_abbr $commit_type
 +                              } elseif {$lno == [expr {$first_lno + 1}]} {
 +                                      $cur_w insert $lno.0 $author_abbr author_abbr
 +                              } else {
 +                                      $cur_w insert $lno.0 { |}
 +                              }
 +
 +                              foreach i $w_columns {
 +                                      if {$cur_w eq $w_amov} {
 +                                              for {set g 0} \
 +                                                      {$g < [llength $group_colors]} \
 +                                                      {incr g} {
 +                                                      $i tag remove color$g $lno.0 $lno_e
 +                                              }
 +                                              $i tag add $color $lno.0 $lno_e
 +                                      }
 +                                      $i tag add g$cmit $lno.0 $lno_e
 +                              }
 +
 +                              if {$highlight_column eq $cur_w} {
 +                                      if {$highlight_line == -1
 +                                       && [lindex [$w_file yview] 0] == 0} {
 +                                              $w_file see $lno.0
 +                                              set highlight_line $lno
 +                                      }
 +                                      if {$highlight_line == $lno} {
 +                                              _showcommit $this $cur_w $lno
 +                                      }
 +                              }
 +
 +                              incr n -1
 +                              incr lno
 +                              incr oln
 +                              incr blame_lines
 +                      }
 +
 +                      while {
 +                         $cmit eq [lindex $line_data $lno 0]
 +                      && $file eq [lindex $line_data $lno 1]
 +                      } {
 +                              $cur_w delete $lno.0 "$lno.0 lineend"
 +
 +                              if {$lno == $first_lno} {
 +                                      $cur_w insert $lno.0 $commit_abbr $commit_type
 +                              } elseif {$lno == [expr {$first_lno + 1}]} {
 +                                      $cur_w insert $lno.0 $author_abbr author_abbr
 +                              } else {
 +                                      $cur_w insert $lno.0 { |}
 +                              }
 +
 +                              if {$cur_w eq $w_amov} {
 +                                      foreach i $w_columns {
 +                                              for {set g 0} \
 +                                                      {$g < [llength $group_colors]} \
 +                                                      {incr g} {
 +                                                      $i tag remove color$g $lno.0 $lno_e
 +                                              }
 +                                              $i tag add $color $lno.0 $lno_e
 +                                      }
 +                              }
 +
 +                              incr lno
 +                      }
 +
 +              } elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} {
 +                      set header($r_commit,$key) $data
 +              }
 +      }
 +      $cur_w conf -state disabled
 +
 +      if {[eof $fd]} {
 +              close $fd
 +              if {$cur_w eq $w_asim} {
 +                      _exec_blame $this $w_amov @amov_data \
 +                              $original_options \
 +                              { original location}
 +              } else {
 +                      set current_fd {}
 +                      $status stop {Annotation complete.}
 +              }
 +      } else {
 +              $status update $blame_lines $total_lines
 +      }
 +} ifdeleted { catch {close $fd} }
 +
 +method _click {cur_w pos} {
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      _showcommit $this $cur_w $lno
 +}
 +
 +method _load_commit {cur_w cur_d pos} {
 +      upvar #0 $cur_d line_data
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      set dat [lindex $line_data $lno]
 +      if {$dat ne {}} {
 +              lappend history [list \
 +                      $commit $path \
 +                      $highlight_column \
 +                      $highlight_line \
 +                      [lindex [$w_file xview] 0] \
 +                      [lindex [$w_file yview] 0] \
 +                      ]
 +              set commit [lindex $dat 0]
 +              set path   [lindex $dat 1]
 +              _load $this [list [lindex $dat 2]]
 +      }
 +}
 +
 +method _showcommit {cur_w lno} {
 +      global repo_config
 +      variable active_color
 +
 +      if {$highlight_commit ne {}} {
 +              foreach i $w_columns {
 +                      $i tag conf g$highlight_commit -background {}
 +                      $i tag lower g$highlight_commit
 +              }
 +      }
 +
 +      if {$cur_w eq $w_asim} {
 +              set dat [lindex $asim_data $lno]
 +              set highlight_column $w_asim
 +      } else {
 +              set dat [lindex $amov_data $lno]
 +              set highlight_column $w_amov
 +      }
 +
 +      $w_cviewer conf -state normal
 +      $w_cviewer delete 0.0 end
 +
 +      if {$dat eq {}} {
 +              set cmit {}
 +              $w_cviewer insert end "Loading annotation..." still_loading
 +      } else {
 +              set cmit [lindex $dat 0]
 +              set file [lindex $dat 1]
 +
 +              foreach i $w_columns {
 +                      $i tag conf g$cmit -background $active_color
 +                      $i tag raise g$cmit
 +              }
 +
 +              set author_name {}
 +              set author_email {}
 +              set author_time {}
 +              catch {set author_name $header($cmit,author)}
 +              catch {set author_email $header($cmit,author-mail)}
 +              catch {set author_time [clock format \
 +                      $header($cmit,author-time) \
 +                      -format {%Y-%m-%d %H:%M:%S}
 +              ]}
 +
 +              set committer_name {}
 +              set committer_email {}
 +              set committer_time {}
 +              catch {set committer_name $header($cmit,committer)}
 +              catch {set committer_email $header($cmit,committer-mail)}
 +              catch {set committer_time [clock format \
 +                      $header($cmit,committer-time) \
 +                      -format {%Y-%m-%d %H:%M:%S}
 +              ]}
 +
 +              if {[catch {set msg $header($cmit,message)}]} {
 +                      set msg {}
 +                      catch {
 +                              set fd [git_read cat-file commit $cmit]
 +                              fconfigure $fd -encoding binary -translation lf
 +                              if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 +                                      set enc utf-8
 +                              }
 +                              while {[gets $fd line] > 0} {
 +                                      if {[string match {encoding *} $line]} {
 +                                              set enc [string tolower [string range $line 9 end]]
 +                                      }
 +                              }
-                               set author_name [encoding convertfrom $enc $author_name]
-                               set committer_name [encoding convertfrom $enc $committer_name]
- 
-                               set header($cmit,author) $author_name
-                               set header($cmit,committer) $committer_name
++                              set msg [read $fd]
 +                              close $fd
 +
++                              set enc [tcl_encoding $enc]
++                              if {$enc ne {}} {
++                                      set msg [encoding convertfrom $enc $msg]
++                                      set author_name [encoding convertfrom $enc $author_name]
++                                      set committer_name [encoding convertfrom $enc $committer_name]
++                                      set header($cmit,author) $author_name
++                                      set header($cmit,committer) $committer_name
++                                      set header($cmit,summary) \
++                                      [encoding convertfrom $enc $header($cmit,summary)]
++                              }
++                              set msg [string trim $msg]
 +                      }
 +                      set header($cmit,message) $msg
 +              }
 +
 +              $w_cviewer insert end "commit $cmit\n" header_key
 +              $w_cviewer insert end "Author:\t" header_key
 +              $w_cviewer insert end "$author_name $author_email" header_val
 +              $w_cviewer insert end "  $author_time\n" header_val
 +
 +              $w_cviewer insert end "Committer:\t" header_key
 +              $w_cviewer insert end "$committer_name $committer_email" header_val
 +              $w_cviewer insert end "  $committer_time\n" header_val
 +
 +              if {$file ne $path} {
 +                      $w_cviewer insert end "Original File:\t" header_key
 +                      $w_cviewer insert end "[escape_path $file]\n" header_val
 +              }
 +
 +              $w_cviewer insert end "\n$msg"
 +      }
 +      $w_cviewer conf -state disabled
 +
 +      set highlight_line $lno
 +      set highlight_commit $cmit
 +
 +      if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} {
 +              _hide_tooltip $this
 +      }
 +}
 +
 +method _copycommit {} {
 +      set pos @$::cursorX,$::cursorY
 +      set lno [lindex [split [$::cursorW index $pos] .] 0]
 +      set dat [lindex $amov_data $lno]
 +      if {$dat ne {}} {
 +              clipboard clear
 +              clipboard append \
 +                      -format STRING \
 +                      -type STRING \
 +                      -- [lindex $dat 0]
 +      }
 +}
 +
 +method _show_tooltip {cur_w pos} {
 +      if {$tooltip_wm ne {}} {
 +              _open_tooltip $this $cur_w
 +      } elseif {$tooltip_timer eq {}} {
 +              set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
 +      }
 +}
 +
 +method _open_tooltip {cur_w} {
 +      set tooltip_timer {}
 +      set pos_x [winfo pointerx $cur_w]
 +      set pos_y [winfo pointery $cur_w]
 +      if {[winfo containing $pos_x $pos_y] ne $cur_w} {
 +              _hide_tooltip $this
 +              return
 +      }
 +
 +      if {$tooltip_wm ne "$cur_w.tooltip"} {
 +              _hide_tooltip $this
 +
 +              set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
 +              wm overrideredirect $tooltip_wm 1
 +              wm transient $tooltip_wm [winfo toplevel $cur_w]
 +              set tooltip_t $tooltip_wm.label
 +              text $tooltip_t \
 +                      -takefocus 0 \
 +                      -highlightthickness 0 \
 +                      -relief flat \
 +                      -borderwidth 0 \
 +                      -wrap none \
 +                      -background lightyellow \
 +                      -foreground black
 +              $tooltip_t tag conf section_header -font font_uibold
 +              pack $tooltip_t
 +      } else {
 +              $tooltip_t conf -state normal
 +              $tooltip_t delete 0.0 end
 +      }
 +
 +      set pos @[join [list \
 +              [expr {$pos_x - [winfo rootx $cur_w]}] \
 +              [expr {$pos_y - [winfo rooty $cur_w]}]] ,]
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      if {$cur_w eq $w_amov} {
 +              set dat [lindex $amov_data $lno]
 +              set org {}
 +      } else {
 +              set dat [lindex $asim_data $lno]
 +              set org [lindex $amov_data $lno]
 +      }
 +
++      if {$dat eq {}} {
++              _hide_tooltip $this
++              return
++      }
++
 +      set cmit [lindex $dat 0]
 +      set tooltip_commit [list $cmit]
 +
 +      set author_name {}
 +      set summary     {}
 +      set author_time {}
 +      catch {set author_name $header($cmit,author)}
 +      catch {set summary     $header($cmit,summary)}
 +      catch {set author_time [clock format \
 +              $header($cmit,author-time) \
 +              -format {%Y-%m-%d %H:%M:%S}
 +      ]}
 +
 +      $tooltip_t insert end "commit $cmit\n"
 +      $tooltip_t insert end "$author_name  $author_time\n"
 +      $tooltip_t insert end "$summary"
 +
 +      if {$org ne {} && [lindex $org 0] ne $cmit} {
 +              set save [$tooltip_t get 0.0 end]
 +              $tooltip_t delete 0.0 end
 +
 +              set cmit [lindex $org 0]
 +              set file [lindex $org 1]
 +              lappend tooltip_commit $cmit
 +
 +              set author_name {}
 +              set summary     {}
 +              set author_time {}
 +              catch {set author_name $header($cmit,author)}
 +              catch {set summary     $header($cmit,summary)}
 +              catch {set author_time [clock format \
 +                      $header($cmit,author-time) \
 +                      -format {%Y-%m-%d %H:%M:%S}
 +              ]}
 +
 +              $tooltip_t insert end "Originally By:\n" section_header
 +              $tooltip_t insert end "commit $cmit\n"
 +              $tooltip_t insert end "$author_name  $author_time\n"
 +              $tooltip_t insert end "$summary\n"
 +
 +              if {$file ne $path} {
 +                      $tooltip_t insert end "In File: " section_header
 +                      $tooltip_t insert end "$file\n"
 +              }
 +
 +              $tooltip_t insert end "\n"
 +              $tooltip_t insert end "Copied Or Moved Here By:\n" section_header
 +              $tooltip_t insert end $save
 +      }
 +
 +      $tooltip_t conf -state disabled
 +      _position_tooltip $this
 +}
 +
 +method _position_tooltip {} {
 +      set max_h [lindex [split [$tooltip_t index end] .] 0]
 +      set max_w 0
 +      for {set i 1} {$i <= $max_h} {incr i} {
 +              set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1]
 +              if {$c > $max_w} {set max_w $c}
 +      }
 +      $tooltip_t conf -width $max_w -height $max_h
 +
 +      set req_w [winfo reqwidth  $tooltip_t]
 +      set req_h [winfo reqheight $tooltip_t]
 +      set pos_x [expr {[winfo pointerx .] +  5}]
 +      set pos_y [expr {[winfo pointery .] + 10}]
 +
 +      set g "${req_w}x${req_h}"
 +      if {$pos_x >= 0} {append g +}
 +      append g $pos_x
 +      if {$pos_y >= 0} {append g +}
 +      append g $pos_y
 +
 +      wm geometry $tooltip_wm $g
 +      raise $tooltip_wm
 +}
 +
 +method _hide_tooltip {} {
 +      if {$tooltip_wm ne {}} {
 +              destroy $tooltip_wm
 +              set tooltip_wm {}
 +              set tooltip_commit {}
 +      }
 +      if {$tooltip_timer ne {}} {
 +              after cancel $tooltip_timer
 +              set tooltip_timer {}
 +      }
 +}
 +
 +method _resize {new_height} {
 +      set diff [expr {$new_height - $old_height}]
 +      if {$diff == 0} return
 +
 +      set my [expr {[winfo height $w.file_pane] - 25}]
 +      set o [$w.file_pane sash coord 0]
 +      set ox [lindex $o 0]
 +      set oy [expr {[lindex $o 1] + $diff}]
 +      if {$oy < 0}   {set oy 0}
 +      if {$oy > $my} {set oy $my}
 +      $w.file_pane sash place 0 $ox $oy
 +
 +      set old_height $new_height
 +}
 +
 +}

diff --cc git-gui/lib/browser.tcl
index 911e5af7f42f4059636a1a2c95234520f397331e,0000000000000000000000000000000000000000..888db3c889fabbeb221aa9d8c6aab044105f039b
mode 100644,000000..100644
--- 1/git-gui/lib/browser.tcl
--- /dev/null
+++ b/git-gui/lib/browser.tcl
@@@ -1,241 -1,0 +1,312 @@@
- constructor new {commit} {
 +# git-gui tree browser
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +class browser {
 +
++image create photo ::browser::img_parent  -data {R0lGODlhEAAQAIUAAPwCBBxSHBxOHMTSzNzu3KzCtBRGHCSKFIzCjLzSxBQ2FAxGHDzCLCyeHBQ+FHSmfAwuFBxKLDSCNMzizISyjJzOnDSyLAw+FAQSDAQeDBxWJAwmDAQOBKzWrDymNAQaDAQODAwaDDyKTFSyXFTGTEy6TAQCBAQKDAwiFBQyHAwSFAwmHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAZ1QIBwSCwaj0hiQCBICpcDQsFgGAaIguhhi0gohIsrQEDYMhiNrRfgeAQC5fMCAolIDhD2hFI5WC4YRBkaBxsOE2l/RxsHHA4dHmkfRyAbIQ4iIyQlB5NFGCAACiakpSZEJyinTgAcKSesACorgU4mJ6uxR35BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=}
++image create photo ::browser::img_rblob   -data {R0lGODlhEAAQAIUAAPwCBFxaXNze3Ly2rJSWjPz+/Ozq7GxqbJyanPT29HRydMzOzDQyNIyKjERCROTi3Pz69PTy7Pzy7PTu5Ozm3LyqlJyWlJSSjJSOhOzi1LyulPz27PTq3PTm1OzezLyqjIyKhJSKfOzaxPz29OzizLyidIyGdIyCdOTOpLymhOzavOTStMTCtMS+rMS6pMSynMSulLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAaQQIAQECgajcNkQMBkDgKEQFK4LFgLhkMBIVUKroWEYlEgMLxbBKLQUBwc52HgAQ4LBo049atWQyIPA3pEdFcQEhMUFYNVagQWFxgZGoxfYRsTHB0eH5UJCJAYICEinUoPIxIcHCQkIiIllQYEGCEhJicoKYwPmiQeKisrKLFKLCwtLi8wHyUlMYwM0tPUDH5BACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=}
++image create photo ::browser::img_xblob   -data {R0lGODlhEAAQAIYAAPwCBFRWVFxaXNza3OTi3Nze3Ly2tJyanPz+/Ozq7GxubNzSxMzOzMTGxHRybDQyNLy+vHRydHx6fKSipISChIyKjGxqbERCRCwuLLy6vGRiZExKTCQiJAwKDLSytLy2rJSSlHx+fDw6PKyqrBQWFPTu5Ozm3LyulLS2tCQmJAQCBPTq3Ozi1MSynCwqLAQGBOTazOzizOzezLyqjBweHNzSvOzaxKyurHRuZNzOtLymhDw+PIyCdOzWvOTOpLyidNzKtOTStLyifMTCtMS+rLyedAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfZgACCAAEChYeGg4oCAwQFjgYBBwGKggEECJkICQoIkwADCwwNDY2mDA4Lng8QDhESsLARExQVDhYXGBkWExIaGw8cHR4SCQQfFQ8eFgUgIQEiwiMSBMYfGB4atwEXDyQd0wQlJicPKAHoFyIpJCoeDgMrLC0YKBsX6i4kL+4OMDEyZijr5oLGNxUqUCioEcPGDAwjPNyI6MEDChQjcOSwsUDHgw07RIgI4KCkAgs8cvTw8eOBogAxQtXIASTISiEuBwUYMoRIixYnZggpUgTDywdIkWJIitRPIAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
++image create photo ::browser::img_tree    -data {R0lGODlhEAAQAIYAAPwCBAQCBExKTBwWHMzKzOzq7ERCRExGTCwqLARqnAQ+ZHR2dKyqrNTOzHx2fCQiJMTi9NTu9HzC3AxmnAQ+XPTm7Dy67DymzITC3IzG5AxypHRydKymrMzOzOzu7BweHByy9AyGtFyy1IzG3NTu/ARupFRSVByazBR6rAyGvFyuzJTK3MTm9BR+tAxWhHS61MTi7Pz+/IymvCxulBRelAx2rHS63Pz6/PTy9PTu9Nza3ISitBRupFSixNTS1CxqnDQyNMzGzOTi5MTCxMTGxGxubGxqbLy2vLSutGRiZLy6vLSytKyurDQuNFxaXKSipDw6PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAfDgACCAAECg4eIAAMEBQYHCImDBgkKCwwNBQIBBw4Bhw8QERITFJYEFQUFnoIPFhcYoRkaFBscHR4Ggh8gIRciEiMQJBkltCa6JyUoKSkXKhIrLCQYuQAPLS4TEyUhKb0qLzDVAjEFMjMuNBMoNcw21QY3ODkFOjs82RM1PfDzFRU3fOggcM7Fj2pAgggRokOHDx9DhhAZUqQaISBGhjwMEvEIkiIHEgUAkgSJkiNLmFSMJChAEydPGBSBwvJQgAc0/QQCACH+aENyZWF0ZWQgYnkgQk1QVG9HSUYgUHJvIHZlcnNpb24gMi41DQqpIERldmVsQ29yIDE5OTcsMTk5OC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4NCmh0dHA6Ly93d3cuZGV2ZWxjb3IuY29tADs=}
++image create photo ::browser::img_symlink -data {R0lGODlhEAAQAIQAAPwCBCwqLLSytLy+vERGRFRWVDQ2NKSmpAQCBKyurMTGxISChJyanHR2dIyKjGxubHRydGRmZIyOjFxeXHx6fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAVbICACwWieY1CibCCsrBkMb0zchSEcNYskCtqBBzshFkOGQFk0IRqOxqPBODRHCMhCQKteRc9FI/KQWGOIyFYgkDC+gPR4snCcfRGKOIKIgSMQE31+f4OEYCZ+IQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
++image create photo ::browser::img_unknown -data {R0lGODlhEAAQAIUAAPwCBFxaXIyKjNTW1Nze3LS2tJyanER2RGS+VPz+/PTu5GxqbPz69BQ6BCxeLFSqRPT29HRydMzOzDQyNERmPKSypCRWHIyKhERCRDyGPKz2nESiLBxGHCyCHGxubPz6/PTy7Ozi1Ly2rKSipOzm3LyqlKSWhCRyFOzizLymhNTKtNzOvOzaxOTStPz27OzWvOTOpLSupLyedMS+rMS6pMSulLyqjLymfLyifAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAamQIAQECgajcOkYEBoDgoBQyAJOCCuiENCsWBIh9aGw9F4HCARiXciRDQoBUnlYRlcIgsMG5CxXAgMGhscBRAEBRd7AB0eBBoIgxUfICEiikSPgyMMIAokJZcBkBybJgomIaBJAZoMpyCmqkMBFCcVCrgKKAwpoSorKqchKCwtvasIFBIhLiYvLzDHsxQNMcMKLDAwMqEz3jQ1NTY3ONyrE+jp6hN+QQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
++
 +field w
 +field browser_commit
 +field browser_path
 +field browser_files  {}
 +field browser_status {Starting...}
 +field browser_stack  {}
 +field browser_busy   1
 +
 +field ls_buf     {}; # Buffered record output from ls-tree
 +
-       set browser_path $browser_commit:
++constructor new {commit {path {}}} {
 +      global cursor_ptr M1B
 +      make_toplevel top w
 +      wm title $top "[appname] ([reponame]): File Browser"
 +
 +      set browser_commit $commit
-       _ls $this $browser_commit
++      set browser_path $browser_commit:$path
 +
 +      label $w.path \
 +              -textvariable @browser_path \
 +              -anchor w \
 +              -justify left \
 +              -borderwidth 1 \
 +              -relief sunken \
 +              -font font_uibold
 +      pack $w.path -anchor w -side top -fill x
 +
 +      frame $w.list
 +      set w_list $w.list.l
 +      text $w_list -background white -borderwidth 0 \
 +              -cursor $cursor_ptr \
 +              -state disabled \
 +              -wrap none \
 +              -height 20 \
 +              -width 70 \
 +              -xscrollcommand [list $w.list.sbx set] \
 +              -yscrollcommand [list $w.list.sby set]
 +      $w_list tag conf in_sel \
 +              -background [$w_list cget -foreground] \
 +              -foreground [$w_list cget -background]
 +      scrollbar $w.list.sbx -orient h -command [list $w_list xview]
 +      scrollbar $w.list.sby -orient v -command [list $w_list yview]
 +      pack $w.list.sbx -side bottom -fill x
 +      pack $w.list.sby -side right -fill y
 +      pack $w_list -side left -fill both -expand 1
 +      pack $w.list -side top -fill both -expand 1
 +
 +      label $w.status \
 +              -textvariable @browser_status \
 +              -anchor w \
 +              -justify left \
 +              -borderwidth 1 \
 +              -relief sunken
 +      pack $w.status -anchor w -side bottom -fill x
 +
 +      bind $w_list <Button-1>        "[cb _click 0 @%x,%y];break"
 +      bind $w_list <Double-Button-1> "[cb _click 1 @%x,%y];break"
 +      bind $w_list <$M1B-Up>         "[cb _parent]        ;break"
 +      bind $w_list <$M1B-Left>       "[cb _parent]        ;break"
 +      bind $w_list <Up>              "[cb _move -1]       ;break"
 +      bind $w_list <Down>            "[cb _move  1]       ;break"
 +      bind $w_list <$M1B-Right>      "[cb _enter]         ;break"
 +      bind $w_list <Return>          "[cb _enter]         ;break"
 +      bind $w_list <Prior>           "[cb _page -1]       ;break"
 +      bind $w_list <Next>            "[cb _page  1]       ;break"
 +      bind $w_list <Left>            break
 +      bind $w_list <Right>           break
 +
 +      bind $w_list <Visibility> [list focus $w_list]
 +      set w $w_list
-                       -image file_uplevel
++      if {$path ne {}} {
++              _ls $this $browser_commit:$path $path
++      } else {
++              _ls $this $browser_commit $path
++      }
 +      return $this
 +}
 +
 +method _move {dir} {
 +      if {$browser_busy} return
 +      set lno [lindex [split [$w index in_sel.first] .] 0]
 +      incr lno $dir
 +      if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
 +              $w tag remove in_sel 0.0 end
 +              $w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +              $w see $lno.0
 +      }
 +}
 +
 +method _page {dir} {
 +      if {$browser_busy} return
 +      $w yview scroll $dir pages
 +      set lno [expr {int(
 +                [lindex [$w yview] 0]
 +              * [llength $browser_files]
 +              + 1)}]
 +      if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
 +              $w tag remove in_sel 0.0 end
 +              $w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +              $w see $lno.0
 +      }
 +}
 +
 +method _parent {} {
 +      if {$browser_busy} return
 +      set info [lindex $browser_files 0]
 +      if {[lindex $info 0] eq {parent}} {
 +              set parent [lindex $browser_stack end-1]
 +              set browser_stack [lrange $browser_stack 0 end-2]
 +              if {$browser_stack eq {}} {
 +                      regsub {:.*$} $browser_path {:} browser_path
 +              } else {
 +                      regsub {/[^/]+$} $browser_path {} browser_path
 +              }
 +              set browser_status "Loading $browser_path..."
 +              _ls $this [lindex $parent 0] [lindex $parent 1]
 +      }
 +}
 +
 +method _enter {} {
 +      if {$browser_busy} return
 +      set lno [lindex [split [$w index in_sel.first] .] 0]
 +      set info [lindex $browser_files [expr {$lno - 1}]]
 +      if {$info ne {}} {
 +              switch -- [lindex $info 0] {
 +              parent {
 +                      _parent $this
 +              }
 +              tree {
 +                      set name [lindex $info 2]
 +                      set escn [escape_path $name]
 +                      set browser_status "Loading $escn..."
 +                      append browser_path $escn
 +                      _ls $this [lindex $info 1] $name
 +              }
 +              blob {
 +                      set name [lindex $info 2]
 +                      set p {}
 +                      foreach n $browser_stack {
 +                              append p [lindex $n 1]
 +                      }
 +                      append p $name
 +                      blame::new $browser_commit $p
 +              }
 +              }
 +      }
 +}
 +
 +method _click {was_double_click pos} {
 +      if {$browser_busy} return
 +      set lno [lindex [split [$w index $pos] .] 0]
 +      focus $w
 +
 +      if {[lindex $browser_files [expr {$lno - 1}]] ne {}} {
 +              $w tag remove in_sel 0.0 end
 +              $w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +              if {$was_double_click} {
 +                      _enter $this
 +              }
 +      }
 +}
 +
 +method _ls {tree_id {name {}}} {
 +      set ls_buf {}
 +      set browser_files {}
 +      set browser_busy 1
 +
 +      $w conf -state normal
 +      $w tag remove in_sel 0.0 end
 +      $w delete 0.0 end
 +      if {$browser_stack ne {}} {
 +              $w image create end \
 +                      -align center -padx 5 -pady 1 \
 +                      -name icon0 \
-                       set image file_mod
++                      -image ::browser::img_parent
 +              $w insert end {[Up To Parent]}
 +              lappend browser_files parent
 +      }
 +      lappend browser_stack [list $tree_id $name]
 +      $w conf -state disabled
 +
 +      set fd [git_read ls-tree -z $tree_id]
 +      fconfigure $fd -blocking 0 -translation binary -encoding binary
 +      fileevent $fd readable [cb _read $fd]
 +}
 +
 +method _read {fd} {
 +      append ls_buf [read $fd]
 +      set pck [split $ls_buf "\0"]
 +      set ls_buf [lindex $pck end]
 +
 +      set n [llength $browser_files]
 +      $w conf -state normal
 +      foreach p [lrange $pck 0 end-1] {
 +              set tab [string first "\t" $p]
 +              if {$tab == -1} continue
 +
 +              set info [split [string range $p 0 [expr {$tab - 1}]] { }]
 +              set path [string range $p [expr {$tab + 1}] end]
 +              set type   [lindex $info 1]
 +              set object [lindex $info 2]
 +
 +              switch -- $type {
 +              blob {
-                       set image file_dir
++                      scan [lindex $info 0] %o mode
++                      if {$mode == 0120000} {
++                              set image ::browser::img_symlink
++                      } elseif {($mode & 0100) != 0} {
++                              set image ::browser::img_xblob
++                      } else {
++                              set image ::browser::img_rblob
++                      }
 +              }
 +              tree {
-                       set image file_question
++                      set image ::browser::img_tree
 +                      append path /
 +              }
 +              default {
++                      set image ::browser::img_unknown
 +              }
 +              }
 +
 +              if {$n > 0} {$w insert end "\n"}
 +              $w image create end \
 +                      -align center -padx 5 -pady 1 \
 +                      -name icon[incr n] \
 +                      -image $image
 +              $w insert end [escape_path $path]
 +              lappend browser_files [list $type $object $path]
 +      }
 +      $w conf -state disabled
 +
 +      if {[eof $fd]} {
 +              close $fd
 +              set browser_status Ready.
 +              set browser_busy 0
 +              set ls_buf {}
 +              if {$n > 0} {
 +                      $w tag add in_sel 1.0 2.0
 +                      focus -force $w
 +              }
 +      }
 +} ifdeleted {
 +      catch {close $fd}
 +}
 +
 +}
++
++class browser_open {
++
++field w              ; # widget path
++field w_rev          ; # mega-widget to pick the initial revision
++
++constructor dialog {} {
++      make_toplevel top w
++      wm title $top "[appname] ([reponame]): Browse Branch Files"
++      if {$top ne {.}} {
++              wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
++      }
++
++      label $w.header \
++              -text {Browse Branch Files} \
++              -font font_uibold
++      pack $w.header -side top -fill x
++
++      frame $w.buttons
++      button $w.buttons.browse -text Browse \
++              -default active \
++              -command [cb _open]
++      pack $w.buttons.browse -side right
++      button $w.buttons.cancel -text {Cancel} \
++              -command [list destroy $w]
++      pack $w.buttons.cancel -side right -padx 5
++      pack $w.buttons -side bottom -fill x -pady 10 -padx 10
++
++      set w_rev [::choose_rev::new $w.rev {Revision}]
++      $w_rev bind_listbox <Double-Button-1> [cb _open]
++      pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
++
++      bind $w <Visibility> [cb _visible]
++      bind $w <Key-Escape> [list destroy $w]
++      bind $w <Key-Return> [cb _open]\;break
++      tkwait window $w
++}
++
++method _open {} {
++      if {[catch {$w_rev commit_or_die} err]} {
++              return
++      }
++      set name [$w_rev get]
++      destroy $w
++      browser::new $name
++}
++
++method _visible {} {
++      grab $w
++      $w_rev focus_filter
++}
++
++}

diff --cc git-gui/lib/checkout_op.tcl
index 00a994be120edaa1024733cb94e3f1fe4e494039,0000000000000000000000000000000000000000..170f737f611b48fa901e1789ec6d4f4d64834537
mode 100644,000000..100644
--- 1/git-gui/lib/checkout_op.tcl
--- /dev/null
+++ b/git-gui/lib/checkout_op.tcl
@@@ -1,579 -1,0 +1,588 @@@
-               $w_cons exec \
-                       [list git fetch $remote +$r_head:$l_trck] \
-                       [cb _finish_fetch]
 +# git-gui commit checkout support
 +# Copyright (C) 2007 Shawn Pearce
 +
 +class checkout_op {
 +
 +field w        {}; # our window (if we have one)
 +field w_cons   {}; # embedded console window object
 +
 +field new_expr   ; # expression the user saw/thinks this is
 +field new_hash   ; # commit SHA-1 we are switching to
 +field new_ref    ; # ref we are updating/creating
 +
 +field parent_w      .; # window that started us
 +field merge_type none; # type of merge to apply to existing branch
++field merge_base   {}; # merge base if we have another ref involved
 +field fetch_spec   {}; # refetch tracking branch if used?
 +field checkout      1; # actually checkout the branch?
 +field create        0; # create the branch if it doesn't exist?
 +
 +field reset_ok      0; # did the user agree to reset?
 +field fetch_ok      0; # did the fetch succeed?
 +
 +field readtree_d   {}; # buffered output from read-tree
 +field update_old   {}; # was the update-ref call deferred?
 +field reflog_msg   {}; # log message for the update-ref call
 +
 +constructor new {expr hash {ref {}}} {
 +      set new_expr $expr
 +      set new_hash $hash
 +      set new_ref  $ref
 +
 +      return $this
 +}
 +
 +method parent {path} {
 +      set parent_w [winfo toplevel $path]
 +}
 +
 +method enable_merge {type} {
 +      set merge_type $type
 +}
 +
 +method enable_fetch {spec} {
 +      set fetch_spec $spec
 +}
 +
 +method enable_checkout {co} {
 +      set checkout $co
 +}
 +
 +method enable_create {co} {
 +      set create $co
 +}
 +
 +method run {} {
 +      if {$fetch_spec ne {}} {
 +              global M1B
 +
 +              # We were asked to refresh a single tracking branch
 +              # before we get to work.  We should do that before we
 +              # consider any ref updating.
 +              #
 +              set fetch_ok 0
 +              set l_trck [lindex $fetch_spec 0]
 +              set remote [lindex $fetch_spec 1]
 +              set r_head [lindex $fetch_spec 2]
 +              regsub ^refs/heads/ $r_head {} r_name
 +
++              set cmd [list git fetch $remote]
++              if {$l_trck ne {}} {
++                      lappend cmd +$r_head:$l_trck
++              } else {
++                      lappend cmd $r_head
++              }
++
 +              _toplevel $this {Refreshing Tracking Branch}
 +              set w_cons [::console::embed \
 +                      $w.console \
 +                      "Fetching $r_name from $remote"]
 +              pack $w.console -fill both -expand 1
-               set mrb {}
-               catch {set mrb [git merge-base $new $cur]}
-               switch -- $merge_type {
-               ff {
-                       if {$mrb eq $new} {
-                               # The current branch is actually newer.
-                               #
-                               set new $cur
-                       } elseif {$mrb eq $cur} {
-                               # The current branch is older.
-                               #
-                               set reflog_msg "merge $new_expr: Fast-forward"
-                       } else {
-                               _error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required."
-                               return 0
++              $w_cons exec $cmd [cb _finish_fetch]
 +
 +              bind $w <$M1B-Key-w> break
 +              bind $w <$M1B-Key-W> break
 +              bind $w <Visibility> "
 +                      [list grab $w]
 +                      [list focus $w]
 +              "
 +              wm protocol $w WM_DELETE_WINDOW [cb _noop]
 +              tkwait window $w
 +
 +              if {!$fetch_ok} {
 +                      delete_this
 +                      return 0
 +              }
 +      }
 +
 +      if {$new_ref ne {}} {
 +              # If we have a ref we need to update it before we can
 +              # proceed with a checkout (if one was enabled).
 +              #
 +              if {![_update_ref $this]} {
 +                      delete_this
 +                      return 0
 +              }
 +      }
 +
 +      if {$checkout} {
 +              _checkout $this
 +              return 1
 +      }
 +
 +      delete_this
 +      return 1
 +}
 +
 +method _noop {} {}
 +
 +method _finish_fetch {ok} {
 +      if {$ok} {
 +              set l_trck [lindex $fetch_spec 0]
++              if {$l_trck eq {}} {
++                      set l_trck FETCH_HEAD
++              }
 +              if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
 +                      set ok 0
 +                      $w_cons insert "fatal: Cannot resolve $l_trck"
 +                      $w_cons insert $err
 +              }
 +      }
 +
 +      $w_cons done $ok
 +      set w_cons {}
 +      wm protocol $w WM_DELETE_WINDOW {}
 +
 +      if {$ok} {
 +              destroy $w
 +              set w {}
 +      } else {
 +              button $w.close -text Close -command [list destroy $w]
 +              pack $w.close -side bottom -anchor e -padx 10 -pady 10
 +      }
 +
 +      set fetch_ok $ok
 +}
 +
 +method _update_ref {} {
 +      global null_sha1 current_branch
 +
 +      set ref $new_ref
 +      set new $new_hash
 +
 +      set is_current 0
 +      set rh refs/heads/
 +      set rn [string length $rh]
 +      if {[string equal -length $rn $rh $ref]} {
 +              set newbranch [string range $ref $rn end]
 +              if {$current_branch eq $newbranch} {
 +                      set is_current 1
 +              }
 +      } else {
 +              set newbranch $ref
 +      }
 +
 +      if {[catch {set cur [git rev-parse --verify "$ref^0"]}]} {
 +              # Assume it does not exist, and that is what the error was.
 +              #
 +              if {!$create} {
 +                      _error $this "Branch '$newbranch' does not exist."
 +                      return 0
 +              }
 +
 +              set reflog_msg "branch: Created from $new_expr"
 +              set cur $null_sha1
 +      } elseif {$create && $merge_type eq {none}} {
 +              # We were told to create it, but not do a merge.
 +              # Bad.  Name shouldn't have existed.
 +              #
 +              _error $this "Branch '$newbranch' already exists."
 +              return 0
 +      } elseif {!$create && $merge_type eq {none}} {
 +              # We aren't creating, it exists and we don't merge.
 +              # We are probably just a simple branch switch.
 +              # Use whatever value we just read.
 +              #
 +              set new      $cur
 +              set new_hash $cur
 +      } elseif {$new eq $cur} {
 +              # No merge would be required, don't compute anything.
 +              #
 +      } else {
-               }
-               reset {
-                       if {$mrb eq $cur} {
-                               # The current branch is older.
-                               #
-                               set reflog_msg "merge $new_expr: Fast-forward"
-                       } else {
++              catch {set merge_base [git merge-base $new $cur]}
++              if {$merge_base eq $cur} {
++                      # The current branch is older.
++                      #
++                      set reflog_msg "merge $new_expr: Fast-forward"
++              } else {
++                      switch -- $merge_type {
++                      ff {
++                              if {$merge_base eq $new} {
++                                      # The current branch is actually newer.
++                                      #
++                                      set new $cur
++                                      set new_hash $cur
++                              } else {
++                                      _error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required."
++                                      return 0
++                              }
 +                      }
-               }
-               default {
-                       _error $this "Only 'ff' and 'reset' merge is currently supported."
-                       return 0
-               }
++                      reset {
 +                              # The current branch will lose things.
 +                              #
 +                              if {[_confirm_reset $this $cur]} {
 +                                      set reflog_msg "reset $new_expr"
 +                              } else {
 +                                      return 0
 +                              }
 +                      }
-               _error $this "Index is already locked."
++                      default {
++                              _error $this "Merge strategy '$merge_type' not supported."
++                              return 0
++                      }
++                      }
 +              }
 +      }
 +
 +      if {$new ne $cur} {
 +              if {$is_current} {
 +                      # No so fast.  We should defer this in case
 +                      # we cannot update the working directory.
 +                      #
 +                      set update_old $cur
 +                      return 1
 +              }
 +
 +              if {[catch {
 +                              git update-ref -m $reflog_msg $ref $new $cur
 +                      } err]} {
 +                      _error $this "Failed to update '$newbranch'.\n\n$err"
 +                      return 0
 +              }
 +      }
 +
 +      return 1
 +}
 +
 +method _checkout {} {
 +      if {[lock_index checkout_op]} {
 +              after idle [cb _start_checkout]
 +      } else {
-       if {[is_config_true gui.trustmtime]} {
++              _error $this "Staging area (index) is already locked."
 +              delete_this
 +      }
 +}
 +
 +method _start_checkout {} {
 +      global HEAD commit_type
 +
 +      # -- Our in memory state should match the repository.
 +      #
 +      repository_state curType curHEAD curMERGE_HEAD
 +      if {[string match amend* $commit_type]
 +              && $curType eq {normal}
 +              && $curHEAD eq $HEAD} {
 +      } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
 +              info_popup {Last scanned state does not match repository state.
 +
 +Another Git program has modified this repository since the last scan.  A rescan must be performed before the current branch can be changed.
 +
 +The rescan will be automatically started now.
 +}
 +              unlock_index
 +              rescan ui_ready
 +              delete_this
 +              return
 +      }
 +
-               append log " to $new_branch"
- 
-               if {[catch {
-                               git symbolic-ref -m $log HEAD $new_ref
-                       } err]} {
-                       _fatal $this $err
++      if {$curHEAD eq $new_hash} {
++              _after_readtree $this
++      } elseif {[is_config_true gui.trustmtime]} {
 +              _readtree $this
 +      } else {
 +              ui_status {Refreshing file status...}
 +              set fd [git_read update-index \
 +                      -q \
 +                      --unmerged \
 +                      --ignore-missing \
 +                      --refresh \
 +                      ]
 +              fconfigure $fd -blocking 0 -translation binary
 +              fileevent $fd readable [cb _refresh_wait $fd]
 +      }
 +}
 +
 +method _refresh_wait {fd} {
 +      read $fd
 +      if {[eof $fd]} {
 +              close $fd
 +              _readtree $this
 +      }
 +}
 +
 +method _name {} {
 +      if {$new_ref eq {}} {
 +              return [string range $new_hash 0 7]
 +      }
 +
 +      set rh refs/heads/
 +      set rn [string length $rh]
 +      if {[string equal -length $rn $rh $new_ref]} {
 +              return [string range $new_ref $rn end]
 +      } else {
 +              return $new_ref
 +      }
 +}
 +
 +method _readtree {} {
 +      global HEAD
 +
 +      set readtree_d {}
 +      $::main_status start \
 +              "Updating working directory to '[_name $this]'..." \
 +              {files checked out}
 +
 +      set fd [git_read --stderr read-tree \
 +              -m \
 +              -u \
 +              -v \
 +              --exclude-per-directory=.gitignore \
 +              $HEAD \
 +              $new_hash \
 +              ]
 +      fconfigure $fd -blocking 0 -translation binary
 +      fileevent $fd readable [cb _readtree_wait $fd]
 +}
 +
 +method _readtree_wait {fd} {
 +      global current_branch
 +
 +      set buf [read $fd]
 +      $::main_status update_meter $buf
 +      append readtree_d $buf
 +
 +      fconfigure $fd -blocking 1
 +      if {![eof $fd]} {
 +              fconfigure $fd -blocking 0
 +              return
 +      }
 +
 +      if {[catch {close $fd}]} {
 +              set err $readtree_d
 +              regsub {^fatal: } $err {} err
 +              $::main_status stop "Aborted checkout of '[_name $this]' (file level merging is required)."
 +              warn_popup "File level merge required.
 +
 +$err
 +
 +Staying on branch '$current_branch'."
 +              unlock_index
 +              delete_this
 +              return
 +      }
 +
 +      $::main_status stop
 +      _after_readtree $this
 +}
 +
 +method _after_readtree {} {
 +      global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
 +      global current_branch is_detached
 +      global ui_comm
 +
 +      set name [_name $this]
 +      set log "checkout: moving"
 +      if {!$is_detached} {
 +              append log " from $current_branch"
 +      }
 +
 +      # -- Move/create HEAD as a symbolic ref.  Core git does not
 +      #    even check for failure here, it Just Works(tm).  If it
 +      #    doesn't we are in some really ugly state that is difficult
 +      #    to recover from within git-gui.
 +      #
 +      set rh refs/heads/
 +      set rn [string length $rh]
 +      if {[string equal -length $rn $rh $new_ref]} {
 +              set new_branch [string range $new_ref $rn end]
-               set current_branch $new_branch
-               set is_detached 0
++              if {$is_detached || $current_branch ne $new_branch} {
++                      append log " to $new_branch"
++                      if {[catch {
++                                      git symbolic-ref -m $log HEAD $new_ref
++                              } err]} {
++                              _fatal $this $err
++                      }
++                      set current_branch $new_branch
++                      set is_detached 0
 +              }
-               append log " to $new_expr"
- 
-               if {[catch {
-                               _detach_HEAD $log $new_hash
-                       } err]} {
-                       _fatal $this $err
 +      } else {
++              if {$new_hash ne $HEAD} {
++                      append log " to $new_expr"
++                      if {[catch {
++                                      _detach_HEAD $log $new_hash
++                              } err]} {
++                              _fatal $this $err
++                      }
 +              }
 +              set current_branch HEAD
 +              set is_detached 1
 +      }
 +
 +      # -- We had to defer updating the branch itself until we
 +      #    knew the working directory would update.  So now we
 +      #    need to finish that work.  If it fails we're in big
 +      #    trouble.
 +      #
 +      if {$update_old ne {}} {
 +              if {[catch {
 +                              git update-ref \
 +                                      -m $reflog_msg \
 +                                      $new_ref \
 +                                      $new_hash \
 +                                      $update_old
 +                      } err]} {
 +                      _fatal $this $err
 +              }
 +      }
 +
 +      if {$is_detached} {
 +              info_popup "You are no longer on a local branch.
 +
 +If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."
 +      }
 +
 +      # -- Update our repository state.  If we were previously in
 +      #    amend mode we need to toss the current buffer and do a
 +      #    full rescan to update our file lists.  If we weren't in
 +      #    amend mode our file lists are accurate and we can avoid
 +      #    the rescan.
 +      #
 +      unlock_index
 +      set selected_commit_type new
 +      if {[string match amend* $commit_type]} {
 +              $ui_comm delete 0.0 end
 +              $ui_comm edit reset
 +              $ui_comm edit modified false
 +              rescan [list ui_status "Checked out '$name'."]
 +      } else {
 +              repository_state commit_type HEAD MERGE_HEAD
 +              set PARENT $HEAD
 +              ui_status "Checked out '$name'."
 +      }
 +      delete_this
 +}
 +
 +git-version proc _detach_HEAD {log new} {
 +      >= 1.5.3 {
 +              git update-ref --no-deref -m $log HEAD $new
 +      }
 +      default {
 +              set p [gitdir HEAD]
 +              file delete $p
 +              set fd [open $p w]
 +              fconfigure $fd -translation lf -encoding utf-8
 +              puts $fd $new
 +              close $fd
 +      }
 +}
 +
 +method _confirm_reset {cur} {
 +      set reset_ok 0
 +      set name [_name $this]
 +      set gitk [list do_gitk [list $cur ^$new_hash]]
 +
 +      _toplevel $this {Confirm Branch Reset}
 +      pack [label $w.msg1 \
 +              -anchor w \
 +              -justify left \
 +              -text "Resetting '$name' to $new_expr will lose the following commits:" \
 +              ] -anchor w
 +
 +      set list $w.list.l
 +      frame $w.list
 +      text $list \
 +              -font font_diff \
 +              -width 80 \
 +              -height 10 \
 +              -wrap none \
 +              -xscrollcommand [list $w.list.sbx set] \
 +              -yscrollcommand [list $w.list.sby set]
 +      scrollbar $w.list.sbx -orient h -command [list $list xview]
 +      scrollbar $w.list.sby -orient v -command [list $list yview]
 +      pack $w.list.sbx -fill x -side bottom
 +      pack $w.list.sby -fill y -side right
 +      pack $list -fill both -expand 1
 +      pack $w.list -fill both -expand 1 -padx 5 -pady 5
 +
 +      pack [label $w.msg2 \
 +              -anchor w \
 +              -justify left \
 +              -text {Recovering lost commits may not be easy.} \
 +              ]
 +      pack [label $w.msg3 \
 +              -anchor w \
 +              -justify left \
 +              -text "Reset '$name'?" \
 +              ]
 +
 +      frame $w.buttons
 +      button $w.buttons.visualize \
 +              -text Visualize \
 +              -command $gitk
 +      pack $w.buttons.visualize -side left
 +      button $w.buttons.reset \
 +              -text Reset \
 +              -command "
 +                      set @reset_ok 1
 +                      destroy $w
 +              "
 +      pack $w.buttons.reset -side right
 +      button $w.buttons.cancel \
 +              -default active \
 +              -text Cancel \
 +              -command [list destroy $w]
 +      pack $w.buttons.cancel -side right -padx 5
 +      pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +      set fd [git_read rev-list --pretty=oneline $cur ^$new_hash]
 +      while {[gets $fd line] > 0} {
 +              set abbr [string range $line 0 7]
 +              set subj [string range $line 41 end]
 +              $list insert end "$abbr  $subj\n"
 +      }
 +      close $fd
 +      $list configure -state disabled
 +
 +      bind $w    <Key-v> $gitk
 +      bind $w <Visibility> "
 +              grab $w
 +              focus $w.buttons.cancel
 +      "
 +      bind $w <Key-Return> [list destroy $w]
 +      bind $w <Key-Escape> [list destroy $w]
 +      tkwait window $w
 +      return $reset_ok
 +}
 +
 +method _error {msg} {
 +      if {[winfo ismapped $parent_w]} {
 +              set p $parent_w
 +      } else {
 +              set p .
 +      }
 +
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [wm title $p] \
 +              -parent $p \
 +              -message $msg
 +}
 +
 +method _toplevel {title} {
 +      regsub -all {::} $this {__} w
 +      set w .$w
 +
 +      if {[winfo ismapped $parent_w]} {
 +              set p $parent_w
 +      } else {
 +              set p .
 +      }
 +
 +      toplevel $w
 +      wm title $w $title
 +      wm geometry $w "+[winfo rootx $p]+[winfo rooty $p]"
 +}
 +
 +method _fatal {err} {
 +      error_popup "Failed to set current branch.
 +
 +This working directory is only partially switched.  We successfully updated your files, but failed to update an internal Git file.
 +
 +This should not have occurred.  [appname] will now close and give up.
 +
 +$err"
 +      exit 1
 +}
 +
 +}

diff --cc git-gui/lib/choose_rev.tcl
index afd81707ceb08ccc106e76b082f892c824dfb828,0000000000000000000000000000000000000000..ec064b3e13a6b2e6ab0e3ee05ab7a55cab8aa4bc
mode 100644,000000..100644
--- 1/git-gui/lib/choose_rev.tcl
--- /dev/null
+++ b/git-gui/lib/choose_rev.tcl
@@@ -1,367 -1,0 +1,627 @@@
- constructor new {path {title {}}} {
 +# git-gui revision chooser
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +class choose_rev {
 +
 +image create photo ::choose_rev::img_find -data {R0lGODlhEAAQAIYAAPwCBCQmJDw+PBQSFAQCBMza3NTm5MTW1HyChOT29Ozq7MTq7Kze5Kzm7Oz6/NTy9Iza5GzGzKzS1Nzy9Nz29Kzq9HTGzHTK1Lza3AwKDLzu9JTi7HTW5GTCzITO1Mzq7Hza5FTK1ESyvHzKzKzW3DQyNDyqtDw6PIzW5HzGzAT+/Dw+RKyurNTOzMTGxMS+tJSGdATCxHRydLSqpLymnLSijBweHERCRNze3Pz69PTy9Oze1OTSxOTGrMSqlLy+vPTu5OzSvMymjNTGvNS+tMy2pMyunMSefAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAQABAAAAe4gACCAAECA4OIiAIEBQYHBAKJgwIICQoLDA0IkZIECQ4PCxARCwSSAxITFA8VEBYXGBmJAQYLGhUbHB0eH7KIGRIMEBAgISIjJKaIJQQLFxERIialkieUGigpKRoIBCqJKyyLBwvJAioEyoICLS4v6QQwMQQyLuqLli8zNDU2BCf1lN3AkUPHDh49fAQAAEnGD1MCCALZEaSHkIUMBQS8wWMIkSJGhBzBmFEGgRsBUqpMiSgdAD+BAAAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7}
 +
 +field w               ; # our megawidget path
 +field w_list          ; # list of currently filtered specs
 +field w_filter        ; # filter entry for $w_list
 +
 +field c_expr        {}; # current revision expression
 +field filter          ; # current filter string
 +field revtype     head; # type of revision chosen
 +field cur_specs [list]; # list of specs for $revtype
 +field spec_head       ; # list of all head specs
 +field spec_trck       ; # list of all tracking branch specs
 +field spec_tag        ; # list of all tag specs
++field tip_data        ; # array of tip commit info by refname
++field log_last        ; # array of reflog date by refname
 +
-               -height 5 \
++field tooltip_wm        {} ; # Current tooltip toplevel, if open
++field tooltip_t         {} ; # Text widget in $tooltip_wm
++field tooltip_timer     {} ; # Current timer event for our tooltip
++
++proc new {path {title {}}} {
++      return [_new $path 0 $title]
++}
++
++proc new_unmerged {path {title {}}} {
++      return [_new $path 1 $title]
++}
++
++constructor _new {path unmerged_only title} {
 +      global current_branch is_detached
 +
++      if {![info exists ::all_remotes]} {
++              load_all_remotes
++      }
++
 +      set w $path
 +
 +      if {$title ne {}} {
 +              labelframe $w -text $title
 +      } else {
 +              frame $w
 +      }
 +      bind $w <Destroy> [cb _delete %W]
 +
 +      if {$is_detached} {
 +              radiobutton $w.detachedhead_r \
 +                      -anchor w \
 +                      -text {This Detached Checkout} \
 +                      -value HEAD \
 +                      -variable @revtype
 +              grid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2
 +      }
 +
 +      radiobutton $w.expr_r \
 +              -text {Revision Expression:} \
 +              -value expr \
 +              -variable @revtype
 +      entry $w.expr_t \
 +              -borderwidth 1 \
 +              -relief sunken \
 +              -width 50 \
 +              -textvariable @c_expr \
 +              -validate key \
 +              -validatecommand [cb _validate %d %S]
 +      grid $w.expr_r $w.expr_t -sticky we -padx {0 5}
 +
 +      frame $w.types
 +      radiobutton $w.types.head_r \
 +              -text {Local Branch} \
 +              -value head \
 +              -variable @revtype
 +      pack $w.types.head_r -side left
 +      radiobutton $w.types.trck_r \
 +              -text {Tracking Branch} \
 +              -value trck \
 +              -variable @revtype
 +      pack $w.types.trck_r -side left
 +      radiobutton $w.types.tag_r \
 +              -text {Tag} \
 +              -value tag \
 +              -variable @revtype
 +      pack $w.types.tag_r -side left
 +      set w_filter $w.types.filter
 +      entry $w_filter \
 +              -borderwidth 1 \
 +              -relief sunken \
 +              -width 12 \
 +              -textvariable @filter \
 +              -validate key \
 +              -validatecommand [cb _filter %P]
 +      pack $w_filter -side right
 +      pack [label $w.types.filter_icon \
 +              -image ::choose_rev::img_find \
 +              ] -side right
 +      grid $w.types -sticky we -padx {0 5} -columnspan 2
 +
 +      frame $w.list
 +      set w_list $w.list.l
 +      listbox $w_list \
 +              -font font_diff \
 +              -width 50 \
-               lappend spec_head [list $name refs/heads/$name]
++              -height 10 \
 +              -selectmode browse \
 +              -exportselection false \
 +              -xscrollcommand [cb _sb_set $w.list.sbx h] \
 +              -yscrollcommand [cb _sb_set $w.list.sby v]
 +      pack $w_list -fill both -expand 1
 +      grid $w.list -sticky nswe -padx {20 5} -columnspan 2
++      bind $w_list <Any-Motion>  [cb _show_tooltip @%x,%y]
++      bind $w_list <Any-Enter>   [cb _hide_tooltip]
++      bind $w_list <Any-Leave>   [cb _hide_tooltip]
++      bind $w_list <Destroy>     [cb _hide_tooltip]
 +
 +      grid columnconfigure $w 1 -weight 1
 +      if {$is_detached} {
 +              grid rowconfigure $w 3 -weight 1
 +      } else {
 +              grid rowconfigure $w 2 -weight 1
 +      }
 +
 +      trace add variable @revtype write [cb _select]
 +      bind $w_filter <Key-Return> [list focus $w_list]\;break
 +      bind $w_filter <Key-Down>   [list focus $w_list]
 +
++      set fmt list
++      append fmt { %(refname)}
++      append fmt { [list}
++      append fmt { %(objecttype)}
++      append fmt { %(objectname)}
++      append fmt { [concat %(taggername) %(authorname)]}
++      append fmt { [concat %(taggerdate) %(authordate)]}
++      append fmt { %(subject)}
++      append fmt {] [list}
++      append fmt { %(*objecttype)}
++      append fmt { %(*objectname)}
++      append fmt { %(*authorname)}
++      append fmt { %(*authordate)}
++      append fmt { %(*subject)}
++      append fmt {]}
++      set all_refn [list]
++      set fr_fd [git_read for-each-ref \
++              --tcl \
++              --sort=-taggerdate \
++              --format=$fmt \
++              refs/heads \
++              refs/remotes \
++              refs/tags \
++              ]
++      fconfigure $fr_fd -translation lf -encoding utf-8
++      while {[gets $fr_fd line] > 0} {
++              set line [eval $line]
++              if {[lindex $line 1 0] eq {tag}} {
++                      if {[lindex $line 2 0] eq {commit}} {
++                              set sha1 [lindex $line 2 1]
++                      } else {
++                              continue
++                      }
++              } elseif {[lindex $line 1 0] eq {commit}} {
++                      set sha1 [lindex $line 1 1]
++              } else {
++                      continue
++              }
++              set refn [lindex $line 0]
++              set tip_data($refn) [lrange $line 1 end]
++              lappend cmt_refn($sha1) $refn
++              lappend all_refn $refn
++      }
++      close $fr_fd
++
++      if {$unmerged_only} {
++              set fr_fd [git_read rev-list --all ^$::HEAD]
++              while {[gets $fr_fd sha1] > 0} {
++                      if {[catch {set rlst $cmt_refn($sha1)}]} continue
++                      foreach refn $rlst {
++                              set inc($refn) 1
++                      }
++              }
++              close $fr_fd
++      } else {
++              foreach refn $all_refn {
++                      set inc($refn) 1
++              }
++      }
++
 +      set spec_head [list]
 +      foreach name [load_all_heads] {
-               set name [lindex $spec 0]
-               regsub ^refs/(heads|remotes)/ $name {} name
-               lappend spec_trck [concat $name $spec]
++              set refn refs/heads/$name
++              if {[info exists inc($refn)]} {
++                      lappend spec_head [list $name $refn]
++              }
 +      }
 +
 +      set spec_trck [list]
 +      foreach spec [all_tracking_branches] {
-               lappend spec_tag [list $name refs/tags/$name]
++              set refn [lindex $spec 0]
++              if {[info exists inc($refn)]} {
++                      regsub ^refs/(heads|remotes)/ $refn {} name
++                      lappend spec_trck [concat $name $spec]
++              }
 +      }
 +
 +      set spec_tag [list]
 +      foreach name [load_all_tags] {
++              set refn refs/tags/$name
++              if {[info exists inc($refn)]} {
++                      lappend spec_tag [list $name $refn]
++              }
 +      }
 +
 +                if {$is_detached}             { set revtype HEAD
 +      } elseif {[llength $spec_head] > 0} { set revtype head
 +      } elseif {[llength $spec_trck] > 0} { set revtype trck
 +      } elseif {[llength $spec_tag ] > 0} { set revtype tag
 +      } else {                              set revtype expr
 +      }
 +
 +      if {$revtype eq {head} && $current_branch ne {}} {
 +              set i 0
 +              foreach spec $spec_head {
 +                      if {[lindex $spec 0] eq $current_branch} {
 +                              $w_list selection clear 0 end
 +                              $w_list selection set $i
 +                              break
 +                      }
 +                      incr i
 +              }
 +      }
 +
 +      return $this
 +}
 +
 +method none {text} {
 +      if {![winfo exists $w.none_r]} {
 +              radiobutton $w.none_r \
 +                      -anchor w \
 +                      -value none \
 +                      -variable @revtype
 +              grid $w.none_r -sticky we -padx {0 5} -columnspan 2
 +      }
 +      $w.none_r configure -text $text
 +}
 +
 +method get {} {
 +      switch -- $revtype {
 +      head -
 +      trck -
 +      tag  {
 +              set i [$w_list curselection]
 +              if {$i ne {}} {
 +                      return [lindex $cur_specs $i 0]
 +              } else {
 +                      return {}
 +              }
 +      }
 +
 +      HEAD { return HEAD                     }
 +      expr { return $c_expr                  }
 +      none { return {}                       }
 +      default { error "unknown type of revision" }
 +      }
 +}
 +
 +method pick_tracking_branch {} {
 +      set revtype trck
 +}
 +
 +method focus_filter {} {
 +      if {[$w_filter cget -state] eq {normal}} {
 +              focus $w_filter
 +      }
 +}
 +
 +method bind_listbox {event script}  {
 +      bind $w_list $event $script
 +}
 +
 +method get_local_branch {} {
 +      if {$revtype eq {head}} {
 +              return [_expr $this]
 +      } else {
 +              return {}
 +      }
 +}
 +
 +method get_tracking_branch {} {
 +      set i [$w_list curselection]
 +      if {$i eq {} || $revtype ne {trck}} {
 +              return {}
 +      }
 +      return [lrange [lindex $cur_specs $i] 1 end]
 +}
 +
 +method get_commit {} {
 +      set e [_expr $this]
 +      if {$e eq {}} {
 +              return {}
 +      }
 +      return [git rev-parse --verify "$e^0"]
 +}
 +
 +method commit_or_die {} {
 +      if {[catch {set new [get_commit $this]} err]} {
 +
 +              # Cleanup the not-so-friendly error from rev-parse.
 +              #
 +              regsub {^fatal:\s*} $err {} err
 +              if {$err eq {Needed a single revision}} {
 +                      set err {}
 +              }
 +
 +              set top [winfo toplevel $w]
 +              set msg "Invalid revision: [get $this]\n\n$err"
 +              tk_messageBox \
 +                      -icon error \
 +                      -type ok \
 +                      -title [wm title $top] \
 +                      -parent $top \
 +                      -message $msg
 +              error $msg
 +      }
 +      return $new
 +}
 +
 +method _expr {} {
 +      switch -- $revtype {
 +      head -
 +      trck -
 +      tag  {
 +              set i [$w_list curselection]
 +              if {$i ne {}} {
 +                      return [lindex $cur_specs $i 1]
 +              } else {
 +                      error "No revision selected."
 +              }
 +      }
 +
 +      expr {
 +              if {$c_expr ne {}} {
 +                      return $c_expr
 +              } else {
 +                      error "Revision expression is empty."
 +              }
 +      }
 +      HEAD { return HEAD                     }
 +      none { return {}                       }
 +      default { error "unknown type of revision"      }
 +      }
 +}
 +
 +method _validate {d S} {
 +      if {$d == 1} {
 +              if {[regexp {\s} $S]} {
 +                      return 0
 +              }
 +              if {[string length $S] > 0} {
 +                      set revtype expr
 +              }
 +      }
 +      return 1
 +}
 +
 +method _filter {P} {
 +      if {[regexp {\s} $P]} {
 +              return 0
 +      }
 +      _rebuild $this $P
 +      return 1
 +}
 +
 +method _select {args} {
 +      _rebuild $this $filter
 +      focus_filter $this
 +}
 +
 +method _rebuild {pat} {
 +      set ste normal
 +      switch -- $revtype {
 +      head { set new $spec_head }
 +      trck { set new $spec_trck }
 +      tag  { set new $spec_tag  }
 +      expr -
 +      HEAD -
 +      none {
 +              set new [list]
 +              set ste disabled
 +      }
 +      }
 +
 +      if {[$w_list cget -state] eq {disabled}} {
 +              $w_list configure -state normal
 +      }
 +      $w_list delete 0 end
 +
 +      if {$pat ne {}} {
 +              set pat *${pat}*
 +      }
 +      set cur_specs [list]
 +      foreach spec $new {
 +              set txt [lindex $spec 0]
 +              if {$pat eq {} || [string match $pat $txt]} {
 +                      lappend cur_specs $spec
 +                      $w_list insert end $txt
 +              }
 +      }
 +      if {$cur_specs ne {}} {
 +              $w_list selection clear 0 end
 +              $w_list selection set 0
 +      }
 +
 +      if {[$w_filter cget -state] ne $ste} {
 +              $w_list   configure -state $ste
 +              $w_filter configure -state $ste
 +      }
 +}
 +
 +method _delete {current} {
 +      if {$current eq $w} {
 +              delete_this
 +      }
 +}
 +
 +method _sb_set {sb orient first last} {
 +      set old_focus [focus -lastfor $w]
 +
 +      if {$first == 0 && $last == 1} {
 +              if {[winfo exists $sb]} {
 +                      destroy $sb
 +                      if {$old_focus ne {}} {
 +                              update
 +                              focus $old_focus
 +                      }
 +              }
 +              return
 +      }
 +
 +      if {![winfo exists $sb]} {
 +              if {$orient eq {h}} {
 +                      scrollbar $sb -orient h -command [list $w_list xview]
 +                      pack $sb -fill x -side bottom -before $w_list
 +              } else {
 +                      scrollbar $sb -orient v -command [list $w_list yview]
 +                      pack $sb -fill y -side right -before $w_list
 +              }
 +              if {$old_focus ne {}} {
 +                      update
 +                      focus $old_focus
 +              }
 +      }
 +      $sb set $first $last
 +}
 +
++method _show_tooltip {pos} {
++      if {$tooltip_wm ne {}} {
++              _open_tooltip $this
++      } elseif {$tooltip_timer eq {}} {
++              set tooltip_timer [after 1000 [cb _open_tooltip]]
++      }
++}
++
++method _open_tooltip {} {
++      global remote_url
++
++      set tooltip_timer {}
++      set pos_x [winfo pointerx $w_list]
++      set pos_y [winfo pointery $w_list]
++      if {[winfo containing $pos_x $pos_y] ne $w_list} {
++              _hide_tooltip $this
++              return
++      }
++
++      set pos @[join [list \
++              [expr {$pos_x - [winfo rootx $w_list]}] \
++              [expr {$pos_y - [winfo rooty $w_list]}]] ,]
++      set lno [$w_list index $pos]
++      if {$lno eq {}} {
++              _hide_tooltip $this
++              return
++      }
++
++      set spec [lindex $cur_specs $lno]
++      set refn [lindex $spec 1]
++      if {$refn eq {}} {
++              _hide_tooltip $this
++              return
++      }
++
++      if {$tooltip_wm eq {}} {
++              set tooltip_wm [toplevel $w_list.tooltip -borderwidth 1]
++              wm overrideredirect $tooltip_wm 1
++              wm transient $tooltip_wm [winfo toplevel $w_list]
++              set tooltip_t $tooltip_wm.label
++              text $tooltip_t \
++                      -takefocus 0 \
++                      -highlightthickness 0 \
++                      -relief flat \
++                      -borderwidth 0 \
++                      -wrap none \
++                      -background lightyellow \
++                      -foreground black
++              $tooltip_t tag conf section_header -font font_uibold
++              bind $tooltip_wm <Escape> [cb _hide_tooltip]
++              pack $tooltip_t
++      } else {
++              $tooltip_t conf -state normal
++              $tooltip_t delete 0.0 end
++      }
++
++      set data $tip_data($refn)
++      if {[lindex $data 0 0] eq {tag}} {
++              set tag  [lindex $data 0]
++              if {[lindex $data 1 0] eq {commit}} {
++                      set cmit [lindex $data 1]
++              } else {
++                      set cmit {}
++              }
++      } elseif {[lindex $data 0 0] eq {commit}} {
++              set tag  {}
++              set cmit [lindex $data 0]
++      }
++
++      $tooltip_t insert end [lindex $spec 0]
++      set last [_reflog_last $this [lindex $spec 1]]
++      if {$last ne {}} {
++              $tooltip_t insert end "\n"
++              $tooltip_t insert end "updated"
++              $tooltip_t insert end " $last"
++      }
++      $tooltip_t insert end "\n"
++
++      if {$tag ne {}} {
++              $tooltip_t insert end "\n"
++              $tooltip_t insert end "tag" section_header
++              $tooltip_t insert end "  [lindex $tag 1]\n"
++              $tooltip_t insert end [lindex $tag 2]
++              $tooltip_t insert end " ([lindex $tag 3])\n"
++              $tooltip_t insert end [lindex $tag 4]
++              $tooltip_t insert end "\n"
++      }
++
++      if {$cmit ne {}} {
++              $tooltip_t insert end "\n"
++              $tooltip_t insert end "commit" section_header
++              $tooltip_t insert end "  [lindex $cmit 1]\n"
++              $tooltip_t insert end [lindex $cmit 2]
++              $tooltip_t insert end " ([lindex $cmit 3])\n"
++              $tooltip_t insert end [lindex $cmit 4]
++      }
++
++      if {[llength $spec] > 2} {
++              $tooltip_t insert end "\n"
++              $tooltip_t insert end "remote" section_header
++              $tooltip_t insert end "  [lindex $spec 2]\n"
++              $tooltip_t insert end "url"
++              $tooltip_t insert end " $remote_url([lindex $spec 2])\n"
++              $tooltip_t insert end "branch"
++              $tooltip_t insert end " [lindex $spec 3]"
++      }
++
++      $tooltip_t conf -state disabled
++      _position_tooltip $this
++}
++
++method _reflog_last {name} {
++      if {[info exists reflog_last($name)]} {
++              return reflog_last($name)
++      }
++
++      set last {}
++      if {[catch {set last [file mtime [gitdir $name]]}]
++      && ![catch {set g [open [gitdir logs $name] r]}]} {
++              fconfigure $g -translation binary
++              while {[gets $g line] >= 0} {
++                      if {[regexp {> ([1-9][0-9]*) } $line line when]} {
++                              set last $when
++                      }
++              }
++              close $g
++      }
++
++      if {$last ne {}} {
++              set last [clock format $last -format {%a %b %e %H:%M:%S %Y}]
++      }
++      set reflog_last($name) $last
++      return $last
++}
++
++method _position_tooltip {} {
++      set max_h [lindex [split [$tooltip_t index end] .] 0]
++      set max_w 0
++      for {set i 1} {$i <= $max_h} {incr i} {
++              set c [lindex [split [$tooltip_t index "$i.0 lineend"] .] 1]
++              if {$c > $max_w} {set max_w $c}
++      }
++      $tooltip_t conf -width $max_w -height $max_h
++
++      set req_w [winfo reqwidth  $tooltip_t]
++      set req_h [winfo reqheight $tooltip_t]
++      set pos_x [expr {[winfo pointerx .] +  5}]
++      set pos_y [expr {[winfo pointery .] + 10}]
++
++      set g "${req_w}x${req_h}"
++      if {$pos_x >= 0} {append g +}
++      append g $pos_x
++      if {$pos_y >= 0} {append g +}
++      append g $pos_y
++
++      wm geometry $tooltip_wm $g
++      raise $tooltip_wm
++}
++
++method _hide_tooltip {} {
++      if {$tooltip_wm ne {}} {
++              destroy $tooltip_wm
++              set tooltip_wm {}
++      }
++      if {$tooltip_timer ne {}} {
++              after cancel $tooltip_timer
++              set tooltip_timer {}
++      }
++}
++
 +}

diff --cc git-gui/lib/commit.tcl
index 46a78c158f53372a481061e9a5a6072c40e54e58,0000000000000000000000000000000000000000..f857a2ff5bb3d0e151ea471a16a1b233117afc70
mode 100644,000000..100644
--- 1/git-gui/lib/commit.tcl
--- /dev/null
+++ b/git-gui/lib/commit.tcl
@@@ -1,415 -1,0 +1,431 @@@
-                       set msg [encoding convertfrom $enc [read $fd]]
-                       set msg [string trim $msg]
 +# git-gui misc. commit reading/writing support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc load_last_commit {} {
 +      global HEAD PARENT MERGE_HEAD commit_type ui_comm
 +      global repo_config
 +
 +      if {[llength $PARENT] == 0} {
 +              error_popup {There is nothing to amend.
 +
 +You are about to create the initial commit.  There is no commit before this to amend.
 +}
 +              return
 +      }
 +
 +      repository_state curType curHEAD curMERGE_HEAD
 +      if {$curType eq {merge}} {
 +              error_popup {Cannot amend while merging.
 +
 +You are currently in the middle of a merge that has not been fully completed.  You cannot amend the prior commit unless you first abort the current merge activity.
 +}
 +              return
 +      }
 +
 +      set msg {}
 +      set parents [list]
 +      if {[catch {
 +                      set fd [git_read cat-file commit $curHEAD]
 +                      fconfigure $fd -encoding binary -translation lf
 +                      if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 +                              set enc utf-8
 +                      }
 +                      while {[gets $fd line] > 0} {
 +                              if {[string match {parent *} $line]} {
 +                                      lappend parents [string range $line 7 end]
 +                              } elseif {[string match {encoding *} $line]} {
 +                                      set enc [string tolower [string range $line 9 end]]
 +                              }
 +                      }
- File [short_path $path] has merge conflicts.  You must resolve them and add the file before committing.
++                      set msg [read $fd]
 +                      close $fd
++
++                      set enc [tcl_encoding $enc]
++                      if {$enc ne {}} {
++                              set msg [encoding convertfrom $enc $msg]
++                      }
++                      set msg [string trim $msg]
 +              } err]} {
 +              error_popup "Error loading commit data for amend:\n\n$err"
 +              return
 +      }
 +
 +      set HEAD $curHEAD
 +      set PARENT $parents
 +      set MERGE_HEAD [list]
 +      switch -- [llength $parents] {
 +      0       {set commit_type amend-initial}
 +      1       {set commit_type amend}
 +      default {set commit_type amend-merge}
 +      }
 +
 +      $ui_comm delete 0.0 end
 +      $ui_comm insert end $msg
 +      $ui_comm edit reset
 +      $ui_comm edit modified false
 +      rescan ui_ready
 +}
 +
 +set GIT_COMMITTER_IDENT {}
 +
 +proc committer_ident {} {
 +      global GIT_COMMITTER_IDENT
 +
 +      if {$GIT_COMMITTER_IDENT eq {}} {
 +              if {[catch {set me [git var GIT_COMMITTER_IDENT]} err]} {
 +                      error_popup "Unable to obtain your identity:\n\n$err"
 +                      return {}
 +              }
 +              if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
 +                      $me me GIT_COMMITTER_IDENT]} {
 +                      error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
 +                      return {}
 +              }
 +      }
 +
 +      return $GIT_COMMITTER_IDENT
 +}
 +
 +proc do_signoff {} {
 +      global ui_comm
 +
 +      set me [committer_ident]
 +      if {$me eq {}} return
 +
 +      set sob "Signed-off-by: $me"
 +      set last [$ui_comm get {end -1c linestart} {end -1c}]
 +      if {$last ne $sob} {
 +              $ui_comm edit separator
 +              if {$last ne {}
 +                      && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
 +                      $ui_comm insert end "\n"
 +              }
 +              $ui_comm insert end "\n$sob"
 +              $ui_comm edit separator
 +              $ui_comm see end
 +      }
 +}
 +
 +proc create_new_commit {} {
 +      global commit_type ui_comm
 +
 +      set commit_type normal
 +      $ui_comm delete 0.0 end
 +      $ui_comm edit reset
 +      $ui_comm edit modified false
 +      rescan ui_ready
 +}
 +
 +proc commit_tree {} {
 +      global HEAD commit_type file_states ui_comm repo_config
 +      global pch_error
 +
 +      if {[committer_ident] eq {}} return
 +      if {![lock_index update]} return
 +
 +      # -- Our in memory state should match the repository.
 +      #
 +      repository_state curType curHEAD curMERGE_HEAD
 +      if {[string match amend* $commit_type]
 +              && $curType eq {normal}
 +              && $curHEAD eq $HEAD} {
 +      } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
 +              info_popup {Last scanned state does not match repository state.
 +
 +Another Git program has modified this repository since the last scan.  A rescan must be performed before another commit can be created.
 +
 +The rescan will be automatically started now.
 +}
 +              unlock_index
 +              rescan ui_ready
 +              return
 +      }
 +
 +      # -- At least one file should differ in the index.
 +      #
 +      set files_ready 0
 +      foreach path [array names file_states] {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              _? {continue}
 +              A? -
 +              D? -
 +              M? {set files_ready 1}
 +              U? {
 +                      error_popup "Unmerged files cannot be committed.
 +
- You must add at least 1 file before you can commit.
++File [short_path $path] has merge conflicts.  You must resolve them and stage the file before committing.
 +"
 +                      unlock_index
 +                      return
 +              }
 +              default {
 +                      error_popup "Unknown file state [lindex $s 0] detected.
 +
 +File [short_path $path] cannot be committed by this program.
 +"
 +              }
 +              }
 +      }
 +      if {!$files_ready && ![string match *merge $curType]} {
 +              info_popup {No changes to commit.
 +
-       fconfigure $fd_ph -blocking 0 -translation binary
++You must stage at least 1 file before you can commit.
 +}
 +              unlock_index
 +              return
 +      }
 +
 +      # -- A message is required.
 +      #
 +      set msg [string trim [$ui_comm get 1.0 end]]
 +      regsub -all -line {[ \t\r]+$} $msg {} msg
 +      if {$msg eq {}} {
 +              error_popup {Please supply a commit message.
 +
 +A good commit message has the following format:
 +
 +- First line: Describe in one sentance what you did.
 +- Second line: Blank
 +- Remaining lines: Describe why this change is good.
 +}
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Run the pre-commit hook.
 +      #
 +      set pchook [gitdir hooks pre-commit]
 +
 +      # 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] && [file isfile $pchook]} {
 +              set pchook [list sh -c [concat \
 +                      "if test -x \"$pchook\";" \
 +                      "then exec \"$pchook\" 2>&1;" \
 +                      "fi"]]
 +      } elseif {[file executable $pchook]} {
 +              set pchook [list $pchook |& cat]
 +      } else {
 +              commit_writetree $curHEAD $msg
 +              return
 +      }
 +
 +      ui_status {Calling pre-commit hook...}
 +      set pch_error {}
 +      set fd_ph [open "| $pchook" r]
-       fconfigure $msg_wt -encoding binary -translation binary
-       puts -nonewline $msg_wt [encoding convertto $enc $msg]
++      fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +      fileevent $fd_ph readable \
 +              [list commit_prehook_wait $fd_ph $curHEAD $msg]
 +}
 +
 +proc commit_prehook_wait {fd_ph curHEAD msg} {
 +      global pch_error
 +
 +      append pch_error [read $fd_ph]
 +      fconfigure $fd_ph -blocking 1
 +      if {[eof $fd_ph]} {
 +              if {[catch {close $fd_ph}]} {
 +                      ui_status {Commit declined by pre-commit hook.}
 +                      hook_failed_popup pre-commit $pch_error
 +                      unlock_index
 +              } else {
 +                      commit_writetree $curHEAD $msg
 +              }
 +              set pch_error {}
 +              return
 +      }
 +      fconfigure $fd_ph -blocking 0
 +}
 +
 +proc commit_writetree {curHEAD msg} {
 +      ui_status {Committing changes...}
 +      set fd_wt [git_read write-tree]
 +      fileevent $fd_wt readable \
 +              [list commit_committree $fd_wt $curHEAD $msg]
 +}
 +
 +proc commit_committree {fd_wt curHEAD msg} {
 +      global HEAD PARENT MERGE_HEAD commit_type
 +      global current_branch
 +      global ui_comm selected_commit_type
 +      global file_states selected_paths rescan_active
 +      global repo_config
 +
 +      gets $fd_wt tree_id
 +      if {$tree_id eq {} || [catch {close $fd_wt} err]} {
 +              error_popup "write-tree failed:\n\n$err"
 +              ui_status {Commit failed.}
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Verify this wasn't an empty change.
 +      #
 +      if {$commit_type eq {normal}} {
 +              set fd_ot [git_read cat-file commit $PARENT]
 +              fconfigure $fd_ot -encoding binary -translation lf
 +              set old_tree [gets $fd_ot]
 +              close $fd_ot
 +
 +              if {[string equal -length 5 {tree } $old_tree]
 +                      && [string length $old_tree] == 45} {
 +                      set old_tree [string range $old_tree 5 end]
 +              } else {
 +                      error "Commit $PARENT appears to be corrupt"
 +              }
 +
 +              if {$tree_id eq $old_tree} {
 +                      info_popup {No changes to commit.
 +
 +No files were modified by this commit and it was not a merge commit.
 +
 +A rescan will be automatically started now.
 +}
 +                      unlock_index
 +                      rescan {ui_status {No changes to commit.}}
 +                      return
 +              }
 +      }
 +
 +      # -- Build the message.
 +      #
 +      set msg_p [gitdir COMMIT_EDITMSG]
 +      set msg_wt [open $msg_p w]
++      fconfigure $msg_wt -translation lf
 +      if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 +              set enc utf-8
 +      }
++      set use_enc [tcl_encoding $enc]
++      if {$use_enc ne {}} {
++              fconfigure $msg_wt -encoding $use_enc
++      } else {
++              puts stderr "warning: Tcl does not support encoding '$enc'."
++              fconfigure $msg_wt -encoding utf-8
++      }
++      puts -nonewline $msg_wt $msg
 +      close $msg_wt
 +
 +      # -- Create the commit.
 +      #
 +      set cmd [list commit-tree $tree_id]
 +      foreach p [concat $PARENT $MERGE_HEAD] {
 +              lappend cmd -p $p
 +      }
 +      lappend cmd <$msg_p
 +      if {[catch {set cmt_id [eval git $cmd]} err]} {
 +              error_popup "commit-tree failed:\n\n$err"
 +              ui_status {Commit failed.}
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Update the HEAD ref.
 +      #
 +      set reflogm commit
 +      if {$commit_type ne {normal}} {
 +              append reflogm " ($commit_type)"
 +      }
 +      set i [string first "\n" $msg]
 +      if {$i >= 0} {
 +              set subject [string range $msg 0 [expr {$i - 1}]]
 +      } else {
 +              set subject $msg
 +      }
 +      append reflogm {: } $subject
 +      if {[catch {
 +                      git update-ref -m $reflogm HEAD $cmt_id $curHEAD
 +              } err]} {
 +              error_popup "update-ref failed:\n\n$err"
 +              ui_status {Commit failed.}
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Cleanup after ourselves.
 +      #
 +      catch {file delete $msg_p}
 +      catch {file delete [gitdir MERGE_HEAD]}
 +      catch {file delete [gitdir MERGE_MSG]}
 +      catch {file delete [gitdir SQUASH_MSG]}
 +      catch {file delete [gitdir GITGUI_MSG]}
 +
 +      # -- Let rerere do its thing.
 +      #
 +      if {[get_config rerere.enabled] eq {}} {
 +              set rerere [file isdirectory [gitdir rr-cache]]
 +      } else {
 +              set rerere [is_config_true rerere.enabled]
 +      }
 +      if {$rerere} {
 +              catch {git rerere}
 +      }
 +
 +      # -- Run the post-commit hook.
 +      #
 +      set pchook [gitdir hooks post-commit]
 +      if {[is_Cygwin] && [file isfile $pchook]} {
 +              set pchook [list sh -c [concat \
 +                      "if test -x \"$pchook\";" \
 +                      "then exec \"$pchook\";" \
 +                      "fi"]]
 +      } elseif {![file executable $pchook]} {
 +              set pchook {}
 +      }
 +      if {$pchook ne {}} {
 +              catch {exec $pchook &}
 +      }
 +
 +      $ui_comm delete 0.0 end
 +      $ui_comm edit reset
 +      $ui_comm edit modified false
++      if {$::GITGUI_BCK_exists} {
++              catch {file delete [gitdir GITGUI_BCK]}
++              set ::GITGUI_BCK_exists 0
++      }
 +
 +      if {[is_enabled singlecommit]} do_quit
 +
 +      # -- Update in memory status
 +      #
 +      set selected_commit_type new
 +      set commit_type normal
 +      set HEAD $cmt_id
 +      set PARENT $cmt_id
 +      set MERGE_HEAD [list]
 +
 +      foreach path [array names file_states] {
 +              set s $file_states($path)
 +              set m [lindex $s 0]
 +              switch -glob -- $m {
 +              _O -
 +              _M -
 +              _D {continue}
 +              __ -
 +              A_ -
 +              M_ -
 +              D_ {
 +                      unset file_states($path)
 +                      catch {unset selected_paths($path)}
 +              }
 +              DO {
 +                      set file_states($path) [list _O [lindex $s 1] {} {}]
 +              }
 +              AM -
 +              AD -
 +              MM -
 +              MD {
 +                      set file_states($path) [list \
 +                              _[string index $m 1] \
 +                              [lindex $s 1] \
 +                              [lindex $s 3] \
 +                              {}]
 +              }
 +              }
 +      }
 +
 +      display_all_files
 +      unlock_index
 +      reshow_diff
 +      ui_status "Created commit [string range $cmt_id 0 7]: $subject"
 +}

diff --cc git-gui/lib/database.tcl
index 87c815d7ac4f64d4d837f950f6f60e141a4433d5,0000000000000000000000000000000000000000..0657cc2245cec67bbb6d3399935a40247bd0c402
mode 100644,000000..100644
--- 1/git-gui/lib/database.tcl
--- /dev/null
+++ b/git-gui/lib/database.tcl
@@@ -1,89 -1,0 +1,116 @@@
 +# git-gui object database management support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc do_stats {} {
 +      set fd [git_read count-objects -v]
 +      while {[gets $fd line] > 0} {
 +              if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
 +                      set stats($name) $value
 +              }
 +      }
 +      close $fd
 +
 +      set packed_sz 0
 +      foreach p [glob -directory [gitdir objects pack] \
 +              -type f \
 +              -nocomplain -- *] {
 +              incr packed_sz [file size $p]
 +      }
 +      if {$packed_sz > 0} {
 +              set stats(size-pack) [expr {$packed_sz / 1024}]
 +      }
 +
 +      set w .stats_view
 +      toplevel $w
 +      wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
 +      label $w.header -text {Database Statistics}
 +      pack $w.header -side top -fill x
 +
 +      frame $w.buttons -border 1
 +      button $w.buttons.close -text Close \
 +              -default active \
 +              -command [list destroy $w]
 +      button $w.buttons.gc -text {Compress Database} \
 +              -default normal \
 +              -command "destroy $w;do_gc"
 +      pack $w.buttons.close -side right
 +      pack $w.buttons.gc -side left
 +      pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +      frame $w.stat -borderwidth 1 -relief solid
 +      foreach s {
 +              {count           {Number of loose objects}}
 +              {size            {Disk space used by loose objects} { KiB}}
 +              {in-pack         {Number of packed objects}}
 +              {packs           {Number of packs}}
 +              {size-pack       {Disk space used by packed objects} { KiB}}
 +              {prune-packable  {Packed objects waiting for pruning}}
 +              {garbage         {Garbage files}}
 +              } {
 +              set name [lindex $s 0]
 +              set label [lindex $s 1]
 +              if {[catch {set value $stats($name)}]} continue
 +              if {[llength $s] > 2} {
 +                      set value "$value[lindex $s 2]"
 +              }
 +
 +              label $w.stat.l_$name -text "$label:" -anchor w
 +              label $w.stat.v_$name -text $value -anchor w
 +              grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
 +      }
 +      pack $w.stat -pady 10 -padx 10
 +
 +      bind $w <Visibility> "grab $w; focus $w.buttons.close"
 +      bind $w <Key-Escape> [list destroy $w]
 +      bind $w <Key-Return> [list destroy $w]
 +      wm title $w "[appname] ([reponame]): Database Statistics"
 +      tkwait window $w
 +}
 +
 +proc do_gc {} {
 +      set w [console::new {gc} {Compressing the object database}]
 +      console::chain $w {
 +              {exec git pack-refs --prune}
 +              {exec git reflog expire --all}
 +              {exec git repack -a -d -l}
 +              {exec git rerere gc}
 +      }
 +}
 +
 +proc do_fsck_objects {} {
 +      set w [console::new {fsck-objects} \
 +              {Verifying the object database with fsck-objects}]
 +      set cmd [list git fsck-objects]
 +      lappend cmd --full
 +      lappend cmd --cache
 +      lappend cmd --strict
 +      console::exec $w $cmd
 +}
++
++proc hint_gc {} {
++      set object_limit 8
++      if {[is_Windows]} {
++              set object_limit 1
++      }
++
++      set objects_current [llength [glob \
++              -directory [gitdir objects 42] \
++              -nocomplain \
++              -tails \
++              -- \
++              *]]
++
++      if {$objects_current >= $object_limit} {
++              set objects_current [expr {$objects_current * 256}]
++              set object_limit    [expr {$object_limit    * 256}]
++              if {[ask_popup \
++                      "This repository currently has approximately $objects_current loose objects.
++
++To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
++
++Compress the database now?"] eq yes} {
++                      do_gc
++              }
++      }
++}

diff --cc git-gui/lib/diff.tcl
index 9cb9d0604a4905337dc0c57d8d846753a3157c8a,0000000000000000000000000000000000000000..e09e1257e1be299caceb0c6f0074c1b43b566974
mode 100644,000000..100644
--- 1/git-gui/lib/diff.tcl
--- /dev/null
+++ b/git-gui/lib/diff.tcl
@@@ -1,336 -1,0 +1,337 @@@
 +# git-gui diff viewer
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc clear_diff {} {
 +      global ui_diff current_diff_path current_diff_header
 +      global ui_index ui_workdir
 +
 +      $ui_diff conf -state normal
 +      $ui_diff delete 0.0 end
 +      $ui_diff conf -state disabled
 +
 +      set current_diff_path {}
 +      set current_diff_header {}
 +
 +      $ui_index tag remove in_diff 0.0 end
 +      $ui_workdir tag remove in_diff 0.0 end
 +}
 +
 +proc reshow_diff {} {
 +      global file_states file_lists
 +      global current_diff_path current_diff_side
 +
 +      set p $current_diff_path
 +      if {$p eq {}} {
 +              # No diff is being shown.
 +      } elseif {$current_diff_side eq {}
 +              || [catch {set s $file_states($p)}]
 +              || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
 +              clear_diff
 +      } else {
 +              show_diff $p $current_diff_side
 +      }
 +}
 +
 +proc handle_empty_diff {} {
 +      global current_diff_path file_states file_lists
 +
 +      set path $current_diff_path
 +      set s $file_states($path)
 +      if {[lindex $s 0] ne {_M}} return
 +
 +      info_popup "No differences detected.
 +
 +[short_path $path] has no changes.
 +
 +The modification date of this file was updated by another application, but the content within the file was not changed.
 +
 +A rescan will be automatically started to find other files which may have the same state."
 +
 +      clear_diff
 +      display_file $path __
 +      rescan ui_ready 0
 +}
 +
 +proc show_diff {path w {lno {}}} {
 +      global file_states file_lists
 +      global is_3way_diff diff_active repo_config
 +      global ui_diff ui_index ui_workdir
 +      global current_diff_path current_diff_side current_diff_header
 +
 +      if {$diff_active || ![lock_index read]} return
 +
 +      clear_diff
 +      if {$lno == {}} {
 +              set lno [lsearch -sorted -exact $file_lists($w) $path]
 +              if {$lno >= 0} {
 +                      incr lno
 +              }
 +      }
 +      if {$lno >= 1} {
 +              $w tag add in_diff $lno.0 [expr {$lno + 1}].0
 +      }
 +
 +      set s $file_states($path)
 +      set m [lindex $s 0]
 +      set is_3way_diff 0
 +      set diff_active 1
 +      set current_diff_path $path
 +      set current_diff_side $w
 +      set current_diff_header {}
 +      ui_status "Loading diff of [escape_path $path]..."
 +
 +      # - Git won't give us the diff, there's nothing to compare to!
 +      #
 +      if {$m eq {_O}} {
 +              set max_sz [expr {128 * 1024}]
 +              if {[catch {
 +                              set fd [open $path r]
++                              fconfigure $fd -eofchar {}
 +                              set content [read $fd $max_sz]
 +                              close $fd
 +                              set sz [file size $path]
 +                      } err ]} {
 +                      set diff_active 0
 +                      unlock_index
 +                      ui_status "Unable to display [escape_path $path]"
 +                      error_popup "Error loading file:\n\n$err"
 +                      return
 +              }
 +              $ui_diff conf -state normal
 +              if {![catch {set type [exec file $path]}]} {
 +                      set n [string length $path]
 +                      if {[string equal -length $n $path $type]} {
 +                              set type [string range $type $n end]
 +                              regsub {^:?\s*} $type {} type
 +                      }
 +                      $ui_diff insert end "* $type\n" d_@
 +              }
 +              if {[string first "\0" $content] != -1} {
 +                      $ui_diff insert end \
 +                              "* Binary file (not showing content)." \
 +                              d_@
 +              } else {
 +                      if {$sz > $max_sz} {
 +                              $ui_diff insert end \
 +"* Untracked file is $sz bytes.
 +* Showing only first $max_sz bytes.
 +" d_@
 +                      }
 +                      $ui_diff insert end $content
 +                      if {$sz > $max_sz} {
 +                              $ui_diff insert end "
 +* Untracked file clipped here by [appname].
 +* To see the entire file, use an external editor.
 +" d_@
 +                      }
 +              }
 +              $ui_diff conf -state disabled
 +              set diff_active 0
 +              unlock_index
 +              ui_ready
 +              return
 +      }
 +
 +      set cmd [list]
 +      if {$w eq $ui_index} {
 +              lappend cmd diff-index
 +              lappend cmd --cached
 +      } elseif {$w eq $ui_workdir} {
 +              if {[string index $m 0] eq {U}} {
 +                      lappend cmd diff
 +              } else {
 +                      lappend cmd diff-files
 +              }
 +      }
 +
 +      lappend cmd -p
 +      lappend cmd --no-color
 +      if {$repo_config(gui.diffcontext) >= 0} {
 +              lappend cmd "-U$repo_config(gui.diffcontext)"
 +      }
 +      if {$w eq $ui_index} {
 +              lappend cmd [PARENT]
 +      }
 +      lappend cmd --
 +      lappend cmd $path
 +
 +      if {[catch {set fd [eval git_read --nice $cmd]} err]} {
 +              set diff_active 0
 +              unlock_index
 +              ui_status "Unable to display [escape_path $path]"
 +              error_popup "Error loading diff:\n\n$err"
 +              return
 +      }
 +
 +      fconfigure $fd \
 +              -blocking 0 \
 +              -encoding binary \
 +              -translation binary
 +      fileevent $fd readable [list read_diff $fd]
 +}
 +
 +proc read_diff {fd} {
 +      global ui_diff diff_active
 +      global is_3way_diff current_diff_header
 +
 +      $ui_diff conf -state normal
 +      while {[gets $fd line] >= 0} {
 +              # -- Cleanup uninteresting diff header lines.
 +              #
 +              if {   [string match {diff --git *}      $line]
 +                      || [string match {diff --cc *}       $line]
 +                      || [string match {diff --combined *} $line]
 +                      || [string match {--- *}             $line]
 +                      || [string match {+++ *}             $line]} {
 +                      append current_diff_header $line "\n"
 +                      continue
 +              }
 +              if {[string match {index *} $line]} continue
 +              if {$line eq {deleted file mode 120000}} {
 +                      set line "deleted symlink"
 +              }
 +
 +              # -- Automatically detect if this is a 3 way diff.
 +              #
 +              if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 +
 +              if {[string match {mode *} $line]
 +                      || [string match {new file *} $line]
 +                      || [string match {deleted file *} $line]
 +                      || [string match {Binary files * and * differ} $line]
 +                      || $line eq {\ No newline at end of file}
 +                      || [regexp {^\* Unmerged path } $line]} {
 +                      set tags {}
 +              } elseif {$is_3way_diff} {
 +                      set op [string range $line 0 1]
 +                      switch -- $op {
 +                      {  } {set tags {}}
 +                      {@@} {set tags d_@}
 +                      { +} {set tags d_s+}
 +                      { -} {set tags d_s-}
 +                      {+ } {set tags d_+s}
 +                      {- } {set tags d_-s}
 +                      {--} {set tags d_--}
 +                      {++} {
 +                              if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
 +                                      set line [string replace $line 0 1 {  }]
 +                                      set tags d$op
 +                              } else {
 +                                      set tags d_++
 +                              }
 +                      }
 +                      default {
 +                              puts "error: Unhandled 3 way diff marker: {$op}"
 +                              set tags {}
 +                      }
 +                      }
 +              } else {
 +                      set op [string index $line 0]
 +                      switch -- $op {
 +                      { } {set tags {}}
 +                      {@} {set tags d_@}
 +                      {-} {set tags d_-}
 +                      {+} {
 +                              if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
 +                                      set line [string replace $line 0 0 { }]
 +                                      set tags d$op
 +                              } else {
 +                                      set tags d_+
 +                              }
 +                      }
 +                      default {
 +                              puts "error: Unhandled 2 way diff marker: {$op}"
 +                              set tags {}
 +                      }
 +                      }
 +              }
 +              $ui_diff insert end $line $tags
 +              if {[string index $line end] eq "\r"} {
 +                      $ui_diff tag add d_cr {end - 2c}
 +              }
 +              $ui_diff insert end "\n" $tags
 +      }
 +      $ui_diff conf -state disabled
 +
 +      if {[eof $fd]} {
 +              close $fd
 +              set diff_active 0
 +              unlock_index
 +              ui_ready
 +
 +              if {[$ui_diff index end] eq {2.0}} {
 +                      handle_empty_diff
 +              }
 +      }
 +}
 +
 +proc apply_hunk {x y} {
 +      global current_diff_path current_diff_header current_diff_side
 +      global ui_diff ui_index file_states
 +
 +      if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +      if {![lock_index apply_hunk]} return
 +
 +      set apply_cmd {apply --cached --whitespace=nowarn}
 +      set mi [lindex $file_states($current_diff_path) 0]
 +      if {$current_diff_side eq $ui_index} {
 +              set mode unstage
 +              lappend apply_cmd --reverse
 +              if {[string index $mi 0] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      } else {
 +              set mode stage
 +              if {[string index $mi 1] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      }
 +
 +      set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
 +      set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
 +      if {$s_lno eq {}} {
 +              unlock_index
 +              return
 +      }
 +
 +      set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
 +      if {$e_lno eq {}} {
 +              set e_lno end
 +      }
 +
 +      if {[catch {
 +              set p [eval git_write $apply_cmd]
 +              fconfigure $p -translation binary -encoding binary
 +              puts -nonewline $p $current_diff_header
 +              puts -nonewline $p [$ui_diff get $s_lno $e_lno]
 +              close $p} err]} {
 +              error_popup "Failed to $mode selected hunk.\n\n$err"
 +              unlock_index
 +              return
 +      }
 +
 +      $ui_diff conf -state normal
 +      $ui_diff delete $s_lno $e_lno
 +      $ui_diff conf -state disabled
 +
 +      if {[$ui_diff get 1.0 end] eq "\n"} {
 +              set o _
 +      } else {
 +              set o ?
 +      }
 +
 +      if {$current_diff_side eq $ui_index} {
 +              set mi ${o}M
 +      } elseif {[string index $mi 0] eq {_}} {
 +              set mi M$o
 +      } else {
 +              set mi ?$o
 +      }
 +      unlock_index
 +      display_file $current_diff_path $mi
 +      if {$o eq {_}} {
 +              clear_diff
 +      }
 +}

diff --cc git-gui/lib/encoding.tcl
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7f06b0d47f0fa214c98644757f99f8a036b9689e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/git-gui/lib/encoding.tcl
@@@ -1,0 -1,0 +1,276 @@@
++# git-gui encoding support
++# Copyright (C) 2005 Paul Mackerras <paulus@samba.org>
++# (Copied from gitk, commit fd8ccbec4f0161)
++
++# This list of encoding names and aliases is distilled from
++# http://www.iana.org/assignments/character-sets.
++# Not all of them are supported by Tcl.
++set encoding_aliases {
++    { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII
++      ISO646-US US-ASCII us IBM367 cp367 csASCII }
++    { ISO-10646-UTF-1 csISO10646UTF1 }
++    { ISO_646.basic:1983 ref csISO646basic1983 }
++    { INVARIANT csINVARIANT }
++    { ISO_646.irv:1983 iso-ir-2 irv csISO2IntlRefVersion }
++    { BS_4730 iso-ir-4 ISO646-GB gb uk csISO4UnitedKingdom }
++    { NATS-SEFI iso-ir-8-1 csNATSSEFI }
++    { NATS-SEFI-ADD iso-ir-8-2 csNATSSEFIADD }
++    { NATS-DANO iso-ir-9-1 csNATSDANO }
++    { NATS-DANO-ADD iso-ir-9-2 csNATSDANOADD }
++    { SEN_850200_B iso-ir-10 FI ISO646-FI ISO646-SE se csISO10Swedish }
++    { SEN_850200_C iso-ir-11 ISO646-SE2 se2 csISO11SwedishForNames }
++    { KS_C_5601-1987 iso-ir-149 KS_C_5601-1989 KSC_5601 korean csKSC56011987 }
++    { ISO-2022-KR csISO2022KR }
++    { EUC-KR csEUCKR }
++    { ISO-2022-JP csISO2022JP }
++    { ISO-2022-JP-2 csISO2022JP2 }
++    { JIS_C6220-1969-jp JIS_C6220-1969 iso-ir-13 katakana x0201-7
++      csISO13JISC6220jp }
++    { JIS_C6220-1969-ro iso-ir-14 jp ISO646-JP csISO14JISC6220ro }
++    { IT iso-ir-15 ISO646-IT csISO15Italian }
++    { PT iso-ir-16 ISO646-PT csISO16Portuguese }
++    { ES iso-ir-17 ISO646-ES csISO17Spanish }
++    { greek7-old iso-ir-18 csISO18Greek7Old }
++    { latin-greek iso-ir-19 csISO19LatinGreek }
++    { DIN_66003 iso-ir-21 de ISO646-DE csISO21German }
++    { NF_Z_62-010_(1973) iso-ir-25 ISO646-FR1 csISO25French }
++    { Latin-greek-1 iso-ir-27 csISO27LatinGreek1 }
++    { ISO_5427 iso-ir-37 csISO5427Cyrillic }
++    { JIS_C6226-1978 iso-ir-42 csISO42JISC62261978 }
++    { BS_viewdata iso-ir-47 csISO47BSViewdata }
++    { INIS iso-ir-49 csISO49INIS }
++    { INIS-8 iso-ir-50 csISO50INIS8 }
++    { INIS-cyrillic iso-ir-51 csISO51INISCyrillic }
++    { ISO_5427:1981 iso-ir-54 ISO5427Cyrillic1981 }
++    { ISO_5428:1980 iso-ir-55 csISO5428Greek }
++    { GB_1988-80 iso-ir-57 cn ISO646-CN csISO57GB1988 }
++    { GB_2312-80 iso-ir-58 chinese csISO58GB231280 }
++    { NS_4551-1 iso-ir-60 ISO646-NO no csISO60DanishNorwegian
++      csISO60Norwegian1 }
++    { NS_4551-2 ISO646-NO2 iso-ir-61 no2 csISO61Norwegian2 }
++    { NF_Z_62-010 iso-ir-69 ISO646-FR fr csISO69French }
++    { videotex-suppl iso-ir-70 csISO70VideotexSupp1 }
++    { PT2 iso-ir-84 ISO646-PT2 csISO84Portuguese2 }
++    { ES2 iso-ir-85 ISO646-ES2 csISO85Spanish2 }
++    { MSZ_7795.3 iso-ir-86 ISO646-HU hu csISO86Hungarian }
++    { JIS_C6226-1983 iso-ir-87 x0208 JIS_X0208-1983 csISO87JISX0208 }
++    { greek7 iso-ir-88 csISO88Greek7 }
++    { ASMO_449 ISO_9036 arabic7 iso-ir-89 csISO89ASMO449 }
++    { iso-ir-90 csISO90 }
++    { JIS_C6229-1984-a iso-ir-91 jp-ocr-a csISO91JISC62291984a }
++    { JIS_C6229-1984-b iso-ir-92 ISO646-JP-OCR-B jp-ocr-b
++      csISO92JISC62991984b }
++    { JIS_C6229-1984-b-add iso-ir-93 jp-ocr-b-add csISO93JIS62291984badd }
++    { JIS_C6229-1984-hand iso-ir-94 jp-ocr-hand csISO94JIS62291984hand }
++    { JIS_C6229-1984-hand-add iso-ir-95 jp-ocr-hand-add
++      csISO95JIS62291984handadd }
++    { JIS_C6229-1984-kana iso-ir-96 csISO96JISC62291984kana }
++    { ISO_2033-1983 iso-ir-98 e13b csISO2033 }
++    { ANSI_X3.110-1983 iso-ir-99 CSA_T500-1983 NAPLPS csISO99NAPLPS }
++    { ISO_8859-1:1987 iso-ir-100 ISO_8859-1 ISO-8859-1 latin1 l1 IBM819
++      CP819 csISOLatin1 }
++    { ISO_8859-2:1987 iso-ir-101 ISO_8859-2 ISO-8859-2 latin2 l2 csISOLatin2 }
++    { T.61-7bit iso-ir-102 csISO102T617bit }
++    { T.61-8bit T.61 iso-ir-103 csISO103T618bit }
++    { ISO_8859-3:1988 iso-ir-109 ISO_8859-3 ISO-8859-3 latin3 l3 csISOLatin3 }
++    { ISO_8859-4:1988 iso-ir-110 ISO_8859-4 ISO-8859-4 latin4 l4 csISOLatin4 }
++    { ECMA-cyrillic iso-ir-111 KOI8-E csISO111ECMACyrillic }
++    { CSA_Z243.4-1985-1 iso-ir-121 ISO646-CA csa7-1 ca csISO121Canadian1 }
++    { CSA_Z243.4-1985-2 iso-ir-122 ISO646-CA2 csa7-2 csISO122Canadian2 }
++    { CSA_Z243.4-1985-gr iso-ir-123 csISO123CSAZ24341985gr }
++    { ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ISO-8859-6 ECMA-114 ASMO-708
++      arabic csISOLatinArabic }
++    { ISO_8859-6-E csISO88596E ISO-8859-6-E }
++    { ISO_8859-6-I csISO88596I ISO-8859-6-I }
++    { ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ISO-8859-7 ELOT_928 ECMA-118
++      greek greek8 csISOLatinGreek }
++    { T.101-G2 iso-ir-128 csISO128T101G2 }
++    { ISO_8859-8:1988 iso-ir-138 ISO_8859-8 ISO-8859-8 hebrew
++      csISOLatinHebrew }
++    { ISO_8859-8-E csISO88598E ISO-8859-8-E }
++    { ISO_8859-8-I csISO88598I ISO-8859-8-I }
++    { CSN_369103 iso-ir-139 csISO139CSN369103 }
++    { JUS_I.B1.002 iso-ir-141 ISO646-YU js yu csISO141JUSIB1002 }
++    { ISO_6937-2-add iso-ir-142 csISOTextComm }
++    { IEC_P27-1 iso-ir-143 csISO143IECP271 }
++    { ISO_8859-5:1988 iso-ir-144 ISO_8859-5 ISO-8859-5 cyrillic
++      csISOLatinCyrillic }
++    { JUS_I.B1.003-serb iso-ir-146 serbian csISO146Serbian }
++    { JUS_I.B1.003-mac macedonian iso-ir-147 csISO147Macedonian }
++    { ISO_8859-9:1989 iso-ir-148 ISO_8859-9 ISO-8859-9 latin5 l5 csISOLatin5 }
++    { greek-ccitt iso-ir-150 csISO150 csISO150GreekCCITT }
++    { NC_NC00-10:81 cuba iso-ir-151 ISO646-CU csISO151Cuba }
++    { ISO_6937-2-25 iso-ir-152 csISO6937Add }
++    { GOST_19768-74 ST_SEV_358-88 iso-ir-153 csISO153GOST1976874 }
++    { ISO_8859-supp iso-ir-154 latin1-2-5 csISO8859Supp }
++    { ISO_10367-box iso-ir-155 csISO10367Box }
++    { ISO-8859-10 iso-ir-157 l6 ISO_8859-10:1992 csISOLatin6 latin6 }
++    { latin-lap lap iso-ir-158 csISO158Lap }
++    { JIS_X0212-1990 x0212 iso-ir-159 csISO159JISX02121990 }
++    { DS_2089 DS2089 ISO646-DK dk csISO646Danish }
++    { us-dk csUSDK }
++    { dk-us csDKUS }
++    { JIS_X0201 X0201 csHalfWidthKatakana }
++    { KSC5636 ISO646-KR csKSC5636 }
++    { ISO-10646-UCS-2 csUnicode }
++    { ISO-10646-UCS-4 csUCS4 }
++    { DEC-MCS dec csDECMCS }
++    { hp-roman8 roman8 r8 csHPRoman8 }
++    { macintosh mac csMacintosh }
++    { IBM037 cp037 ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl
++      csIBM037 }
++    { IBM038 EBCDIC-INT cp038 csIBM038 }
++    { IBM273 CP273 csIBM273 }
++    { IBM274 EBCDIC-BE CP274 csIBM274 }
++    { IBM275 EBCDIC-BR cp275 csIBM275 }
++    { IBM277 EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 }
++    { IBM278 CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 }
++    { IBM280 CP280 ebcdic-cp-it csIBM280 }
++    { IBM281 EBCDIC-JP-E cp281 csIBM281 }
++    { IBM284 CP284 ebcdic-cp-es csIBM284 }
++    { IBM285 CP285 ebcdic-cp-gb csIBM285 }
++    { IBM290 cp290 EBCDIC-JP-kana csIBM290 }
++    { IBM297 cp297 ebcdic-cp-fr csIBM297 }
++    { IBM420 cp420 ebcdic-cp-ar1 csIBM420 }
++    { IBM423 cp423 ebcdic-cp-gr csIBM423 }
++    { IBM424 cp424 ebcdic-cp-he csIBM424 }
++    { IBM437 cp437 437 csPC8CodePage437 }
++    { IBM500 CP500 ebcdic-cp-be ebcdic-cp-ch csIBM500 }
++    { IBM775 cp775 csPC775Baltic }
++    { IBM850 cp850 850 csPC850Multilingual }
++    { IBM851 cp851 851 csIBM851 }
++    { IBM852 cp852 852 csPCp852 }
++    { IBM855 cp855 855 csIBM855 }
++    { IBM857 cp857 857 csIBM857 }
++    { IBM860 cp860 860 csIBM860 }
++    { IBM861 cp861 861 cp-is csIBM861 }
++    { IBM862 cp862 862 csPC862LatinHebrew }
++    { IBM863 cp863 863 csIBM863 }
++    { IBM864 cp864 csIBM864 }
++    { IBM865 cp865 865 csIBM865 }
++    { IBM866 cp866 866 csIBM866 }
++    { IBM868 CP868 cp-ar csIBM868 }
++    { IBM869 cp869 869 cp-gr csIBM869 }
++    { IBM870 CP870 ebcdic-cp-roece ebcdic-cp-yu csIBM870 }
++    { IBM871 CP871 ebcdic-cp-is csIBM871 }
++    { IBM880 cp880 EBCDIC-Cyrillic csIBM880 }
++    { IBM891 cp891 csIBM891 }
++    { IBM903 cp903 csIBM903 }
++    { IBM904 cp904 904 csIBBM904 }
++    { IBM905 CP905 ebcdic-cp-tr csIBM905 }
++    { IBM918 CP918 ebcdic-cp-ar2 csIBM918 }
++    { IBM1026 CP1026 csIBM1026 }
++    { EBCDIC-AT-DE csIBMEBCDICATDE }
++    { EBCDIC-AT-DE-A csEBCDICATDEA }
++    { EBCDIC-CA-FR csEBCDICCAFR }
++    { EBCDIC-DK-NO csEBCDICDKNO }
++    { EBCDIC-DK-NO-A csEBCDICDKNOA }
++    { EBCDIC-FI-SE csEBCDICFISE }
++    { EBCDIC-FI-SE-A csEBCDICFISEA }
++    { EBCDIC-FR csEBCDICFR }
++    { EBCDIC-IT csEBCDICIT }
++    { EBCDIC-PT csEBCDICPT }
++    { EBCDIC-ES csEBCDICES }
++    { EBCDIC-ES-A csEBCDICESA }
++    { EBCDIC-ES-S csEBCDICESS }
++    { EBCDIC-UK csEBCDICUK }
++    { EBCDIC-US csEBCDICUS }
++    { UNKNOWN-8BIT csUnknown8BiT }
++    { MNEMONIC csMnemonic }
++    { MNEM csMnem }
++    { VISCII csVISCII }
++    { VIQR csVIQR }
++    { KOI8-R csKOI8R }
++    { IBM00858 CCSID00858 CP00858 PC-Multilingual-850+euro }
++    { IBM00924 CCSID00924 CP00924 ebcdic-Latin9--euro }
++    { IBM01140 CCSID01140 CP01140 ebcdic-us-37+euro }
++    { IBM01141 CCSID01141 CP01141 ebcdic-de-273+euro }
++    { IBM01142 CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro }
++    { IBM01143 CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro }
++    { IBM01144 CCSID01144 CP01144 ebcdic-it-280+euro }
++    { IBM01145 CCSID01145 CP01145 ebcdic-es-284+euro }
++    { IBM01146 CCSID01146 CP01146 ebcdic-gb-285+euro }
++    { IBM01147 CCSID01147 CP01147 ebcdic-fr-297+euro }
++    { IBM01148 CCSID01148 CP01148 ebcdic-international-500+euro }
++    { IBM01149 CCSID01149 CP01149 ebcdic-is-871+euro }
++    { IBM1047 IBM-1047 }
++    { PTCP154 csPTCP154 PT154 CP154 Cyrillic-Asian }
++    { Amiga-1251 Ami1251 Amiga1251 Ami-1251 }
++    { UNICODE-1-1 csUnicode11 }
++    { CESU-8 csCESU-8 }
++    { BOCU-1 csBOCU-1 }
++    { UNICODE-1-1-UTF-7 csUnicode11UTF7 }
++    { ISO-8859-14 iso-ir-199 ISO_8859-14:1998 ISO_8859-14 latin8 iso-celtic
++      l8 }
++    { ISO-8859-15 ISO_8859-15 Latin-9 }
++    { ISO-8859-16 iso-ir-226 ISO_8859-16:2001 ISO_8859-16 latin10 l10 }
++    { GBK CP936 MS936 windows-936 }
++    { JIS_Encoding csJISEncoding }
++    { Shift_JIS MS_Kanji csShiftJIS }
++    { Extended_UNIX_Code_Packed_Format_for_Japanese csEUCPkdFmtJapanese
++      EUC-JP }
++    { Extended_UNIX_Code_Fixed_Width_for_Japanese csEUCFixWidJapanese }
++    { ISO-10646-UCS-Basic csUnicodeASCII }
++    { ISO-10646-Unicode-Latin1 csUnicodeLatin1 ISO-10646 }
++    { ISO-Unicode-IBM-1261 csUnicodeIBM1261 }
++    { ISO-Unicode-IBM-1268 csUnicodeIBM1268 }
++    { ISO-Unicode-IBM-1276 csUnicodeIBM1276 }
++    { ISO-Unicode-IBM-1264 csUnicodeIBM1264 }
++    { ISO-Unicode-IBM-1265 csUnicodeIBM1265 }
++    { ISO-8859-1-Windows-3.0-Latin-1 csWindows30Latin1 }
++    { ISO-8859-1-Windows-3.1-Latin-1 csWindows31Latin1 }
++    { ISO-8859-2-Windows-Latin-2 csWindows31Latin2 }
++    { ISO-8859-9-Windows-Latin-5 csWindows31Latin5 }
++    { Adobe-Standard-Encoding csAdobeStandardEncoding }
++    { Ventura-US csVenturaUS }
++    { Ventura-International csVenturaInternational }
++    { PC8-Danish-Norwegian csPC8DanishNorwegian }
++    { PC8-Turkish csPC8Turkish }
++    { IBM-Symbols csIBMSymbols }
++    { IBM-Thai csIBMThai }
++    { HP-Legal csHPLegal }
++    { HP-Pi-font csHPPiFont }
++    { HP-Math8 csHPMath8 }
++    { Adobe-Symbol-Encoding csHPPSMath }
++    { HP-DeskTop csHPDesktop }
++    { Ventura-Math csVenturaMath }
++    { Microsoft-Publishing csMicrosoftPublishing }
++    { Windows-31J csWindows31J }
++    { GB2312 csGB2312 }
++    { Big5 csBig5 }
++}
++
++proc tcl_encoding {enc} {
++    global encoding_aliases
++    set names [encoding names]
++    set lcnames [string tolower $names]
++    set enc [string tolower $enc]
++    set i [lsearch -exact $lcnames $enc]
++    if {$i < 0} {
++      # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
++      if {[regsub {^iso[-_]} $enc iso encx]} {
++          set i [lsearch -exact $lcnames $encx]
++      }
++    }
++    if {$i < 0} {
++      foreach l $encoding_aliases {
++          set ll [string tolower $l]
++          if {[lsearch -exact $ll $enc] < 0} continue
++          # look through the aliases for one that tcl knows about
++          foreach e $ll {
++              set i [lsearch -exact $lcnames $e]
++              if {$i < 0} {
++                  if {[regsub {^iso[-_]} $e iso ex]} {
++                      set i [lsearch -exact $lcnames $ex]
++                  }
++              }
++              if {$i >= 0} break
++          }
++          break
++      }
++    }
++    if {$i >= 0} {
++      return [lindex $names $i]
++    }
++    return {}
++}

diff --cc git-gui/lib/error.tcl
index d0253ae2ffa72e491784434ff6ad98ed675ff10c,0000000000000000000000000000000000000000..16a22187b26760963069bef14673b1791b311c12
mode 100644,000000..100644
--- 1/git-gui/lib/error.tcl
--- /dev/null
+++ b/git-gui/lib/error.tcl
@@@ -1,101 -1,0 +1,104 @@@
-       return [tk_messageBox \
-               -parent . \
 +# git-gui branch (create/delete) support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc error_popup {msg} {
 +      set title [appname]
 +      if {[reponame] ne {}} {
 +              append title " ([reponame])"
 +      }
 +      set cmd [list tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title "$title: error" \
 +              -message $msg]
 +      if {[winfo ismapped .]} {
 +              lappend cmd -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 "$title: warning" \
 +              -message $msg]
 +      if {[winfo ismapped .]} {
 +              lappend cmd -parent .
 +      }
 +      eval $cmd
 +}
 +
 +proc info_popup {msg {parent .}} {
 +      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 .
++      }
++      eval $cmd
 +}
 +
 +proc hook_failed_popup {hook msg} {
 +      set w .hookfail
 +      toplevel $w
 +
 +      frame $w.m
 +      label $w.m.l1 -text "$hook hook failed:" \
 +              -anchor w \
 +              -justify left \
 +              -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]
 +      label $w.m.l2 \
 +              -text {You must correct the above errors before committing.} \
 +              -anchor w \
 +              -justify left \
 +              -font font_uibold
 +      scrollbar $w.m.sby -command [list $w.m.t yview]
 +      pack $w.m.l1 -side top -fill x
 +      pack $w.m.l2 -side bottom -fill x
 +      pack $w.m.sby -side right -fill y
 +      pack $w.m.t -side left -fill both -expand 1
 +      pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
 +
 +      $w.m.t insert 1.0 $msg
 +      $w.m.t conf -state disabled
 +
 +      button $w.ok -text OK \
 +              -width 15 \
 +              -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 "[appname] ([reponame]): error"
 +      tkwait window $w
 +}

diff --cc git-gui/lib/index.tcl
index 3ea72e1ec9807477e72e48306d7e3ad47a393abb,0000000000000000000000000000000000000000..f47f9290c8f82b2c899c839c26d9921e85b9fa0d
mode 100644,000000..100644
--- 1/git-gui/lib/index.tcl
--- /dev/null
+++ b/git-gui/lib/index.tcl
@@@ -1,409 -1,0 +1,409 @@@
- Any unadded changes will be permanently lost by the revert." \
 +# git-gui index (add/remove) support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc update_indexinfo {msg pathList after} {
 +      global update_index_cp
 +
 +      if {![lock_index update]} return
 +
 +      set update_index_cp 0
 +      set pathList [lsort $pathList]
 +      set totalCnt [llength $pathList]
 +      set batch [expr {int($totalCnt * .01) + 1}]
 +      if {$batch > 25} {set batch 25}
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              0.0]
 +      set fd [git_write update-index -z --index-info]
 +      fconfigure $fd \
 +              -blocking 0 \
 +              -buffering full \
 +              -buffersize 512 \
 +              -encoding binary \
 +              -translation binary
 +      fileevent $fd writable [list \
 +              write_update_indexinfo \
 +              $fd \
 +              $pathList \
 +              $totalCnt \
 +              $batch \
 +              $msg \
 +              $after \
 +              ]
 +}
 +
 +proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
 +      global update_index_cp
 +      global file_states current_diff_path
 +
 +      if {$update_index_cp >= $totalCnt} {
 +              close $fd
 +              unlock_index
 +              uplevel #0 $after
 +              return
 +      }
 +
 +      for {set i $batch} \
 +              {$update_index_cp < $totalCnt && $i > 0} \
 +              {incr i -1} {
 +              set path [lindex $pathList $update_index_cp]
 +              incr update_index_cp
 +
 +              set s $file_states($path)
 +              switch -glob -- [lindex $s 0] {
 +              A? {set new _O}
 +              M? {set new _M}
 +              D_ {set new _D}
 +              D? {set new _?}
 +              ?? {continue}
 +              }
 +              set info [lindex $s 2]
 +              if {$info eq {}} continue
 +
 +              puts -nonewline $fd "$info\t[encoding convertto $path]\0"
 +              display_file $path $new
 +      }
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              [expr {100.0 * $update_index_cp / $totalCnt}]]
 +}
 +
 +proc update_index {msg pathList after} {
 +      global update_index_cp
 +
 +      if {![lock_index update]} return
 +
 +      set update_index_cp 0
 +      set pathList [lsort $pathList]
 +      set totalCnt [llength $pathList]
 +      set batch [expr {int($totalCnt * .01) + 1}]
 +      if {$batch > 25} {set batch 25}
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              0.0]
 +      set fd [git_write update-index --add --remove -z --stdin]
 +      fconfigure $fd \
 +              -blocking 0 \
 +              -buffering full \
 +              -buffersize 512 \
 +              -encoding binary \
 +              -translation binary
 +      fileevent $fd writable [list \
 +              write_update_index \
 +              $fd \
 +              $pathList \
 +              $totalCnt \
 +              $batch \
 +              $msg \
 +              $after \
 +              ]
 +}
 +
 +proc write_update_index {fd pathList totalCnt batch msg after} {
 +      global update_index_cp
 +      global file_states current_diff_path
 +
 +      if {$update_index_cp >= $totalCnt} {
 +              close $fd
 +              unlock_index
 +              uplevel #0 $after
 +              return
 +      }
 +
 +      for {set i $batch} \
 +              {$update_index_cp < $totalCnt && $i > 0} \
 +              {incr i -1} {
 +              set path [lindex $pathList $update_index_cp]
 +              incr update_index_cp
 +
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              AD {set new __}
 +              ?D {set new D_}
 +              _O -
 +              AM {set new A_}
 +              U? {
 +                      if {[file exists $path]} {
 +                              set new M_
 +                      } else {
 +                              set new D_
 +                      }
 +              }
 +              ?M {set new M_}
 +              ?? {continue}
 +              }
 +              puts -nonewline $fd "[encoding convertto $path]\0"
 +              display_file $path $new
 +      }
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              [expr {100.0 * $update_index_cp / $totalCnt}]]
 +}
 +
 +proc checkout_index {msg pathList after} {
 +      global update_index_cp
 +
 +      if {![lock_index update]} return
 +
 +      set update_index_cp 0
 +      set pathList [lsort $pathList]
 +      set totalCnt [llength $pathList]
 +      set batch [expr {int($totalCnt * .01) + 1}]
 +      if {$batch > 25} {set batch 25}
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              0.0]
 +      set fd [git_write checkout-index \
 +              --index \
 +              --quiet \
 +              --force \
 +              -z \
 +              --stdin \
 +              ]
 +      fconfigure $fd \
 +              -blocking 0 \
 +              -buffering full \
 +              -buffersize 512 \
 +              -encoding binary \
 +              -translation binary
 +      fileevent $fd writable [list \
 +              write_checkout_index \
 +              $fd \
 +              $pathList \
 +              $totalCnt \
 +              $batch \
 +              $msg \
 +              $after \
 +              ]
 +}
 +
 +proc write_checkout_index {fd pathList totalCnt batch msg after} {
 +      global update_index_cp
 +      global file_states current_diff_path
 +
 +      if {$update_index_cp >= $totalCnt} {
 +              close $fd
 +              unlock_index
 +              uplevel #0 $after
 +              return
 +      }
 +
 +      for {set i $batch} \
 +              {$update_index_cp < $totalCnt && $i > 0} \
 +              {incr i -1} {
 +              set path [lindex $pathList $update_index_cp]
 +              incr update_index_cp
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              U? {continue}
 +              ?M -
 +              ?D {
 +                      puts -nonewline $fd "[encoding convertto $path]\0"
 +                      display_file $path ?_
 +              }
 +              }
 +      }
 +
 +      ui_status [format \
 +              "$msg... %i/%i files (%.2f%%)" \
 +              $update_index_cp \
 +              $totalCnt \
 +              [expr {100.0 * $update_index_cp / $totalCnt}]]
 +}
 +
 +proc unstage_helper {txt paths} {
 +      global file_states current_diff_path
 +
 +      if {![lock_index begin-update]} return
 +
 +      set pathList [list]
 +      set after {}
 +      foreach path $paths {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              A? -
 +              M? -
 +              D? {
 +                      lappend pathList $path
 +                      if {$path eq $current_diff_path} {
 +                              set after {reshow_diff;}
 +                      }
 +              }
 +              }
 +      }
 +      if {$pathList eq {}} {
 +              unlock_index
 +      } else {
 +              update_indexinfo \
 +                      $txt \
 +                      $pathList \
 +                      [concat $after [list ui_ready]]
 +      }
 +}
 +
 +proc do_unstage_selection {} {
 +      global current_diff_path selected_paths
 +
 +      if {[array size selected_paths] > 0} {
 +              unstage_helper \
 +                      {Unstaging selected files from commit} \
 +                      [array names selected_paths]
 +      } elseif {$current_diff_path ne {}} {
 +              unstage_helper \
 +                      "Unstaging [short_path $current_diff_path] from commit" \
 +                      [list $current_diff_path]
 +      }
 +}
 +
 +proc add_helper {txt paths} {
 +      global file_states current_diff_path
 +
 +      if {![lock_index begin-update]} return
 +
 +      set pathList [list]
 +      set after {}
 +      foreach path $paths {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              _O -
 +              ?M -
 +              ?D -
 +              U? {
 +                      lappend pathList $path
 +                      if {$path eq $current_diff_path} {
 +                              set after {reshow_diff;}
 +                      }
 +              }
 +              }
 +      }
 +      if {$pathList eq {}} {
 +              unlock_index
 +      } else {
 +              update_index \
 +                      $txt \
 +                      $pathList \
 +                      [concat $after {ui_status {Ready to commit.}}]
 +      }
 +}
 +
 +proc do_add_selection {} {
 +      global current_diff_path selected_paths
 +
 +      if {[array size selected_paths] > 0} {
 +              add_helper \
 +                      {Adding selected files} \
 +                      [array names selected_paths]
 +      } elseif {$current_diff_path ne {}} {
 +              add_helper \
 +                      "Adding [short_path $current_diff_path]" \
 +                      [list $current_diff_path]
 +      }
 +}
 +
 +proc do_add_all {} {
 +      global file_states
 +
 +      set paths [list]
 +      foreach path [array names file_states] {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              U? {continue}
 +              ?M -
 +              ?D {lappend paths $path}
 +              }
 +      }
 +      add_helper {Adding all changed files} $paths
 +}
 +
 +proc revert_helper {txt paths} {
 +      global file_states current_diff_path
 +
 +      if {![lock_index begin-update]} return
 +
 +      set pathList [list]
 +      set after {}
 +      foreach path $paths {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              U? {continue}
 +              ?M -
 +              ?D {
 +                      lappend pathList $path
 +                      if {$path eq $current_diff_path} {
 +                              set after {reshow_diff;}
 +                      }
 +              }
 +              }
 +      }
 +
 +      set n [llength $pathList]
 +      if {$n == 0} {
 +              unlock_index
 +              return
 +      } elseif {$n == 1} {
 +              set s "[short_path [lindex $pathList]]"
 +      } else {
 +              set s "these $n files"
 +      }
 +
 +      set reply [tk_dialog \
 +              .confirm_revert \
 +              "[appname] ([reponame])" \
 +              "Revert changes in $s?
 +
++Any unstaged changes will be permanently lost by the revert." \
 +              question \
 +              1 \
 +              {Do Nothing} \
 +              {Revert Changes} \
 +              ]
 +      if {$reply == 1} {
 +              checkout_index \
 +                      $txt \
 +                      $pathList \
 +                      [concat $after [list ui_ready]]
 +      } else {
 +              unlock_index
 +      }
 +}
 +
 +proc do_revert_selection {} {
 +      global current_diff_path selected_paths
 +
 +      if {[array size selected_paths] > 0} {
 +              revert_helper \
 +                      {Reverting selected files} \
 +                      [array names selected_paths]
 +      } elseif {$current_diff_path ne {}} {
 +              revert_helper \
 +                      "Reverting [short_path $current_diff_path]" \
 +                      [list $current_diff_path]
 +      }
 +}
 +
 +proc do_select_commit_type {} {
 +      global commit_type selected_commit_type
 +
 +      if {$selected_commit_type eq {new}
 +              && [string match amend* $commit_type]} {
 +              create_new_commit
 +      } elseif {$selected_commit_type eq {amend}
 +              && ![string match amend* $commit_type]} {
 +              load_last_commit
 +
 +              # The amend request was rejected...
 +              #
 +              if {![string match amend* $commit_type]} {
 +                      set selected_commit_type new
 +              }
 +      }
 +}

diff --cc git-gui/lib/merge.tcl
index 288d7ac8894fbaf2e756add9b2b9a56fdd00b75e,0000000000000000000000000000000000000000..5de0d82b1486ef6ff8ce0eaea4221fa393a87d5b
mode 100644,000000..100644
--- 1/git-gui/lib/merge.tcl
--- /dev/null
+++ b/git-gui/lib/merge.tcl
@@@ -1,317 -1,0 +1,274 @@@
- namespace eval merge {
 +# git-gui branch merge support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
- proc _can_merge {} {
++class merge {
++
++field w         ; # top level window
++field w_rev     ; # mega-widget to pick the revision to merge
 +
- You must resolve them, add the file, and commit to complete the current merge.  Only then can you begin another merge.
++method _can_merge {} {
 +      global HEAD commit_type file_states
 +
 +      if {[string match amend* $commit_type]} {
 +              info_popup {Cannot merge while amending.
 +
 +You must finish amending this commit before starting any type of merge.
 +}
 +              return 0
 +      }
 +
 +      if {[committer_ident] eq {}} {return 0}
 +      if {![lock_index merge]} {return 0}
 +
 +      # -- Our in memory state should match the repository.
 +      #
 +      repository_state curType curHEAD curMERGE_HEAD
 +      if {$commit_type ne $curType || $HEAD ne $curHEAD} {
 +              info_popup {Last scanned state does not match repository state.
 +
 +Another Git program has modified this repository since the last scan.  A rescan must be performed before a merge can be performed.
 +
 +The rescan will be automatically started now.
 +}
 +              unlock_index
 +              rescan ui_ready
 +              return 0
 +      }
 +
 +      foreach path [array names file_states] {
 +              switch -glob -- [lindex $file_states($path) 0] {
 +              _O {
 +                      continue; # and pray it works!
 +              }
 +              U? {
 +                      error_popup "You are in the middle of a conflicted merge.
 +
 +File [short_path $path] has merge conflicts.
 +
- proc _refs {w list} {
-       set r {}
-       foreach i [$w.source.l curselection] {
-               lappend r [lindex [lindex $list $i] 0]
++You must resolve them, stage the file, and commit to complete the current merge.  Only then can you begin another merge.
 +"
 +                      unlock_index
 +                      return 0
 +              }
 +              ?? {
 +                      error_popup "You are in the middle of a change.
 +
 +File [short_path $path] is modified.
 +
 +You should complete the current commit before starting a merge.  Doing so will help you abort a failed merge, should the need arise.
 +"
 +                      unlock_index
 +                      return 0
 +              }
 +              }
 +      }
 +
 +      return 1
 +}
 +
-       return $r
++method _rev {} {
++      if {[catch {$w_rev commit_or_die}]} {
++              return {}
 +      }
- proc _visualize {w list} {
-       set revs [_refs $w $list]
-       if {$revs eq {}} return
-       lappend revs --not HEAD
-       do_gitk $revs
++      return [$w_rev get]
 +}
 +
- proc _start {w list} {
-       global HEAD current_branch
++method _visualize {} {
++      set rev [_rev $this]
++      if {$rev ne {}} {
++              do_gitk [list $rev --not HEAD]
++      }
 +}
 +
-       set cmd [list git merge]
-       set names [_refs $w $list]
-       set revcnt [llength $names]
-       append cmd { } $names
- 
-       if {$revcnt == 0} {
++method _start {} {
++      global HEAD current_branch remote_url
 +
-       } elseif {$revcnt == 1} {
-               set unit branch
-       } elseif {$revcnt <= 15} {
-               set unit branches
- 
-               if {[tk_dialog \
-               $w.confirm_octopus \
-               [wm title $w] \
-               "Use octopus merge strategy?
- 
- You are merging $revcnt branches at once.  This requires using the octopus merge driver, which may not succeed if there are file-level conflicts.
- " \
-               question \
-               0 \
-               {Cancel} \
-               {Use octopus} \
-               ] != 1} return
-       } else {
-               tk_messageBox \
-                       -icon error \
-                       -type ok \
-                       -title [wm title $w] \
-                       -parent $w \
-                       -message "Too many branches selected.
++      set name [_rev $this]
++      if {$name eq {}} {
 +              return
- You have requested to merge $revcnt branches in an octopus merge.  This exceeds Git's internal limit of 15 branches per merge.
++      }
 +
- Please select fewer branches.  To merge more than 15 branches, merge the branches in batches.
- "
-               return
++      set spec [$w_rev get_tracking_branch]
++      set cmit [$w_rev get_commit]
 +
- 
-       set msg "Merging $current_branch, [join $names {, }]"
++      set fh [open [gitdir FETCH_HEAD] w]
++      fconfigure $fh -translation lf
++      if {$spec eq {}} {
++              set remote .
++              set branch $name
++              set stitle $branch
++      } else {
++              set remote $remote_url([lindex $spec 1])
++              if {[regexp {^[^:@]*@[^:]*:/} $remote]} {
++                      regsub {^[^:@]*@} $remote {} remote
++              }
++              set branch [lindex $spec 2]
++              set stitle "$branch of $remote"
 +      }
-       set cons [console::new "Merge" $msg]
-       console::exec $cons $cmd \
-               [namespace code [list _finish $revcnt $cons]]
++      regsub ^refs/heads/ $branch {} branch
++      puts $fh "$cmit\t\tbranch '$branch' of $remote"
++      close $fh
++
++      set cmd [list git]
++      lappend cmd merge
++      lappend cmd --strategy=recursive
++      lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
++      lappend cmd HEAD
++      lappend cmd $cmit
++
++      set msg "Merging $current_branch and $stitle"
 +      ui_status "$msg..."
- proc _finish {revcnt w ok} {
-       console::done $w $ok
++      set cons [console::new "Merge" "merge $stitle"]
++      console::exec $cons $cmd [cb _finish $cons]
 +
 +      wm protocol $w WM_DELETE_WINDOW {}
 +      destroy $w
 +}
 +
-               if {$revcnt != 1} {
-                       info_popup "Octopus merge failed.
- 
- Your merge of $revcnt branches has failed.
- 
- There are file-level conflicts between the branches which must be resolved manually.
- 
- The working directory will now be reset.
- 
- You can attempt this merge again by merging only one branch at a time." $w
- 
-                       set fd [git_read read-tree --reset -u HEAD]
-                       fconfigure $fd -blocking 0 -translation binary
-                       fileevent $fd readable \
-                               [namespace code [list _reset_wait $fd]]
-                       ui_status {Aborting... please wait...}
-                       return
-               }
- 
++method _finish {cons ok} {
++      console::done $cons $ok
 +      if {$ok} {
 +              set msg {Merge completed successfully.}
 +      } else {
- proc dialog {} {
 +              set msg {Merge failed.  Conflict resolution is required.}
 +      }
 +      unlock_index
 +      rescan [list ui_status $msg]
++      delete_this
 +}
 +
-       if {![_can_merge]} return
- 
-       set fmt {list %(objectname) %(*objectname) %(refname) %(subject)}
-       set fr_fd [git_read for-each-ref \
-               --tcl \
-               --format=$fmt \
-               refs/heads \
-               refs/remotes \
-               refs/tags \
-               ]
-       fconfigure $fr_fd -translation binary
-       while {[gets $fr_fd line] > 0} {
-               set line [eval $line]
-               set ref [lindex $line 2]
-               regsub ^refs/(heads|remotes|tags)/ $ref {} ref
-               set subj($ref) [lindex $line 3]
-               lappend sha1([lindex $line 0]) $ref
-               if {[lindex $line 1] ne {}} {
-                       lappend sha1([lindex $line 1]) $ref
-               }
-       }
-       close $fr_fd
- 
-       set to_show {}
-       set fr_fd [git_read rev-list --all --not HEAD]
-       while {[gets $fr_fd line] > 0} {
-               if {[catch {set ref $sha1($line)}]} continue
-               foreach n $ref {
-                       lappend to_show [list $n $line]
-               }
++constructor dialog {} {
 +      global current_branch
 +      global M1B
 +
-       close $fr_fd
-       set to_show [lsort -unique $to_show]
++      if {![_can_merge $this]} {
++              delete_this
++              return
 +      }
-       set w .merge_setup
-       toplevel $w
-       wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
-       set _visualize [namespace code [list _visualize $w $to_show]]
-       set _start [namespace code [list _start $w $to_show]]
++      make_toplevel top w
++      wm title $top "[appname] ([reponame]): Merge"
++      if {$top ne {.}} {
++              wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
++      }
 +
-       button $w.buttons.visualize -text Visualize -command $_visualize
++      set _start [cb _start]
 +
 +      label $w.header \
 +              -text "Merge Into $current_branch" \
 +              -font font_uibold
 +      pack $w.header -side top -fill x
 +
 +      frame $w.buttons
-       button $w.buttons.create -text Merge -command $_start
-       pack $w.buttons.create -side right
++      button $w.buttons.visualize \
++              -text Visualize \
++              -command [cb _visualize]
 +      pack $w.buttons.visualize -side left
-               -command "unlock_index;destroy $w"
++      button $w.buttons.merge \
++              -text Merge \
++              -command $_start
++      pack $w.buttons.merge -side right
 +      button $w.buttons.cancel \
 +              -text {Cancel} \
-       labelframe $w.source -text {Source Branches}
-       listbox $w.source.l \
-               -height 10 \
-               -width 70 \
-               -font font_diff \
-               -selectmode extended \
-               -yscrollcommand [list $w.source.sby set]
-       scrollbar $w.source.sby -command [list $w.source.l yview]
-       pack $w.source.sby -side right -fill y
-       pack $w.source.l -side left -fill both -expand 1
-       pack $w.source -fill both -expand 1 -pady 5 -padx 5
- 
-       foreach ref $to_show {
-               set n [lindex $ref 0]
-               if {[string length $n] > 20} {
-                       set n "[string range $n 0 16]..."
-               }
-               $w.source.l insert end [format {%s %-20s %s} \
-                       [string range [lindex $ref 1] 0 5] \
-                       $n \
-                       $subj([lindex $ref 0])]
-       }
- 
-       bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
-       bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
-       bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
-       bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
-       bind $w.source.l <Key-h> [list event generate %W <Key-Left>]
-       bind $w.source.l <Key-l> [list event generate %W <Key-Right>]
-       bind $w.source.l <Key-v> $_visualize
++              -command [cb _cancel]
 +      pack $w.buttons.cancel -side right -padx 5
 +      pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
-       bind $w <Visibility> "grab $w; focus $w.source.l"
-       bind $w <Key-Escape> "unlock_index;destroy $w"
-       wm protocol $w WM_DELETE_WINDOW "unlock_index;destroy $w"
-       wm title $w "[appname] ([reponame]): Merge"
++      set w_rev [::choose_rev::new_unmerged $w.rev {Revision To Merge}]
++      pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
 +
 +      bind $w <$M1B-Key-Return> $_start
-               set op merge
++      bind $w <Key-Return> $_start
++      bind $w <Key-Escape> [cb _cancel]
++      wm protocol $w WM_DELETE_WINDOW [cb _cancel]
++
++      bind $w.buttons.merge <Visibility> [cb _visible]
 +      tkwait window $w
 +}
 +
++method _visible {} {
++      grab $w
++      if {[is_config_true gui.matchtrackingbranch]} {
++              $w_rev pick_tracking_branch
++      }
++      $w_rev focus_filter
++}
++
++method _cancel {} {
++      wm protocol $w WM_DELETE_WINDOW {}
++      unlock_index
++      destroy $w
++      delete_this
++}
++
++}
++
++namespace eval merge {
++
 +proc reset_hard {} {
 +      global HEAD commit_type file_states
 +
 +      if {[string match amend* $commit_type]} {
 +              info_popup {Cannot abort while amending.
 +
 +You must finish amending this commit.
 +}
 +              return
 +      }
 +
 +      if {![lock_index abort]} return
 +
 +      if {[string match *merge* $commit_type]} {
-               set op commit
-       }
++              set op_question "Abort merge?
++
++Aborting the current merge will cause *ALL* uncommitted changes to be lost.
++
++Continue with aborting the current merge?"
 +      } else {
-       if {[ask_popup "Abort $op?
++              set op_question "Reset changes?
 +
- Aborting the current $op will cause *ALL* uncommitted changes to be lost.
++Resetting the changes will cause *ALL* uncommitted changes to be lost.
 +
- Continue with aborting the current $op?"] eq {yes}} {
-               set fd [git_read read-tree --reset -u HEAD]
++Continue with resetting the current changes?"
++      }
 +
-               ui_status {Aborting... please wait...}
++      if {[ask_popup $op_question] eq {yes}} {
++              set fd [git_read --stderr read-tree --reset -u -v HEAD]
 +              fconfigure $fd -blocking 0 -translation binary
 +              fileevent $fd readable [namespace code [list _reset_wait $fd]]
-       read $fd
++              $::main_status start {Aborting} {files reset}
 +      } else {
 +              unlock_index
 +      }
 +}
 +
 +proc _reset_wait {fd} {
 +      global ui_comm
 +
-               close $fd
++      $::main_status update_meter [read $fd]
++
++      fconfigure $fd -blocking 1
 +      if {[eof $fd]} {
++              set fail [catch {close $fd} err]
++              $::main_status stop
 +              unlock_index
 +
 +              $ui_comm delete 0.0 end
 +              $ui_comm edit modified false
 +
 +              catch {file delete [gitdir MERGE_HEAD]}
 +              catch {file delete [gitdir rr-cache MERGE_RR]}
 +              catch {file delete [gitdir SQUASH_MSG]}
 +              catch {file delete [gitdir MERGE_MSG]}
 +              catch {file delete [gitdir GITGUI_MSG]}
 +
++              if {$fail} {
++                      warn_popup "Abort failed.\n\n$err"
++              }
 +              rescan {ui_status {Abort completed.  Ready.}}
++      } else {
++              fconfigure $fd -blocking 0
 +      }
 +}
 +
 +}

diff --cc git-gui/lib/remote.tcl
index e235ca88765090e08707f63096369d56da76d196,0000000000000000000000000000000000000000..cf9b9d582959e62c805a92a86c33e0f3ae7f304e
mode 100644,000000..100644
--- 1/git-gui/lib/remote.tcl
--- /dev/null
+++ b/git-gui/lib/remote.tcl
@@@ -1,205 -1,0 +1,211 @@@
 +# git-gui remote management
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +set some_heads_tracking 0;  # assume not
 +
 +proc is_tracking_branch {name} {
 +      global tracking_branches
 +      foreach spec $tracking_branches {
 +              set t [lindex $spec 0]
 +              if {$t eq $name || [string match $t $name]} {
 +                      return 1
 +              }
 +      }
 +      return 0
 +}
 +
 +proc all_tracking_branches {} {
 +      global tracking_branches
 +
 +      set all [list]
 +      set pat [list]
 +      set cmd [list]
 +
 +      foreach spec $tracking_branches {
 +              set dst [lindex $spec 0]
 +              if {[string range $dst end-1 end] eq {/*}} {
 +                      lappend pat $spec
 +                      lappend cmd [string range $dst 0 end-2]
 +              } else {
 +                      lappend all $spec
 +              }
 +      }
 +
 +      if {$pat ne {}} {
 +              set fd [eval git_read for-each-ref --format=%(refname) $cmd]
 +              while {[gets $fd n] > 0} {
 +                      foreach spec $pat {
 +                              set dst [string range [lindex $spec 0] 0 end-2]
 +                              set len [string length $dst]
 +                              if {[string equal -length $len $dst $n]} {
 +                                      set src [string range [lindex $spec 2] 0 end-2]
 +                                      set spec [list \
 +                                              $n \
 +                                              [lindex $spec 1] \
 +                                              $src[string range $n $len end] \
 +                                              ]
 +                                      lappend all $spec
 +                              }
 +                      }
 +              }
 +              close $fd
 +      }
 +
 +      return [lsort -index 0 -unique $all]
 +}
 +
 +proc load_all_remotes {} {
 +      global repo_config
 +      global all_remotes tracking_branches some_heads_tracking
++      global remote_url
 +
 +      set some_heads_tracking 0
 +      set all_remotes [list]
 +      set trck [list]
 +
 +      set rh_str refs/heads/
 +      set rh_len [string length $rh_str]
 +      set rm_dir [gitdir remotes]
 +      if {[file isdirectory $rm_dir]} {
 +              set all_remotes [glob \
 +                      -types f \
 +                      -tails \
 +                      -nocomplain \
 +                      -directory $rm_dir *]
 +
 +              foreach name $all_remotes {
 +                      catch {
 +                              set fd [open [file join $rm_dir $name] r]
 +                              while {[gets $fd line] >= 0} {
++                                      if {[regexp {^URL:[     ]*(.+)$} $line line url]} {
++                                              set remote_url($name) $url
++                                              continue
++                                      }
 +                                      if {![regexp {^Pull:[   ]*([^:]+):(.+)$} \
 +                                              $line line src dst]} continue
 +                                      if {[string index $src 0] eq {+}} {
 +                                              set src [string range $src 1 end]
 +                                      }
 +                                      if {![string equal -length 5 refs/ $src]} {
 +                                              set src $rh_str$src
 +                                      }
 +                                      if {![string equal -length 5 refs/ $dst]} {
 +                                              set dst $rh_str$dst
 +                                      }
 +                                      if {[string equal -length $rh_len $rh_str $dst]} {
 +                                              set some_heads_tracking 1
 +                                      }
 +                                      lappend trck [list $dst $name $src]
 +                              }
 +                              close $fd
 +                      }
 +              }
 +      }
 +
 +      foreach line [array names repo_config remote.*.url] {
 +              if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
 +              lappend all_remotes $name
++              set remote_url($name) $repo_config(remote.$name.url)
 +
 +              if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
 +                      set fl {}
 +              }
 +              foreach line $fl {
 +                      if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
 +                      if {[string index $src 0] eq {+}} {
 +                              set src [string range $src 1 end]
 +                      }
 +                      if {![string equal -length 5 refs/ $src]} {
 +                              set src $rh_str$src
 +                      }
 +                      if {![string equal -length 5 refs/ $dst]} {
 +                              set dst $rh_str$dst
 +                      }
 +                      if {[string equal -length $rh_len $rh_str $dst]} {
 +                              set some_heads_tracking 1
 +                      }
 +                      lappend trck [list $dst $name $src]
 +              }
 +      }
 +
 +      set tracking_branches [lsort -index 0 -unique $trck]
 +      set all_remotes [lsort -unique $all_remotes]
 +}
 +
 +proc populate_fetch_menu {} {
 +      global all_remotes repo_config
 +
 +      set m .mbar.fetch
 +      set prune_list [list]
 +      foreach r $all_remotes {
 +              set enable 0
 +              if {![catch {set a $repo_config(remote.$r.url)}]} {
 +                      if {![catch {set a $repo_config(remote.$r.fetch)}]} {
 +                              set enable 1
 +                      }
 +              } else {
 +                      catch {
 +                              set fd [open [gitdir remotes $r] r]
 +                              while {[gets $fd n] >= 0} {
 +                                      if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
 +                                              set enable 1
 +                                              break
 +                                      }
 +                              }
 +                              close $fd
 +                      }
 +              }
 +
 +              if {$enable} {
 +                      lappend prune_list $r
 +                      $m add command \
 +                              -label "Fetch from $r..." \
 +                              -command [list fetch_from $r]
 +              }
 +      }
 +
 +      if {$prune_list ne {}} {
 +              $m add separator
 +      }
 +      foreach r $prune_list {
 +              $m add command \
 +                      -label "Prune from $r..." \
 +                      -command [list prune_from $r]
 +      }
 +}
 +
 +proc populate_push_menu {} {
 +      global all_remotes repo_config
 +
 +      set m .mbar.push
 +      set fast_count 0
 +      foreach r $all_remotes {
 +              set enable 0
 +              if {![catch {set a $repo_config(remote.$r.url)}]} {
 +                      if {![catch {set a $repo_config(remote.$r.push)}]} {
 +                              set enable 1
 +                      }
 +              } else {
 +                      catch {
 +                              set fd [open [gitdir remotes $r] r]
 +                              while {[gets $fd n] >= 0} {
 +                                      if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
 +                                              set enable 1
 +                                              break
 +                                      }
 +                              }
 +                              close $fd
 +                      }
 +              }
 +
 +              if {$enable} {
 +                      if {!$fast_count} {
 +                              $m add separator
 +                      }
 +                      $m add command \
 +                              -label "Push to $r..." \
 +                              -command [list push_to $r]
 +                      incr fast_count
 +              }
 +      }
 +}