![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/git-gui.sh b/git-gui.sh
index ae22338be353e4ba588948a0778ea8b0b8a1a60e..f84ba3382b3078ee6de45bddfacd650973068303 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@"
-set appvers {@@GIT_VERSION@@}
+set appvers {@@GITGUI_VERSION@@}
set copyright {
-Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
+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
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}
+set gitgui_credits {
+Paul Mackerras
+}
######################################################################
##
proc gitexec {args} {
global _gitexec
if {$_gitexec eq {}} {
- if {[catch {set _gitexec [exec git --exec-path]} err]} {
+ if {[catch {set _gitexec [git --exec-path]} err]} {
error "Git not installed?\n\n$err"
}
}
set value $global_config_new($name)
if {$value ne $global_config($name)} {
if {$value eq $default_config($name)} {
- catch {exec git config --global --unset $name}
+ catch {git config --global --unset $name}
} else {
regsub -all "\[{}\]" $value {"} value
- exec git config --global $name $value
+ git config --global $name $value
}
set global_config($name) $value
if {$value eq $repo_config($name)} {
- catch {exec git config --unset $name}
+ catch {git config --unset $name}
set repo_config($name) $value
}
}
set value $repo_config_new($name)
if {$value ne $repo_config($name)} {
if {$value eq $global_config($name)} {
- catch {exec git config --unset $name}
+ catch {git config --unset $name}
} else {
regsub -all "\[{}\]" $value {"} value
- exec git config $name $value
+ git config $name $value
}
set repo_config($name) $value
}
}
}
+######################################################################
+##
+## handy utils
+
+proc git {args} {
+ return [eval exec git $args]
+}
+
proc error_popup {msg} {
set title [appname]
if {[reponame] ne {}} {
-message $msg]
}
+######################################################################
+##
+## version check
+
+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)}]
- && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
+ && [catch {set _gitdir [git rev-parse --git-dir]} err]} {
catch {wm withdraw .}
error_popup "Cannot find the git directory:\n\n$err"
exit 1
[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 mh [list]
- if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
+ if {[catch {set current_branch [git symbolic-ref HEAD]}]} {
set current_branch {}
} else {
regsub ^refs/((heads|tags|remotes)/)? \
current_branch
}
- if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
+ if {[catch {set hd [git rev-parse --verify HEAD]}]} {
set hd {}
set ct initial
return
return $p
}
if {$empty_tree eq {}} {
- set empty_tree [exec git mktree << {}]
+ set empty_tree [git mktree << {}]
}
return $empty_tree
}
global current_diff_path current_diff_side
set p $current_diff_path
- if {$p eq {}
- || $current_diff_side eq {}
+ if {$p eq {}} {
+ # No diff is being shown.
+ } elseif {$current_diff_side eq {}
|| [catch {set s $file_states($p)}]
|| [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
clear_diff
global GIT_COMMITTER_IDENT
if {$GIT_COMMITTER_IDENT eq {}} {
- if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
+ if {[catch {set me [git var GIT_COMMITTER_IDENT]} err]} {
error_popup "Unable to obtain your identity:\n\n$err"
return {}
}
return
}
- # -- Make sure our current branch exists.
- #
- if {$commit_type eq {initial}} {
- lappend all_heads $current_branch
- set all_heads [lsort -unique $all_heads]
- populate_branch_menu
- }
-
# -- Cleanup after ourselves.
#
catch {file delete $msg_p}
# -- Let rerere do its thing.
#
if {[file isdirectory [gitdir rr-cache]]} {
- catch {exec git rerere}
+ catch {git rerere}
}
# -- Run the post-commit hook.
if {[is_enabled singlecommit]} do_quit
+ # -- Make sure our current branch exists.
+ #
+ if {$commit_type eq {initial}} {
+ lappend all_heads $current_branch
+ set all_heads [lsort -unique $all_heads]
+ populate_branch_menu
+ }
+
# -- Update in memory status
#
set selected_commit_type new
return [lsort -unique $all_trackings]
}
+proc load_all_tags {} {
+ set all_tags [list]
+ set fd [open "| git for-each-ref --format=%(refname) refs/tags" r]
+ while {[gets $fd line] > 0} {
+ if {![regsub ^refs/tags/ $line {} name]} continue
+ lappend all_tags $name
+ }
+ close $fd
+
+ return [lsort $all_tags]
+}
+
proc do_create_branch_action {w} {
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
+ global create_branch_tag
set newbranch $create_branch_name
if {$newbranch eq {}
focus $w.desc.name_t
return
}
- if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
+ if {![catch {git show-ref --verify -- "refs/heads/$newbranch"}]} {
tk_messageBox \
-icon error \
-type ok \
focus $w.desc.name_t
return
}
- if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
+ if {[catch {git check-ref-format "heads/$newbranch"}]} {
tk_messageBox \
-icon error \
-type ok \
switch -- $create_branch_revtype {
head {set rev $create_branch_head}
tracking {set rev $create_branch_trackinghead}
+ tag {set rev $create_branch_tag}
expression {set rev $create_branch_revexp}
}
- if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
+ if {[catch {set cmt [git rev-parse --verify "${rev}^0"]}]} {
tk_messageBox \
-icon error \
-type ok \
[list radio_selector create_branch_revtype head]
trace add variable create_branch_trackinghead write \
[list radio_selector create_branch_revtype tracking]
+trace add variable create_branch_tag write \
+ [list radio_selector create_branch_revtype tag]
trace add variable delete_branch_head write \
[list radio_selector delete_branch_checktype head]
global create_branch_checkout create_branch_revtype
global create_branch_head create_branch_trackinghead
global create_branch_name create_branch_revexp
+ global create_branch_tag
set w .branch_editor
toplevel $w
$all_trackings
grid $w.from.tracking_r $w.from.tracking_m -sticky w
}
+ set all_tags [load_all_tags]
+ if {$all_tags ne {}} {
+ set create_branch_tag [lindex $all_tags 0]
+ radiobutton $w.from.tag_r \
+ -text {Tag:} \
+ -value tag \
+ -variable create_branch_revtype \
+ -font font_ui
+ eval tk_optionMenu $w.from.tag_m \
+ create_branch_tag \
+ $all_tags
+ grid $w.from.tag_r $w.from.tag_m -sticky w
+ }
radiobutton $w.from.exp_r \
-text {Revision Expression:} \
-value expression \
}
if {$check_rev eq {:none}} {
set check_cmt {}
- } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
+ } elseif {[catch {set check_cmt [git rev-parse --verify "${check_rev}^0"]}]} {
tk_messageBox \
-icon error \
-type ok \
set not_merged [list]
foreach i [$w.list.l curselection] {
set b [$w.list.l get $i]
- if {[catch {set o [exec git rev-parse --verify $b]}]} continue
+ if {[catch {set o [git rev-parse --verify $b]}]} continue
if {$check_cmt ne {}} {
if {$b eq $check_rev} continue
- if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
+ if {[catch {set m [git merge-base $o $check_cmt]}]} continue
if {$o ne $m} {
lappend not_merged $b
continue
foreach i $to_delete {
set b [lindex $i 0]
set o [lindex $i 1]
- if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
+ if {[catch {git update-ref -d "refs/heads/$b" $o} err]} {
append failed " - $b: $err\n"
} else {
set x [lsearch -sorted -exact $all_heads $b]
# here, it Just Works(tm). If it doesn't we are in some really ugly
# state that is difficult to recover from within git-gui.
#
- if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
+ if {[catch {git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
error_popup "Failed to set current branch.
This working directory is only partially switched.
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 {--format=%(objectname) %(*objectname) %(refname)}
lappend cmd refs/heads
lappend cmd refs/remotes
+ lappend cmd refs/tags
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]
+ set sha1([lindex $line 0]) [lindex $line 2]
+ set sha1([lindex $line 1]) [lindex $line 2]
}
close $fr_fd
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
+ regsub ^refs/(heads|remotes|tags)/ $ref {} ref
lappend to_show $ref
}
close $fr_fd
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]
+ if {[winfo ismapped .]} {
+ set w .browser[incr next_browser_id]
+ set tl $w
+ toplevel $w
+ } else {
+ set w {}
+ set tl .
+ }
set w_list $w.list.l
set browser_commit($w_list) $commit
set browser_status($w_list) {Starting...}
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 \
bind $w_list <Left> break
bind $w_list <Right> break
- bind $w <Visibility> "focus $w"
- bind $w <Destroy> "
+ bind $tl <Visibility> "focus $w"
+ bind $tl <Destroy> "
array unset browser_buffer $w_list
array unset browser_files $w_list
array unset browser_status $w_list
array unset browser_commit $w_list
array unset browser_busy $w_list
"
- wm title $w "[appname] ([reponame]): File Browser"
+ wm title $tl "[appname] ([reponame]): File Browser"
ls_tree $w_list $browser_commit($w_list) {}
}
set tl .
}
set blame_status($w) {Loading current file content...}
- set texts [list]
label $w.path -text "$commit:$path" \
-anchor w \
-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 \
+ text $w.out.loaded_t \
-background white -borderwidth 0 \
-state disabled \
-wrap none \
-height 40 \
- -width 20 \
+ -width 1 \
-font font_diff
- lappend texts $w.out.author_t
+ $w.out.loaded_t tag conf annotated -background grey
- 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 \
-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 \
-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
+ -command [list scrollbar2many [list \
+ $w.out.loaded_t \
+ $w.out.linenumber_t \
+ $w.out.file_t \
+ ] yview]
+ grid \
+ $w.out.linenumber_t \
+ $w.out.loaded_t \
+ $w.out.file_t \
+ $w.out.sby \
+ -sticky nsew
+ grid conf $w.out.sbx -column 2 -sticky we
+ grid columnconfigure $w.out 2 -weight 1
+ grid rowconfigure $w.out 0 -weight 1
pack $w.out -fill both -expand 1
label $w.status -textvariable blame_status($w) \
-font font_ui
pack $w.status -side bottom -fill x
+ frame $w.cm
+ text $w.cm.t \
+ -background white -borderwidth 0 \
+ -state disabled \
+ -wrap none \
+ -height 10 \
+ -width 80 \
+ -xscrollcommand [list $w.cm.sbx set] \
+ -yscrollcommand [list $w.cm.sby set] \
+ -font font_diff
+ scrollbar $w.cm.sbx -orient h -command [list $w.cm.t xview]
+ scrollbar $w.cm.sby -orient v -command [list $w.cm.t yview]
+ pack $w.cm.sby -side right -fill y
+ pack $w.cm.sbx -side bottom -fill x
+ pack $w.cm.t -expand 1 -fill both
+ pack $w.cm -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 {
+ foreach i [list \
+ $w.out.loaded_t \
+ $w.out.linenumber_t \
+ $w.out.file_t] {
$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"
+ [list many2scrollbar [list \
+ $w.out.loaded_t \
+ $w.out.linenumber_t \
+ $w.out.file_t \
+ ] yview $w.out.sby]
+ bind $i <Button-1> "
+ blame_click {$w} \\
+ $w.cm.t \\
+ $w.out.linenumber_t \\
+ $w.out.file_t \\
+ $i @%x,%y
+ focus $i
+ "
bind_button3 $i "
set cursorX %x
set cursorY %y
"
}
- set blame_data($w,colors) {}
-
+ bind $w.cm.t <Button-1> "focus $w.cm.t"
bind $tl <Visibility> "focus $tl"
bind $tl <Destroy> "
array unset blame_status {$w}
"
wm title $tl "[appname] ([reponame]): File Viewer"
+ set blame_data($w,commit_count) 0
+ set blame_data($w,commit_list) {}
set blame_data($w,total_lines) 0
+ set blame_data($w,blame_lines) 0
+ set blame_data($w,highlight_commit) {}
+ set blame_data($w,highlight_line) -1
+
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]
+ $w.cm.t $w.out.loaded_t $w.out.linenumber_t $w.out.file_t]
}
-proc read_blame_catfile {fd w commit path texts w_lno w_file} {
+proc read_blame_catfile {fd w commit path w_cmit w_load w_line w_file} {
global blame_status blame_data
if {![winfo exists $w_file]} {
}
set n $blame_data($w,total_lines)
- foreach i $texts {$i conf -state normal}
+ $w_load conf -state normal
+ $w_line conf -state normal
+ $w_file 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"}
+ $w_load insert end "\n"
+ $w_line insert end "$n\n" linenumber
+ $w_file insert end "$line\n"
}
- foreach i $texts {$i conf -state disabled}
+ $w_load conf -state disabled
+ $w_line conf -state disabled
+ $w_file conf -state disabled
set blame_data($w,total_lines) $n
if {[eof $fd]} {
close $fd
- set blame_status($w) {Loading annotations...}
+ blame_incremental_status $w
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
- set handler [list read_blame_incremental $fd $w]
- append handler " $texts"
- fileevent $fd readable $handler
+ fileevent $fd readable [list read_blame_incremental $fd $w \
+ $w_load $w_cmit $w_line $w_file]
}
}
-proc read_blame_incremental {fd w
- w_commit w_author w_date w_filename w_olno
- w_lno w_file} {
+proc read_blame_incremental {fd w w_load w_cmit w_line w_file} {
global blame_status blame_data
- if {![winfo exists $w_commit]} {
+ if {![winfo exists $w_file]} {
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,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
+ if {[catch {set g $blame_data($w,$cmit,order)}]} {
+ $w_line tag conf g$cmit
+ $w_file tag conf g$cmit
+ $w_line tag raise in_sel
+ $w_file tag raise in_sel
+ $w_file tag raise sel
+ set blame_data($w,$cmit,order) $blame_data($w,commit_count)
+ incr blame_data($w,commit_count)
+ lappend blame_data($w,commit_list) $cmit
}
} elseif {[string match {filename *} $line]} {
+ set file [string range $line 9 end]
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"
+ if {[catch {set g g$blame_data($w,line$lno,commit)}]} {
+ $w_load tag add annotated $lno.0 "$lno.0 lineend + 1c"
+ } else {
+ $w_line tag remove g$g $lno.0 "$lno.0 lineend + 1c"
+ $w_file tag remove g$g $lno.0 "$lno.0 lineend + 1c"
}
set blame_data($w,line$lno,commit) $cmit
+ set blame_data($w,line$lno,file) $file
+ $w_line tag add g$cmit $lno.0 "$lno.0 lineend + 1c"
+ $w_file tag add g$cmit $lno.0 "$lno.0 lineend + 1c"
+
+ if {$blame_data($w,highlight_line) == -1} {
+ if {[lindex [$w_file yview] 0] == 0} {
+ $w_file see $lno.0
+ blame_showcommit $w $w_cmit $w_line $w_file $lno
+ }
+ } elseif {$blame_data($w,highlight_line) == $lno} {
+ blame_showcommit $w $w_cmit $w_line $w_file $lno
+ }
incr n -1
incr lno
- incr ol
+ incr blame_data($w,blame_lines)
+ }
+
+ set hc $blame_data($w,highlight_commit)
+ if {$hc ne {}
+ && [expr {$blame_data($w,$hc,order) + 1}]
+ == $blame_data($w,$cmit,order)} {
+ blame_showcommit $w $w_cmit $w_line $w_file \
+ $blame_data($w,highlight_line)
}
} 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.}
+ } else {
+ blame_incremental_status $w
}
}
-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
- }
+proc blame_incremental_status {w} {
+ global blame_status blame_data
+
+ set blame_status($w) [format \
+ "Loading annotations... %i of %i lines annotated (%2i%%)" \
+ $blame_data($w,blame_lines) \
+ $blame_data($w,total_lines) \
+ [expr {100 * $blame_data($w,blame_lines)
+ / $blame_data($w,total_lines)}]]
+}
+
+proc blame_click {w w_cmit w_line w_file cur_w pos} {
+ set lno [lindex [split [$cur_w index $pos] .] 0]
if {$lno eq {}} return
- foreach i $args {
- $i tag add in_sel $lno.0 "$lno.0 + 1 line"
+
+ $w_line tag remove in_sel 0.0 end
+ $w_file tag remove in_sel 0.0 end
+ $w_line tag add in_sel $lno.0 "$lno.0 + 1 line"
+ $w_file tag add in_sel $lno.0 "$lno.0 + 1 line"
+
+ blame_showcommit $w $w_cmit $w_line $w_file $lno
+}
+
+set blame_colors {
+ #ff4040
+ #ff40ff
+ #4040ff
+}
+
+proc blame_showcommit {w w_cmit w_line w_file lno} {
+ global blame_colors blame_data repo_config
+
+ set cmit $blame_data($w,highlight_commit)
+ if {$cmit ne {}} {
+ set idx $blame_data($w,$cmit,order)
+ set i 0
+ foreach c $blame_colors {
+ set h [lindex $blame_data($w,commit_list) [expr {$idx - 1 + $i}]]
+ $w_line tag conf g$h -background white
+ $w_file tag conf g$h -background white
+ incr i
+ }
}
+
+ $w_cmit conf -state normal
+ $w_cmit delete 0.0 end
+ if {[catch {set cmit $blame_data($w,line$lno,commit)}]} {
+ set cmit {}
+ $w_cmit insert end "Loading annotation..."
+ } else {
+ set idx $blame_data($w,$cmit,order)
+ set i 0
+ foreach c $blame_colors {
+ set h [lindex $blame_data($w,commit_list) [expr {$idx - 1 + $i}]]
+ $w_line tag conf g$h -background $c
+ $w_file tag conf g$h -background $c
+ incr i
+ }
+
+ if {[catch {set msg $blame_data($w,$cmit,message)}]} {
+ set msg {}
+ catch {
+ set fd [open "| git cat-file commit $cmit" r]
+ fconfigure $fd -encoding binary -translation lf
+ if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
+ set enc utf-8
+ }
+ while {[gets $fd line] > 0} {
+ if {[string match {encoding *} $line]} {
+ set enc [string tolower [string range $line 9 end]]
+ }
+ }
+ fconfigure $fd -encoding $enc
+ set msg [string trim [read $fd]]
+ close $fd
+ }
+ set blame_data($w,$cmit,message) $msg
+ }
+
+ set author_name {}
+ set author_email {}
+ set author_time {}
+ catch {set author_name $blame_data($w,$cmit,author)}
+ catch {set author_email $blame_data($w,$cmit,author-mail)}
+ catch {set author_time [clock format $blame_data($w,$cmit,author-time)]}
+
+ set committer_name {}
+ set committer_email {}
+ set committer_time {}
+ catch {set committer_name $blame_data($w,$cmit,committer)}
+ catch {set committer_email $blame_data($w,$cmit,committer-mail)}
+ catch {set committer_time [clock format $blame_data($w,$cmit,committer-time)]}
+
+ $w_cmit insert end "commit $cmit\n"
+ $w_cmit insert end "Author: $author_name $author_email $author_time\n"
+ $w_cmit insert end "Committer: $committer_name $committer_email $committer_time\n"
+ $w_cmit insert end "Original File: [escape_path $blame_data($w,line$lno,file)]\n"
+ $w_cmit insert end "\n"
+ $w_cmit insert end $msg
+ }
+ $w_cmit conf -state disabled
+
+ set blame_data($w,highlight_line) $lno
+ set blame_data($w,highlight_commit) $cmit
}
proc blame_copycommit {w i pos} {
proc do_gitk {revs} {
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]}
- }
-
# -- Always start gitk through whatever we were loaded with. This
# lets us bypass using shell process on Windows systems.
#
set rc_geometry {}
}
if {$cfg_geometry ne $rc_geometry} {
- catch {exec git config gui.geometry $cfg_geometry}
+ catch {git config gui.geometry $cfg_geometry}
}
}
commit_tree
}
+proc do_credits {} {
+ global gitgui_credits
+
+ set w .credits_dialog
+
+ toplevel $w
+ wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+
+ label $w.header -text {git-gui Contributors} -font font_uibold
+ pack $w.header -side top -fill x
+
+ frame $w.buttons
+ button $w.buttons.close -text {Close} \
+ -font font_ui \
+ -command [list destroy $w]
+ pack $w.buttons.close -side right
+ pack $w.buttons -side bottom -fill x -pady 10 -padx 10
+
+ frame $w.credits
+ text $w.credits.t \
+ -background [$w.header cget -background] \
+ -yscrollcommand [list $w.credits.sby set] \
+ -width 20 \
+ -height 10 \
+ -wrap none \
+ -borderwidth 1 \
+ -relief solid \
+ -padx 5 -pady 5 \
+ -font font_ui
+ scrollbar $w.credits.sby -command [list $w.credits.t yview]
+ pack $w.credits.sby -side right -fill y
+ pack $w.credits.t -fill both -expand 1
+ pack $w.credits -side top -fill both -expand 1 -padx 5 -pady 5
+
+ label $w.desc \
+ -text "All portions are copyrighted by their respective authors
+and are distributed under the GNU General Public License." \
+ -padx 5 -pady 5 \
+ -justify left \
+ -anchor w \
+ -borderwidth 1 \
+ -relief solid \
+ -font font_ui
+ pack $w.desc -side top -fill x -padx 5 -pady 5
+
+ $w.credits.t insert end "[string trim $gitgui_credits]\n"
+ $w.credits.t conf -state disabled
+ $w.credits.t see 1.0
+
+ bind $w <Visibility> "grab $w; focus $w"
+ bind $w <Key-Escape> [list destroy $w]
+ wm title $w [$w.header cget -text]
+ tkwait window $w
+}
+
proc do_about {} {
global appvers copyright
global tcl_patchLevel tk_patchLevel
button $w.buttons.close -text {Close} \
-font font_ui \
-command [list destroy $w]
+ button $w.buttons.credits -text {Contributors} \
+ -font font_ui \
+ -command do_credits
+ pack $w.buttons.credits -side left
pack $w.buttons.close -side right
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
label $w.desc \
- -text "[appname] - a commit creation tool for Git.
+ -text "git-gui - a graphical user interface for Git.
$copyright" \
-padx 5 -pady 5 \
-justify left \
pack $w.desc -side top -fill x -padx 5 -pady 5
set v {}
- append v "[appname] version $appvers\n"
- append v "[exec git version]\n"
+ 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"
toplevel $w
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
- label $w.header -text "[appname] Options" \
+ label $w.header -text "Options" \
-font font_uibold
pack $w.header -side top -fill x
enable_option transport
switch -- $subcommand {
+--version -
+version -
+browser -
blame {
disable_option multicommit
disable_option branch
.mbar.apple add command -label "About [appname]" \
-command do_about \
-font font_ui
- .mbar.apple add command -label "[appname] Options..." \
+ .mbar.apple add command -label "Options..." \
-command do_options \
-font font_ui
} else {
set doc_path [file join $doc_path Documentation index.html]
if {[is_Cygwin]} {
- set doc_path [exec cygpath --windows $doc_path]
+ set doc_path [exec cygpath --mixed $doc_path]
}
if {$browser eq {}} {
# -- Not a normal commit type invocation? Do that instead!
#
switch -- $subcommand {
+--version -
+version {
+ puts "git-gui version $appvers"
+ exit
+}
+browser {
+ if {[llength $argv] != 1} {
+ puts stderr "usage: $argv0 browser commit"
+ exit 1
+ }
+ set current_branch [lindex $argv 0]
+ new_browser $current_branch
+ return
+}
blame {
if {[llength $argv] != 2} {
puts stderr "usage: $argv0 blame commit path"
# fall through to setup UI for commits
}
default {
- puts stderr "usage: $argv0 \[{blame|citool}\]"
+ puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
exit 1
}
}
# -- 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
if {$current_diff_path eq {}} {
# -- Status Bar
#
-set ui_status_value {Initializing...}
label .status -textvariable ui_status_value \
-anchor w \
-justify left \
set file_lists($ui_index) [list]
set file_lists($ui_workdir) [list]
-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
-
wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
focus -force $ui_comm
if {[is_enabled multicommit]} {
set object_limit 2000
if {[is_Windows]} {set object_limit 200}
- regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
+ 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.