@matheusbsbs / matheus-bagliano / commits / b18825876a
Fork 0

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>

Andy Parkins committed Apr 4, 2007 at 13:14 UTC b18825876ae60e67e646097945c8365779175ee2
1 file changed +10 -3
diff.c
+10 -3
@@ -811,7 +811,12 @@ static void show_stats(struct diffstat_t* data, struct diff_options *options)
811
812 if (data->files[i]->is_binary) {
813 show_name(prefix, name, len, reset, set);
814 - printf(" Bin\n");
814 + printf(" Bin ");
815 + printf("%s%d%s", del_c, deleted, reset);
816 + printf(" -> ");
817 + printf("%s%d%s", add_c, added, reset);
818 + printf(" bytes");
819 + printf("\n");
820 goto free_diffstat_file;
821 }
822 else if (data->files[i]->is_unmerged) {
@@ -1185,9 +1190,11 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
1190 if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
1191 die("unable to read files to diff");
1192
1188 - if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2))
1193 + if (mmfile_is_binary(&mf1) || mmfile_is_binary(&mf2)) {
1194 data->is_binary = 1;
1190 - else {
1195 + data->added = mf2.size;
1196 + data->deleted = mf1.size;
1197 + } else {
1198 /* Crazy xdl interfaces.. */
1199 xpparam_t xpp;
1200 xdemitconf_t xecfg;