Get rid of the tagged OID
This means we no longer accept any iolist in some of the functions, but we might bring it back later. There is also a new function, geef_ref:create_symbolic() to create symbolic references, since we can no longer differentiate between a name and an OID.
This commit is contained in:
@@ -14,18 +14,16 @@
|
||||
-export([lookup/2, lookup/3]).
|
||||
|
||||
-spec lookup(pid(), geef_oid:oid() | iolist()) -> {ok, object()} | {error, term()}.
|
||||
lookup(Repo, Id = #geef_oid{oid=Oid}) ->
|
||||
case geef_repo:lookup_object(Repo, Oid) of
|
||||
lookup(Repo, Id) ->
|
||||
case geef_repo:lookup_object(Repo, Id) of
|
||||
{ok, Type, Handle} ->
|
||||
{ok, #geef_object{type=Type, id=Id, handle=Handle}};
|
||||
{error, Err} ->
|
||||
{error, Err}
|
||||
end;
|
||||
lookup(Repo, Id) ->
|
||||
lookup(Repo, geef_oid:parse(Id)).
|
||||
end.
|
||||
|
||||
%% As lookup/2, but it asserts that the type is correct
|
||||
-spec lookup(pid(), geef_oid:oid() | iolist(), atom()) -> {ok, object()} | {error, term()}.
|
||||
-spec lookup(pid(), geef_oid:oid(), atom()) -> {ok, object()} | {error, term()}.
|
||||
lookup(Repo, Id, Type) ->
|
||||
case lookup(Repo, Id) of
|
||||
{ok, Obj = #geef_object{type=Type}} ->
|
||||
@@ -38,16 +36,13 @@ lookup(Repo, Id, Type) ->
|
||||
|
||||
lookup_test() ->
|
||||
{ok, Repo} = geef_repo:open(".."),
|
||||
{ok, #geef_object{type=commit}} = lookup(Repo, geef_oid:parse("b5b68cce8b92ca0e7bd48430617ac10c0f2c2923")),
|
||||
{ok, #geef_object{type=commit}} = lookup(Repo, "b5b68cce8b92ca0e7bd48430617ac10c0f2c2923"),
|
||||
{ok, #geef_object{type=commit}} = lookup(Repo, ["b5b68cce8b92ca0e7", "bd48430617ac10c0f2c2923"]),
|
||||
{ok, #geef_object{type=commit}} = lookup(Repo, <<"b5b68cce8b92ca0e7bd48430617ac10c0f2c2923">>).
|
||||
{ok, #geef_object{type=commit}} = lookup(Repo, geef_oid:parse("b5b68cce8b92ca0e7bd48430617ac10c0f2c2923")).
|
||||
|
||||
id_test() ->
|
||||
{ok, Repo} = geef_repo:open(".."),
|
||||
Sha = <<"b5b68cce8b92ca0e7bd48430617ac10c0f2c2923">>,
|
||||
Id = geef_oid:parse(Sha),
|
||||
{ok, Commit = #geef_object{type=commit}} = lookup(Repo, Sha),
|
||||
{ok, Commit = #geef_object{type=commit}} = lookup(Repo, Id),
|
||||
Id = Commit#geef_object.id.
|
||||
|
||||
-endif.
|
||||
|
||||
Reference in New Issue
Block a user