libbe.storage.vcs.base.VCS._init() now creates the '.be/version' file.

And
  python test.py libbe.storage.vcs.base
passes again.

2 files changed, 34 insertions, 17 deletions

diff --git a/libbe/storage/base.py b/libbe/storage/base.py
index b43f765..9da60ad 100644
--- a/libbe/storage/base.py
+++ b/libbe/storage/base.py
@@ -272,10 +272,11 @@ class Storage (object):
         else:
             decode = False
         value = self._get(*args, **kwargs)
-        if decode == True and type(value) != types.UnicodeType:
-            return unicode(value, self.encoding)
-        if decode == False and type(value) != types.StringType:
-            return value.encode(self.encoding)
+        if value != None:
+            if decode == True and type(value) != types.UnicodeType:
+                return unicode(value, self.encoding)
+            elif decode == False and type(value) != types.StringType:
+                return value.encode(self.encoding)
         return value
 
     def _get(self, id, default=InvalidObject, revision=None):
diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index e96b466..cfb39a1 100644
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -38,7 +38,7 @@ import libbe
 import libbe.storage
 import libbe.storage.base
 import libbe.util.encoding
-from libbe.storage.base import EmptyCommit, InvalidRevision
+from libbe.storage.base import EmptyCommit, InvalidRevision, InvalidID
 from libbe.util.utility import Dir, search_parent_directories
 from libbe.util.subproc import CommandError, invoke
 from libbe.util.plugin import import_by_name
@@ -97,11 +97,11 @@ class VCSUnableToRoot (libbe.storage.base.ConnectionError):
         libbe.storage.base.ConnectionError.__init__(self, msg)
         self.vcs = vcs
 
-class InvalidPath (libbe.storage.base.InvalidID):
+class InvalidPath (InvalidID):
     def __init__(self, path, root, msg=None):
         if msg == None:
             msg = 'Path "%s" not in root "%s"' % (path, root)
-        libbe.storage.base.InvalidID.__init__(self, msg)
+        InvalidID.__init__(self, msg)
         self.path = path
         self.root = root
 
@@ -111,10 +111,10 @@ class SpacerCollision (InvalidPath):
         InvalidPath.__init__(self, path, root=None, msg=msg)
         self.spacer = spacer
 
-class NoSuchFile (libbe.storage.base.InvalidID):
+class NoSuchFile (InvalidID):
     def __init__(self, pathname, root='.'):
         path = os.path.abspath(os.path.join(root, pathname))
-        libbe.storage.base.InvalidID.__init__(self, 'No such file: %s' % path)
+        InvalidID.__init__(self, 'No such file: %s' % path)
 
 
 class CachedPathID (object):
@@ -198,7 +198,6 @@ class CachedPathID (object):
                 relpath = dirpath[len(self._root)+1:]
                 if id.count('/') == 0:
                     if id in self._cache:
-                        import sys
                         print >> sys.stderr, 'Multiple paths for %s: \n  %s\n  %s' % (id, self._cache[id], relpath)
                     self._cache[id] = relpath
             except InvalidPath:
@@ -240,7 +239,7 @@ class CachedPathID (object):
         else:
             extra = fields[1:]
         if uuid not in self._cache:
-            raise libbe.storage.base.InvalidID(uuid)
+            raise InvalidID(uuid)
         if relpath == True:
             return os.path.join(self._cache[uuid], *extra)
         return os.path.join(self._root, self._cache[uuid], *extra)
@@ -640,6 +639,7 @@ os.listdir(self.get_path("bugs")):
             self.root()
         os.mkdir(self.be_dir)
         self._vcs_add(self._u_rel_path(self.be_dir))
+        self._setup_storage_version()
         self._cached_path_id.init()
 
     def _destroy(self):
@@ -723,7 +723,7 @@ os.listdir(self.get_path("bugs")):
                 children[i] = None
                 children.extend([os.path.join(c, c2) for c2 in
                                  os.listdir(os.path.join(path, c))])
-            elif c == 'id-cache':
+            elif c in ['id-cache', 'version']:
                 children[i] = None
         for i,c in enumerate(children):
             if c == None: continue
@@ -738,15 +738,18 @@ os.listdir(self.get_path("bugs")):
     def _get(self, id, default=libbe.util.InvalidObject, revision=None):
         try:
             path = self._cached_path_id.path(id)
-        except libbe.storage.base.InvalidID, e:
+        except InvalidID, e:
             if default == libbe.util.InvalidObject:
                 raise e
             return default
         relpath = self._u_rel_path(path)
-        contents = self._vcs_get_file_contents(relpath,revision)
+        try:
+            contents = self._vcs_get_file_contents(relpath,revision)
+        except InvalidID, e:
+            raise InvalidID(id)
         if contents in [libbe.storage.base.InvalidDirectory,
                         libbe.util.InvalidObject]:
-            raise libbe.storage.base.InvalidID(id)
+            raise InvalidID(id)
         elif len(contents) == 0:
             return None
         return contents
@@ -754,10 +757,10 @@ os.listdir(self.get_path("bugs")):
     def _set(self, id, value):
         try:
             path = self._cached_path_id.path(id)
-        except libbe.storage.base.InvalidID, e:
+        except InvalidID, e:
             raise e
         if not os.path.exists(path):
-            raise libbe.storage.base.InvalidID(id)
+            raise InvalidID(id)
         if os.path.isdir(path):
             raise libbe.storage.base.InvalidDirectory(id)
         f = open(path, "wb")
@@ -892,6 +895,8 @@ os.listdir(self.get_path("bugs")):
         """
         if path == None:
             path = os.path.join(self.repo, '.be', 'version')
+        if not os.path.exists(path):
+            raise libbe.storage.InvalidStorageVersion(None)
         if revision == None: # don't require connection
             return libbe.util.encoding.get_file_contents(
                 path, decode=True).rstrip('\n')
@@ -900,6 +905,17 @@ os.listdir(self.get_path("bugs")):
             contents = unicode(contents, self.encoding)
         return contents.strip()
 
+    def _setup_storage_version(self):
+        """
+        Requires disk access.
+        """
+        assert self._rooted == True
+        path = os.path.join(self.be_dir, 'version')
+        if not os.path.exists(path):
+            libbe.util.encoding.set_file_contents(path,
+                libbe.storage.STORAGE_VERSION+'\n')
+            self._vcs_add(self._u_rel_path(path))
+
 
 if libbe.TESTING == True:
     class VCSTestCase (unittest.TestCase):