author | Paul Mackerras <paulus@samba.org> | |
Mon, 7 Sep 2009 00:08:21 +0000 (10:08 +1000) | ||
committer | Paul Mackerras <paulus@samba.org> | |
Thu, 10 Sep 2009 11:46:28 +0000 (21:46 +1000) | ||
commit | c21398be6d7b112fa3a041b4b7d869d9954bf753 | |
tree | 50566a9ec58e39b9562a4946cc8a8d9ce66aa95f | tree | snapshot |
parent | b53bb301f5781b05fb59891128db21a331dca032 | commit | diff |
gitk: Show diff of commits at end of compare-commits output
When comparing a string of commits, when we find two non-merge commits
that differ, we now write the two commits to files and diff the files.
This pulls out the logic for creating a temporary directory from
external_diff into a separate procedure so that the new diffcommits
procedure can use it.
Because the diff command returns an exit status of 1 when the files
differ, and Tcl treats that as an error, this adds catch {} around the
close statements in getblobdiffline.
At present this only removes the temporary files when gitk exits. It
should remove them when the diff is done.
Signed-off-by: Paul Mackerras <paulus@samba.org>
When comparing a string of commits, when we find two non-merge commits
that differ, we now write the two commits to files and diff the files.
This pulls out the logic for creating a temporary directory from
external_diff into a separate procedure so that the new diffcommits
procedure can use it.
Because the diff command returns an exit status of 1 when the files
differ, and Tcl treats that as an error, this adds catch {} around the
close statements in getblobdiffline.
At present this only removes the temporary files when gitk exits. It
should remove them when the diff is done.
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk | diff | blob | history |