diff options
Diffstat (limited to 'lib/gall/object.lua')
| -rw-r--r-- | lib/gall/object.lua | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/lib/gall/object.lua b/lib/gall/object.lua index 2772587..bedc6f1 100644 --- a/lib/gall/object.lua +++ b/lib/gall/object.lua @@ -12,6 +12,7 @@ local tree = require "gall.tree" local tag = require "gall.tag" local repos = setmetatable({}, {__mode="k"}) +local blobs = setmetatable({}, {__mode="k"}) local known_types = { blob = true, commit = true, tree = true, tag = true, @@ -19,12 +20,25 @@ local known_types = { local function _objectindex(obj, field) local ok, ret + local blob = blobs[obj] if field == "type" then - ok, ret = repos[obj]:gather("cat-file", "-t", obj.sha) + if blob then + ok, ret = 0, blob:type() + else + ok, ret = repos[obj]:gather("cat-file", "-t", obj.sha) + end elseif field == "size" then - ok, ret = repos[obj]:gather("cat-file", "-s", obj.sha) + if blob then + ok, ret = 0, blob:size() + else + ok, ret = repos[obj]:gather("cat-file", "-s", obj.sha) + end elseif field == "raw" then - ok, ret = repos[obj]:rawgather("cat-file", (obj.type == "tag" and "tag" or "-p"), obj.sha) + if blob and obj.type ~= "tree" then + ok, ret = 0, blob:data() + else + ok, ret = repos[obj]:rawgather("cat-file", (obj.type == "tag" and "tag" or "-p"), obj.sha) + end elseif field == "content" then assert(known_types[obj.type], "Unknown type: " .. obj.type) if obj.type == "blob" then @@ -61,6 +75,10 @@ local objectmeta = { local function _new(repo, sha) local ret = setmetatable({sha=sha}, objectmeta) repos[ret] = repo + if ll.git2 then + local oid = ll.git2.OID.hex(sha) + blobs[ret] = repo.git2.odb:read(oid) + end return ret end |