2 # Copyright (C) 2006, 2007 Shawn Pearce
5 global ui_diff current_diff_path current_diff_header
6 global ui_index ui_workdir
8 $ui_diff conf -state normal
9 $ui_diff delete 0.0 end
10 $ui_diff conf -state disabled
12 set current_diff_path {}
13 set current_diff_header {}
15 $ui_index tag remove in_diff 0.0 end
16 $ui_workdir tag remove in_diff 0.0 end
20 global file_states file_lists
21 global current_diff_path current_diff_side
23 set p $current_diff_path
25 # No diff is being shown.
26 } elseif {$current_diff_side eq {}
27 || [catch {set s $file_states($p)}]
28 || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
31 show_diff $p $current_diff_side
35 proc handle_empty_diff {} {
36 global current_diff_path file_states file_lists
38 set path $current_diff_path
39 set s $file_states($path)
40 if {[lindex $s 0] ne {_M}} return
42 info_popup "No differences detected.
44 [short_path $path] has no changes.
46 The modification date of this file was updated by another application, but the content within the file was not changed.
48 A rescan will be automatically started to find other files which may have the same state."
55 proc show_diff {path w {lno {}}} {
56 global file_states file_lists
57 global is_3way_diff diff_active repo_config
58 global ui_diff ui_index ui_workdir
59 global current_diff_path current_diff_side current_diff_header
61 if {$diff_active || ![lock_index read]} return
65 set lno [lsearch -sorted -exact $file_lists($w) $path]
71 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
74 set s $file_states($path)
78 set current_diff_path $path
79 set current_diff_side $w
80 set current_diff_header {}
81 ui_status "Loading diff of [escape_path $path]..."
83 # - Git won't give us the diff, there's nothing to compare to!
86 set max_sz [expr {128 * 1024}]
88 if {[file type $path] == {link}} {
89 set content [file readlink $path]
90 set sz [string length $content]
93 fconfigure $fd -eofchar {}
94 set content [read $fd $max_sz]
96 set sz [file size $path]
101 ui_status "Unable to display [escape_path $path]"
102 error_popup "Error loading file:\n\n$err"
105 $ui_diff conf -state normal
106 if {![catch {set type [exec file $path]}]} {
107 set n [string length $path]
108 if {[string equal -length $n $path $type]} {
109 set type [string range $type $n end]
110 regsub {^:?\s*} $type {} type
112 $ui_diff insert end "* $type\n" d_@
114 if {[string first "\0" $content] != -1} {
115 $ui_diff insert end \
116 "* Binary file (not showing content)." \
120 $ui_diff insert end \
121 "* Untracked file is $sz bytes.
122 * Showing only first $max_sz bytes.
125 $ui_diff insert end $content
127 $ui_diff insert end "
128 * Untracked file clipped here by [appname].
129 * To see the entire file, use an external editor.
133 $ui_diff conf -state disabled
141 if {$w eq $ui_index} {
142 lappend cmd diff-index
144 } elseif {$w eq $ui_workdir} {
145 if {[string index $m 0] eq {U}} {
148 lappend cmd diff-files
153 lappend cmd --no-color
154 if {$repo_config(gui.diffcontext) >= 0} {
155 lappend cmd "-U$repo_config(gui.diffcontext)"
157 if {$w eq $ui_index} {
163 if {[catch {set fd [eval git_read --nice $cmd]} err]} {
166 ui_status "Unable to display [escape_path $path]"
167 error_popup "Error loading diff:\n\n$err"
175 fileevent $fd readable [list read_diff $fd]
178 proc read_diff {fd} {
179 global ui_diff diff_active
180 global is_3way_diff current_diff_header
182 $ui_diff conf -state normal
183 while {[gets $fd line] >= 0} {
184 # -- Cleanup uninteresting diff header lines.
186 if { [string match {diff --git *} $line]
187 || [string match {diff --cc *} $line]
188 || [string match {diff --combined *} $line]
189 || [string match {--- *} $line]
190 || [string match {+++ *} $line]} {
191 append current_diff_header $line "\n"
194 if {[string match {index *} $line]} continue
195 if {$line eq {deleted file mode 120000}} {
196 set line "deleted symlink"
199 # -- Automatically detect if this is a 3 way diff.
201 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
203 if {[string match {mode *} $line]
204 || [string match {new file *} $line]
205 || [string match {deleted file *} $line]
206 || [string match {Binary files * and * differ} $line]
207 || $line eq {\ No newline at end of file}
208 || [regexp {^\* Unmerged path } $line]} {
210 } elseif {$is_3way_diff} {
211 set op [string range $line 0 1]
221 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
222 set line [string replace $line 0 1 { }]
229 puts "error: Unhandled 3 way diff marker: {$op}"
234 set op [string index $line 0]
240 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
241 set line [string replace $line 0 0 { }]
248 puts "error: Unhandled 2 way diff marker: {$op}"
253 $ui_diff insert end $line $tags
254 if {[string index $line end] eq "\r"} {
255 $ui_diff tag add d_cr {end - 2c}
257 $ui_diff insert end "\n" $tags
259 $ui_diff conf -state disabled
267 if {[$ui_diff index end] eq {2.0}} {
273 proc apply_hunk {x y} {
274 global current_diff_path current_diff_header current_diff_side
275 global ui_diff ui_index file_states
277 if {$current_diff_path eq {} || $current_diff_header eq {}} return
278 if {![lock_index apply_hunk]} return
280 set apply_cmd {apply --cached --whitespace=nowarn}
281 set mi [lindex $file_states($current_diff_path) 0]
282 if {$current_diff_side eq $ui_index} {
284 lappend apply_cmd --reverse
285 if {[string index $mi 0] ne {M}} {
291 if {[string index $mi 1] ne {M}} {
297 set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
298 set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
304 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
310 set p [eval git_write $apply_cmd]
311 fconfigure $p -translation binary -encoding binary
312 puts -nonewline $p $current_diff_header
313 puts -nonewline $p [$ui_diff get $s_lno $e_lno]
315 error_popup "Failed to $mode selected hunk.\n\n$err"
320 $ui_diff conf -state normal
321 $ui_diff delete $s_lno $e_lno
322 $ui_diff conf -state disabled
324 if {[$ui_diff get 1.0 end] eq "\n"} {
330 if {$current_diff_side eq $ui_index} {
332 } elseif {[string index $mi 0] eq {_}} {
338 display_file $current_diff_path $mi