summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-12-03 14:05:48 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-12-03 14:05:48 +0000
commita1232696c7e57d98cb1bc3b093cde6f8c4eff5e6 (patch)
treefe6eb287d5941ab7573fb1be30c0cf8de5c7fb41
parentf7b8001175f492b41d68269ff5294fde347f8f4d (diff)
downloadmorph-a1232696c7e57d98cb1bc3b093cde6f8c4eff5e6.tar.gz
Fix missing argument to rev_list(), breaking resolve_ref for SHA1s
This bug has been present since the initial commit to the cache server. Due to the missing repo_dir argument to rev_list(), resolving SHA1s rather than symbolic refs via /1.0/sha1s fails. This feature, however, is absolutely required for morph to resolve petrified system branches.
-rw-r--r--morphcacheserver/repocache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphcacheserver/repocache.py b/morphcacheserver/repocache.py
index b7d46c35..9675e04e 100644
--- a/morphcacheserver/repocache.py
+++ b/morphcacheserver/repocache.py
@@ -72,7 +72,7 @@ class RepoCache(object):
if not self._is_valid_sha1(ref):
raise InvalidReferenceError(repo_url, ref)
try:
- sha = self._rev_list(ref).strip()
+ sha = self._rev_list(repo_dir, ref).strip()
return sha, self._tree_from_commit(repo_dir, sha)
except:
raise InvalidReferenceError(repo_url, ref)