summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorAndy Parkins <andyparkins@gmail.com>2007-04-04 13:14:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-05 22:07:16 (GMT)
commitb18825876ae60e67e646097945c8365779175ee2 (patch)
tree2bcd7842e755a2c8e7783bf176ec3239884c3789 /diff.c
parent566842f62bdf1f16c2e94fb431445d2e6c0f3f0b (diff)
downloadgit-b18825876ae60e67e646097945c8365779175ee2.zip
git-b18825876ae60e67e646097945c8365779175ee2.tar.gz
git-b18825876ae60e67e646097945c8365779175ee2.tar.bz2
Show binary file size change in diff --stat
Previously, a binary file in the diffstat would show as: some-binary-file.bin | Bin The space after the "Bin" was never used. This patch changes binary lines in the diffstat to be: some-binary-file.bin | Bin 12345 -> 123456 bytes The very nice "->" notation was suggested by Johannes Schindelin, and shows the before and after sizes more clearly than "+" and "-" would. If a size is 0 it's not shown (although it would probably be better to treat no-file differently from zero-byte-file). The user can see what changed in the binary file, and how big the new file is. This is in keeping with the information in the rest of the diffstat. The diffstat_t members "added" and "deleted" were unused when the file was binary, so this patch loads them with the file sizes in builtin_diffstat(). These figures are then read in show_stats() when the file is marked binary. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index d8f9242..fbb79d7 100644
--- a/diff.c
+++ b/diff.c
@@ -811,7 +811,12 @@ static void show_stats(struct diffstat_t* data, struct diff_options *options)
if (data->files[i]->is_binary) {
show_name(prefix, name, len, reset, set);
- printf(" Bin\n");
+ printf(" Bin ");
+ printf("%s%d%s", del_c, deleted, reset);
+ printf(" -> ");
+ printf("%s%d%s", add_c, added, reset);
+ printf(" bytes");
+ printf("\n");
goto free_diffstat_file;
}
else if (data->files[i]->is_unmerged) {
@@ -1185,9 +1190,11 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
die("unable to read files to diff");
- if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2))
+ if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2)) {
data->is_binary = 1;
- else {
+ data->added = mf2.size;
+ data->deleted = mf1.size;
+ } else {
/* Crazy xdl interfaces.. */
xpparam_t xpp;
xdemitconf_t xecfg;