cat-file: add %(objectsize:disk) format atom

This atom is just like %(objectsize), except that it shows
the on-disk size of the object rather than the object's true
size. In other words, it makes the "disk_size" query of
sha1_object_info_extended available via the command-line.

This can be used for rough attribution of disk usage to
particular refs, though see the caveats in the
documentation.

This patch does not include any tests, as the exact numbers
returned are volatile and subject to zlib and packing
decisions. We cannot even reliably guarantee that the
on-disk size is smaller than the object content (though in
general this should be the case for non-trivial objects).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 7c57eca9b08a73074430c5cb249fd95393d36557..10fbc6a373758437f23ef80245b3bd9e164add1f 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -106,6 +106,10 @@ newline. The available atoms are:
        The size, in bytes, of the object (the same as `cat-file -s`
        reports).
 
        The size, in bytes, of the object (the same as `cat-file -s`
        reports).
 

+`objectsize:disk`::
+       The size, in bytes, that the object takes up on disk. See the
+       note about on-disk sizes in the `CAVEATS` section below.
+

 If no format is specified, the default format is `%(objectname)
 %(objecttype) %(objectsize)`.
 
 If no format is specified, the default format is `%(objectname)
 %(objecttype) %(objectsize)`.
 


@@ -133,6 +137,20 @@ the repository, then `cat-file` will ignore any custom format and print:
 <object> SP missing LF
 ------------
 
 <object> SP missing LF
 ------------
 

+
+CAVEATS
+-------
+
+Note that the sizes of objects on disk are reported accurately, but care
+should be taken in drawing conclusions about which refs or objects are
+responsible for disk usage. The size of a packed non-delta object may be
+much larger than the size of objects which delta against it, but the
+choice of which object is the base and which is the delta is arbitrary
+and is subject to change during a repack. Note also that multiple copies
+of an object may be present in the object database; in this case, it is
+undefined which copy's size will be reported.
+
+

 GIT
 ---
 Part of the linkgit:git[1] suite
 GIT
 ---
 Part of the linkgit:git[1] suite

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index b43a0c50403403b5dcf6b415dea092ee64b66558..11fa8c08bc149df3504d67b270ea7deb44dbdc5e 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -118,6 +118,7 @@ struct expand_data {
        unsigned char sha1[20];
        enum object_type type;
        unsigned long size;
        unsigned char sha1[20];
        enum object_type type;
        unsigned long size;

+       unsigned long disk_size;

 
        /*
         * If mark_query is true, we do not expand anything, but rather
 
        /*
         * If mark_query is true, we do not expand anything, but rather


@@ -155,6 +156,11 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len,
                        data->info.sizep = &data->size;
                else
                        strbuf_addf(sb, "%lu", data->size);
                        data->info.sizep = &data->size;
                else
                        strbuf_addf(sb, "%lu", data->size);

+       } else if (is_atom("objectsize:disk", atom, len)) {
+               if (data->mark_query)
+                       data->info.disk_sizep = &data->disk_size;
+               else
+                       strbuf_addf(sb, "%lu", data->disk_size);

        } else
                die("unknown format element: %.*s", len, atom);
 }
        } else
                die("unknown format element: %.*s", len, atom);
 }