aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libbe/storage/vcs/base.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index e9995b0..1bd4e4c 100644
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -356,7 +356,6 @@ class VCS (libbe.storage.base.VersionedStorage):
kwargs['encoding'] = libbe.util.encoding.get_text_file_encoding()
libbe.storage.base.VersionedStorage.__init__(self, *args, **kwargs)
self.versioned = False
- self.interspersed_vcs_files = False
self._cached_path_id = CachedPathID()
self._rooted = False
@@ -435,11 +434,7 @@ class VCS (libbe.storage.base.VersionedStorage):
Return true if a path is under version control, False
otherwise. You only need to set this if the VCS goes about
dumping VCS-specific files into the .be directory.
-
- If you do need to implement this method, set
- self.interspersed_vcs_files = True
"""
- assert self.interspersed_vcs_files == False
raise NotImplementedError
def _vcs_get_file_contents(self, path, revision=None):
@@ -825,18 +820,11 @@ class VCS (libbe.storage.base.VersionedStorage):
listdir(os.path.join(path, c))])
elif c in ['id-cache', 'version']:
children[i] = None
- elif self.interspersed_vcs_files \
- and self._vcs_is_versioned(c) == False:
children[i] = None
for i,c in enumerate(children):
if c == None: continue
cpath = os.path.join(path, c)
- if self.interspersed_vcs_files == True \
- and revision != None \
- and self._vcs_is_versioned(cpath) == False:
- children[i] = None
- else:
- children[i] = self._u_path_to_id(cpath)
+ children[i] = self._u_path_to_id(cpath)
return [c for c in children if c != None]
def _get(self, id, default=libbe.util.InvalidObject, revision=None):