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

* git://repo.or.cz/git-gui:
  git-gui: Reenable staging unmerged files by clicking the icon.
  git-gui: Support the encoding menu in gui blame.
  git-gui: Optimize encoding name resolution using a lookup table.
  git-gui: Allow forcing display encoding for diffs using a submenu.
  git-gui: Add a menu of available encodings.
  git-gui: Cleanup handling of the default encoding.
  git-gui: Assume `blame --incremental` output is in UTF-8
  git-gui: Use gitattribute "encoding" for file content display
  git-gui: Add support for calling out to the prepare-commit-msg hook
  git-gui: Hide commit related UI during citool --nocommit
  git-gui: Add more integration options to citool.
  git-gui: Updated German translation.
  git-gui: I18n fix sentence parts into full sentences for translation again.
  git-gui: Restore ability to Stage Working Copy for conflicts.
  git-gui: Fix Blame Parent & Context for working copy lines.

diff --cc git-gui/.gitattributes
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f96112d47f743289bf3893981bc89dcaa9caae19
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/git-gui/.gitattributes
@@@ -1,0 -1,0 +1,3 @@@
++*           encoding=US-ASCII
++git-gui.sh  encoding=UTF-8
++/po/*.po    encoding=UTF-8

diff --cc git-gui/git-gui.sh
index 10d8a4422f151eda78a24ff533eb20c3d775d099,0000000000000000000000000000000000000000..4085e8fea59f2b819812f20185df89379d851c0b
mode 100755,000000..100755
--- 1/git-gui/git-gui.sh
--- /dev/null
+++ b/git-gui/git-gui.sh
@@@ -1,3197 -1,0 +1,3371 @@@
- proc do_quit {} {
 +#!/bin/sh
 +# Tcl ignores the next line -*- tcl -*- \
 + if test "z$*" = zversion \
 + || test "z$*" = z--version; \
 + then \
 +      echo 'git-gui version @@GITGUI_VERSION@@'; \
 +      exit; \
 + fi; \
 + argv0=$0; \
 + exec wish "$argv0" -- "$@"
 +
 +set appvers {@@GITGUI_VERSION@@}
 +set copyright [encoding convertfrom utf-8 {
 +Copyright © 2006, 2007 Shawn Pearce, et. al.
 +
 +This program is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 2 of the License, or
 +(at your option) any later version.
 +
 +This program is distributed in the hope that it will be useful,
 +but WITHOUT ANY WARRANTY; without even the implied warranty of
 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +GNU General Public License for more details.
 +
 +You should have received a copy of the GNU General Public License
 +along with this program; if not, write to the Free Software
 +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}]
 +
 +######################################################################
 +##
 +## Tcl/Tk sanity check
 +
 +if {[catch {package require Tcl 8.4} err]
 + || [catch {package require Tk  8.4} err]
 +} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message $err
 +      exit 1
 +}
 +
 +catch {rename send {}} ; # What an evil concept...
 +
 +######################################################################
 +##
 +## locate our library
 +
 +set oguilib {@@GITGUI_LIBDIR@@}
 +set oguirel {@@GITGUI_RELATIVE@@}
 +if {$oguirel eq {1}} {
 +      set oguilib [file dirname [file normalize $argv0]]
 +      if {[file tail $oguilib] eq {git-core}} {
 +              set oguilib [file dirname $oguilib]
 +      }
 +      set oguilib [file dirname $oguilib]
 +      set oguilib [file join $oguilib share git-gui lib]
 +      set oguimsg [file join $oguilib msgs]
 +} elseif {[string match @@* $oguirel]} {
 +      set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +      set oguimsg [file join [file dirname [file normalize $argv0]] po]
 +} else {
 +      set oguimsg [file join $oguilib msgs]
 +}
 +unset oguirel
 +
 +######################################################################
 +##
 +## enable verbose loading?
 +
 +if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
 +      unset _verbose
 +      rename auto_load real__auto_load
 +      proc auto_load {name args} {
 +              puts stderr "auto_load $name"
 +              return [uplevel 1 real__auto_load $name $args]
 +      }
 +      rename source real__source
 +      proc source {name} {
 +              puts stderr "source    $name"
 +              uplevel 1 real__source $name
 +      }
 +}
 +
 +######################################################################
 +##
 +## Internationalization (i18n) through msgcat and gettext. See
 +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
 +
 +package require msgcat
 +
 +proc _mc_trim {fmt} {
 +      set cmk [string first @@ $fmt]
 +      if {$cmk > 0} {
 +              return [string range $fmt 0 [expr {$cmk - 1}]]
 +      }
 +      return $fmt
 +}
 +
 +proc mc {en_fmt args} {
 +      set fmt [_mc_trim [::msgcat::mc $en_fmt]]
 +      if {[catch {set msg [eval [list format $fmt] $args]} err]} {
 +              set msg [eval [list format [_mc_trim $en_fmt]] $args]
 +      }
 +      return $msg
 +}
 +
 +proc strcat {args} {
 +      return [join $args {}]
 +}
 +
 +::msgcat::mcload $oguimsg
 +unset oguimsg
 +
 +######################################################################
 +##
 +## read only globals
 +
 +set _appname {Git Gui}
 +set _gitdir {}
 +set _gitexec {}
 +set _reponame {}
 +set _iscygwin {}
 +set _search_path {}
 +
 +set _trace [lsearch -exact $argv --trace]
 +if {$_trace >= 0} {
 +      set argv [lreplace $argv $_trace $_trace]
 +      set _trace 1
 +} else {
 +      set _trace 0
 +}
 +
 +proc appname {} {
 +      global _appname
 +      return $_appname
 +}
 +
 +proc gitdir {args} {
 +      global _gitdir
 +      if {$args eq {}} {
 +              return $_gitdir
 +      }
 +      return [eval [list file join $_gitdir] $args]
 +}
 +
 +proc gitexec {args} {
 +      global _gitexec
 +      if {$_gitexec eq {}} {
 +              if {[catch {set _gitexec [git --exec-path]} err]} {
 +                      error "Git not installed?\n\n$err"
 +              }
 +              if {[is_Cygwin]} {
 +                      set _gitexec [exec cygpath \
 +                              --windows \
 +                              --absolute \
 +                              $_gitexec]
 +              } else {
 +                      set _gitexec [file normalize $_gitexec]
 +              }
 +      }
 +      if {$args eq {}} {
 +              return $_gitexec
 +      }
 +      return [eval [list file join $_gitexec] $args]
 +}
 +
 +proc reponame {} {
 +      return $::_reponame
 +}
 +
 +proc is_MacOSX {} {
 +      if {[tk windowingsystem] eq {aqua}} {
 +              return 1
 +      }
 +      return 0
 +}
 +
 +proc is_Windows {} {
 +      if {$::tcl_platform(platform) eq {windows}} {
 +              return 1
 +      }
 +      return 0
 +}
 +
 +proc is_Cygwin {} {
 +      global _iscygwin
 +      if {$_iscygwin eq {}} {
 +              if {$::tcl_platform(platform) eq {windows}} {
 +                      if {[catch {set p [exec cygpath --windir]} err]} {
 +                              set _iscygwin 0
 +                      } else {
 +                              set _iscygwin 1
 +                      }
 +              } else {
 +                      set _iscygwin 0
 +              }
 +      }
 +      return $_iscygwin
 +}
 +
 +proc is_enabled {option} {
 +      global enabled_options
 +      if {[catch {set on $enabled_options($option)}]} {return 0}
 +      return $on
 +}
 +
 +proc enable_option {option} {
 +      global enabled_options
 +      set enabled_options($option) 1
 +}
 +
 +proc disable_option {option} {
 +      global enabled_options
 +      set enabled_options($option) 0
 +}
 +
 +######################################################################
 +##
 +## config
 +
 +proc is_many_config {name} {
 +      switch -glob -- $name {
 +      gui.recentrepo -
 +      remote.*.fetch -
 +      remote.*.push
 +              {return 1}
 +      *
 +              {return 0}
 +      }
 +}
 +
 +proc is_config_true {name} {
 +      global repo_config
 +      if {[catch {set v $repo_config($name)}]} {
 +              return 0
 +      } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
 +              return 1
 +      } else {
 +              return 0
 +      }
 +}
 +
 +proc get_config {name} {
 +      global repo_config
 +      if {[catch {set v $repo_config($name)}]} {
 +              return {}
 +      } else {
 +              return $v
 +      }
 +}
 +
 +######################################################################
 +##
 +## handy utils
 +
 +proc _trace_exec {cmd} {
 +      if {!$::_trace} return
 +      set d {}
 +      foreach v $cmd {
 +              if {$d ne {}} {
 +                      append d { }
 +              }
 +              if {[regexp {[ \t\r\n'"$?*]} $v]} {
 +                      set v [sq $v]
 +              }
 +              append d $v
 +      }
 +      puts stderr $d
 +}
 +
 +proc _git_cmd {name} {
 +      global _git_cmd_path
 +
 +      if {[catch {set v $_git_cmd_path($name)}]} {
 +              switch -- $name {
 +                version   -
 +              --version   -
 +              --exec-path { return [list $::_git $name] }
 +              }
 +
 +              set p [gitexec git-$name$::_search_exe]
 +              if {[file exists $p]} {
 +                      set v [list $p]
 +              } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
 +                      # Try to determine what sort of magic will make
 +                      # git-$name go and do its thing, because native
 +                      # Tcl on Windows doesn't know it.
 +                      #
 +                      set p [gitexec git-$name]
 +                      set f [open $p r]
 +                      set s [gets $f]
 +                      close $f
 +
 +                      switch -glob -- [lindex $s 0] {
 +                      #!*sh     { set i sh     }
 +                      #!*perl   { set i perl   }
 +                      #!*python { set i python }
 +                      default   { error "git-$name is not supported: $s" }
 +                      }
 +
 +                      upvar #0 _$i interp
 +                      if {![info exists interp]} {
 +                              set interp [_which $i]
 +                      }
 +                      if {$interp eq {}} {
 +                              error "git-$name requires $i (not in PATH)"
 +                      }
 +                      set v [concat [list $interp] [lrange $s 1 end] [list $p]]
 +              } else {
 +                      # Assume it is builtin to git somehow and we
 +                      # aren't actually able to see a file for it.
 +                      #
 +                      set v [list $::_git $name]
 +              }
 +              set _git_cmd_path($name) $v
 +      }
 +      return $v
 +}
 +
 +proc _which {what args} {
 +      global env _search_exe _search_path
 +
 +      if {$_search_path eq {}} {
 +              if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
 +                      set _search_path [split [exec cygpath \
 +                              --windows \
 +                              --path \
 +                              --absolute \
 +                              $env(PATH)] {;}]
 +                      set _search_exe .exe
 +              } elseif {[is_Windows]} {
 +                      set gitguidir [file dirname [info script]]
 +                      regsub -all ";" $gitguidir "\\;" gitguidir
 +                      set env(PATH) "$gitguidir;$env(PATH)"
 +                      set _search_path [split $env(PATH) {;}]
 +                      set _search_exe .exe
 +              } else {
 +                      set _search_path [split $env(PATH) :]
 +                      set _search_exe {}
 +              }
 +      }
 +
 +      if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
 +              set suffix {}
 +      } else {
 +              set suffix $_search_exe
 +      }
 +
 +      foreach p $_search_path {
 +              set p [file join $p $what$suffix]
 +              if {[file exists $p]} {
 +                      return [file normalize $p]
 +              }
 +      }
 +      return {}
 +}
 +
 +proc _lappend_nice {cmd_var} {
 +      global _nice
 +      upvar $cmd_var cmd
 +
 +      if {![info exists _nice]} {
 +              set _nice [_which nice]
 +      }
 +      if {$_nice ne {}} {
 +              lappend cmd $_nice
 +      }
 +}
 +
 +proc git {args} {
 +      set opt [list]
 +
 +      while {1} {
 +              switch -- [lindex $args 0] {
 +              --nice {
 +                      _lappend_nice opt
 +              }
 +
 +              default {
 +                      break
 +              }
 +
 +              }
 +
 +              set args [lrange $args 1 end]
 +      }
 +
 +      set cmdp [_git_cmd [lindex $args 0]]
 +      set args [lrange $args 1 end]
 +
 +      _trace_exec [concat $opt $cmdp $args]
 +      set result [eval exec $opt $cmdp $args]
 +      if {$::_trace} {
 +              puts stderr "< $result"
 +      }
 +      return $result
 +}
 +
 +proc _open_stdout_stderr {cmd} {
 +      _trace_exec $cmd
 +      if {[catch {
 +                      set fd [open [concat [list | ] $cmd] r]
 +              } err]} {
 +              if {   [lindex $cmd end] eq {2>@1}
 +                  && $err eq {can not find channel named "1"}
 +                      } {
 +                      # Older versions of Tcl 8.4 don't have this 2>@1 IO
 +                      # redirect operator.  Fallback to |& cat for those.
 +                      # The command was not actually started, so its safe
 +                      # to try to start it a second time.
 +                      #
 +                      set fd [open [concat \
 +                              [list | ] \
 +                              [lrange $cmd 0 end-1] \
 +                              [list |& cat] \
 +                              ] r]
 +              } else {
 +                      error $err
 +              }
 +      }
 +      fconfigure $fd -eofchar {}
 +      return $fd
 +}
 +
 +proc git_read {args} {
 +      set opt [list]
 +
 +      while {1} {
 +              switch -- [lindex $args 0] {
 +              --nice {
 +                      _lappend_nice opt
 +              }
 +
 +              --stderr {
 +                      lappend args 2>@1
 +              }
 +
 +              default {
 +                      break
 +              }
 +
 +              }
 +
 +              set args [lrange $args 1 end]
 +      }
 +
 +      set cmdp [_git_cmd [lindex $args 0]]
 +      set args [lrange $args 1 end]
 +
 +      return [_open_stdout_stderr [concat $opt $cmdp $args]]
 +}
 +
 +proc git_write {args} {
 +      set opt [list]
 +
 +      while {1} {
 +              switch -- [lindex $args 0] {
 +              --nice {
 +                      _lappend_nice opt
 +              }
 +
 +              default {
 +                      break
 +              }
 +
 +              }
 +
 +              set args [lrange $args 1 end]
 +      }
 +
 +      set cmdp [_git_cmd [lindex $args 0]]
 +      set args [lrange $args 1 end]
 +
 +      _trace_exec [concat $opt $cmdp $args]
 +      return [open [concat [list | ] $opt $cmdp $args] w]
 +}
 +
 +proc githook_read {hook_name args} {
 +      set pchook [gitdir hooks $hook_name]
 +      lappend args 2>@1
 +
 +      # On Windows [file executable] might lie so we need to ask
 +      # the shell if the hook is executable.  Yes that's annoying.
 +      #
 +      if {[is_Windows]} {
 +              upvar #0 _sh interp
 +              if {![info exists interp]} {
 +                      set interp [_which sh]
 +              }
 +              if {$interp eq {}} {
 +                      error "hook execution requires sh (not in PATH)"
 +              }
 +
 +              set scr {if test -x "$1";then exec "$@";fi}
 +              set sh_c [list $interp -c $scr $interp $pchook]
 +              return [_open_stdout_stderr [concat $sh_c $args]]
 +      }
 +
 +      if {[file executable $pchook]} {
 +              return [_open_stdout_stderr [concat [list $pchook] $args]]
 +      }
 +
 +      return {}
 +}
 +
 +proc kill_file_process {fd} {
 +      set process [pid $fd]
 +
 +      catch {
 +              if {[is_Windows]} {
 +                      # Use a Cygwin-specific flag to allow killing
 +                      # native Windows processes
 +                      exec kill -f $process
 +              } else {
 +                      exec kill $process
 +              }
 +      }
 +}
 +
++proc gitattr {path attr default} {
++      if {[catch {set r [git check-attr $attr -- $path]}]} {
++              set r unspecified
++      } else {
++              set r [join [lrange [split $r :] 2 end] :]
++              regsub {^ } $r {} r
++      }
++      if {$r eq {unspecified}} {
++              return $default
++      }
++      return $r
++}
++
 +proc sq {value} {
 +      regsub -all ' $value "'\\''" value
 +      return "'$value'"
 +}
 +
 +proc load_current_branch {} {
 +      global current_branch is_detached
 +
 +      set fd [open [gitdir HEAD] r]
 +      if {[gets $fd ref] < 1} {
 +              set ref {}
 +      }
 +      close $fd
 +
 +      set pfx {ref: refs/heads/}
 +      set len [string length $pfx]
 +      if {[string equal -length $len $pfx $ref]} {
 +              # We're on a branch.  It might not exist.  But
 +              # HEAD looks good enough to be a branch.
 +              #
 +              set current_branch [string range $ref $len end]
 +              set is_detached 0
 +      } else {
 +              # Assume this is a detached head.
 +              #
 +              set current_branch HEAD
 +              set is_detached 1
 +      }
 +}
 +
 +auto_load tk_optionMenu
 +rename tk_optionMenu real__tkOptionMenu
 +proc tk_optionMenu {w varName args} {
 +      set m [eval real__tkOptionMenu $w $varName $args]
 +      $m configure -font font_ui
 +      $w configure -font font_ui
 +      return $m
 +}
 +
 +proc rmsel_tag {text} {
 +      $text tag conf sel \
 +              -background [$text cget -background] \
 +              -foreground [$text cget -foreground] \
 +              -borderwidth 0
 +      $text tag conf in_sel -background lightgray
 +      bind $text <Motion> break
 +      return $text
 +}
 +
 +set root_exists 0
 +bind . <Visibility> {
 +      bind . <Visibility> {}
 +      set root_exists 1
 +}
 +
 +if {[is_Windows]} {
 +      wm iconbitmap . -default $oguilib/git-gui.ico
 +}
 +
 +######################################################################
 +##
 +## config defaults
 +
 +set cursor_ptr arrow
 +font create font_diff -family Courier -size 10
 +font create font_ui
 +catch {
 +      label .dummy
 +      eval font configure font_ui [font actual [.dummy cget -font]]
 +      destroy .dummy
 +}
 +
 +font create font_uiitalic
 +font create font_uibold
 +font create font_diffbold
 +font create font_diffitalic
 +
 +foreach class {Button Checkbutton Entry Label
 +              Labelframe Listbox Menu Message
 +              Radiobutton Spinbox Text} {
 +      option add *$class.font font_ui
 +}
 +unset class
 +
 +if {[is_Windows] || [is_MacOSX]} {
 +      option add *Menu.tearOff 0
 +}
 +
 +if {[is_MacOSX]} {
 +      set M1B M1
 +      set M1T Cmd
 +} else {
 +      set M1B Control
 +      set M1T Ctrl
 +}
 +
 +proc bind_button3 {w cmd} {
 +      bind $w <Any-Button-3> $cmd
 +      if {[is_MacOSX]} {
 +              # Mac OS X sends Button-2 on right click through three-button mouse,
 +              # or through trackpad right-clicking (two-finger touch + click).
 +              bind $w <Any-Button-2> $cmd
 +              bind $w <Control-Button-1> $cmd
 +      }
 +}
 +
 +proc apply_config {} {
 +      global repo_config font_descs
 +
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set font [lindex $option 1]
 +              if {[catch {
 +                      set need_weight 1
 +                      foreach {cn cv} $repo_config(gui.$name) {
 +                              if {$cn eq {-weight}} {
 +                                      set need_weight 0
 +                              }
 +                              font configure $font $cn $cv
 +                      }
 +                      if {$need_weight} {
 +                              font configure $font -weight normal
 +                      }
 +                      } err]} {
 +                      error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
 +              }
 +              foreach {cn cv} [font configure $font] {
 +                      font configure ${font}bold $cn $cv
 +                      font configure ${font}italic $cn $cv
 +              }
 +              font configure ${font}bold -weight bold
 +              font configure ${font}italic -slant italic
 +      }
 +}
 +
 +set default_config(branch.autosetupmerge) true
 +set default_config(merge.tool) {}
 +set default_config(merge.keepbackup) true
 +set default_config(merge.diffstat) true
 +set default_config(merge.summary) false
 +set default_config(merge.verbosity) 2
 +set default_config(user.name) {}
 +set default_config(user.email) {}
 +
++set default_config(gui.encoding) [encoding system]
 +set default_config(gui.matchtrackingbranch) false
 +set default_config(gui.pruneduringfetch) false
 +set default_config(gui.trustmtime) false
 +set default_config(gui.fastcopyblame) false
 +set default_config(gui.copyblamethreshold) 40
 +set default_config(gui.blamehistoryctx) 7
 +set default_config(gui.diffcontext) 5
 +set default_config(gui.commitmsgwidth) 75
 +set default_config(gui.newbranchtemplate) {}
 +set default_config(gui.spellingdictionary) {}
 +set default_config(gui.fontui) [font configure font_ui]
 +set default_config(gui.fontdiff) [font configure font_diff]
 +set font_descs {
 +      {fontui   font_ui   {mc "Main Font"}}
 +      {fontdiff font_diff {mc "Diff/Console Font"}}
 +}
 +
 +######################################################################
 +##
 +## find git
 +
 +set _git  [_which git]
 +if {$_git eq {}} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message [mc "Cannot find git in PATH."]
 +      exit 1
 +}
 +
 +######################################################################
 +##
 +## version check
 +
 +if {[catch {set _git_version [git --version]} err]} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message "Cannot determine Git version:
 +
 +$err
 +
 +[appname] requires Git 1.5.0 or later."
 +      exit 1
 +}
 +if {![regsub {^git version } $_git_version {} _git_version]} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
 +      exit 1
 +}
 +
 +set _real_git_version $_git_version
 +regsub -- {[\-\.]dirty$} $_git_version {} _git_version
 +regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 +regsub {\.rc[0-9]+$} $_git_version {} _git_version
 +regsub {\.GIT$} $_git_version {} _git_version
 +regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
 +
 +if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
 +      catch {wm withdraw .}
 +      if {[tk_messageBox \
 +              -icon warning \
 +              -type yesno \
 +              -default no \
 +              -title "[appname]: warning" \
 +               -message [mc "Git version cannot be determined.
 +
 +%s claims it is version '%s'.
 +
 +%s requires at least Git 1.5.0 or later.
 +
 +Assume '%s' is version 1.5.0?
 +" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
 +              set _git_version 1.5.0
 +      } else {
 +              exit 1
 +      }
 +}
 +unset _real_git_version
 +
 +proc git-version {args} {
 +      global _git_version
 +
 +      switch [llength $args] {
 +      0 {
 +              return $_git_version
 +      }
 +
 +      2 {
 +              set op [lindex $args 0]
 +              set vr [lindex $args 1]
 +              set cm [package vcompare $_git_version $vr]
 +              return [expr $cm $op 0]
 +      }
 +
 +      4 {
 +              set type [lindex $args 0]
 +              set name [lindex $args 1]
 +              set parm [lindex $args 2]
 +              set body [lindex $args 3]
 +
 +              if {($type ne {proc} && $type ne {method})} {
 +                      error "Invalid arguments to git-version"
 +              }
 +              if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
 +                      error "Last arm of $type $name must be default"
 +              }
 +
 +              foreach {op vr cb} [lrange $body 0 end-2] {
 +                      if {[git-version $op $vr]} {
 +                              return [uplevel [list $type $name $parm $cb]]
 +                      }
 +              }
 +
 +              return [uplevel [list $type $name $parm [lindex $body end]]]
 +      }
 +
 +      default {
 +              error "git-version >= x"
 +      }
 +
 +      }
 +}
 +
 +if {[git-version < 1.5]} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message "[appname] requires Git 1.5.0 or later.
 +
 +You are using [git-version]:
 +
 +[git --version]"
 +      exit 1
 +}
 +
 +######################################################################
 +##
 +## configure our library
 +
 +set idx [file join $oguilib tclIndex]
 +if {[catch {set fd [open $idx r]} err]} {
 +      catch {wm withdraw .}
 +      tk_messageBox \
 +              -icon error \
 +              -type ok \
 +              -title [mc "git-gui: fatal error"] \
 +              -message $err
 +      exit 1
 +}
 +if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
 +      set idx [list]
 +      while {[gets $fd n] >= 0} {
 +              if {$n ne {} && ![string match #* $n]} {
 +                      lappend idx $n
 +              }
 +      }
 +} else {
 +      set idx {}
 +}
 +close $fd
 +
 +if {$idx ne {}} {
 +      set loaded [list]
 +      foreach p $idx {
 +              if {[lsearch -exact $loaded $p] >= 0} continue
 +              source [file join $oguilib $p]
 +              lappend loaded $p
 +      }
 +      unset loaded p
 +} else {
 +      set auto_path [concat [list $oguilib] $auto_path]
 +}
 +unset -nocomplain idx fd
 +
 +######################################################################
 +##
 +## config file parsing
 +
 +git-version proc _parse_config {arr_name args} {
 +      >= 1.5.3 {
 +              upvar $arr_name arr
 +              array unset arr
 +              set buf {}
 +              catch {
 +                      set fd_rc [eval \
 +                              [list git_read config] \
 +                              $args \
 +                              [list --null --list]]
 +                      fconfigure $fd_rc -translation binary
 +                      set buf [read $fd_rc]
 +                      close $fd_rc
 +              }
 +              foreach line [split $buf "\0"] {
 +                      if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
 +                              if {[is_many_config $name]} {
 +                                      lappend arr($name) $value
 +                              } else {
 +                                      set arr($name) $value
 +                              }
 +                      }
 +              }
 +      }
 +      default {
 +              upvar $arr_name arr
 +              array unset arr
 +              catch {
 +                      set fd_rc [eval [list git_read config --list] $args]
 +                      while {[gets $fd_rc line] >= 0} {
 +                              if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
 +                                      if {[is_many_config $name]} {
 +                                              lappend arr($name) $value
 +                                      } else {
 +                                              set arr($name) $value
 +                                      }
 +                              }
 +                      }
 +                      close $fd_rc
 +              }
 +      }
 +}
 +
 +proc load_config {include_global} {
 +      global repo_config global_config default_config
 +
 +      if {$include_global} {
 +              _parse_config global_config --global
 +      }
 +      _parse_config repo_config
 +
 +      foreach name [array names default_config] {
 +              if {[catch {set v $global_config($name)}]} {
 +                      set global_config($name) $default_config($name)
 +              }
 +              if {[catch {set v $repo_config($name)}]} {
 +                      set repo_config($name) $default_config($name)
 +              }
 +      }
 +}
 +
 +######################################################################
 +##
 +## feature option selection
 +
 +if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
 +      unset _junk
 +} else {
 +      set subcommand gui
 +}
 +if {$subcommand eq {gui.sh}} {
 +      set subcommand gui
 +}
 +if {$subcommand eq {gui} && [llength $argv] > 0} {
 +      set subcommand [lindex $argv 0]
 +      set argv [lrange $argv 1 end]
 +}
 +
 +enable_option multicommit
 +enable_option branch
 +enable_option transport
 +disable_option bare
 +
 +switch -- $subcommand {
 +browser -
 +blame {
 +      enable_option bare
 +
 +      disable_option multicommit
 +      disable_option branch
 +      disable_option transport
 +}
 +citool {
 +      enable_option singlecommit
++      enable_option retcode
 +
 +      disable_option multicommit
 +      disable_option branch
 +      disable_option transport
++
++      while {[llength $argv] > 0} {
++              set a [lindex $argv 0]
++              switch -- $a {
++              --amend {
++                      enable_option initialamend
++              }
++              --nocommit {
++                      enable_option nocommit
++                      enable_option nocommitmsg
++              }
++              --commitmsg {
++                      disable_option nocommitmsg
++              }
++              default {
++                      break
++              }
++              }
++
++              set argv [lrange $argv 1 end]
++      }
 +}
 +}
 +
 +######################################################################
 +##
 +## repository setup
 +
 +if {[catch {
 +              set _gitdir $env(GIT_DIR)
 +              set _prefix {}
 +              }]
 +      && [catch {
 +              set _gitdir [git rev-parse --git-dir]
 +              set _prefix [git rev-parse --show-prefix]
 +      } err]} {
 +      load_config 1
 +      apply_config
 +      choose_repository::pick
 +}
 +if {![file isdirectory $_gitdir] && [is_Cygwin]} {
 +      catch {set _gitdir [exec cygpath --windows $_gitdir]}
 +}
 +if {![file isdirectory $_gitdir]} {
 +      catch {wm withdraw .}
 +      error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
 +      exit 1
 +}
 +if {$_prefix ne {}} {
 +      regsub -all {[^/]+/} $_prefix ../ cdup
 +      if {[catch {cd $cdup} err]} {
 +              catch {wm withdraw .}
 +              error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
 +              exit 1
 +      }
 +      unset cdup
 +} elseif {![is_enabled bare]} {
 +      if {[lindex [file split $_gitdir] end] ne {.git}} {
 +              catch {wm withdraw .}
 +              error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
 +              exit 1
 +      }
 +      if {[catch {cd [file dirname $_gitdir]} err]} {
 +              catch {wm withdraw .}
 +              error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
 +              exit 1
 +      }
 +}
 +set _reponame [file split [file normalize $_gitdir]]
 +if {[lindex $_reponame end] eq {.git}} {
 +      set _reponame [lindex $_reponame end-1]
 +} else {
 +      set _reponame [lindex $_reponame end]
 +}
 +
 +######################################################################
 +##
 +## global init
 +
 +set current_diff_path {}
 +set current_diff_side {}
 +set diff_actions [list]
 +
 +set HEAD {}
 +set PARENT {}
 +set MERGE_HEAD [list]
 +set commit_type {}
 +set empty_tree {}
 +set current_branch {}
 +set is_detached 0
 +set current_diff_path {}
 +set is_3way_diff 0
++set is_conflict_diff 0
 +set selected_commit_type new
 +
++set nullid "0000000000000000000000000000000000000000"
++set nullid2 "0000000000000000000000000000000000000001"
++
 +######################################################################
 +##
 +## task management
 +
 +set rescan_active 0
 +set diff_active 0
 +set last_clicked {}
 +
 +set disable_on_lock [list]
 +set index_lock_type none
 +
 +proc lock_index {type} {
 +      global index_lock_type disable_on_lock
 +
 +      if {$index_lock_type eq {none}} {
 +              set index_lock_type $type
 +              foreach w $disable_on_lock {
 +                      uplevel #0 $w disabled
 +              }
 +              return 1
 +      } elseif {$index_lock_type eq "begin-$type"} {
 +              set index_lock_type $type
 +              return 1
 +      }
 +      return 0
 +}
 +
 +proc unlock_index {} {
 +      global index_lock_type disable_on_lock
 +
 +      set index_lock_type none
 +      foreach w $disable_on_lock {
 +              uplevel #0 $w normal
 +      }
 +}
 +
 +######################################################################
 +##
 +## status
 +
 +proc repository_state {ctvar hdvar mhvar} {
 +      global current_branch
 +      upvar $ctvar ct $hdvar hd $mhvar mh
 +
 +      set mh [list]
 +
 +      load_current_branch
 +      if {[catch {set hd [git rev-parse --verify HEAD]}]} {
 +              set hd {}
 +              set ct initial
 +              return
 +      }
 +
 +      set merge_head [gitdir MERGE_HEAD]
 +      if {[file exists $merge_head]} {
 +              set ct merge
 +              set fd_mh [open $merge_head r]
 +              while {[gets $fd_mh line] >= 0} {
 +                      lappend mh $line
 +              }
 +              close $fd_mh
 +              return
 +      }
 +
 +      set ct normal
 +}
 +
 +proc PARENT {} {
 +      global PARENT empty_tree
 +
 +      set p [lindex $PARENT 0]
 +      if {$p ne {}} {
 +              return $p
 +      }
 +      if {$empty_tree eq {}} {
 +              set empty_tree [git mktree << {}]
 +      }
 +      return $empty_tree
 +}
 +
++proc force_amend {} {
++      global selected_commit_type
++      global HEAD PARENT MERGE_HEAD commit_type
++
++      repository_state newType newHEAD newMERGE_HEAD
++      set HEAD $newHEAD
++      set PARENT $newHEAD
++      set MERGE_HEAD $newMERGE_HEAD
++      set commit_type $newType
++
++      set selected_commit_type amend
++      do_select_commit_type
++}
++
 +proc rescan {after {honor_trustmtime 1}} {
 +      global HEAD PARENT MERGE_HEAD commit_type
 +      global ui_index ui_workdir ui_comm
 +      global rescan_active file_states
 +      global repo_config
 +
 +      if {$rescan_active > 0 || ![lock_index read]} return
 +
 +      repository_state newType newHEAD newMERGE_HEAD
 +      if {[string match amend* $commit_type]
 +              && $newType eq {normal}
 +              && $newHEAD eq $HEAD} {
 +      } else {
 +              set HEAD $newHEAD
 +              set PARENT $newHEAD
 +              set MERGE_HEAD $newMERGE_HEAD
 +              set commit_type $newType
 +      }
 +
 +      array unset file_states
 +
 +      if {!$::GITGUI_BCK_exists &&
 +              (![$ui_comm edit modified]
 +              || [string trim [$ui_comm get 0.0 end]] eq {})} {
 +              if {[string match amend* $commit_type]} {
 +              } elseif {[load_message GITGUI_MSG]} {
++              } elseif {[run_prepare_commit_msg_hook]} {
 +              } elseif {[load_message MERGE_MSG]} {
 +              } elseif {[load_message SQUASH_MSG]} {
 +              }
 +              $ui_comm edit reset
 +              $ui_comm edit modified false
 +      }
 +
 +      if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
 +              rescan_stage2 {} $after
 +      } else {
 +              set rescan_active 1
 +              ui_status [mc "Refreshing file status..."]
 +              set fd_rf [git_read update-index \
 +                      -q \
 +                      --unmerged \
 +                      --ignore-missing \
 +                      --refresh \
 +                      ]
 +              fconfigure $fd_rf -blocking 0 -translation binary
 +              fileevent $fd_rf readable \
 +                      [list rescan_stage2 $fd_rf $after]
 +      }
 +}
 +
 +if {[is_Cygwin]} {
 +      set is_git_info_exclude {}
 +      proc have_info_exclude {} {
 +              global is_git_info_exclude
 +
 +              if {$is_git_info_exclude eq {}} {
 +                      if {[catch {exec test -f [gitdir info exclude]}]} {
 +                              set is_git_info_exclude 0
 +                      } else {
 +                              set is_git_info_exclude 1
 +                      }
 +              }
 +              return $is_git_info_exclude
 +      }
 +} else {
 +      proc have_info_exclude {} {
 +              return [file readable [gitdir info exclude]]
 +      }
 +}
 +
 +proc rescan_stage2 {fd after} {
 +      global rescan_active buf_rdi buf_rdf buf_rlo
 +
 +      if {$fd ne {}} {
 +              read $fd
 +              if {![eof $fd]} return
 +              close $fd
 +      }
 +
 +      set ls_others [list --exclude-per-directory=.gitignore]
 +      if {[have_info_exclude]} {
 +              lappend ls_others "--exclude-from=[gitdir info exclude]"
 +      }
 +      set user_exclude [get_config core.excludesfile]
 +      if {$user_exclude ne {} && [file readable $user_exclude]} {
 +              lappend ls_others "--exclude-from=$user_exclude"
 +      }
 +
 +      set buf_rdi {}
 +      set buf_rdf {}
 +      set buf_rlo {}
 +
 +      set rescan_active 3
 +      ui_status [mc "Scanning for modified files ..."]
 +      set fd_di [git_read diff-index --cached -z [PARENT]]
 +      set fd_df [git_read diff-files -z]
 +      set fd_lo [eval git_read ls-files --others -z $ls_others]
 +
 +      fconfigure $fd_di -blocking 0 -translation binary -encoding binary
 +      fconfigure $fd_df -blocking 0 -translation binary -encoding binary
 +      fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
 +      fileevent $fd_di readable [list read_diff_index $fd_di $after]
 +      fileevent $fd_df readable [list read_diff_files $fd_df $after]
 +      fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
 +}
 +
 +proc load_message {file} {
 +      global ui_comm
 +
 +      set f [gitdir $file]
 +      if {[file isfile $f]} {
 +              if {[catch {set fd [open $f r]}]} {
 +                      return 0
 +              }
 +              fconfigure $fd -eofchar {}
 +              set content [string trim [read $fd]]
 +              close $fd
 +              regsub -all -line {[ \r\t]+$} $content {} content
 +              $ui_comm delete 0.0 end
 +              $ui_comm insert end $content
 +              return 1
 +      }
 +      return 0
 +}
 +
++proc run_prepare_commit_msg_hook {} {
++      global pch_error
++
++      # prepare-commit-msg requires PREPARE_COMMIT_MSG exist.  From git-gui
++      # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
++      # empty file but existant file.
++
++      set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
++
++      if {[file isfile [gitdir MERGE_MSG]]} {
++              set pcm_source "merge"
++              set fd_mm [open [gitdir MERGE_MSG] r]
++              puts -nonewline $fd_pcm [read $fd_mm]
++              close $fd_mm
++      } elseif {[file isfile [gitdir SQUASH_MSG]]} {
++              set pcm_source "squash"
++              set fd_sm [open [gitdir SQUASH_MSG] r]
++              puts -nonewline $fd_pcm [read $fd_sm]
++              close $fd_sm
++      } else {
++              set pcm_source ""
++      }
++
++      close $fd_pcm
++
++      set fd_ph [githook_read prepare-commit-msg \
++                      [gitdir PREPARE_COMMIT_MSG] $pcm_source]
++      if {$fd_ph eq {}} {
++              catch {file delete [gitdir PREPARE_COMMIT_MSG]}
++              return 0;
++      }
++
++      ui_status [mc "Calling prepare-commit-msg hook..."]
++      set pch_error {}
++
++      fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
++      fileevent $fd_ph readable \
++              [list prepare_commit_msg_hook_wait $fd_ph]
++
++      return 1;
++}
++
++proc prepare_commit_msg_hook_wait {fd_ph} {
++      global pch_error
++
++      append pch_error [read $fd_ph]
++      fconfigure $fd_ph -blocking 1
++      if {[eof $fd_ph]} {
++              if {[catch {close $fd_ph}]} {
++                      ui_status [mc "Commit declined by prepare-commit-msg hook."]
++                      hook_failed_popup prepare-commit-msg $pch_error
++                      catch {file delete [gitdir PREPARE_COMMIT_MSG]}
++                      exit 1
++              } else {
++                      load_message PREPARE_COMMIT_MSG
++              }
++              set pch_error {}
++              catch {file delete [gitdir PREPARE_COMMIT_MSG]}
++              return
++        }
++      fconfigure $fd_ph -blocking 0
++      catch {file delete [gitdir PREPARE_COMMIT_MSG]}
++}
++
 +proc read_diff_index {fd after} {
 +      global buf_rdi
 +
 +      append buf_rdi [read $fd]
 +      set c 0
 +      set n [string length $buf_rdi]
 +      while {$c < $n} {
 +              set z1 [string first "\0" $buf_rdi $c]
 +              if {$z1 == -1} break
 +              incr z1
 +              set z2 [string first "\0" $buf_rdi $z1]
 +              if {$z2 == -1} break
 +
 +              incr c
 +              set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
 +              set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
 +              merge_state \
 +                      [encoding convertfrom $p] \
 +                      [lindex $i 4]? \
 +                      [list [lindex $i 0] [lindex $i 2]] \
 +                      [list]
 +              set c $z2
 +              incr c
 +      }
 +      if {$c < $n} {
 +              set buf_rdi [string range $buf_rdi $c end]
 +      } else {
 +              set buf_rdi {}
 +      }
 +
 +      rescan_done $fd buf_rdi $after
 +}
 +
 +proc read_diff_files {fd after} {
 +      global buf_rdf
 +
 +      append buf_rdf [read $fd]
 +      set c 0
 +      set n [string length $buf_rdf]
 +      while {$c < $n} {
 +              set z1 [string first "\0" $buf_rdf $c]
 +              if {$z1 == -1} break
 +              incr z1
 +              set z2 [string first "\0" $buf_rdf $z1]
 +              if {$z2 == -1} break
 +
 +              incr c
 +              set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
 +              set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
 +              merge_state \
 +                      [encoding convertfrom $p] \
 +                      ?[lindex $i 4] \
 +                      [list] \
 +                      [list [lindex $i 0] [lindex $i 2]]
 +              set c $z2
 +              incr c
 +      }
 +      if {$c < $n} {
 +              set buf_rdf [string range $buf_rdf $c end]
 +      } else {
 +              set buf_rdf {}
 +      }
 +
 +      rescan_done $fd buf_rdf $after
 +}
 +
 +proc read_ls_others {fd after} {
 +      global buf_rlo
 +
 +      append buf_rlo [read $fd]
 +      set pck [split $buf_rlo "\0"]
 +      set buf_rlo [lindex $pck end]
 +      foreach p [lrange $pck 0 end-1] {
 +              set p [encoding convertfrom $p]
 +              if {[string index $p end] eq {/}} {
 +                      set p [string range $p 0 end-1]
 +              }
 +              merge_state $p ?O
 +      }
 +      rescan_done $fd buf_rlo $after
 +}
 +
 +proc rescan_done {fd buf after} {
 +      global rescan_active current_diff_path
 +      global file_states repo_config
 +      upvar $buf to_clear
 +
 +      if {![eof $fd]} return
 +      set to_clear {}
 +      close $fd
 +      if {[incr rescan_active -1] > 0} return
 +
 +      prune_selection
 +      unlock_index
 +      display_all_files
 +      if {$current_diff_path ne {}} reshow_diff
 +      if {$current_diff_path eq {}} select_first_diff
 +
 +      uplevel #0 $after
 +}
 +
 +proc prune_selection {} {
 +      global file_states selected_paths
 +
 +      foreach path [array names selected_paths] {
 +              if {[catch {set still_here $file_states($path)}]} {
 +                      unset selected_paths($path)
 +              }
 +      }
 +}
 +
 +######################################################################
 +##
 +## ui helpers
 +
 +proc mapicon {w state path} {
 +      global all_icons
 +
 +      if {[catch {set r $all_icons($state$w)}]} {
 +              puts "error: no icon for $w state={$state} $path"
 +              return file_plain
 +      }
 +      return $r
 +}
 +
 +proc mapdesc {state path} {
 +      global all_descs
 +
 +      if {[catch {set r $all_descs($state)}]} {
 +              puts "error: no desc for state={$state} $path"
 +              return $state
 +      }
 +      return $r
 +}
 +
 +proc ui_status {msg} {
 +      global main_status
 +      if {[info exists main_status]} {
 +              $main_status show $msg
 +      }
 +}
 +
 +proc ui_ready {{test {}}} {
 +      global main_status
 +      if {[info exists main_status]} {
 +              $main_status show [mc "Ready."] $test
 +      }
 +}
 +
 +proc escape_path {path} {
 +      regsub -all {\\} $path "\\\\" path
 +      regsub -all "\n" $path "\\n" path
 +      return $path
 +}
 +
 +proc short_path {path} {
 +      return [escape_path [lindex [file split $path] end]]
 +}
 +
 +set next_icon_id 0
 +set null_sha1 [string repeat 0 40]
 +
 +proc merge_state {path new_state {head_info {}} {index_info {}}} {
 +      global file_states next_icon_id null_sha1
 +
 +      set s0 [string index $new_state 0]
 +      set s1 [string index $new_state 1]
 +
 +      if {[catch {set info $file_states($path)}]} {
 +              set state __
 +              set icon n[incr next_icon_id]
 +      } else {
 +              set state [lindex $info 0]
 +              set icon [lindex $info 1]
 +              if {$head_info eq {}}  {set head_info  [lindex $info 2]}
 +              if {$index_info eq {}} {set index_info [lindex $info 3]}
 +      }
 +
 +      if     {$s0 eq {?}} {set s0 [string index $state 0]} \
 +      elseif {$s0 eq {_}} {set s0 _}
 +
 +      if     {$s1 eq {?}} {set s1 [string index $state 1]} \
 +      elseif {$s1 eq {_}} {set s1 _}
 +
 +      if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
 +              set head_info [list 0 $null_sha1]
 +      } elseif {$s0 ne {_} && [string index $state 0] eq {_}
 +              && $head_info eq {}} {
 +              set head_info $index_info
 +      }
 +
 +      set file_states($path) [list $s0$s1 $icon \
 +              $head_info $index_info \
 +              ]
 +      return $state
 +}
 +
 +proc display_file_helper {w path icon_name old_m new_m} {
 +      global file_lists
 +
 +      if {$new_m eq {_}} {
 +              set lno [lsearch -sorted -exact $file_lists($w) $path]
 +              if {$lno >= 0} {
 +                      set file_lists($w) [lreplace $file_lists($w) $lno $lno]
 +                      incr lno
 +                      $w conf -state normal
 +                      $w delete $lno.0 [expr {$lno + 1}].0
 +                      $w conf -state disabled
 +              }
 +      } elseif {$old_m eq {_} && $new_m ne {_}} {
 +              lappend file_lists($w) $path
 +              set file_lists($w) [lsort -unique $file_lists($w)]
 +              set lno [lsearch -sorted -exact $file_lists($w) $path]
 +              incr lno
 +              $w conf -state normal
 +              $w image create $lno.0 \
 +                      -align center -padx 5 -pady 1 \
 +                      -name $icon_name \
 +                      -image [mapicon $w $new_m $path]
 +              $w insert $lno.1 "[escape_path $path]\n"
 +              $w conf -state disabled
 +      } elseif {$old_m ne $new_m} {
 +              $w conf -state normal
 +              $w image conf $icon_name -image [mapicon $w $new_m $path]
 +              $w conf -state disabled
 +      }
 +}
 +
 +proc display_file {path state} {
 +      global file_states selected_paths
 +      global ui_index ui_workdir
 +
 +      set old_m [merge_state $path $state]
 +      set s $file_states($path)
 +      set new_m [lindex $s 0]
 +      set icon_name [lindex $s 1]
 +
 +      set o [string index $old_m 0]
 +      set n [string index $new_m 0]
 +      if {$o eq {U}} {
 +              set o _
 +      }
 +      if {$n eq {U}} {
 +              set n _
 +      }
 +      display_file_helper     $ui_index $path $icon_name $o $n
 +
 +      if {[string index $old_m 0] eq {U}} {
 +              set o U
 +      } else {
 +              set o [string index $old_m 1]
 +      }
 +      if {[string index $new_m 0] eq {U}} {
 +              set n U
 +      } else {
 +              set n [string index $new_m 1]
 +      }
 +      display_file_helper     $ui_workdir $path $icon_name $o $n
 +
 +      if {$new_m eq {__}} {
 +              unset file_states($path)
 +              catch {unset selected_paths($path)}
 +      }
 +}
 +
 +proc display_all_files_helper {w path icon_name m} {
 +      global file_lists
 +
 +      lappend file_lists($w) $path
 +      set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
 +      $w image create end \
 +              -align center -padx 5 -pady 1 \
 +              -name $icon_name \
 +              -image [mapicon $w $m $path]
 +      $w insert end "[escape_path $path]\n"
 +}
 +
 +proc display_all_files {} {
 +      global ui_index ui_workdir
 +      global file_states file_lists
 +      global last_clicked
 +
 +      $ui_index conf -state normal
 +      $ui_workdir conf -state normal
 +
 +      $ui_index delete 0.0 end
 +      $ui_workdir delete 0.0 end
 +      set last_clicked {}
 +
 +      set file_lists($ui_index) [list]
 +      set file_lists($ui_workdir) [list]
 +
 +      foreach path [lsort [array names file_states]] {
 +              set s $file_states($path)
 +              set m [lindex $s 0]
 +              set icon_name [lindex $s 1]
 +
 +              set s [string index $m 0]
 +              if {$s ne {U} && $s ne {_}} {
 +                      display_all_files_helper $ui_index $path \
 +                              $icon_name $s
 +              }
 +
 +              if {[string index $m 0] eq {U}} {
 +                      set s U
 +              } else {
 +                      set s [string index $m 1]
 +              }
 +              if {$s ne {_}} {
 +                      display_all_files_helper $ui_workdir $path \
 +                              $icon_name $s
 +              }
 +      }
 +
 +      $ui_index conf -state disabled
 +      $ui_workdir conf -state disabled
 +}
 +
 +######################################################################
 +##
 +## icons
 +
 +set filemask {
 +#define mask_width 14
 +#define mask_height 15
 +static unsigned char mask_bits[] = {
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
 +}
 +
 +image create bitmap file_plain -background white -foreground black -data {
 +#define plain_width 14
 +#define plain_height 15
 +static unsigned char plain_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_mod -background white -foreground blue -data {
 +#define mod_width 14
 +#define mod_height 15
 +static unsigned char mod_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_fulltick -background white -foreground "#007000" -data {
 +#define file_fulltick_width 14
 +#define file_fulltick_height 15
 +static unsigned char file_fulltick_bits[] = {
 +   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
 +   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
 +   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_parttick -background white -foreground "#005050" -data {
 +#define parttick_width 14
 +#define parttick_height 15
 +static unsigned char parttick_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
 +   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
 +   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_question -background white -foreground black -data {
 +#define file_question_width 14
 +#define file_question_height 15
 +static unsigned char file_question_bits[] = {
 +   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
 +   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
 +   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_removed -background white -foreground red -data {
 +#define file_removed_width 14
 +#define file_removed_height 15
 +static unsigned char file_removed_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
 +   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
 +   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_merge -background white -foreground blue -data {
 +#define file_merge_width 14
 +#define file_merge_height 15
 +static unsigned char file_merge_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
 +   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_statechange -background white -foreground green -data {
 +#define file_merge_width 14
 +#define file_merge_height 15
 +static unsigned char file_statechange_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
 +   0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +set ui_index .vpane.files.index.list
 +set ui_workdir .vpane.files.workdir.list
 +
 +set all_icons(_$ui_index)   file_plain
 +set all_icons(A$ui_index)   file_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(T$ui_index)   file_statechange
 +
 +set all_icons(_$ui_workdir) file_plain
 +set all_icons(M$ui_workdir) file_mod
 +set all_icons(D$ui_workdir) file_question
 +set all_icons(U$ui_workdir) file_merge
 +set all_icons(O$ui_workdir) file_plain
 +set all_icons(T$ui_workdir) file_statechange
 +
 +set max_status_desc 0
 +foreach i {
 +              {__ {mc "Unmodified"}}
 +
 +              {_M {mc "Modified, not staged"}}
 +              {M_ {mc "Staged for commit"}}
 +              {MM {mc "Portions staged for commit"}}
 +              {MD {mc "Staged for commit, missing"}}
 +
 +              {_T {mc "File type changed, not staged"}}
 +              {T_ {mc "File type changed, staged"}}
 +
 +              {_O {mc "Untracked, not staged"}}
 +              {A_ {mc "Staged for commit"}}
 +              {AM {mc "Portions staged for commit"}}
 +              {AD {mc "Staged for commit, missing"}}
 +
 +              {_D {mc "Missing"}}
 +              {D_ {mc "Staged for removal"}}
 +              {DO {mc "Staged for removal, still present"}}
 +
 +              {_U {mc "Requires merge resolution"}}
 +              {U_ {mc "Requires merge resolution"}}
 +              {UU {mc "Requires merge resolution"}}
 +              {UM {mc "Requires merge resolution"}}
 +              {UD {mc "Requires merge resolution"}}
 +              {UT {mc "Requires merge resolution"}}
 +      } {
 +      set text [eval [lindex $i 1]]
 +      if {$max_status_desc < [string length $text]} {
 +              set max_status_desc [string length $text]
 +      }
 +      set all_descs([lindex $i 0]) $text
 +}
 +unset i
 +
 +######################################################################
 +##
 +## util
 +
 +proc scrollbar2many {list mode args} {
 +      foreach w $list {eval $w $mode $args}
 +}
 +
 +proc many2scrollbar {list mode sb top bottom} {
 +      $sb set $top $bottom
 +      foreach w $list {$w $mode moveto $top}
 +}
 +
 +proc incr_font_size {font {amt 1}} {
 +      set sz [font configure $font -size]
 +      incr sz $amt
 +      font configure $font -size $sz
 +      font configure ${font}bold -size $sz
 +      font configure ${font}italic -size $sz
 +}
 +
 +######################################################################
 +##
 +## ui commands
 +
 +set starting_gitk_msg [mc "Starting gitk... please wait..."]
 +
 +proc do_gitk {revs} {
 +      # -- Always start gitk through whatever we were loaded with.  This
 +      #    lets us bypass using shell process on Windows systems.
 +      #
 +      set exe [_which gitk -script]
 +      set cmd [list [info nameofexecutable] $exe]
 +      if {$exe eq {}} {
 +              error_popup [mc "Couldn't find gitk in PATH"]
 +      } else {
 +              global env
 +
 +              if {[info exists env(GIT_DIR)]} {
 +                      set old_GIT_DIR $env(GIT_DIR)
 +              } else {
 +                      set old_GIT_DIR {}
 +              }
 +
 +              set pwd [pwd]
 +              cd [file dirname [gitdir]]
 +              set env(GIT_DIR) [file tail [gitdir]]
 +
 +              eval exec $cmd $revs &
 +
 +              if {$old_GIT_DIR eq {}} {
 +                      unset env(GIT_DIR)
 +              } else {
 +                      set env(GIT_DIR) $old_GIT_DIR
 +              }
 +              cd $pwd
 +
 +              ui_status $::starting_gitk_msg
 +              after 10000 {
 +                      ui_ready $starting_gitk_msg
 +              }
 +      }
 +}
 +
 +set is_quitting 0
++set ret_code    1
++
++proc terminate_me {win} {
++      global ret_code
++      if {$win ne {.}} return
++      exit $ret_code
++}
 +
-       # Do not stage files with conflicts
++proc do_quit {{rc {1}}} {
 +      global ui_comm is_quitting repo_config commit_type
 +      global GITGUI_BCK_exists GITGUI_BCK_i
 +      global ui_comm_spell
++      global ret_code
 +
 +      if {$is_quitting} return
 +      set is_quitting 1
 +
 +      if {[winfo exists $ui_comm]} {
 +              # -- Stash our current commit buffer.
 +              #
 +              set save [gitdir GITGUI_MSG]
 +              if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
 +                      file rename -force [gitdir GITGUI_BCK] $save
 +                      set GITGUI_BCK_exists 0
 +              } else {
 +                      set msg [string trim [$ui_comm get 0.0 end]]
 +                      regsub -all -line {[ \r\t]+$} $msg {} msg
 +                      if {(![string match amend* $commit_type]
 +                              || [$ui_comm edit modified])
 +                              && $msg ne {}} {
 +                              catch {
 +                                      set fd [open $save w]
 +                                      puts -nonewline $fd $msg
 +                                      close $fd
 +                              }
 +                      } else {
 +                              catch {file delete $save}
 +                      }
 +              }
 +
 +              # -- Cancel our spellchecker if its running.
 +              #
 +              if {[info exists ui_comm_spell]} {
 +                      $ui_comm_spell stop
 +              }
 +
 +              # -- Remove our editor backup, its not needed.
 +              #
 +              after cancel $GITGUI_BCK_i
 +              if {$GITGUI_BCK_exists} {
 +                      catch {file delete [gitdir GITGUI_BCK]}
 +              }
 +
 +              # -- Stash our current window geometry into this repository.
 +              #
 +              set cfg_geometry [list]
 +              lappend cfg_geometry [wm geometry .]
 +              lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
 +              lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
 +              if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
 +                      set rc_geometry {}
 +              }
 +              if {$cfg_geometry ne $rc_geometry} {
 +                      catch {git config gui.geometry $cfg_geometry}
 +              }
 +      }
 +
++      set ret_code $rc
 +      destroy .
 +}
 +
 +proc do_rescan {} {
 +      rescan ui_ready
 +}
 +
 +proc ui_do_rescan {} {
 +      rescan {force_first_diff; ui_ready}
 +}
 +
 +proc do_commit {} {
 +      commit_tree
 +}
 +
 +proc next_diff {} {
 +      global next_diff_p next_diff_w next_diff_i
 +      show_diff $next_diff_p $next_diff_w {}
 +}
 +
 +proc find_anchor_pos {lst name} {
 +      set lid [lsearch -sorted -exact $lst $name]
 +
 +      if {$lid == -1} {
 +              set lid 0
 +              foreach lname $lst {
 +                      if {$lname >= $name} break
 +                      incr lid
 +              }
 +      }
 +
 +      return $lid
 +}
 +
 +proc find_file_from {flist idx delta path mmask} {
 +      global file_states
 +
 +      set len [llength $flist]
 +      while {$idx >= 0 && $idx < $len} {
 +              set name [lindex $flist $idx]
 +
 +              if {$name ne $path && [info exists file_states($name)]} {
 +                      set state [lindex $file_states($name) 0]
 +
 +                      if {$mmask eq {} || [regexp $mmask $state]} {
 +                              return $idx
 +                      }
 +              }
 +
 +              incr idx $delta
 +      }
 +
 +      return {}
 +}
 +
 +proc find_next_diff {w path {lno {}} {mmask {}}} {
 +      global next_diff_p next_diff_w next_diff_i
 +      global file_lists ui_index ui_workdir
 +
 +      set flist $file_lists($w)
 +      if {$lno eq {}} {
 +              set lno [find_anchor_pos $flist $path]
 +      } else {
 +              incr lno -1
 +      }
 +
 +      if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
 +              if {$w eq $ui_index} {
 +                      set mmask "^$mmask"
 +              } else {
 +                      set mmask "$mmask\$"
 +              }
 +      }
 +
 +      set idx [find_file_from $flist $lno 1 $path $mmask]
 +      if {$idx eq {}} {
 +              incr lno -1
 +              set idx [find_file_from $flist $lno -1 $path $mmask]
 +      }
 +
 +      if {$idx ne {}} {
 +              set next_diff_w $w
 +              set next_diff_p [lindex $flist $idx]
 +              set next_diff_i [expr {$idx+1}]
 +              return 1
 +      } else {
 +              return 0
 +      }
 +}
 +
 +proc next_diff_after_action {w path {lno {}} {mmask {}}} {
 +      global current_diff_path
 +
 +      if {$path ne $current_diff_path} {
 +              return {}
 +      } elseif {[find_next_diff $w $path $lno $mmask]} {
 +              return {next_diff;}
 +      } else {
 +              return {reshow_diff;}
 +      }
 +}
 +
 +proc select_first_diff {} {
 +      global ui_workdir
 +
 +      if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
 +          [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
 +              next_diff
 +      }
 +}
 +
 +proc force_first_diff {} {
 +      global current_diff_path
 +
 +      if {[info exists file_states($current_diff_path)]} {
 +              set state [lindex $file_states($current_diff_path) 0]
 +
 +              if {[string index $state 1] ne {O}} return
 +      }
 +
 +      select_first_diff
 +}
 +
 +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 {[string first {U} $state] >= 0} {
-               set col 1
-       }
- 
++      # Determine the state of the file
 +      if {[info exists file_states($path)]} {
 +              set state [lindex $file_states($path) 0]
 +      } else {
 +              set state {__}
 +      }
 +
-       .mbar.commit add radiobutton \
-               -label [mc "New Commit"] \
-               -command do_select_commit_type \
-               -variable selected_commit_type \
-               -value new
-       lappend disable_on_lock \
-               [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +      # Restage the file, or simply show the diff
 +      if {$col == 0 && $y > 1} {
++              # Conflicts need special handling
++              if {[string first {U} $state] >= 0} {
++                      merge_stage_workdir $path $w $lno
++                      return
++              }
++
 +              if {[string index $state 1] eq {O}} {
 +                      set mmask {}
 +              } else {
 +                      set mmask {[^O]}
 +              }
 +
 +              set after [next_diff_after_action $w $path $lno $mmask]
 +
 +              if {$w eq $ui_index} {
 +                      update_indexinfo \
 +                              "Unstaging [short_path $path] from commit" \
 +                              [list $path] \
 +                              [concat $after [list ui_ready]]
 +              } elseif {$w eq $ui_workdir} {
 +                      update_index \
 +                              "Adding [short_path $path]" \
 +                              [list $path] \
 +                              [concat $after [list ui_ready]]
 +              }
 +      } else {
 +              show_diff $path $w $lno
 +      }
 +}
 +
 +proc add_one_to_selection {w x y} {
 +      global file_lists last_clicked selected_paths
 +
 +      set lno [lindex [split [$w index @$x,$y] .] 0]
 +      set path [lindex $file_lists($w) [expr {$lno - 1}]]
 +      if {$path eq {}} {
 +              set last_clicked {}
 +              return
 +      }
 +
 +      if {$last_clicked ne {}
 +              && [lindex $last_clicked 0] ne $w} {
 +              array unset selected_paths
 +              [lindex $last_clicked 0] tag remove in_sel 0.0 end
 +      }
 +
 +      set last_clicked [list $w $lno]
 +      if {[catch {set in_sel $selected_paths($path)}]} {
 +              set in_sel 0
 +      }
 +      if {$in_sel} {
 +              unset selected_paths($path)
 +              $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
 +      } else {
 +              set selected_paths($path) 1
 +              $w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +      }
 +}
 +
 +proc add_range_to_selection {w x y} {
 +      global file_lists last_clicked selected_paths
 +
 +      if {[lindex $last_clicked 0] ne $w} {
 +              toggle_or_diff $w $x $y
 +              return
 +      }
 +
 +      set lno [lindex [split [$w index @$x,$y] .] 0]
 +      set lc [lindex $last_clicked 1]
 +      if {$lc < $lno} {
 +              set begin $lc
 +              set end $lno
 +      } else {
 +              set begin $lno
 +              set end $lc
 +      }
 +
 +      foreach path [lrange $file_lists($w) \
 +              [expr {$begin - 1}] \
 +              [expr {$end - 1}]] {
 +              set selected_paths($path) 1
 +      }
 +      $w tag add in_sel $begin.0 [expr {$end + 1}].0
 +}
 +
 +proc show_more_context {} {
 +      global repo_config
 +      if {$repo_config(gui.diffcontext) < 99} {
 +              incr repo_config(gui.diffcontext)
 +              reshow_diff
 +      }
 +}
 +
 +proc show_less_context {} {
 +      global repo_config
 +      if {$repo_config(gui.diffcontext) > 1} {
 +              incr repo_config(gui.diffcontext) -1
 +              reshow_diff
 +      }
 +}
 +
 +######################################################################
 +##
 +## ui construction
 +
 +load_config 0
 +apply_config
 +set ui_comm {}
 +
 +# -- Menu Bar
 +#
 +menu .mbar -tearoff 0
 +.mbar add cascade -label [mc Repository] -menu .mbar.repository
 +.mbar add cascade -label [mc Edit] -menu .mbar.edit
 +if {[is_enabled branch]} {
 +      .mbar add cascade -label [mc Branch] -menu .mbar.branch
 +}
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +      .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
 +}
 +if {[is_enabled transport]} {
 +      .mbar add cascade -label [mc Merge] -menu .mbar.merge
 +      .mbar add cascade -label [mc Remote] -menu .mbar.remote
 +}
 +. configure -menu .mbar
 +
 +# -- Repository Menu
 +#
 +menu .mbar.repository
 +
 +.mbar.repository add command \
 +      -label [mc "Browse Current Branch's Files"] \
 +      -command {browser::new $current_branch}
 +set ui_browse_current [.mbar.repository index last]
 +.mbar.repository add command \
 +      -label [mc "Browse Branch Files..."] \
 +      -command browser_open::dialog
 +.mbar.repository add separator
 +
 +.mbar.repository add command \
 +      -label [mc "Visualize Current Branch's History"] \
 +      -command {do_gitk $current_branch}
 +set ui_visualize_current [.mbar.repository index last]
 +.mbar.repository add command \
 +      -label [mc "Visualize All Branch History"] \
 +      -command {do_gitk --all}
 +.mbar.repository add separator
 +
 +proc current_branch_write {args} {
 +      global current_branch
 +      .mbar.repository entryconf $::ui_browse_current \
 +              -label [mc "Browse %s's Files" $current_branch]
 +      .mbar.repository entryconf $::ui_visualize_current \
 +              -label [mc "Visualize %s's History" $current_branch]
 +}
 +trace add variable current_branch write current_branch_write
 +
 +if {[is_enabled multicommit]} {
 +      .mbar.repository add command -label [mc "Database Statistics"] \
 +              -command do_stats
 +
 +      .mbar.repository add command -label [mc "Compress Database"] \
 +              -command do_gc
 +
 +      .mbar.repository add command -label [mc "Verify Database"] \
 +              -command do_fsck_objects
 +
 +      .mbar.repository add separator
 +
 +      if {[is_Cygwin]} {
 +              .mbar.repository add command \
 +                      -label [mc "Create Desktop Icon"] \
 +                      -command do_cygwin_shortcut
 +      } elseif {[is_Windows]} {
 +              .mbar.repository add command \
 +                      -label [mc "Create Desktop Icon"] \
 +                      -command do_windows_shortcut
 +      } elseif {[is_MacOSX]} {
 +              .mbar.repository add command \
 +                      -label [mc "Create Desktop Icon"] \
 +                      -command do_macosx_app
 +      }
 +}
 +
 +if {[is_MacOSX]} {
 +      proc ::tk::mac::Quit {args} { do_quit }
 +} else {
 +      .mbar.repository add command -label [mc Quit] \
 +              -command do_quit \
 +              -accelerator $M1T-Q
 +}
 +
 +# -- Edit Menu
 +#
 +menu .mbar.edit
 +.mbar.edit add command -label [mc Undo] \
 +      -command {catch {[focus] edit undo}} \
 +      -accelerator $M1T-Z
 +.mbar.edit add command -label [mc Redo] \
 +      -command {catch {[focus] edit redo}} \
 +      -accelerator $M1T-Y
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc Cut] \
 +      -command {catch {tk_textCut [focus]}} \
 +      -accelerator $M1T-X
 +.mbar.edit add command -label [mc Copy] \
 +      -command {catch {tk_textCopy [focus]}} \
 +      -accelerator $M1T-C
 +.mbar.edit add command -label [mc Paste] \
 +      -command {catch {tk_textPaste [focus]; [focus] see insert}} \
 +      -accelerator $M1T-V
 +.mbar.edit add command -label [mc Delete] \
 +      -command {catch {[focus] delete sel.first sel.last}} \
 +      -accelerator Del
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc "Select All"] \
 +      -command {catch {[focus] tag add sel 0.0 end}} \
 +      -accelerator $M1T-A
 +
 +# -- Branch Menu
 +#
 +if {[is_enabled branch]} {
 +      menu .mbar.branch
 +
 +      .mbar.branch add command -label [mc "Create..."] \
 +              -command branch_create::dialog \
 +              -accelerator $M1T-N
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label [mc "Checkout..."] \
 +              -command branch_checkout::dialog \
 +              -accelerator $M1T-O
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label [mc "Rename..."] \
 +              -command branch_rename::dialog
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label [mc "Delete..."] \
 +              -command branch_delete::dialog
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +
 +      .mbar.branch add command -label [mc "Reset..."] \
 +              -command merge::reset_hard
 +      lappend disable_on_lock [list .mbar.branch entryconf \
 +              [.mbar.branch index last] -state]
 +}
 +
 +# -- Commit Menu
 +#
++proc commit_btn_caption {} {
++      if {[is_enabled nocommit]} {
++              return [mc "Done"]
++      } else {
++              return [mc Commit@@verb]
++      }
++}
++
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +      menu .mbar.commit
 +
-       .mbar.commit add radiobutton \
-               -label [mc "Amend Last Commit"] \
-               -command do_select_commit_type \
-               -variable selected_commit_type \
-               -value amend
-       lappend disable_on_lock \
-               [list .mbar.commit entryconf [.mbar.commit index last] -state]
++      if {![is_enabled nocommit]} {
++              .mbar.commit add radiobutton \
++                      -label [mc "New Commit"] \
++                      -command do_select_commit_type \
++                      -variable selected_commit_type \
++                      -value new
++              lappend disable_on_lock \
++                      [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
-       .mbar.commit add separator
++              .mbar.commit add radiobutton \
++                      -label [mc "Amend Last Commit"] \
++                      -command do_select_commit_type \
++                      -variable selected_commit_type \
++                      -value amend
++              lappend disable_on_lock \
++                      [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
-       .mbar.commit add command -label [mc "Sign Off"] \
-               -command do_signoff \
-               -accelerator $M1T-S
++              .mbar.commit add separator
++      }
 +
 +      .mbar.commit add command -label [mc Rescan] \
 +              -command ui_do_rescan \
 +              -accelerator F5
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +      .mbar.commit add command -label [mc "Stage To Commit"] \
 +              -command do_add_selection \
 +              -accelerator $M1T-T
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +      .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
 +              -command do_add_all \
 +              -accelerator $M1T-I
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +      .mbar.commit add command -label [mc "Unstage From Commit"] \
 +              -command do_unstage_selection
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +      .mbar.commit add command -label [mc "Revert Changes"] \
 +              -command do_revert_selection
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +      .mbar.commit add separator
 +
 +      .mbar.commit add command -label [mc "Show Less Context"] \
 +              -command show_less_context \
 +              -accelerator $M1T-\-
 +
 +      .mbar.commit add command -label [mc "Show More Context"] \
 +              -command show_more_context \
 +              -accelerator $M1T-=
 +
 +      .mbar.commit add separator
 +
-       .mbar.commit add command -label [mc Commit@@verb] \
++      if {![is_enabled nocommit]} {
++              .mbar.commit add command -label [mc "Sign Off"] \
++                      -command do_signoff \
++                      -accelerator $M1T-S
++      }
 +
- button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
-       -command do_signoff
- pack .vpane.lower.commarea.buttons.signoff -side top -fill x
++      .mbar.commit add command -label [commit_btn_caption] \
 +              -command do_commit \
 +              -accelerator $M1T-Return
 +      lappend disable_on_lock \
 +              [list .mbar.commit entryconf [.mbar.commit index last] -state]
 +}
 +
 +# -- Merge Menu
 +#
 +if {[is_enabled branch]} {
 +      menu .mbar.merge
 +      .mbar.merge add command -label [mc "Local Merge..."] \
 +              -command merge::dialog \
 +              -accelerator $M1T-M
 +      lappend disable_on_lock \
 +              [list .mbar.merge entryconf [.mbar.merge index last] -state]
 +      .mbar.merge add command -label [mc "Abort Merge..."] \
 +              -command merge::reset_hard
 +      lappend disable_on_lock \
 +              [list .mbar.merge entryconf [.mbar.merge index last] -state]
 +}
 +
 +# -- Transport Menu
 +#
 +if {[is_enabled transport]} {
 +      menu .mbar.remote
 +
 +      .mbar.remote add command \
 +              -label [mc "Push..."] \
 +              -command do_push_anywhere \
 +              -accelerator $M1T-P
 +      .mbar.remote add command \
 +              -label [mc "Delete..."] \
 +              -command remote_branch_delete::dialog
 +}
 +
 +if {[is_MacOSX]} {
 +      # -- Apple Menu (Mac OS X only)
 +      #
 +      .mbar add cascade -label Apple -menu .mbar.apple
 +      menu .mbar.apple
 +
 +      .mbar.apple add command -label [mc "About %s" [appname]] \
 +              -command do_about
 +      .mbar.apple add separator
 +      .mbar.apple add command \
 +              -label [mc "Preferences..."] \
 +              -command do_options \
 +              -accelerator $M1T-,
 +      bind . <$M1B-,> do_options
 +} else {
 +      # -- Edit Menu
 +      #
 +      .mbar.edit add separator
 +      .mbar.edit add command -label [mc "Options..."] \
 +              -command do_options
 +}
 +
 +# -- Help Menu
 +#
 +.mbar add cascade -label [mc Help] -menu .mbar.help
 +menu .mbar.help
 +
 +if {![is_MacOSX]} {
 +      .mbar.help add command -label [mc "About %s" [appname]] \
 +              -command do_about
 +}
 +
 +set browser {}
 +catch {set browser $repo_config(instaweb.browser)}
 +set doc_path [file dirname [gitexec]]
 +set doc_path [file join $doc_path Documentation index.html]
 +
 +if {[is_Cygwin]} {
 +      set doc_path [exec cygpath --mixed $doc_path]
 +}
 +
 +if {$browser eq {}} {
 +      if {[is_MacOSX]} {
 +              set browser open
 +      } elseif {[is_Cygwin]} {
 +              set program_files [file dirname [exec cygpath --windir]]
 +              set program_files [file join $program_files {Program Files}]
 +              set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
 +              set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
 +              if {[file exists $firefox]} {
 +                      set browser $firefox
 +              } elseif {[file exists $ie]} {
 +                      set browser $ie
 +              }
 +              unset program_files firefox ie
 +      }
 +}
 +
 +if {[file isfile $doc_path]} {
 +      set doc_url "file:$doc_path"
 +} else {
 +      set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
 +}
 +
 +if {$browser ne {}} {
 +      .mbar.help add command -label [mc "Online Documentation"] \
 +              -command [list exec $browser $doc_url &]
 +}
 +unset browser doc_path doc_url
 +
 +# -- Standard bindings
 +#
 +wm protocol . WM_DELETE_WINDOW do_quit
 +bind all <$M1B-Key-q> do_quit
 +bind all <$M1B-Key-Q> do_quit
 +bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
 +bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
 +
 +set subcommand_args {}
 +proc usage {} {
 +      puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
 +      exit 1
 +}
 +
 +# -- Not a normal commit type invocation?  Do that instead!
 +#
 +switch -- $subcommand {
 +browser -
 +blame {
 +      if {$subcommand eq "blame"} {
 +              set subcommand_args {[--line=<num>] rev? path}
 +      } else {
 +              set subcommand_args {rev? path}
 +      }
 +      if {$argv eq {}} usage
 +      set head {}
 +      set path {}
 +      set jump_spec {}
 +      set is_path 0
 +      foreach a $argv {
 +              if {$is_path || [file exists $_prefix$a]} {
 +                      if {$path ne {}} usage
 +                      set path $_prefix$a
 +                      break
 +              } elseif {$a eq {--}} {
 +                      if {$path ne {}} {
 +                              if {$head ne {}} usage
 +                              set head $path
 +                              set path {}
 +                      }
 +                      set is_path 1
 +              } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
 +                      if {$jump_spec ne {} || $head ne {}} usage
 +                      set jump_spec [list $lnum]
 +              } elseif {$head eq {}} {
 +                      if {$head ne {}} usage
 +                      set head $a
 +                      set is_path 1
 +              } else {
 +                      usage
 +              }
 +      }
 +      unset is_path
 +
 +      if {$head ne {} && $path eq {}} {
 +              set path $_prefix$head
 +              set head {}
 +      }
 +
 +      if {$head eq {}} {
 +              load_current_branch
 +      } else {
 +              if {[regexp {^[0-9a-f]{1,39}$} $head]} {
 +                      if {[catch {
 +                                      set head [git rev-parse --verify $head]
 +                              } err]} {
 +                              puts stderr $err
 +                              exit 1
 +                      }
 +              }
 +              set current_branch $head
 +      }
 +
 +      switch -- $subcommand {
 +      browser {
 +              if {$jump_spec ne {}} usage
 +              if {$head eq {}} {
 +                      if {$path ne {} && [file isdirectory $path]} {
 +                              set head $current_branch
 +                      } else {
 +                              set head $path
 +                              set path {}
 +                      }
 +              }
 +              browser::new $head $path
 +      }
 +      blame   {
 +              if {$head eq {} && ![file exists $path]} {
 +                      puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
 +                      exit 1
 +              }
 +              blame::new $head $path $jump_spec
 +      }
 +      }
 +      return
 +}
 +citool -
 +gui {
 +      if {[llength $argv] != 0} {
 +              puts -nonewline stderr "usage: $argv0"
 +              if {$subcommand ne {gui}
 +                      && [file tail $argv0] ne "git-$subcommand"} {
 +                      puts -nonewline stderr " $subcommand"
 +              }
 +              puts stderr {}
 +              exit 1
 +      }
 +      # fall through to setup UI for commits
 +}
 +default {
 +      puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
 +      exit 1
 +}
 +}
 +
 +# -- Branch Control
 +#
 +frame .branch \
 +      -borderwidth 1 \
 +      -relief sunken
 +label .branch.l1 \
 +      -text [mc "Current Branch:"] \
 +      -anchor w \
 +      -justify left
 +label .branch.cb \
 +      -textvariable current_branch \
 +      -anchor w \
 +      -justify left
 +pack .branch.l1 -side left
 +pack .branch.cb -side left -fill x
 +pack .branch -side top -fill x
 +
 +# -- Main Window Layout
 +#
 +panedwindow .vpane -orient horizontal
 +panedwindow .vpane.files -orient vertical
 +.vpane add .vpane.files -sticky nsew -height 100 -width 200
 +pack .vpane -anchor n -side top -fill both -expand 1
 +
 +# -- Index File List
 +#
 +frame .vpane.files.index -height 100 -width 200
 +label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
 +      -background lightgreen -foreground black
 +text $ui_index -background white -foreground black \
 +      -borderwidth 0 \
 +      -width 20 -height 10 \
 +      -wrap none \
 +      -cursor $cursor_ptr \
 +      -xscrollcommand {.vpane.files.index.sx set} \
 +      -yscrollcommand {.vpane.files.index.sy set} \
 +      -state disabled
 +scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
 +scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
 +pack .vpane.files.index.title -side top -fill x
 +pack .vpane.files.index.sx -side bottom -fill x
 +pack .vpane.files.index.sy -side right -fill y
 +pack $ui_index -side left -fill both -expand 1
 +
 +# -- Working Directory File List
 +#
 +frame .vpane.files.workdir -height 100 -width 200
 +label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 +      -background lightsalmon -foreground black
 +text $ui_workdir -background white -foreground black \
 +      -borderwidth 0 \
 +      -width 20 -height 10 \
 +      -wrap none \
 +      -cursor $cursor_ptr \
 +      -xscrollcommand {.vpane.files.workdir.sx set} \
 +      -yscrollcommand {.vpane.files.workdir.sy set} \
 +      -state disabled
 +scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
 +scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
 +pack .vpane.files.workdir.title -side top -fill x
 +pack .vpane.files.workdir.sx -side bottom -fill x
 +pack .vpane.files.workdir.sy -side right -fill y
 +pack $ui_workdir -side left -fill both -expand 1
 +
 +.vpane.files add .vpane.files.workdir -sticky nsew
 +.vpane.files add .vpane.files.index -sticky nsew
 +
 +foreach i [list $ui_index $ui_workdir] {
 +      rmsel_tag $i
 +      $i tag conf in_diff -background [$i tag cget in_sel -background]
 +}
 +unset i
 +
 +# -- Diff and Commit Area
 +#
 +frame .vpane.lower -height 300 -width 400
 +frame .vpane.lower.commarea
 +frame .vpane.lower.diff -relief sunken -borderwidth 1
 +pack .vpane.lower.diff -fill both -expand 1
 +pack .vpane.lower.commarea -side bottom -fill x
 +.vpane add .vpane.lower -sticky nsew
 +
 +# -- Commit Area Buttons
 +#
 +frame .vpane.lower.commarea.buttons
 +label .vpane.lower.commarea.buttons.l -text {} \
 +      -anchor w \
 +      -justify left
 +pack .vpane.lower.commarea.buttons.l -side top -fill x
 +pack .vpane.lower.commarea.buttons -side left -fill y
 +
 +button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
 +      -command ui_do_rescan
 +pack .vpane.lower.commarea.buttons.rescan -side top -fill x
 +lappend disable_on_lock \
 +      {.vpane.lower.commarea.buttons.rescan conf -state}
 +
 +button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
 +      -command do_add_all
 +pack .vpane.lower.commarea.buttons.incall -side top -fill x
 +lappend disable_on_lock \
 +      {.vpane.lower.commarea.buttons.incall conf -state}
 +
- button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
++if {![is_enabled nocommit]} {
++      button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
++              -command do_signoff
++      pack .vpane.lower.commarea.buttons.signoff -side top -fill x
++}
 +
- button .vpane.lower.commarea.buttons.push -text [mc Push] \
-       -command do_push_anywhere
- pack .vpane.lower.commarea.buttons.push -side top -fill x
++button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
 +      -command do_commit
 +pack .vpane.lower.commarea.buttons.commit -side top -fill x
 +lappend disable_on_lock \
 +      {.vpane.lower.commarea.buttons.commit conf -state}
 +
- radiobutton .vpane.lower.commarea.buffer.header.new \
-       -text [mc "New Commit"] \
-       -command do_select_commit_type \
-       -variable selected_commit_type \
-       -value new
- lappend disable_on_lock \
-       [list .vpane.lower.commarea.buffer.header.new conf -state]
- radiobutton .vpane.lower.commarea.buffer.header.amend \
-       -text [mc "Amend Last Commit"] \
-       -command do_select_commit_type \
-       -variable selected_commit_type \
-       -value amend
- lappend disable_on_lock \
-       [list .vpane.lower.commarea.buffer.header.amend conf -state]
++if {![is_enabled nocommit]} {
++      button .vpane.lower.commarea.buttons.push -text [mc Push] \
++              -command do_push_anywhere
++      pack .vpane.lower.commarea.buttons.push -side top -fill x
++}
 +
 +# -- Commit Message Buffer
 +#
 +frame .vpane.lower.commarea.buffer
 +frame .vpane.lower.commarea.buffer.header
 +set ui_comm .vpane.lower.commarea.buffer.t
 +set ui_coml .vpane.lower.commarea.buffer.header.l
- pack .vpane.lower.commarea.buffer.header.amend -side right
- pack .vpane.lower.commarea.buffer.header.new -side right
++
++if {![is_enabled nocommit]} {
++      radiobutton .vpane.lower.commarea.buffer.header.new \
++              -text [mc "New Commit"] \
++              -command do_select_commit_type \
++              -variable selected_commit_type \
++              -value new
++      lappend disable_on_lock \
++              [list .vpane.lower.commarea.buffer.header.new conf -state]
++      radiobutton .vpane.lower.commarea.buffer.header.amend \
++              -text [mc "Amend Last Commit"] \
++              -command do_select_commit_type \
++              -variable selected_commit_type \
++              -value amend
++      lappend disable_on_lock \
++              [list .vpane.lower.commarea.buffer.header.amend conf -state]
++}
++
 +label $ui_coml \
 +      -anchor w \
 +      -justify left
 +proc trace_commit_type {varname args} {
 +      global ui_coml commit_type
 +      switch -glob -- $commit_type {
 +      initial       {set txt [mc "Initial Commit Message:"]}
 +      amend         {set txt [mc "Amended Commit Message:"]}
 +      amend-initial {set txt [mc "Amended Initial Commit Message:"]}
 +      amend-merge   {set txt [mc "Amended Merge Commit Message:"]}
 +      merge         {set txt [mc "Merge Commit Message:"]}
 +      *             {set txt [mc "Commit Message:"]}
 +      }
 +      $ui_coml conf -text $txt
 +}
 +trace add variable commit_type write trace_commit_type
 +pack $ui_coml -side left -fill x
- after 1 do_rescan
++
++if {![is_enabled nocommit]} {
++      pack .vpane.lower.commarea.buffer.header.amend -side right
++      pack .vpane.lower.commarea.buffer.header.new -side right
++}
 +
 +text $ui_comm -background white -foreground black \
 +      -borderwidth 1 \
 +      -undo true \
 +      -maxundo 20 \
 +      -autoseparators true \
 +      -relief sunken \
 +      -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
 +      -font font_diff \
 +      -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 +scrollbar .vpane.lower.commarea.buffer.sby \
 +      -command [list $ui_comm yview]
 +pack .vpane.lower.commarea.buffer.header -side top -fill x
 +pack .vpane.lower.commarea.buffer.sby -side right -fill y
 +pack $ui_comm -side left -fill y
 +pack .vpane.lower.commarea.buffer -side left -fill y
 +
 +# -- Commit Message Buffer Context Menu
 +#
 +set ctxm .vpane.lower.commarea.buffer.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +      -label [mc Cut] \
 +      -command {tk_textCut $ui_comm}
 +$ctxm add command \
 +      -label [mc Copy] \
 +      -command {tk_textCopy $ui_comm}
 +$ctxm add command \
 +      -label [mc Paste] \
 +      -command {tk_textPaste $ui_comm}
 +$ctxm add command \
 +      -label [mc Delete] \
 +      -command {$ui_comm delete sel.first sel.last}
 +$ctxm add separator
 +$ctxm add command \
 +      -label [mc "Select All"] \
 +      -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
 +$ctxm add command \
 +      -label [mc "Copy All"] \
 +      -command {
 +              $ui_comm tag add sel 0.0 end
 +              tk_textCopy $ui_comm
 +              $ui_comm tag remove sel 0.0 end
 +      }
 +$ctxm add separator
 +$ctxm add command \
 +      -label [mc "Sign Off"] \
 +      -command do_signoff
 +set ui_comm_ctxm $ctxm
 +
 +# -- Diff Header
 +#
 +proc trace_current_diff_path {varname args} {
 +      global current_diff_path diff_actions file_states
 +      if {$current_diff_path eq {}} {
 +              set s {}
 +              set f {}
 +              set p {}
 +              set o disabled
 +      } else {
 +              set p $current_diff_path
 +              set s [mapdesc [lindex $file_states($p) 0] $p]
 +              set f [mc "File:"]
 +              set p [escape_path $p]
 +              set o normal
 +      }
 +
 +      .vpane.lower.diff.header.status configure -text $s
 +      .vpane.lower.diff.header.file configure -text $f
 +      .vpane.lower.diff.header.path configure -text $p
 +      foreach w $diff_actions {
 +              uplevel #0 $w $o
 +      }
 +}
 +trace add variable current_diff_path write trace_current_diff_path
 +
 +frame .vpane.lower.diff.header -background gold
 +label .vpane.lower.diff.header.status \
 +      -background gold \
 +      -foreground black \
 +      -width $max_status_desc \
 +      -anchor w \
 +      -justify left
 +label .vpane.lower.diff.header.file \
 +      -background gold \
 +      -foreground black \
 +      -anchor w \
 +      -justify left
 +label .vpane.lower.diff.header.path \
 +      -background gold \
 +      -foreground black \
 +      -anchor w \
 +      -justify left
 +pack .vpane.lower.diff.header.status -side left
 +pack .vpane.lower.diff.header.file -side left
 +pack .vpane.lower.diff.header.path -fill x
 +set ctxm .vpane.lower.diff.header.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +      -label [mc Copy] \
 +      -command {
 +              clipboard clear
 +              clipboard append \
 +                      -format STRING \
 +                      -type STRING \
 +                      -- $current_diff_path
 +      }
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
 +
 +# -- Diff Body
 +#
 +frame .vpane.lower.diff.body
 +set ui_diff .vpane.lower.diff.body.t
 +text $ui_diff -background white -foreground black \
 +      -borderwidth 0 \
 +      -width 80 -height 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
 +#
 +
 +proc create_common_diff_popup {ctxm} {
 +      $ctxm add command \
 +              -label [mc "Show Less Context"] \
 +              -command show_less_context
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add command \
 +              -label [mc "Show More Context"] \
 +              -command show_more_context
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add separator
 +      $ctxm add command \
 +              -label [mc Refresh] \
 +              -command reshow_diff
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add command \
 +              -label [mc Copy] \
 +              -command {tk_textCopy $ui_diff}
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add command \
 +              -label [mc "Select All"] \
 +              -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add command \
 +              -label [mc "Copy All"] \
 +              -command {
 +                      $ui_diff tag add sel 0.0 end
 +                      tk_textCopy $ui_diff
 +                      $ui_diff tag remove sel 0.0 end
 +              }
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add separator
 +      $ctxm add command \
 +              -label [mc "Decrease Font Size"] \
 +              -command {incr_font_size font_diff -1}
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add command \
 +              -label [mc "Increase Font Size"] \
 +              -command {incr_font_size font_diff 1}
 +      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +      $ctxm add separator
++      set emenu $ctxm.enc
++      menu $emenu
++      build_encoding_menu $emenu [list force_diff_encoding]
++      $ctxm add cascade \
++              -label [mc "Encoding"] \
++              -menu $emenu
++      lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
++      $ctxm add separator
 +      $ctxm add command -label [mc "Options..."] \
 +              -command do_options
 +}
 +
 +set ctxm .vpane.lower.diff.body.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +      -label [mc "Apply/Reverse Hunk"] \
 +      -command {apply_hunk $cursorX $cursorY}
 +set ui_diff_applyhunk [$ctxm index last]
 +lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
 +$ctxm add command \
 +      -label [mc "Apply/Reverse Line"] \
 +      -command {apply_line $cursorX $cursorY; do_rescan}
 +set ui_diff_applyline [$ctxm index last]
 +lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
 +$ctxm add separator
 +create_common_diff_popup $ctxm
 +
 +set ctxmmg .vpane.lower.diff.body.ctxmmg
 +menu $ctxmmg -tearoff 0
 +$ctxmmg add command \
 +      -label [mc "Run Merge Tool"] \
 +      -command {merge_resolve_tool}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add separator
 +$ctxmmg add command \
 +      -label [mc "Use Remote Version"] \
 +      -command {merge_resolve_one 3}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add command \
 +      -label [mc "Use Local Version"] \
 +      -command {merge_resolve_one 2}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add command \
 +      -label [mc "Revert To Base"] \
 +      -command {merge_resolve_one 1}
 +lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
 +$ctxmmg add separator
 +create_common_diff_popup $ctxmmg
 +
 +proc popup_diff_menu {ctxm ctxmmg x y X Y} {
 +      global current_diff_path file_states
 +      set ::cursorX $x
 +      set ::cursorY $y
 +      if {[info exists file_states($current_diff_path)]} {
 +              set state [lindex $file_states($current_diff_path) 0]
 +      } else {
 +              set state {__}
 +      }
 +      if {[string first {U} $state] >= 0} {
 +              tk_popup $ctxmmg $X $Y
 +      } else {
 +              if {$::ui_index eq $::current_diff_side} {
 +                      set l [mc "Unstage Hunk From Commit"]
 +                      set t [mc "Unstage Line From Commit"]
 +              } else {
 +                      set l [mc "Stage Hunk For Commit"]
 +                      set t [mc "Stage Line For Commit"]
 +              }
 +              if {$::is_3way_diff
 +                      || $current_diff_path eq {}
 +                      || {__} eq $state
 +                      || {_O} eq $state
 +                      || {_T} eq $state
 +                      || {T_} eq $state} {
 +                      set s disabled
 +              } else {
 +                      set s normal
 +              }
 +              $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
 +              $ctxm entryconf $::ui_diff_applyline -state $s -label $t
 +              tk_popup $ctxm $X $Y
 +      }
 +}
 +bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y]
 +
 +# -- Status Bar
 +#
 +set main_status [::status_bar::new .status]
 +pack .status -anchor w -side bottom -fill x
 +$main_status show [mc "Initializing..."]
 +
 +# -- Load geometry
 +#
 +catch {
 +set gm $repo_config(gui.geometry)
 +wm geometry . [lindex $gm 0]
 +.vpane sash place 0 \
 +      [lindex $gm 1] \
 +      [lindex [.vpane sash coord 0] 1]
 +.vpane.files sash place 0 \
 +      [lindex [.vpane.files sash coord 0] 0] \
 +      [lindex $gm 2]
 +unset gm
 +}
 +
 +# -- Key Bindings
 +#
 +bind $ui_comm <$M1B-Key-Return> {do_commit;break}
 +bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-i> {do_add_all;break}
 +bind $ui_comm <$M1B-Key-I> {do_add_all;break}
 +bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
 +bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
 +bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
 +bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
 +bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
 +bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
 +bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
 +bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
 +bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
 +bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
 +bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
 +bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
 +bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
 +
 +bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-v> {break}
 +bind $ui_diff <$M1B-Key-V> {break}
 +bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
 +bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
 +bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
 +bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
 +bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
 +bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
 +bind $ui_diff <Key-k>         {catch {%W yview scroll -1 units};break}
 +bind $ui_diff <Key-j>         {catch {%W yview scroll  1 units};break}
 +bind $ui_diff <Key-h>         {catch {%W xview scroll -1 units};break}
 +bind $ui_diff <Key-l>         {catch {%W xview scroll  1 units};break}
 +bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
 +bind $ui_diff <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 +bind $ui_diff <Button-1>   {focus %W}
 +
 +if {[is_enabled branch]} {
 +      bind . <$M1B-Key-n> branch_create::dialog
 +      bind . <$M1B-Key-N> branch_create::dialog
 +      bind . <$M1B-Key-o> branch_checkout::dialog
 +      bind . <$M1B-Key-O> branch_checkout::dialog
 +      bind . <$M1B-Key-m> merge::dialog
 +      bind . <$M1B-Key-M> merge::dialog
 +}
 +if {[is_enabled transport]} {
 +      bind . <$M1B-Key-p> do_push_anywhere
 +      bind . <$M1B-Key-P> do_push_anywhere
 +}
 +
 +bind .   <Key-F5>     ui_do_rescan
 +bind .   <$M1B-Key-r> ui_do_rescan
 +bind .   <$M1B-Key-R> ui_do_rescan
 +bind .   <$M1B-Key-s> do_signoff
 +bind .   <$M1B-Key-S> do_signoff
 +bind .   <$M1B-Key-t> do_add_selection
 +bind .   <$M1B-Key-T> do_add_selection
 +bind .   <$M1B-Key-i> do_add_all
 +bind .   <$M1B-Key-I> do_add_all
 +bind .   <$M1B-Key-minus> {show_less_context;break}
 +bind .   <$M1B-Key-KP_Subtract> {show_less_context;break}
 +bind .   <$M1B-Key-equal> {show_more_context;break}
 +bind .   <$M1B-Key-plus> {show_more_context;break}
 +bind .   <$M1B-Key-KP_Add> {show_more_context;break}
 +bind .   <$M1B-Key-Return> do_commit
 +foreach i [list $ui_index $ui_workdir] {
 +      bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
 +      bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
 +      bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
 +}
 +unset i
 +
 +set file_lists($ui_index) [list]
 +set file_lists($ui_workdir) [list]
 +
 +wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
 +focus -force $ui_comm
 +
 +# -- Warn the user about environmental problems.  Cygwin's Tcl
 +#    does *not* pass its env array onto any processes it spawns.
 +#    This means that git processes get none of our environment.
 +#
 +if {[is_Cygwin]} {
 +      set ignored_env 0
 +      set suggest_user {}
 +      set msg [mc "Possible environment issues exist.
 +
 +The following environment variables are probably
 +going to be ignored by any Git subprocess run
 +by %s:
 +
 +" [appname]]
 +      foreach name [array names env] {
 +              switch -regexp -- $name {
 +              {^GIT_INDEX_FILE$} -
 +              {^GIT_OBJECT_DIRECTORY$} -
 +              {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
 +              {^GIT_DIFF_OPTS$} -
 +              {^GIT_EXTERNAL_DIFF$} -
 +              {^GIT_PAGER$} -
 +              {^GIT_TRACE$} -
 +              {^GIT_CONFIG$} -
 +              {^GIT_CONFIG_LOCAL$} -
 +              {^GIT_(AUTHOR|COMMITTER)_DATE$} {
 +                      append msg " - $name\n"
 +                      incr ignored_env
 +              }
 +              {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
 +                      append msg " - $name\n"
 +                      incr ignored_env
 +                      set suggest_user $name
 +              }
 +              }
 +      }
 +      if {$ignored_env > 0} {
 +              append msg [mc "
 +This is due to a known issue with the
 +Tcl binary distributed by Cygwin."]
 +
 +              if {$suggest_user ne {}} {
 +                      append msg [mc "
 +
 +A good replacement for %s
 +is placing values for the user.name and
 +user.email settings into your personal
 +~/.gitconfig file.
 +" $suggest_user]
 +              }
 +              warn_popup $msg
 +      }
 +      unset ignored_env msg suggest_user name
 +}
 +
 +# -- Only initialize complex UI if we are going to stay running.
 +#
 +if {[is_enabled transport]} {
 +      load_all_remotes
 +
 +      set n [.mbar.remote index end]
 +      populate_push_menu
 +      populate_fetch_menu
 +      set n [expr {[.mbar.remote index end] - $n}]
 +      if {$n > 0} {
 +              if {[.mbar.remote type 0] eq "tearoff"} { incr n }
 +              .mbar.remote insert $n separator
 +      }
 +      unset n
 +}
 +
 +if {[winfo exists $ui_comm]} {
 +      set GITGUI_BCK_exists [load_message GITGUI_BCK]
 +
 +      # -- If both our backup and message files exist use the
 +      #    newer of the two files to initialize the buffer.
 +      #
 +      if {$GITGUI_BCK_exists} {
 +              set m [gitdir GITGUI_MSG]
 +              if {[file isfile $m]} {
 +                      if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
 +                              catch {file delete [gitdir GITGUI_MSG]}
 +                      } else {
 +                              $ui_comm delete 0.0 end
 +                              $ui_comm edit reset
 +                              $ui_comm edit modified false
 +                              catch {file delete [gitdir GITGUI_BCK]}
 +                              set GITGUI_BCK_exists 0
 +                      }
 +              }
 +              unset m
 +      }
 +
 +      proc backup_commit_buffer {} {
 +              global ui_comm GITGUI_BCK_exists
 +
 +              set m [$ui_comm edit modified]
 +              if {$m || $GITGUI_BCK_exists} {
 +                      set msg [string trim [$ui_comm get 0.0 end]]
 +                      regsub -all -line {[ \r\t]+$} $msg {} msg
 +
 +                      if {$msg eq {}} {
 +                              if {$GITGUI_BCK_exists} {
 +                                      catch {file delete [gitdir GITGUI_BCK]}
 +                                      set GITGUI_BCK_exists 0
 +                              }
 +                      } elseif {$m} {
 +                              catch {
 +                                      set fd [open [gitdir GITGUI_BCK] w]
 +                                      puts -nonewline $fd $msg
 +                                      close $fd
 +                                      set GITGUI_BCK_exists 1
 +                              }
 +                      }
 +
 +                      $ui_comm edit modified false
 +              }
 +
 +              set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
 +      }
 +
 +      backup_commit_buffer
 +
 +      # -- If the user has aspell available we can drive it
 +      #    in pipe mode to spellcheck the commit message.
 +      #
 +      set spell_cmd [list |]
 +      set spell_dict [get_config gui.spellingdictionary]
 +      lappend spell_cmd aspell
 +      if {$spell_dict ne {}} {
 +              lappend spell_cmd --master=$spell_dict
 +      }
 +      lappend spell_cmd --mode=none
 +      lappend spell_cmd --encoding=utf-8
 +      lappend spell_cmd pipe
 +      if {$spell_dict eq {none}
 +       || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
 +              bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
 +      } else {
 +              set ui_comm_spell [spellcheck::init \
 +                      $spell_fd \
 +                      $ui_comm \
 +                      $ui_comm_ctxm \
 +              ]
 +      }
 +      unset -nocomplain spell_cmd spell_fd spell_err spell_dict
 +}
 +
 +lock_index begin-read
 +if {![winfo ismapped .]} {
 +      wm deiconify .
 +}
++after 1 {
++      if {[is_enabled initialamend]} {
++              force_amend
++      } else {
++              do_rescan
++      }
++
++      if {[is_enabled nocommitmsg]} {
++              $ui_comm configure -state disabled -background gray
++      }
++}
 +if {[is_enabled multicommit]} {
 +      after 1000 hint_gc
 +}
++if {[is_enabled retcode]} {
++      bind . <Destroy> {+terminate_me %W}
++}

diff --cc git-gui/lib/blame.tcl
index 827c85d67f0b0f18d22b1399624e6819cf93f23f,0000000000000000000000000000000000000000..eb61374d2db79a1199d455dfdda85e2d063bf1f6
mode 100644,000000..100644
--- 1/git-gui/lib/blame.tcl
--- /dev/null
+++ b/git-gui/lib/blame.tcl
@@@ -1,1212 -1,0 +1,1249 @@@
-       fconfigure $fd -blocking 0 -translation lf -encoding binary
 +# 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
 +}
 +
 +# Current blame data; cleared/reset on each load
 +#
 +field commit               ; # input commit to blame
 +field path                 ; # input filename to view in $commit
 +
 +field current_fd        {} ; # background process running
 +field highlight_line    -1 ; # current line selected
 +field highlight_column  {} ; # current commit column selected
 +field highlight_commit  {} ; # sha1 of commit selected
 +
 +field total_lines       0  ; # total length of file
 +field blame_lines       0  ; # number of lines computed
 +field amov_data            ; # list of {commit origfile origline}
 +field asim_data            ; # list of {commit origfile origline}
 +
 +field r_commit             ; # commit currently being parsed
 +field r_orig_line          ; # original line number
 +field r_final_line         ; # final line number
 +field r_line_count         ; # lines in this region
 +
 +field tooltip_wm        {} ; # Current tooltip toplevel, if open
 +field tooltip_t         {} ; # Text widget in $tooltip_wm
 +field tooltip_timer     {} ; # Current timer event for our tooltip
 +field tooltip_commit    {} ; # Commit(s) in tooltip
 +
 +constructor new {i_commit i_path i_jump} {
 +      global cursor_ptr
 +      variable active_color
 +      variable group_colors
 +
 +      set commit $i_commit
 +      set path   $i_path
 +
 +      make_toplevel top w
 +      wm title $top [append "[appname] ([reponame]): " [mc "File Viewer"]]
 +
 +      frame $w.header -background gold
 +      label $w.header.commit_l \
 +              -text [mc "Commit:"] \
 +              -background gold \
 +              -foreground black \
 +              -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 \
 +              -foreground black \
 +              -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 \
 +              -foreground black \
 +              -anchor w \
 +              -justify left
 +      label $w.header.path_l \
 +              -text [mc "File:"] \
 +              -background gold \
 +              -foreground black \
 +              -anchor w \
 +              -justify left
 +      set w_path $w.header.path
 +      label $w_path \
 +              -background gold \
 +              -foreground black \
 +              -anchor w \
 +              -justify left
 +      pack $w.header.commit_l -side left
 +      pack $w_back -side left
 +      pack $w.header.commit -side left
 +      pack $w_path -fill x -side right
 +      pack $w.header.path_l -side right
 +
 +      panedwindow $w.file_pane -orient vertical
 +      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 \
 +              -foreground black \
 +              -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 6 \
 +              -font font_diff
 +      $w_line tag conf linenumber -justify right -rmargin 5
 +
 +      set w_amov $w.file_pane.out.amove_t
 +      text $w_amov \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white \
 +              -foreground black \
 +              -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 5 \
 +              -font font_diff
 +      $w_amov tag conf author_abbr -justify right -rmargin 5
 +      $w_amov tag conf curr_commit
 +      $w_amov tag conf prior_commit -foreground blue -underline 1
 +      $w_amov tag bind prior_commit \
 +              <Button-1> \
 +              "[cb _load_commit $w_amov @amov_data @%x,%y];break"
 +
 +      set w_asim $w.file_pane.out.asimple_t
 +      text $w_asim \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white \
 +              -foreground black \
 +              -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 4 \
 +              -font font_diff
 +      $w_asim tag conf author_abbr -justify right
 +      $w_asim tag conf curr_commit
 +      $w_asim tag conf prior_commit -foreground blue -underline 1
 +      $w_asim tag bind prior_commit \
 +              <Button-1> \
 +              "[cb _load_commit $w_asim @asim_data @%x,%y];break"
 +
 +      set w_file $w.file_pane.out.file_t
 +      text $w_file \
 +              -takefocus 0 \
 +              -highlightthickness 0 \
 +              -padx 0 -pady 0 \
 +              -background white \
 +              -foreground black \
 +              -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 40 \
 +              -width 80 \
 +              -xscrollcommand [list $w.file_pane.out.sbx set] \
 +              -font font_diff
 +
 +      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 \
 +              -foreground black \
 +              -borderwidth 0 \
 +              -state disabled \
 +              -wrap none \
 +              -height 10 \
 +              -width 80 \
 +              -xscrollcommand [list $w.file_pane.cm.sbx set] \
 +              -yscrollcommand [list $w.file_pane.cm.sby set] \
 +              -font font_diff
 +      $w_cviewer tag conf still_loading \
 +              -font font_uiitalic \
 +              -justify center
 +      $w_cviewer tag conf header_key \
 +              -tabs {3c} \
 +              -background $active_color \
 +              -font font_uibold
 +      $w_cviewer tag conf header_val \
 +              -background $active_color \
 +              -font font_ui
 +      $w_cviewer tag raise sel
 +      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 [mc "Copy Commit"] \
 +              -command [cb _copycommit]
++      $w.ctxm add separator
++      menu $w.ctxm.enc
++      build_encoding_menu $w.ctxm.enc [cb _setencoding]
++      $w.ctxm add cascade \
++              -label [mc "Encoding"] \
++              -menu $w.ctxm.enc
 +      $w.ctxm add command \
 +              -label [mc "Do Full Copy Detection"] \
 +              -command [cb _fullcopyblame]
++      $w.ctxm add separator
 +      $w.ctxm add command \
 +              -label [mc "Show History Context"] \
 +              -command [cb _gitkcommit]
 +      $w.ctxm add command \
 +              -label [mc "Blame Parent Commit"] \
 +              -command [cb _blameparent]
 +
 +      foreach i $w_columns {
 +              for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +                      $i tag conf color$g -background [lindex $group_colors $g]
 +              }
 +
 +              $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]}"
 +
 +      wm protocol $top WM_DELETE_WINDOW "destroy $top"
 +      bind $top <Destroy> [cb _kill]
 +
 +      _load $this $i_jump
 +}
 +
 +method _kill {} {
 +      if {$current_fd ne {}} {
 +              kill_file_process $current_fd
 +              catch {close $current_fd}
 +              set current_fd {}
 +      }
 +}
 +
 +method _load {jump} {
 +      variable group_colors
 +
 +      _hide_tooltip $this
 +
 +      if {$total_lines != 0 || $current_fd ne {}} {
 +              _kill $this
 +
 +              foreach i $w_columns {
 +                      $i conf -state normal
 +                      $i delete 0.0 end
 +                      foreach g [$i tag names] {
 +                              if {[regexp {^g[0-9a-f]{40}$} $g]} {
 +                                      $i tag delete $g
 +                              }
 +                      }
 +                      $i conf -state disabled
 +              }
 +
 +              $w_cviewer conf -state normal
 +              $w_cviewer delete 0.0 end
 +              $w_cviewer conf -state disabled
 +
 +              set highlight_line -1
 +              set highlight_column {}
 +              set highlight_commit {}
 +              set total_lines 0
 +      }
 +
 +      if {$history eq {}} {
 +              $w_back conf -state disabled
 +      } else {
 +              $w_back conf -state normal
 +      }
 +
 +      # Index 0 is always empty.  There is never line 0 as
 +      # we use only 1 based lines, as that matches both with
 +      # git-blame output and with Tk's text widget.
 +      #
 +      set amov_data [list [list]]
 +      set asim_data [list [list]]
 +
 +      $status show [mc "Reading %s..." "$commit:[escape_path $path]"]
 +      $w_path conf -text [escape_path $path]
 +      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
++      fconfigure $fd \
++              -blocking 0 \
++              -translation lf \
++              -encoding [get_path_encoding $path]
 +      fileevent $fd readable [cb _read_file $fd $jump]
 +      set current_fd $fd
 +}
 +
 +method _history_menu {} {
 +      set m $w.backmenu
 +      if {[winfo exists $m]} {
 +              $m delete 0 end
 +      } else {
 +              menu $m -tearoff 0
 +      }
 +
 +      for {set i [expr {[llength $history] - 1}]
 +              } {$i >= 0} {incr i -1} {
 +              set e [lindex $history $i]
 +              set c [lindex $e 0]
 +              set f [lindex $e 1]
 +
 +              if {[regexp {^[0-9a-f]{40}$} $c]} {
 +                      set t [string range $c 0 8]...
 +              } elseif {$c eq {}} {
 +                      set t {Working Directory}
 +              } else {
 +                      set t $c
 +              }
 +              if {![catch {set summary $header($c,summary)}]} {
 +                      append t " $summary"
 +                      if {[string length $t] > 70} {
 +                              set t [string range $t 0 66]...
 +                      }
 +              }
 +
 +              $m add command -label $t -command [cb _goback $i]
 +      }
 +      set X [winfo rootx $w_back]
 +      set Y [expr {[winfo rooty $w_back] + [winfo height $w_back]}]
 +      tk_popup $m $X $Y
 +}
 +
 +method _goback {i} {
 +      set dat [lindex $history $i]
 +      set history [lrange $history 0 [expr {$i - 1}]]
 +      set commit [lindex $dat 0]
 +      set path [lindex $dat 1]
 +      _load $this [lrange $dat 2 5]
 +}
 +
 +method _read_file {fd jump} {
 +      if {$fd ne $current_fd} {
 +              catch {close $fd}
 +              return
 +      }
 +
 +      foreach i $w_columns {$i conf -state normal}
 +      while {[gets $fd line] >= 0} {
 +              regsub "\r\$" $line {} line
 +              incr total_lines
 +              lappend amov_data {}
 +              lappend asim_data {}
 +
 +              if {$total_lines > 1} {
 +                      foreach i $w_columns {$i insert end "\n"}
 +              }
 +
 +              $w_line insert end "$total_lines" linenumber
 +              $w_file insert end "$line"
 +      }
 +
 +      set ln_wc [expr {[string length $total_lines] + 2}]
 +      if {[$w_line cget -width] < $ln_wc} {
 +              $w_line conf -width $ln_wc
 +      }
 +
 +      foreach i $w_columns {$i conf -state disabled}
 +
 +      if {[eof $fd]} {
 +              close $fd
 +
 +              # If we don't force Tk to update the widgets *right now*
 +              # none of our jump commands will cause a change in the UI.
 +              #
 +              update
 +
 +              if {[llength $jump] == 1} {
 +                      set highlight_line [lindex $jump 0]
 +                      $w_file see "$highlight_line.0"
 +              } elseif {[llength $jump] == 4} {
 +                      set highlight_column [lindex $jump 0]
 +                      set highlight_line [lindex $jump 1]
 +                      $w_file xview moveto [lindex $jump 2]
 +                      $w_file yview moveto [lindex $jump 3]
 +              }
 +
 +              _exec_blame $this $w_asim @asim_data \
 +                      [list] \
 +                      [mc "Loading copy/move tracking annotations..."]
 +      }
 +} ifdeleted { catch {close $fd} }
 +
 +method _exec_blame {cur_w cur_d options cur_s} {
 +      lappend options --incremental
 +      if {$commit eq {}} {
 +              lappend options --contents $path
 +      } else {
 +              lappend options $commit
 +      }
 +      lappend options -- $path
 +      set fd [eval git_read --nice blame $options]
-                                       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)]
++      fconfigure $fd -blocking 0 -translation lf -encoding utf-8
 +      fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
 +      set current_fd $fd
 +      set blame_lines 0
 +
 +      $status start \
 +              $cur_s \
 +              [mc "lines annotated"]
 +}
 +
 +method _read_blame {fd cur_w cur_d} {
 +      upvar #0 $cur_d line_data
 +      variable group_colors
 +
 +      if {$fd ne $current_fd} {
 +              catch {close $fd}
 +              return
 +      }
 +
 +      $cur_w conf -state normal
 +      while {[gets $fd line] >= 0} {
 +              if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
 +                      cmit original_line final_line line_count]} {
 +                      set r_commit     $cmit
 +                      set r_orig_line  $original_line
 +                      set r_final_line $final_line
 +                      set r_line_count $line_count
 +              } elseif {[string match {filename *} $line]} {
 +                      set file [string range $line 9 end]
 +                      set n    $r_line_count
 +                      set lno  $r_final_line
 +                      set oln  $r_orig_line
 +                      set cmit $r_commit
 +
 +                      if {[regexp {^0{40}$} $cmit]} {
 +                              set commit_abbr work
 +                              set commit_type curr_commit
 +                      } elseif {$cmit eq $commit} {
 +                              set commit_abbr this
 +                              set commit_type curr_commit
 +                      } else {
 +                              set commit_type prior_commit
 +                              set commit_abbr [string range $cmit 0 3]
 +                      }
 +
 +                      set author_abbr {}
 +                      set a_name {}
 +                      catch {set a_name $header($cmit,author)}
 +                      while {$a_name ne {}} {
 +                              if {$author_abbr ne {}
 +                                      && [string index $a_name 0] eq {'}} {
 +                                      regsub {^'[^']+'\s+} $a_name {} a_name
 +                              }
 +                              if {![regexp {^([[:upper:]])} $a_name _a]} break
 +                              append author_abbr $_a
 +                              unset _a
 +                              if {![regsub \
 +                                      {^[[:upper:]][^\s]*\s+} \
 +                                      $a_name {} a_name ]} break
 +                      }
 +                      if {$author_abbr eq {}} {
 +                              set author_abbr { |}
 +                      } else {
 +                              set author_abbr [string range $author_abbr 0 3]
 +                      }
 +                      unset a_name
 +
 +                      set first_lno $lno
 +                      while {
 +                         $first_lno > 1
 +                      && $cmit eq [lindex $line_data [expr {$first_lno - 1}] 0]
 +                      && $file eq [lindex $line_data [expr {$first_lno - 1}] 1]
 +                      } {
 +                              incr first_lno -1
 +                      }
 +
 +                      set color {}
 +                      if {$first_lno < $lno} {
 +                              foreach g [$w_file tag names $first_lno.0] {
 +                                      if {[regexp {^color[0-9]+$} $g]} {
 +                                              set color $g
 +                                              break
 +                                      }
 +                              }
 +                      } else {
 +                              set i [lsort [concat \
 +                                      [$w_file tag names "[expr {$first_lno - 1}].0"] \
 +                                      [$w_file tag names "[expr {$lno + $n}].0"] \
 +                                      ]]
 +                              for {set g 0} {$g < [llength $group_colors]} {incr g} {
 +                                      if {[lsearch -sorted -exact $i color$g] == -1} {
 +                                              set color color$g
 +                                              break
 +                                      }
 +                              }
 +                      }
 +                      if {$color eq {}} {
 +                              set color color0
 +                      }
 +
 +                      while {$n > 0} {
 +                              set lno_e "$lno.0 lineend + 1c"
 +                              if {[lindex $line_data $lno] ne {}} {
 +                                      set g [lindex $line_data $lno 0]
 +                                      foreach i $w_columns {
 +                                              $i tag remove g$g $lno.0 $lno_e
 +                                      }
 +                              }
 +                              lset line_data $lno [list $cmit $file $oln]
 +
 +                              $cur_w delete $lno.0 "$lno.0 lineend"
 +                              if {$lno == $first_lno} {
 +                                      $cur_w insert $lno.0 $commit_abbr $commit_type
 +                              } elseif {$lno == [expr {$first_lno + 1}]} {
 +                                      $cur_w insert $lno.0 $author_abbr author_abbr
 +                              } else {
 +                                      $cur_w insert $lno.0 { |}
 +                              }
 +
 +                              foreach i $w_columns {
 +                                      if {$cur_w eq $w_amov} {
 +                                              for {set g 0} \
 +                                                      {$g < [llength $group_colors]} \
 +                                                      {incr g} {
 +                                                      $i tag remove color$g $lno.0 $lno_e
 +                                              }
 +                                              $i tag add $color $lno.0 $lno_e
 +                                      }
 +                                      $i tag add g$cmit $lno.0 $lno_e
 +                              }
 +
 +                              if {$highlight_column eq $cur_w} {
 +                                      if {$highlight_line == -1
 +                                       && [lindex [$w_file yview] 0] == 0} {
 +                                              $w_file see $lno.0
 +                                              set highlight_line $lno
 +                                      }
 +                                      if {$highlight_line == $lno} {
 +                                              _showcommit $this $cur_w $lno
 +                                      }
 +                              }
 +
 +                              incr n -1
 +                              incr lno
 +                              incr oln
 +                              incr blame_lines
 +                      }
 +
 +                      while {
 +                         $cmit eq [lindex $line_data $lno 0]
 +                      && $file eq [lindex $line_data $lno 1]
 +                      } {
 +                              $cur_w delete $lno.0 "$lno.0 lineend"
 +
 +                              if {$lno == $first_lno} {
 +                                      $cur_w insert $lno.0 $commit_abbr $commit_type
 +                              } elseif {$lno == [expr {$first_lno + 1}]} {
 +                                      $cur_w insert $lno.0 $author_abbr author_abbr
 +                              } else {
 +                                      $cur_w insert $lno.0 { |}
 +                              }
 +
 +                              if {$cur_w eq $w_amov} {
 +                                      foreach i $w_columns {
 +                                              for {set g 0} \
 +                                                      {$g < [llength $group_colors]} \
 +                                                      {incr g} {
 +                                                      $i tag remove color$g $lno.0 $lno_e
 +                                              }
 +                                              $i tag add $color $lno.0 $lno_e
 +                                      }
 +                              }
 +
 +                              incr lno
 +                      }
 +
 +              } elseif {[regexp {^([a-z-]+) (.*)$} $line line key data]} {
 +                      set header($r_commit,$key) $data
 +              }
 +      }
 +      $cur_w conf -state disabled
 +
 +      if {[eof $fd]} {
 +              close $fd
 +              if {$cur_w eq $w_asim} {
 +                      # Switches for original location detection
 +                      set threshold [get_config gui.copyblamethreshold]
 +                      set original_options [list "-C$threshold"]
 +
 +                      if {![is_config_true gui.fastcopyblame]} {
 +                              # thorough copy search; insert before the threshold
 +                              set original_options [linsert $original_options 0 -C]
 +                      }
 +                      if {[git-version >= 1.5.3]} {
 +                              lappend original_options -w ; # ignore indentation changes
 +                      }
 +
 +                      _exec_blame $this $w_amov @amov_data \
 +                              $original_options \
 +                              [mc "Loading original location annotations..."]
 +              } else {
 +                      set current_fd {}
 +                      $status stop [mc "Annotation complete."]
 +              }
 +      } else {
 +              $status update $blame_lines $total_lines
 +      }
 +} ifdeleted { catch {close $fd} }
 +
 +method _find_commit_bound {data_list start_idx delta} {
 +      upvar #0 $data_list line_data
 +      set pos $start_idx
 +      set limit       [expr {[llength $line_data] - 1}]
 +      set base_commit [lindex $line_data $pos 0]
 +
 +      while {$pos > 0 && $pos < $limit} {
 +              set new_pos [expr {$pos + $delta}]
 +              if {[lindex $line_data $new_pos 0] ne $base_commit} {
 +                      return $pos
 +              }
 +
 +              set pos $new_pos
 +      }
 +
 +      return $pos
 +}
 +
 +method _fullcopyblame {} {
 +      if {$current_fd ne {}} {
 +              tk_messageBox \
 +                      -icon error \
 +                      -type ok \
 +                      -title [mc "Busy"] \
 +                      -message [mc "Annotation process is already running."]
 +
 +              return
 +      }
 +
 +      # Switches for original location detection
 +      set threshold [get_config gui.copyblamethreshold]
 +      set original_options [list -C -C "-C$threshold"]
 +
 +      if {[git-version >= 1.5.3]} {
 +              lappend original_options -w ; # ignore indentation changes
 +      }
 +
 +      # Find the line range
 +      set pos @$::cursorX,$::cursorY
 +      set lno [lindex [split [$::cursorW index $pos] .] 0]
 +      set min_amov_lno [_find_commit_bound $this @amov_data $lno -1]
 +      set max_amov_lno [_find_commit_bound $this @amov_data $lno 1]
 +      set min_asim_lno [_find_commit_bound $this @asim_data $lno -1]
 +      set max_asim_lno [_find_commit_bound $this @asim_data $lno 1]
 +
 +      if {$min_asim_lno < $min_amov_lno} {
 +              set min_amov_lno $min_asim_lno
 +      }
 +
 +      if {$max_asim_lno > $max_amov_lno} {
 +              set max_amov_lno $max_asim_lno
 +      }
 +
 +      lappend original_options -L "$min_amov_lno,$max_amov_lno"
 +
 +      # Clear lines
 +      for {set i $min_amov_lno} {$i <= $max_amov_lno} {incr i} {
 +              lset amov_data $i [list ]
 +      }
 +
 +      # Start the back-end process
 +      _exec_blame $this $w_amov @amov_data \
 +              $original_options \
 +              [mc "Running thorough copy detection..."]
 +}
 +
 +method _click {cur_w pos} {
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      _showcommit $this $cur_w $lno
 +}
 +
++method _setencoding {enc} {
++      force_path_encoding $path $enc
++      _load $this [list \
++              $highlight_column \
++              $highlight_line \
++              [lindex [$w_file xview] 0] \
++              [lindex [$w_file yview] 0] \
++              ]
++}
++
 +method _load_commit {cur_w cur_d pos} {
 +      upvar #0 $cur_d line_data
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      set dat [lindex $line_data $lno]
 +      if {$dat ne {}} {
 +              _load_new_commit $this  \
 +                      [lindex $dat 0] \
 +                      [lindex $dat 1] \
 +                      [list [lindex $dat 2]]
 +      }
 +}
 +
 +method _load_new_commit {new_commit new_path jump} {
 +      lappend history [list \
 +              $commit $path \
 +              $highlight_column \
 +              $highlight_line \
 +              [lindex [$w_file xview] 0] \
 +              [lindex [$w_file yview] 0] \
 +              ]
 +
 +      set commit $new_commit
 +      set path   $new_path
 +      _load $this $jump
 +}
 +
 +method _showcommit {cur_w lno} {
 +      global repo_config
 +      variable active_color
 +
 +      if {$highlight_commit ne {}} {
 +              foreach i $w_columns {
 +                      $i tag conf g$highlight_commit -background {}
 +                      $i tag lower g$highlight_commit
 +              }
 +      }
 +
 +      if {$cur_w eq $w_asim} {
 +              set dat [lindex $asim_data $lno]
 +              set highlight_column $w_asim
 +      } else {
 +              set dat [lindex $amov_data $lno]
 +              set highlight_column $w_amov
 +      }
 +
 +      $w_cviewer conf -state normal
 +      $w_cviewer delete 0.0 end
 +
 +      if {$dat eq {}} {
 +              set cmit {}
 +              $w_cviewer insert end [mc "Loading annotation..."] still_loading
 +      } else {
 +              set cmit [lindex $dat 0]
 +              set file [lindex $dat 1]
 +
 +              foreach i $w_columns {
 +                      $i tag conf g$cmit -background $active_color
 +                      $i tag raise g$cmit
 +              }
 +
 +              set author_name {}
 +              set author_email {}
 +              set author_time {}
 +              catch {set author_name $header($cmit,author)}
 +              catch {set author_email $header($cmit,author-mail)}
 +              catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +              set committer_name {}
 +              set committer_email {}
 +              set committer_time {}
 +              catch {set committer_name $header($cmit,committer)}
 +              catch {set committer_email $header($cmit,committer-mail)}
 +              catch {set committer_time [format_date $header($cmit,committer-time)]}
 +
 +              if {[catch {set msg $header($cmit,message)}]} {
 +                      set msg {}
 +                      catch {
 +                              set fd [git_read cat-file commit $cmit]
 +                              fconfigure $fd -encoding binary -translation lf
 +                              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 msg [read $fd]
 +                              close $fd
 +
 +                              set enc [tcl_encoding $enc]
 +                              if {$enc ne {}} {
 +                                      set msg [encoding convertfrom $enc $msg]
-               if {[catch {set cparent [git rev-parse --verify "$cmit^"]}]} {
 +                              }
 +                              set msg [string trim $msg]
 +                      }
 +                      set header($cmit,message) $msg
 +              }
 +
 +              $w_cviewer insert end "commit $cmit\n" header_key
 +              $w_cviewer insert end [strcat [mc "Author:"] "\t"] header_key
 +              $w_cviewer insert end "$author_name $author_email" header_val
 +              $w_cviewer insert end "  $author_time\n" header_val
 +
 +              $w_cviewer insert end [strcat [mc "Committer:"] "\t"] header_key
 +              $w_cviewer insert end "$committer_name $committer_email" header_val
 +              $w_cviewer insert end "  $committer_time\n" header_val
 +
 +              if {$file ne $path} {
 +                      $w_cviewer insert end [strcat [mc "Original File:"] "\t"] header_key
 +                      $w_cviewer insert end "[escape_path $file]\n" header_val
 +              }
 +
 +              $w_cviewer insert end "\n$msg"
 +      }
 +      $w_cviewer conf -state disabled
 +
 +      set highlight_line $lno
 +      set highlight_commit $cmit
 +
 +      if {[lsearch -exact $tooltip_commit $highlight_commit] != -1} {
 +              _hide_tooltip $this
 +      }
 +}
 +
 +method _get_click_amov_info {} {
 +      set pos @$::cursorX,$::cursorY
 +      set lno [lindex [split [$::cursorW index $pos] .] 0]
 +      return [lindex $amov_data $lno]
 +}
 +
 +method _copycommit {} {
 +      set dat [_get_click_amov_info $this]
 +      if {$dat ne {}} {
 +              clipboard clear
 +              clipboard append \
 +                      -format STRING \
 +                      -type STRING \
 +                      -- [lindex $dat 0]
 +      }
 +}
 +
 +method _format_offset_date {base offset} {
 +      set exval [expr {$base + $offset*24*60*60}]
 +      return [clock format $exval -format {%Y-%m-%d}]
 +}
 +
 +method _gitkcommit {} {
++      global nullid
++
 +      set dat [_get_click_amov_info $this]
 +      if {$dat ne {}} {
 +              set cmit [lindex $dat 0]
++
++              # If the line belongs to the working copy, use HEAD instead
++              if {$cmit eq $nullid} {
++                      if {[catch {set cmit [git rev-parse --verify HEAD]} err]} {
++                              error_popup [strcat [mc "Cannot find HEAD commit:"] "\n\n$err"]
++                              return;
++                      }
++              }
++
 +              set radius [get_config gui.blamehistoryctx]
 +              set cmdline [list --select-commit=$cmit]
 +
 +                if {$radius > 0} {
 +                      set author_time {}
 +                      set committer_time {}
 +
 +                      catch {set author_time $header($cmit,author-time)}
 +                      catch {set committer_time $header($cmit,committer-time)}
 +
 +                      if {$committer_time eq {}} {
 +                              set committer_time $author_time
 +                      }
 +
 +                      set after_time [_format_offset_date $this $committer_time [expr {-$radius}]]
 +                      set before_time [_format_offset_date $this $committer_time $radius]
 +
 +                      lappend cmdline --after=$after_time --before=$before_time
 +              }
 +
 +              lappend cmdline $cmit
 +
 +              set base_rev "HEAD"
 +              if {$commit ne {}} {
 +                      set base_rev $commit
 +              }
 +
 +              if {$base_rev ne $cmit} {
 +                      lappend cmdline $base_rev
 +              }
 +
 +              do_gitk $cmdline
 +      }
 +}
 +
 +method _blameparent {} {
++      global nullid
++
 +      set dat [_get_click_amov_info $this]
 +      if {$dat ne {}} {
 +              set cmit [lindex $dat 0]
 +              set new_path [lindex $dat 1]
 +
-               if {[catch {set fd [eval git_read diff-tree \
-                               --unified=0 $cparent $cmit $new_path]} err]} {
++              # Allow using Blame Parent on lines modified in the working copy
++              if {$cmit eq $nullid} {
++                      set parent_ref "HEAD"
++              } else {
++                      set parent_ref "$cmit^"
++              }
++              if {[catch {set cparent [git rev-parse --verify $parent_ref]} err]} {
 +                      error_popup [strcat [mc "Cannot find parent commit:"] "\n\n$err"]
 +                      return;
 +              }
 +
 +              _kill $this
 +
 +              # Generate a diff between the commit and its parent,
 +              # and use the hunks to update the line number.
 +              # Request zero context to simplify calculations.
++              if {$cmit eq $nullid} {
++                      set diffcmd [list diff-index --unified=0 $cparent -- $new_path]
++              } else {
++                      set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path]
++              }
++              if {[catch {set fd [eval git_read $diffcmd]} err]} {
 +                      $status stop [mc "Unable to display parent"]
 +                      error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 +                      return
 +              }
 +
 +              set r_orig_line [lindex $dat 2]
 +
 +              fconfigure $fd \
 +                      -blocking 0 \
 +                      -encoding binary \
 +                      -translation binary
 +              fileevent $fd readable [cb _read_diff_load_commit \
 +                      $fd $cparent $new_path $r_orig_line]
 +              set current_fd $fd
 +      }
 +}
 +
 +method _read_diff_load_commit {fd cparent new_path tline} {
 +      if {$fd ne $current_fd} {
 +              catch {close $fd}
 +              return
 +      }
 +
 +      while {[gets $fd line] >= 0} {
 +              if {[regexp {^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@} $line line \
 +                      old_line osz old_size new_line nsz new_size]} {
 +
 +                      if {$osz eq {}} { set old_size 1 }
 +                      if {$nsz eq {}} { set new_size 1 }
 +
 +                      if {$new_line <= $tline} {
 +                              if {[expr {$new_line + $new_size}] > $tline} {
 +                                      # Target line within the hunk
 +                                      set line_shift [expr {
 +                                              ($new_size-$old_size)*($tline-$new_line)/$new_size
 +                                              }]
 +                              } else {
 +                                      set line_shift [expr {$new_size-$old_size}]
 +                              }
 +
 +                              set r_orig_line [expr {$r_orig_line - $line_shift}]
 +                      }
 +              }
 +      }
 +
 +      if {[eof $fd]} {
 +              close $fd;
 +              set current_fd {}
 +
 +              _load_new_commit $this  \
 +                      $cparent        \
 +                      $new_path       \
 +                      [list $r_orig_line]
 +      }
 +} ifdeleted { catch {close $fd} }
 +
 +method _show_tooltip {cur_w pos} {
 +      if {$tooltip_wm ne {}} {
 +              _open_tooltip $this $cur_w
 +      } elseif {$tooltip_timer eq {}} {
 +              set tooltip_timer [after 1000 [cb _open_tooltip $cur_w]]
 +      }
 +}
 +
 +method _open_tooltip {cur_w} {
 +      set tooltip_timer {}
 +      set pos_x [winfo pointerx $cur_w]
 +      set pos_y [winfo pointery $cur_w]
 +      if {[winfo containing $pos_x $pos_y] ne $cur_w} {
 +              _hide_tooltip $this
 +              return
 +      }
 +
 +      if {$tooltip_wm ne "$cur_w.tooltip"} {
 +              _hide_tooltip $this
 +
 +              set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
 +              wm overrideredirect $tooltip_wm 1
 +              wm transient $tooltip_wm [winfo toplevel $cur_w]
 +              set tooltip_t $tooltip_wm.label
 +              text $tooltip_t \
 +                      -takefocus 0 \
 +                      -highlightthickness 0 \
 +                      -relief flat \
 +                      -borderwidth 0 \
 +                      -wrap none \
 +                      -background lightyellow \
 +                      -foreground black
 +              $tooltip_t tag conf section_header -font font_uibold
 +              pack $tooltip_t
 +      } else {
 +              $tooltip_t conf -state normal
 +              $tooltip_t delete 0.0 end
 +      }
 +
 +      set pos @[join [list \
 +              [expr {$pos_x - [winfo rootx $cur_w]}] \
 +              [expr {$pos_y - [winfo rooty $cur_w]}]] ,]
 +      set lno [lindex [split [$cur_w index $pos] .] 0]
 +      if {$cur_w eq $w_amov} {
 +              set dat [lindex $amov_data $lno]
 +              set org {}
 +      } else {
 +              set dat [lindex $asim_data $lno]
 +              set org [lindex $amov_data $lno]
 +      }
 +
 +      if {$dat eq {}} {
 +              _hide_tooltip $this
 +              return
 +      }
 +
 +      set cmit [lindex $dat 0]
 +      set tooltip_commit [list $cmit]
 +
 +      set author_name {}
 +      set summary     {}
 +      set author_time {}
 +      catch {set author_name $header($cmit,author)}
 +      catch {set summary     $header($cmit,summary)}
 +      catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +      $tooltip_t insert end "commit $cmit\n"
 +      $tooltip_t insert end "$author_name  $author_time\n"
 +      $tooltip_t insert end "$summary"
 +
 +      if {$org ne {} && [lindex $org 0] ne $cmit} {
 +              set save [$tooltip_t get 0.0 end]
 +              $tooltip_t delete 0.0 end
 +
 +              set cmit [lindex $org 0]
 +              set file [lindex $org 1]
 +              lappend tooltip_commit $cmit
 +
 +              set author_name {}
 +              set summary     {}
 +              set author_time {}
 +              catch {set author_name $header($cmit,author)}
 +              catch {set summary     $header($cmit,summary)}
 +              catch {set author_time [format_date $header($cmit,author-time)]}
 +
 +              $tooltip_t insert end [strcat [mc "Originally By:"] "\n"] section_header
 +              $tooltip_t insert end "commit $cmit\n"
 +              $tooltip_t insert end "$author_name  $author_time\n"
 +              $tooltip_t insert end "$summary\n"
 +
 +              if {$file ne $path} {
 +                      $tooltip_t insert end [strcat [mc "In File:"] " "] section_header
 +                      $tooltip_t insert end "$file\n"
 +              }
 +
 +              $tooltip_t insert end "\n"
 +              $tooltip_t insert end [strcat [mc "Copied Or Moved Here By:"] "\n"] section_header
 +              $tooltip_t insert end $save
 +      }
 +
 +      $tooltip_t conf -state disabled
 +      _position_tooltip $this
 +}
 +
 +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/commit.tcl
index 2977315624fc5deeecff275d8dc8b3f2e3210a70,0000000000000000000000000000000000000000..334514996a9e900d124b5fdc54f83dc9924517b5
mode 100644,000000..100644
--- 1/git-gui/lib/commit.tcl
--- /dev/null
+++ b/git-gui/lib/commit.tcl
@@@ -1,473 -1,0 +1,477 @@@
-       if {!$files_ready && ![string match *merge $curType]} {
 +# 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 [mc "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 [mc "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]]
 +                              }
 +                      }
 +                      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 [strcat [mc "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 [strcat [mc "Unable to obtain your identity:"] "\n\n$err"]
 +                      return {}
 +              }
 +              if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
 +                      $me me GIT_COMMITTER_IDENT]} {
 +                      error_popup [strcat [mc "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 [mc "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? -
 +              T_ -
 +              M? {set files_ready 1}
 +              _U -
 +              U? {
 +                      error_popup [mc "Unmerged files cannot be committed.
 +
 +File %s has merge conflicts.  You must resolve them and stage the file before committing.
 +" [short_path $path]]
 +                      unlock_index
 +                      return
 +              }
 +              default {
 +                      error_popup [mc "Unknown file state %s detected.
 +
 +File %s cannot be committed by this program.
 +" [lindex $s 0] [short_path $path]]
 +              }
 +              }
 +      }
-       if {[is_enabled singlecommit]} do_quit
++      if {!$files_ready && ![string match *merge $curType] && ![is_enabled nocommit]} {
 +              info_popup [mc "No changes to commit.
 +
 +You must stage at least 1 file before you can commit.
 +"]
 +              unlock_index
 +              return
 +      }
 +
++      if {[is_enabled nocommitmsg]} { do_quit 0 }
++
 +      # -- 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 [mc "Please supply a commit message.
 +
 +A good commit message has the following format:
 +
 +- First line: Describe in one sentence what you did.
 +- Second line: Blank
 +- Remaining lines: Describe why this change is good.
 +"]
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Build the message file.
 +      #
 +      set msg_p [gitdir GITGUI_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 [mc "warning: Tcl does not support encoding '%s'." $enc]
 +              fconfigure $msg_wt -encoding utf-8
 +      }
 +      puts $msg_wt $msg
 +      close $msg_wt
 +
++      if {[is_enabled nocommit]} { do_quit 0 }
++
 +      # -- Run the pre-commit hook.
 +      #
 +      set fd_ph [githook_read pre-commit]
 +      if {$fd_ph eq {}} {
 +              commit_commitmsg $curHEAD $msg_p
 +              return
 +      }
 +
 +      ui_status [mc "Calling pre-commit hook..."]
 +      set pch_error {}
 +      fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +      fileevent $fd_ph readable \
 +              [list commit_prehook_wait $fd_ph $curHEAD $msg_p]
 +}
 +
 +proc commit_prehook_wait {fd_ph curHEAD msg_p} {
 +      global pch_error
 +
 +      append pch_error [read $fd_ph]
 +      fconfigure $fd_ph -blocking 1
 +      if {[eof $fd_ph]} {
 +              if {[catch {close $fd_ph}]} {
 +                      catch {file delete $msg_p}
 +                      ui_status [mc "Commit declined by pre-commit hook."]
 +                      hook_failed_popup pre-commit $pch_error
 +                      unlock_index
 +              } else {
 +                      commit_commitmsg $curHEAD $msg_p
 +              }
 +              set pch_error {}
 +              return
 +      }
 +      fconfigure $fd_ph -blocking 0
 +}
 +
 +proc commit_commitmsg {curHEAD msg_p} {
 +      global pch_error
 +
 +      # -- Run the commit-msg hook.
 +      #
 +      set fd_ph [githook_read commit-msg $msg_p]
 +      if {$fd_ph eq {}} {
 +              commit_writetree $curHEAD $msg_p
 +              return
 +      }
 +
 +      ui_status [mc "Calling commit-msg hook..."]
 +      set pch_error {}
 +      fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +      fileevent $fd_ph readable \
 +              [list commit_commitmsg_wait $fd_ph $curHEAD $msg_p]
 +}
 +
 +proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {
 +      global pch_error
 +
 +      append pch_error [read $fd_ph]
 +      fconfigure $fd_ph -blocking 1
 +      if {[eof $fd_ph]} {
 +              if {[catch {close $fd_ph}]} {
 +                      catch {file delete $msg_p}
 +                      ui_status [mc "Commit declined by commit-msg hook."]
 +                      hook_failed_popup commit-msg $pch_error
 +                      unlock_index
 +              } else {
 +                      commit_writetree $curHEAD $msg_p
 +              }
 +              set pch_error {}
 +              return
 +      }
 +      fconfigure $fd_ph -blocking 0
 +}
 +
 +proc commit_writetree {curHEAD msg_p} {
 +      ui_status [mc "Committing changes..."]
 +      set fd_wt [git_read write-tree]
 +      fileevent $fd_wt readable \
 +              [list commit_committree $fd_wt $curHEAD $msg_p]
 +}
 +
 +proc commit_committree {fd_wt curHEAD msg_p} {
 +      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 {[catch {close $fd_wt} err]} {
 +              catch {file delete $msg_p}
 +              error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
 +              ui_status [mc "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 [mc "Commit %s appears to be corrupt" $PARENT]
 +              }
 +
 +              if {$tree_id eq $old_tree} {
 +                      catch {file delete $msg_p}
 +                      info_popup [mc "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 [mc "No changes to commit."]}
 +                      return
 +              }
 +      }
 +
 +      # -- 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]} {
 +              catch {file delete $msg_p}
 +              error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"]
 +              ui_status [mc "Commit failed."]
 +              unlock_index
 +              return
 +      }
 +
 +      # -- Update the HEAD ref.
 +      #
 +      set reflogm commit
 +      if {$commit_type ne {normal}} {
 +              append reflogm " ($commit_type)"
 +      }
 +      set msg_fd [open $msg_p r]
 +      gets $msg_fd subject
 +      close $msg_fd
 +      append reflogm {: } $subject
 +      if {[catch {
 +                      git update-ref -m $reflogm HEAD $cmt_id $curHEAD
 +              } err]} {
 +              catch {file delete $msg_p}
 +              error_popup [strcat [mc "update-ref failed:"] "\n\n$err"]
 +              ui_status [mc "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 fd_ph [githook_read post-commit]
 +      if {$fd_ph ne {}} {
 +              upvar #0 pch_error$cmt_id pc_err
 +              set pc_err {}
 +              fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +              fileevent $fd_ph readable \
 +                      [list commit_postcommit_wait $fd_ph $cmt_id]
 +      }
 +
 +      $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 0 }
 +
 +      # -- 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_ -
 +              T_ -
 +              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 [mc "Created commit %s: %s" [string range $cmt_id 0 7] $subject]
 +}
 +
 +proc commit_postcommit_wait {fd_ph cmt_id} {
 +      upvar #0 pch_error$cmt_id pch_error
 +
 +      append pch_error [read $fd_ph]
 +      fconfigure $fd_ph -blocking 1
 +      if {[eof $fd_ph]} {
 +              if {[catch {close $fd_ph}]} {
 +                      hook_failed_popup post-commit $pch_error 0
 +              }
 +              unset pch_error
 +              return
 +      }
 +      fconfigure $fd_ph -blocking 0
 +}

diff --cc git-gui/lib/diff.tcl
index a30c80a935b58ce0c783dfffde196a85eadca9a2,0000000000000000000000000000000000000000..abe502d97104cb62bed308b0f5025c9d014834fb
mode 100644,000000..100644
--- 1/git-gui/lib/diff.tcl
--- /dev/null
+++ b/git-gui/lib/diff.tcl
@@@ -1,613 -1,0 +1,644 @@@
- proc show_diff {path w {lno {}} {scroll_pos {}}} {
 +# 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
 +      global ui_diff
 +
 +      set p $current_diff_path
 +      if {$p eq {}} {
 +              # No diff is being shown.
 +      } elseif {$current_diff_side eq {}} {
 +              clear_diff
 +      } elseif {[catch {set s $file_states($p)}]
 +              || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
 +
 +              if {[find_next_diff $current_diff_side $p {} {[^O]}]} {
 +                      next_diff
 +              } else {
 +                      clear_diff
 +              }
 +      } else {
 +              set save_pos [lindex [$ui_diff yview] 0]
 +              show_diff $p $current_diff_side {} $save_pos
 +      }
 +}
 +
++proc force_diff_encoding {enc} {
++      global current_diff_path
++      
++      if {$current_diff_path ne {}} {
++              force_path_encoding $current_diff_path $enc
++              reshow_diff
++      }
++}
++
 +proc handle_empty_diff {} {
 +      global current_diff_path file_states file_lists
 +
 +      set path $current_diff_path
 +      set s $file_states($path)
 +      if {[lindex $s 0] ne {_M}} return
 +
 +      info_popup [mc "No differences detected.
 +
 +%s has no changes.
 +
 +The modification date of this file was updated by another application, but the content within the file was not changed.
 +
 +A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
 +
 +      clear_diff
 +      display_file $path __
 +      rescan ui_ready 0
 +}
 +
-       global is_3way_diff diff_active repo_config
++proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
 +      global file_states file_lists
-               merge_load_stages $path [list show_unmerged_diff $scroll_pos]
++      global is_3way_diff is_conflict_diff diff_active repo_config
 +      global ui_diff ui_index ui_workdir
 +      global current_diff_path current_diff_side current_diff_header
 +      global current_diff_queue
 +
 +      if {$diff_active || ![lock_index read]} return
 +
 +      clear_diff
 +      if {$lno == {}} {
 +              set lno [lsearch -sorted -exact $file_lists($w) $path]
 +              if {$lno >= 0} {
 +                      incr lno
 +              }
 +      }
 +      if {$lno >= 1} {
 +              $w tag add in_diff $lno.0 [expr {$lno + 1}].0
 +              $w see $lno.0
 +      }
 +
 +      set s $file_states($path)
 +      set m [lindex $s 0]
++      set is_conflict_diff 0
 +      set current_diff_path $path
 +      set current_diff_side $w
 +      set current_diff_queue {}
 +      ui_status [mc "Loading diff of %s..." [escape_path $path]]
 +
++      set cont_info [list $scroll_pos $callback]
++
 +      if {[string first {U} $m] >= 0} {
-               show_other_diff $path $w $m $scroll_pos
++              merge_load_stages $path [list show_unmerged_diff $cont_info]
 +      } elseif {$m eq {_O}} {
-               start_show_diff $scroll_pos
++              show_other_diff $path $w $m $cont_info
 +      } else {
- proc show_unmerged_diff {scroll_pos} {
++              start_show_diff $cont_info
 +      }
 +}
 +
-       global merge_stages ui_diff
++proc show_unmerged_diff {cont_info} {
 +      global current_diff_path current_diff_side
-               start_show_diff $scroll_pos
++      global merge_stages ui_diff is_conflict_diff
 +      global current_diff_queue
 +
 +      if {$merge_stages(2) eq {}} {
++              set is_conflict_diff 1
 +              lappend current_diff_queue \
 +                      [list "LOCAL: deleted\nREMOTE:\n" d======= \
 +                          [list ":1:$current_diff_path" ":3:$current_diff_path"]]
 +      } elseif {$merge_stages(3) eq {}} {
++              set is_conflict_diff 1
 +              lappend current_diff_queue \
 +                      [list "REMOTE: deleted\nLOCAL:\n" d======= \
 +                          [list ":1:$current_diff_path" ":2:$current_diff_path"]]
 +      } elseif {[lindex $merge_stages(1) 0] eq {120000}
 +              || [lindex $merge_stages(2) 0] eq {120000}
 +              || [lindex $merge_stages(3) 0] eq {120000}} {
++              set is_conflict_diff 1
 +              lappend current_diff_queue \
 +                      [list "LOCAL:\n" d======= \
 +                          [list ":1:$current_diff_path" ":2:$current_diff_path"]]
 +              lappend current_diff_queue \
 +                      [list "REMOTE:\n" d======= \
 +                          [list ":1:$current_diff_path" ":3:$current_diff_path"]]
 +      } else {
-       advance_diff_queue $scroll_pos
++              start_show_diff $cont_info
 +              return
 +      }
 +
- proc advance_diff_queue {scroll_pos} {
++      advance_diff_queue $cont_info
 +}
 +
-       start_show_diff $scroll_pos [lindex $item 2]
++proc advance_diff_queue {cont_info} {
 +      global current_diff_queue ui_diff
 +
 +      set item [lindex $current_diff_queue 0]
 +      set current_diff_queue [lrange $current_diff_queue 1 end]
 +
 +      $ui_diff conf -state normal
 +      $ui_diff insert end [lindex $item 0] [lindex $item 1]
 +      $ui_diff conf -state disabled
 +
- proc show_other_diff {path w m scroll_pos} {
++      start_show_diff $cont_info [lindex $item 2]
 +}
 +
-                                       fconfigure $fd -eofchar {}
++proc show_other_diff {path w m cont_info} {
 +      global file_states file_lists
 +      global is_3way_diff diff_active repo_config
 +      global ui_diff ui_index ui_workdir
 +      global current_diff_path current_diff_side current_diff_header
 +
 +      # - Git won't give us the diff, there's nothing to compare to!
 +      #
 +      if {$m eq {_O}} {
 +              set max_sz [expr {128 * 1024}]
 +              set type unknown
 +              if {[catch {
 +                              set type [file type $path]
 +                              switch -- $type {
 +                              directory {
 +                                      set type submodule
 +                                      set content {}
 +                                      set sz 0
 +                              }
 +                              link {
 +                                      set content [file readlink $path]
 +                                      set sz [string length $content]
 +                              }
 +                              file {
 +                                      set fd [open $path r]
- proc start_show_diff {scroll_pos {add_opts {}}} {
++                                      fconfigure $fd \
++                                              -eofchar {} \
++                                              -encoding [get_path_encoding $path]
 +                                      set content [read $fd $max_sz]
 +                                      close $fd
 +                                      set sz [file size $path]
 +                              }
 +                              default {
 +                                      error "'$type' not supported"
 +                              }
 +                              }
 +                      } err ]} {
 +                      set diff_active 0
 +                      unlock_index
 +                      ui_status [mc "Unable to display %s" [escape_path $path]]
 +                      error_popup [strcat [mc "Error loading file:"] "\n\n$err"]
 +                      return
 +              }
 +              $ui_diff conf -state normal
 +              if {$type eq {submodule}} {
 +                      $ui_diff insert end [append \
 +                              "* " \
 +                              [mc "Git Repository (subproject)"] \
 +                              "\n"] d_@
 +              } elseif {![catch {set type [exec file $path]}]} {
 +                      set n [string length $path]
 +                      if {[string equal -length $n $path $type]} {
 +                              set type [string range $type $n end]
 +                              regsub {^:?\s*} $type {} type
 +                      }
 +                      $ui_diff insert end "* $type\n" d_@
 +              }
 +              if {[string first "\0" $content] != -1} {
 +                      $ui_diff insert end \
 +                              [mc "* Binary file (not showing content)."] \
 +                              d_@
 +              } else {
 +                      if {$sz > $max_sz} {
 +                              $ui_diff insert end \
 +"* 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
++              set scroll_pos [lindex $cont_info 0]
 +              if {$scroll_pos ne {}} {
 +                      update
 +                      $ui_diff yview moveto $scroll_pos
 +              }
 +              ui_ready
++              set callback [lindex $cont_info 1]
++              if {$callback ne {}} {
++                      eval $callback
++              }
 +              return
 +      }
 +}
 +
-               -encoding binary \
-               -translation binary
-       fileevent $fd readable [list read_diff $fd $scroll_pos]
++proc start_show_diff {cont_info {add_opts {}}} {
 +      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
 +
 +      set path $current_diff_path
 +      set w $current_diff_side
 +
 +      set s $file_states($path)
 +      set m [lindex $s 0]
 +      set is_3way_diff 0
 +      set diff_active 1
 +      set current_diff_header {}
 +
 +      set cmd [list]
 +      if {$w eq $ui_index} {
 +              lappend cmd diff-index
 +              lappend cmd --cached
 +      } elseif {$w eq $ui_workdir} {
 +              if {[string first {U} $m] >= 0} {
 +                      lappend cmd diff
 +              } else {
 +                      lappend cmd diff-files
 +              }
 +      }
 +
 +      lappend cmd -p
 +      lappend cmd --no-color
 +      if {$repo_config(gui.diffcontext) >= 1} {
 +              lappend cmd "-U$repo_config(gui.diffcontext)"
 +      }
 +      if {$w eq $ui_index} {
 +              lappend cmd [PARENT]
 +      }
 +      if {$add_opts ne {}} {
 +              eval lappend cmd $add_opts
 +      } else {
 +              lappend cmd --
 +              lappend cmd $path
 +      }
 +
 +      if {[catch {set fd [eval git_read --nice $cmd]} err]} {
 +              set diff_active 0
 +              unlock_index
 +              ui_status [mc "Unable to display %s" [escape_path $path]]
 +              error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 +              return
 +      }
 +
 +      set ::current_diff_inheader 1
 +      fconfigure $fd \
 +              -blocking 0 \
- proc read_diff {fd scroll_pos} {
++              -encoding [get_path_encoding $path] \
++              -translation lf
++      fileevent $fd readable [list read_diff $fd $cont_info]
 +}
 +
-       global is_3way_diff current_diff_header
++proc read_diff {fd cont_info} {
 +      global ui_diff diff_active
-                       advance_diff_queue $scroll_pos
++      global is_3way_diff is_conflict_diff current_diff_header
 +      global current_diff_queue
 +
 +      $ui_diff conf -state normal
 +      while {[gets $fd line] >= 0} {
 +              # -- Cleanup uninteresting diff header lines.
 +              #
 +              if {$::current_diff_inheader} {
 +                      if {   [string match {diff --git *}      $line]
 +                          || [string match {diff --cc *}       $line]
 +                          || [string match {diff --combined *} $line]
 +                          || [string match {--- *}             $line]
 +                          || [string match {+++ *}             $line]} {
 +                              append current_diff_header $line "\n"
 +                              continue
 +                      }
 +              }
 +              if {[string match {index *} $line]} continue
 +              if {$line eq {deleted file mode 120000}} {
 +                      set line "deleted symlink"
 +              }
 +              set ::current_diff_inheader 0
 +
 +              # -- Automatically detect if this is a 3 way diff.
 +              #
 +              if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 +
 +              if {[string match {mode *} $line]
 +                      || [string match {new file *} $line]
 +                      || [regexp {^(old|new) mode *} $line]
 +                      || [string match {deleted file *} $line]
 +                      || [string match {deleted symlink} $line]
 +                      || [string match {Binary files * and * differ} $line]
 +                      || $line eq {\ No newline at end of file}
 +                      || [regexp {^\* Unmerged path } $line]} {
 +                      set tags {}
 +              } elseif {$is_3way_diff} {
 +                      set op [string range $line 0 1]
 +                      switch -- $op {
 +                      {  } {set tags {}}
 +                      {@@} {set tags d_@}
 +                      { +} {set tags d_s+}
 +                      { -} {set tags d_s-}
 +                      {+ } {set tags d_+s}
 +                      {- } {set tags d_-s}
 +                      {--} {set tags d_--}
 +                      {++} {
 +                              if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
++                                      set is_conflict_diff 1
 +                                      set line [string replace $line 0 1 {  }]
 +                                      set tags d$op
 +                              } else {
 +                                      set tags d_++
 +                              }
 +                      }
 +                      default {
 +                              puts "error: Unhandled 3 way diff marker: {$op}"
 +                              set tags {}
 +                      }
 +                      }
 +              } else {
 +                      set op [string index $line 0]
 +                      switch -- $op {
 +                      { } {set tags {}}
 +                      {@} {set tags d_@}
 +                      {-} {set tags d_-}
 +                      {+} {
 +                              if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
++                                      set is_conflict_diff 1
 +                                      set 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
 +
 +              if {$current_diff_queue ne {}} {
-               fconfigure $p -translation binary -encoding binary
++                      advance_diff_queue $cont_info
 +                      return
 +              }
 +
 +              set diff_active 0
 +              unlock_index
++              set scroll_pos [lindex $cont_info 0]
 +              if {$scroll_pos ne {}} {
 +                      update
 +                      $ui_diff yview moveto $scroll_pos
 +              }
 +              ui_ready
 +
 +              if {[$ui_diff index end] eq {2.0}} {
 +                      handle_empty_diff
 +              }
++              set callback [lindex $cont_info 1]
++              if {$callback ne {}} {
++                      eval $callback
++              }
 +      }
 +}
 +
 +proc apply_hunk {x y} {
 +      global current_diff_path current_diff_header current_diff_side
 +      global ui_diff ui_index file_states
 +
 +      if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +      if {![lock_index apply_hunk]} return
 +
 +      set apply_cmd {apply --cached --whitespace=nowarn}
 +      set mi [lindex $file_states($current_diff_path) 0]
 +      if {$current_diff_side eq $ui_index} {
 +              set failed_msg [mc "Failed to unstage selected hunk."]
 +              lappend apply_cmd --reverse
 +              if {[string index $mi 0] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      } else {
 +              set failed_msg [mc "Failed to stage selected hunk."]
 +              if {[string index $mi 1] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      }
 +
 +      set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
 +      set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
 +      if {$s_lno eq {}} {
 +              unlock_index
 +              return
 +      }
 +
 +      set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
 +      if {$e_lno eq {}} {
 +              set e_lno end
 +      }
 +
 +      if {[catch {
++              set enc [get_path_encoding $current_diff_path]
 +              set p [eval git_write $apply_cmd]
-               fconfigure $p -translation binary -encoding binary
++              fconfigure $p -translation binary -encoding $enc
 +              puts -nonewline $p $current_diff_header
 +              puts -nonewline $p [$ui_diff get $s_lno $e_lno]
 +              close $p} err]} {
 +              error_popup [append $failed_msg "\n\n$err"]
 +              unlock_index
 +              return
 +      }
 +
 +      $ui_diff conf -state normal
 +      $ui_diff delete $s_lno $e_lno
 +      $ui_diff conf -state disabled
 +
 +      if {[$ui_diff get 1.0 end] eq "\n"} {
 +              set o _
 +      } else {
 +              set o ?
 +      }
 +
 +      if {$current_diff_side eq $ui_index} {
 +              set mi ${o}M
 +      } elseif {[string index $mi 0] eq {_}} {
 +              set mi M$o
 +      } else {
 +              set mi ?$o
 +      }
 +      unlock_index
 +      display_file $current_diff_path $mi
 +      # This should trigger shift to the next changed file
 +      if {$o eq {_}} {
 +              reshow_diff
 +      }
 +}
 +
 +proc apply_line {x y} {
 +      global current_diff_path current_diff_header current_diff_side
 +      global ui_diff ui_index file_states
 +
 +      if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +      if {![lock_index apply_hunk]} return
 +
 +      set apply_cmd {apply --cached --whitespace=nowarn}
 +      set mi [lindex $file_states($current_diff_path) 0]
 +      if {$current_diff_side eq $ui_index} {
 +              set failed_msg [mc "Failed to unstage selected line."]
 +              set to_context {+}
 +              lappend apply_cmd --reverse
 +              if {[string index $mi 0] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      } else {
 +              set failed_msg [mc "Failed to stage selected line."]
 +              set to_context {-}
 +              if {[string index $mi 1] ne {M}} {
 +                      unlock_index
 +                      return
 +              }
 +      }
 +
 +      set the_l [$ui_diff index @$x,$y]
 +
 +      # operate only on change lines
 +      set c1 [$ui_diff get "$the_l linestart"]
 +      if {$c1 ne {+} && $c1 ne {-}} {
 +              unlock_index
 +              return
 +      }
 +      set sign $c1
 +
 +      set i_l [$ui_diff search -backwards -regexp ^@@ $the_l 0.0]
 +      if {$i_l eq {}} {
 +              unlock_index
 +              return
 +      }
 +      # $i_l is now at the beginning of a line
 +
 +      # pick start line number from hunk header
 +      set hh [$ui_diff get $i_l "$i_l + 1 lines"]
 +      set hh [lindex [split $hh ,] 0]
 +      set hln [lindex [split $hh -] 1]
 +
 +      # There is a special situation to take care of. Consider this hunk:
 +      #
 +      #    @@ -10,4 +10,4 @@
 +      #     context before
 +      #    -old 1
 +      #    -old 2
 +      #    +new 1
 +      #    +new 2
 +      #     context after
 +      #
 +      # We used to keep the context lines in the order they appear in the
 +      # hunk. But then it is not possible to correctly stage only
 +      # "-old 1" and "+new 1" - it would result in this staged text:
 +      #
 +      #    context before
 +      #    old 2
 +      #    new 1
 +      #    context after
 +      #
 +      # (By symmetry it is not possible to *un*stage "old 2" and "new 2".)
 +      #
 +      # We resolve the problem by introducing an asymmetry, namely, when
 +      # a "+" line is *staged*, it is moved in front of the context lines
 +      # that are generated from the "-" lines that are immediately before
 +      # the "+" block. That is, we construct this patch:
 +      #
 +      #    @@ -10,4 +10,5 @@
 +      #     context before
 +      #    +new 1
 +      #     old 1
 +      #     old 2
 +      #     context after
 +      #
 +      # But we do *not* treat "-" lines that are *un*staged in a special
 +      # way.
 +      #
 +      # With this asymmetry it is possible to stage the change
 +      # "old 1" -> "new 1" directly, and to stage the change
 +      # "old 2" -> "new 2" by first staging the entire hunk and
 +      # then unstaging the change "old 1" -> "new 1".
 +
 +      # This is non-empty if and only if we are _staging_ changes;
 +      # then it accumulates the consecutive "-" lines (after converting
 +      # them to context lines) in order to be moved after the "+" change
 +      # line.
 +      set pre_context {}
 +
 +      set n 0
 +      set i_l [$ui_diff index "$i_l + 1 lines"]
 +      set patch {}
 +      while {[$ui_diff compare $i_l < "end - 1 chars"] &&
 +             [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} {
 +              set next_l [$ui_diff index "$i_l + 1 lines"]
 +              set c1 [$ui_diff get $i_l]
 +              if {[$ui_diff compare $i_l <= $the_l] &&
 +                  [$ui_diff compare $the_l < $next_l]} {
 +                      # the line to stage/unstage
 +                      set ln [$ui_diff get $i_l $next_l]
 +                      if {$c1 eq {-}} {
 +                              set n [expr $n+1]
 +                              set patch "$patch$pre_context$ln"
 +                      } else {
 +                              set patch "$patch$ln$pre_context"
 +                      }
 +                      set pre_context {}
 +              } elseif {$c1 ne {-} && $c1 ne {+}} {
 +                      # context line
 +                      set ln [$ui_diff get $i_l $next_l]
 +                      set patch "$patch$pre_context$ln"
 +                      set n [expr $n+1]
 +                      set pre_context {}
 +              } elseif {$c1 eq $to_context} {
 +                      # turn change line into context line
 +                      set ln [$ui_diff get "$i_l + 1 chars" $next_l]
 +                      if {$c1 eq {-}} {
 +                              set pre_context "$pre_context $ln"
 +                      } else {
 +                              set patch "$patch $ln"
 +                      }
 +                      set n [expr $n+1]
 +              }
 +              set i_l $next_l
 +      }
 +      set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
 +
 +      if {[catch {
++              set enc [get_path_encoding $current_diff_path]
 +              set p [eval git_write $apply_cmd]
++              fconfigure $p -translation binary -encoding $enc
 +              puts -nonewline $p $current_diff_header
 +              puts -nonewline $p $patch
 +              close $p} err]} {
 +              error_popup [append $failed_msg "\n\n$err"]
 +      }
 +
 +      unlock_index
 +}

diff --cc git-gui/lib/encoding.tcl
index 7f06b0d47f0fa214c98644757f99f8a036b9689e,0000000000000000000000000000000000000000..32668fc9c6debee6de9882719c305392c1e4791a
mode 100644,000000..100644
--- 1/git-gui/lib/encoding.tcl
--- /dev/null
+++ b/git-gui/lib/encoding.tcl
@@@ -1,276 -1,0 +1,466 @@@
-     { Shift_JIS MS_Kanji csShiftJIS }
 +# 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 }
-     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]
++    { Shift_JIS MS_Kanji csShiftJIS ShiftJIS Shift-JIS }
 +    { 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 }
 +}
 +
++set encoding_groups {
++    {"" ""
++      {"Unicode" UTF-8}
++      {"Western" ISO-8859-1}}
++    {we "West European"
++      {"Western" ISO-8859-15 CP-437 CP-850 MacRoman CP-1252 Windows-1252}
++      {"Celtic" ISO-8859-14}
++      {"Greek" ISO-8859-14 ISO-8859-7 CP-737 CP-869 MacGreek CP-1253 Windows-1253}
++      {"Icelandic" MacIceland MacIcelandic CP-861}
++      {"Nordic" ISO-8859-10 CP-865}
++      {"Portuguese" CP-860}
++      {"South European" ISO-8859-3}}
++    {ee "East European"
++      {"Baltic" CP-775 ISO-8859-4 ISO-8859-13 CP-1257 Windows-1257}
++      {"Central European" CP-852 ISO-8859-2 MacCE CP-1250 Windows-1250}
++      {"Croatian" MacCroatian}
++      {"Cyrillic" CP-855 ISO-8859-5 ISO-IR-111 KOI8-R MacCyrillic CP-1251 Windows-1251}
++      {"Russian" CP-866}
++      {"Ukrainian" KOI8-U MacUkraine MacUkrainian}
++      {"Romanian" ISO-8859-16 MacRomania MacRomanian}}
++    {ea "East Asian"
++      {"Generic" ISO-2022}
++      {"Chinese Simplified" GB2312 GB1988 GB12345 GB2312-RAW GBK EUC-CN GB18030 HZ ISO-2022-CN}
++      {"Chinese Traditional" Big5 Big5-HKSCS EUC-TW CP-950}
++      {"Japanese" EUC-JP ISO-2022-JP Shift-JIS JIS-0212 JIS-0208 JIS-0201 CP-932 MacJapan}
++      {"Korean" EUC-KR UHC JOHAB ISO-2022-KR CP-949 KSC5601}}
++    {sa "SE & SW Asian"
++      {"Armenian" ARMSCII-8}
++      {"Georgian" GEOSTD8}
++      {"Thai" TIS-620 ISO-8859-11 CP-874 Windows-874 MacThai}
++      {"Turkish" CP-857 CP857 ISO-8859-9 MacTurkish CP-1254 Windows-1254}
++      {"Vietnamese" TCVN VISCII VPS CP-1258 Windows-1258}
++      {"Hindi" MacDevanagari}
++      {"Gujarati" MacGujarati}
++      {"Gurmukhi" MacGurmukhi}}
++    {me "Middle Eastern"
++      {"Arabic" ISO-8859-6 Windows-1256 CP-1256 CP-864 MacArabic}
++      {"Farsi" MacFarsi}
++      {"Hebrew" ISO-8859-8-I Windows-1255 CP-1255 ISO-8859-8 CP-862 MacHebrew}}
++    {mi "Misc"
++      {"7-bit" ASCII}
++      {"16-bit" Unicode}
++      {"Legacy" CP-863 EBCDIC}
++      {"Symbol" Symbol Dingbats MacDingbats MacCentEuro}}
++}
++
++proc build_encoding_table {} {
++      global encoding_aliases encoding_lookup_table
++
++      # Prepare the lookup list; cannot use lsort -nocase because
++      # of compatibility issues with older Tcl (e.g. in msysgit)
++      set names [list]
++      foreach item [encoding names] {
++              lappend names [list [string tolower $item] $item]
++      }
++      set names [lsort -ascii -index 0 $names]
++      # neither can we use lsearch -index
++      set lnames [list]
++      foreach item $names {
++              lappend lnames [lindex $item 0]
++      }
++
++      foreach grp $encoding_aliases {
++              set target {}
++              foreach item $grp {
++                      set i [lsearch -sorted -ascii $lnames \
++                                      [string tolower $item]]
++                      if {$i >= 0} {
++                              set target [lindex $names $i 1]
++                              break
++                      }
++              }
++              if {$target eq {}} continue
++              foreach item $grp {
++                      set encoding_lookup_table([string tolower $item]) $target
++              }
++      }
++
++      foreach item $names {
++              set encoding_lookup_table([lindex $item 0]) [lindex $item 1]
++      }
++}
++
 +proc tcl_encoding {enc} {
-     }
-     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]
-                   }
++      global encoding_lookup_table
++      if {$enc eq {}} {
++              return {}
++      }
++      if {![info exists encoding_lookup_table]} {
++              build_encoding_table
++      }
++      set enc [string tolower $enc]
++      if {![info exists encoding_lookup_table($enc)]} {
++              # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
++              if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
++                      set enc $encx
++              }
++      }
++      if {[info exists encoding_lookup_table($enc)]} {
++              return $encoding_lookup_table($enc)
++      } else {
++              return {}
++      }
++}
++
++proc force_path_encoding {path enc} {
++      global path_encoding_overrides last_encoding_override
++
++      set enc [tcl_encoding $enc]
++      if {$enc eq {}} {
++              catch { unset last_encoding_override }
++              catch { unset path_encoding_overrides($path) }
++      } else {
++              set last_encoding_override $enc
++              if {$path ne {}} {
++                      set path_encoding_overrides($path) $enc
++              }
++      }
++}
++
++proc get_path_encoding {path} {
++      global path_encoding_overrides last_encoding_override
++
++      if {[info exists last_encoding_override]} {
++              set tcl_enc $last_encoding_override
++      } else {
++              set tcl_enc [tcl_encoding [get_config gui.encoding]]
 +      }
-               if {$i >= 0} break
-           }
-           break
++      if {$tcl_enc eq {}} {
++              set tcl_enc [encoding system]
++      }
++      if {$path ne {}} {
++              if {[info exists path_encoding_overrides($path)]} {
++                      set enc2 $path_encoding_overrides($path)
++              } else {
++                      set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
++              }
++              if {$enc2 ne {}} {
++                      set tcl_enc $enc2
++              }
++      }
++      return $tcl_enc
++}
++
++proc build_encoding_submenu {parent grp cmd} {
++      global used_encodings
++
++      set mid [lindex $grp 0]
++      set gname [mc [lindex $grp 1]]
++
++      set smenu {}
++      foreach subset [lrange $grp 2 end] {
++              set name [mc [lindex $subset 0]]
++
++              foreach enc [lrange $subset 1 end] {
++                      set tcl_enc [tcl_encoding $enc]
++                      if {$tcl_enc eq {}} continue
++
++                      if {$smenu eq {}} {
++                              if {$mid eq {}} {
++                                      set smenu $parent
++                              } else {
++                                      set smenu "$parent.$mid"
++                                      menu $smenu
++                                      $parent add cascade \
++                                              -label $gname \
++                                              -menu $smenu
++                              }
++                      }
++
++                      if {$name ne {}} {
++                              set lbl "$name ($enc)"
++                      } else {
++                              set lbl $enc
++                      }
++                      $smenu add command \
++                              -label $lbl \
++                              -command [concat $cmd [list $tcl_enc]]
++
++                      lappend used_encodings $tcl_enc
++              }
++      }
++}
++
++proc popup_btn_menu {m b} {
++      tk_popup $m [winfo pointerx $b] [winfo pointery $b]
++}
++
++proc build_encoding_menu {emenu cmd {nodef 0}} {
++      $emenu configure -postcommand \
++              [list do_build_encoding_menu $emenu $cmd $nodef]
++}
++
++proc do_build_encoding_menu {emenu cmd {nodef 0}} {
++      global used_encodings encoding_groups
++
++      $emenu configure -postcommand {}
++
++      if {!$nodef} {
++              $emenu add command \
++                      -label [mc "Default"] \
++                      -command [concat $cmd [list {}]]
++      }
++      set sysenc [encoding system]
++      $emenu add command \
++              -label [mc "System (%s)" $sysenc] \
++              -command [concat $cmd [list $sysenc]]
++
++      # Main encoding tree
++      set used_encodings [list identity]
++      $emenu add separator
++      foreach grp $encoding_groups {
++              build_encoding_submenu $emenu $grp $cmd
++      }
++
++      # Add unclassified encodings
++      set unused_grp [list [mc Other]]
++      foreach enc [encoding names] {
++              if {[lsearch -exact $used_encodings $enc] < 0} {
++                      lappend unused_grp $enc
 +              }
-     }
-     if {$i >= 0} {
-       return [lindex $names $i]
-     }
-     return {}
 +      }
++      build_encoding_submenu $emenu [list other [mc Other] $unused_grp] $cmd
 +}

diff --cc git-gui/lib/mergetool.tcl
index 79c58bc7bc8c79a13acd1370b184a530d67eaa20,0000000000000000000000000000000000000000..6ab5701d937b9a719570907e745609b60d1d56a8
mode 100644,000000..100644
--- 1/git-gui/lib/mergetool.tcl
--- /dev/null
+++ b/git-gui/lib/mergetool.tcl
@@@ -1,373 -1,0 +1,400 @@@
-               1 { set target [mc "the base version"] }
-               2 { set target [mc "this branch"] }
-               3 { set target [mc "the other branch"] }
 +# git-gui merge conflict resolution
 +# parts based on git-mergetool (c) 2006 Theodore Y. Ts'o
 +
 +proc merge_resolve_one {stage} {
 +      global current_diff_path
 +
 +      switch -- $stage {
-       set op_question [mc "Force resolution to %s?
- Note that the diff shows only conflicting changes.
++              1 { set targetquestion [mc "Force resolution to the base version?"] }
++              2 { set targetquestion [mc "Force resolution to this branch?"] }
++              3 { set targetquestion [mc "Force resolution to the other branch?"] }
 +      }
 +
-               $target [short_path $current_diff_path]]
++      set op_question [strcat $targetquestion "\n" \
++[mc "Note that the diff shows only conflicting changes.
 +
 +%s will be overwritten.
 +
 +This operation can be undone only by restarting the merge." \
++              [short_path $current_diff_path]]]
 +
 +      if {[ask_popup $op_question] eq {yes}} {
 +              merge_load_stages $current_diff_path [list merge_force_stage $stage]
 +      }
 +}
 +
++proc merge_stage_workdir {path w lno} {
++      global current_diff_path diff_active
++
++      if {$diff_active} return
++
++      if {$path ne $current_diff_path} {
++              show_diff $path $w $lno {} [list do_merge_stage_workdir $path]
++      } else {
++              do_merge_stage_workdir $path
++      }
++}
++
++proc do_merge_stage_workdir {path} {
++      global current_diff_path is_conflict_diff
++
++      if {$path ne $current_diff_path} return;
++
++      if {$is_conflict_diff} {
++              if {[ask_popup [mc "File %s seems to have unresolved conflicts, still stage?" \
++                              [short_path $path]]] ne {yes}} {
++                      return
++              }
++      }
++
++      merge_add_resolution $path
++}
++
 +proc merge_add_resolution {path} {
 +      global current_diff_path ui_workdir
 +
 +      set after [next_diff_after_action $ui_workdir $path {} {^_?U}]
 +
 +      update_index \
 +              [mc "Adding resolution for %s" [short_path $path]] \
 +              [list $path] \
 +              [concat $after [list ui_ready]]
 +}
 +
 +proc merge_force_stage {stage} {
 +      global current_diff_path merge_stages
 +
 +      if {$merge_stages($stage) ne {}} {
 +              git checkout-index -f --stage=$stage -- $current_diff_path
 +      } else {
 +              file delete -- $current_diff_path
 +      }
 +
 +      merge_add_resolution $current_diff_path
 +}
 +
 +proc merge_load_stages {path cont} {
 +      global merge_stages_fd merge_stages merge_stages_buf
 +
 +      if {[info exists merge_stages_fd]} {
 +              catch { kill_file_process $merge_stages_fd }
 +              catch { close $merge_stages_fd }
 +      }
 +
 +      set merge_stages(0) {}
 +      set merge_stages(1) {}
 +      set merge_stages(2) {}
 +      set merge_stages(3) {}
 +      set merge_stages_buf {}
 +
 +      set merge_stages_fd [eval git_read ls-files -u -z -- $path]
 +
 +      fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary
 +      fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]
 +}
 +
 +proc read_merge_stages {fd cont} {
 +      global merge_stages_buf merge_stages_fd merge_stages
 +
 +      append merge_stages_buf [read $fd]
 +      set pck [split $merge_stages_buf "\0"]
 +      set merge_stages_buf [lindex $pck end]
 +
 +      if {[eof $fd] && $merge_stages_buf ne {}} {
 +              lappend pck {}
 +              set merge_stages_buf {}
 +      }
 +
 +      foreach p [lrange $pck 0 end-1] {
 +              set fcols [split $p "\t"]
 +              set cols  [split [lindex $fcols 0] " "]
 +              set stage [lindex $cols 2]
 +              
 +              set merge_stages($stage) [lrange $cols 0 1]
 +      }
 +
 +      if {[eof $fd]} {
 +              close $fd
 +              unset merge_stages_fd
 +              eval $cont
 +      }
 +}
 +
 +proc merge_resolve_tool {} {
 +      global current_diff_path
 +
 +      merge_load_stages $current_diff_path [list merge_resolve_tool2]
 +}
 +
 +proc merge_resolve_tool2 {} {
 +      global current_diff_path merge_stages
 +
 +      # Validate the stages
 +      if {$merge_stages(2) eq {} ||
 +          [lindex $merge_stages(2) 0] eq {120000} ||
 +          [lindex $merge_stages(2) 0] eq {160000} ||
 +          $merge_stages(3) eq {} ||
 +          [lindex $merge_stages(3) 0] eq {120000} ||
 +          [lindex $merge_stages(3) 0] eq {160000}
 +      } {
 +              error_popup [mc "Cannot resolve deletion or link conflicts using a tool"]
 +              return
 +      }
 +
 +      if {![file exists $current_diff_path]} {
 +              error_popup [mc "Conflict file does not exist"]
 +              return
 +      }
 +
 +      # Determine the tool to use
 +      set tool [get_config merge.tool]
 +      if {$tool eq {}} { set tool meld }
 +
 +      set merge_tool_path [get_config "mergetool.$tool.path"]
 +      if {$merge_tool_path eq {}} {
 +              switch -- $tool {
 +              emerge { set merge_tool_path "emacs" }
 +              araxis { set merge_tool_path "compare" }
 +              default { set merge_tool_path $tool }
 +              }
 +      }
 +
 +      # Make file names
 +      set filebase [file rootname $current_diff_path]
 +      set fileext  [file extension $current_diff_path]
 +      set basename [lindex [file split $current_diff_path] end]
 +
 +      set MERGED   $current_diff_path
 +      set BASE     "./$MERGED.BASE$fileext"
 +      set LOCAL    "./$MERGED.LOCAL$fileext"
 +      set REMOTE   "./$MERGED.REMOTE$fileext"
 +      set BACKUP   "./$MERGED.BACKUP$fileext"
 +
 +      set base_stage $merge_stages(1)
 +
 +      # Build the command line
 +      switch -- $tool {
 +      kdiff3 {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Base)" \
 +                              --L2 "$MERGED (Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" --auto --L1 "$MERGED (Local)" \
 +                              --L2 "$MERGED (Remote)" -o "$MERGED" "$LOCAL" "$REMOTE"]
 +              }
 +      }
 +      tkdiff {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"]
 +              }
 +      }
 +      meld {
 +              set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"]
 +      }
 +      gvimdiff {
 +              set cmdline [list "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"]
 +      }
 +      xxdiff {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" -X --show-merged-pane \
 +                                          -R {Accel.SaveAsMerged: "Ctrl-S"} \
 +                                          -R {Accel.Search: "Ctrl+F"} \
 +                                          -R {Accel.SearchForward: "Ctrl-G"} \
 +                                          --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" -X --show-merged-pane \
 +                                          -R {Accel.SaveAsMerged: "Ctrl-S"} \
 +                                          -R {Accel.Search: "Ctrl+F"} \
 +                                          -R {Accel.SearchForward: "Ctrl-G"} \
 +                                          --merged-file "$MERGED" "$LOCAL" "$REMOTE"]
 +              }
 +      }
 +      opendiff {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED"]
 +              }
 +      }
 +      ecmerge {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" --default --mode=merge2 --to="$MERGED"]
 +              }
 +      }
 +      emerge {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" -f emerge-files-with-ancestor-command \
 +                                      "$LOCAL" "$REMOTE" "$BASE" "$basename"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" -f emerge-files-command \
 +                                      "$LOCAL" "$REMOTE" "$basename"]
 +              }
 +      }
 +      winmerge {
 +              if {$base_stage ne {}} {
 +                      # This tool does not support 3-way merges.
 +                      # Use the 'conflict file' resolution feature instead.
 +                      set cmdline [list "$merge_tool_path" -e -ub "$MERGED"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" -e -ub -wl \
 +                              -dl "Theirs File" -dr "Mine File" "$REMOTE" "$LOCAL" "$MERGED"]
 +              }
 +      }
 +      araxis {
 +              if {$base_stage ne {}} {
 +                      set cmdline [list "$merge_tool_path" -wait -merge -3 -a1 \
 +                              -title1:"'$MERGED (Base)'" -title2:"'$MERGED (Local)'" \
 +                              -title3:"'$MERGED (Remote)'" \
 +                              "$BASE" "$LOCAL" "$REMOTE" "$MERGED"]
 +              } else {
 +                      set cmdline [list "$merge_tool_path" -wait -2 \
 +                               -title1:"'$MERGED (Local)'" -title2:"'$MERGED (Remote)'" \
 +                               "$LOCAL" "$REMOTE" "$MERGED"]
 +              }
 +      }
 +      p4merge {
 +              set cmdline [list "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"]
 +      }
 +      vimdiff {
 +              error_popup [mc "Not a GUI merge tool: '%s'" $tool]
 +              return
 +      }
 +      default {
 +              error_popup [mc "Unsupported merge tool '%s'" $tool]
 +              return
 +      }
 +      }
 +
 +      merge_tool_start $cmdline $MERGED $BACKUP [list $BASE $LOCAL $REMOTE]
 +}
 +
 +proc delete_temp_files {files} {
 +      foreach fname $files {
 +              file delete $fname
 +      }
 +}
 +
 +proc merge_tool_get_stages {target stages} {
 +      global merge_stages
 +
 +      set i 1
 +      foreach fname $stages {
 +              if {$merge_stages($i) eq {}} {
 +                      file delete $fname
 +                      catch { close [open $fname w] }
 +              } else {
 +                      # A hack to support autocrlf properly
 +                      git checkout-index -f --stage=$i -- $target
 +                      file rename -force -- $target $fname
 +              }
 +              incr i
 +      }
 +}
 +
 +proc merge_tool_start {cmdline target backup stages} {
 +      global merge_stages mtool_target mtool_tmpfiles mtool_fd mtool_mtime
 +
 +      if {[info exists mtool_fd]} {
 +              if {[ask_popup [mc "Merge tool is already running, terminate it?"]] eq {yes}} {
 +                      catch { kill_file_process $mtool_fd }
 +                      catch { close $mtool_fd }
 +                      unset mtool_fd
 +
 +                      set old_backup [lindex $mtool_tmpfiles end]
 +                      file rename -force -- $old_backup $mtool_target
 +                      delete_temp_files $mtool_tmpfiles
 +              } else {
 +                      return
 +              }
 +      }
 +
 +      # Save the original file
 +      file rename -force -- $target $backup
 +
 +      # Get the blobs; it destroys $target
 +      if {[catch {merge_tool_get_stages $target $stages} err]} {
 +              file rename -force -- $backup $target
 +              delete_temp_files $stages
 +              error_popup [mc "Error retrieving versions:\n%s" $err]
 +              return
 +      }
 +
 +      # Restore the conflict file
 +      file copy -force -- $backup $target
 +
 +      # Initialize global state
 +      set mtool_target $target
 +      set mtool_mtime [file mtime $target]
 +      set mtool_tmpfiles $stages
 +
 +      lappend mtool_tmpfiles $backup
 +
 +      # Force redirection to avoid interpreting output on stderr
 +      # as an error, and launch the tool
 +      lappend cmdline {2>@1}
 +
 +      if {[catch { set mtool_fd [_open_stdout_stderr $cmdline] } err]} {
 +              delete_temp_files $mtool_tmpfiles
 +              error_popup [mc "Could not start the merge tool:\n\n%s" $err]
 +              return
 +      }
 +
 +      ui_status [mc "Running merge tool..."]
 +
 +      fconfigure $mtool_fd -blocking 0 -translation binary -encoding binary
 +      fileevent $mtool_fd readable [list read_mtool_output $mtool_fd]
 +}
 +
 +proc read_mtool_output {fd} {
 +      global mtool_fd mtool_tmpfiles
 +
 +      read $fd
 +      if {[eof $fd]} {
 +              unset mtool_fd
 +
 +              fconfigure $fd -blocking 1
 +              merge_tool_finish $fd
 +      }
 +}
 +
 +proc merge_tool_finish {fd} {
 +      global mtool_tmpfiles mtool_target mtool_mtime
 +
 +      set backup [lindex $mtool_tmpfiles end]
 +      set failed 0
 +
 +      # Check the return code
 +      if {[catch {close $fd} err]} {
 +              set failed 1
 +              if {$err ne {child process exited abnormally}} {
 +                      error_popup [strcat [mc "Merge tool failed."] "\n\n$err"]
 +              }
 +      }
 +
 +      # Check the modification time of the target file
 +      if {!$failed && [file mtime $mtool_target] eq $mtool_mtime} {
 +              if {[ask_popup [mc "File %s unchanged, still accept as resolved?" \
 +                              [short_path $mtool_target]]] ne {yes}} {
 +                      set failed 1
 +              }
 +      }
 +
 +      # Finish
 +      if {$failed} {
 +              file rename -force -- $backup $mtool_target
 +              delete_temp_files $mtool_tmpfiles
 +              ui_status [mc "Merge tool failed."]
 +      } else {
 +              if {[is_config_true merge.keepbackup]} {
 +                      file rename -force -- $backup "$mtool_target.orig"
 +              }
 +
 +              delete_temp_files $mtool_tmpfiles
 +
 +              merge_add_resolution $mtool_target
 +      }
 +}

diff --cc git-gui/lib/option.tcl
index 9b865f6a754aeb0933e1696ae1c9ffaee899e936,0000000000000000000000000000000000000000..c80c9398786baa63a5023b3e0123a228d148ce34
mode 100644,000000..100644
--- 1/git-gui/lib/option.tcl
--- /dev/null
+++ b/git-gui/lib/option.tcl
@@@ -1,283 -1,0 +1,318 @@@
 +# git-gui options editor
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
++proc config_check_encodings {} {
++      global repo_config_new global_config_new
++
++      set enc $global_config_new(gui.encoding)
++      if {$enc eq {}} {
++              set global_config_new(gui.encoding) [encoding system]
++      } elseif {[tcl_encoding $enc] eq {}} {
++              error_popup [mc "Invalid global encoding '%s'" $enc]
++              return 0
++      }
++
++      set enc $repo_config_new(gui.encoding)
++      if {$enc eq {}} {
++              set repo_config_new(gui.encoding) [encoding system]
++      } elseif {[tcl_encoding $enc] eq {}} {
++              error_popup [mc "Invalid repo encoding '%s'" $enc]
++              return 0
++      }
++
++      return 1
++}
++
 +proc save_config {} {
 +      global default_config font_descs
 +      global repo_config global_config
 +      global repo_config_new global_config_new
 +      global ui_comm_spell
 +
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set font [lindex $option 1]
 +              font configure $font \
 +                      -family $global_config_new(gui.$font^^family) \
 +                      -size $global_config_new(gui.$font^^size)
 +              font configure ${font}bold \
 +                      -family $global_config_new(gui.$font^^family) \
 +                      -size $global_config_new(gui.$font^^size)
 +              font configure ${font}italic \
 +                      -family $global_config_new(gui.$font^^family) \
 +                      -size $global_config_new(gui.$font^^size)
 +              set global_config_new(gui.$name) [font configure $font]
 +              unset global_config_new(gui.$font^^family)
 +              unset global_config_new(gui.$font^^size)
 +      }
 +
 +      foreach name [array names default_config] {
 +              set value $global_config_new($name)
 +              if {$value ne $global_config($name)} {
 +                      if {$value eq $default_config($name)} {
 +                              catch {git config --global --unset $name}
 +                      } else {
 +                              regsub -all "\[{}\]" $value {"} value
 +                              git config --global $name $value
 +                      }
 +                      set global_config($name) $value
 +                      if {$value eq $repo_config($name)} {
 +                              catch {git config --unset $name}
 +                              set repo_config($name) $value
 +                      }
 +              }
 +      }
 +
 +      foreach name [array names default_config] {
 +              set value $repo_config_new($name)
 +              if {$value ne $repo_config($name)} {
 +                      if {$value eq $global_config($name)} {
 +                              catch {git config --unset $name}
 +                      } else {
 +                              regsub -all "\[{}\]" $value {"} value
 +                              git config $name $value
 +                      }
 +                      set repo_config($name) $value
 +              }
 +      }
 +
 +      if {[info exists repo_config(gui.spellingdictionary)]} {
 +              set value $repo_config(gui.spellingdictionary)
 +              if {$value eq {none}} {
 +                      if {[info exists ui_comm_spell]} {
 +                              $ui_comm_spell stop
 +                      }
 +              } elseif {[info exists ui_comm_spell]} {
 +                      $ui_comm_spell lang $value
 +              }
 +      }
 +}
 +
 +proc do_options {} {
 +      global repo_config global_config font_descs
 +      global repo_config_new global_config_new
 +      global ui_comm_spell
 +
 +      array unset repo_config_new
 +      array unset global_config_new
 +      foreach name [array names repo_config] {
 +              set repo_config_new($name) $repo_config($name)
 +      }
 +      load_config 1
 +      foreach name [array names repo_config] {
 +              switch -- $name {
 +              gui.diffcontext {continue}
 +              }
 +              set repo_config_new($name) $repo_config($name)
 +      }
 +      foreach name [array names global_config] {
 +              set global_config_new($name) $global_config($name)
 +      }
 +
 +      set w .options_editor
 +      toplevel $w
 +      wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
 +      frame $w.buttons
 +      button $w.buttons.restore -text [mc "Restore Defaults"] \
 +              -default normal \
 +              -command do_restore_defaults
 +      pack $w.buttons.restore -side left
 +      button $w.buttons.save -text [mc Save] \
 +              -default active \
 +              -command [list do_save_config $w]
 +      pack $w.buttons.save -side right
 +      button $w.buttons.cancel -text [mc "Cancel"] \
 +              -default normal \
 +              -command [list destroy $w]
 +      pack $w.buttons.cancel -side right -padx 5
 +      pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +      labelframe $w.repo -text [mc "%s Repository" [reponame]]
 +      labelframe $w.global -text [mc "Global (All Repositories)"]
 +      pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
 +      pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
 +
 +      set optid 0
 +      foreach option {
 +              {t user.name {mc "User Name"}}
 +              {t user.email {mc "Email Address"}}
 +
 +              {b merge.summary {mc "Summarize Merge Commits"}}
 +              {i-1..5 merge.verbosity {mc "Merge Verbosity"}}
 +              {b merge.diffstat {mc "Show Diffstat After Merge"}}
 +              {t merge.tool {mc "Use Merge Tool"}}
 +
 +              {b gui.trustmtime  {mc "Trust File Modification Timestamps"}}
 +              {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
 +              {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
 +              {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
 +              {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
 +              {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
 +              {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
 +              {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
 +              {t gui.newbranchtemplate {mc "New Branch Name Template"}}
++              {c gui.encoding {mc "Default File Contents Encoding"}}
 +              } {
 +              set type [lindex $option 0]
 +              set name [lindex $option 1]
 +              set text [eval [lindex $option 2]]
 +              incr optid
 +              foreach f {repo global} {
 +                      switch -glob -- $type {
 +                      b {
 +                              checkbutton $w.$f.$optid -text $text \
 +                                      -variable ${f}_config_new($name) \
 +                                      -onvalue true \
 +                                      -offvalue false
 +                              pack $w.$f.$optid -side top -anchor w
 +                      }
 +                      i-* {
 +                              regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
 +                              frame $w.$f.$optid
 +                              label $w.$f.$optid.l -text "$text:"
 +                              pack $w.$f.$optid.l -side left -anchor w -fill x
 +                              spinbox $w.$f.$optid.v \
 +                                      -textvariable ${f}_config_new($name) \
 +                                      -from $min \
 +                                      -to $max \
 +                                      -increment 1 \
 +                                      -width [expr {1 + [string length $max]}]
 +                              bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
 +                              pack $w.$f.$optid.v -side right -anchor e -padx 5
 +                              pack $w.$f.$optid -side top -anchor w -fill x
 +                      }
++                      c -
 +                      t {
 +                              frame $w.$f.$optid
 +                              label $w.$f.$optid.l -text "$text:"
 +                              entry $w.$f.$optid.v \
 +                                      -borderwidth 1 \
 +                                      -relief sunken \
 +                                      -width 20 \
 +                                      -textvariable ${f}_config_new($name)
 +                              pack $w.$f.$optid.l -side left -anchor w
 +                              pack $w.$f.$optid.v -side left -anchor w \
 +                                      -fill x -expand 1 \
 +                                      -padx 5
++                              if {$type eq {c}} {
++                                      menu $w.$f.$optid.m
++                                      build_encoding_menu $w.$f.$optid.m \
++                                              [list set ${f}_config_new($name)] 1
++                                      button $w.$f.$optid.b \
++                                              -text [mc "Change"] \
++                                              -command [list popup_btn_menu \
++                                                      $w.$f.$optid.m $w.$f.$optid.b]
++                                      pack $w.$f.$optid.b -side left -anchor w
++                              }
 +                              pack $w.$f.$optid -side top -anchor w -fill x
 +                      }
 +                      }
 +              }
 +      }
 +
 +      set all_dicts [linsert \
 +              [spellcheck::available_langs] \
 +              0 \
 +              none]
 +      incr optid
 +      foreach f {repo global} {
 +              if {![info exists ${f}_config_new(gui.spellingdictionary)]} {
 +                      if {[info exists ui_comm_spell]} {
 +                              set value [$ui_comm_spell lang]
 +                      } else {
 +                              set value none
 +                      }
 +                      set ${f}_config_new(gui.spellingdictionary) $value
 +              }
 +
 +              frame $w.$f.$optid
 +              label $w.$f.$optid.l -text [mc "Spelling Dictionary:"]
 +              eval tk_optionMenu $w.$f.$optid.v \
 +                      ${f}_config_new(gui.spellingdictionary) \
 +                      $all_dicts
 +              pack $w.$f.$optid.l -side left -anchor w -fill x
 +              pack $w.$f.$optid.v -side right -anchor e -padx 5
 +              pack $w.$f.$optid -side top -anchor w -fill x
 +      }
 +      unset all_dicts
 +
 +      set all_fonts [lsort [font families]]
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set font [lindex $option 1]
 +              set text [eval [lindex $option 2]]
 +
 +              set global_config_new(gui.$font^^family) \
 +                      [font configure $font -family]
 +              set global_config_new(gui.$font^^size) \
 +                      [font configure $font -size]
 +
 +              frame $w.global.$name
 +              label $w.global.$name.l -text "$text:"
 +              button $w.global.$name.b \
 +                      -text [mc "Change Font"] \
 +                      -command [list \
 +                              choose_font::pick \
 +                              $w \
 +                              [mc "Choose %s" $text] \
 +                              global_config_new(gui.$font^^family) \
 +                              global_config_new(gui.$font^^size) \
 +                              ]
 +              label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
 +              label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
 +              label $w.global.$name.pt -text [mc "pt."]
 +              pack $w.global.$name.l -side left -anchor w
 +              pack $w.global.$name.b -side right -anchor e
 +              pack $w.global.$name.pt -side right -anchor w
 +              pack $w.global.$name.s -side right -anchor w
 +              pack $w.global.$name.f -side right -anchor w
 +              pack $w.global.$name -side top -anchor w -fill x
 +      }
 +
 +      bind $w <Visibility> "grab $w; focus $w.buttons.save"
 +      bind $w <Key-Escape> "destroy $w"
 +      bind $w <Key-Return> [list do_save_config $w]
 +
 +      if {[is_MacOSX]} {
 +              set t [mc "Preferences"]
 +      } else {
 +              set t [mc "Options"]
 +      }
 +      wm title $w "[appname] ([reponame]): $t"
 +      tkwait window $w
 +}
 +
 +proc do_restore_defaults {} {
 +      global font_descs default_config repo_config
 +      global repo_config_new global_config_new
 +
 +      foreach name [array names default_config] {
 +              set repo_config_new($name) $default_config($name)
 +              set global_config_new($name) $default_config($name)
 +      }
 +
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set repo_config(gui.$name) $default_config(gui.$name)
 +      }
 +      apply_config
 +
 +      foreach option $font_descs {
 +              set name [lindex $option 0]
 +              set font [lindex $option 1]
 +              set global_config_new(gui.$font^^family) \
 +                      [font configure $font -family]
 +              set global_config_new(gui.$font^^size) \
 +                      [font configure $font -size]
 +      }
 +}
 +
 +proc do_save_config {w} {
++      if {![config_check_encodings]} return
 +      if {[catch {save_config} err]} {
 +              error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"]
 +      }
 +      reshow_diff
 +      destroy $w
 +}

diff --cc git-gui/po/de.po
index fa43947ad0cb43867545316d9a978bc1d67a88a2,0000000000000000000000000000000000000000..793cca1e798640400453e74e2a4b64863f76a540
mode 100644,000000..100644
--- 1/git-gui/po/de.po
--- /dev/null
+++ b/git-gui/po/de.po
@@@ -1,2037 -1,0 +1,2188 @@@
- "POT-Creation-Date: 2008-08-02 08:58+0200\n"
- "PO-Revision-Date: 2008-08-02 09:09+0200\n"
 +# Translation of git-gui to German.
 +# Copyright (C) 2007 Shawn Pearce, et al.
 +# This file is distributed under the same license as the git package.
 +# Christian Stimming <stimming@tuhh.de>, 2007
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: git-gui\n"
 +"Report-Msgid-Bugs-To: \n"
- #: git-gui.sh:1597
++"POT-Creation-Date: 2008-09-13 10:20+0200\n"
++"PO-Revision-Date: 2008-09-13 10:24+0200\n"
 +"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 +"Language-Team: German\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
 +#: git-gui.sh:763
 +msgid "git-gui: fatal error"
 +msgstr "git-gui: Programmfehler"
 +
 +#: git-gui.sh:593
 +#, tcl-format
 +msgid "Invalid font specified in %s:"
 +msgstr "Ungültige Zeichensatz-Angabe in %s:"
 +
 +#: git-gui.sh:620
 +msgid "Main Font"
 +msgstr "Programmschriftart"
 +
 +#: git-gui.sh:621
 +msgid "Diff/Console Font"
 +msgstr "Vergleich-Schriftart"
 +
 +#: git-gui.sh:635
 +msgid "Cannot find git in PATH."
 +msgstr "Git kann im PATH nicht gefunden werden."
 +
 +#: git-gui.sh:662
 +msgid "Cannot parse Git version string:"
 +msgstr "Git Versionsangabe kann nicht erkannt werden:"
 +
 +#: git-gui.sh:680
 +#, tcl-format
 +msgid ""
 +"Git version cannot be determined.\n"
 +"\n"
 +"%s claims it is version '%s'.\n"
 +"\n"
 +"%s requires at least Git 1.5.0 or later.\n"
 +"\n"
 +"Assume '%s' is version 1.5.0?\n"
 +msgstr ""
 +"Die Version von Git kann nicht bestimmt werden.\n"
 +"\n"
 +"»%s« behauptet, es sei Version »%s«.\n"
 +"\n"
 +"%s benötigt mindestens Git 1.5.0 oder höher.\n"
 +"\n"
 +"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 +
 +#: git-gui.sh:918
 +msgid "Git directory not found:"
 +msgstr "Git-Verzeichnis nicht gefunden:"
 +
 +#: git-gui.sh:925
 +msgid "Cannot move to top of working directory:"
 +msgstr ""
 +"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 +"werden:"
 +
 +#: git-gui.sh:932
 +msgid "Cannot use funny .git directory:"
 +msgstr "Unerwartete Struktur des .git Verzeichnis:"
 +
 +#: git-gui.sh:937
 +msgid "No working directory"
 +msgstr "Kein Arbeitsverzeichnis"
 +
 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
 +msgid "Refreshing file status..."
 +msgstr "Dateistatus aktualisieren..."
 +
 +#: git-gui.sh:1149
 +msgid "Scanning for modified files ..."
 +msgstr "Nach geänderten Dateien suchen..."
 +
 +#: git-gui.sh:1324 lib/browser.tcl:246
 +msgid "Ready."
 +msgstr "Bereit."
 +
 +#: git-gui.sh:1590
 +msgid "Unmodified"
 +msgstr "Unverändert"
 +
 +#: git-gui.sh:1592
 +msgid "Modified, not staged"
 +msgstr "Verändert, nicht bereitgestellt"
 +
 +#: git-gui.sh:1593 git-gui.sh:1598
 +msgid "Staged for commit"
 +msgstr "Bereitgestellt zum Eintragen"
 +
 +#: git-gui.sh:1594 git-gui.sh:1599
 +msgid "Portions staged for commit"
 +msgstr "Teilweise bereitgestellt zum Eintragen"
 +
 +#: git-gui.sh:1595 git-gui.sh:1600
 +msgid "Staged for commit, missing"
 +msgstr "Bereitgestellt zum Eintragen, fehlend"
 +
- #: git-gui.sh:2589
- msgid "Apply/Reverse Hunk"
- msgstr "Kontext anwenden/umkehren"
- 
- #: git-gui.sh:2696
- msgid "Apply/Reverse Line"
- msgstr "Zeile anwenden/umkehren"
- 
- #: git-gui.sh:2711
++#: git-gui.sh:1658
++msgid "File type changed, not staged"
++msgstr "Dateityp geändert, nicht bereitgestellt"
++
++#: git-gui.sh:1659
++msgid "File type changed, staged"
++msgstr "Dateityp geändert, bereitgestellt"
++
++#: git-gui.sh:1661
 +msgid "Untracked, not staged"
 +msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
 +
 +#: git-gui.sh:1602
 +msgid "Missing"
 +msgstr "Fehlend"
 +
 +#: git-gui.sh:1603
 +msgid "Staged for removal"
 +msgstr "Bereitgestellt zum Löschen"
 +
 +#: git-gui.sh:1604
 +msgid "Staged for removal, still present"
 +msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 +
 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
 +msgid "Requires merge resolution"
 +msgstr "Konfliktauflösung nötig"
 +
 +#: git-gui.sh:1644
 +msgid "Starting gitk... please wait..."
 +msgstr "Gitk wird gestartet... bitte warten."
 +
 +#: git-gui.sh:1698
 +msgid "Couldn't find gitk in PATH"
 +msgstr "Gitk kann im PATH nicht gefunden werden."
 +
 +#: git-gui.sh:1948 lib/choose_repository.tcl:36
 +msgid "Repository"
 +msgstr "Projektarchiv"
 +
 +#: git-gui.sh:1861
 +msgid "Edit"
 +msgstr "Bearbeiten"
 +
 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
 +msgid "Branch"
 +msgstr "Zweig"
 +
 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
 +msgid "Commit@@noun"
 +msgstr "Version"
 +
 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
 +msgid "Merge"
 +msgstr "Zusammenführen"
 +
 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
 +msgid "Remote"
 +msgstr "Andere Archive"
 +
 +#: git-gui.sh:1879
 +msgid "Browse Current Branch's Files"
 +msgstr "Aktuellen Zweig durchblättern"
 +
 +#: git-gui.sh:1883
 +msgid "Browse Branch Files..."
 +msgstr "Einen Zweig durchblättern..."
 +
 +#: git-gui.sh:1888
 +msgid "Visualize Current Branch's History"
 +msgstr "Aktuellen Zweig darstellen"
 +
 +#: git-gui.sh:1892
 +msgid "Visualize All Branch History"
 +msgstr "Alle Zweige darstellen"
 +
 +#: git-gui.sh:1899
 +#, tcl-format
 +msgid "Browse %s's Files"
 +msgstr "Zweig »%s« durchblättern"
 +
 +#: git-gui.sh:1901
 +#, tcl-format
 +msgid "Visualize %s's History"
 +msgstr "Historie von »%s« darstellen"
 +
 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
 +msgid "Database Statistics"
 +msgstr "Datenbankstatistik"
 +
 +#: git-gui.sh:1909 lib/database.tcl:34
 +msgid "Compress Database"
 +msgstr "Datenbank komprimieren"
 +
 +#: git-gui.sh:1912
 +msgid "Verify Database"
 +msgstr "Datenbank überprüfen"
 +
 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 +msgid "Create Desktop Icon"
 +msgstr "Desktop-Icon erstellen"
 +
 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
 +msgid "Quit"
 +msgstr "Beenden"
 +
 +#: git-gui.sh:1939
 +msgid "Undo"
 +msgstr "Rückgängig"
 +
 +#: git-gui.sh:1942
 +msgid "Redo"
 +msgstr "Wiederholen"
 +
 +#: git-gui.sh:1946 git-gui.sh:2443
 +msgid "Cut"
 +msgstr "Ausschneiden"
 +
 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
 +#: lib/console.tcl:69
 +msgid "Copy"
 +msgstr "Kopieren"
 +
 +#: git-gui.sh:1952 git-gui.sh:2449
 +msgid "Paste"
 +msgstr "Einfügen"
 +
 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
 +#: lib/remote_branch_delete.tcl:38
 +msgid "Delete"
 +msgstr "Löschen"
 +
 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
 +msgid "Select All"
 +msgstr "Alle auswählen"
 +
 +#: git-gui.sh:1968
 +msgid "Create..."
 +msgstr "Erstellen..."
 +
 +#: git-gui.sh:1974
 +msgid "Checkout..."
 +msgstr "Umstellen..."
 +
 +#: git-gui.sh:1980
 +msgid "Rename..."
 +msgstr "Umbenennen..."
 +
 +#: git-gui.sh:1985 git-gui.sh:2085
 +msgid "Delete..."
 +msgstr "Löschen..."
 +
 +#: git-gui.sh:1990
 +msgid "Reset..."
 +msgstr "Zurücksetzen..."
 +
 +#: git-gui.sh:2002 git-gui.sh:2389
 +msgid "New Commit"
 +msgstr "Neue Version"
 +
 +#: git-gui.sh:2010 git-gui.sh:2396
 +msgid "Amend Last Commit"
 +msgstr "Letzte nachbessern"
 +
 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
 +msgid "Rescan"
 +msgstr "Neu laden"
 +
 +#: git-gui.sh:2025
 +msgid "Stage To Commit"
 +msgstr "Zum Eintragen bereitstellen"
 +
 +#: git-gui.sh:2031
 +msgid "Stage Changed Files To Commit"
 +msgstr "Geänderte Dateien bereitstellen"
 +
 +#: git-gui.sh:2037
 +msgid "Unstage From Commit"
 +msgstr "Aus der Bereitstellung herausnehmen"
 +
 +#: git-gui.sh:2042 lib/index.tcl:395
 +msgid "Revert Changes"
 +msgstr "Änderungen verwerfen"
 +
 +#: git-gui.sh:2141 git-gui.sh:2702
 +msgid "Show Less Context"
 +msgstr "Weniger Zeilen anzeigen"
 +
 +#: git-gui.sh:2145 git-gui.sh:2706
 +msgid "Show More Context"
 +msgstr "Mehr Zeilen anzeigen"
 +
 +#: git-gui.sh:2151 git-gui.sh:2470 git-gui.sh:2569
 +msgid "Sign Off"
 +msgstr "Abzeichnen"
 +
 +#: git-gui.sh:2053 git-gui.sh:2372
 +msgid "Commit@@verb"
 +msgstr "Eintragen"
 +
 +#: git-gui.sh:2064
 +msgid "Local Merge..."
 +msgstr "Lokales Zusammenführen..."
 +
 +#: git-gui.sh:2069
 +msgid "Abort Merge..."
 +msgstr "Zusammenführen abbrechen..."
 +
 +#: git-gui.sh:2081
 +msgid "Push..."
 +msgstr "Versenden..."
 +
 +#: git-gui.sh:2197 git-gui.sh:2219 lib/about.tcl:14
 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
 +#, tcl-format
 +msgid "About %s"
 +msgstr "Über %s"
 +
 +#: git-gui.sh:2099
 +msgid "Preferences..."
 +msgstr "Einstellungen..."
 +
 +#: git-gui.sh:2107 git-gui.sh:2639
 +msgid "Options..."
 +msgstr "Optionen..."
 +
 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
 +msgid "Help"
 +msgstr "Hilfe"
 +
 +#: git-gui.sh:2154
 +msgid "Online Documentation"
 +msgstr "Online-Dokumentation"
 +
 +#: git-gui.sh:2238
 +#, tcl-format
 +msgid "fatal: cannot stat path %s: No such file or directory"
 +msgstr ""
 +"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
 +"nicht gefunden"
 +
 +#: git-gui.sh:2271
 +msgid "Current Branch:"
 +msgstr "Aktueller Zweig:"
 +
 +#: git-gui.sh:2292
 +msgid "Staged Changes (Will Commit)"
 +msgstr "Bereitstellung (zum Eintragen)"
 +
 +#: git-gui.sh:2312
 +msgid "Unstaged Changes"
 +msgstr "Nicht bereitgestellte Änderungen"
 +
 +#: git-gui.sh:2362
 +msgid "Stage Changed"
 +msgstr "Alles bereitstellen"
 +
 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
 +msgid "Push"
 +msgstr "Versenden"
 +
 +#: git-gui.sh:2408
 +msgid "Initial Commit Message:"
 +msgstr "Erste Versionsbeschreibung:"
 +
 +#: git-gui.sh:2409
 +msgid "Amended Commit Message:"
 +msgstr "Nachgebesserte Beschreibung:"
 +
 +#: git-gui.sh:2410
 +msgid "Amended Initial Commit Message:"
 +msgstr "Nachgebesserte erste Beschreibung:"
 +
 +#: git-gui.sh:2411
 +msgid "Amended Merge Commit Message:"
 +msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
 +
 +#: git-gui.sh:2412
 +msgid "Merge Commit Message:"
 +msgstr "Zusammenführungs-Beschreibung:"
 +
 +#: git-gui.sh:2413
 +msgid "Commit Message:"
 +msgstr "Versionsbeschreibung:"
 +
 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
 +msgid "Copy All"
 +msgstr "Alle kopieren"
 +
 +#: git-gui.sh:2483 lib/blame.tcl:107
 +msgid "File:"
 +msgstr "Datei:"
 +
- #: git-gui.sh:2646
++#: git-gui.sh:2834
 +msgid "Refresh"
 +msgstr "Aktualisieren"
 +
 +#: git-gui.sh:2631
 +msgid "Decrease Font Size"
 +msgstr "Schriftgröße verkleinern"
 +
 +#: git-gui.sh:2635
 +msgid "Increase Font Size"
 +msgstr "Schriftgröße vergrößern"
 +
- #: lib/blame.tcl:388
++#: git-gui.sh:2870
++msgid "Apply/Reverse Hunk"
++msgstr "Kontext anwenden/umkehren"
++
++#: git-gui.sh:2875
++msgid "Apply/Reverse Line"
++msgstr "Zeile anwenden/umkehren"
++
++#: git-gui.sh:2885
++msgid "Run Merge Tool"
++msgstr "Zusammenführungswerkzeug"
++
++#: git-gui.sh:2890
++msgid "Use Remote Version"
++msgstr "Entfernte Version benutzen"
++
++#: git-gui.sh:2894
++msgid "Use Local Version"
++msgstr "Lokale Version benutzen"
++
++#: git-gui.sh:2898
++msgid "Revert To Base"
++msgstr "Ursprüngliche Version benutzen"
++
++#: git-gui.sh:2906
++msgid "Stage Working Copy"
++msgstr "Arbeitskopie bereitstellen"
++
++#: git-gui.sh:2925
 +msgid "Unstage Hunk From Commit"
 +msgstr "Kontext aus Bereitstellung herausnehmen"
 +
 +#: git-gui.sh:2748
 +msgid "Unstage Line From Commit"
 +msgstr "Zeile aus der Bereitstellung herausnehmen"
 +
 +#: git-gui.sh:2750
 +msgid "Stage Hunk For Commit"
 +msgstr "Kontext zur Bereitstellung hinzufügen"
 +
 +#: git-gui.sh:2751
 +msgid "Stage Line For Commit"
 +msgstr "Zeile zur Bereitstellung hinzufügen"
 +
 +#: git-gui.sh:2771
 +msgid "Initializing..."
 +msgstr "Initialisieren..."
 +
 +#: git-gui.sh:2762
 +#, tcl-format
 +msgid ""
 +"Possible environment issues exist.\n"
 +"\n"
 +"The following environment variables are probably\n"
 +"going to be ignored by any Git subprocess run\n"
 +"by %s:\n"
 +"\n"
 +msgstr ""
 +"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n"
 +"\n"
 +"Die folgenden Umgebungsvariablen können vermutlich nicht \n"
 +"von %s an Git weitergegeben werden:\n"
 +"\n"
 +
 +#: git-gui.sh:2792
 +msgid ""
 +"\n"
 +"This is due to a known issue with the\n"
 +"Tcl binary distributed by Cygwin."
 +msgstr ""
 +"\n"
 +"Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 +"in Cygwin mitgeliefert wird."
 +
 +#: git-gui.sh:2797
 +#, tcl-format
 +msgid ""
 +"\n"
 +"\n"
 +"A good replacement for %s\n"
 +"is placing values for the user.name and\n"
 +"user.email settings into your personal\n"
 +"~/.gitconfig file.\n"
 +msgstr ""
 +"\n"
 +"\n"
 +"Um den Namen »%s« zu ändern, sollten Sie die \n"
 +"gewünschten Werte für die Einstellung user.name und \n"
 +"user.email in Ihre Datei ~/.gitconfig einfügen.\n"
 +
 +#: lib/about.tcl:26
 +msgid "git-gui - a graphical user interface for Git."
 +msgstr "git-gui - eine grafische Oberfläche für Git."
 +
 +#: lib/blame.tcl:77
 +msgid "File Viewer"
 +msgstr "Datei-Browser"
 +
 +#: lib/blame.tcl:81
 +msgid "Commit:"
 +msgstr "Version:"
 +
 +#: lib/blame.tcl:264
 +msgid "Copy Commit"
 +msgstr "Version kopieren"
 +
 +#: lib/blame.tcl:260
 +msgid "Do Full Copy Detection"
 +msgstr "Volle Kopie-Erkennung"
 +
- #: lib/blame.tcl:925
++#: lib/blame.tcl:263
++msgid "Show History Context"
++msgstr "Historien-Kontext anzeigen"
++
++#: lib/blame.tcl:266
++msgid "Blame Parent Commit"
++msgstr "Elternversion annotieren"
++
++#: lib/blame.tcl:394
 +#, tcl-format
 +msgid "Reading %s..."
 +msgstr "%s lesen..."
 +
 +#: lib/blame.tcl:488
 +msgid "Loading copy/move tracking annotations..."
 +msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
 +
 +#: lib/blame.tcl:508
 +msgid "lines annotated"
 +msgstr "Zeilen annotiert"
 +
 +#: lib/blame.tcl:689
 +msgid "Loading original location annotations..."
 +msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
 +
 +#: lib/blame.tcl:692
 +msgid "Annotation complete."
 +msgstr "Annotierung vollständig."
 +
 +#: lib/blame.tcl:737
 +msgid "Busy"
 +msgstr "Verarbeitung läuft"
 +
 +#: lib/blame.tcl:738
 +msgid "Annotation process is already running."
 +msgstr "Annotierung läuft bereits."
 +
 +#: lib/blame.tcl:777
 +msgid "Running thorough copy detection..."
 +msgstr "Intensive Kopie-Erkennung läuft..."
 +
 +#: lib/blame.tcl:827
 +msgid "Loading annotation..."
 +msgstr "Annotierung laden..."
 +
 +#: lib/blame.tcl:802
 +msgid "Author:"
 +msgstr "Autor:"
 +
 +#: lib/blame.tcl:806
 +msgid "Committer:"
 +msgstr "Eintragender:"
 +
 +#: lib/blame.tcl:811
 +msgid "Original File:"
 +msgstr "Ursprüngliche Datei:"
 +
- #: lib/diff.tcl:185
- msgid "Error loading diff:"
- msgstr "Fehler beim Laden des Vergleichs:"
- 
- #: lib/diff.tcl:303
++#: lib/blame.tcl:990
++msgid "Cannot find parent commit:"
++msgstr "Elternversion kann nicht gefunden werden:"
++
++#: lib/blame.tcl:1001
++msgid "Unable to display parent"
++msgstr "Elternversion kann nicht angezeigt werden"
++
++#: lib/blame.tcl:1002 lib/diff.tcl:191
++msgid "Error loading diff:"
++msgstr "Fehler beim Laden des Vergleichs:"
++
++#: lib/blame.tcl:1142
 +msgid "Originally By:"
 +msgstr "Ursprünglich von:"
 +
 +#: lib/blame.tcl:931
 +msgid "In File:"
 +msgstr "In Datei:"
 +
 +#: lib/blame.tcl:936
 +msgid "Copied Or Moved Here By:"
 +msgstr "Kopiert oder verschoben durch:"
 +
 +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 +msgid "Checkout Branch"
 +msgstr "Auf Zweig umstellen"
 +
 +#: lib/branch_checkout.tcl:23
 +msgid "Checkout"
 +msgstr "Umstellen"
 +
 +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 +msgid "Cancel"
 +msgstr "Abbrechen"
 +
 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
 +msgid "Revision"
 +msgstr "Version"
 +
 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
 +msgid "Options"
 +msgstr "Optionen"
 +
 +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
 +msgid "Fetch Tracking Branch"
 +msgstr "Übernahmezweig anfordern"
 +
 +#: lib/branch_checkout.tcl:44
 +msgid "Detach From Local Branch"
 +msgstr "Verbindung zu lokalem Zweig lösen"
 +
 +#: lib/branch_create.tcl:22
 +msgid "Create Branch"
 +msgstr "Zweig erstellen"
 +
 +#: lib/branch_create.tcl:27
 +msgid "Create New Branch"
 +msgstr "Neuen Zweig erstellen"
 +
 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
 +msgid "Create"
 +msgstr "Erstellen"
 +
 +#: lib/branch_create.tcl:40
 +msgid "Branch Name"
 +msgstr "Zweigname"
 +
 +#: lib/branch_create.tcl:43
 +msgid "Name:"
 +msgstr "Name:"
 +
 +#: lib/branch_create.tcl:58
 +msgid "Match Tracking Branch Name"
 +msgstr "Passend zu Übernahmezweig-Name"
 +
 +#: lib/branch_create.tcl:66
 +msgid "Starting Revision"
 +msgstr "Anfangsversion"
 +
 +#: lib/branch_create.tcl:72
 +msgid "Update Existing Branch:"
 +msgstr "Existierenden Zweig aktualisieren:"
 +
 +#: lib/branch_create.tcl:75
 +msgid "No"
 +msgstr "Nein"
 +
 +#: lib/branch_create.tcl:80
 +msgid "Fast Forward Only"
 +msgstr "Nur Schnellzusammenführung"
 +
 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 +msgid "Reset"
 +msgstr "Zurücksetzen"
 +
 +#: lib/branch_create.tcl:97
 +msgid "Checkout After Creation"
 +msgstr "Arbeitskopie umstellen nach Erstellen"
 +
 +#: lib/branch_create.tcl:131
 +msgid "Please select a tracking branch."
 +msgstr "Bitte wählen Sie einen Übernahmezweig."
 +
 +#: lib/branch_create.tcl:140
 +#, tcl-format
 +msgid "Tracking branch %s is not a branch in the remote repository."
 +msgstr "Übernahmezweig »%s« ist kein Zweig im anderen Projektarchiv."
 +
 +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 +msgid "Please supply a branch name."
 +msgstr "Bitte geben Sie einen Zweignamen an."
 +
 +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 +#, tcl-format
 +msgid "'%s' is not an acceptable branch name."
 +msgstr "»%s« ist kein zulässiger Zweigname."
 +
 +#: lib/branch_delete.tcl:15
 +msgid "Delete Branch"
 +msgstr "Zweig löschen"
 +
 +#: lib/branch_delete.tcl:20
 +msgid "Delete Local Branch"
 +msgstr "Lokalen Zweig löschen"
 +
 +#: lib/branch_delete.tcl:37
 +msgid "Local Branches"
 +msgstr "Lokale Zweige"
 +
 +#: lib/branch_delete.tcl:52
 +msgid "Delete Only If Merged Into"
 +msgstr "Nur löschen, wenn zusammengeführt nach"
 +
 +#: lib/branch_delete.tcl:54
 +msgid "Always (Do not perform merge test.)"
 +msgstr "Immer (ohne Zusammenführungstest)"
 +
 +#: lib/branch_delete.tcl:103
 +#, tcl-format
 +msgid "The following branches are not completely merged into %s:"
 +msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
 +
 +#: lib/branch_delete.tcl:115
 +msgid ""
 +"Recovering deleted branches is difficult. \n"
 +"\n"
 +" Delete the selected branches?"
 +msgstr ""
 +"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n"
 +"\n"
 +"Gewählte Zweige jetzt löschen?"
 +
 +#: lib/branch_delete.tcl:141
 +#, tcl-format
 +msgid ""
 +"Failed to delete branches:\n"
 +"%s"
 +msgstr ""
 +"Fehler beim Löschen der Zweige:\n"
 +"%s"
 +
 +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
 +msgid "Rename Branch"
 +msgstr "Zweig umbenennen"
 +
 +#: lib/branch_rename.tcl:26
 +msgid "Rename"
 +msgstr "Umbenennen"
 +
 +#: lib/branch_rename.tcl:36
 +msgid "Branch:"
 +msgstr "Zweig:"
 +
 +#: lib/branch_rename.tcl:39
 +msgid "New Name:"
 +msgstr "Neuer Name:"
 +
 +#: lib/branch_rename.tcl:75
 +msgid "Please select a branch to rename."
 +msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
 +
 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
 +#, tcl-format
 +msgid "Branch '%s' already exists."
 +msgstr "Zweig »%s« existiert bereits."
 +
 +#: lib/branch_rename.tcl:117
 +#, tcl-format
 +msgid "Failed to rename '%s'."
 +msgstr "Fehler beim Umbenennen von »%s«."
 +
 +#: lib/browser.tcl:17
 +msgid "Starting..."
 +msgstr "Starten..."
 +
 +#: lib/browser.tcl:26
 +msgid "File Browser"
 +msgstr "Datei-Browser"
 +
 +#: lib/browser.tcl:126 lib/browser.tcl:143
 +#, tcl-format
 +msgid "Loading %s..."
 +msgstr "%s laden..."
 +
 +#: lib/browser.tcl:187
 +msgid "[Up To Parent]"
 +msgstr "[Nach oben]"
 +
 +#: lib/browser.tcl:267 lib/browser.tcl:273
 +msgid "Browse Branch Files"
 +msgstr "Dateien des Zweigs durchblättern"
 +
 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
 +#: lib/choose_repository.tcl:987
 +msgid "Browse"
 +msgstr "Blättern"
 +
 +#: lib/checkout_op.tcl:79
 +#, tcl-format
 +msgid "Fetching %s from %s"
 +msgstr "Änderungen »%s« von »%s« anfordern"
 +
 +#: lib/checkout_op.tcl:127
 +#, tcl-format
 +msgid "fatal: Cannot resolve %s"
 +msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
 +
 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
 +msgid "Close"
 +msgstr "Schließen"
 +
 +#: lib/checkout_op.tcl:169
 +#, tcl-format
 +msgid "Branch '%s' does not exist."
 +msgstr "Zweig »%s« existiert nicht."
 +
 +#: lib/checkout_op.tcl:193
 +#, tcl-format
 +msgid "Failed to configure simplified git-pull for '%s'."
 +msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
 +
 +#: lib/checkout_op.tcl:228
 +#, tcl-format
 +msgid ""
 +"Branch '%s' already exists.\n"
 +"\n"
 +"It cannot fast-forward to %s.\n"
 +"A merge is required."
 +msgstr ""
 +"Zweig »%s« existiert bereits.\n"
 +"\n"
 +"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres "
 +"Zusammenführen ist notwendig."
 +
 +#: lib/checkout_op.tcl:220
 +#, tcl-format
 +msgid "Merge strategy '%s' not supported."
 +msgstr "Zusammenführungsmethode »%s« nicht unterstützt."
 +
 +#: lib/checkout_op.tcl:239
 +#, tcl-format
 +msgid "Failed to update '%s'."
 +msgstr "Aktualisieren von »%s« fehlgeschlagen."
 +
 +#: lib/checkout_op.tcl:251
 +msgid "Staging area (index) is already locked."
 +msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)."
 +
 +#: lib/checkout_op.tcl:266
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before the current branch can be changed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/checkout_op.tcl:322
 +#, tcl-format
 +msgid "Updating working directory to '%s'..."
 +msgstr "Arbeitskopie umstellen auf »%s«..."
 +
 +#: lib/checkout_op.tcl:323
 +msgid "files checked out"
 +msgstr "Dateien aktualisiert"
 +
 +#: lib/checkout_op.tcl:353
 +#, tcl-format
 +msgid "Aborted checkout of '%s' (file level merging is required)."
 +msgstr ""
 +"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist "
 +"notwendig)."
 +
 +#: lib/checkout_op.tcl:354
 +msgid "File level merge required."
 +msgstr "Zusammenführen der Dateien ist notwendig."
 +
 +#: lib/checkout_op.tcl:358
 +#, tcl-format
 +msgid "Staying on branch '%s'."
 +msgstr "Es wird auf Zweig »%s« verblieben."
 +
 +#: lib/checkout_op.tcl:429
 +msgid ""
 +"You are no longer on a local branch.\n"
 +"\n"
 +"If you wanted to be on a branch, create one now starting from 'This Detached "
 +"Checkout'."
 +msgstr ""
 +"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
 +"\n"
 +"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
 +"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
 +
 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
 +#, tcl-format
 +msgid "Checked out '%s'."
 +msgstr "Umgestellt auf »%s«."
 +
 +#: lib/checkout_op.tcl:478
 +#, tcl-format
 +msgid "Resetting '%s' to '%s' will lose the following commits:"
 +msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:"
 +
 +#: lib/checkout_op.tcl:500
 +msgid "Recovering lost commits may not be easy."
 +msgstr ""
 +"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt "
 +"werden."
 +
 +#: lib/checkout_op.tcl:505
 +#, tcl-format
 +msgid "Reset '%s'?"
 +msgstr "»%s« zurücksetzen?"
 +
 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
 +msgid "Visualize"
 +msgstr "Darstellen"
 +
 +#: lib/checkout_op.tcl:578
 +#, tcl-format
 +msgid ""
 +"Failed to set current branch.\n"
 +"\n"
 +"This working directory is only partially switched.  We successfully updated "
 +"your files, but failed to update an internal Git file.\n"
 +"\n"
 +"This should not have occurred.  %s will now close and give up."
 +msgstr ""
 +"Lokaler Zweig kann nicht gesetzt werden.\n"
 +"\n"
 +"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt "
 +"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert "
 +"werden.\n"
 +"\n"
 +"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
 +
 +#: lib/choose_font.tcl:39
 +msgid "Select"
 +msgstr "Auswählen"
 +
 +#: lib/choose_font.tcl:53
 +msgid "Font Family"
 +msgstr "Schriftfamilie"
 +
 +#: lib/choose_font.tcl:74
 +msgid "Font Size"
 +msgstr "Schriftgröße"
 +
 +#: lib/choose_font.tcl:91
 +msgid "Font Example"
 +msgstr "Schriftbeispiel"
 +
 +#: lib/choose_font.tcl:103
 +msgid ""
 +"This is example text.\n"
 +"If you like this text, it can be your font."
 +msgstr ""
 +"Dies ist ein Beispieltext.\n"
 +"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
 +
 +#: lib/choose_repository.tcl:28
 +msgid "Git Gui"
 +msgstr "Git Gui"
 +
 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
 +msgid "Create New Repository"
 +msgstr "Neues Projektarchiv"
 +
 +#: lib/choose_repository.tcl:87
 +msgid "New..."
 +msgstr "Neu..."
 +
 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
 +msgid "Clone Existing Repository"
 +msgstr "Projektarchiv klonen"
 +
 +#: lib/choose_repository.tcl:100
 +msgid "Clone..."
 +msgstr "Klonen..."
 +
 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
 +msgid "Open Existing Repository"
 +msgstr "Projektarchiv öffnen"
 +
 +#: lib/choose_repository.tcl:113
 +msgid "Open..."
 +msgstr "Öffnen..."
 +
 +#: lib/choose_repository.tcl:126
 +msgid "Recent Repositories"
 +msgstr "Zuletzt benutzte Projektarchive"
 +
 +#: lib/choose_repository.tcl:132
 +msgid "Open Recent Repository:"
 +msgstr "Zuletzt benutztes Projektarchiv öffnen:"
 +
 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
 +#: lib/choose_repository.tcl:310
 +#, tcl-format
 +msgid "Failed to create repository %s:"
 +msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
 +
 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
 +msgid "Directory:"
 +msgstr "Verzeichnis:"
 +
 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
 +#: lib/choose_repository.tcl:1011
 +msgid "Git Repository"
 +msgstr "Git Projektarchiv"
 +
 +#: lib/choose_repository.tcl:437
 +#, tcl-format
 +msgid "Directory %s already exists."
 +msgstr "Verzeichnis »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:441
 +#, tcl-format
 +msgid "File %s already exists."
 +msgstr "Datei »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:455
 +msgid "Clone"
 +msgstr "Klonen"
 +
 +#: lib/choose_repository.tcl:468
 +msgid "URL:"
 +msgstr "URL:"
 +
 +#: lib/choose_repository.tcl:489
 +msgid "Clone Type:"
 +msgstr "Art des Klonens:"
 +
 +#: lib/choose_repository.tcl:495
 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 +msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
 +
 +#: lib/choose_repository.tcl:501
 +msgid "Full Copy (Slower, Redundant Backup)"
 +msgstr "Alles kopieren (langsamer, volle Redundanz)"
 +
 +#: lib/choose_repository.tcl:507
 +msgid "Shared (Fastest, Not Recommended, No Backup)"
 +msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
 +
 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
 +#, tcl-format
 +msgid "Not a Git repository: %s"
 +msgstr "Kein Git-Projektarchiv in »%s« gefunden."
 +
 +#: lib/choose_repository.tcl:579
 +msgid "Standard only available for local repository."
 +msgstr "Standard ist nur für lokale Projektarchive verfügbar."
 +
 +#: lib/choose_repository.tcl:583
 +msgid "Shared only available for local repository."
 +msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
 +
 +#: lib/choose_repository.tcl:604
 +#, tcl-format
 +msgid "Location %s already exists."
 +msgstr "Projektarchiv »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:615
 +msgid "Failed to configure origin"
 +msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 +
 +#: lib/choose_repository.tcl:627
 +msgid "Counting objects"
 +msgstr "Objekte werden gezählt"
 +
 +#: lib/choose_repository.tcl:628
 +msgid "buckets"
 +msgstr "Buckets"
 +
 +#: lib/choose_repository.tcl:652
 +#, tcl-format
 +msgid "Unable to copy objects/info/alternates: %s"
 +msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 +
 +#: lib/choose_repository.tcl:688
 +#, tcl-format
 +msgid "Nothing to clone from %s."
 +msgstr "Von »%s« konnte nichts geklont werden."
 +
 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
 +#: lib/choose_repository.tcl:916
 +msgid "The 'master' branch has not been initialized."
 +msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
 +
 +#: lib/choose_repository.tcl:703
 +msgid "Hardlinks are unavailable.  Falling back to copying."
 +msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
 +
 +#: lib/choose_repository.tcl:715
 +#, tcl-format
 +msgid "Cloning from %s"
 +msgstr "Kopieren von »%s«"
 +
 +#: lib/choose_repository.tcl:746
 +msgid "Copying objects"
 +msgstr "Objektdatenbank kopieren"
 +
 +#: lib/choose_repository.tcl:747
 +msgid "KiB"
 +msgstr "KB"
 +
 +#: lib/choose_repository.tcl:771
 +#, tcl-format
 +msgid "Unable to copy object: %s"
 +msgstr "Objekt kann nicht kopiert werden: %s"
 +
 +#: lib/choose_repository.tcl:781
 +msgid "Linking objects"
 +msgstr "Objekte verlinken"
 +
 +#: lib/choose_repository.tcl:782
 +msgid "objects"
 +msgstr "Objekte"
 +
 +#: lib/choose_repository.tcl:790
 +#, tcl-format
 +msgid "Unable to hardlink object: %s"
 +msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
 +
 +#: lib/choose_repository.tcl:845
 +msgid "Cannot fetch branches and objects.  See console output for details."
 +msgstr ""
 +"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:856
 +msgid "Cannot fetch tags.  See console output for details."
 +msgstr ""
 +"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:880
 +msgid "Cannot determine HEAD.  See console output for details."
 +msgstr ""
 +"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:889
 +#, tcl-format
 +msgid "Unable to cleanup %s"
 +msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
 +
 +#: lib/choose_repository.tcl:895
 +msgid "Clone failed."
 +msgstr "Klonen fehlgeschlagen."
 +
 +#: lib/choose_repository.tcl:902
 +msgid "No default branch obtained."
 +msgstr "Kein voreingestellter Zweig gefunden."
 +
 +#: lib/choose_repository.tcl:913
 +#, tcl-format
 +msgid "Cannot resolve %s as a commit."
 +msgstr "»%s« wurde nicht als Version gefunden."
 +
 +#: lib/choose_repository.tcl:925
 +msgid "Creating working directory"
 +msgstr "Arbeitskopie erstellen"
 +
 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
 +#: lib/index.tcl:193
 +msgid "files"
 +msgstr "Dateien"
 +
 +#: lib/choose_repository.tcl:955
 +msgid "Initial file checkout failed."
 +msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 +
 +#: lib/choose_repository.tcl:971
 +msgid "Open"
 +msgstr "Öffnen"
 +
 +#: lib/choose_repository.tcl:981
 +msgid "Repository:"
 +msgstr "Projektarchiv:"
 +
 +#: lib/choose_repository.tcl:1031
 +#, tcl-format
 +msgid "Failed to open repository %s:"
 +msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
 +
 +#: lib/choose_rev.tcl:53
 +msgid "This Detached Checkout"
 +msgstr "Abgetrennte Arbeitskopie-Version"
 +
 +#: lib/choose_rev.tcl:60
 +msgid "Revision Expression:"
 +msgstr "Version Regexp-Ausdruck:"
 +
 +#: lib/choose_rev.tcl:74
 +msgid "Local Branch"
 +msgstr "Lokaler Zweig"
 +
 +#: lib/choose_rev.tcl:79
 +msgid "Tracking Branch"
 +msgstr "Übernahmezweig"
 +
 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
 +msgid "Tag"
 +msgstr "Markierung"
 +
 +#: lib/choose_rev.tcl:317
 +#, tcl-format
 +msgid "Invalid revision: %s"
 +msgstr "Ungültige Version: %s"
 +
 +#: lib/choose_rev.tcl:338
 +msgid "No revision selected."
 +msgstr "Keine Version ausgewählt."
 +
 +#: lib/choose_rev.tcl:346
 +msgid "Revision expression is empty."
 +msgstr "Versions-Ausdruck ist leer."
 +
 +#: lib/choose_rev.tcl:531
 +msgid "Updated"
 +msgstr "Aktualisiert"
 +
 +#: lib/choose_rev.tcl:559
 +msgid "URL"
 +msgstr "URL"
 +
 +#: lib/commit.tcl:9
 +msgid ""
 +"There is nothing to amend.\n"
 +"\n"
 +"You are about to create the initial commit.  There is no commit before this "
 +"to amend.\n"
 +msgstr ""
 +"Keine Version zur Nachbesserung vorhanden.\n"
 +"\n"
 +"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende "
 +"Version, die Sie nachbessern könnten.\n"
 +
 +#: lib/commit.tcl:18
 +msgid ""
 +"Cannot amend while merging.\n"
 +"\n"
 +"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.\n"
 +msgstr ""
 +"Nachbesserung währen Zusammenführung nicht möglich.\n"
 +"\n"
 +"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht "
 +"beendet. Sie können keine vorige Übertragung nachbessern, solange eine "
 +"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
 +"beenden oder abbrechen.\n"
 +
 +#: lib/commit.tcl:49
 +msgid "Error loading commit data for amend:"
 +msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
 +
 +#: lib/commit.tcl:76
 +msgid "Unable to obtain your identity:"
 +msgstr "Benutzername konnte nicht bestimmt werden:"
 +
 +#: lib/commit.tcl:81
 +msgid "Invalid GIT_COMMITTER_IDENT:"
 +msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
 +
 +#: lib/commit.tcl:133
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before another commit can be created.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/commit.tcl:154
 +#, tcl-format
 +msgid ""
 +"Unmerged files cannot be committed.\n"
 +"\n"
 +"File %s has merge conflicts.  You must resolve them and stage the file "
 +"before committing.\n"
 +msgstr ""
 +"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
 +"\n"
 +"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
 +"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
 +
 +#: lib/commit.tcl:162
 +#, tcl-format
 +msgid ""
 +"Unknown file state %s detected.\n"
 +"\n"
 +"File %s cannot be committed by this program.\n"
 +msgstr ""
 +"Unbekannter Dateizustand »%s«.\n"
 +"\n"
 +"Datei »%s« kann nicht eingetragen werden.\n"
 +
 +#: lib/commit.tcl:170
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"You must stage at least 1 file before you can commit.\n"
 +msgstr ""
 +"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
 +"\n"
 +"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
 +
 +#: lib/commit.tcl:183
 +msgid ""
 +"Please supply a commit message.\n"
 +"\n"
 +"A good commit message has the following format:\n"
 +"\n"
 +"- First line: Describe in one sentence what you did.\n"
 +"- Second line: Blank\n"
 +"- Remaining lines: Describe why this change is good.\n"
 +msgstr ""
 +"Bitte geben Sie eine Versionsbeschreibung ein.\n"
 +"\n"
 +"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
 +"\n"
 +"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
 +"\n"
 +"- Zweite Zeile: Leerzeile\n"
 +"\n"
 +"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
 +
 +#: lib/commit.tcl:207
 +#, tcl-format
 +msgid "warning: Tcl does not support encoding '%s'."
 +msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
 +
 +#: lib/commit.tcl:221
 +msgid "Calling pre-commit hook..."
 +msgstr "Aufrufen der Vor-Eintragen-Kontrolle..."
 +
 +#: lib/commit.tcl:236
 +msgid "Commit declined by pre-commit hook."
 +msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
 +
 +#: lib/commit.tcl:259
 +msgid "Calling commit-msg hook..."
 +msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
 +
 +#: lib/commit.tcl:274
 +msgid "Commit declined by commit-msg hook."
 +msgstr ""
 +"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
 +"hook«)."
 +
 +#: lib/commit.tcl:287
 +msgid "Committing changes..."
 +msgstr "Änderungen eintragen..."
 +
 +#: lib/commit.tcl:303
 +msgid "write-tree failed:"
 +msgstr "write-tree fehlgeschlagen:"
 +
 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
 +msgid "Commit failed."
 +msgstr "Eintragen fehlgeschlagen."
 +
 +#: lib/commit.tcl:321
 +#, tcl-format
 +msgid "Commit %s appears to be corrupt"
 +msgstr "Version »%s« scheint beschädigt zu sein"
 +
 +#: lib/commit.tcl:326
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"No files were modified by this commit and it was not a merge commit.\n"
 +"\n"
 +"A rescan will be automatically started now.\n"
 +msgstr ""
 +"Keine Änderungen einzutragen.\n"
 +"\n"
 +"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
 +"zusammengeführt.\n"
 +"\n"
 +"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 +
 +#: lib/commit.tcl:333
 +msgid "No changes to commit."
 +msgstr "Keine Änderungen, die eingetragen werden können."
 +
 +#: lib/commit.tcl:347
 +msgid "commit-tree failed:"
 +msgstr "commit-tree fehlgeschlagen:"
 +
 +#: lib/commit.tcl:367
 +msgid "update-ref failed:"
 +msgstr "update-ref fehlgeschlagen:"
 +
 +#: lib/commit.tcl:454
 +#, tcl-format
 +msgid "Created commit %s: %s"
 +msgstr "Version %s übertragen: %s"
 +
 +#: lib/console.tcl:59
 +msgid "Working... please wait..."
 +msgstr "Verarbeitung. Bitte warten..."
 +
 +#: lib/console.tcl:186
 +msgid "Success"
 +msgstr "Erfolgreich"
 +
 +#: lib/console.tcl:200
 +msgid "Error: Command Failed"
 +msgstr "Fehler: Kommando fehlgeschlagen"
 +
 +#: lib/database.tcl:43
 +msgid "Number of loose objects"
 +msgstr "Anzahl unverknüpfter Objekte"
 +
 +#: lib/database.tcl:44
 +msgid "Disk space used by loose objects"
 +msgstr "Festplattenplatz von unverknüpften Objekten"
 +
 +#: lib/database.tcl:45
 +msgid "Number of packed objects"
 +msgstr "Anzahl komprimierter Objekte"
 +
 +#: lib/database.tcl:46
 +msgid "Number of packs"
 +msgstr "Anzahl Komprimierungseinheiten"
 +
 +#: lib/database.tcl:47
 +msgid "Disk space used by packed objects"
 +msgstr "Festplattenplatz von komprimierten Objekten"
 +
 +#: lib/database.tcl:48
 +msgid "Packed objects waiting for pruning"
 +msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind"
 +
 +#: lib/database.tcl:49
 +msgid "Garbage files"
 +msgstr "Dateien im Mülleimer"
 +
 +#: lib/database.tcl:72
 +msgid "Compressing the object database"
 +msgstr "Objektdatenbank komprimieren"
 +
 +#: lib/database.tcl:83
 +msgid "Verifying the object database with fsck-objects"
 +msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
 +
 +#: lib/database.tcl:108
 +#, tcl-format
 +msgid ""
 +"This repository currently has approximately %i loose objects.\n"
 +"\n"
 +"To maintain optimal performance it is strongly recommended that you compress "
 +"the database when more than %i loose objects exist.\n"
 +"\n"
 +"Compress the database now?"
 +msgstr ""
 +"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
 +"\n"
 +"Für eine optimale Performance wird empfohlen, die Datenbank des "
 +"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte "
 +"vorliegen.\n"
 +"\n"
 +"Soll die Datenbank jetzt komprimiert werden?"
 +
 +#: lib/date.tcl:25
 +#, tcl-format
 +msgid "Invalid date from Git: %s"
 +msgstr "Ungültiges Datum von Git: %s"
 +
 +#: lib/diff.tcl:42
 +#, tcl-format
 +msgid ""
 +"No differences detected.\n"
 +"\n"
 +"%s has no changes.\n"
 +"\n"
 +"The modification date of this file was updated by another application, but "
 +"the content within the file was not changed.\n"
 +"\n"
 +"A rescan will be automatically started to find other files which may have "
 +"the same state."
 +msgstr ""
 +"Keine Änderungen feststellbar.\n"
 +"\n"
 +"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei "
 +"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
 +"unverändert.\n"
 +"\n"
 +"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
 +"Dateien zu prüfen."
 +
 +#: lib/diff.tcl:81
 +#, tcl-format
 +msgid "Loading diff of %s..."
 +msgstr "Vergleich von »%s« laden..."
 +
 +#: lib/diff.tcl:114 lib/diff.tcl:184
 +#, tcl-format
 +msgid "Unable to display %s"
 +msgstr "Datei »%s« kann nicht angezeigt werden"
 +
 +#: lib/diff.tcl:115
 +msgid "Error loading file:"
 +msgstr "Fehler beim Laden der Datei:"
 +
 +#: lib/diff.tcl:122
 +msgid "Git Repository (subproject)"
 +msgstr "Git-Projektarchiv (Unterprojekt)"
 +
 +#: lib/diff.tcl:134
 +msgid "* Binary file (not showing content)."
 +msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
 +
- #: lib/option.tcl:123
++#: lib/diff.tcl:313
 +msgid "Failed to unstage selected hunk."
 +msgstr ""
 +"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
 +
 +#: lib/diff.tcl:310
 +msgid "Failed to stage selected hunk."
 +msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
 +
 +#: lib/diff.tcl:386
 +msgid "Failed to unstage selected line."
 +msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
 +
 +#: lib/diff.tcl:394
 +msgid "Failed to stage selected line."
 +msgstr "Fehler beim Bereitstellen der gewählten Zeile."
 +
 +#: lib/error.tcl:20 lib/error.tcl:114
 +msgid "error"
 +msgstr "Fehler"
 +
 +#: lib/error.tcl:36
 +msgid "warning"
 +msgstr "Warnung"
 +
 +#: lib/error.tcl:94
 +msgid "You must correct the above errors before committing."
 +msgstr ""
 +"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
 +
 +#: lib/index.tcl:6
 +msgid "Unable to unlock the index."
 +msgstr "Bereitstellung kann nicht wieder freigegeben werden."
 +
 +#: lib/index.tcl:15
 +msgid "Index Error"
 +msgstr "Fehler in Bereitstellung"
 +
 +#: lib/index.tcl:21
 +msgid ""
 +"Updating the Git index failed.  A rescan will be automatically started to "
 +"resynchronize git-gui."
 +msgstr ""
 +"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
 +"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
 +"synchronisieren."
 +
 +#: lib/index.tcl:27
 +msgid "Continue"
 +msgstr "Fortsetzen"
 +
 +#: lib/index.tcl:31
 +msgid "Unlock Index"
 +msgstr "Bereitstellung freigeben"
 +
 +#: lib/index.tcl:282
 +#, tcl-format
 +msgid "Unstaging %s from commit"
 +msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
 +
 +#: lib/index.tcl:313
 +msgid "Ready to commit."
 +msgstr "Bereit zum Eintragen."
 +
 +#: lib/index.tcl:326
 +#, tcl-format
 +msgid "Adding %s"
 +msgstr "»%s« hinzufügen..."
 +
 +#: lib/index.tcl:381
 +#, tcl-format
 +msgid "Revert changes in file %s?"
 +msgstr "Änderungen in Datei »%s« verwerfen?"
 +
 +#: lib/index.tcl:383
 +#, tcl-format
 +msgid "Revert changes in these %i files?"
 +msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
 +
 +#: lib/index.tcl:391
 +msgid "Any unstaged changes will be permanently lost by the revert."
 +msgstr ""
 +"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
 +
 +#: lib/index.tcl:394
 +msgid "Do Nothing"
 +msgstr "Nichts tun"
 +
++#: lib/index.tcl:419
++msgid "Reverting selected files"
++msgstr "Änderungen in gewählten Dateien verwerfen"
++
++#: lib/index.tcl:423
++#, tcl-format
++msgid "Reverting %s"
++msgstr "Änderungen in %s verwerfen"
++
 +#: lib/merge.tcl:13
 +msgid ""
 +"Cannot merge while amending.\n"
 +"\n"
 +"You must finish amending this commit before starting any type of merge.\n"
 +msgstr ""
 +"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
 +"\n"
 +"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
 +"zusammenführen können.\n"
 +
 +#: lib/merge.tcl:27
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before a merge can be performed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor einem Zusammenführen muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/merge.tcl:44
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a conflicted merge.\n"
 +"\n"
 +"File %s has merge conflicts.\n"
 +"\n"
 +"You must resolve them, stage the file, and commit to complete the current "
 +"merge.  Only then can you begin another merge.\n"
 +msgstr ""
 +"Zusammenführung mit Konflikten.\n"
 +"\n"
 +"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
 +"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
 +"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
 +"danach kann eine neue Zusammenführung begonnen werden.\n"
 +
 +#: lib/merge.tcl:54
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a change.\n"
 +"\n"
 +"File %s is modified.\n"
 +"\n"
 +"You should complete the current commit before starting a merge.  Doing so "
 +"will help you abort a failed merge, should the need arise.\n"
 +msgstr ""
 +"Es liegen Änderungen vor.\n"
 +"\n"
 +"Die Datei »%s« wurde geändert.  Sie sollten zuerst die bereitgestellte "
 +"Version abschließen, bevor Sie eine Zusammenführung beginnen.  Mit dieser "
 +"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
 +"einfacher beheben oder abbrechen.\n"
 +
 +#: lib/merge.tcl:106
 +#, tcl-format
 +msgid "%s of %s"
 +msgstr "%s von %s"
 +
 +#: lib/merge.tcl:119
 +#, tcl-format
 +msgid "Merging %s and %s..."
 +msgstr "Zusammenführen von %s und %s..."
 +
 +#: lib/merge.tcl:130
 +msgid "Merge completed successfully."
 +msgstr "Zusammenführen erfolgreich abgeschlossen."
 +
 +#: lib/merge.tcl:132
 +msgid "Merge failed.  Conflict resolution is required."
 +msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
 +
 +#: lib/merge.tcl:157
 +#, tcl-format
 +msgid "Merge Into %s"
 +msgstr "Zusammenführen in »%s«"
 +
 +#: lib/merge.tcl:176
 +msgid "Revision To Merge"
 +msgstr "Zusammenzuführende Version"
 +
 +#: lib/merge.tcl:211
 +msgid ""
 +"Cannot abort while amending.\n"
 +"\n"
 +"You must finish amending this commit.\n"
 +msgstr ""
 +"Abbruch der Nachbesserung ist nicht möglich.\n"
 +"\n"
 +"Sie müssen die Nachbesserung der Version abschließen.\n"
 +
 +#: lib/merge.tcl:221
 +msgid ""
 +"Abort merge?\n"
 +"\n"
 +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with aborting the current merge?"
 +msgstr ""
 +"Zusammenführen abbrechen?\n"
 +"\n"
 +"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
 +"verloren.\n"
 +"\n"
 +"Zusammenführen jetzt abbrechen?"
 +
 +#: lib/merge.tcl:227
 +msgid ""
 +"Reset changes?\n"
 +"\n"
 +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with resetting the current changes?"
 +msgstr ""
 +"Änderungen zurücksetzen?\n"
 +"\n"
 +"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
 +"verloren.\n"
 +"\n"
 +"Änderungen jetzt zurücksetzen?"
 +
 +#: lib/merge.tcl:238
 +msgid "Aborting"
 +msgstr "Abbruch"
 +
 +#: lib/merge.tcl:238
 +msgid "files reset"
 +msgstr "Dateien zurückgesetzt"
 +
 +#: lib/merge.tcl:265
 +msgid "Abort failed."
 +msgstr "Abbruch fehlgeschlagen."
 +
 +#: lib/merge.tcl:267
 +msgid "Abort completed.  Ready."
 +msgstr "Abbruch durchgeführt. Bereit."
 +
++#: lib/mergetool.tcl:14
++msgid "Force resolution to the base version?"
++msgstr "Konflikt durch Basisversion ersetzen?"
++
++#: lib/mergetool.tcl:15
++msgid "Force resolution to this branch?"
++msgstr "Konflikt durch diesen Zweig ersetzen?"
++
++#: lib/mergetool.tcl:16
++msgid "Force resolution to the other branch?"
++msgstr "Konflikt durch anderen Zweig ersetzen?"
++
++#: lib/mergetool.tcl:20
++#, tcl-format
++msgid ""
++"Note that the diff shows only conflicting changes.\n"
++"\n"
++"%s will be overwritten.\n"
++"\n"
++"This operation can be undone only by restarting the merge."
++msgstr ""
++"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n"
++"\n"
++"»%s« wird überschrieben.\n"
++"\n"
++"Diese Operation kann nur rückgängig gemacht werden, wenn die\n"
++"Zusammenführung erneut gestartet wird."
++
++#: lib/mergetool.tcl:32
++#, tcl-format
++msgid "Adding resolution for %s"
++msgstr "Auflösung hinzugefügt für %s"
++
++#: lib/mergetool.tcl:119
++msgid "Cannot resolve deletion or link conflicts using a tool"
++msgstr ""
++"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch "
++"das Zusamenführungswerkzeug gelöst werden."
++
++#: lib/mergetool.tcl:124
++msgid "Conflict file does not exist"
++msgstr "Konflikt-Datei existiert nicht"
++
++#: lib/mergetool.tcl:236
++#, tcl-format
++msgid "Not a GUI merge tool: '%s'"
++msgstr "Kein GUI Zusammenführungswerkzeug: »%s«"
++
++#: lib/mergetool.tcl:240
++#, tcl-format
++msgid "Unsupported merge tool '%s'"
++msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«"
++
++#: lib/mergetool.tcl:275
++msgid "Merge tool is already running, terminate it?"
++msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?"
++
++#: lib/mergetool.tcl:295
++#, tcl-format
++msgid ""
++"Error retrieving versions:\n"
++"%s"
++msgstr ""
++"Fehler beim Abrufen der Dateiversionen:\n"
++"%s"
++
++#: lib/mergetool.tcl:315
++#, tcl-format
++msgid ""
++"Could not start the merge tool:\n"
++"\n"
++"%s"
++msgstr ""
++"Zusammenführungswerkzeug konnte nicht gestartet werden:\n"
++"\n"
++"%s"
++
++#: lib/mergetool.tcl:319
++msgid "Running merge tool..."
++msgstr "Zusammenführungswerkzeug starten..."
++
++#: lib/mergetool.tcl:347 lib/mergetool.tcl:363
++msgid "Merge tool failed."
++msgstr "Zusammenführungswerkzeug fehlgeschlagen."
++
++#: lib/mergetool.tcl:353
++#, tcl-format
++msgid "File %s unchanged, still accept as resolved?"
++msgstr "Datei »%s« unverändert. Trotzdem Konflikt als gelöst akzeptieren?"
++
 +#: lib/option.tcl:95
 +msgid "Restore Defaults"
 +msgstr "Voreinstellungen wiederherstellen"
 +
 +#: lib/option.tcl:99
 +msgid "Save"
 +msgstr "Speichern"
 +
 +#: lib/option.tcl:109
 +#, tcl-format
 +msgid "%s Repository"
 +msgstr "Projektarchiv %s"
 +
 +#: lib/option.tcl:110
 +msgid "Global (All Repositories)"
 +msgstr "Global (Alle Projektarchive)"
 +
 +#: lib/option.tcl:116
 +msgid "User Name"
 +msgstr "Benutzername"
 +
 +#: lib/option.tcl:117
 +msgid "Email Address"
 +msgstr "E-Mail-Adresse"
 +
 +#: lib/option.tcl:119
 +msgid "Summarize Merge Commits"
 +msgstr "Zusammenführungs-Versionen zusammenfassen"
 +
 +#: lib/option.tcl:120
 +msgid "Merge Verbosity"
 +msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
 +
 +#: lib/option.tcl:121
 +msgid "Show Diffstat After Merge"
 +msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
 +
++#: lib/option.tcl:122
++msgid "Use Merge Tool"
++msgstr "Zusammenführungswerkzeug"
++
++#: lib/option.tcl:124
 +msgid "Trust File Modification Timestamps"
 +msgstr "Auf Dateiänderungsdatum verlassen"
 +
 +#: lib/option.tcl:124
 +msgid "Prune Tracking Branches During Fetch"
 +msgstr "Übernahmezweige aufräumen während Anforderung"
 +
 +#: lib/option.tcl:125
 +msgid "Match Tracking Branches"
 +msgstr "Passend zu Übernahmezweig"
 +
 +#: lib/option.tcl:126
 +msgid "Blame Copy Only On Changed Files"
 +msgstr "Kopie-Annotieren nur bei geänderten Dateien"
 +
 +#: lib/option.tcl:127
 +msgid "Minimum Letters To Blame Copy On"
 +msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
 +
 +#: lib/option.tcl:128
++msgid "Blame History Context Radius (days)"
++msgstr "Anzahl Tage für Historien-Kontext"
++
++#: lib/option.tcl:129
 +msgid "Number of Diff Context Lines"
 +msgstr "Anzahl der Kontextzeilen beim Vergleich"
 +
 +#: lib/option.tcl:127
 +msgid "Commit Message Text Width"
 +msgstr "Textbreite der Versionsbeschreibung"
 +
 +#: lib/option.tcl:128
 +msgid "New Branch Name Template"
 +msgstr "Namensvorschlag für neue Zweige"
 +
 +#: lib/option.tcl:192
 +msgid "Spelling Dictionary:"
 +msgstr "Wörterbuch Rechtschreibprüfung:"
 +
 +#: lib/option.tcl:216
 +msgid "Change Font"
 +msgstr "Schriftart ändern"
 +
 +#: lib/option.tcl:220
 +#, tcl-format
 +msgid "Choose %s"
 +msgstr "%s wählen"
 +
 +#: lib/option.tcl:226
 +msgid "pt."
 +msgstr "pt."
 +
 +#: lib/option.tcl:240
 +msgid "Preferences"
 +msgstr "Einstellungen"
 +
 +#: lib/option.tcl:275
 +msgid "Failed to completely save options:"
 +msgstr "Optionen konnten nicht gespeichert werden:"
 +
 +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 +msgid "Delete Remote Branch"
 +msgstr "Zweig in anderem Projektarchiv löschen"
 +
 +#: lib/remote_branch_delete.tcl:47
 +msgid "From Repository"
 +msgstr "In Projektarchiv"
 +
 +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 +msgid "Remote:"
 +msgstr "Anderes Archiv:"
 +
 +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 +msgid "Arbitrary URL:"
 +msgstr "Archiv-URL:"
 +
 +#: lib/remote_branch_delete.tcl:84
 +msgid "Branches"
 +msgstr "Zweige"
 +
 +#: lib/remote_branch_delete.tcl:109
 +msgid "Delete Only If"
 +msgstr "Nur löschen, wenn"
 +
 +#: lib/remote_branch_delete.tcl:111
 +msgid "Merged Into:"
 +msgstr "Zusammengeführt mit:"
 +
 +#: lib/remote_branch_delete.tcl:119
 +msgid "Always (Do not perform merge checks)"
 +msgstr "Immer (Keine Zusammenführungsprüfung)"
 +
 +#: lib/remote_branch_delete.tcl:152
 +msgid "A branch is required for 'Merged Into'."
 +msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
 +
 +#: lib/remote_branch_delete.tcl:184
 +#, tcl-format
 +msgid ""
 +"The following branches are not completely merged into %s:\n"
 +"\n"
 +" - %s"
 +msgstr ""
 +"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n"
 +"\n"
 +" - %s"
 +
 +#: lib/remote_branch_delete.tcl:189
 +#, tcl-format
 +msgid ""
 +"One or more of the merge tests failed because you have not fetched the "
 +"necessary commits.  Try fetching from %s first."
 +msgstr ""
 +"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
 +"notwendigen Versionen vorher angefordert haben.  Sie sollten versuchen, "
 +"zuerst von »%s« anzufordern."
 +
 +#: lib/remote_branch_delete.tcl:207
 +msgid "Please select one or more branches to delete."
 +msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll."
 +
 +#: lib/remote_branch_delete.tcl:216
 +msgid ""
 +"Recovering deleted branches is difficult.\n"
 +"\n"
 +"Delete the selected branches?"
 +msgstr ""
 +"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
 +"möglich.\n"
 +"\n"
 +"Sollen die ausgewählten Zweige gelöscht werden?"
 +
 +#: lib/remote_branch_delete.tcl:226
 +#, tcl-format
 +msgid "Deleting branches from %s"
 +msgstr "Zweige auf »%s« werden gelöscht"
 +
 +#: lib/remote_branch_delete.tcl:286
 +msgid "No repository selected."
 +msgstr "Kein Projektarchiv ausgewählt."
 +
 +#: lib/remote_branch_delete.tcl:291
 +#, tcl-format
 +msgid "Scanning %s..."
 +msgstr "»%s« laden..."
 +
 +#: lib/remote.tcl:165
 +msgid "Prune from"
 +msgstr "Aufräumen von"
 +
 +#: lib/remote.tcl:170
 +msgid "Fetch from"
 +msgstr "Anfordern von"
 +
 +#: lib/remote.tcl:213
 +msgid "Push to"
 +msgstr "Versenden nach"
 +
 +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 +msgid "Cannot write shortcut:"
 +msgstr "Fehler beim Schreiben der Verknüpfung:"
 +
 +#: lib/shortcut.tcl:136
 +msgid "Cannot write icon:"
 +msgstr "Fehler beim Erstellen des Icons:"
 +
 +#: lib/spellcheck.tcl:57
 +msgid "Unsupported spell checker"
 +msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
 +
 +#: lib/spellcheck.tcl:65
 +msgid "Spell checking is unavailable"
 +msgstr "Rechtschreibprüfung nicht verfügbar"
 +
 +#: lib/spellcheck.tcl:68
 +msgid "Invalid spell checking configuration"
 +msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
 +
 +#: lib/spellcheck.tcl:70
 +#, tcl-format
 +msgid "Reverting dictionary to %s."
 +msgstr "Wörterbuch auf %s zurückgesetzt."
 +
 +#: lib/spellcheck.tcl:73
 +msgid "Spell checker silently failed on startup"
 +msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
 +
 +#: lib/spellcheck.tcl:80
 +msgid "Unrecognized spell checker"
 +msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
 +
 +#: lib/spellcheck.tcl:180
 +msgid "No Suggestions"
 +msgstr "Keine Vorschläge"
 +
 +#: lib/spellcheck.tcl:381
 +msgid "Unexpected EOF from spell checker"
 +msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
 +
 +#: lib/spellcheck.tcl:385
 +msgid "Spell Checker Failed"
 +msgstr "Rechtschreibprüfung fehlgeschlagen"
 +
 +#: lib/status_bar.tcl:83
 +#, tcl-format
 +msgid "%s ... %*i of %*i %s (%3i%%)"
 +msgstr "%s ... %*i von %*i %s (%3i%%)"
 +
 +#: lib/transport.tcl:6
 +#, tcl-format
 +msgid "fetch %s"
 +msgstr "»%s« anfordern"
 +
 +#: lib/transport.tcl:7
 +#, tcl-format
 +msgid "Fetching new changes from %s"
 +msgstr "Neue Änderungen von »%s« holen"
 +
 +#: lib/transport.tcl:18
 +#, tcl-format
 +msgid "remote prune %s"
 +msgstr "Aufräumen von »%s«"
 +
 +#: lib/transport.tcl:19
 +#, tcl-format
 +msgid "Pruning tracking branches deleted from %s"
 +msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
 +
 +#: lib/transport.tcl:25 lib/transport.tcl:71
 +#, tcl-format
 +msgid "push %s"
 +msgstr "»%s« versenden..."
 +
 +#: lib/transport.tcl:26
 +#, tcl-format
 +msgid "Pushing changes to %s"
 +msgstr "Änderungen nach »%s« versenden"
 +
 +#: lib/transport.tcl:72
 +#, tcl-format
 +msgid "Pushing %s %s to %s"
 +msgstr "%s %s nach %s versenden"
 +
 +#: lib/transport.tcl:89
 +msgid "Push Branches"
 +msgstr "Zweige versenden"
 +
 +#: lib/transport.tcl:103
 +msgid "Source Branches"
 +msgstr "Lokale Zweige"
 +
 +#: lib/transport.tcl:120
 +msgid "Destination Repository"
 +msgstr "Ziel-Projektarchiv"
 +
 +#: lib/transport.tcl:158
 +msgid "Transfer Options"
 +msgstr "Netzwerk-Einstellungen"
 +
 +#: lib/transport.tcl:160
 +msgid "Force overwrite existing branch (may discard changes)"
 +msgstr ""
 +"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
 +
 +#: lib/transport.tcl:164
 +msgid "Use thin pack (for slow network connections)"
 +msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
 +
 +#: lib/transport.tcl:168
 +msgid "Include tags"
 +msgstr "Mit Markierungen übertragen"