demangle_name: handle .bupm files

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

diff --git a/lib/bup/vfs.py b/lib/bup/vfs.py
index fffff8238cc6c467f7bba8908cfc1bd583251d47..fbe5bd6cc6fca5ed2eb0407c7c6792c3a9032122 100644 (file)
--- a/lib/bup/vfs.py
+++ b/lib/bup/vfs.py
@@ -434,7 +434,7 @@ class Dir(Node):
                 self._bupm = File(self, mangled_name, GIT_MODE_FILE, sha,
                                   bupmode)
                 continue
-            (name,bupmode) = git.demangle_name(mangled_name)
+            name, bupmode = git.demangle_name(mangled_name, mode)
             if bupmode == git.BUP_CHUNKED:
                 mode = GIT_MODE_FILE
             if stat.S_ISDIR(mode):
@@ -527,7 +527,7 @@ class TagDir(Node):
                                             repo_dir=self._repo_dir)[0]
                 commithex = sha.encode('hex')
                 target = '../.commit/%s/%s' % (commithex[:2], commithex[2:])
-                tag1 = FakeSymlink(self, name, target, repo_dir, self._repo_dir)
+                tag1 = FakeSymlink(self, name, target, self._repo_dir)
                 tag1.ctime = tag1.mtime = date
                 self._subs[name] = tag1
 
@@ -544,8 +544,6 @@ class BranchList(Node):
     def _mksubs(self):
         self._subs = {}
 
-        tags = git.tags(repo_dir = self._repo_dir)
-
         revs = list(git.rev_list(self.hash.encode('hex'),
                                  repo_dir=self._repo_dir))
         latest = revs[0]
@@ -558,11 +556,6 @@ class BranchList(Node):
             n1.ctime = n1.mtime = date
             self._subs[ls] = n1
 
-            for tag in tags.get(commit, []):
-                t1 = FakeSymlink(self, tag, target, self._repo_dir)
-                t1.ctime = t1.mtime = date
-                self._subs[tag] = t1
-
         (date, commit) = latest
         commithex = commit.encode('hex')
         target = '../.commit/%s/%s' % (commithex[:2], commithex[2:])