Rev 2220: Fix hidden. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sun Dec 7 19:30:09 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2220
revision-id: jelmer at samba.org-20081207193007-7y1uctwnv726ofv9
parent: jelmer at samba.org-20081207183211-yfbndvwnagn3tabq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 20:30:07 +0100
message:
Fix hidden.
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'mapping.py'
--- a/mapping.py 2008-12-07 18:05:41 +0000
+++ b/mapping.py 2008-12-07 19:30:07 +0000
@@ -812,7 +812,8 @@
svn_revprops[SVN_REVPROP_BZR_USER_AGENT] = get_client_string()
def revprops_complete(self, revprops):
- return (SVN_REVPROP_BZR_MAPPING_VERSION in revprops)
+ return (SVN_REVPROP_BZR_MAPPING_VERSION in revprops or
+ SVN_REVPROP_BZR_HIDDEN in revprops)
def export_fileid_map_revprops(self, fileids, revprops):
if fileids != {}:
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-12-07 18:32:11 +0000
+++ b/revmeta.py 2008-12-07 19:30:07 +0000
@@ -601,6 +601,8 @@
return ret
can_use_revprops = False
+ can_use_fileprops = can_use_fileprops and self.is_changes_root()
+
# Check changed_fileprops if self.knows_changed_fileprops() and
# can_use_fileprops
if can_use_fileprops and self.knows_changed_fileprops():
@@ -609,6 +611,11 @@
return ret
can_use_fileprops = False
+ # No point in looking any further if file properties should be there
+ if (mapping is not None and mapping.must_use_fileprops and
+ not can_use_fileprops):
+ return default
+
# Check revprops if the last descendant has bzr:check-revprops set;
# if it has and the revnum there is < self.revnum
if can_use_revprops and self.consider_bzr_revprops():
@@ -667,8 +674,6 @@
return self._consider_bzr_revprops
def consider_bzr_hidden_fileprops(self):
- if not self.is_changes_root():
- return False
return (self.estimate_bzr_hidden_fileprop_ancestors() > 0)
def consider_bzr_fileprops(self):
@@ -678,10 +683,7 @@
"""
if self._consider_bzr_fileprops is not None:
return self._consider_bzr_fileprops
- if not self.is_changes_root():
- self._consider_bzr_fileprops = False
- else:
- self._consider_bzr_fileprops = (self.estimate_bzr_fileprop_ancestors() > 0)
+ self._consider_bzr_fileprops = (self.estimate_bzr_fileprop_ancestors() > 0)
return self._consider_bzr_fileprops
def consider_svk_fileprops(self):
More information about the bazaar-commits
mailing list