# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+"""Access to stored Subversion basis trees."""
-from binascii import hexlify
-from bzrlib.bzrdir import BzrDirFormat
-from bzrlib.errors import NotBranchError, NoSuchFile
-from bzrlib.inventory import (Inventory, InventoryDirectory, InventoryFile,
- ROOT_ID)
-from bzrlib.lockable_files import TransportLock, LockableFiles
-from bzrlib.lockdir import LockDir
-import bzrlib.osutils as osutils
-from bzrlib.progress import DummyProgress
-from bzrlib.revision import NULL_REVISION
+from bzrlib.inventory import Inventory
+
+from bzrlib import osutils, urlutils
from bzrlib.trace import mutter
from bzrlib.revisiontree import RevisionTree
import os
import md5
from cStringIO import StringIO
+import urllib
+
+import svn.core, svn.wc, svn.delta
+from svn.core import Pool
+
+# Deal with Subversion 1.5 and the patched Subversion 1.4 (which are
+# slightly different).
-import svn.core, svn.wc, svn.delta, svn.ra
-from svn.core import SubversionException, Pool
+if hasattr(svn.delta, 'tx_invoke_window_handler'):
+ def apply_txdelta_handler(src_stream, target_stream, pool):
+ assert hasattr(src_stream, 'read')
+ assert hasattr(target_stream, 'write')
+ window_handler, baton = svn.delta.tx_apply(src_stream, target_stream,
+ None, pool)
-def apply_txdelta_handler(src_stream, target_stream, pool):
- assert hasattr(src_stream, 'read')
- assert hasattr(target_stream, 'write')
- ret = svn.delta.svn_txdelta_apply(
- src_stream,
- target_stream,
- None,
- pool)
+ def wrapper(window):
+ window_handler(window, baton)
- def wrapper(window):
- svn.delta.invoke_txdelta_window_handler(
- ret[1], window, ret[2])
+ return wrapper
+else:
+ def apply_txdelta_handler(src_stream, target_stream, pool):
+ assert hasattr(src_stream, 'read')
+ assert hasattr(target_stream, 'write')
+ ret = svn.delta.svn_txdelta_apply(src_stream, target_stream, None, pool)
- return wrapper
+ def wrapper(window):
+ svn.delta.invoke_txdelta_window_handler(
+ ret[1], window, ret[2])
+
+ return wrapper
class SvnRevisionTree(RevisionTree):
- def __init__(self, repository, revision_id, inventory=None):
+ """A tree that existed in a historical Subversion revision."""
+ def __init__(self, repository, revision_id):
self._repository = repository
self._revision_id = revision_id
pool = Pool()
- if revision_id == NULL_REVISION:
- self._inventory = Inventory(ROOT_ID)
- self._inventory.revision_id = NULL_REVISION
- else:
- (self.branch_path, self.revnum) = repository.parse_revision_id(revision_id)
- self._inventory = Inventory(ROOT_ID)
- self._inventory.revision_id = revision_id
- self.id_map = repository.get_fileid_map(self.revnum, self.branch_path)
- self.editor = TreeBuildEditor(self, pool)
- self.file_data = {}
-
- editor, baton = svn.delta.make_editor(self.editor, pool)
+ (self.branch_path, self.revnum, scheme) = repository.lookup_revision_id(revision_id)
+ self._inventory = Inventory()
+ self.id_map = repository.get_fileid_map(self.revnum, self.branch_path,
+ scheme)
+ self.editor = TreeBuildEditor(self, pool)
+ self.file_data = {}
+ editor, baton = svn.delta.make_editor(self.editor, pool)
+ root_repos = repository.transport.get_repos_root()
+ reporter = repository.transport.do_switch(
+ self.revnum, True,
+ urlutils.join(root_repos, self.branch_path), editor, baton, pool)
+ reporter.set_path("", 0, True, None, pool)
+ reporter.finish_report(pool)
+ pool.destroy()
- root_repos = repository.transport.get_repos_root()
- reporter, reporter_baton = repository.transport.do_switch(
- self.revnum, "", True,
- os.path.join(root_repos, self.branch_path), editor, baton, pool)
-
- svn.ra.reporter2_invoke_set_path(reporter, reporter_baton, "", 0, True, None, pool)
-
- svn.ra.reporter2_invoke_finish_report(reporter, reporter_baton, pool)
-
- pool.destroy()
-
- def get_file_lines(self, file_id):
+ def get_file_lines(self, file_id):
return osutils.split_lines(self.file_data[file_id])
class TreeBuildEditor(svn.delta.Editor):
+ """Builds a tree given Subversion tree transform calls."""
def __init__(self, tree, pool):
self.tree = tree
self.repository = tree._repository
self.revnum = revnum
def open_root(self, revnum, baton):
- return ROOT_ID
+ file_id, revision_id = self.tree.id_map[""]
+ ie = self.tree._inventory.add_path("", 'directory', file_id)
+ ie.revision = revision_id
+ self.tree._inventory.revision_id = revision_id
+ return file_id
def add_directory(self, path, parent_baton, copyfrom_path, copyfrom_revnum, pool):
+ path = path.decode("utf-8")
file_id, revision_id = self.tree.id_map[path]
ie = self.tree._inventory.add_path(path, 'directory', file_id)
-
ie.revision = revision_id
return file_id
def change_dir_prop(self, id, name, value, pool):
- from repository import (SVN_PROP_BZR_MERGE, SVN_PROP_SVK_MERGE,
- SVN_PROP_BZR_REVPROP_PREFIX, SVN_PROP_BZR_FILEIDS)
+ from repository import (SVN_PROP_BZR_ANCESTRY,
+ SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO,
+ SVN_PROP_BZR_FILEIDS, SVN_PROP_BZR_REVISION_ID,
+ SVN_PROP_BZR_BRANCHING_SCHEME, SVN_PROP_BZR_MERGE)
if name == svn.core.SVN_PROP_ENTRY_COMMITTED_REV:
self.dir_revnum[id] = int(value)
elif name == svn.core.SVN_PROP_IGNORE:
self.dir_ignores[id] = value
- elif name == SVN_PROP_BZR_MERGE or name == SVN_PROP_SVK_MERGE:
- if id != ROOT_ID:
- mutter('%r set on non-root dir!' % SVN_PROP_BZR_MERGE)
+ elif name.startswith(SVN_PROP_BZR_ANCESTRY):
+ if id != self.tree._inventory.root.file_id:
+ mutter('%r set on non-root dir!' % name)
return
- elif name == SVN_PROP_BZR_FILEIDS:
- if id != self.tree.id_map[""][0]:
- mutter('%r set on non-root dir!' % SVN_PROP_BZR_FILEIDS)
+ elif name in (SVN_PROP_BZR_FILEIDS, SVN_PROP_BZR_BRANCHING_SCHEME):
+ if id != self.tree._inventory.root.file_id:
+ mutter('%r set on non-root dir!' % name)
return
elif name in (svn.core.SVN_PROP_ENTRY_COMMITTED_DATE,
svn.core.SVN_PROP_ENTRY_LAST_AUTHOR,
pass
elif name.startswith(svn.core.SVN_PROP_WC_PREFIX):
pass
- elif name.startswith(SVN_PROP_BZR_REVPROP_PREFIX):
+ elif (name == SVN_PROP_BZR_REVISION_INFO or
+ name.startswith(SVN_PROP_BZR_REVISION_ID)):
pass
- else:
+ elif name == SVN_PROP_BZR_MERGE:
+ pass
+ elif (name.startswith(svn.core.SVN_PROP_PREFIX) or
+ name.startswith(SVN_PROP_BZR_PREFIX)):
mutter('unsupported dir property %r' % name)
def change_file_prop(self, id, name, value, pool):
+ from repository import SVN_PROP_BZR_PREFIX
+
if name == svn.core.SVN_PROP_EXECUTABLE:
self.is_executable = (value != None)
elif name == svn.core.SVN_PROP_SPECIAL:
pass
elif name.startswith(svn.core.SVN_PROP_WC_PREFIX):
pass
- else:
+ elif (name.startswith(svn.core.SVN_PROP_PREFIX) or
+ name.startswith(SVN_PROP_BZR_PREFIX)):
mutter('unsupported file property %r' % name)
def add_file(self, path, parent_id, copyfrom_path, copyfrom_revnum, baton):
+ path = path.decode("utf-8")
self.is_symlink = False
self.is_executable = False
return path
def close_file(self, path, checksum):
file_id, revision_id = self.tree.id_map[path]
-
if self.is_symlink:
ie = self.tree._inventory.add_path(path, 'symlink', file_id)
else:
ie.text_sha1 = None
ie.text_size = None
ie.text_id = None
+ ie.executable = False
else:
ie.text_sha1 = osutils.sha_string(file_data)
ie.text_size = len(file_data)
return apply_txdelta_handler(StringIO(""), self.file_stream, self.pool)
-class SvnBasisTree(SvnRevisionTree):
+class SvnBasisTree(RevisionTree):
"""Optimized version of SvnRevisionTree."""
- def __init__(self, workingtree, revid):
- super(SvnBasisTree, self).__init__(workingtree.branch.repository,
- revid)
+ def __init__(self, workingtree):
self.workingtree = workingtree
+ self._revision_id = workingtree.branch.generate_revision_id(
+ workingtree.base_revnum)
+ self.id_map = workingtree.branch.repository.get_fileid_map(
+ workingtree.base_revnum,
+ workingtree.branch.get_branch_path(workingtree.base_revnum),
+ workingtree.branch.scheme)
+ self._inventory = Inventory(root_id=None)
+ self._repository = workingtree.branch.repository
+
+ def add_file_to_inv(relpath, id, revid, wc):
+ props = svn.wc.get_prop_diffs(self.workingtree.abspath(relpath), wc)
+ if isinstance(props, list): # Subversion 1.5
+ props = props[1]
+ if props.has_key(svn.core.SVN_PROP_SPECIAL):
+ ie = self._inventory.add_path(relpath, 'symlink', id)
+ ie.symlink_target = open(self._abspath(relpath)).read()[len("link "):]
+ ie.text_sha1 = None
+ ie.text_size = None
+ ie.text_id = None
+ ie.executable = False
+ else:
+ ie = self._inventory.add_path(relpath, 'file', id)
+ data = osutils.fingerprint_file(open(self._abspath(relpath)))
+ ie.text_sha1 = data['sha1']
+ ie.text_size = data['size']
+ ie.executable = props.has_key(svn.core.SVN_PROP_EXECUTABLE)
+ ie.revision = revid
+ return ie
+
+ def find_ids(entry):
+ relpath = urllib.unquote(entry.url[len(entry.repos):].strip("/"))
+ if entry.schedule in (svn.wc.schedule_normal,
+ svn.wc.schedule_delete,
+ svn.wc.schedule_replace):
+ return self.id_map[workingtree.branch.scheme.unprefix(relpath)[1]]
+ return (None, None)
+
+ def add_dir_to_inv(relpath, wc, parent_id):
+ entries = svn.wc.entries_read(wc, False)
+ entry = entries[""]
+ (id, revid) = find_ids(entry)
+ if id == None:
+ return
+
+ # First handle directory itself
+ ie = self._inventory.add_path(relpath, 'directory', id)
+ ie.revision = revid
+ if relpath == "":
+ self._inventory.revision_id = revid
+
+ for name in entries:
+ if name == "":
+ continue
+
+ subrelpath = os.path.join(relpath, name)
+
+ entry = entries[name]
+ assert entry
+
+ if entry.kind == svn.core.svn_node_dir:
+ subwc = svn.wc.adm_open3(wc,
+ self.workingtree.abspath(subrelpath),
+ False, 0, None)
+ try:
+ add_dir_to_inv(subrelpath, subwc, id)
+ finally:
+ svn.wc.adm_close(subwc)
+ else:
+ (subid, subrevid) = find_ids(entry)
+ if subid is not None:
+ add_file_to_inv(subrelpath, subid, subrevid, wc)
+
+ wc = workingtree._get_wc()
+ try:
+ add_dir_to_inv("", wc, None)
+ finally:
+ svn.wc.adm_close(wc)
+
+ def _abspath(self, relpath):
+ return svn.wc.get_pristine_copy_path(self.workingtree.abspath(relpath))
def get_file_lines(self, file_id):
- path = self.id2path(file_id)
- base_copy = svn.wc.get_pristine_copy_path(self.workingtree.abspath(path))
+ base_copy = self._abspath(self.id2path(file_id))
return osutils.split_lines(open(base_copy).read())
git.samba.org / jelmer / subvertpy.git / blobdiff