-#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@"
set z2 [string first "\0" $buf_rdi $z1]
if {$z2 == -1} break
+ incr c
+ set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
+ merge_state \
+ [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
+ [lindex $i 4]? \
+ [list [lindex $i 0] [lindex $i 2]] \
+ [list]
set c $z2
- incr z2 -1
- display_file \
- [string range $buf_rdi $z1 $z2] \
- [string index $buf_rdi [expr {$z1 - 2}]]?
incr c
}
if {$c < $n} {
set z2 [string first "\0" $buf_rdf $z1]
if {$z2 == -1} break
+ incr c
+ set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
+ merge_state \
+ [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
+ ?[lindex $i 4] \
+ [list] \
+ [list [lindex $i 0] [lindex $i 2]]
set c $z2
- incr z2 -1
- display_file \
- [string range $buf_rdf $z1 $z2] \
- ?[string index $buf_rdf [expr {$z1 - 2}]]
incr c
}
if {$c < $n} {
set pck [split $buf_rlo "\0"]
set buf_rlo [lindex $pck end]
foreach p [lrange $pck 0 end-1] {
- display_file $p ?O
+ merge_state $p ?O
}
rescan_done $fd buf_rlo $after
}
proc show_diff {path {w {}} {lno {}}} {
global file_states file_lists
- global diff_3way diff_active repo_config
+ global is_3way_diff diff_active repo_config
global ui_diff current_diff ui_status_value
if {$diff_active || ![lock_index read]} return
set s $file_states($path)
set m [lindex $s 0]
- set diff_3way 0
+ set is_3way_diff 0
set diff_active 1
set current_diff $path
set ui_status_value "Loading diff of [escape_path $path]..."
}
proc read_diff {fd} {
- global ui_diff ui_status_value diff_3way diff_active
+ global ui_diff ui_status_value is_3way_diff diff_active
global repo_config
+ $ui_diff conf -state normal
while {[gets $fd line] >= 0} {
- if {[string match {diff --git *} $line]} continue
+ # -- Cleanup uninteresting diff header lines.
+ #
+ if {[string match {diff --git *} $line]} continue
if {[string match {diff --combined *} $line]} continue
- if {[string match {--- *} $line]} continue
- if {[string match {+++ *} $line]} continue
- if {[string match index* $line]} {
- if {[string first , $line] >= 0} {
- set diff_3way 1
- }
+ if {[string match {--- *} $line]} continue
+ if {[string match {+++ *} $line]} continue
+ if {$line eq {deleted file mode 120000}} {
+ set line "deleted symlink"
}
- $ui_diff conf -state normal
- if {!$diff_3way} {
- set x [string index $line 0]
- switch -- $x {
- "@" {set tags da}
- "+" {set tags dp}
- "-" {set tags dm}
+ # -- Automatically detect if this is a 3 way diff.
+ #
+ if {[string match {@@@ *} $line]} {set is_3way_diff 1}
+
+ # -- Reformat a 3 way diff, 'cause its too weird.
+ #
+ if {$is_3way_diff} {
+ set op [string range $line 0 1]
+ switch -- $op {
+ {@@} {set tags d_@}
+ {++} {set tags d_+ ; set op { +}}
+ {--} {set tags d_- ; set op { -}}
+ { +} {set tags d_++; set op {++}}
+ { -} {set tags d_--; set op {--}}
+ {+ } {set tags d_-+; set op {-+}}
+ {- } {set tags d_+-; set op {+-}}
default {set tags {}}
}
+ set line [string replace $line 0 1 $op]
} else {
- set x [string range $line 0 1]
- switch -- $x {
- default {set tags {}}
- "@@" {set tags da}
- "++" {set tags dp; set x " +"}
- " +" {set tags {di bold}; set x "++"}
- "+ " {set tags dni; set x "-+"}
- "--" {set tags dm; set x " -"}
- " -" {set tags {dm bold}; set x "--"}
- "- " {set tags di; set x "+-"}
+ switch -- [string index $line 0] {
+ @ {set tags d_@}
+ + {set tags d_+}
+ - {set tags d_-}
default {set tags {}}
}
- set line [string replace $line 0 1 $x]
}
$ui_diff insert end $line $tags
- $ui_diff insert end "\n"
- $ui_diff conf -state disabled
+ $ui_diff insert end "\n" $tags
}
+ $ui_diff conf -state disabled
if {[eof $fd]} {
close $fd
set s $file_states($path)
set m [lindex $s 0]
switch -glob -- $m {
+ DD -
+ AO {set m __}
A? -
M? -
D? {set m _[string index $m 1]}
}
set next_icon_id 0
+set null_sha1 [string repeat 0 40]
-proc merge_state {path new_state} {
- global file_states next_icon_id
+proc merge_state {path new_state {head_info {}} {index_info {}}} {
+ global file_states next_icon_id null_sha1
set s0 [string index $new_state 0]
set s1 [string index $new_state 1]
} else {
set state [lindex $info 0]
set icon [lindex $info 1]
+ if {$head_info eq {}} {set head_info [lindex $info 2]}
+ if {$index_info eq {}} {set index_info [lindex $info 3]}
}
- if {$s0 eq {?}} {
- set s0 [string index $state 0]
- } elseif {$s0 eq {_}} {
- set s0 _
- }
+ if {$s0 eq {?}} {set s0 [string index $state 0]} \
+ elseif {$s0 eq {_}} {set s0 _}
+
+ if {$s1 eq {?}} {set s1 [string index $state 1]} \
+ elseif {$s1 eq {_}} {set s1 _}
- if {$s1 eq {?}} {
- set s1 [string index $state 1]
- } elseif {$s1 eq {_}} {
- set s1 _
+ if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
+ set head_info [list 0 $null_sha1]
+ } elseif {$s0 ne {_} && [string index $state 0] eq {_}
+ && $head_info eq {}} {
+ set head_info $index_info
}
- set file_states($path) [list $s0$s1 $icon]
+ set file_states($path) [list $s0$s1 $icon \
+ $head_info $index_info \
+ ]
return $state
}
proc display_file {path state} {
- global file_states file_lists selected_paths rescan_active
+ global file_states file_lists selected_paths
set old_m [merge_state $path $state]
- if {$rescan_active > 0} return
-
set s $file_states($path)
set new_m [lindex $s 0]
set new_w [mapcol $new_m $path]
$ui_other conf -state disabled
}
+proc update_indexinfo {msg pathList after} {
+ global update_index_cp ui_status_value
+
+ if {![lock_index update]} return
+
+ set update_index_cp 0
+ set pathList [lsort $pathList]
+ set totalCnt [llength $pathList]
+ set batch [expr {int($totalCnt * .01) + 1}]
+ if {$batch > 25} {set batch 25}
+
+ set ui_status_value [format \
+ "$msg... %i/%i files (%.2f%%)" \
+ $update_index_cp \
+ $totalCnt \
+ 0.0]
+ set fd [open "| git update-index -z --index-info" w]
+ fconfigure $fd \
+ -blocking 0 \
+ -buffering full \
+ -buffersize 512 \
+ -translation binary
+ fileevent $fd writable [list \
+ write_update_indexinfo \
+ $fd \
+ $pathList \
+ $totalCnt \
+ $batch \
+ $msg \
+ $after \
+ ]
+}
+
+proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
+ global update_index_cp ui_status_value
+ global file_states current_diff
+
+ if {$update_index_cp >= $totalCnt} {
+ close $fd
+ unlock_index
+ uplevel #0 $after
+ return
+ }
+
+ for {set i $batch} \
+ {$update_index_cp < $totalCnt && $i > 0} \
+ {incr i -1} {
+ set path [lindex $pathList $update_index_cp]
+ incr update_index_cp
+
+ set s $file_states($path)
+ switch -glob -- [lindex $s 0] {
+ A? {set new _O}
+ M? {set new _M}
+ D? {set new _?}
+ ?? {continue}
+ }
+ set info [lindex $s 2]
+ if {$info eq {}} continue
+
+ puts -nonewline $fd $info
+ puts -nonewline $fd "\t"
+ puts -nonewline $fd $path
+ puts -nonewline $fd "\0"
+ display_file $path $new
+ }
+
+ set ui_status_value [format \
+ "$msg... %i/%i files (%.2f%%)" \
+ $update_index_cp \
+ $totalCnt \
+ [expr {100.0 * $update_index_cp / $totalCnt}]]
+}
+
proc update_index {msg pathList after} {
global update_index_cp ui_status_value
switch -glob -- [lindex $file_states($path) 0] {
AD -
MD -
- _D {set new D_}
+ _D {set new DD}
_M -
MM -
rescan {set ui_status_value {Ready.}}
}
+proc remove_helper {txt paths} {
+ global file_states current_diff
+
+ if {![lock_index begin-update]} return
+
+ set pathList [list]
+ set after {}
+ foreach path $paths {
+ switch -glob -- [lindex $file_states($path) 0] {
+ A? -
+ M? -
+ D? {
+ lappend pathList $path
+ if {$path eq $current_diff} {
+ set after {reshow_diff;}
+ }
+ }
+ }
+ }
+ if {$pathList eq {}} {
+ unlock_index
+ } else {
+ update_indexinfo \
+ $txt \
+ $pathList \
+ [concat $after {set ui_status_value {Ready.}}]
+ }
+}
+
+proc do_remove_selection {} {
+ global current_diff selected_paths
+
+ if {[array size selected_paths] > 0} {
+ remove_helper \
+ {Removing selected files from commit} \
+ [array names selected_paths]
+ } elseif {$current_diff ne {}} {
+ remove_helper \
+ "Removing [short_path $current_diff] from commit" \
+ [list $current_diff]
+ }
+}
+
proc include_helper {txt paths} {
global file_states current_diff
file mkdir $MacOS
- set fd [open [file join $Contents PkgInfo] w]
- puts -nonewline $fd {APPL????}
- close $fd
-
set fd [open [file join $Contents Info.plist] w]
puts $fd {<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
}
proc toggle_or_diff {w x y} {
- global file_lists current_diff ui_index ui_other
+ global file_states file_lists current_diff ui_index ui_other
global last_clicked selected_paths
set pos [split [$w index @$x,$y] .]
} else {
set after {}
}
- update_index \
- "Including [short_path $path]" \
- [list $path] \
- [concat $after {set ui_status_value {Ready.}}]
+ switch -glob -- [lindex $file_states($path) 0] {
+ A_ -
+ AO -
+ M_ -
+ DD -
+ D_ {
+ update_indexinfo \
+ "Removing [short_path $path] from commit" \
+ [list $path] \
+ [concat $after {set ui_status_value {Ready.}}]
+ }
+ ?? {
+ update_index \
+ "Including [short_path $path]" \
+ [list $path] \
+ [concat $after {set ui_status_value {Ready.}}]
+ }
+ }
} else {
show_diff $path $w $lno
}
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Include Selected Files} \
+.mbar.commit add command -label {Remove From Commit} \
+ -command do_remove_selection \
+ -font font_ui
+lappend disable_on_lock \
+ [list .mbar.commit entryconf [.mbar.commit index last] -state]
+
+.mbar.commit add command -label {Include In Commit} \
-command do_include_selection \
-font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
-.mbar.commit add command -label {Include All Files} \
+.mbar.commit add command -label {Include All} \
-command do_include_all \
-accelerator $M1T-I \
-font font_ui
lappend disable_on_lock \
[list .mbar.commit entryconf [.mbar.commit index last] -state]
+.mbar.commit add separator
+
.mbar.commit add command -label {Sign Off} \
-command do_signoff \
-accelerator $M1T-S \
pack .vpane.lower.diff.header -side top -fill x
pack .vpane.lower.diff.body -side bottom -fill both -expand 1
-$ui_diff tag conf dm -foreground red
-$ui_diff tag conf dp -foreground blue
-$ui_diff tag conf di -foreground {#00a000}
-$ui_diff tag conf dni -foreground {#a000a0}
-$ui_diff tag conf da -font font_diffbold
-$ui_diff tag conf bold -font font_diffbold
+$ui_diff tag conf d_@ -font font_diffbold
+$ui_diff tag conf d_+ -foreground blue
+$ui_diff tag conf d_- -foreground red
+$ui_diff tag conf d_++ -foreground {#00a000}
+$ui_diff tag conf d_-- -foreground {#a000a0}
+$ui_diff tag conf d_+- \
+ -foreground red \
+ -background {light goldenrod yellow}
+$ui_diff tag conf d_-+ \
+ -foreground blue \
+ -background azure2
# -- Diff Body Context Menu
#