From 3adfa507c0b56922e593e0620c6b8cb6c15a8d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 21 Apr 2013 17:14:36 +0200 Subject: [PATCH] Fix geef_ref:lookup/2 Make use of the repo server intead of accepting a handle --- src/geef_ref.erl | 6 +++--- src/geef_repo.erl | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/geef_ref.erl b/src/geef_ref.erl index 9af77ea..48bf149 100644 --- a/src/geef_ref.erl +++ b/src/geef_ref.erl @@ -9,9 +9,9 @@ new(Handle) -> Type = geef:reference_type(Handle), #ref{handle=Handle, type=Type}. --spec lookup(repo(), iolist()) -> {ok, ref()} | {error, term()}. -lookup(#repo{handle=Handle}, Refname) -> - case geef:reference_lookup(Handle, Refname) of +-spec lookup(pid(), iolist()) -> {ok, ref()} | {error, term()}. +lookup(Repo, Refname) -> + case geef_repo:lookup_reference(Repo, Refname) of {ok, Ref} -> {ok, new(Ref)}; Other -> diff --git a/src/geef_repo.erl b/src/geef_repo.erl index d3d8ff6..cba988d 100644 --- a/src/geef_repo.erl +++ b/src/geef_repo.erl @@ -16,7 +16,7 @@ %% API -export([open/1, init/2, path/1, workdir/1, odb/1, is_bare/1, references/1, discover/1, - lookup_object/2, revwalk/1, stop/1]). + lookup_object/2, lookup_reference/2, revwalk/1, stop/1]). -include("geef_records.hrl"). -record(state, {handle}). @@ -81,6 +81,10 @@ references(Pid) -> lookup_object(Pid, Oid) -> gen_server:call(Pid, {lookup_object, Oid}). +%% @private +lookup_reference(Pid, Name) -> + gen_server:call(Pid, {lookup_reference, Name}). + %% @doc Create a revision walker for the given repository. revwalk(Pid) -> gen_server:call(Pid, revwalk). @@ -115,6 +119,9 @@ handle_call(refs, _From, State = #state{handle=Handle}) -> handle_call({lookup_object, Oid}, _From, State = #state{handle=Handle}) -> Reply = geef:object_lookup(Handle, Oid), {reply, Reply, State}; +handle_call({lookup_reference, Name}, _From, State = #state{handle=Handle}) -> + Reply = geef:reference_lookup(Handle, Name), + {reply, Reply, State}; handle_call(stop, _From, State) -> {stop, normal, ok, State}; handle_call(revwalk, _From, State = #state{handle=Handle}) ->