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
}} 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
285 lappend cmd
--no-color
286 if {$repo_config(gui.diffcontext
) >= 1} {
287 lappend cmd
"-U$repo_config(gui.diffcontext)"
289 if {$w eq
$ui_index} {
292 if {$add_opts ne
{}} {
293 eval lappend cmd
$add_opts
299 if {[string match
{160000 *} [lindex $s 2]]
300 ||
[string match
{160000 *} [lindex $s 3]]} {
301 set is_submodule_diff
1
302 if {$w eq
$ui_index} {
303 set cmd
[list submodule summary
--cached -- $path]
305 set cmd
[list submodule summary
--files -- $path]
309 if {[catch {set fd
[eval git_read
--nice $cmd]} err
]} {
312 ui_status
[mc
"Unable to display %s" [escape_path
$path]]
313 error_popup
[strcat
[mc
"Error loading diff:"] "\n\n$err"]
317 set ::current_diff_inheader 1
320 -encoding [get_path_encoding
$path] \
322 fileevent $fd readable
[list read_diff
$fd $cont_info]
325 proc read_diff
{fd cont_info
} {
326 global ui_diff diff_active is_submodule_diff
327 global is_3way_diff is_conflict_diff current_diff_header
328 global current_diff_queue
329 global diff_empty_count
331 $ui_diff conf
-state normal
332 while {[gets $fd line
] >= 0} {
333 # -- Cleanup uninteresting diff header lines.
335 if {$::current_diff_inheader} {
336 if { [string match
{diff
--git *} $line]
337 ||
[string match
{diff
--cc *} $line]
338 ||
[string match
{diff
--combined *} $line]
339 ||
[string match
{--- *} $line]
340 ||
[string match
{+++ *} $line]} {
341 append current_diff_header
$line "\n"
345 if {[string match
{index
*} $line]} continue
346 if {$line eq
{deleted
file mode
120000}} {
347 set line
"deleted symlink"
349 set ::current_diff_inheader 0
351 # -- Automatically detect if this is a 3 way diff.
353 if {[string match
{@@@ *} $line]} {set is_3way_diff
1}
355 if {[string match
{mode
*} $line]
356 ||
[string match
{new
file *} $line]
357 ||
[regexp {^
(old|new
) mode
*} $line]
358 ||
[string match
{deleted
file *} $line]
359 ||
[string match
{deleted symlink
} $line]
360 ||
[string match
{Binary files
* and
* differ
} $line]
361 ||
$line eq
{\ No newline at end of
file}
362 ||
[regexp {^
\* Unmerged path
} $line]} {
364 } elseif
{$is_3way_diff} {
365 set op
[string range
$line 0 1]
375 if {[regexp {^
\+\+([<>]{7} |
={7})} $line _g op
]} {
376 set is_conflict_diff
1
377 set line
[string replace
$line 0 1 { }]
384 puts "error: Unhandled 3 way diff marker: {$op}"
388 } elseif
{$is_submodule_diff} {
389 if {$line == ""} continue
390 if {[regexp {^
\* } $line]} {
391 set line
[string replace
$line 0 1 {Submodule
}]
394 set op
[string range
$line 0 2]
400 puts "error: Unhandled submodule diff marker: {$op}"
406 set op
[string index
$line 0]
412 if {[regexp {^
\+([<>]{7} |
={7})} $line _g op
]} {
413 set is_conflict_diff
1
420 puts "error: Unhandled 2 way diff marker: {$op}"
425 $ui_diff insert end
$line $tags
426 if {[string index
$line end
] eq
"\r"} {
427 $ui_diff tag add d_cr
{end
- 2c
}
429 $ui_diff insert end
"\n" $tags
431 $ui_diff conf
-state disabled
436 if {$current_diff_queue ne
{}} {
437 advance_diff_queue
$cont_info
443 set scroll_pos
[lindex $cont_info 0]
444 if {$scroll_pos ne
{}} {
446 $ui_diff yview moveto
$scroll_pos
450 if {[$ui_diff index end
] eq
{2.0}} {
453 set diff_empty_count
0
456 set callback
[lindex $cont_info 1]
457 if {$callback ne
{}} {
463 proc apply_hunk
{x y
} {
464 global current_diff_path current_diff_header current_diff_side
465 global ui_diff ui_index file_states
467 if {$current_diff_path eq
{} ||
$current_diff_header eq
{}} return
468 if {![lock_index apply_hunk
]} return
470 set apply_cmd
{apply
--cached --whitespace=nowarn
}
471 set mi
[lindex $file_states($current_diff_path) 0]
472 if {$current_diff_side eq
$ui_index} {
473 set failed_msg
[mc
"Failed to unstage selected hunk."]
474 lappend apply_cmd
--reverse
475 if {[string index
$mi 0] ne
{M
}} {
480 set failed_msg
[mc
"Failed to stage selected hunk."]
481 if {[string index
$mi 1] ne
{M
}} {
487 set s_lno
[lindex [split [$ui_diff index
@$x,$y] .
] 0]
488 set s_lno
[$ui_diff search
-backwards -regexp ^
@@ $s_lno.0 0.0]
494 set e_lno
[$ui_diff search
-forwards -regexp ^
@@ "$s_lno + 1 lines" end
]
500 set enc
[get_path_encoding
$current_diff_path]
501 set p
[eval git_write
$apply_cmd]
502 fconfigure $p -translation binary -encoding $enc
503 puts -nonewline $p $current_diff_header
504 puts -nonewline $p [$ui_diff get
$s_lno $e_lno]
506 error_popup
[append $failed_msg "\n\n$err"]
511 $ui_diff conf
-state normal
512 $ui_diff delete
$s_lno $e_lno
513 $ui_diff conf
-state disabled
515 if {[$ui_diff get
1.0 end
] eq
"\n"} {
521 if {$current_diff_side eq
$ui_index} {
523 } elseif
{[string index
$mi 0] eq
{_
}} {
529 display_file
$current_diff_path $mi
530 # This should trigger shift to the next changed file
536 proc apply_line
{x y
} {
537 global current_diff_path current_diff_header current_diff_side
538 global ui_diff ui_index file_states
540 if {$current_diff_path eq
{} ||
$current_diff_header eq
{}} return
541 if {![lock_index apply_hunk
]} return
543 set apply_cmd
{apply
--cached --whitespace=nowarn
}
544 set mi
[lindex $file_states($current_diff_path) 0]
545 if {$current_diff_side eq
$ui_index} {
546 set failed_msg
[mc
"Failed to unstage selected line."]
548 lappend apply_cmd
--reverse
549 if {[string index
$mi 0] ne
{M
}} {
554 set failed_msg
[mc
"Failed to stage selected line."]
556 if {[string index
$mi 1] ne
{M
}} {
562 set the_l
[$ui_diff index
@$x,$y]
564 # operate only on change lines
565 set c1
[$ui_diff get
"$the_l linestart"]
566 if {$c1 ne
{+} && $c1 ne
{-}} {
572 set i_l
[$ui_diff search
-backwards -regexp ^
@@ $the_l 0.0]
577 # $i_l is now at the beginning of a line
579 # pick start line number from hunk header
580 set hh
[$ui_diff get
$i_l "$i_l + 1 lines"]
581 set hh
[lindex [split $hh ,] 0]
582 set hln
[lindex [split $hh -] 1]
584 # There is a special situation to take care of. Consider this hunk:
594 # We used to keep the context lines in the order they appear in the
595 # hunk. But then it is not possible to correctly stage only
596 # "-old 1" and "+new 1" - it would result in this staged text:
603 # (By symmetry it is not possible to *un*stage "old 2" and "new 2".)
605 # We resolve the problem by introducing an asymmetry, namely, when
606 # a "+" line is *staged*, it is moved in front of the context lines
607 # that are generated from the "-" lines that are immediately before
608 # the "+" block. That is, we construct this patch:
617 # But we do *not* treat "-" lines that are *un*staged in a special
620 # With this asymmetry it is possible to stage the change
621 # "old 1" -> "new 1" directly, and to stage the change
622 # "old 2" -> "new 2" by first staging the entire hunk and
623 # then unstaging the change "old 1" -> "new 1".
625 # This is non-empty if and only if we are _staging_ changes;
626 # then it accumulates the consecutive "-" lines (after converting
627 # them to context lines) in order to be moved after the "+" change
632 set i_l
[$ui_diff index
"$i_l + 1 lines"]
634 while {[$ui_diff compare
$i_l < "end - 1 chars"] &&
635 [$ui_diff get
$i_l "$i_l + 2 chars"] ne
{@@}} {
636 set next_l
[$ui_diff index
"$i_l + 1 lines"]
637 set c1
[$ui_diff get
$i_l]
638 if {[$ui_diff compare
$i_l <= $the_l] &&
639 [$ui_diff compare
$the_l < $next_l]} {
640 # the line to stage/unstage
641 set ln
[$ui_diff get
$i_l $next_l]
644 set patch
"$patch$pre_context$ln"
646 set patch
"$patch$ln$pre_context"
649 } elseif
{$c1 ne
{-} && $c1 ne
{+}} {
651 set ln
[$ui_diff get
$i_l $next_l]
652 set patch
"$patch$pre_context$ln"
655 } elseif
{$c1 eq
$to_context} {
656 # turn change line into context line
657 set ln
[$ui_diff get
"$i_l + 1 chars" $next_l]
659 set pre_context
"$pre_context $ln"
661 set patch
"$patch $ln"
667 set patch
"@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
670 set enc
[get_path_encoding
$current_diff_path]
671 set p
[eval git_write
$apply_cmd]
672 fconfigure $p -translation binary -encoding $enc
673 puts -nonewline $p $current_diff_header
674 puts -nonewline $p $patch
676 error_popup
[append $failed_msg "\n\n$err"]