Rev 2221: Still import revision properties even if branch root is different. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sun Dec 7 20:36:44 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2221
revision-id: jelmer at samba.org-20081207203639-533qdkwpj2wqrg0s
parent: jelmer at samba.org-20081207193007-7y1uctwnv726ofv9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 21:36:39 +0100
message:
Still import revision properties even if branch root is different.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
layout/standard.py standard.py-20080909185308-vfoi9po1pzy6u4le-2
mapping4.py mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'branch.py'
--- a/branch.py 2008-12-05 19:27:39 +0000
+++ b/branch.py 2008-12-07 20:36:39 +0000
@@ -140,7 +140,7 @@
if revnum is None:
return self._branch_path
- last_revmeta = self.last_revmeta()
+ last_revmeta, _ = self.last_revmeta()
if revnum == last_revmeta.revnum:
return last_revmeta.branch_path
@@ -155,15 +155,15 @@
:return: Revision number
"""
- return self.last_revmeta().revnum
+ return self.last_revmeta()[0].revnum
def last_revmeta(self):
"""Return the revmeta element for the last revision in this branch.
"""
for revmeta, mapping in self._revision_meta_history():
if not revmeta.is_hidden(mapping):
- return revmeta
- return None
+ return revmeta, mapping
+ return None, None
def check(self):
"""See Branch.Check.
@@ -368,8 +368,7 @@
"""See Branch.last_revision()."""
# Shortcut for finding the tip. This avoids expensive generation time
# on large branches.
- last_revmeta = self.last_revmeta()
- mapping = last_revmeta.get_appropriate_mappings(self.mapping)[0]
+ last_revmeta, mapping = self.last_revmeta()
return last_revmeta.get_revision_id(mapping)
@needs_write_lock
=== modified file 'layout/standard.py'
--- a/layout/standard.py 2008-11-19 16:20:56 +0000
+++ b/layout/standard.py 2008-12-07 20:36:39 +0000
@@ -22,6 +22,7 @@
)
from functools import partial
+from subvertpy import NODE_DIR
class TrunkLayout(RepositoryLayout):
@@ -183,6 +184,12 @@
"""
return ('branch', '', '', path)
+ def is_branch_path(self, bp, project=None):
+ return (bp == "")
+
+ def is_tag_path(self, tp, project=None):
+ return False
+
def get_branches(self, repository, revnum, project=None, pb=None):
"""Retrieve a list of paths that refer to branches in a specific revision.
@@ -269,14 +276,14 @@
:result: Iterator over tuples with (project, branch path)
"""
- return [(project, b, b.split("/")[-1]) for b in self.branches]
+ return [(project, b, b.split("/")[-1]) for b in self.branches if repository.transport.check_path(b, revnum) == NODE_DIR]
def get_tags(self, repository, revnum, project=None, pb=None):
"""Retrieve a list of paths that refer to tags in a specific revision.
:result: Iterator over tuples with (project, branch path)
"""
- return [(project, t, t.split("/")[-1]) for t in self.tags]
+ return [(project, t, t.split("/")[-1]) for t in self.tags if repository.transport.check_path(t, revnum) == NODE_DIR]
def __repr__(self):
return "%s(%r,%r)" % (self.__class__.__name__, self.branches, self.tags)
=== modified file 'mapping4.py'
--- a/mapping4.py 2008-12-07 18:05:41 +0000
+++ b/mapping4.py 2008-12-07 20:36:39 +0000
@@ -94,7 +94,6 @@
if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES):
features = mapping.parse_required_features_property(svn_revprops[mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES])
assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
- assert svn_revprops.get(mapping.SVN_REVPROP_BZR_MAPPING_VERSION) in (None, self.name), "unknown mapping: %s" % svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION]
return mapping.BzrSvnMappingRevProps.import_revision_revprops(self, svn_revprops, rev)
def import_revision_fileprops(self, fileprops, rev):
=== modified file 'repository.py'
--- a/repository.py 2008-12-07 04:20:06 +0000
+++ b/repository.py 2008-12-07 20:36:39 +0000
@@ -737,6 +737,8 @@
pb = ui.ui_factory.nested_progress_bar()
try:
for (paths, i, revprops) in self._log.iter_changes(prefixes, from_revnum, to_revnum):
+ if (isinstance(revprops, dict) or revprops.is_loaded) and is_bzr_revision_revprops(revprops):
+ continue
pb.update("finding branches", i, to_revnum)
for p in sorted(paths.keys()):
if layout.is_branch_or_tag(p, project):
@@ -798,12 +800,9 @@
it = iter([])
it = chain(it, layout.get_branches(self, to_revnum, project))
it = chain(it, layout.get_tags(self, to_revnum, project))
- for (project, branch, nick) in it:
- yield (branch, to_revnum, True)
+ return iter(((branch, to_revnum, True) for (project, branch, nick) in it))
else:
- for (branch, revno, exists) in self.find_branchpaths(
- layout, from_revnum, to_revnum, project):
- yield (branch, revno, exists)
+ return iter(self.find_branchpaths(layout, from_revnum, to_revnum, project))
def abort_write_group(self, suppress_errors=False):
"""See Repository.abort_write_group()."""
=== modified file 'revids.py'
--- a/revids.py 2008-12-07 18:05:41 +0000
+++ b/revids.py 2008-12-07 20:36:39 +0000
@@ -94,6 +94,8 @@
assert isinstance(revno, int)
# Look at their bzr:revision-id-vX
revids = set()
+ if self.repos.transport.check_path(branch, revno) != 2:
+ import pdb; pdb.set_trace()
try:
revmeta = self.repos._revmeta_provider.lookup_revision(branch, revno)
if revmeta.consider_bzr_fileprops():
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-12-07 19:30:07 +0000
+++ b/revmeta.py 2008-12-07 20:36:39 +0000
@@ -50,6 +50,7 @@
parse_svn_revprops,
SVN_REVPROP_BZR_SIGNATURE,
SVN_PROP_BZR_REVPROP_REDIRECT,
+ SVN_REVPROP_BZR_ROOT,
)
from bzrlib.plugins.svn.svk import (
estimate_svk_ancestors,
@@ -363,7 +364,7 @@
find_mapping_fileprops,
find_mapping_revprops,
None, self.consider_bzr_fileprops,
- revprops_acceptable=lambda x: True,
+ revprops_acceptable=lambda revprops: revprops.get(SVN_REVPROP_BZR_ROOT) == self.branch_path,
revprops_sufficient=lambda x: True)
def _get_stored_lhs_parent_revid(self, mapping):
More information about the bazaar-commits
mailing list