aboutsummaryrefslogtreecommitdiffstats
path: root/libbe/storage/vcs/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'libbe/storage/vcs/base.py')
-rw-r--r--libbe/storage/vcs/base.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index 15460b0..9fc43c1 100644
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -749,7 +749,8 @@ os.listdir(self.get_path("bugs")):
if revision == None:
id_to_path = self._cached_path_id.path
else:
- id_to_path = lambda id : self._vcs_path(id, revision)
+ id_to_path = lambda id : os.path.join(
+ self.repo, self._vcs_path(id, revision))
if id==None:
path = self.be_dir
else:
@@ -772,9 +773,12 @@ os.listdir(self.get_path("bugs")):
isdir = os.path.isdir
listdir = os.listdir
else:
- id_to_path = lambda id : self._vcs_path(id, revision)
- isdir = lambda path : self._vcs_isdir(path, revision)
- listdir = lambda path : self._vcs_listdir(path, revision)
+ id_to_path = lambda id : os.path.join(
+ self.repo, self._vcs_path(id, revision))
+ isdir = lambda path : self._vcs_isdir(
+ self._u_rel_path(path), revision)
+ listdir = lambda path : self._vcs_listdir(
+ self._u_rel_path(path), revision)
if id==None:
path = self.be_dir
else:
@@ -1046,7 +1050,8 @@ os.listdir(self.get_path("bugs")):
if revision == None: # don't require connection
return libbe.util.encoding.get_file_contents(
path, decode=True).rstrip('\n')
- contents = self._vcs_get_file_contents(path, revision=revision)
+ relpath = self._u_rel_path(path)
+ contents = self._vcs_get_file_contents(relpath, revision=revision)
if type(contents) != types.UnicodeType:
contents = unicode(contents, self.encoding)
return contents.strip()