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
19 proc reshow_diff {{after {}}} {
20 global file_states file_lists
21 global current_diff_path current_diff_side
24 set p $current_diff_path
26 # No diff is being shown.
27 } elseif {$current_diff_side eq {}} {
29 } elseif {[catch {set s $file_states($p)}]
30 || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
32 if {[find_next_diff $current_diff_side $p {} {[^O]}]} {
38 set save_pos [lindex [$ui_diff yview] 0]
39 show_diff $p $current_diff_side {} $save_pos $after
43 proc force_diff_encoding {enc} {
44 global current_diff_path
46 if {$current_diff_path ne {}} {
47 force_path_encoding $current_diff_path $enc
52 proc handle_empty_diff {} {
53 global current_diff_path file_states file_lists
54 global diff_empty_count
56 set path $current_diff_path
57 set s $file_states($path)
58 if {[lindex $s 0] ne {_M} || [has_textconv $path]} return
60 # Prevent infinite rescan loops
62 if {$diff_empty_count > 1} return
64 info_popup [mc "No differences detected.
68 The modification date of this file was updated by another application, but the content within the file was not changed.
70 A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
77 proc show_diff {path w {lno {}} {scroll_pos {}} {callback {}}} {
78 global file_states file_lists
79 global is_3way_diff is_conflict_diff diff_active repo_config
80 global ui_diff ui_index ui_workdir
81 global current_diff_path current_diff_side current_diff_header
82 global current_diff_queue
84 if {$diff_active || ![lock_index read]} return
88 set lno [lsearch -sorted -exact $file_lists($w) $path]
94 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
98 set s $file_states($path)
100 set is_conflict_diff 0
101 set current_diff_path $path
102 set current_diff_side $w
103 set current_diff_queue {}
104 ui_status [mc "Loading diff of %s..." [escape_path $path]]
106 set cont_info [list $scroll_pos $callback]
108 if {[string first {U} $m] >= 0} {
109 merge_load_stages $path [list show_unmerged_diff $cont_info]
110 } elseif {$m eq {_O}} {
111 show_other_diff $path $w $m $cont_info
113 start_show_diff $cont_info
117 proc show_unmerged_diff {cont_info} {
118 global current_diff_path current_diff_side
119 global merge_stages ui_diff is_conflict_diff
120 global current_diff_queue
122 if {$merge_stages(2) eq {}} {
123 set is_conflict_diff 1
124 lappend current_diff_queue \
125 [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \
126 [list ":1:$current_diff_path" ":3:$current_diff_path"]]
127 } elseif {$merge_stages(3) eq {}} {
128 set is_conflict_diff 1
129 lappend current_diff_queue \
130 [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \
131 [list ":1:$current_diff_path" ":2:$current_diff_path"]]
132 } elseif {[lindex $merge_stages(1) 0] eq {120000}
133 || [lindex $merge_stages(2) 0] eq {120000}
134 || [lindex $merge_stages(3) 0] eq {120000}} {
135 set is_conflict_diff 1
136 lappend current_diff_queue \
137 [list [mc "LOCAL:\n"] d======= \
138 [list ":1:$current_diff_path" ":2:$current_diff_path"]]
139 lappend current_diff_queue \
140 [list [mc "REMOTE:\n"] d======= \
141 [list ":1:$current_diff_path" ":3:$current_diff_path"]]
143 start_show_diff $cont_info
147 advance_diff_queue $cont_info
150 proc advance_diff_queue {cont_info} {
151 global current_diff_queue ui_diff
153 set item [lindex $current_diff_queue 0]
154 set current_diff_queue [lrange $current_diff_queue 1 end]
156 $ui_diff conf -state normal
157 $ui_diff insert end [lindex $item 0] [lindex $item 1]
158 $ui_diff conf -state disabled
160 start_show_diff $cont_info [lindex $item 2]
163 proc show_other_diff {path w m cont_info} {
164 global file_states file_lists
165 global is_3way_diff diff_active repo_config
166 global ui_diff ui_index ui_workdir
167 global current_diff_path current_diff_side current_diff_header
169 # - Git won't give us the diff, there's nothing to compare to!
175 set type [file type $path]
183 set content [file readlink $path]
184 set sz [string length $content]
187 set fd [open $path r]
190 -encoding [get_path_encoding $path]
191 set content [read $fd $max_sz]
193 set sz [file size $path]
196 error "'$type' not supported"
202 ui_status [mc "Unable to display %s" [escape_path $path]]
203 error_popup [strcat [mc "Error loading file:"] "\n\n$err"]
206 $ui_diff conf -state normal
207 if {$type eq {submodule}} {
208 $ui_diff insert end [append \
210 [mc "Git Repository (subproject)"] \
212 } elseif {![catch {set type [exec file $path]}]} {
213 set n [string length $path]
214 if {[string equal -length $n $path $type]} {
215 set type [string range $type $n end]
216 regsub {^:?\s*} $type {} type
218 $ui_diff insert end "* $type\n" d_@
220 if {[string first "\0" $content] != -1} {
221 $ui_diff insert end \
222 [mc "* Binary file (not showing content)."] \
226 $ui_diff insert end [mc \
227 "* Untracked file is %d bytes.
228 * Showing only first %d bytes.
231 $ui_diff insert end $content
233 $ui_diff insert end [mc "
234 * Untracked file clipped here by %s.
235 * To see the entire file, use an external editor.
239 $ui_diff conf -state disabled
242 set scroll_pos [lindex $cont_info 0]
243 if {$scroll_pos ne {}} {
245 $ui_diff yview moveto $scroll_pos
248 set callback [lindex $cont_info 1]
249 if {$callback ne {}} {
256 proc start_show_diff {cont_info {add_opts {}}} {
257 global file_states file_lists
258 global is_3way_diff is_submodule_diff diff_active repo_config
259 global ui_diff ui_index ui_workdir
260 global current_diff_path current_diff_side current_diff_header
262 set path $current_diff_path
263 set w $current_diff_side
265 set s $file_states($path)
268 set is_submodule_diff 0
270 set current_diff_header {}
273 if {$w eq $ui_index} {
274 lappend cmd diff-index
276 } elseif {$w eq $ui_workdir} {
277 if {[string first {U} $m] >= 0} {
280 lappend cmd diff-files
283 if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
284 lappend cmd --textconv
287 if {[string match {160000 *} [lindex $s 2]]
288 || [string match {160000 *} [lindex $s 3]]} {
289 set is_submodule_diff 1
291 if {[git-version >= "1.6.6"]} {
292 lappend cmd --submodule
297 lappend cmd --no-color
298 if {$repo_config(gui.diffcontext) >= 1} {
299 lappend cmd "-U$repo_config(gui.diffcontext)"
301 if {$w eq $ui_index} {
304 if {$add_opts ne {}} {
305 eval lappend cmd $add_opts
311 if {$is_submodule_diff && [git-version < "1.6.6"]} {
312 if {$w eq $ui_index} {
313 set cmd [list submodule summary --cached -- $path]
315 set cmd [list submodule summary --files -- $path]
319 if {[catch {set fd [eval git_read --nice $cmd]} err]} {
322 ui_status [mc "Unable to display %s" [escape_path $path]]
323 error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
327 set ::current_diff_inheader 1
330 -encoding [get_path_encoding $path] \
332 fileevent $fd readable [list read_diff $fd $cont_info]
335 proc read_diff {fd cont_info} {
336 global ui_diff diff_active is_submodule_diff
337 global is_3way_diff is_conflict_diff current_diff_header
338 global current_diff_queue
339 global diff_empty_count
341 $ui_diff conf -state normal
342 while {[gets $fd line] >= 0} {
343 # -- Cleanup uninteresting diff header lines.
345 if {$::current_diff_inheader} {
346 if { [string match {diff --git *} $line]
347 || [string match {diff --cc *} $line]
348 || [string match {diff --combined *} $line]
349 || [string match {--- *} $line]
350 || [string match {+++ *} $line]} {
351 append current_diff_header $line "\n"
355 if {[string match {index *} $line]} continue
356 if {$line eq {deleted file mode 120000}} {
357 set line "deleted symlink"
359 set ::current_diff_inheader 0
361 # -- Automatically detect if this is a 3 way diff.
363 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
365 if {[string match {mode *} $line]
366 || [string match {new file *} $line]
367 || [regexp {^(old|new) mode *} $line]
368 || [string match {deleted file *} $line]
369 || [string match {deleted symlink} $line]
370 || [string match {Binary files * and * differ} $line]
371 || $line eq {\ No newline at end of file}
372 || [regexp {^\* Unmerged path } $line]} {
374 } elseif {$is_3way_diff} {
375 set op [string range $line 0 1]
385 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
386 set is_conflict_diff 1
387 set line [string replace $line 0 1 { }]
394 puts "error: Unhandled 3 way diff marker: {$op}"
398 } elseif {$is_submodule_diff} {
399 if {$line == ""} continue
400 if {[regexp {^Submodule } $line]} {
402 } elseif {[regexp {^\* } $line]} {
403 set line [string replace $line 0 1 {Submodule }]
406 set op [string range $line 0 2]
412 puts "error: Unhandled submodule diff marker: {$op}"
418 set op [string index $line 0]
424 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
425 set is_conflict_diff 1
432 puts "error: Unhandled 2 way diff marker: {$op}"
437 $ui_diff insert end $line $tags
438 if {[string index $line end] eq "\r"} {
439 $ui_diff tag add d_cr {end - 2c}
441 $ui_diff insert end "\n" $tags
443 $ui_diff conf -state disabled
448 if {$current_diff_queue ne {}} {
449 advance_diff_queue $cont_info
455 set scroll_pos [lindex $cont_info 0]
456 if {$scroll_pos ne {}} {
458 $ui_diff yview moveto $scroll_pos
462 if {[$ui_diff index end] eq {2.0}} {
465 set diff_empty_count 0
468 set callback [lindex $cont_info 1]
469 if {$callback ne {}} {
475 proc apply_hunk {x y} {
476 global current_diff_path current_diff_header current_diff_side
477 global ui_diff ui_index file_states
479 if {$current_diff_path eq {} || $current_diff_header eq {}} return
480 if {![lock_index apply_hunk]} return
482 set apply_cmd {apply --cached --whitespace=nowarn}
483 set mi [lindex $file_states($current_diff_path) 0]
484 if {$current_diff_side eq $ui_index} {
485 set failed_msg [mc "Failed to unstage selected hunk."]
486 lappend apply_cmd --reverse
487 if {[string index $mi 0] ne {M}} {
492 set failed_msg [mc "Failed to stage selected hunk."]
493 if {[string index $mi 1] ne {M}} {
499 set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
500 set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
506 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
512 set enc [get_path_encoding $current_diff_path]
513 set p [eval git_write $apply_cmd]
514 fconfigure $p -translation binary -encoding $enc
515 puts -nonewline $p $current_diff_header
516 puts -nonewline $p [$ui_diff get $s_lno $e_lno]
518 error_popup [append $failed_msg "\n\n$err"]
523 $ui_diff conf -state normal
524 $ui_diff delete $s_lno $e_lno
525 $ui_diff conf -state disabled
527 if {[$ui_diff get 1.0 end] eq "\n"} {
533 if {$current_diff_side eq $ui_index} {
535 } elseif {[string index $mi 0] eq {_}} {
541 display_file $current_diff_path $mi
542 # This should trigger shift to the next changed file
548 proc apply_range_or_line {x y} {
549 global current_diff_path current_diff_header current_diff_side
550 global ui_diff ui_index file_states
552 set selected [$ui_diff tag nextrange sel 0.0]
554 if {$selected == {}} {
555 set first [$ui_diff index "@$x,$y"]
558 set first [lindex $selected 0]
559 set last [lindex $selected 1]
562 set first_l [$ui_diff index "$first linestart"]
563 set last_l [$ui_diff index "$last lineend"]
565 if {$current_diff_path eq {} || $current_diff_header eq {}} return
566 if {![lock_index apply_hunk]} return
568 set apply_cmd {apply --cached --whitespace=nowarn}
569 set mi [lindex $file_states($current_diff_path) 0]
570 if {$current_diff_side eq $ui_index} {
571 set failed_msg [mc "Failed to unstage selected line."]
573 lappend apply_cmd --reverse
574 if {[string index $mi 0] ne {M}} {
579 set failed_msg [mc "Failed to stage selected line."]
581 if {[string index $mi 1] ne {M}} {
589 while {$first_l < $last_l} {
590 set i_l [$ui_diff search -backwards -regexp ^@@ $first_l 0.0]
592 # If there's not a @@ above, then the selected range
593 # must have come before the first_l @@
594 set i_l [$ui_diff search -regexp ^@@ $first_l $last_l]
600 # $i_l is now at the beginning of a line
602 # pick start line number from hunk header
603 set hh [$ui_diff get $i_l "$i_l + 1 lines"]
604 set hh [lindex [split $hh ,] 0]
605 set hln [lindex [split $hh -] 1]
607 # There is a special situation to take care of. Consider this
618 # We used to keep the context lines in the order they appear in
619 # the hunk. But then it is not possible to correctly stage only
620 # "-old 1" and "+new 1" - it would result in this staged text:
627 # (By symmetry it is not possible to *un*stage "old 2" and "new
630 # We resolve the problem by introducing an asymmetry, namely,
631 # when a "+" line is *staged*, it is moved in front of the
632 # context lines that are generated from the "-" lines that are
633 # immediately before the "+" block. That is, we construct this
643 # But we do *not* treat "-" lines that are *un*staged in a
646 # With this asymmetry it is possible to stage the change "old
647 # 1" -> "new 1" directly, and to stage the change "old 2" ->
648 # "new 2" by first staging the entire hunk and then unstaging
649 # the change "old 1" -> "new 1".
651 # Applying multiple lines adds complexity to the special
652 # situation. The pre_context must be moved after the entire
653 # first block of consecutive staged "+" lines, so that
654 # staging both additions gives the following patch:
664 # This is non-empty if and only if we are _staging_ changes;
665 # then it accumulates the consecutive "-" lines (after
666 # converting them to context lines) in order to be moved after
672 set i_l [$ui_diff index "$i_l + 1 lines"]
674 while {[$ui_diff compare $i_l < "end - 1 chars"] &&
675 [$ui_diff get $i_l "$i_l + 2 chars"] ne {@@}} {
676 set next_l [$ui_diff index "$i_l + 1 lines"]
677 set c1 [$ui_diff get $i_l]
678 if {[$ui_diff compare $first_l <= $i_l] &&
679 [$ui_diff compare $i_l < $last_l] &&
680 ($c1 eq {-} || $c1 eq {+})} {
681 # a line to stage/unstage
682 set ln [$ui_diff get $i_l $next_l]
685 set patch "$patch$pre_context$ln"
689 set patch "$patch$ln"
691 } elseif {$c1 ne {-} && $c1 ne {+}} {
693 set ln [$ui_diff get $i_l $next_l]
694 set patch "$patch$pre_context$ln"
698 } elseif {$c1 eq $to_context} {
699 # turn change line into context line
700 set ln [$ui_diff get "$i_l + 1 chars" $next_l]
702 set pre_context "$pre_context $ln"
704 set patch "$patch $ln"
709 # a change in the opposite direction of
710 # to_context which is outside the range of
712 set patch "$patch$pre_context"
717 set patch "$patch$pre_context"
718 set wholepatch "$wholepatch@@ -$hln,$n +$hln,$m @@\n$patch"
719 set first_l [$ui_diff index "$next_l + 1 lines"]
723 set enc [get_path_encoding $current_diff_path]
724 set p [eval git_write $apply_cmd]
725 fconfigure $p -translation binary -encoding $enc
726 puts -nonewline $p $current_diff_header
727 puts -nonewline $p $wholepatch
729 error_popup [append $failed_msg "\n\n$err"]