diff options
Diffstat (limited to 'libbe/storage/vcs/base.py')
| -rw-r--r-- | libbe/storage/vcs/base.py | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py index 671df43..687575f 100644 --- a/libbe/storage/vcs/base.py +++ b/libbe/storage/vcs/base.py @@ -50,7 +50,7 @@ if libbe.TESTING == True: import libbe.ui.util.user -VCS_ORDER = ['arch', 'bzr', 'darcs', 'git', 'hg', 'monotone'] +VCS_ORDER = ['bzr', 'darcs', 'git', 'hg', 'monotone'] """List VCS modules in order of preference. Don't list this module, it is implicitly last. @@ -129,11 +129,6 @@ class SpacerCollision (InvalidPath): InvalidPath.__init__(self, path, root=None, msg=msg) self.spacer = spacer -class NoSuchFile (InvalidID): - def __init__(self, pathname, root='.'): - path = os.path.abspath(os.path.join(root, pathname)) - InvalidID.__init__(self, 'No such file: %s' % path) - class CachedPathID (object): """Cache Storage ID <-> path policy. @@ -356,7 +351,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 @@ -430,18 +424,6 @@ class VCS (libbe.storage.base.VersionedStorage): """ pass - def _vcs_is_versioned(self, path): - """ - 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 (e.g. Arch), set - self.interspersed_vcs_files = True - """ - assert self.interspersed_vcs_files == False - raise NotImplementedError - def _vcs_get_file_contents(self, path, revision=None): """ Get the file contents as they were in a given revision. @@ -825,18 +807,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): |