set _appname [lindex [file split $argv0] end]
set _gitdir {}
+set _gitexec {}
set _reponame {}
+set _iscygwin {}
proc appname {} {
global _appname
return [eval [concat [list file join $_gitdir] $args]]
}
+proc gitexec {args} {
+ global _gitexec
+ if {$_gitexec eq {}} {
+ if {[catch {set _gitexec [exec 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
+}
+
######################################################################
##
## config
}
}
+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 load_config {include_global} {
global repo_config global_config default_config
eval $cmd
}
-proc info_popup {msg} {
+proc info_popup {msg {parent .}} {
set title [appname]
if {[reponame] ne {}} {
append title " ([reponame])"
}
tk_messageBox \
- -parent . \
+ -parent $parent \
-icon info \
-type ok \
-title $title \
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"
}
if {[lindex [file split $_gitdir] end] ne {.git}} {
catch {wm withdraw .}
- error_popup "Cannot use funny .git directory:\n\n$gitdir"
+ error_popup "Cannot use funny .git directory:\n\n$_gitdir"
exit 1
}
if {[catch {cd [file dirname $_gitdir]} err]} {
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
+ global repo_config single_commit
if {$rescan_active > 0 || ![lock_index read]} return
$ui_comm edit modified false
}
+ if {!$single_commit} {
+ load_all_heads
+ populate_branch_menu
+ }
+
if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
rescan_stage2 {} $after
} else {
}
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
## diff
proc clear_diff {} {
- global ui_diff current_diff_path ui_index ui_workdir
+ global ui_diff current_diff_path current_diff_header
+ global ui_index ui_workdir
$ui_diff conf -state normal
$ui_diff delete 0.0 end
$ui_diff conf -state disabled
set current_diff_path {}
+ set current_diff_header {}
$ui_index tag remove in_diff 0.0 end
$ui_workdir tag remove in_diff 0.0 end
if {$p eq {}
|| $current_diff_side eq {}
|| [catch {set s $file_states($p)}]
- || [lsearch -sorted $file_lists($current_diff_side) $p] == -1} {
+ || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
clear_diff
} else {
show_diff $p $current_diff_side
global file_states file_lists
global is_3way_diff diff_active repo_config
global ui_diff ui_status_value ui_index ui_workdir
- global current_diff_path current_diff_side
+ global current_diff_path current_diff_side current_diff_header
if {$diff_active || ![lock_index read]} return
clear_diff
- if {$w eq {} || $lno == {}} {
- foreach w [array names file_lists] {
- set lno [lsearch -sorted $file_lists($w) $path]
- if {$lno >= 0} {
- incr lno
- break
- }
+ if {$lno == {}} {
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
+ if {$lno >= 0} {
+ incr lno
}
}
- if {$w ne {} && $lno >= 1} {
+ if {$lno >= 1} {
$w tag add in_diff $lno.0 [expr {$lno + 1}].0
}
set diff_active 1
set current_diff_path $path
set current_diff_side $w
+ set current_diff_header {}
set ui_status_value "Loading diff of [escape_path $path]..."
# - Git won't give us the diff, there's nothing to compare to!
return
}
- fconfigure $fd -blocking 0 -translation auto
+ fconfigure $fd \
+ -blocking 0 \
+ -encoding binary \
+ -translation binary
fileevent $fd readable [list read_diff $fd]
}
proc read_diff {fd} {
- global ui_diff ui_status_value is_3way_diff diff_active
+ global ui_diff ui_status_value diff_active
+ global is_3way_diff current_diff_header
$ui_diff conf -state normal
while {[gets $fd line] >= 0} {
# -- Cleanup uninteresting diff header lines.
#
- if {[string match {diff --git *} $line]} continue
- if {[string match {diff --cc *} $line]} continue
- if {[string match {diff --combined *} $line]} continue
- if {[string match {--- *} $line]} continue
- if {[string match {+++ *} $line]} continue
+ if { [string match {diff --git *} $line]
+ || [string match {diff --cc *} $line]
+ || [string match {diff --combined *} $line]
+ || [string match {--- *} $line]
+ || [string match {+++ *} $line]} {
+ append current_diff_header $line "\n"
+ continue
+ }
+ if {[string match {index *} $line]} continue
if {$line eq {deleted file mode 120000}} {
set line "deleted symlink"
}
#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
- if {[string match {index *} $line]
- || [string match {mode *} $line]
+ if {[string match {mode *} $line]
|| [string match {new file *} $line]
|| [string match {deleted file *} $line]
|| [string match {Binary files * and * differ} $line]
}
}
$ui_diff insert end $line $tags
+ if {[string index $line end] eq "\r"} {
+ $ui_diff tag add d_cr {end - 2c}
+ }
$ui_diff insert end "\n" $tags
}
$ui_diff conf -state disabled
}
}
+proc apply_hunk {x y} {
+ global current_diff_path current_diff_header current_diff_side
+ global ui_diff ui_index file_states
+
+ if {$current_diff_path eq {} || $current_diff_header eq {}} return
+ if {![lock_index apply_hunk]} return
+
+ set apply_cmd {git apply --cached --whitespace=nowarn}
+ set mi [lindex $file_states($current_diff_path) 0]
+ if {$current_diff_side eq $ui_index} {
+ set mode unstage
+ lappend apply_cmd --reverse
+ if {[string index $mi 0] ne {M}} {
+ unlock_index
+ return
+ }
+ } else {
+ set mode stage
+ if {[string index $mi 1] ne {M}} {
+ unlock_index
+ return
+ }
+ }
+
+ set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
+ set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
+ if {$s_lno eq {}} {
+ unlock_index
+ return
+ }
+
+ set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
+ if {$e_lno eq {}} {
+ set e_lno end
+ }
+
+ if {[catch {
+ set p [open "| $apply_cmd" w]
+ fconfigure $p -translation binary -encoding binary
+ puts -nonewline $p $current_diff_header
+ puts -nonewline $p [$ui_diff get $s_lno $e_lno]
+ close $p} err]} {
+ error_popup "Failed to $mode selected hunk.\n\n$err"
+ unlock_index
+ return
+ }
+
+ $ui_diff conf -state normal
+ $ui_diff delete $s_lno $e_lno
+ $ui_diff conf -state disabled
+
+ if {[$ui_diff get 1.0 end] eq "\n"} {
+ set o _
+ } else {
+ set o ?
+ }
+
+ if {$current_diff_side eq $ui_index} {
+ set mi ${o}M
+ } elseif {[string index $mi 0] eq {_}} {
+ set mi M$o
+ } else {
+ set mi ?$o
+ }
+ unlock_index
+ display_file $current_diff_path $mi
+ if {$o eq {_}} {
+ clear_diff
+ }
+}
+
######################################################################
##
## commit
global HEAD commit_type file_states ui_comm repo_config
global ui_status_value pch_error
- if {![lock_index update]} return
if {[committer_ident] eq {}} return
+ if {![lock_index update]} return
# -- Our in memory state should match the repository.
#
# -- A message is required.
#
set msg [string trim [$ui_comm get 1.0 end]]
+ regsub -all -line {[ \t\r]+$} $msg {} msg
if {$msg eq {}} {
error_popup {Please supply a commit message.
# On Cygwin [file executable] might lie so we need to ask
# the shell if the hook is executable. Yes that's annoying.
#
- if {[is_Windows] && [file isfile $pchook]} {
+ if {[is_Cygwin] && [file isfile $pchook]} {
set pchook [list sh -c [concat \
"if test -x \"$pchook\";" \
"then exec \"$pchook\" 2>&1;" \
# -- Run the post-commit hook.
#
set pchook [gitdir hooks post-commit]
- if {[is_Windows] && [file isfile $pchook]} {
+ if {[is_Cygwin] && [file isfile $pchook]} {
set pchook [list sh -c [concat \
"if test -x \"$pchook\";" \
"then exec \"$pchook\";" \
######################################################################
##
-## fetch pull push
+## fetch push
proc fetch_from {remote} {
- set w [new_console "fetch $remote" \
+ set w [new_console \
+ "fetch $remote" \
"Fetching new changes from $remote"]
set cmd [list git fetch]
lappend cmd $remote
- console_exec $w $cmd
-}
-
-proc pull_remote {remote branch} {
- global HEAD commit_type file_states repo_config
-
- if {![lock_index update]} return
-
- # -- Our in memory state should match the repository.
- #
- repository_state curType curHEAD curMERGE_HEAD
- if {$commit_type ne $curType || $HEAD ne $curHEAD} {
- info_popup {Last scanned state does not match repository state.
-
-Another Git program has modified this repository
-since the last scan. A rescan must be performed
-before a pull operation can be started.
-
-The rescan will be automatically started now.
-}
- unlock_index
- rescan {set ui_status_value {Ready.}}
- return
- }
-
- # -- No differences should exist before a pull.
- #
- if {[array size file_states] != 0} {
- error_popup {Uncommitted but modified files are present.
-
-You should not perform a pull with unmodified
-files in your working directory as Git will be
-unable to recover from an incorrect merge.
-
-You should commit or revert all changes before
-starting a pull operation.
-}
- unlock_index
- return
- }
-
- set w [new_console "pull $remote $branch" \
- "Pulling new changes from branch $branch in $remote"]
- set cmd [list git pull]
- if {$repo_config(gui.pullsummary) eq {false}} {
- lappend cmd --no-summary
- }
- lappend cmd $remote
- lappend cmd $branch
- console_exec $w $cmd [list post_pull_remote $remote $branch]
-}
-
-proc post_pull_remote {remote branch success} {
- global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
- global ui_status_value
-
- unlock_index
- if {$success} {
- repository_state commit_type HEAD MERGE_HEAD
- set PARENT $HEAD
- set selected_commit_type new
- set ui_status_value "Pulling $branch from $remote complete."
- } else {
- rescan [list set ui_status_value \
- "Conflicts detected while pulling $branch from $remote."]
- }
+ console_exec $w $cmd console_done
}
proc push_to {remote} {
- set w [new_console "push $remote" \
+ set w [new_console \
+ "push $remote" \
"Pushing changes to $remote"]
set cmd [list git push]
+ lappend cmd -v
lappend cmd $remote
- console_exec $w $cmd
+ console_exec $w $cmd console_done
}
######################################################################
global file_lists
if {$new_m eq {_}} {
- set lno [lsearch -sorted $file_lists($w) $path]
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
if {$lno >= 0} {
set file_lists($w) [lreplace $file_lists($w) $lno $lno]
incr lno
} 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 $file_lists($w) $path]
+ set lno [lsearch -sorted -exact $file_lists($w) $path]
incr lno
$w conf -state normal
$w image create $lno.0 \
}
}
- $m add separator
+ if {$all_heads ne {}} {
+ $m add separator
+ }
foreach b $all_heads {
$m add radiobutton \
-label $b \
global all_heads null_sha1 repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
+ global create_branch_name create_branch_revexp
- set newbranch [string trim [$w.desc.name_t get 0.0 end]]
+ set newbranch $create_branch_name
if {$newbranch eq {}
|| $newbranch eq $repo_config(gui.newbranchtemplate)} {
tk_messageBox \
switch -- $create_branch_revtype {
head {set rev $create_branch_head}
tracking {set rev $create_branch_trackinghead}
- expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
+ expression {set rev $create_branch_revexp}
}
if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
tk_messageBox \
global all_heads current_branch repo_config
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
+ global create_branch_name create_branch_revexp
set w .branch_editor
toplevel $w
-text {Branch Description} \
-font font_ui
label $w.desc.name_l -text {Name:} -font font_ui
- text $w.desc.name_t \
+ entry $w.desc.name_t \
-borderwidth 1 \
-relief sunken \
- -height 1 \
-width 40 \
- -font font_ui
- $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
- grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
- bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
- bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
- bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
- bind $w.desc.name_t <Key> {
- if {{%K} ne {BackSpace}
- && {%K} ne {Tab}
- && {%K} ne {Escape}
- && {%K} ne {Return}} {
- if {%k <= 32} break
- if {[string first %A {~^:?*[}] >= 0} break
+ -textvariable create_branch_name \
+ -font font_ui \
+ -validate key \
+ -validatecommand {
+ if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
+ return 1
}
- }
+ grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
grid columnconfigure $w.desc 1 -weight 1
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
-value expression \
-variable create_branch_revtype \
-font font_ui
- text $w.from.exp_t \
+ entry $w.from.exp_t \
-borderwidth 1 \
-relief sunken \
- -height 1 \
-width 50 \
- -font font_ui
+ -textvariable create_branch_revexp \
+ -font font_ui \
+ -validate key \
+ -validatecommand {
+ if {%d == 1 && [regexp {\s} %S]} {return 0}
+ if {%d == 1 && [string length %S] > 0} {
+ set create_branch_revtype expression
+ }
+ return 1
+ }
grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
- bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
- bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
- bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
- bind $w.from.exp_t <Key-space> break
- bind $w.from.exp_t <Key> {set create_branch_revtype expression}
grid columnconfigure $w.from 1 -weight 1
pack $w.from -anchor nw -fill x -pady 5 -padx 5
set create_branch_checkout 1
set create_branch_head $current_branch
set create_branch_revtype head
+ set create_branch_name $repo_config(gui.newbranchtemplate)
+ set create_branch_revexp {}
- bind $w <Visibility> "grab $w; focus $w.desc.name_t"
+ bind $w <Visibility> "
+ grab $w
+ $w.desc.name_t icursor end
+ focus $w.desc.name_t
+ "
bind $w <Key-Escape> "destroy $w"
bind $w <Key-Return> "do_create_branch_action $w;break"
wm title $w "[appname] ([reponame]): Create Branch"
if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
append failed " - $b: $err\n"
} else {
- set x [lsearch -sorted $all_heads $b]
+ set x [lsearch -sorted -exact $all_heads $b]
if {$x >= 0} {
set all_heads [lreplace $all_heads $x $x]
}
-font font_ui
listbox $w.list.l \
-height 10 \
- -width 50 \
+ -width 70 \
-selectmode extended \
+ -yscrollcommand [list $w.list.sby set] \
-font font_ui
foreach h $all_heads {
if {$h ne $current_branch} {
$w.list.l insert end $h
}
}
- pack $w.list.l -fill both -pady 5 -padx 5
- pack $w.list -fill both -pady 5 -padx 5
+ scrollbar $w.list.sby -command [list $w.list.l yview]
+ pack $w.list.sby -side right -fill y
+ pack $w.list.l -side left -fill both -expand 1
+ pack $w.list -fill both -expand 1 -pady 5 -padx 5
labelframe $w.validate \
-text {Delete Only If} \
return
}
+ # -- Don't do a pointless switch.
+ #
+ if {$current_branch eq $new_branch} {
+ unlock_index
+ return
+ }
+
if {$repo_config(gui.trustmtime) eq {true}} {
switch_branch_stage2 {} $new_branch
} else {
set all_remotes [lsort -unique $all_remotes]
}
-proc populate_fetch_menu {m} {
+proc populate_fetch_menu {} {
global all_remotes repo_config
+ set m .mbar.fetch
foreach r $all_remotes {
set enable 0
if {![catch {set a $repo_config(remote.$r.url)}]} {
}
}
-proc populate_push_menu {m} {
+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 {$enable} {
+ if {!$fast_count} {
+ $m add separator
+ }
$m add command \
-label "Push to $r..." \
-command [list push_to $r] \
-font font_ui
+ incr fast_count
}
}
}
-proc populate_pull_menu {m} {
- global repo_config all_remotes disable_on_lock
+proc start_push_anywhere_action {w} {
+ global push_urltype push_remote push_url push_thin push_tags
- foreach remote $all_remotes {
- set rb_list [list]
- if {[array get repo_config remote.$remote.url] ne {}} {
- if {[array get repo_config remote.$remote.fetch] ne {}} {
- foreach line $repo_config(remote.$remote.fetch) {
- if {[regexp {^([^:]+):} $line line rb]} {
- lappend rb_list $rb
- }
- }
- }
- } else {
- catch {
- set fd [open [gitdir remotes $remote] r]
- while {[gets $fd line] >= 0} {
- if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
- lappend rb_list $rb
- }
- }
- close $fd
- }
+ 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 [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
+ console_exec $cons $cmd console_done
+ 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 \
+ -font font_ui \
+ -command [list start_push_anywhere_action $w]
+ pack $w.buttons.create -side right
+ button $w.buttons.cancel -text {Cancel} \
+ -font font_ui \
+ -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} \
+ -font font_ui
+ listbox $w.source.l \
+ -height 10 \
+ -width 70 \
+ -selectmode extended \
+ -yscrollcommand [list $w.source.sby set] \
+ -font font_ui
+ 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
- foreach rb $rb_list {
- regsub ^refs/heads/ $rb {} rb_short
- $m add command \
- -label "Branch $rb_short from $remote..." \
- -command [list pull_remote $remote $rb] \
- -font font_ui
- lappend disable_on_lock \
- [list $m entryconf [$m index last] -state]
+ labelframe $w.dest \
+ -text {Destination Repository} \
+ -font font_ui
+ if {$all_remotes ne {}} {
+ radiobutton $w.dest.remote_r \
+ -text {Remote:} \
+ -value remote \
+ -variable push_urltype \
+ -font font_ui
+ 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 \
+ -font font_ui
+ entry $w.dest.url_t \
+ -borderwidth 1 \
+ -relief sunken \
+ -width 50 \
+ -textvariable push_url \
+ -font font_ui \
+ -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} \
+ -font font_ui
+ checkbutton $w.options.thin \
+ -text {Use thin pack (for slow network connections)} \
+ -variable push_thin \
+ -font font_ui
+ grid $w.options.thin -columnspan 2 -sticky w
+ checkbutton $w.options.tags \
+ -text {Include tags} \
+ -variable push_tags \
+ -font font_ui
+ 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"
+ bind $w <Key-Escape> "destroy $w"
+ wm title $w "[appname] ([reponame]): Push"
+ tkwait window $w
}
######################################################################
##
-## icons
+## merge
-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};
-}
+proc can_merge {} {
+ global HEAD commit_type file_states
-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
+ if {[string match amend* $commit_type]} {
+ info_popup {Cannot merge while amending.
-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
+You must finish amending this commit before
+starting any type of merge.
+}
+ return 0
+ }
-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
+ if {[committer_ident] eq {}} {return 0}
+ if {![lock_index merge]} {return 0}
-image create bitmap file_parttick -background white -foreground "#005050" -data {
+ # -- Our in memory state should match the repository.
+ #
+ repository_state curType curHEAD curMERGE_HEAD
+ if {$commit_type ne $curType || $HEAD ne $curHEAD} {
+ info_popup {Last scanned state does not match repository state.
+
+Another Git program has modified this repository
+since the last scan. A rescan must be performed
+before a merge can be performed.
+
+The rescan will be automatically started now.
+}
+ unlock_index
+ rescan {set ui_status_value {Ready.}}
+ return 0
+ }
+
+ foreach path [array names file_states] {
+ switch -glob -- [lindex $file_states($path) 0] {
+ _O {
+ continue; # and pray it works!
+ }
+ U? {
+ error_popup "You are in the middle of a conflicted merge.
+
+File [short_path $path] has merge conflicts.
+
+You must resolve them, add the file, and commit to
+complete the current merge. Only then can you
+begin another merge.
+"
+ unlock_index
+ return 0
+ }
+ ?? {
+ error_popup "You are in the middle of a change.
+
+File [short_path $path] is modified.
+
+You should complete the current commit before
+starting a merge. Doing so will help you abort
+a failed merge, should the need arise.
+"
+ unlock_index
+ return 0
+ }
+ }
+ }
+
+ return 1
+}
+
+proc visualize_local_merge {w} {
+ set revs {}
+ foreach i [$w.source.l curselection] {
+ lappend revs [$w.source.l get $i]
+ }
+ if {$revs eq {}} return
+ lappend revs --not HEAD
+ do_gitk $revs
+}
+
+proc start_local_merge_action {w} {
+ global HEAD ui_status_value current_branch
+
+ set cmd [list git merge]
+ set names {}
+ set revcnt 0
+ foreach i [$w.source.l curselection] {
+ set b [$w.source.l get $i]
+ lappend cmd $b
+ lappend names $b
+ incr revcnt
+ }
+
+ if {$revcnt == 0} {
+ return
+ } elseif {$revcnt == 1} {
+ set unit branch
+ } elseif {$revcnt <= 15} {
+ set unit branches
+ } else {
+ tk_messageBox \
+ -icon error \
+ -type ok \
+ -title [wm title $w] \
+ -parent $w \
+ -message "Too many branches selected.
+
+You have requested to merge $revcnt branches
+in an octopus merge. This exceeds Git's
+internal limit of 15 branches per merge.
+
+Please select fewer branches. To merge more
+than 15 branches, merge the branches in batches.
+"
+ return
+ }
+
+ set msg "Merging $current_branch, [join $names {, }]"
+ set ui_status_value "$msg..."
+ set cons [new_console "Merge" $msg]
+ console_exec $cons $cmd [list finish_merge $revcnt]
+ bind $w <Destroy> {}
+ destroy $w
+}
+
+proc finish_merge {revcnt w ok} {
+ console_done $w $ok
+ if {$ok} {
+ set msg {Merge completed successfully.}
+ } else {
+ if {$revcnt != 1} {
+ info_popup "Octopus merge failed.
+
+Your merge of $revcnt branches has failed.
+
+There are file-level conflicts between the
+branches which must be resolved manually.
+
+The working directory will now be reset.
+
+You can attempt this merge again
+by merging only one branch at a time." $w
+
+ set fd [open "| git read-tree --reset -u HEAD" r]
+ fconfigure $fd -blocking 0 -translation binary
+ fileevent $fd readable [list reset_hard_wait $fd]
+ set ui_status_value {Aborting... please wait...}
+ return
+ }
+
+ set msg {Merge failed. Conflict resolution is required.}
+ }
+ unlock_index
+ rescan [list set ui_status_value $msg]
+}
+
+proc do_local_merge {} {
+ global current_branch
+
+ if {![can_merge]} return
+
+ set w .merge_setup
+ toplevel $w
+ wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+ label $w.header \
+ -text "Merge Into $current_branch" \
+ -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons
+ button $w.buttons.visualize -text Visualize \
+ -font font_ui \
+ -command [list visualize_local_merge $w]
+ pack $w.buttons.visualize -side left
+ button $w.buttons.create -text Merge \
+ -font font_ui \
+ -command [list start_local_merge_action $w]
+ pack $w.buttons.create -side right
+ button $w.buttons.cancel -text {Cancel} \
+ -font font_ui \
+ -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} \
+ -font font_ui
+ listbox $w.source.l \
+ -height 10 \
+ -width 70 \
+ -selectmode extended \
+ -yscrollcommand [list $w.source.sby set] \
+ -font font_ui
+ 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
+
+ set cmd [list git for-each-ref]
+ lappend cmd {--format=%(objectname) %(refname)}
+ lappend cmd refs/heads
+ lappend cmd refs/remotes
+ set fr_fd [open "| $cmd" r]
+ fconfigure $fr_fd -translation binary
+ while {[gets $fr_fd line] > 0} {
+ set line [split $line { }]
+ set sha1([lindex $line 0]) [lindex $line 1]
+ }
+ close $fr_fd
+
+ set to_show {}
+ set fr_fd [open "| git rev-list --all --not HEAD"]
+ while {[gets $fr_fd line] > 0} {
+ if {[catch {set ref $sha1($line)}]} continue
+ regsub ^refs/(heads|remotes)/ $ref {} ref
+ lappend to_show $ref
+ }
+ close $fr_fd
+
+ foreach ref [lsort -unique $to_show] {
+ $w.source.l insert end $ref
+ }
+
+ bind $w <Visibility> "grab $w"
+ bind $w <Key-Escape> "unlock_index;destroy $w"
+ bind $w <Destroy> unlock_index
+ wm title $w "[appname] ([reponame]): Merge"
+ tkwait window $w
+}
+
+proc do_reset_hard {} {
+ global HEAD commit_type file_states
+
+ if {[string match amend* $commit_type]} {
+ info_popup {Cannot abort while amending.
+
+You must finish amending this commit.
+}
+ return
+ }
+
+ if {![lock_index abort]} return
+
+ if {[string match *merge* $commit_type]} {
+ set op merge
+ } else {
+ set op commit
+ }
+
+ if {[ask_popup "Abort $op?
+
+Aborting the current $op will cause
+*ALL* uncommitted changes to be lost.
+
+Continue with aborting the current $op?"] eq {yes}} {
+ set fd [open "| git read-tree --reset -u HEAD" r]
+ fconfigure $fd -blocking 0 -translation binary
+ fileevent $fd readable [list reset_hard_wait $fd]
+ set ui_status_value {Aborting... please wait...}
+ } else {
+ unlock_index
+ }
+}
+
+proc reset_hard_wait {fd} {
+ global ui_comm
+
+ read $fd
+ if {[eof $fd]} {
+ close $fd
+ unlock_index
+
+ $ui_comm delete 0.0 end
+ $ui_comm edit modified false
+
+ catch {file delete [gitdir MERGE_HEAD]}
+ catch {file delete [gitdir rr-cache MERGE_RR]}
+ catch {file delete [gitdir SQUASH_MSG]}
+ catch {file delete [gitdir MERGE_MSG]}
+ catch {file delete [gitdir GITGUI_MSG]}
+
+ rescan {set ui_status_value {Abort completed. Ready.}}
+ }
+}
+
+######################################################################
+##
+## browser
+
+set next_browser_id 0
+
+proc new_browser {commit} {
+ global next_browser_id cursor_ptr M1B
+ global browser_commit browser_status browser_stack browser_path browser_busy
+
+ set w .browser[incr next_browser_id]
+ set w_list $w.list.l
+ set browser_commit($w_list) $commit
+ set browser_status($w_list) {Starting...}
+ set browser_stack($w_list) {}
+ set browser_path($w_list) $browser_commit($w_list):
+ set browser_busy($w_list) 1
+
+ toplevel $w
+ label $w.path -textvariable browser_path($w_list) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_uibold
+ pack $w.path -anchor w -side top -fill x
+
+ frame $w.list
+ text $w_list -background white -borderwidth 0 \
+ -cursor $cursor_ptr \
+ -state disabled \
+ -wrap none \
+ -height 20 \
+ -width 70 \
+ -xscrollcommand [list $w.list.sbx set] \
+ -yscrollcommand [list $w.list.sby set] \
+ -font font_ui
+ $w_list tag conf in_sel \
+ -background [$w_list cget -foreground] \
+ -foreground [$w_list cget -background]
+ scrollbar $w.list.sbx -orient h -command [list $w_list xview]
+ scrollbar $w.list.sby -orient v -command [list $w_list yview]
+ pack $w.list.sbx -side bottom -fill x
+ pack $w.list.sby -side right -fill y
+ pack $w_list -side left -fill both -expand 1
+ pack $w.list -side top -fill both -expand 1
+
+ label $w.status -textvariable browser_status($w_list) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_ui
+ pack $w.status -anchor w -side bottom -fill x
+
+ bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
+ bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
+ bind $w_list <$M1B-Up> "browser_parent $w_list;break"
+ bind $w_list <$M1B-Left> "browser_parent $w_list;break"
+ bind $w_list <Up> "browser_move -1 $w_list;break"
+ bind $w_list <Down> "browser_move 1 $w_list;break"
+ bind $w_list <$M1B-Right> "browser_enter $w_list;break"
+ bind $w_list <Return> "browser_enter $w_list;break"
+ bind $w_list <Prior> "browser_page -1 $w_list;break"
+ bind $w_list <Next> "browser_page 1 $w_list;break"
+ bind $w_list <Left> break
+ bind $w_list <Right> break
+
+ bind $w <Visibility> "focus $w"
+ bind $w <Destroy> "
+ array unset browser_buffer $w_list
+ array unset browser_files $w_list
+ array unset browser_status $w_list
+ array unset browser_stack $w_list
+ array unset browser_path $w_list
+ array unset browser_commit $w_list
+ array unset browser_busy $w_list
+ "
+ wm title $w "[appname] ([reponame]): File Browser"
+ ls_tree $w_list $browser_commit($w_list) {}
+}
+
+proc browser_move {dir w} {
+ global browser_files browser_busy
+
+ if {$browser_busy($w)} return
+ set lno [lindex [split [$w index in_sel.first] .] 0]
+ incr lno $dir
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
+ $w tag remove in_sel 0.0 end
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ $w see $lno.0
+ }
+}
+
+proc browser_page {dir w} {
+ global browser_files browser_busy
+
+ if {$browser_busy($w)} return
+ $w yview scroll $dir pages
+ set lno [expr {int(
+ [lindex [$w yview] 0]
+ * [llength $browser_files($w)]
+ + 1)}]
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
+ $w tag remove in_sel 0.0 end
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ $w see $lno.0
+ }
+}
+
+proc browser_parent {w} {
+ global browser_files browser_status browser_path
+ global browser_stack browser_busy
+
+ if {$browser_busy($w)} return
+ set info [lindex $browser_files($w) 0]
+ if {[lindex $info 0] eq {parent}} {
+ set parent [lindex $browser_stack($w) end-1]
+ set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
+ if {$browser_stack($w) eq {}} {
+ regsub {:.*$} $browser_path($w) {:} browser_path($w)
+ } else {
+ regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
+ }
+ set browser_status($w) "Loading $browser_path($w)..."
+ ls_tree $w [lindex $parent 0] [lindex $parent 1]
+ }
+}
+
+proc browser_enter {w} {
+ global browser_files browser_status browser_path
+ global browser_commit browser_stack browser_busy
+
+ if {$browser_busy($w)} return
+ set lno [lindex [split [$w index in_sel.first] .] 0]
+ set info [lindex $browser_files($w) [expr {$lno - 1}]]
+ if {$info ne {}} {
+ switch -- [lindex $info 0] {
+ parent {
+ browser_parent $w
+ }
+ tree {
+ set name [lindex $info 2]
+ set escn [escape_path $name]
+ set browser_status($w) "Loading $escn..."
+ append browser_path($w) $escn
+ ls_tree $w [lindex $info 1] $name
+ }
+ blob {
+ set name [lindex $info 2]
+ set p {}
+ foreach n $browser_stack($w) {
+ append p [lindex $n 1]
+ }
+ append p $name
+ show_blame $browser_commit($w) $p
+ }
+ }
+ }
+}
+
+proc browser_click {was_double_click w pos} {
+ global browser_files browser_busy
+
+ if {$browser_busy($w)} return
+ set lno [lindex [split [$w index $pos] .] 0]
+ focus $w
+
+ if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
+ $w tag remove in_sel 0.0 end
+ $w tag add in_sel $lno.0 [expr {$lno + 1}].0
+ if {$was_double_click} {
+ browser_enter $w
+ }
+ }
+}
+
+proc ls_tree {w tree_id name} {
+ global browser_buffer browser_files browser_stack browser_busy
+
+ set browser_buffer($w) {}
+ set browser_files($w) {}
+ set browser_busy($w) 1
+
+ $w conf -state normal
+ $w tag remove in_sel 0.0 end
+ $w delete 0.0 end
+ if {$browser_stack($w) ne {}} {
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name icon0 \
+ -image file_uplevel
+ $w insert end {[Up To Parent]}
+ lappend browser_files($w) parent
+ }
+ lappend browser_stack($w) [list $tree_id $name]
+ $w conf -state disabled
+
+ set cmd [list git ls-tree -z $tree_id]
+ set fd [open "| $cmd" r]
+ fconfigure $fd -blocking 0 -translation binary -encoding binary
+ fileevent $fd readable [list read_ls_tree $fd $w]
+}
+
+proc read_ls_tree {fd w} {
+ global browser_buffer browser_files browser_status browser_busy
+
+ if {![winfo exists $w]} {
+ catch {close $fd}
+ return
+ }
+
+ append browser_buffer($w) [read $fd]
+ set pck [split $browser_buffer($w) "\0"]
+ set browser_buffer($w) [lindex $pck end]
+
+ set n [llength $browser_files($w)]
+ $w conf -state normal
+ foreach p [lrange $pck 0 end-1] {
+ set info [split $p "\t"]
+ set path [lindex $info 1]
+ set info [split [lindex $info 0] { }]
+ set type [lindex $info 1]
+ set object [lindex $info 2]
+
+ switch -- $type {
+ blob {
+ set image file_mod
+ }
+ tree {
+ set image file_dir
+ append path /
+ }
+ default {
+ set image file_question
+ }
+ }
+
+ if {$n > 0} {$w insert end "\n"}
+ $w image create end \
+ -align center -padx 5 -pady 1 \
+ -name icon[incr n] \
+ -image $image
+ $w insert end [escape_path $path]
+ lappend browser_files($w) [list $type $object $path]
+ }
+ $w conf -state disabled
+
+ if {[eof $fd]} {
+ close $fd
+ set browser_status($w) Ready.
+ set browser_busy($w) 0
+ array unset browser_buffer $w
+ if {$n > 0} {
+ $w tag add in_sel 1.0 2.0
+ focus -force $w
+ }
+ }
+}
+
+proc show_blame {commit path} {
+ global next_browser_id blame_status blame_data
+
+ set w .browser[incr next_browser_id]
+ set blame_status($w) {Loading current file content...}
+ set texts [list]
+
+ toplevel $w
+
+ label $w.path -text "$commit:$path" \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_uibold
+ pack $w.path -side top -fill x
+
+ set hbg #e2effa
+ frame $w.out
+ label $w.out.commit_l -text Commit \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.commit_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 9 \
+ -font font_diff
+ lappend texts $w.out.commit_t
+
+ label $w.out.author_l -text Author \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.author_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 20 \
+ -font font_diff
+ lappend texts $w.out.author_t
+
+ label $w.out.date_l -text Date \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.date_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width [string length "yyyy-mm-dd hh:mm:ss"] \
+ -font font_diff
+ lappend texts $w.out.date_t
+
+ label $w.out.filename_l -text Filename \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.filename_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 20 \
+ -font font_diff
+ lappend texts $w.out.filename_t
+
+ label $w.out.origlinenumber_l -text {Orig Line} \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.origlinenumber_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 5 \
+ -font font_diff
+ $w.out.origlinenumber_t tag conf linenumber -justify right
+ lappend texts $w.out.origlinenumber_t
+
+ label $w.out.linenumber_l -text {Curr Line} \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.linenumber_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 5 \
+ -font font_diff
+ $w.out.linenumber_t tag conf linenumber -justify right
+ lappend texts $w.out.linenumber_t
+
+ label $w.out.file_l -text {File Content} \
+ -relief solid \
+ -borderwidth 1 \
+ -background $hbg \
+ -font font_uibold
+ text $w.out.file_t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 40 \
+ -width 80 \
+ -xscrollcommand [list $w.out.sbx set] \
+ -font font_diff
+ lappend texts $w.out.file_t
+
+ scrollbar $w.out.sbx -orient h -command [list $w.out.file_t xview]
+ scrollbar $w.out.sby -orient v \
+ -command [list scrollbar2many $texts yview]
+ set labels [list]
+ foreach i $texts {
+ regsub {_t$} $i _l l
+ lappend labels $l
+ }
+ set file_col [expr {[llength $texts] - 1}]
+ eval grid $labels -sticky we
+ eval grid $texts $w.out.sby -sticky nsew
+ grid conf $w.out.sbx -column $file_col -sticky we
+ grid columnconfigure $w.out $file_col -weight 1
+ grid rowconfigure $w.out 1 -weight 1
+ pack $w.out -fill both -expand 1
+
+ label $w.status -textvariable blame_status($w) \
+ -anchor w \
+ -justify left \
+ -borderwidth 1 \
+ -relief sunken \
+ -font font_ui
+ pack $w.status -side bottom -fill x
+
+ menu $w.ctxm -tearoff 0
+ $w.ctxm add command -label "Copy Commit" \
+ -font font_ui \
+ -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
+
+ foreach i $texts {
+ $i tag conf in_sel \
+ -background [$i cget -foreground] \
+ -foreground [$i cget -background]
+ $i conf -yscrollcommand \
+ [list many2scrollbar $texts yview $w.out.sby]
+ bind $i <Button-1> "blame_highlight $i @%x,%y $texts;break"
+ bind_button3 $i "
+ set cursorX %x
+ set cursorY %y
+ set cursorW %W
+ tk_popup $w.ctxm %X %Y
+ "
+ }
+
+ set blame_data($w,colors) {}
+
+ bind $w <Visibility> "focus $w"
+ bind $w <Destroy> "
+ array unset blame_status $w
+ array unset blame_data $w,*
+ "
+ wm title $w "[appname] ([reponame]): File Viewer"
+
+ set blame_data($w,total_lines) 0
+ set cmd [list git cat-file blob "$commit:$path"]
+ set fd [open "| $cmd" r]
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
+ fileevent $fd readable [list read_blame_catfile \
+ $fd $w $commit $path \
+ $texts $w.out.linenumber_t $w.out.file_t]
+}
+
+proc read_blame_catfile {fd w commit path texts w_lno w_file} {
+ global blame_status blame_data
+
+ if {![winfo exists $w_file]} {
+ catch {close $fd}
+ return
+ }
+
+ set n $blame_data($w,total_lines)
+ foreach i $texts {$i conf -state normal}
+ while {[gets $fd line] >= 0} {
+ regsub "\r\$" $line {} line
+ incr n
+ $w_lno insert end $n linenumber
+ $w_file insert end $line
+ foreach i $texts {$i insert end "\n"}
+ }
+ foreach i $texts {$i conf -state disabled}
+ set blame_data($w,total_lines) $n
+
+ if {[eof $fd]} {
+ close $fd
+ set blame_status($w) {Loading annotations...}
+ set cmd [list git blame -M -C --incremental]
+ lappend cmd $commit -- $path
+ set fd [open "| $cmd" r]
+ fconfigure $fd -blocking 0 -translation lf -encoding binary
+ fileevent $fd readable "read_blame_incremental $fd $w $texts"
+ }
+}
+
+proc read_blame_incremental {fd w
+ w_commit w_author w_date w_filename w_olno
+ w_lno w_file} {
+ global blame_status blame_data
+
+ if {![winfo exists $w_commit]} {
+ catch {close $fd}
+ return
+ }
+
+ set all [list \
+ $w_commit \
+ $w_author \
+ $w_date \
+ $w_filename \
+ $w_olno \
+ $w_lno \
+ $w_file]
+
+ $w_commit conf -state normal
+ $w_author conf -state normal
+ $w_date conf -state normal
+ $w_filename conf -state normal
+ $w_olno conf -state normal
+
+ while {[gets $fd line] >= 0} {
+ if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
+ cmit original_line final_line line_count]} {
+ set blame_data($w,commit) $cmit
+ set blame_data($w,original_line) $original_line
+ set blame_data($w,final_line) $final_line
+ set blame_data($w,line_count) $line_count
+
+ if {[catch {set g $blame_data($w,$cmit,seen)}]} {
+ if {$blame_data($w,colors) eq {}} {
+ set blame_data($w,colors) {
+ yellow
+ red
+ pink
+ orange
+ green
+ grey
+ }
+ }
+ set c [lindex $blame_data($w,colors) 0]
+ set blame_data($w,colors) \
+ [lrange $blame_data($w,colors) 1 end]
+ foreach t $all {
+ $t tag conf g$cmit -background $c
+ }
+ } else {
+ set blame_data($w,$cmit,seen) 1
+ }
+ } elseif {[string match {filename *} $line]} {
+ set n $blame_data($w,line_count)
+ set lno $blame_data($w,final_line)
+ set ol $blame_data($w,original_line)
+ set file [string range $line 9 end]
+ set cmit $blame_data($w,commit)
+ set abbrev [string range $cmit 0 8]
+
+ if {[catch {set author $blame_data($w,$cmit,author)} err]} {
+ set author {}
+ }
+
+ if {[catch {set atime $blame_data($w,$cmit,author-time)}]} {
+ set atime {}
+ } else {
+ set atime [clock format $atime -format {%Y-%m-%d %T}]
+ }
+
+ while {$n > 0} {
+ if {![catch {set g g$blame_data($w,line$lno,commit)}]} {
+ foreach t $all {
+ $t tag remove $g $lno.0 "$lno.0 lineend + 1c"
+ }
+ }
+
+ foreach t [list \
+ $w_commit \
+ $w_author \
+ $w_date \
+ $w_filename \
+ $w_olno] {
+ $t delete $lno.0 "$lno.0 lineend"
+ }
+
+ $w_commit insert $lno.0 $abbrev
+ $w_author insert $lno.0 $author
+ $w_date insert $lno.0 $atime
+ $w_filename insert $lno.0 $file
+ $w_olno insert $lno.0 $ol linenumber
+
+ set g g$cmit
+ foreach t $all {
+ $t tag add $g $lno.0 "$lno.0 lineend + 1c"
+ }
+
+ set blame_data($w,line$lno,commit) $cmit
+
+ incr n -1
+ incr lno
+ incr ol
+ }
+ } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
+ set blame_data($w,$blame_data($w,commit),$header) $data
+ }
+ }
+
+ $w_commit conf -state disabled
+ $w_author conf -state disabled
+ $w_date conf -state disabled
+ $w_filename conf -state disabled
+ $w_olno conf -state disabled
+
+ if {[eof $fd]} {
+ close $fd
+ set blame_status($w) {Annotation complete.}
+ }
+}
+
+proc blame_highlight {w pos args} {
+ set lno [lindex [split [$w index $pos] .] 0]
+ foreach i $args {
+ $i tag remove in_sel 0.0 end
+ }
+ if {$lno eq {}} return
+ foreach i $args {
+ $i tag add in_sel $lno.0 "$lno.0 + 1 line"
+ }
+}
+
+proc blame_copycommit {w i pos} {
+ global blame_data
+ set lno [lindex [split [$i index $pos] .] 0]
+ if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
+ clipboard clear
+ clipboard append \
+ -format STRING \
+ -type STRING \
+ -- $commit
+ }
+}
+
+######################################################################
+##
+## 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[] = {
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
##
## util
-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 bind_button3 {w cmd} {
bind $w <Any-Button-3> $cmd
if {[is_MacOSX]} {
}
}
+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
return $w
}
-proc console_exec {w cmd {after {}}} {
- # -- Windows tosses the enviroment when we exec our child.
+proc console_exec {w cmd after} {
+ # -- Cygwin's Tcl tosses the enviroment when we exec our child.
# But most users need that so we have to relogin. :-(
#
- if {[is_Windows]} {
+ if {[is_Cygwin]} {
set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
}
}
proc console_read {w fd after} {
- global console_cr console_data
+ global console_cr
set buf [read $fd]
if {$buf ne {}} {
fconfigure $fd -blocking 1
if {[eof $fd]} {
if {[catch {close $fd}]} {
- if {![winfo exists $w]} {console_init $w}
- $w.m.s conf -background red -text {Error: Command Failed}
- $w.ok conf -state normal
set ok 0
- } elseif {[winfo exists $w]} {
- $w.m.s conf -background green -text {Success}
- $w.ok conf -state normal
+ } else {
set ok 1
}
- array unset console_cr $w
- array unset console_data $w
- if {$after ne {}} {
- uplevel #0 $after $ok
- }
+ uplevel #0 $after $w $ok
return
}
fconfigure $fd -blocking 0
}
+proc console_chain {cmdlist w {ok 1}} {
+ if {$ok} {
+ if {[llength $cmdlist] == 0} {
+ console_done $w $ok
+ return
+ }
+
+ set cmd [lindex $cmdlist 0]
+ set cmdlist [lrange $cmdlist 1 end]
+
+ if {[lindex $cmd 0] eq {console_exec}} {
+ console_exec $w \
+ [lindex $cmd 1] \
+ [list console_chain $cmdlist]
+ } else {
+ uplevel #0 $cmd $cmdlist $w $ok
+ }
+ } else {
+ console_done $w $ok
+ }
+}
+
+proc console_done {args} {
+ global console_cr console_data
+
+ switch -- [llength $args] {
+ 2 {
+ set w [lindex $args 0]
+ set ok [lindex $args 1]
+ }
+ 3 {
+ set w [lindex $args 1]
+ set ok [lindex $args 2]
+ }
+ default {
+ error "wrong number of args: console_done ?ignored? w ok"
+ }
+ }
+
+ if {$ok} {
+ if {[winfo exists $w]} {
+ $w.m.s conf -background green -text {Success}
+ $w.ok conf -state normal
+ }
+ } else {
+ if {![winfo exists $w]} {
+ console_init $w
+ }
+ $w.m.s conf -background red -text {Error: Command Failed}
+ $w.ok conf -state normal
+ }
+
+ array unset console_cr $w
+ array unset console_data $w
+}
+
######################################################################
##
## ui commands
set starting_gitk_msg {Starting gitk... please wait...}
proc do_gitk {revs} {
- global ui_status_value starting_gitk_msg
+ global env ui_status_value starting_gitk_msg
+
+ # -- On Windows gitk is severly broken, and right now it seems like
+ # nobody cares about fixing it. The only known workaround is to
+ # always delete ~/.gitk before starting the program.
+ #
+ if {[is_Windows]} {
+ catch {file delete [file join $env(HOME) .gitk]}
+ }
- set cmd gitk
+ # -- Always start gitk through whatever we were loaded with. This
+ # lets us bypass using shell process on Windows systems.
+ #
+ set cmd [info nameofexecutable]
+ lappend cmd [gitexec gitk]
if {$revs ne {}} {
append cmd { }
append cmd $revs
}
- if {[is_Windows]} {
- set cmd "sh -c \"exec $cmd\""
- }
- append cmd { &}
- if {[catch {eval exec $cmd} err]} {
+ if {[catch {eval exec $cmd &} err]} {
error_popup "Failed to start gitk:\n\n$err"
} else {
set ui_status_value $starting_gitk_msg
label $w.stat.v_$name -text $value -anchor w -font font_ui
grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
}
- pack $w.stat
+ pack $w.stat -pady 10 -padx 10
bind $w <Visibility> "grab $w; focus $w"
bind $w <Key-Escape> [list destroy $w]
proc do_gc {} {
set w [new_console {gc} {Compressing the object database}]
- console_exec $w {git gc}
+ console_chain {
+ {console_exec {git pack-refs --prune}}
+ {console_exec {git reflog expire --all}}
+ {console_exec {git repack -a -d -l}}
+ {console_exec {git rerere gc}}
+ } $w
}
proc do_fsck_objects {} {
lappend cmd --full
lappend cmd --cache
lappend cmd --strict
- console_exec $w $cmd
+ console_exec $w $cmd console_done
}
set is_quitting 0
#
set save [gitdir GITGUI_MSG]
set msg [string trim [$ui_comm get 0.0 end]]
- if {![string match amend* $commit_type]
- && [$ui_comm edit modified]
+ 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 $fd [string trim [$ui_comm get 0.0 end]]
+ puts -nonewline $fd $msg
close $fd
}
} else {
pack $w.buttons.restore -side left
button $w.buttons.save -text Save \
-font font_ui \
- -command "
- catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
- do_save_config $w
- "
+ -command [list do_save_config $w]
pack $w.buttons.save -side right
button $w.buttons.cancel -text {Cancel} \
-font font_ui \
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 {
- {b pullsummary {Show Pull Summary}}
- {b trustmtime {Trust File Modification Timestamps}}
- {i diffcontext {Number of Diff Context Lines}}
- {t newbranchtemplate {New Branch Name Template}}
+ {t user.name {User Name}}
+ {t user.email {Email Address}}
+
+ {b merge.summary {Summarize Merge Commits}}
+ {i-1..5 merge.verbosity {Merge Verbosity}}
+
+ {b gui.trustmtime {Trust File Modification Timestamps}}
+ {i-1..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 $type {
+ switch -glob -- $type {
b {
- checkbutton $w.$f.$name -text $text \
- -variable ${f}_config_new(gui.$name) \
+ checkbutton $w.$f.$optid -text $text \
+ -variable ${f}_config_new($name) \
-onvalue true \
-offvalue false \
-font font_ui
- pack $w.$f.$name -side top -anchor w
+ pack $w.$f.$optid -side top -anchor w
}
- i {
- frame $w.$f.$name
- label $w.$f.$name.l -text "$text:" -font font_ui
- pack $w.$f.$name.l -side left -anchor w -fill x
- spinbox $w.$f.$name.v \
- -textvariable ${f}_config_new(gui.$name) \
- -from 1 -to 99 -increment 1 \
- -width 3 \
+ i-* {
+ regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
+ frame $w.$f.$optid
+ label $w.$f.$optid.l -text "$text:" -font font_ui
+ 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]}] \
-font font_ui
- bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
- pack $w.$f.$name.v -side right -anchor e -padx 5
- pack $w.$f.$name -side top -anchor w -fill x
+ 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.$name
- label $w.$f.$name.l -text "$text:" -font font_ui
- text $w.$f.$name.v \
+ frame $w.$f.$optid
+ label $w.$f.$optid.l -text "$text:" -font font_ui
+ entry $w.$f.$optid.v \
-borderwidth 1 \
-relief sunken \
- -height 1 \
-width 20 \
+ -textvariable ${f}_config_new($name) \
-font font_ui
- $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
- bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
- bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
- bind $w.$f.$name.v <Key-Return> break
- bind $w.$f.$name.v <FocusIn> "$w.$f.$name.v tag add sel 0.0 end"
- bind $w.$f.$name.v <FocusOut> "
- set ${f}_config_new(gui.$name) \
- \[string trim \[$w.$f.$name.v get 0.0 end\]\]
- "
- pack $w.$f.$name.l -side left -anchor w
- pack $w.$f.$name.v -side left -anchor w \
+ 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.$name -side top -anchor w -fill x
+ pack $w.$f.$optid -side top -anchor w -fill x
}
}
}
proc do_windows_shortcut {} {
global argv0
+ set fn [tk_getSaveFile \
+ -parent . \
+ -title "[appname] ([reponame]): Create Desktop Icon" \
+ -initialfile "Git [reponame].bat"]
+ if {$fn != {}} {
+ if {[catch {
+ set fd [open $fn w]
+ puts $fd "@ECHO Entering [reponame]"
+ puts $fd "@ECHO Starting git-gui... please wait..."
+ puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
+ puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
+ puts -nonewline $fd "@\"[info nameofexecutable]\""
+ puts $fd " \"[file normalize $argv0]\""
+ close $fd
+ } err]} {
+ error_popup "Cannot write script:\n\n$err"
+ }
+ }
+}
+
+proc do_cygwin_shortcut {} {
+ global argv0
+
if {[catch {
set desktop [exec cygpath \
--windows \
set fd [open $exe w]
set gd [file normalize [gitdir]]
- set ep [file normalize [exec git --exec-path]]
+ set ep [file normalize [gitexec]]
regsub -all ' $gd "'\\''" gd
regsub -all ' $ep "'\\''" ep
puts $fd "#!/bin/sh"
}
}
+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.trustmtime) false
-set default_config(gui.pullsummary) true
set default_config(gui.diffcontext) 5
set default_config(gui.newbranchtemplate) {}
set default_config(gui.fontui) [font configure font_ui]
}
.mbar add cascade -label Commit -menu .mbar.commit
if {!$single_commit} {
+ .mbar add cascade -label Merge -menu .mbar.merge
.mbar add cascade -label Fetch -menu .mbar.fetch
- .mbar add cascade -label Pull -menu .mbar.pull
.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 {new_browser $current_branch} \
+ -font font_ui
+.mbar.repository add separator
+
.mbar.repository add command \
-label {Visualize Current Branch} \
-command {do_gitk {}} \
-font font_ui
-if {![is_MacOSX]} {
- .mbar.repository add command \
- -label {Visualize All Branches} \
- -command {do_gitk {--all}} \
- -font font_ui
-}
+.mbar.repository add command \
+ -label {Visualize All Branches} \
+ -command {do_gitk {--all}} \
+ -font font_ui
.mbar.repository add separator
if {!$single_commit} {
.mbar.repository add separator
- if {[is_Windows]} {
+ if {[is_Cygwin]} {
+ .mbar.repository add command \
+ -label {Create Desktop Icon} \
+ -command do_cygwin_shortcut \
+ -font font_ui
+ } elseif {[is_Windows]} {
.mbar.repository add command \
-label {Create Desktop Icon} \
-command do_windows_shortcut \
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-# -- Transport menus
-#
-if {!$single_commit} {
- menu .mbar.fetch
- menu .mbar.pull
- menu .mbar.push
-}
-
if {[is_MacOSX]} {
# -- Apple Menu (Mac OS X only)
#
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
+# -- 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 \
-font font_ui
}
+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 --windows $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 &] \
+ -font font_ui
+}
+unset browser doc_path doc_url
# -- Branch Control
#
pack .branch.cb -side left -fill x
pack .branch -side top -fill x
+if {!$single_commit} {
+ menu .mbar.merge
+ .mbar.merge add command -label {Local Merge...} \
+ -command do_local_merge \
+ -font font_ui
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
+ .mbar.merge add command -label {Abort Merge...} \
+ -command do_reset_hard \
+ -font font_ui
+ lappend disable_on_lock \
+ [list .mbar.merge entryconf [.mbar.merge index last] -state]
+
+
+ menu .mbar.fetch
+
+ menu .mbar.push
+ .mbar.push add command -label {Push...} \
+ -command do_push_anywhere \
+ -font font_ui
+}
+
# -- Main Window Layout
#
panedwindow .vpane -orient vertical
# -- Diff Header
#
set current_diff_path {}
+set current_diff_side {}
set diff_actions [list]
proc trace_current_diff_path {varname args} {
global current_diff_path diff_actions file_states
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
}
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
$ctxm add separator
+$ctxm add command \
+ -label {Apply/Reverse Hunk} \
+ -font font_ui \
+ -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} \
-font font_ui \
$ctxm add command -label {Options...} \
-font font_ui \
-command do_options
-bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
+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
#
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 <Button-1> {focus %W}
if {!$single_commit} {
bind . <$M1B-Key-n> do_create_branch
# does *not* pass its env array onto any processes it spawns.
# This means that git processes get none of our environment.
#
-if {[is_Windows]} {
+if {[is_Cygwin]} {
set ignored_env 0
set suggest_user {}
set msg "Possible environment issues exist.
load_all_heads
populate_branch_menu
- populate_fetch_menu .mbar.fetch
- populate_pull_menu .mbar.pull
- populate_push_menu .mbar.push
+ populate_fetch_menu
+ populate_push_menu
}
# -- Only suggest a gc run if we are going to stay running.