![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Jun 2007 07:52:43 +0000 (00:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Jun 2007 07:52:43 +0000 (00:52 -0700) |
* 'master' of git://repo.or.cz/git-gui:
git-gui: Internalize symbolic-ref HEAD reading logic
git-gui: Expose the merge.diffstat configuration option
git-gui: Allow users to delete remote branches
git-gui: Allow users to rename branches through 'branch -m'
git-gui: Disable tearoff menus on Windows, Mac OS X
git-gui: Provide fatal error if library is unavailable
git-gui: Enable verbose Tcl loading earlier
git-gui: Show the git-gui library path in 'About git-gui'
git-gui: GUI support for running 'git remote prune <name>'
git gui 0.8.0
git-gui: Internalize symbolic-ref HEAD reading logic
git-gui: Expose the merge.diffstat configuration option
git-gui: Allow users to delete remote branches
git-gui: Allow users to rename branches through 'branch -m'
git-gui: Disable tearoff menus on Windows, Mac OS X
git-gui: Provide fatal error if library is unavailable
git-gui: Enable verbose Tcl loading earlier
git-gui: Show the git-gui library path in 'About git-gui'
git-gui: GUI support for running 'git remote prune <name>'
git gui 0.8.0
| 1 | 2 | |||
|---|---|---|---|---|
| git-gui/GIT-VERSION-GEN | patch | | diff1 | | | | blob | history |
| git-gui/git-gui.sh | patch | | diff1 | | | | blob | history |
| git-gui/lib/branch_rename.tcl | patch | | | | | | blob |
| git-gui/lib/option.tcl | patch | | diff1 | | | | blob | history |
| git-gui/lib/remote.tcl | patch | | diff1 | | | | blob | history |
| git-gui/lib/remote_branch_delete.tcl | patch | | | | | | blob |
| git-gui/lib/transport.tcl | patch | | diff1 | | | | blob | history |
diff --cc git-gui/GIT-VERSION-GEN
index eee495a98666094415233a7023c03db9852dfe53,0000000000000000000000000000000000000000..9770b0bc27ae4dfd44f4bfcfc74946fabefdc127
mode 100755,000000..100755
mode 100755,000000..100755
--- /dev/null
+++ b/git-gui/GIT-VERSION-GEN
- DEF_VER=0.7.GITGUI
+#!/bin/sh
+
+GVF=GIT-VERSION-FILE
++DEF_VER=0.8.GITGUI
+
+LF='
+'
+
+tree_search ()
+{
+ head=$1
+ tree=$2
+ for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
+ do
+ test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
+ vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
+ case "$vn" in
+ gitgui-[0-9]*) echo $vn; break;;
+ esac
+ done
+}
+
+# Always use the tarball version file if found, just
+# in case we are somehow contained in a larger git
+# repository that doesn't actually track our state.
+# (At least one package manager is doing this.)
+#
+# We may be a subproject, so try looking for the merge
+# commit that supplied this directory content if we are
+# not at the toplevel. We probably will always be the
+# second parent in the commit, but we shouldn't rely on
+# that fact.
+#
+# If we are at the toplevel or the merge assumption fails
+# try looking for a gitgui-* tag.
+
+if test -f version &&
+ VN=$(cat version)
+then
+ : happy
+elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
+ test -n "$prefix" &&
+ head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
+ tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
+ VN=$(tree_search $head $tree)
+ case "$VN" in
+ gitgui-[0-9]*) : happy ;;
+ *) (exit 1) ;;
+ esac
+then
+ VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
+elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+ case "$VN" in
+ gitgui-[0-9]*) : happy ;;
+ *) (exit 1) ;;
+ esac
+then
+ VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
+else
+ VN="$DEF_VER"
+fi
+
+dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
+case "$dirty" in
+'')
+ ;;
+*)
+ VN="$VN-dirty" ;;
+esac
+
+if test -r $GVF
+then
+ VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
+else
+ VC=unset
+fi
+test "$VN" = "$VC" || {
+ echo >&2 "GITGUI_VERSION = $VN"
+ echo "GITGUI_VERSION = $VN" >$GVF
+}
diff --cc git-gui/git-gui.sh
index dfb4b955eb1d33fdd90b25e1e575ed86949bbd9f,0000000000000000000000000000000000000000..e33ee03bc0b1881596115da73c875ef784cd0a93
mode 100755,000000..100755
mode 100755,000000..100755
--- 1/git-gui/git-gui.sh
--- /dev/null
+++ b/git-gui/git-gui.sh
- catch {
- set fd [open $idx r]
- 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
- }
+#!/bin/sh
+# Tcl ignores the next line -*- tcl -*- \
+exec wish "$0" -- "$@"
+
+set appvers {@@GITGUI_VERSION@@}
+set copyright {
+Copyright © 2006, 2007 Shawn Pearce, et. al.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
+
+######################################################################
+##
+## Tcl/Tk sanity check
+
+if {[catch {package require Tcl 8.4} err]
+ || [catch {package require Tk 8.4} err]
+} {
+ catch {wm withdraw .}
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title "git-gui: fatal error" \
+ -message $err
+ exit 1
+}
+
++######################################################################
++##
++## enable verbose loading?
++
++if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
++ unset _verbose
++ rename auto_load real__auto_load
++ proc auto_load {name args} {
++ puts stderr "auto_load $name"
++ return [uplevel 1 real__auto_load $name $args]
++ }
++ rename source real__source
++ proc source {name} {
++ puts stderr "source $name"
++ uplevel 1 real__source $name
++ }
++}
++
+######################################################################
+##
+## configure our library
+
+set oguilib {@@GITGUI_LIBDIR@@}
+set oguirel {@@GITGUI_RELATIVE@@}
+if {$oguirel eq {1}} {
+ set oguilib [file dirname [file dirname [file normalize $argv0]]]
+ set oguilib [file join $oguilib share git-gui lib]
+} elseif {[string match @@* $oguirel]} {
+ set oguilib [file join [file dirname [file normalize $argv0]] lib]
+}
++
+set idx [file join $oguilib tclIndex]
- } else {
- set idx {}
++if {[catch {set fd [open $idx r]} err]} {
++ catch {wm withdraw .}
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title "git-gui: fatal error" \
++ -message $err
++ exit 1
++}
++if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
++ set idx [list]
++ while {[gets $fd n] >= 0} {
++ if {$n ne {} && ![string match #* $n]} {
++ lappend idx $n
+ }
- close $fd
+ }
- puts $p
++} else {
++ set idx {}
+}
++close $fd
++
+if {$idx ne {}} {
+ set loaded [list]
+ foreach p $idx {
+ if {[lsearch -exact $loaded $p] >= 0} continue
- unset -nocomplain oguilib oguirel idx fd
-
- 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
- }
- }
+ source [file join $oguilib $p]
+ lappend loaded $p
+ }
+ unset loaded p
+} else {
+ set auto_path [concat [list $oguilib] $auto_path]
+}
- if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
- set current_branch {}
- } else {
- regsub ^refs/((heads|tags|remotes)/)? \
- $current_branch \
- {} \
- current_branch
- }
-
++unset -nocomplain oguirel idx fd
+
+######################################################################
+##
+## read only globals
+
+set _appname [lindex [file split $argv0] end]
+set _gitdir {}
+set _gitexec {}
+set _reponame {}
+set _iscygwin {}
+
+proc appname {} {
+ global _appname
+ return $_appname
+}
+
+proc gitdir {args} {
+ global _gitdir
+ if {$args eq {}} {
+ return $_gitdir
+ }
+ return [eval [concat [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 {$args eq {}} {
+ return $_gitexec
+ }
+ return [eval [concat [list file join $_gitexec] $args]]
+}
+
+proc reponame {} {
+ global _reponame
+ return $_reponame
+}
+
+proc is_MacOSX {} {
+ global tcl_platform tk_library
+ if {[tk windowingsystem] eq {aqua}} {
+ return 1
+ }
+ return 0
+}
+
+proc is_Windows {} {
+ global tcl_platform
+ if {$tcl_platform(platform) eq {windows}} {
+ return 1
+ }
+ return 0
+}
+
+proc is_Cygwin {} {
+ global tcl_platform _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 {
+ remote.*.fetch -
+ remote.*.push
+ {return 1}
+ *
+ {return 0}
+ }
+}
+
+proc is_config_true {name} {
+ global repo_config
+ if {[catch {set v $repo_config($name)}]} {
+ return 0
+ } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
+ return 1
+ } else {
+ return 0
+ }
+}
+
++proc get_config {name} {
++ global repo_config
++ if {[catch {set v $repo_config($name)}]} {
++ return {}
++ } else {
++ return $v
++ }
++}
++
+proc load_config {include_global} {
+ global repo_config global_config default_config
+
+ array unset global_config
+ if {$include_global} {
+ catch {
+ set fd_rc [open "| git config --global --list" r]
+ while {[gets $fd_rc line] >= 0} {
+ if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
+ if {[is_many_config $name]} {
+ lappend global_config($name) $value
+ } else {
+ set global_config($name) $value
+ }
+ }
+ }
+ close $fd_rc
+ }
+ }
+
+ array unset repo_config
+ catch {
+ set fd_rc [open "| git config --list" r]
+ while {[gets $fd_rc line] >= 0} {
+ if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
+ if {[is_many_config $name]} {
+ lappend repo_config($name) $value
+ } else {
+ set repo_config($name) $value
+ }
+ }
+ }
+ close $fd_rc
+ }
+
+ foreach name [array names default_config] {
+ if {[catch {set v $global_config($name)}]} {
+ set global_config($name) $default_config($name)
+ }
+ if {[catch {set v $repo_config($name)}]} {
+ set repo_config($name) $default_config($name)
+ }
+ }
+}
+
+######################################################################
+##
+## handy utils
+
+proc git {args} {
+ return [eval exec git $args]
+}
+
++proc current-branch {} {
++ set ref {}
++ set fd [open [gitdir HEAD] r]
++ if {[gets $fd ref] <16
++ || ![regsub {^ref: refs/heads/} $ref {} ref]} {
++ set ref {}
++ }
++ close $fd
++ return $ref
++}
++
+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
+}
+
+######################################################################
+##
+## version check
+
+if {{--version} eq $argv || {version} eq $argv} {
+ puts "git-gui version $appvers"
+ exit
+}
+
+set req_maj 1
+set req_min 5
+
+if {[catch {set v [git --version]} err]} {
+ catch {wm withdraw .}
+ error_popup "Cannot determine Git version:
+
+$err
+
+[appname] requires Git $req_maj.$req_min or later."
+ exit 1
+}
+if {[regexp {^git version (\d+)\.(\d+)} $v _junk act_maj act_min]} {
+ if {$act_maj < $req_maj
+ || ($act_maj == $req_maj && $act_min < $req_min)} {
+ catch {wm withdraw .}
+ error_popup "[appname] requires Git $req_maj.$req_min or later.
+
+You are using $v."
+ exit 1
+ }
+} else {
+ catch {wm withdraw .}
+ error_popup "Cannot parse Git version string:\n\n$v"
+ exit 1
+}
+unset -nocomplain v _junk act_maj act_min req_maj req_min
+
+######################################################################
+##
+## repository setup
+
+if {[catch {
+ set _gitdir $env(GIT_DIR)
+ set _prefix {}
+ }]
+ && [catch {
+ set _gitdir [git rev-parse --git-dir]
+ set _prefix [git rev-parse --show-prefix]
+ } err]} {
+ catch {wm withdraw .}
+ error_popup "Cannot find the git directory:\n\n$err"
+ exit 1
+}
+if {![file isdirectory $_gitdir] && [is_Cygwin]} {
+ catch {set _gitdir [exec cygpath --unix $_gitdir]}
+}
+if {![file isdirectory $_gitdir]} {
+ catch {wm withdraw .}
+ error_popup "Git directory not found:\n\n$_gitdir"
+ exit 1
+}
+if {[lindex [file split $_gitdir] end] ne {.git}} {
+ catch {wm withdraw .}
+ error_popup "Cannot use funny .git directory:\n\n$_gitdir"
+ exit 1
+}
+if {[catch {cd [file dirname $_gitdir]} err]} {
+ catch {wm withdraw .}
+ error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
+ exit 1
+}
+set _reponame [lindex [file split \
+ [file normalize [file dirname $_gitdir]]] \
+ end]
+
+######################################################################
+##
+## global init
+
+set current_diff_path {}
+set current_diff_side {}
+set diff_actions [list]
+set ui_status_value {Initializing...}
+
+set HEAD {}
+set PARENT {}
+set MERGE_HEAD [list]
+set commit_type {}
+set empty_tree {}
+set current_branch {}
+set current_diff_path {}
+set selected_commit_type new
+
+######################################################################
+##
+## task management
+
+set rescan_active 0
+set diff_active 0
+set last_clicked {}
+
+set disable_on_lock [list]
+set index_lock_type none
+
+proc lock_index {type} {
+ global index_lock_type disable_on_lock
+
+ if {$index_lock_type eq {none}} {
+ set index_lock_type $type
+ foreach w $disable_on_lock {
+ uplevel #0 $w disabled
+ }
+ return 1
+ } elseif {$index_lock_type eq "begin-$type"} {
+ set index_lock_type $type
+ return 1
+ }
+ return 0
+}
+
+proc unlock_index {} {
+ global index_lock_type disable_on_lock
+
+ set index_lock_type none
+ foreach w $disable_on_lock {
+ uplevel #0 $w normal
+ }
+}
+
+######################################################################
+##
+## status
+
+proc repository_state {ctvar hdvar mhvar} {
+ global current_branch
+ upvar $ctvar ct $hdvar hd $mhvar mh
+
+ set mh [list]
+
- 0 {
- set current_branch [git symbolic-ref HEAD]
- regsub ^refs/((heads|tags|remotes)/)? \
- $current_branch {} current_branch
- }
- 1 {
- set current_branch [lindex $argv 0]
- }
++ set current_branch [current-branch]
+ if {[catch {set hd [git rev-parse --verify HEAD]}]} {
+ set hd {}
+ set ct initial
+ return
+ }
+
+ set merge_head [gitdir MERGE_HEAD]
+ if {[file exists $merge_head]} {
+ set ct merge
+ set fd_mh [open $merge_head r]
+ while {[gets $fd_mh line] >= 0} {
+ lappend mh $line
+ }
+ close $fd_mh
+ return
+ }
+
+ set ct normal
+}
+
+proc PARENT {} {
+ global PARENT empty_tree
+
+ set p [lindex $PARENT 0]
+ if {$p ne {}} {
+ return $p
+ }
+ if {$empty_tree eq {}} {
+ set empty_tree [git mktree << {}]
+ }
+ return $empty_tree
+}
+
+proc rescan {after {honor_trustmtime 1}} {
+ global HEAD PARENT MERGE_HEAD commit_type
+ global ui_index ui_workdir ui_status_value 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 {![$ui_comm edit modified]
+ || [string trim [$ui_comm get 0.0 end]] eq {}} {
+ if {[load_message GITGUI_MSG]} {
+ } elseif {[load_message MERGE_MSG]} {
+ } elseif {[load_message SQUASH_MSG]} {
+ }
+ $ui_comm edit reset
+ $ui_comm edit modified false
+ }
+
+ if {[is_enabled branch]} {
+ load_all_heads
+ populate_branch_menu
+ }
+
+ if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
+ rescan_stage2 {} $after
+ } else {
+ set rescan_active 1
+ set ui_status_value {Refreshing file status...}
+ set cmd [list git update-index]
+ lappend cmd -q
+ lappend cmd --unmerged
+ lappend cmd --ignore-missing
+ lappend cmd --refresh
+ set fd_rf [open "| $cmd" r]
+ fconfigure $fd_rf -blocking 0 -translation binary
+ fileevent $fd_rf readable \
+ [list rescan_stage2 $fd_rf $after]
+ }
+}
+
+proc rescan_stage2 {fd after} {
+ global ui_status_value
+ global rescan_active buf_rdi buf_rdf buf_rlo
+
+ if {$fd ne {}} {
+ read $fd
+ if {![eof $fd]} return
+ close $fd
+ }
+
+ set ls_others [list | git ls-files --others -z \
+ --exclude-per-directory=.gitignore]
+ set info_exclude [gitdir info exclude]
+ if {[file readable $info_exclude]} {
+ lappend ls_others "--exclude-from=$info_exclude"
+ }
+
+ set buf_rdi {}
+ set buf_rdf {}
+ set buf_rlo {}
+
+ set rescan_active 3
+ set ui_status_value {Scanning for modified files ...}
+ set fd_di [open "| git diff-index --cached -z [PARENT]" r]
+ set fd_df [open "| git diff-files -z" r]
+ set fd_lo [open $ls_others r]
+
+ 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
+ }
+ set content [string trim [read $fd]]
+ close $fd
+ regsub -all -line {[ \r\t]+$} $content {} content
+ $ui_comm delete 0.0 end
+ $ui_comm insert end $content
+ return 1
+ }
+ return 0
+}
+
+proc read_diff_index {fd after} {
+ global buf_rdi
+
+ append buf_rdi [read $fd]
+ set c 0
+ set n [string length $buf_rdi]
+ while {$c < $n} {
+ set z1 [string first "\0" $buf_rdi $c]
+ if {$z1 == -1} break
+ incr z1
+ set z2 [string first "\0" $buf_rdi $z1]
+ if {$z2 == -1} break
+
+ incr c
+ set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
+ set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
+ merge_state \
+ [encoding convertfrom $p] \
+ [lindex $i 4]? \
+ [list [lindex $i 0] [lindex $i 2]] \
+ [list]
+ set c $z2
+ incr c
+ }
+ if {$c < $n} {
+ set buf_rdi [string range $buf_rdi $c end]
+ } else {
+ set buf_rdi {}
+ }
+
+ rescan_done $fd buf_rdi $after
+}
+
+proc read_diff_files {fd after} {
+ global buf_rdf
+
+ append buf_rdf [read $fd]
+ set c 0
+ set n [string length $buf_rdf]
+ while {$c < $n} {
+ set z1 [string first "\0" $buf_rdf $c]
+ if {$z1 == -1} break
+ incr z1
+ set z2 [string first "\0" $buf_rdf $z1]
+ if {$z2 == -1} break
+
+ incr c
+ set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
+ set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
+ merge_state \
+ [encoding convertfrom $p] \
+ ?[lindex $i 4] \
+ [list] \
+ [list [lindex $i 0] [lindex $i 2]]
+ set c $z2
+ incr c
+ }
+ if {$c < $n} {
+ set buf_rdf [string range $buf_rdf $c end]
+ } else {
+ set buf_rdf {}
+ }
+
+ rescan_done $fd buf_rdf $after
+}
+
+proc read_ls_others {fd after} {
+ global buf_rlo
+
+ append buf_rlo [read $fd]
+ set pck [split $buf_rlo "\0"]
+ set buf_rlo [lindex $pck end]
+ foreach p [lrange $pck 0 end-1] {
+ merge_state [encoding convertfrom $p] ?O
+ }
+ rescan_done $fd buf_rlo $after
+}
+
+proc rescan_done {fd buf after} {
+ global rescan_active current_diff_path
+ global file_states repo_config
+ upvar $buf to_clear
+
+ if {![eof $fd]} return
+ set to_clear {}
+ close $fd
+ if {[incr rescan_active -1] > 0} return
+
+ prune_selection
+ unlock_index
+ display_all_files
+ if {$current_diff_path ne {}} reshow_diff
+ uplevel #0 $after
+}
+
+proc prune_selection {} {
+ global file_states selected_paths
+
+ foreach path [array names selected_paths] {
+ if {[catch {set still_here $file_states($path)}]} {
+ unset selected_paths($path)
+ }
+ }
+}
+
+######################################################################
+##
+## ui helpers
+
+proc mapicon {w state path} {
+ global all_icons
+
+ if {[catch {set r $all_icons($state$w)}]} {
+ puts "error: no icon for $w state={$state} $path"
+ return file_plain
+ }
+ return $r
+}
+
+proc mapdesc {state path} {
+ global all_descs
+
+ if {[catch {set r $all_descs($state)}]} {
+ puts "error: no desc for state={$state} $path"
+ return $state
+ }
+ return $r
+}
+
+proc escape_path {path} {
+ regsub -all {\\} $path "\\\\" path
+ regsub -all "\n" $path "\\n" path
+ return $path
+}
+
+proc short_path {path} {
+ return [escape_path [lindex [file split $path] end]]
+}
+
+set next_icon_id 0
+set null_sha1 [string repeat 0 40]
+
+proc merge_state {path new_state {head_info {}} {index_info {}}} {
+ global file_states next_icon_id null_sha1
+
+ set s0 [string index $new_state 0]
+ set s1 [string index $new_state 1]
+
+ if {[catch {set info $file_states($path)}]} {
+ set state __
+ set icon n[incr next_icon_id]
+ } else {
+ set state [lindex $info 0]
+ set icon [lindex $info 1]
+ if {$head_info eq {}} {set head_info [lindex $info 2]}
+ if {$index_info eq {}} {set index_info [lindex $info 3]}
+ }
+
+ if {$s0 eq {?}} {set s0 [string index $state 0]} \
+ elseif {$s0 eq {_}} {set s0 _}
+
+ if {$s1 eq {?}} {set s1 [string index $state 1]} \
+ elseif {$s1 eq {_}} {set s1 _}
+
+ if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
+ set head_info [list 0 $null_sha1]
+ } elseif {$s0 ne {_} && [string index $state 0] eq {_}
+ && $head_info eq {}} {
+ set head_info $index_info
+ }
+
+ set file_states($path) [list $s0$s1 $icon \
+ $head_info $index_info \
+ ]
+ return $state
+}
+
+proc display_file_helper {w path icon_name old_m new_m} {
+ global file_lists
+
+ if {$new_m eq {_}} {
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
+ if {$lno >= 0} {
+ set file_lists($w) [lreplace $file_lists($w) $lno $lno]
+ incr lno
+ $w conf -state normal
+ $w delete $lno.0 [expr {$lno + 1}].0
+ $w conf -state disabled
+ }
+ } elseif {$old_m eq {_} && $new_m ne {_}} {
+ lappend file_lists($w) $path
+ set file_lists($w) [lsort -unique $file_lists($w)]
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
+ incr lno
+ $w conf -state normal
+ $w image create $lno.0 \
+ -align center -padx 5 -pady 1 \
+ -name $icon_name \
+ -image [mapicon $w $new_m $path]
+ $w insert $lno.1 "[escape_path $path]\n"
+ $w conf -state disabled
+ } elseif {$old_m ne $new_m} {
+ $w conf -state normal
+ $w image conf $icon_name -image [mapicon $w $new_m $path]
+ $w conf -state disabled
+ }
+}
+
+proc display_file {path state} {
+ global file_states selected_paths
+ global ui_index ui_workdir
+
+ set old_m [merge_state $path $state]
+ set s $file_states($path)
+ set new_m [lindex $s 0]
+ set icon_name [lindex $s 1]
+
+ set o [string index $old_m 0]
+ set n [string index $new_m 0]
+ if {$o eq {U}} {
+ set o _
+ }
+ if {$n eq {U}} {
+ set n _
+ }
+ display_file_helper $ui_index $path $icon_name $o $n
+
+ if {[string index $old_m 0] eq {U}} {
+ set o U
+ } else {
+ set o [string index $old_m 1]
+ }
+ if {[string index $new_m 0] eq {U}} {
+ set n U
+ } else {
+ set n [string index $new_m 1]
+ }
+ display_file_helper $ui_workdir $path $icon_name $o $n
+
+ if {$new_m eq {__}} {
+ unset file_states($path)
+ catch {unset selected_paths($path)}
+ }
+}
+
+proc display_all_files_helper {w path icon_name m} {
+ global file_lists
+
+ lappend file_lists($w) $path
+ set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name $icon_name \
+ -image [mapicon $w $m $path]
+ $w insert end "[escape_path $path]\n"
+}
+
+proc display_all_files {} {
+ global ui_index ui_workdir
+ global file_states file_lists
+ global last_clicked
+
+ $ui_index conf -state normal
+ $ui_workdir conf -state normal
+
+ $ui_index delete 0.0 end
+ $ui_workdir delete 0.0 end
+ set last_clicked {}
+
+ set file_lists($ui_index) [list]
+ set file_lists($ui_workdir) [list]
+
+ foreach path [lsort [array names file_states]] {
+ set s $file_states($path)
+ set m [lindex $s 0]
+ set icon_name [lindex $s 1]
+
+ set s [string index $m 0]
+ if {$s ne {U} && $s ne {_}} {
+ display_all_files_helper $ui_index $path \
+ $icon_name $s
+ }
+
+ if {[string index $m 0] eq {U}} {
+ set s U
+ } else {
+ set s [string index $m 1]
+ }
+ if {$s ne {_}} {
+ display_all_files_helper $ui_workdir $path \
+ $icon_name $s
+ }
+ }
+
+ $ui_index conf -state disabled
+ $ui_workdir conf -state disabled
+}
+
+######################################################################
+##
+## icons
+
+set filemask {
+#define mask_width 14
+#define mask_height 15
+static unsigned char mask_bits[] = {
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
+ 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
+}
+
+image create bitmap file_plain -background white -foreground black -data {
+#define plain_width 14
+#define plain_height 15
+static unsigned char plain_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
+ 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
+ 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_mod -background white -foreground blue -data {
+#define mod_width 14
+#define mod_height 15
+static unsigned char mod_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_fulltick -background white -foreground "#007000" -data {
+#define file_fulltick_width 14
+#define file_fulltick_height 15
+static unsigned char file_fulltick_bits[] = {
+ 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
+ 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
+ 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_parttick -background white -foreground "#005050" -data {
+#define parttick_width 14
+#define parttick_height 15
+static unsigned char parttick_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
+ 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
+ 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_question -background white -foreground black -data {
+#define file_question_width 14
+#define file_question_height 15
+static unsigned char file_question_bits[] = {
+ 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
+ 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
+ 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_removed -background white -foreground red -data {
+#define file_removed_width 14
+#define file_removed_height 15
+static unsigned char file_removed_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
+ 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
+ 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+image create bitmap file_merge -background white -foreground blue -data {
+#define file_merge_width 14
+#define file_merge_height 15
+static unsigned char file_merge_bits[] = {
+ 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
+ 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+ 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+} -maskdata $filemask
+
+set file_dir_data {
+#define file_width 18
+#define file_height 18
+static unsigned char file_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
+ 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
+ 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
+ 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+}
+image create bitmap file_dir -background white -foreground blue \
+ -data $file_dir_data -maskdata $file_dir_data
+unset file_dir_data
+
+set file_uplevel_data {
+#define up_width 15
+#define up_height 15
+static unsigned char up_bits[] = {
+ 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
+ 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
+ 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
+}
+image create bitmap file_uplevel -background white -foreground red \
+ -data $file_uplevel_data -maskdata $file_uplevel_data
+unset file_uplevel_data
+
+set ui_index .vpane.files.index.list
+set ui_workdir .vpane.files.workdir.list
+
+set all_icons(_$ui_index) file_plain
+set all_icons(A$ui_index) file_fulltick
+set all_icons(M$ui_index) file_fulltick
+set all_icons(D$ui_index) file_removed
+set all_icons(U$ui_index) file_merge
+
+set all_icons(_$ui_workdir) file_plain
+set all_icons(M$ui_workdir) file_mod
+set all_icons(D$ui_workdir) file_question
+set all_icons(U$ui_workdir) file_merge
+set all_icons(O$ui_workdir) file_plain
+
+set max_status_desc 0
+foreach i {
+ {__ "Unmodified"}
+
+ {_M "Modified, not staged"}
+ {M_ "Staged for commit"}
+ {MM "Portions staged for commit"}
+ {MD "Staged for commit, missing"}
+
+ {_O "Untracked, not staged"}
+ {A_ "Staged for commit"}
+ {AM "Portions staged for commit"}
+ {AD "Staged for commit, missing"}
+
+ {_D "Missing"}
+ {D_ "Staged for removal"}
+ {DO "Staged for removal, still present"}
+
+ {U_ "Requires merge resolution"}
+ {UU "Requires merge resolution"}
+ {UM "Requires merge resolution"}
+ {UD "Requires merge resolution"}
+ } {
+ if {$max_status_desc < [string length [lindex $i 1]]} {
+ set max_status_desc [string length [lindex $i 1]]
+ }
+ set all_descs([lindex $i 0]) [lindex $i 1]
+}
+unset i
+
+######################################################################
+##
+## util
+
+proc bind_button3 {w cmd} {
+ bind $w <Any-Button-3> $cmd
+ if {[is_MacOSX]} {
+ bind $w <Control-Button-1> $cmd
+ }
+}
+
+proc scrollbar2many {list mode args} {
+ foreach w $list {eval $w $mode $args}
+}
+
+proc many2scrollbar {list mode sb top bottom} {
+ $sb set $top $bottom
+ foreach w $list {$w $mode moveto $top}
+}
+
+proc incr_font_size {font {amt 1}} {
+ set sz [font configure $font -size]
+ incr sz $amt
+ font configure $font -size $sz
+ font configure ${font}bold -size $sz
+ font configure ${font}italic -size $sz
+}
+
+######################################################################
+##
+## ui commands
+
+set starting_gitk_msg {Starting gitk... please wait...}
+
+proc do_gitk {revs} {
+ global env ui_status_value starting_gitk_msg
+
+ # -- Always start gitk through whatever we were loaded with. This
+ # lets us bypass using shell process on Windows systems.
+ #
+ set cmd [list [info nameofexecutable]]
+ lappend cmd [gitexec gitk]
+ if {$revs ne {}} {
+ append cmd { }
+ append cmd $revs
+ }
+
+ if {[catch {eval exec $cmd &} err]} {
+ error_popup "Failed to start gitk:\n\n$err"
+ } else {
+ set ui_status_value $starting_gitk_msg
+ after 10000 {
+ if {$ui_status_value eq $starting_gitk_msg} {
+ set ui_status_value {Ready.}
+ }
+ }
+ }
+}
+
+set is_quitting 0
+
+proc do_quit {} {
+ global ui_comm is_quitting repo_config commit_type
+
+ if {$is_quitting} return
+ set is_quitting 1
+
+ if {[winfo exists $ui_comm]} {
+ # -- Stash our current commit buffer.
+ #
+ set save [gitdir GITGUI_MSG]
+ 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}
+ }
+
+ # -- Stash our current window geometry into this repository.
+ #
+ set cfg_geometry [list]
+ lappend cfg_geometry [wm geometry .]
+ lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
+ lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
+ if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
+ set rc_geometry {}
+ }
+ if {$cfg_geometry ne $rc_geometry} {
+ catch {git config gui.geometry $cfg_geometry}
+ }
+ }
+
+ destroy .
+}
+
+proc do_rescan {} {
+ rescan {set ui_status_value {Ready.}}
+}
+
+proc do_commit {} {
+ commit_tree
+}
+
+proc toggle_or_diff {w x y} {
+ global file_states file_lists current_diff_path ui_index ui_workdir
+ global last_clicked selected_paths
+
+ set pos [split [$w index @$x,$y] .]
+ set lno [lindex $pos 0]
+ set col [lindex $pos 1]
+ set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ if {$path eq {}} {
+ set last_clicked {}
+ return
+ }
+
+ set last_clicked [list $w $lno]
+ array unset selected_paths
+ $ui_index tag remove in_sel 0.0 end
+ $ui_workdir tag remove in_sel 0.0 end
+
+ if {$col == 0} {
+ if {$current_diff_path eq $path} {
+ set after {reshow_diff;}
+ } else {
+ set after {}
+ }
+ if {$w eq $ui_index} {
+ update_indexinfo \
+ "Unstaging [short_path $path] from commit" \
+ [list $path] \
+ [concat $after {set ui_status_value {Ready.}}]
+ } elseif {$w eq $ui_workdir} {
+ update_index \
+ "Adding [short_path $path]" \
+ [list $path] \
+ [concat $after {set ui_status_value {Ready.}}]
+ }
+ } else {
+ show_diff $path $w $lno
+ }
+}
+
+proc add_one_to_selection {w x y} {
+ global file_lists last_clicked selected_paths
+
+ set lno [lindex [split [$w index @$x,$y] .] 0]
+ set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ if {$path eq {}} {
+ set last_clicked {}
+ return
+ }
+
+ if {$last_clicked ne {}
+ && [lindex $last_clicked 0] ne $w} {
+ array unset selected_paths
+ [lindex $last_clicked 0] tag remove in_sel 0.0 end
+ }
+
+ set last_clicked [list $w $lno]
+ if {[catch {set in_sel $selected_paths($path)}]} {
+ set in_sel 0
+ }
+ if {$in_sel} {
+ unset selected_paths($path)
+ $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
+ } else {
+ set selected_paths($path) 1
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ }
+}
+
+proc add_range_to_selection {w x y} {
+ global file_lists last_clicked selected_paths
+
+ if {[lindex $last_clicked 0] ne $w} {
+ toggle_or_diff $w $x $y
+ return
+ }
+
+ set lno [lindex [split [$w index @$x,$y] .] 0]
+ set lc [lindex $last_clicked 1]
+ if {$lc < $lno} {
+ set begin $lc
+ set end $lno
+ } else {
+ set begin $lno
+ set end $lc
+ }
+
+ foreach path [lrange $file_lists($w) \
+ [expr {$begin - 1}] \
+ [expr {$end - 1}]] {
+ set selected_paths($path) 1
+ }
+ $w tag add in_sel $begin.0 [expr {$end + 1}].0
+}
+
+######################################################################
+##
+## config defaults
+
+set cursor_ptr arrow
+font create font_diff -family Courier -size 10
+font create font_ui
+catch {
+ label .dummy
+ eval font configure font_ui [font actual [.dummy cget -font]]
+ destroy .dummy
+}
+
+font create font_uiitalic
+font create font_uibold
+font create font_diffbold
+font create font_diffitalic
+
+foreach class {Button Checkbutton Entry Label
+ Labelframe Listbox Menu Message
+ Radiobutton Spinbox Text} {
+ option add *$class.font font_ui
+}
+unset class
+
++if {[is_Windows] || [is_MacOSX]} {
++ option add *Menu.tearOff 0
++}
++
+if {[is_MacOSX]} {
+ set M1B M1
+ set M1T Cmd
+} else {
+ set M1B Control
+ set M1T Ctrl
+}
+
+proc apply_config {} {
+ global repo_config font_descs
+
+ foreach option $font_descs {
+ set name [lindex $option 0]
+ set font [lindex $option 1]
+ if {[catch {
+ foreach {cn cv} $repo_config(gui.$name) {
+ font configure $font $cn $cv
+ }
+ } err]} {
+ error_popup "Invalid font specified in gui.$name:\n\n$err"
+ }
+ foreach {cn cv} [font configure $font] {
+ font configure ${font}bold $cn $cv
+ font configure ${font}italic $cn $cv
+ }
+ font configure ${font}bold -weight bold
+ font configure ${font}italic -slant italic
+ }
+}
+
++set default_config(merge.diffstat) true
+set default_config(merge.summary) false
+set default_config(merge.verbosity) 2
+set default_config(user.name) {}
+set default_config(user.email) {}
+
++set default_config(gui.pruneduringfetch) false
+set default_config(gui.trustmtime) false
+set default_config(gui.diffcontext) 5
+set default_config(gui.newbranchtemplate) {}
+set default_config(gui.fontui) [font configure font_ui]
+set default_config(gui.fontdiff) [font configure font_diff]
+set font_descs {
+ {fontui font_ui {Main Font}}
+ {fontdiff font_diff {Diff/Console Font}}
+}
+load_config 0
+apply_config
+
+######################################################################
+##
+## feature option selection
+
+if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
+ unset _junk
+} else {
+ set subcommand gui
+}
+if {$subcommand eq {gui.sh}} {
+ set subcommand gui
+}
+if {$subcommand eq {gui} && [llength $argv] > 0} {
+ set subcommand [lindex $argv 0]
+ set argv [lrange $argv 1 end]
+}
+
+enable_option multicommit
+enable_option branch
+enable_option transport
+
+switch -- $subcommand {
+browser -
+blame {
+ disable_option multicommit
+ disable_option branch
+ disable_option transport
+}
+citool {
+ enable_option singlecommit
+
+ disable_option multicommit
+ disable_option branch
+ disable_option transport
+}
+}
+
+######################################################################
+##
+## ui construction
+
+set ui_comm {}
+
+# -- Menu Bar
+#
+menu .mbar -tearoff 0
+.mbar add cascade -label Repository -menu .mbar.repository
+.mbar add cascade -label Edit -menu .mbar.edit
+if {[is_enabled branch]} {
+ .mbar add cascade -label Branch -menu .mbar.branch
+}
+if {[is_enabled multicommit] || [is_enabled singlecommit]} {
+ .mbar add cascade -label Commit -menu .mbar.commit
+}
+if {[is_enabled transport]} {
+ .mbar add cascade -label Merge -menu .mbar.merge
+ .mbar add cascade -label Fetch -menu .mbar.fetch
+ .mbar add cascade -label Push -menu .mbar.push
+}
+. configure -menu .mbar
+
+# -- Repository Menu
+#
+menu .mbar.repository
+
+.mbar.repository add command \
+ -label {Browse Current Branch} \
+ -command {browser::new $current_branch}
+trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
+.mbar.repository add separator
+
+.mbar.repository add command \
+ -label {Visualize Current Branch} \
+ -command {do_gitk $current_branch}
+trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
+.mbar.repository add command \
+ -label {Visualize All Branches} \
+ -command {do_gitk --all}
+.mbar.repository add separator
+
+if {[is_enabled multicommit]} {
+ .mbar.repository add command -label {Database Statistics} \
+ -command do_stats
+
+ .mbar.repository add command -label {Compress Database} \
+ -command do_gc
+
+ .mbar.repository add command -label {Verify Database} \
+ -command do_fsck_objects
+
+ .mbar.repository add separator
+
+ if {[is_Cygwin]} {
+ .mbar.repository add command \
+ -label {Create Desktop Icon} \
+ -command do_cygwin_shortcut
+ } elseif {[is_Windows]} {
+ .mbar.repository add command \
+ -label {Create Desktop Icon} \
+ -command do_windows_shortcut
+ } elseif {[is_MacOSX]} {
+ .mbar.repository add command \
+ -label {Create Desktop Icon} \
+ -command do_macosx_app
+ }
+}
+
+.mbar.repository add command -label Quit \
+ -command do_quit \
+ -accelerator $M1T-Q
+
+# -- Edit Menu
+#
+menu .mbar.edit
+.mbar.edit add command -label Undo \
+ -command {catch {[focus] edit undo}} \
+ -accelerator $M1T-Z
+.mbar.edit add command -label Redo \
+ -command {catch {[focus] edit redo}} \
+ -accelerator $M1T-Y
+.mbar.edit add separator
+.mbar.edit add command -label Cut \
+ -command {catch {tk_textCut [focus]}} \
+ -accelerator $M1T-X
+.mbar.edit add command -label Copy \
+ -command {catch {tk_textCopy [focus]}} \
+ -accelerator $M1T-C
+.mbar.edit add command -label Paste \
+ -command {catch {tk_textPaste [focus]; [focus] see insert}} \
+ -accelerator $M1T-V
+.mbar.edit add command -label Delete \
+ -command {catch {[focus] delete sel.first sel.last}} \
+ -accelerator Del
+.mbar.edit add separator
+.mbar.edit add command -label {Select All} \
+ -command {catch {[focus] tag add sel 0.0 end}} \
+ -accelerator $M1T-A
+
+# -- Branch Menu
+#
+if {[is_enabled branch]} {
+ menu .mbar.branch
+
+ .mbar.branch add command -label {Create...} \
+ -command do_create_branch \
+ -accelerator $M1T-N
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
+
++ .mbar.branch add command -label {Rename...} \
++ -command branch_rename::dialog
++ lappend disable_on_lock [list .mbar.branch entryconf \
++ [.mbar.branch index last] -state]
++
+ .mbar.branch add command -label {Delete...} \
+ -command do_delete_branch
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
+
+ .mbar.branch add command -label {Reset...} \
+ -command merge::reset_hard
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
+}
+
+# -- Commit Menu
+#
+if {[is_enabled multicommit] || [is_enabled singlecommit]} {
+ menu .mbar.commit
+
+ .mbar.commit add radiobutton \
+ -label {New Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value new
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add radiobutton \
+ -label {Amend Last Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value amend
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add separator
+
+ .mbar.commit add command -label Rescan \
+ -command do_rescan \
+ -accelerator F5
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add command -label {Add To Commit} \
+ -command do_add_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add command -label {Add Existing To Commit} \
+ -command do_add_all \
+ -accelerator $M1T-I
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add command -label {Unstage From Commit} \
+ -command do_unstage_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add command -label {Revert Changes} \
+ -command do_revert_selection
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+ .mbar.commit add separator
+
+ .mbar.commit add command -label {Sign Off} \
+ -command do_signoff \
+ -accelerator $M1T-S
+
+ .mbar.commit add command -label Commit \
+ -command do_commit \
+ -accelerator $M1T-Return
+ lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+}
+
+# -- Merge Menu
+#
+if {[is_enabled branch]} {
+ menu .mbar.merge
+ .mbar.merge add command -label {Local Merge...} \
+ -command merge::dialog
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
+ .mbar.merge add command -label {Abort Merge...} \
+ -command merge::reset_hard
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
+
+}
+
+# -- Transport Menu
+#
+if {[is_enabled transport]} {
+ menu .mbar.fetch
+
+ menu .mbar.push
+ .mbar.push add command -label {Push...} \
+ -command do_push_anywhere
++ .mbar.push add command -label {Delete...} \
++ -command remote_branch_delete::dialog
+}
+
+if {[is_MacOSX]} {
+ # -- Apple Menu (Mac OS X only)
+ #
+ .mbar add cascade -label Apple -menu .mbar.apple
+ menu .mbar.apple
+
+ .mbar.apple add command -label "About [appname]" \
+ -command do_about
+ .mbar.apple add command -label "Options..." \
+ -command do_options
+} else {
+ # -- Edit Menu
+ #
+ .mbar.edit add separator
+ .mbar.edit add command -label {Options...} \
+ -command do_options
+
+ # -- Tools Menu
+ #
+ if {[file exists /usr/local/miga/lib/gui-miga]
+ && [file exists .pvcsrc]} {
+ proc do_miga {} {
+ global ui_status_value
+ if {![lock_index update]} return
+ set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
+ set miga_fd [open "|$cmd" r]
+ fconfigure $miga_fd -blocking 0
+ fileevent $miga_fd readable [list miga_done $miga_fd]
+ set ui_status_value {Running miga...}
+ }
+ proc miga_done {fd} {
+ read $fd 512
+ if {[eof $fd]} {
+ close $fd
+ unlock_index
+ rescan [list set ui_status_value {Ready.}]
+ }
+ }
+ .mbar add cascade -label Tools -menu .mbar.tools
+ menu .mbar.tools
+ .mbar.tools add command -label "Migrate" \
+ -command do_miga
+ lappend disable_on_lock \
+ [list .mbar.tools entryconf [.mbar.tools index last] -state]
+ }
+}
+
+# -- Help Menu
+#
+.mbar add cascade -label Help -menu .mbar.help
+menu .mbar.help
+
+if {![is_MacOSX]} {
+ .mbar.help add command -label "About [appname]" \
+ -command do_about
+}
+
+set browser {}
+catch {set browser $repo_config(instaweb.browser)}
+set doc_path [file dirname [gitexec]]
+set doc_path [file join $doc_path Documentation index.html]
+
+if {[is_Cygwin]} {
+ set doc_path [exec cygpath --mixed $doc_path]
+}
+
+if {$browser eq {}} {
+ if {[is_MacOSX]} {
+ set browser open
+ } elseif {[is_Cygwin]} {
+ set program_files [file dirname [exec cygpath --windir]]
+ set program_files [file join $program_files {Program Files}]
+ set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
+ set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
+ if {[file exists $firefox]} {
+ set browser $firefox
+ } elseif {[file exists $ie]} {
+ set browser $ie
+ }
+ unset program_files firefox ie
+ }
+}
+
+if {[file isfile $doc_path]} {
+ set doc_url "file:$doc_path"
+} else {
+ set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
+}
+
+if {$browser ne {}} {
+ .mbar.help add command -label {Online Documentation} \
+ -command [list exec $browser $doc_url &]
+}
+unset browser doc_path doc_url
+
+# -- Standard bindings
+#
+bind . <Destroy> {if {{%W} eq {.}} 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 {
+ set subcommand_args {rev?}
+ switch [llength $argv] {
- set current_branch [git symbolic-ref HEAD]
- regsub ^refs/((heads|tags|remotes)/)? \
- $current_branch {} current_branch
++ 0 { set current_branch [current-branch] }
++ 1 { set current_branch [lindex $argv 0] }
+ default usage
+ }
+ browser::new $current_branch
+ return
+}
+blame {
+ set subcommand_args {rev? path?}
+ set head {}
+ set path {}
+ set is_path 0
+ foreach a $argv {
+ if {$is_path || [file exists $_prefix$a]} {
+ if {$path ne {}} usage
+ set path $_prefix$a
+ break
+ } elseif {$a eq {--}} {
+ if {$path ne {}} {
+ if {$head ne {}} usage
+ set head $path
+ set path {}
+ }
+ set is_path 1
+ } elseif {$head eq {}} {
+ if {$head ne {}} usage
+ set head $a
+ } else {
+ usage
+ }
+ }
+ unset is_path
+
+ if {$head eq {}} {
++ set current_branch [current-branch]
+ } else {
+ set current_branch $head
+ }
+
+ if {$path eq {}} usage
+ blame::new $head $path
+ return
+}
+citool -
+gui {
+ if {[llength $argv] != 0} {
+ puts -nonewline stderr "usage: $argv0"
+ if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
+ puts -nonewline stderr " $subcommand"
+ }
+ puts stderr {}
+ exit 1
+ }
+ # fall through to setup UI for commits
+}
+default {
+ puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
+ exit 1
+}
+}
+
+# -- Branch Control
+#
+frame .branch \
+ -borderwidth 1 \
+ -relief sunken
+label .branch.l1 \
+ -text {Current Branch:} \
+ -anchor w \
+ -justify left
+label .branch.cb \
+ -textvariable current_branch \
+ -anchor w \
+ -justify left
+pack .branch.l1 -side left
+pack .branch.cb -side left -fill x
+pack .branch -side top -fill x
+
+# -- Main Window Layout
+#
+panedwindow .vpane -orient vertical
+panedwindow .vpane.files -orient horizontal
+.vpane add .vpane.files -sticky nsew -height 100 -width 200
+pack .vpane -anchor n -side top -fill both -expand 1
+
+# -- Index File List
+#
+frame .vpane.files.index -height 100 -width 200
+label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
+ -background lightgreen
+text $ui_index -background white -borderwidth 0 \
+ -width 20 -height 10 \
+ -wrap none \
+ -cursor $cursor_ptr \
+ -xscrollcommand {.vpane.files.index.sx set} \
+ -yscrollcommand {.vpane.files.index.sy set} \
+ -state disabled
+scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
+scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
+pack .vpane.files.index.title -side top -fill x
+pack .vpane.files.index.sx -side bottom -fill x
+pack .vpane.files.index.sy -side right -fill y
+pack $ui_index -side left -fill both -expand 1
+.vpane.files add .vpane.files.index -sticky nsew
+
+# -- Working Directory File List
+#
+frame .vpane.files.workdir -height 100 -width 200
+label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
+ -background lightsalmon
+text $ui_workdir -background white -borderwidth 0 \
+ -width 20 -height 10 \
+ -wrap none \
+ -cursor $cursor_ptr \
+ -xscrollcommand {.vpane.files.workdir.sx set} \
+ -yscrollcommand {.vpane.files.workdir.sy set} \
+ -state disabled
+scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
+scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
+pack .vpane.files.workdir.title -side top -fill x
+pack .vpane.files.workdir.sx -side bottom -fill x
+pack .vpane.files.workdir.sy -side right -fill y
+pack $ui_workdir -side left -fill both -expand 1
+.vpane.files add .vpane.files.workdir -sticky nsew
+
+foreach i [list $ui_index $ui_workdir] {
+ $i tag conf in_diff -background lightgray
+ $i tag conf in_sel -background lightgray
+}
+unset i
+
+# -- Diff and Commit Area
+#
+frame .vpane.lower -height 300 -width 400
+frame .vpane.lower.commarea
+frame .vpane.lower.diff -relief sunken -borderwidth 1
+pack .vpane.lower.commarea -side top -fill x
+pack .vpane.lower.diff -side bottom -fill both -expand 1
+.vpane add .vpane.lower -sticky nsew
+
+# -- Commit Area Buttons
+#
+frame .vpane.lower.commarea.buttons
+label .vpane.lower.commarea.buttons.l -text {} \
+ -anchor w \
+ -justify left
+pack .vpane.lower.commarea.buttons.l -side top -fill x
+pack .vpane.lower.commarea.buttons -side left -fill y
+
+button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
+ -command do_rescan
+pack .vpane.lower.commarea.buttons.rescan -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.rescan conf -state}
+
+button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
+ -command do_add_all
+pack .vpane.lower.commarea.buttons.incall -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.incall conf -state}
+
+button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
+ -command do_signoff
+pack .vpane.lower.commarea.buttons.signoff -side top -fill x
+
+button .vpane.lower.commarea.buttons.commit -text {Commit} \
+ -command do_commit
+pack .vpane.lower.commarea.buttons.commit -side top -fill x
+lappend disable_on_lock \
+ {.vpane.lower.commarea.buttons.commit conf -state}
+
+# -- Commit Message Buffer
+#
+frame .vpane.lower.commarea.buffer
+frame .vpane.lower.commarea.buffer.header
+set ui_comm .vpane.lower.commarea.buffer.t
+set ui_coml .vpane.lower.commarea.buffer.header.l
+radiobutton .vpane.lower.commarea.buffer.header.new \
+ -text {New Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value new
+lappend disable_on_lock \
+ [list .vpane.lower.commarea.buffer.header.new conf -state]
+radiobutton .vpane.lower.commarea.buffer.header.amend \
+ -text {Amend Last Commit} \
+ -command do_select_commit_type \
+ -variable selected_commit_type \
+ -value amend
+lappend disable_on_lock \
+ [list .vpane.lower.commarea.buffer.header.amend conf -state]
+label $ui_coml \
+ -anchor w \
+ -justify left
+proc trace_commit_type {varname args} {
+ global ui_coml commit_type
+ switch -glob -- $commit_type {
+ initial {set txt {Initial Commit Message:}}
+ amend {set txt {Amended Commit Message:}}
+ amend-initial {set txt {Amended Initial Commit Message:}}
+ amend-merge {set txt {Amended Merge Commit Message:}}
+ merge {set txt {Merge Commit Message:}}
+ * {set txt {Commit Message:}}
+ }
+ $ui_coml conf -text $txt
+}
+trace add variable commit_type write trace_commit_type
+pack $ui_coml -side left -fill x
+pack .vpane.lower.commarea.buffer.header.amend -side right
+pack .vpane.lower.commarea.buffer.header.new -side right
+
+text $ui_comm -background white -borderwidth 1 \
+ -undo true \
+ -maxundo 20 \
+ -autoseparators true \
+ -relief sunken \
+ -width 75 -height 9 -wrap none \
+ -font font_diff \
+ -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
+scrollbar .vpane.lower.commarea.buffer.sby \
+ -command [list $ui_comm yview]
+pack .vpane.lower.commarea.buffer.header -side top -fill x
+pack .vpane.lower.commarea.buffer.sby -side right -fill y
+pack $ui_comm -side left -fill y
+pack .vpane.lower.commarea.buffer -side left -fill y
+
+# -- Commit Message Buffer Context Menu
+#
+set ctxm .vpane.lower.commarea.buffer.ctxm
+menu $ctxm -tearoff 0
+$ctxm add command \
+ -label {Cut} \
+ -command {tk_textCut $ui_comm}
+$ctxm add command \
+ -label {Copy} \
+ -command {tk_textCopy $ui_comm}
+$ctxm add command \
+ -label {Paste} \
+ -command {tk_textPaste $ui_comm}
+$ctxm add command \
+ -label {Delete} \
+ -command {$ui_comm delete sel.first sel.last}
+$ctxm add separator
+$ctxm add command \
+ -label {Select All} \
+ -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
+$ctxm add command \
+ -label {Copy All} \
+ -command {
+ $ui_comm tag add sel 0.0 end
+ tk_textCopy $ui_comm
+ $ui_comm tag remove sel 0.0 end
+ }
+$ctxm add separator
+$ctxm add command \
+ -label {Sign Off} \
+ -command do_signoff
+bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
+
+# -- Diff Header
+#
+proc trace_current_diff_path {varname args} {
+ global current_diff_path diff_actions file_states
+ if {$current_diff_path eq {}} {
+ set s {}
+ set f {}
+ set p {}
+ set o disabled
+ } else {
+ set p $current_diff_path
+ set s [mapdesc [lindex $file_states($p) 0] $p]
+ set f {File:}
+ set p [escape_path $p]
+ set o normal
+ }
+
+ .vpane.lower.diff.header.status configure -text $s
+ .vpane.lower.diff.header.file configure -text $f
+ .vpane.lower.diff.header.path configure -text $p
+ foreach w $diff_actions {
+ uplevel #0 $w $o
+ }
+}
+trace add variable current_diff_path write trace_current_diff_path
+
+frame .vpane.lower.diff.header -background gold
+label .vpane.lower.diff.header.status \
+ -background gold \
+ -width $max_status_desc \
+ -anchor w \
+ -justify left
+label .vpane.lower.diff.header.file \
+ -background gold \
+ -anchor w \
+ -justify left
+label .vpane.lower.diff.header.path \
+ -background gold \
+ -anchor w \
+ -justify left
+pack .vpane.lower.diff.header.status -side left
+pack .vpane.lower.diff.header.file -side left
+pack .vpane.lower.diff.header.path -fill x
+set ctxm .vpane.lower.diff.header.ctxm
+menu $ctxm -tearoff 0
+$ctxm add command \
+ -label {Copy} \
+ -command {
+ clipboard clear
+ clipboard append \
+ -format STRING \
+ -type STRING \
+ -- $current_diff_path
+ }
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
+
+# -- Diff Body
+#
+frame .vpane.lower.diff.body
+set ui_diff .vpane.lower.diff.body.t
+text $ui_diff -background white -borderwidth 0 \
+ -width 80 -height 15 -wrap none \
+ -font font_diff \
+ -xscrollcommand {.vpane.lower.diff.body.sbx set} \
+ -yscrollcommand {.vpane.lower.diff.body.sby set} \
+ -state disabled
+scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
+ -command [list $ui_diff xview]
+scrollbar .vpane.lower.diff.body.sby -orient vertical \
+ -command [list $ui_diff yview]
+pack .vpane.lower.diff.body.sbx -side bottom -fill x
+pack .vpane.lower.diff.body.sby -side right -fill y
+pack $ui_diff -side left -fill both -expand 1
+pack .vpane.lower.diff.header -side top -fill x
+pack .vpane.lower.diff.body -side bottom -fill both -expand 1
+
+$ui_diff tag conf d_cr -elide true
+$ui_diff tag conf d_@ -foreground blue -font font_diffbold
+$ui_diff tag conf d_+ -foreground {#00a000}
+$ui_diff tag conf d_- -foreground red
+
+$ui_diff tag conf d_++ -foreground {#00a000}
+$ui_diff tag conf d_-- -foreground red
+$ui_diff tag conf d_+s \
+ -foreground {#00a000} \
+ -background {#e2effa}
+$ui_diff tag conf d_-s \
+ -foreground red \
+ -background {#e2effa}
+$ui_diff tag conf d_s+ \
+ -foreground {#00a000} \
+ -background ivory1
+$ui_diff tag conf d_s- \
+ -foreground red \
+ -background ivory1
+
+$ui_diff tag conf d<<<<<<< \
+ -foreground orange \
+ -font font_diffbold
+$ui_diff tag conf d======= \
+ -foreground orange \
+ -font font_diffbold
+$ui_diff tag conf d>>>>>>> \
+ -foreground orange \
+ -font font_diffbold
+
+$ui_diff tag raise sel
+
+# -- Diff Body Context Menu
+#
+set ctxm .vpane.lower.diff.body.ctxm
+menu $ctxm -tearoff 0
+$ctxm add command \
+ -label {Refresh} \
+ -command reshow_diff
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add command \
+ -label {Copy} \
+ -command {tk_textCopy $ui_diff}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add command \
+ -label {Select All} \
+ -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add command \
+ -label {Copy All} \
+ -command {
+ $ui_diff tag add sel 0.0 end
+ tk_textCopy $ui_diff
+ $ui_diff tag remove sel 0.0 end
+ }
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add separator
+$ctxm add command \
+ -label {Apply/Reverse Hunk} \
+ -command {apply_hunk $cursorX $cursorY}
+set ui_diff_applyhunk [$ctxm index last]
+lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
+$ctxm add separator
+$ctxm add command \
+ -label {Decrease Font Size} \
+ -command {incr_font_size font_diff -1}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add command \
+ -label {Increase Font Size} \
+ -command {incr_font_size font_diff 1}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add separator
+$ctxm add command \
+ -label {Show Less Context} \
+ -command {if {$repo_config(gui.diffcontext) >= 1} {
+ incr repo_config(gui.diffcontext) -1
+ reshow_diff
+ }}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add command \
+ -label {Show More Context} \
+ -command {if {$repo_config(gui.diffcontext) < 99} {
+ incr repo_config(gui.diffcontext)
+ reshow_diff
+ }}
+lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
+$ctxm add separator
+$ctxm add command -label {Options...} \
+ -command do_options
+bind_button3 $ui_diff "
+ set cursorX %x
+ set cursorY %y
+ if {\$ui_index eq \$current_diff_side} {
+ $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
+ } else {
+ $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
+ }
+ tk_popup $ctxm %X %Y
+"
+unset ui_diff_applyhunk
+
+# -- Status Bar
+#
+label .status -textvariable ui_status_value \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken
+pack .status -anchor w -side bottom -fill x
+
+# -- Load geometry
+#
+catch {
+set gm $repo_config(gui.geometry)
+wm geometry . [lindex $gm 0]
+.vpane sash place 0 \
+ [lindex [.vpane sash coord 0] 0] \
+ [lindex $gm 1]
+.vpane.files sash place 0 \
+ [lindex $gm 2] \
+ [lindex [.vpane.files sash coord 0] 1]
+unset gm
+}
+
+# -- Key Bindings
+#
+bind $ui_comm <$M1B-Key-Return> {do_commit;break}
+bind $ui_comm <$M1B-Key-i> {do_add_all;break}
+bind $ui_comm <$M1B-Key-I> {do_add_all;break}
+bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
+bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
+bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
+bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
+bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
+bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
+bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
+bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
+
+bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
+bind $ui_diff <$M1B-Key-v> {break}
+bind $ui_diff <$M1B-Key-V> {break}
+bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
+bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
+bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
+bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
+bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
+bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
+bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
+bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
+bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
+bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
+bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
+bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
+bind $ui_diff <Button-1> {focus %W}
+
+if {[is_enabled branch]} {
+ bind . <$M1B-Key-n> do_create_branch
+ bind . <$M1B-Key-N> do_create_branch
+}
+
+bind all <Key-F5> do_rescan
+bind all <$M1B-Key-r> do_rescan
+bind all <$M1B-Key-R> do_rescan
+bind . <$M1B-Key-s> do_signoff
+bind . <$M1B-Key-S> do_signoff
+bind . <$M1B-Key-i> do_add_all
+bind . <$M1B-Key-I> do_add_all
+bind . <$M1B-Key-Return> do_commit
+foreach i [list $ui_index $ui_workdir] {
+ bind $i <Button-1> "toggle_or_diff $i %x %y; break"
+ bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
+ bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
+}
+unset i
+
+set file_lists($ui_index) [list]
+set file_lists($ui_workdir) [list]
+
+wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
+focus -force $ui_comm
+
+# -- Warn the user about environmental problems. Cygwin's Tcl
+# does *not* pass its env array onto any processes it spawns.
+# This means that git processes get none of our environment.
+#
+if {[is_Cygwin]} {
+ set ignored_env 0
+ set suggest_user {}
+ set msg "Possible environment issues exist.
+
+The following environment variables are probably
+going to be ignored by any Git subprocess run
+by [appname]:
+
+"
+ foreach name [array names env] {
+ switch -regexp -- $name {
+ {^GIT_INDEX_FILE$} -
+ {^GIT_OBJECT_DIRECTORY$} -
+ {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
+ {^GIT_DIFF_OPTS$} -
+ {^GIT_EXTERNAL_DIFF$} -
+ {^GIT_PAGER$} -
+ {^GIT_TRACE$} -
+ {^GIT_CONFIG$} -
+ {^GIT_CONFIG_LOCAL$} -
+ {^GIT_(AUTHOR|COMMITTER)_DATE$} {
+ append msg " - $name\n"
+ incr ignored_env
+ }
+ {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
+ append msg " - $name\n"
+ incr ignored_env
+ set suggest_user $name
+ }
+ }
+ }
+ if {$ignored_env > 0} {
+ append msg "
+This is due to a known issue with the
+Tcl binary distributed by Cygwin."
+
+ if {$suggest_user ne {}} {
+ append msg "
+
+A good replacement for $suggest_user
+is placing values for the user.name and
+user.email settings into your personal
+~/.gitconfig file.
+"
+ }
+ warn_popup $msg
+ }
+ unset ignored_env msg suggest_user name
+}
+
+# -- Only initialize complex UI if we are going to stay running.
+#
+if {[is_enabled transport]} {
+ load_all_remotes
+ load_all_heads
+
+ populate_branch_menu
+ populate_fetch_menu
+ populate_push_menu
+}
+
+# -- Only suggest a gc run if we are going to stay running.
+#
+if {[is_enabled multicommit]} {
+ set object_limit 2000
+ if {[is_Windows]} {set object_limit 200}
+ regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
+ if {$objects_current >= $object_limit} {
+ if {[ask_popup \
+ "This repository currently has $objects_current loose objects.
+
+To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
+
+Compress the database now?"] eq yes} {
+ do_gc
+ }
+ }
+ unset object_limit _junk objects_current
+}
+
+lock_index begin-read
+after 1 do_rescan
diff --cc git-gui/lib/branch_rename.tcl
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..54c72b980c1d097a937f77bf0172bab64a223eda
new file mode 100644 (file)
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,137 @@@
++# git-gui branch rename support
++# Copyright (C) 2007 Shawn Pearce
++
++class branch_rename {
++
++field w
++field oldname
++field newname
++
++constructor dialog {} {
++ global all_heads current_branch
++
++ make_toplevel top w
++ wm title $top "[appname] ([reponame]): Rename Branch"
++ if {$top ne {.}} {
++ wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
++ }
++
++ set oldname $current_branch
++ set newname [get_config gui.newbranchtemplate]
++
++ label $w.header -text {Rename Branch} -font font_uibold
++ pack $w.header -side top -fill x
++
++ frame $w.buttons
++ button $w.buttons.rename -text Rename \
++ -default active \
++ -command [cb _rename]
++ pack $w.buttons.rename -side right
++ button $w.buttons.cancel -text {Cancel} \
++ -command [list destroy $w]
++ pack $w.buttons.cancel -side right -padx 5
++ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
++
++ frame $w.rename
++ label $w.rename.oldname_l -text {Branch:}
++ eval tk_optionMenu $w.rename.oldname_m @oldname $all_heads
++
++ label $w.rename.newname_l -text {New Name:}
++ entry $w.rename.newname_t \
++ -borderwidth 1 \
++ -relief sunken \
++ -width 40 \
++ -textvariable @newname \
++ -validate key \
++ -validatecommand {
++ if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
++ return 1
++ }
++
++ grid $w.rename.oldname_l $w.rename.oldname_m -sticky w -padx {0 5}
++ grid $w.rename.newname_l $w.rename.newname_t -sticky we -padx {0 5}
++ grid columnconfigure $w.rename 1 -weight 1
++ pack $w.rename -anchor nw -fill x -pady 5 -padx 5
++
++ bind $w <Key-Return> [cb _rename]
++ bind $w <Key-Escape> [list destroy $w]
++ bind $w <Visibility> "
++ grab $w
++ $w.rename.newname_t icursor end
++ focus $w.rename.newname_t
++ "
++ bind $w.header <Destroy> [list delete_this $this]
++ tkwait window $w
++}
++
++method _rename {} {
++ global all_heads current_branch
++
++ if {$oldname eq {}} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "Please select a branch to rename."
++ focus $w.rename.oldname_m
++ return
++ }
++ if {$newname eq {}
++ || $newname eq [get_config gui.newbranchtemplate]} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "Please supply a branch name."
++ focus $w.rename.newname_t
++ return
++ }
++ if {![catch {git show-ref --verify -- "refs/heads/$newname"}]} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "Branch '$newname' already exists."
++ focus $w.rename.newname_t
++ return
++ }
++ if {[catch {git check-ref-format "heads/$newname"}]} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "We do not like '$newname' as a branch name."
++ focus $w.rename.newname_t
++ return
++ }
++
++ if {[catch {git branch -m $oldname $newname} err]} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "Failed to rename '$oldname'.\n\n$err"
++ return
++ }
++
++ set oldidx [lsearch -exact -sorted $all_heads $oldname]
++ if {$oldidx >= 0} {
++ set all_heads [lreplace $all_heads $oldidx $oldidx]
++ }
++ lappend all_heads $newname
++ set all_heads [lsort $all_heads]
++ populate_branch_menu
++
++ if {$current_branch eq $oldname} {
++ set current_branch $newname
++ }
++
++ destroy $w
++}
++
++}
diff --cc git-gui/lib/option.tcl
index b29e14e64dd305922f82556e8e445be42a9fbb38,0000000000000000000000000000000000000000..ae19a8f9cf3901a808c85f0c028fbf44813d30b5
mode 100644,000000..100644
mode 100644,000000..100644
--- /dev/null
+++ b/git-gui/lib/option.tcl
- global appvers copyright
+# git-gui options editor
+# Copyright (C) 2006, 2007 Shawn Pearce
+
+proc save_config {} {
+ global default_config font_descs
+ global repo_config global_config
+ global repo_config_new global_config_new
+
+ 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
+ }
+ }
+}
+
+proc do_about {} {
++ global appvers copyright oguilib
+ global tcl_patchLevel tk_patchLevel
+
+ set w .about_dialog
+ toplevel $w
+ wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+ label $w.header -text "About [appname]" \
+ -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons
+ button $w.buttons.close -text {Close} \
+ -default active \
+ -command [list destroy $w]
+ pack $w.buttons.close -side right
+ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
+
+ label $w.desc \
+ -text "git-gui - a graphical user interface for Git.
+$copyright" \
+ -padx 5 -pady 5 \
+ -justify left \
+ -anchor w \
+ -borderwidth 1 \
+ -relief solid
+ pack $w.desc -side top -fill x -padx 5 -pady 5
+
+ set v {}
+ append v "git-gui version $appvers\n"
+ append v "[git version]\n"
+ append v "\n"
+ if {$tcl_patchLevel eq $tk_patchLevel} {
+ append v "Tcl/Tk version $tcl_patchLevel"
+ } else {
+ append v "Tcl version $tcl_patchLevel"
+ append v ", Tk version $tk_patchLevel"
+ }
+
++ set d {}
++ append d "git exec dir: [gitexec]\n"
++ append d "git-gui lib: $oguilib"
++
+ label $w.vers \
+ -text $v \
+ -padx 5 -pady 5 \
+ -justify left \
+ -anchor w \
+ -borderwidth 1 \
+ -relief solid
+ pack $w.vers -side top -fill x -padx 5 -pady 5
+
++ label $w.dirs \
++ -text $d \
++ -padx 5 -pady 5 \
++ -justify left \
++ -anchor w \
++ -borderwidth 1 \
++ -relief solid
++ pack $w.dirs -side top -fill x -padx 5 -pady 5
++
+ menu $w.ctxm -tearoff 0
+ $w.ctxm add command \
+ -label {Copy} \
+ -command "
+ clipboard clear
+ clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
+ "
+
+ bind $w <Visibility> "grab $w; focus $w.buttons.close"
+ bind $w <Key-Escape> "destroy $w"
+ bind $w <Key-Return> "destroy $w"
+ bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
+ wm title $w "About [appname]"
+ tkwait window $w
+}
+
+proc do_options {} {
+ global repo_config global_config font_descs
+ global repo_config_new global_config_new
+
+ array unset repo_config_new
+ array unset global_config_new
+ foreach name [array names repo_config] {
+ set repo_config_new($name) $repo_config($name)
+ }
+ 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 .]"
+
+ label $w.header -text "Options" \
+ -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons
+ button $w.buttons.restore -text {Restore Defaults} \
+ -default normal \
+ -command do_restore_defaults
+ pack $w.buttons.restore -side left
+ button $w.buttons.save -text Save \
+ -default active \
+ -command [list do_save_config $w]
+ pack $w.buttons.save -side right
+ button $w.buttons.cancel -text {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 "[reponame] Repository"
+ labelframe $w.global -text {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 {User Name}}
+ {t user.email {Email Address}}
+
+ {b merge.summary {Summarize Merge Commits}}
+ {i-1..5 merge.verbosity {Merge Verbosity}}
++ {b merge.diffstat {Show Diffstat After Merge}}
+
+ {b gui.trustmtime {Trust File Modification Timestamps}}
++ {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
+ {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
+ {t gui.newbranchtemplate {New Branch Name Template}}
+ } {
+ set type [lindex $option 0]
+ set name [lindex $option 1]
+ set text [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
+ }
+ 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
+ pack $w.$f.$optid -side top -anchor w -fill x
+ }
+ }
+ }
+ }
+
+ set all_fonts [lsort [font families]]
+ foreach option $font_descs {
+ set name [lindex $option 0]
+ set font [lindex $option 1]
+ set text [lindex $option 2]
+
+ set global_config_new(gui.$font^^family) \
+ [font configure $font -family]
+ set global_config_new(gui.$font^^size) \
+ [font configure $font -size]
+
+ frame $w.global.$name
+ label $w.global.$name.l -text "$text:"
+ pack $w.global.$name.l -side left -anchor w -fill x
+ eval tk_optionMenu $w.global.$name.family \
+ global_config_new(gui.$font^^family) \
+ $all_fonts
+ spinbox $w.global.$name.size \
+ -textvariable global_config_new(gui.$font^^size) \
+ -from 2 -to 80 -increment 1 \
+ -width 3
+ bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
+ pack $w.global.$name.size -side right -anchor e
+ pack $w.global.$name.family -side right -anchor e
+ pack $w.global.$name -side top -anchor w -fill x
+ }
+
+ bind $w <Visibility> "grab $w; focus $w.buttons.save"
+ bind $w <Key-Escape> "destroy $w"
+ bind $w <Key-Return> [list do_save_config $w]
+ wm title $w "[appname] ([reponame]): Options"
+ 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 {[catch {save_config} err]} {
+ error_popup "Failed to completely save options:\n\n$err"
+ }
+ reshow_diff
+ destroy $w
+}
diff --cc git-gui/lib/remote.tcl
index 99f353ed7d793ca9accf2c5d246938c8a51fea02,0000000000000000000000000000000000000000..b54824ab725d9f11c6c5a38a8e0c53f37e41adc5
mode 100644,000000..100644
mode 100644,000000..100644
--- /dev/null
+++ b/git-gui/lib/remote.tcl
+# git-gui remote management
+# Copyright (C) 2006, 2007 Shawn Pearce
+
+proc is_tracking_branch {name} {
+ global tracking_branches
+
+ if {![catch {set info $tracking_branches($name)}]} {
+ return 1
+ }
+ foreach t [array names tracking_branches] {
+ if {[string match {*/\*} $t] && [string match $t $name]} {
+ return 1
+ }
+ }
+ return 0
+}
+
+proc all_tracking_branches {} {
+ global tracking_branches
+
+ set all_trackings {}
+ set cmd {}
+ foreach name [array names tracking_branches] {
+ if {[regsub {/\*$} $name {} name]} {
+ lappend cmd $name
+ } else {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ }
+
+ if {$cmd ne {}} {
+ set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
+ while {[gets $fd name] > 0} {
+ regsub ^refs/(heads|remotes)/ $name {} name
+ lappend all_trackings $name
+ }
+ close $fd
+ }
+
+ return [lsort -unique $all_trackings]
+}
+
+proc load_all_remotes {} {
+ global repo_config
+ global all_remotes tracking_branches
+
+ set all_remotes [list]
+ array unset tracking_branches
+
+ set rm_dir [gitdir remotes]
+ if {[file isdirectory $rm_dir]} {
+ set all_remotes [glob \
+ -types f \
+ -tails \
+ -nocomplain \
+ -directory $rm_dir *]
+
+ foreach name $all_remotes {
+ catch {
+ set fd [open [file join $rm_dir $name] r]
+ while {[gets $fd line] >= 0} {
+ if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
+ $line line src dst]} continue
+ if {![regexp ^refs/ $dst]} {
+ set dst "refs/heads/$dst"
+ }
+ set tracking_branches($dst) [list $name $src]
+ }
+ close $fd
+ }
+ }
+ }
+
+ foreach line [array names repo_config remote.*.url] {
+ if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
+ lappend all_remotes $name
+
+ if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
+ set fl {}
+ }
+ foreach line $fl {
+ if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
+ if {![regexp ^refs/ $dst]} {
+ set dst "refs/heads/$dst"
+ }
+ set tracking_branches($dst) [list $name $src]
+ }
+ }
+
+ set all_remotes [lsort -unique $all_remotes]
+}
+
+proc populate_fetch_menu {} {
+ global all_remotes repo_config
+
+ set m .mbar.fetch
++ set prune_list [list]
+ foreach r $all_remotes {
+ set enable 0
+ if {![catch {set a $repo_config(remote.$r.url)}]} {
+ if {![catch {set a $repo_config(remote.$r.fetch)}]} {
+ set enable 1
+ }
+ } else {
+ catch {
+ set fd [open [gitdir remotes $r] r]
+ while {[gets $fd n] >= 0} {
+ if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
+ set enable 1
+ break
+ }
+ }
+ close $fd
+ }
+ }
+
+ if {$enable} {
++ lappend prune_list $r
+ $m add command \
+ -label "Fetch from $r..." \
+ -command [list fetch_from $r]
+ }
+ }
++
++ if {$prune_list ne {}} {
++ $m add separator
++ }
++ foreach r $prune_list {
++ $m add command \
++ -label "Prune from $r..." \
++ -command [list prune_from $r]
++ }
+}
+
+proc populate_push_menu {} {
+ global all_remotes repo_config
+
+ set m .mbar.push
+ set fast_count 0
+ foreach r $all_remotes {
+ set enable 0
+ if {![catch {set a $repo_config(remote.$r.url)}]} {
+ if {![catch {set a $repo_config(remote.$r.push)}]} {
+ set enable 1
+ }
+ } else {
+ catch {
+ set fd [open [gitdir remotes $r] r]
+ while {[gets $fd n] >= 0} {
+ if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
+ set enable 1
+ break
+ }
+ }
+ close $fd
+ }
+ }
+
+ if {$enable} {
+ if {!$fast_count} {
+ $m add separator
+ }
+ $m add command \
+ -label "Push to $r..." \
+ -command [list push_to $r]
+ incr fast_count
+ }
+ }
+}
diff --cc git-gui/lib/remote_branch_delete.tcl
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bc39581b86fdb9a9dc1d091c0d07b35a00c57ed9
new file mode 100644 (file)
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,348 @@@
++# git-gui remote branch deleting support
++# Copyright (C) 2007 Shawn Pearce
++
++class remote_branch_delete {
++
++field w
++field head_m
++
++field urltype {url}
++field remote {}
++field url {}
++
++field checktype {head}
++field check_head {}
++
++field status {}
++field idle_id {}
++field full_list {}
++field head_list {}
++field active_ls {}
++field head_cache
++field full_cache
++field cached
++
++constructor dialog {} {
++ global all_remotes M1B
++
++ make_toplevel top w
++ wm title $top "[appname] ([reponame]): Delete Remote Branch"
++ if {$top ne {.}} {
++ wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
++ }
++
++ label $w.header -text {Delete Remote Branch} -font font_uibold
++ pack $w.header -side top -fill x
++
++ frame $w.buttons
++ button $w.buttons.delete -text Delete \
++ -default active \
++ -command [cb _delete]
++ pack $w.buttons.delete -side right
++ button $w.buttons.cancel -text {Cancel} \
++ -command [list destroy $w]
++ pack $w.buttons.cancel -side right -padx 5
++ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
++
++ labelframe $w.dest -text {From Repository}
++ if {$all_remotes ne {}} {
++ radiobutton $w.dest.remote_r \
++ -text {Remote:} \
++ -value remote \
++ -variable @urltype
++ eval tk_optionMenu $w.dest.remote_m @remote $all_remotes
++ grid $w.dest.remote_r $w.dest.remote_m -sticky w
++ if {[lsearch -sorted -exact $all_remotes origin] != -1} {
++ set remote origin
++ } else {
++ set remote [lindex $all_remotes 0]
++ }
++ set urltype remote
++ trace add variable @remote write [cb _write_remote]
++ } else {
++ set urltype url
++ }
++ radiobutton $w.dest.url_r \
++ -text {Arbitrary URL:} \
++ -value url \
++ -variable @urltype
++ entry $w.dest.url_t \
++ -borderwidth 1 \
++ -relief sunken \
++ -width 50 \
++ -textvariable @url \
++ -validate key \
++ -validatecommand {
++ if {%d == 1 && [regexp {\s} %S]} {return 0}
++ return 1
++ }
++ trace add variable @url write [cb _write_url]
++ grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
++ grid columnconfigure $w.dest 1 -weight 1
++ pack $w.dest -anchor nw -fill x -pady 5 -padx 5
++
++ labelframe $w.heads -text {Branches}
++ listbox $w.heads.l \
++ -height 10 \
++ -width 70 \
++ -listvariable @head_list \
++ -selectmode extended \
++ -yscrollcommand [list $w.heads.sby set]
++ scrollbar $w.heads.sby -command [list $w.heads.l yview]
++
++ frame $w.heads.footer
++ label $w.heads.footer.status \
++ -textvariable @status \
++ -anchor w \
++ -justify left
++ button $w.heads.footer.rescan \
++ -text {Rescan} \
++ -command [cb _rescan]
++ pack $w.heads.footer.status -side left -fill x -expand 1
++ pack $w.heads.footer.rescan -side right
++
++ pack $w.heads.footer -side bottom -fill x -expand 1
++ pack $w.heads.sby -side right -fill y
++ pack $w.heads.l -side left -fill both -expand 1
++ pack $w.heads -fill both -expand 1 -pady 5 -padx 5
++
++ labelframe $w.validate -text {Delete Only If}
++ radiobutton $w.validate.head_r \
++ -text {Merged Into:} \
++ -value head \
++ -variable @checktype
++ set head_m [tk_optionMenu $w.validate.head_m @check_head {}]
++ trace add variable @head_list write [cb _write_head_list]
++ trace add variable @check_head write [cb _write_check_head]
++ grid $w.validate.head_r $w.validate.head_m -sticky w
++ radiobutton $w.validate.always_r \
++ -text {Always (Do not perform merge checks)} \
++ -value always \
++ -variable @checktype
++ grid $w.validate.always_r -columnspan 2 -sticky w
++ grid columnconfigure $w.validate 1 -weight 1
++ pack $w.validate -anchor nw -fill x -pady 5 -padx 5
++
++ trace add variable @urltype write [cb _write_urltype]
++ _rescan $this
++
++ bind $w <Key-F5> [cb _rescan]
++ bind $w <$M1B-Key-r> [cb _rescan]
++ bind $w <$M1B-Key-R> [cb _rescan]
++ bind $w <Key-Return> [cb _delete]
++ bind $w <Key-Escape> [list destroy $w]
++ bind $w.header <Destroy> [list delete_this $this]
++ return $w
++}
++
++method _delete {} {
++ switch $urltype {
++ remote {set uri $remote}
++ url {set uri $url}
++ }
++
++ set cache $urltype:$uri
++ set crev {}
++ if {$checktype eq {head}} {
++ if {$check_head eq {}} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "A branch is required for 'Merged Into'."
++ return
++ }
++ set crev $full_cache("$cache\nrefs/heads/$check_head")
++ }
++
++ set not_merged [list]
++ set need_fetch 0
++ set have_selection 0
++ set push_cmd [list git push]
++ lappend push_cmd -v
++ lappend push_cmd $uri
++
++ foreach i [$w.heads.l curselection] {
++ set ref [lindex $full_list $i]
++ if {$crev ne {}} {
++ set obj $full_cache("$cache\n$ref")
++ if {[catch {set m [git merge-base $obj $crev]}]} {
++ set need_fetch 1
++ set m {}
++ }
++ if {$obj ne $m} {
++ lappend not_merged [lindex $head_list $i]
++ continue
++ }
++ }
++
++ lappend push_cmd :$ref
++ set have_selection 1
++ }
++
++ if {$not_merged ne {}} {
++ set msg "The following branches are not completely merged into $check_head:
++
++ - [join $not_merged "\n - "]"
++
++ if {$need_fetch} {
++ append msg "
++
++One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from $uri first."
++ }
++
++ tk_messageBox \
++ -icon info \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message $msg
++ if {!$have_selection} return
++ }
++
++ if {!$have_selection} {
++ tk_messageBox \
++ -icon error \
++ -type ok \
++ -title [wm title $w] \
++ -parent $w \
++ -message "Please select one or more branches to delete."
++ return
++ }
++
++ if {[tk_messageBox \
++ -icon warning \
++ -type yesno \
++ -title [wm title $w] \
++ -parent $w \
++ -message {Recovering deleted branches is difficult.
++
++Delete the selected branches?}] ne yes} {
++ return
++ }
++
++ destroy $w
++
++ set cons [console::new \
++ "push $uri" \
++ "Deleting branches from $uri"]
++ console::exec $cons $push_cmd
++}
++
++method _rescan {{force 1}} {
++ switch $urltype {
++ remote {set uri $remote}
++ url {set uri $url}
++ }
++
++ if {$force} {
++ unset -nocomplain cached($urltype:$uri)
++ }
++
++ if {$idle_id ne {}} {
++ after cancel $idle_id
++ set idle_id {}
++ }
++
++ _load $this $urltype:$uri $uri
++}
++
++method _write_remote {args} { set urltype remote }
++method _write_url {args} { set urltype url }
++method _write_check_head {args} { set checktype head }
++
++method _write_head_list {args} {
++ $head_m delete 0 end
++ foreach abr $head_list {
++ $head_m insert end radiobutton \
++ -label $abr \
++ -value $abr \
++ -variable @check_head
++ }
++ if {[lsearch -exact -sorted $head_list $check_head] < 0} {
++ set check_head {}
++ }
++}
++
++method _write_urltype {args} {
++ if {$urltype eq {url}} {
++ if {$idle_id ne {}} {
++ after cancel $idle_id
++ }
++ _load $this none: {}
++ set idle_id [after 1000 [cb _rescan 0]]
++ } else {
++ _rescan $this 0
++ }
++}
++
++method _load {cache uri} {
++ if {$active_ls ne {}} {
++ catch {close $active_ls}
++ }
++
++ if {$uri eq {}} {
++ $w.heads.l conf -state disabled
++ set head_list [list]
++ set full_list [list]
++ set status {No repository selected.}
++ return
++ }
++
++ if {[catch {set x $cached($cache)}]} {
++ set status "Scanning $uri..."
++ $w.heads.l conf -state disabled
++ set head_list [list]
++ set full_list [list]
++ set head_cache($cache) [list]
++ set full_cache($cache) [list]
++ set active_ls [open "| [list git ls-remote $uri]" r]
++ fconfigure $active_ls \
++ -blocking 0 \
++ -translation lf \
++ -encoding utf-8
++ fileevent $active_ls readable [cb _read $cache $active_ls]
++ } else {
++ set status {}
++ set full_list $full_cache($cache)
++ set head_list $head_cache($cache)
++ $w.heads.l conf -state normal
++ }
++}
++
++method _read {cache fd} {
++ if {$fd ne $active_ls} {
++ catch {close $fd}
++ return
++ }
++
++ while {[gets $fd line] >= 0} {
++ if {[string match {*^{}} $line]} continue
++ if {[regexp {^([0-9a-f]{40}) (.*)$} $line _junk obj ref]} {
++ if {[regsub ^refs/heads/ $ref {} abr]} {
++ lappend head_list $abr
++ lappend head_cache($cache) $abr
++ lappend full_list $ref
++ lappend full_cache($cache) $ref
++ set full_cache("$cache\n$ref") $obj
++ }
++ }
++ }
++
++ if {[eof $fd]} {
++ if {[catch {close $fd} err]} {
++ set status $err
++ set head_list [list]
++ set full_list [list]
++ } else {
++ set status {}
++ set cached($cache) 1
++ $w.heads.l conf -state normal
++ }
++ }
++} ifdeleted {
++ catch {close $fd}
++}
++
++}
diff --cc git-gui/lib/transport.tcl
index c0e7d20fce67349938373c0cfdf879aa3137d18f,0000000000000000000000000000000000000000..e8ebc6eda090faed16c80ba748d21c0c53f9f2a4
mode 100644,000000..100644
mode 100644,000000..100644
--- /dev/null
- set cmd [list git fetch]
- lappend cmd $remote
- console::exec $w $cmd
+# git-gui transport (fetch/push) support
+# Copyright (C) 2006, 2007 Shawn Pearce
+
+proc fetch_from {remote} {
+ set w [console::new \
+ "fetch $remote" \
+ "Fetching new changes from $remote"]
++ set cmds [list]
++ lappend cmds [list exec git fetch $remote]
++ if {[is_config_true gui.pruneduringfetch]} {
++ lappend cmds [list exec git remote prune $remote]
++ }
++ console::chain $w $cmds
++}
++
++proc prune_from {remote} {
++ set w [console::new \
++ "remote prune $remote" \
++ "Pruning tracking branches deleted from $remote"]
++ console::exec $w [list git remote prune $remote]
+}
+
+proc push_to {remote} {
+ set w [console::new \
+ "push $remote" \
+ "Pushing changes to $remote"]
+ set cmd [list git push]
+ lappend cmd -v
+ lappend cmd $remote
+ console::exec $w $cmd
+}
+
+proc start_push_anywhere_action {w} {
+ global push_urltype push_remote push_url push_thin push_tags
+
+ set r_url {}
+ switch -- $push_urltype {
+ remote {set r_url $push_remote}
+ url {set r_url $push_url}
+ }
+ if {$r_url eq {}} return
+
+ set cmd [list git push]
+ lappend cmd -v
+ if {$push_thin} {
+ lappend cmd --thin
+ }
+ if {$push_tags} {
+ lappend cmd --tags
+ }
+ lappend cmd $r_url
+ set cnt 0
+ foreach i [$w.source.l curselection] {
+ set b [$w.source.l get $i]
+ lappend cmd "refs/heads/$b:refs/heads/$b"
+ incr cnt
+ }
+ if {$cnt == 0} {
+ return
+ } elseif {$cnt == 1} {
+ set unit branch
+ } else {
+ set unit branches
+ }
+
+ set cons [console::new \
+ "push $r_url" \
+ "Pushing $cnt $unit to $r_url"]
+ console::exec $cons $cmd
+ destroy $w
+}
+
+trace add variable push_remote write \
+ [list radio_selector push_urltype remote]
+
+proc do_push_anywhere {} {
+ global all_heads all_remotes current_branch
+ global push_urltype push_remote push_url push_thin push_tags
+
+ set w .push_setup
+ toplevel $w
+ wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+ label $w.header -text {Push Branches} -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons
+ button $w.buttons.create -text Push \
+ -default active \
+ -command [list start_push_anywhere_action $w]
+ pack $w.buttons.create -side right
+ button $w.buttons.cancel -text {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.source -text {Source Branches}
+ listbox $w.source.l \
+ -height 10 \
+ -width 70 \
+ -selectmode extended \
+ -yscrollcommand [list $w.source.sby set]
+ foreach h $all_heads {
+ $w.source.l insert end $h
+ if {$h eq $current_branch} {
+ $w.source.l select set end
+ }
+ }
+ scrollbar $w.source.sby -command [list $w.source.l yview]
+ pack $w.source.sby -side right -fill y
+ pack $w.source.l -side left -fill both -expand 1
+ pack $w.source -fill both -expand 1 -pady 5 -padx 5
+
+ labelframe $w.dest -text {Destination Repository}
+ if {$all_remotes ne {}} {
+ radiobutton $w.dest.remote_r \
+ -text {Remote:} \
+ -value remote \
+ -variable push_urltype
+ eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
+ grid $w.dest.remote_r $w.dest.remote_m -sticky w
+ if {[lsearch -sorted -exact $all_remotes origin] != -1} {
+ set push_remote origin
+ } else {
+ set push_remote [lindex $all_remotes 0]
+ }
+ set push_urltype remote
+ } else {
+ set push_urltype url
+ }
+ radiobutton $w.dest.url_r \
+ -text {Arbitrary URL:} \
+ -value url \
+ -variable push_urltype
+ entry $w.dest.url_t \
+ -borderwidth 1 \
+ -relief sunken \
+ -width 50 \
+ -textvariable push_url \
+ -validate key \
+ -validatecommand {
+ if {%d == 1 && [regexp {\s} %S]} {return 0}
+ if {%d == 1 && [string length %S] > 0} {
+ set push_urltype url
+ }
+ return 1
+ }
+ grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
+ grid columnconfigure $w.dest 1 -weight 1
+ pack $w.dest -anchor nw -fill x -pady 5 -padx 5
+
+ labelframe $w.options -text {Transfer Options}
+ checkbutton $w.options.thin \
+ -text {Use thin pack (for slow network connections)} \
+ -variable push_thin
+ grid $w.options.thin -columnspan 2 -sticky w
+ checkbutton $w.options.tags \
+ -text {Include tags} \
+ -variable push_tags
+ grid $w.options.tags -columnspan 2 -sticky w
+ grid columnconfigure $w.options 1 -weight 1
+ pack $w.options -anchor nw -fill x -pady 5 -padx 5
+
+ set push_url {}
+ set push_thin 0
+ set push_tags 0
+
+ bind $w <Visibility> "grab $w; focus $w.buttons.create"
+ bind $w <Key-Escape> "destroy $w"
+ bind $w <Key-Return> [list start_push_anywhere_action $w]
+ wm title $w "[appname] ([reponame]): Push"
+ tkwait window $w
+}