Fixed VCS.children() and Bzr.children() for non-None revisions.

Now they both pass
  VersionedStorage_commit_TestCase.test_commit_revision_ids()

The .children() implementation for previous revisions lacks the
working directory's id<->path cache, so it's fairly slow...

diff --git a/libbe/storage/base.py b/libbe/storage/base.py
index 9807d862b73ef6aa20da6e63aec3933911a6e56e..d16c30bc2c951b91e560f79bff65892ff92db55b 100644 (file)
--- a/libbe/storage/base.py
+++ b/libbe/storage/base.py
@@ -37,7 +37,12 @@ class InvalidStorageVersion(ConnectionError):
         self.expected_version = expected_version
 
 class InvalidID (KeyError):
-    pass
+    def __init__(self, id=None, revision=None, msg=None):
+        if msg == None and id != None:
+            msg = id
+        KeyError.__init__(self, msg)
+        self.id = id
+        self.revision = revision
 
 class InvalidRevision (KeyError):
     pass

diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index cfb39a18cb929fef59ce15a430b871d327c39a75..3b6601963166d9b47b614b62955efa572f6e8e62 100644 (file)
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -98,10 +98,10 @@ class VCSUnableToRoot (libbe.storage.base.ConnectionError):
         self.vcs = vcs
 
 class InvalidPath (InvalidID):
-    def __init__(self, path, root, msg=None):
+    def __init__(self, path, root, msg=None, **kwargs):
         if msg == None:
             msg = 'Path "%s" not in root "%s"' % (path, root)
-        InvalidID.__init__(self, msg)
+        InvalidID.__init__(self, msg=msg, **kwargs)
         self.path = path
         self.root = root
 
@@ -277,9 +277,9 @@ class CachedPathID (object):
         self._changed = True
 
     def id(self, path):
-        path = os.path.abspath(path)
+        path = os.path.join(self._root, path)
         if not path.startswith(self._root + os.path.sep):
-            raise InvalidPath('Path %s not in root %s' % (path, self._root))
+            raise InvalidPath(path, self._root)
         path = path[len(self._root)+1:]
         orig_path = path
         if not path.startswith(self._spacer_dirs[0] + os.path.sep):
@@ -548,6 +548,33 @@ os.listdir(self.get_path("bugs")):
         f.close()
         return contents
 
+    def _vcs_path(self, id, revision):
+        """
+        Return the path to object id as of revision.
+        
+        Revision will not be None.
+        """
+        raise NotImplementedError
+
+    def _vcs_isdir(self, path, revision):
+        """
+        Return True if path (as returned by _vcs_path) was a directory
+        as of revision, False otherwise.
+        
+        Revision will not be None.
+        """
+        raise NotImplementedError
+
+    def _vcs_listdir(self, path, revision):
+        """
+        Return a list of the contents of the directory path (as
+        returned by _vcs_path) as of revision.
+        
+        Revision will not be None, and ._vcs_isdir(path, revision)
+        will be True.
+        """
+        raise NotImplementedError
+
     def _vcs_commit(self, commitfile, allow_empty=False):
         """
         Commit the current working directory, using the contents of
@@ -711,28 +738,40 @@ os.listdir(self.get_path("bugs")):
                 self._cached_path_id.remove_id(id)
 
     def _children(self, id=None, revision=None):
+        if revision == None:
+            id_to_path = self._cached_path_id.path
+            path_to_id = self._cached_path_id.id
+            isdir = os.path.isdir
+            listdir = os.listdir
+        else:
+            id_to_path = lambda id : self._vcs_path(id, revision)
+            path_to_id = self._cached_path_id.id
+            isdir = lambda path : self._vcs_isdir(path, revision)
+            listdir = lambda path : self._vcs_listdir(path, revision)
         if id==None:
             path = self.be_dir
         else:
-            path = self._cached_path_id.path(id)
-        if os.path.isdir(path) == False:
+            path = id_to_path(id)
+        if isdir(path) == False: 
             return []
-        children = os.listdir(path)
+        children = listdir(path)
         for i,c in enumerate(children):
             if c in self._cached_path_id._spacer_dirs:
                 children[i] = None
                 children.extend([os.path.join(c, c2) for c2 in
-                                 os.listdir(os.path.join(path, c))])
+                                 listdir(os.path.join(path, c))])
             elif c in ['id-cache', 'version']:
                 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._cached_path_id.id(cpath)
+                children[i] = path_to_id(cpath)
+                children[i]
         return [c for c in children if c != None]
 
     def _get(self, id, default=libbe.util.InvalidObject, revision=None):
@@ -746,7 +785,7 @@ os.listdir(self.get_path("bugs")):
         try:
             contents = self._vcs_get_file_contents(relpath,revision)
         except InvalidID, e:
-            raise InvalidID(id)
+            raise InvalidPath(path=path, root=self.repo, id=id)
         if contents in [libbe.storage.base.InvalidDirectory,
                         libbe.util.InvalidObject]:
             raise InvalidID(id)
@@ -837,6 +876,25 @@ os.listdir(self.get_path("bugs")):
         """
         return search_parent_directories(path, filename)
 
+    def _u_find_id(self, id, revision):
+        """
+        Search for the relative path to id as of revision.
+        Returns None if the id is not found.
+        """
+        assert self._rooted == True
+        be_dir = self._cached_path_id._spacer_dirs[0]
+        stack = [(be_dir, be_dir)]
+        while len(stack) > 0:
+            path,long_id = stack.pop()
+            if long_id.endswith('/'+id):
+                return path
+            if self._vcs_isdir(path, revision) == False:
+                continue
+            for child in self._vcs_listdir(path, revision):
+                stack.append((os.path.join(path, child),
+                              '/'.join([long_id, child])))
+        return None
+
     def _u_rel_path(self, path, root=None):
         """
         Return the relative path to path from root.

diff --git a/libbe/storage/vcs/bzr.py b/libbe/storage/vcs/bzr.py
index 4e3f330a8ec96a4907ac26aa33edc7eeb58fdcc7..d6e77998a8cec5122a0c683f9d622118003e3f81 100644 (file)
--- a/libbe/storage/vcs/bzr.py
+++ b/libbe/storage/vcs/bzr.py
@@ -129,10 +129,37 @@ class Bzr(base.VCS):
             cmd.run(filename=path, revision=revision)
         except bzrlib.errors.BzrCommandError, e:
             if 'not present in revision' in str(e):
-                raise base.InvalidID(path)
+                raise base.InvalidID(path, revision)
             raise
         return cmd.outf.getvalue()        
 
+    def _vcs_path(self, id, revision):
+        return self._u_find_id(id, revision)
+
+    def _vcs_isdir(self, path, revision):
+        try:
+            self._vcs_listdir(path, revision)
+        except AttributeError, e:
+            if 'children' in str(e):
+                return False
+            raise
+        return True
+
+    def _vcs_listdir(self, path, revision):
+        path = os.path.join(self.repo, path)
+        revision = self._parse_revision_string(revision)
+        cmd = bzrlib.builtins.cmd_ls()
+        cmd.outf = StringIO.StringIO()
+        try:
+            cmd.run(revision=revision, path=path)
+        except bzrlib.errors.BzrCommandError, e:
+            if 'not present in revision' in str(e):
+                raise base.InvalidID(path, revision)
+            raise
+        children = cmd.outf.getvalue().rstrip('\n').splitlines()
+        children = [self._u_rel_path(c, path) for c in children]
+        return children
+
     def _vcs_commit(self, commitfile, allow_empty=False):
         cmd = bzrlib.builtins.cmd_commit()
         cmd.outf = StringIO.StringIO()