The vfs.py library makes it possible to expose contents from bup's repository
and abstracts internal name mangling and storage from the exposition layer.
"""
+
import os, re, stat, time
-from bup import git
-from helpers import *
+
+from bup import git, metadata
+from helpers import debug1, debug2
+from bup.git import BUP_NORMAL, BUP_CHUNKED, cp
+from bup.hashsplit import GIT_MODE_TREE, GIT_MODE_FILE
EMPTY_SHA='\0'*20
-_cp = None
-def cp():
- """Create a git.CatPipe object or reuse the already existing one."""
- global _cp
- if not _cp:
- _cp = git.CatPipe()
- return _cp
class NodeError(Exception):
"""VFS base exception."""
pass
-def _treeget(hash):
- it = cp().get(hash.encode('hex'))
- type = it.next()
+def _treeget(hash, repo_dir=None):
+ it = cp(repo_dir).get(hash.encode('hex'))
+ _, type, _ = next(it)
assert(type == 'tree')
- return git.treeparse(''.join(it))
+ return git.tree_decode(''.join(it))
-def _tree_decode(hash):
- tree = [(int(name,16),stat.S_ISDIR(int(mode,8)),sha)
+def _tree_decode(hash, repo_dir=None):
+ tree = [(int(name,16),stat.S_ISDIR(mode),sha)
for (mode,name,sha)
- in _treeget(hash)]
+ in _treeget(hash, repo_dir)]
assert(tree == list(sorted(tree)))
return tree
-def _chunk_len(hash):
- return sum(len(b) for b in cp().join(hash.encode('hex')))
+def _chunk_len(hash, repo_dir=None):
+ return sum(len(b) for b in cp(repo_dir).join(hash.encode('hex')))
-def _last_chunk_info(hash):
- tree = _tree_decode(hash)
+def _last_chunk_info(hash, repo_dir=None):
+ tree = _tree_decode(hash, repo_dir)
assert(tree)
(ofs,isdir,sha) = tree[-1]
if isdir:
- (subofs, sublen) = _last_chunk_info(sha)
+ (subofs, sublen) = _last_chunk_info(sha, repo_dir)
return (ofs+subofs, sublen)
else:
return (ofs, _chunk_len(sha))
-def _total_size(hash):
- (lastofs, lastsize) = _last_chunk_info(hash)
+def _total_size(hash, repo_dir=None):
+ (lastofs, lastsize) = _last_chunk_info(hash, repo_dir)
return lastofs + lastsize
-def _chunkiter(hash, startofs):
+def _chunkiter(hash, startofs, repo_dir=None):
assert(startofs >= 0)
- tree = _tree_decode(hash)
+ tree = _tree_decode(hash, repo_dir)
# skip elements before startofs
for i in xrange(len(tree)):
if skipmore < 0:
skipmore = 0
if isdir:
- for b in _chunkiter(sha, skipmore):
+ for b in _chunkiter(sha, skipmore, repo_dir):
yield b
else:
- yield ''.join(cp().join(sha.encode('hex')))[skipmore:]
+ yield ''.join(cp(repo_dir).join(sha.encode('hex')))[skipmore:]
-class _ChunkReader(object):
- def __init__(self, hash, isdir, startofs):
+class _ChunkReader:
+ def __init__(self, hash, isdir, startofs, repo_dir=None):
if isdir:
- self.it = _chunkiter(hash, startofs)
+ self.it = _chunkiter(hash, startofs, repo_dir)
self.blob = None
else:
self.it = None
- self.blob = ''.join(cp().join(hash.encode('hex')))[startofs:]
+ self.blob = ''.join(cp(repo_dir).join(hash.encode('hex')))[startofs:]
self.ofs = startofs
def next(self, size):
while len(out) < size:
if self.it and not self.blob:
try:
- self.blob = self.it.next()
+ self.blob = next(self.it)
except StopIteration:
self.it = None
if self.blob:
class _FileReader(object):
- def __init__(self, hash, size, isdir):
+ def __init__(self, hash, size, isdir, repo_dir=None):
self.hash = hash
self.ofs = 0
self.size = size
self.isdir = isdir
self.reader = None
+ self._repo_dir = repo_dir
def seek(self, ofs):
if ofs > self.size:
if count < 0:
count = self.size - self.ofs
if not self.reader or self.reader.ofs != self.ofs:
- self.reader = _ChunkReader(self.hash, self.isdir, self.ofs)
+ self.reader = _ChunkReader(self.hash, self.isdir, self.ofs,
+ self._repo_dir)
try:
buf = self.reader.next(count)
except:
class Node(object):
"""Base class for file representation."""
- def __init__(self, parent, name, mode, hash):
+ def __init__(self, parent, name, mode, hash, repo_dir=None):
self.parent = parent
self.name = name
self.mode = mode
self.hash = hash
self.ctime = self.mtime = self.atime = 0
+ self._repo_dir = repo_dir
self._subs = None
+ self._metadata = None
+
+ def __repr__(self):
+ return "<%s object at %s - name:%r hash:%s parent:%r>" \
+ % (self.__class__, hex(id(self)),
+ self.name, self.hash.encode('hex'),
+ self.parent.name if self.parent else None)
def __cmp__(a, b):
- return cmp(a and a.name or None, b and b.name or None)
+ if a is b:
+ return 0
+ return (cmp(a and a.parent, b and b.parent) or
+ cmp(a and a.name, b and b.name))
def __iter__(self):
return iter(self.subs())
def nlinks(self):
"""Get the number of hard links to the current node."""
- if self._subs == None:
- self._mksubs()
return 1
def size(self):
"""Open the current node. It is an error to open a non-file node."""
raise NotFile('%s is not a regular file' % self.name)
+ def _populate_metadata(self, force=False):
+ # Only Dirs contain .bupm files, so by default, do nothing.
+ pass
+
+ def metadata(self):
+ """Return this Node's Metadata() object, if any."""
+ if not self._metadata and self.parent:
+ self.parent._populate_metadata(force=True)
+ return self._metadata
+
+ def release(self):
+ """Release resources that can be automatically restored (at a cost)."""
+ self._metadata = None
+ self._subs = None
+
class File(Node):
"""A normal file from bup's repository."""
- def __init__(self, parent, name, mode, hash, bupmode):
- Node.__init__(self, parent, name, mode, hash)
+ def __init__(self, parent, name, mode, hash, bupmode, repo_dir=None):
+ Node.__init__(self, parent, name, mode, hash, repo_dir)
self.bupmode = bupmode
self._cached_size = None
self._filereader = None
# object here so we're not constantly re-seeking.
if not self._filereader:
self._filereader = _FileReader(self.hash, self.size(),
- self.bupmode == git.BUP_CHUNKED)
+ self.bupmode == git.BUP_CHUNKED,
+ repo_dir = self._repo_dir)
self._filereader.seek(0)
return self._filereader
def size(self):
"""Get this file's size."""
if self._cached_size == None:
- debug1('<<<<File.size() is calculating...\n')
+ debug1('<<<<File.size() is calculating (for %r)...\n' % self.name)
if self.bupmode == git.BUP_CHUNKED:
- self._cached_size = _total_size(self.hash)
+ self._cached_size = _total_size(self.hash,
+ repo_dir = self._repo_dir)
else:
- self._cached_size = _chunk_len(self.hash)
+ self._cached_size = _chunk_len(self.hash,
+ repo_dir = self._repo_dir)
debug1('<<<<File.size() done.\n')
return self._cached_size
_symrefs = 0
class Symlink(File):
"""A symbolic link from bup's repository."""
- def __init__(self, parent, name, hash, bupmode):
- File.__init__(self, parent, name, 0120000, hash, bupmode)
+ def __init__(self, parent, name, hash, bupmode, repo_dir=None):
+ File.__init__(self, parent, name, 0o120000, hash, bupmode,
+ repo_dir = repo_dir)
def size(self):
"""Get the file size of the file at which this link points."""
def readlink(self):
"""Get the path that this link points at."""
- return ''.join(cp().join(self.hash.encode('hex')))
+ return ''.join(cp(self._repo_dir).join(self.hash.encode('hex')))
def dereference(self):
"""Get the node that this link points at.
class FakeSymlink(Symlink):
"""A symlink that is not stored in the bup repository."""
- def __init__(self, parent, name, toname):
- Symlink.__init__(self, parent, name, EMPTY_SHA, git.BUP_NORMAL)
+ def __init__(self, parent, name, toname, repo_dir=None):
+ Symlink.__init__(self, parent, name, EMPTY_SHA, git.BUP_NORMAL,
+ repo_dir = repo_dir)
self.toname = toname
def readlink(self):
class Dir(Node):
"""A directory stored inside of bup's repository."""
+
+ def __init__(self, *args, **kwargs):
+ Node.__init__(self, *args, **kwargs)
+ self._bupm = None
+
+ def _populate_metadata(self, force=False):
+ if self._metadata and not force:
+ return
+ if not self._subs:
+ self._mksubs()
+ if not self._bupm:
+ return
+ meta_stream = self._bupm.open()
+ dir_meta = metadata.Metadata.read(meta_stream)
+ for sub in self:
+ if not stat.S_ISDIR(sub.mode):
+ sub._metadata = metadata.Metadata.read(meta_stream)
+ self._metadata = dir_meta
+
def _mksubs(self):
self._subs = {}
- it = cp().get(self.hash.encode('hex'))
- type = it.next()
+ it = cp(self._repo_dir).get(self.hash.encode('hex'))
+ _, type, _ = next(it)
if type == 'commit':
del it
- it = cp().get(self.hash.encode('hex') + ':')
- type = it.next()
+ it = cp(self._repo_dir).get(self.hash.encode('hex') + ':')
+ _, type, _ = next(it)
assert(type == 'tree')
- for (mode,mangled_name,sha) in git.treeparse(''.join(it)):
- mode = int(mode, 8)
- name = mangled_name
- (name,bupmode) = git.demangle_name(mangled_name)
+ for (mode,mangled_name,sha) in git.tree_decode(''.join(it)):
+ if mangled_name == '.bupm':
+ bupmode = stat.S_ISDIR(mode) and BUP_CHUNKED or BUP_NORMAL
+ self._bupm = File(self, mangled_name, GIT_MODE_FILE, sha,
+ bupmode)
+ continue
+ name, bupmode = git.demangle_name(mangled_name, mode)
if bupmode == git.BUP_CHUNKED:
- mode = 0100644
+ mode = GIT_MODE_FILE
if stat.S_ISDIR(mode):
- self._subs[name] = Dir(self, name, mode, sha)
+ self._subs[name] = Dir(self, name, mode, sha, self._repo_dir)
elif stat.S_ISLNK(mode):
- self._subs[name] = Symlink(self, name, sha, bupmode)
+ self._subs[name] = Symlink(self, name, sha, bupmode,
+ self._repo_dir)
else:
- self._subs[name] = File(self, name, mode, sha, bupmode)
+ self._subs[name] = File(self, name, mode, sha, bupmode,
+ self._repo_dir)
+
+ def metadata(self):
+ """Return this Dir's Metadata() object, if any."""
+ self._populate_metadata()
+ return self._metadata
+
+ def metadata_file(self):
+ """Return this Dir's .bupm File, if any."""
+ if not self._subs:
+ self._mksubs()
+ return self._bupm
+
+ def release(self):
+ """Release restorable resources held by this node."""
+ self._bupm = None
+ super(Dir, self).release()
+
+
+class CommitDir(Node):
+ """A directory that contains all commits that are reachable by a ref.
+
+ Contains a set of subdirectories named after the commits' first byte in
+ hexadecimal. Each of those directories contain all commits with hashes that
+ start the same as the directory name. The name used for those
+ subdirectories is the hash of the commit without the first byte. This
+ separation helps us avoid having too much directories on the same level as
+ the number of commits grows big.
+ """
+ def __init__(self, parent, name, repo_dir=None):
+ Node.__init__(self, parent, name, GIT_MODE_TREE, EMPTY_SHA, repo_dir)
+
+ def _mksubs(self):
+ self._subs = {}
+ refs = git.list_refs(repo_dir = self._repo_dir)
+ for ref in refs:
+ #debug2('ref name: %s\n' % ref[0])
+ revs = git.rev_list(ref[1].encode('hex'), repo_dir = self._repo_dir)
+ for (date, commit) in revs:
+ #debug2('commit: %s date: %s\n' % (commit.encode('hex'), date))
+ commithex = commit.encode('hex')
+ containername = commithex[:2]
+ dirname = commithex[2:]
+ n1 = self._subs.get(containername)
+ if not n1:
+ n1 = CommitList(self, containername, self._repo_dir)
+ self._subs[containername] = n1
+
+ if n1.commits.get(dirname):
+ # Stop work for this ref, the rest should already be present
+ break
+
+ n1.commits[dirname] = (commit, date)
class CommitList(Node):
- """A reverse-chronological list of commits on a branch in bup's repository.
+ """A list of commits with hashes that start with the current node's name."""
+ def __init__(self, parent, name, repo_dir=None):
+ Node.__init__(self, parent, name, GIT_MODE_TREE, EMPTY_SHA, repo_dir)
+ self.commits = {}
+
+ def _mksubs(self):
+ self._subs = {}
+ for (name, (hash, date)) in self.commits.items():
+ n1 = Dir(self, name, GIT_MODE_TREE, hash, self._repo_dir)
+ n1.ctime = n1.mtime = date
+ self._subs[name] = n1
+
+
+class TagDir(Node):
+ """A directory that contains all tags in the repository."""
+ def __init__(self, parent, name, repo_dir = None):
+ Node.__init__(self, parent, name, GIT_MODE_TREE, EMPTY_SHA, repo_dir)
- Represents each commit as a directory and a symlink that points to the
- directory. The symlink is named after the date. Prepends a dot to each hash
- to make commits look like hidden directories.
+ def _mksubs(self):
+ self._subs = {}
+ for (name, sha) in git.list_refs(repo_dir = self._repo_dir):
+ if name.startswith('refs/tags/'):
+ name = name[10:]
+ date = git.get_commit_dates([sha.encode('hex')],
+ repo_dir=self._repo_dir)[0]
+ commithex = sha.encode('hex')
+ target = '../.commit/%s/%s' % (commithex[:2], commithex[2:])
+ tag1 = FakeSymlink(self, name, target, self._repo_dir)
+ tag1.ctime = tag1.mtime = date
+ self._subs[name] = tag1
+
+
+class BranchList(Node):
+ """A list of links to commits reachable by a branch in bup's repository.
+
+ Represents each commit as a symlink that points to the commit directory in
+ /.commit/??/ . The symlink is named after the commit date.
"""
- def __init__(self, parent, name, hash):
- Node.__init__(self, parent, name, 040000, hash)
+ def __init__(self, parent, name, hash, repo_dir=None):
+ Node.__init__(self, parent, name, GIT_MODE_TREE, hash, repo_dir)
def _mksubs(self):
self._subs = {}
- revs = list(git.rev_list(self.hash.encode('hex')))
+
+ revs = list(git.rev_list(self.hash.encode('hex'),
+ repo_dir=self._repo_dir))
+ latest = revs[0]
for (date, commit) in revs:
l = time.localtime(date)
ls = time.strftime('%Y-%m-%d-%H%M%S', l)
- commithex = '.' + commit.encode('hex')
- n1 = Dir(self, commithex, 040000, commit)
- n2 = FakeSymlink(self, ls, commithex)
- n1.ctime = n1.mtime = n2.ctime = n2.mtime = date
- self._subs[commithex] = n1
- self._subs[ls] = n2
- latest = max(revs)
- if latest:
- (date, commit) = latest
- commithex = '.' + commit.encode('hex')
- n2 = FakeSymlink(self, 'latest', commithex)
- n2.ctime = n2.mtime = date
- self._subs['latest'] = n2
+ commithex = commit.encode('hex')
+ target = '../.commit/%s/%s' % (commithex[:2], commithex[2:])
+ n1 = FakeSymlink(self, ls, target, self._repo_dir)
+ n1.ctime = n1.mtime = date
+ self._subs[ls] = n1
+
+ (date, commit) = latest
+ commithex = commit.encode('hex')
+ target = '../.commit/%s/%s' % (commithex[:2], commithex[2:])
+ n1 = FakeSymlink(self, 'latest', target, self._repo_dir)
+ n1.ctime = n1.mtime = date
+ self._subs['latest'] = n1
class RefList(Node):
The sub-nodes of the ref list are a series of CommitList for each commit
hash pointed to by a branch.
+
+ Also, a special sub-node named '.commit' contains all commit directories
+ that are reachable via a ref (e.g. a branch). See CommitDir for details.
"""
- def __init__(self, parent):
- Node.__init__(self, parent, '/', 040000, EMPTY_SHA)
+ def __init__(self, parent, repo_dir=None):
+ Node.__init__(self, parent, '/', GIT_MODE_TREE, EMPTY_SHA, repo_dir)
def _mksubs(self):
self._subs = {}
- for (name,sha) in git.list_refs():
- if name.startswith('refs/heads/'):
- name = name[11:]
- date = git.rev_get_date(sha.encode('hex'))
- n1 = CommitList(self, name, sha)
- n1.ctime = n1.mtime = date
- self._subs[name] = n1
-
+ commit_dir = CommitDir(self, '.commit', self._repo_dir)
+ self._subs['.commit'] = commit_dir
+
+ tag_dir = TagDir(self, '.tag', self._repo_dir)
+ self._subs['.tag'] = tag_dir
+
+ refs_info = [(name[11:], sha) for (name,sha)
+ in git.list_refs(repo_dir=self._repo_dir)
+ if name.startswith('refs/heads/')]
+ dates = git.get_commit_dates([sha.encode('hex')
+ for (name, sha) in refs_info],
+ repo_dir=self._repo_dir)
+ for (name, sha), date in zip(refs_info, dates):
+ n1 = BranchList(self, name, sha, self._repo_dir)
+ n1.ctime = n1.mtime = date
+ self._subs[name] = n1
projects / bup.git / blobdiff