Add geef_commit:tree()

This commit is contained in:
Carlos Martín Nieto
2013-02-17 21:35:25 +01:00
parent 134c052f71
commit b2e366027b
6 changed files with 39 additions and 3 deletions

View File

@@ -22,3 +22,25 @@ geef_commit_tree_id(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
return enif_make_binary(env, &bin); return enif_make_binary(env, &bin);
} }
ERL_NIF_TERM
geef_commit_tree(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
geef_object *obj, *tree;
ERL_NIF_TERM term_obj;
if (!enif_get_resource(env, argv[0], geef_object_type, (void **) &obj))
return enif_make_badarg(env);
tree = enif_alloc_resource(geef_object_type, sizeof(geef_object));
if (git_commit_tree((git_tree **) &tree->obj, (git_commit *) obj->obj) < 0)
return geef_error(env);
term_obj = enif_make_resource(env, obj);
enif_release_resource(obj);
return enif_make_tuple3(env, atoms.ok, atoms.tree, term_obj);
}

View File

@@ -2,5 +2,6 @@
#define GEEF_COMMIT_H #define GEEF_COMMIT_H
ERL_NIF_TERM geef_commit_tree_id(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); ERL_NIF_TERM geef_commit_tree_id(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
ERL_NIF_TERM geef_commit_tree(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]);
#endif #endif

View File

@@ -98,6 +98,7 @@ static ErlNifFunc geef_funcs[] =
{"oid_fmt", 1, geef_oid_fmt}, {"oid_fmt", 1, geef_oid_fmt},
{"oid_parse", 1, geef_oid_parse}, {"oid_parse", 1, geef_oid_parse},
{"object_lookup", 2, geef_object_lookup}, {"object_lookup", 2, geef_object_lookup},
{"commit_tree", 1, geef_commit_tree},
{"commit_tree_id", 1, geef_commit_tree_id}, {"commit_tree_id", 1, geef_commit_tree_id},
}; };

View File

@@ -78,6 +78,10 @@ object_lookup(_Repo, _Oid) ->
commit_tree_id(_Handle) -> commit_tree_id(_Handle) ->
nif_error(?LINE). nif_error(?LINE).
-spec commit_tree(term) -> term().
commit_tree(_Handle) ->
nif_error(?LINE).
nif_error(Line) -> nif_error(Line) ->
erlang:nif_error({nif_not_loaded,module,?MODULE,line,Line}). erlang:nif_error({nif_not_loaded,module,?MODULE,line,Line}).

View File

@@ -1,5 +1,5 @@
-module(geef_commit). -module(geef_commit).
-export([tree_id/1]). -export([tree_id/1, tree/1]).
-include("geef_records.hrl"). -include("geef_records.hrl").
@@ -7,3 +7,11 @@
tree_id(#object{type=commit,handle=Handle}) -> tree_id(#object{type=commit,handle=Handle}) ->
Oid = geef:commit_tree_id(Handle), Oid = geef:commit_tree_id(Handle),
#oid{oid=Oid}. #oid{oid=Oid}.
tree(Obj = #object{type=commit,handle=Handle}) ->
case geef:commit_tree(Handle) of
{ok, Type, Handle} ->
{ok, #object{type=Type, handle=Handle}};
Other ->
Other
end.

View File

@@ -5,8 +5,8 @@
-export([lookup/2]). -export([lookup/2]).
-spec lookup(repo(), oid()) -> object(). -spec lookup(repo(), oid()) -> object().
lookup(#repo{handle=Repo}, #oid{oid=Oid}) -> lookup(Repo = #repo{handle=RepoHandle}, #oid{oid=Oid}) ->
case geef:object_lookup(Repo, Oid) of case geef:object_lookup(RepoHandle, Oid) of
{ok, Type, Handle} -> {ok, Type, Handle} ->
{ok, #object{type=Type, handle=Handle}}; {ok, #object{type=Type, handle=Handle}};
Other -> Other ->