Restore any metadata during "bup restore"; add "bup meta --edit".

[bup.git] / lib / bup / vfs.py

diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index ccedffc2bd8b8407a73f56f9ab745e40a792d847..f58dd5e31d3069dff375743376ffebf3c0671f55 100644 (file)
--- a/lib/bup/vfs.py
+++ b/lib/bup/vfs.py
@@ -386,7 +386,7 @@ class Dir(Node):
 
     def __init__(self, *args):
         Node.__init__(self, *args)
-        self._metadata_sha = None
+        self._metadata = None
 
     def _mksubs(self):
         self._subs = {}
@@ -399,7 +399,8 @@ class Dir(Node):
         assert(type == 'tree')
         for (mode,mangled_name,sha) in git.tree_decode(''.join(it)):
             if mangled_name == '.bupm':
-                self._metadata_sha = sha
+                self._metadata = \
+                    File(self, mangled_name, mode, sha, git.BUP_NORMAL)
                 continue
             name = mangled_name
             (name,bupmode) = git.demangle_name(mangled_name)
@@ -412,6 +413,11 @@ class Dir(Node):
             else:
                 self._subs[name] = File(self, name, mode, sha, bupmode)
 
+    def metadata_file(self):
+        if self._subs == None:
+            self._mksubs()
+        return self._metadata
+
 
 class CommitDir(Node):
     """A directory that contains all commits that are reachable by a ref.