Rev 1782: Prevent fetching file properties even though they didn't change. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Tue Sep 2 12:24:52 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1782
revision-id: jelmer at samba.org-20080902112450-8nazn82zoh1nu0kp
parent: jelmer at samba.org-20080902101144-nsykrxuukvhrr132
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-02 13:24:50 +0200
message:
Prevent fetching file properties even though they didn't change.
modified:
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'repository.py'
--- a/repository.py 2008-09-02 10:11:44 +0000
+++ b/repository.py 2008-09-02 11:24:50 +0000
@@ -669,22 +669,23 @@
consider_svk_fileprops=consider_svk_fileprops)
if ((consider_bzr_fileprops or consider_svk_fileprops) and
- fileprops_backoff <= 0):
- ancestors = 0
+ fileprops_backoff <= 0 and bp in paths):
+ fileprops_backoff = 0
if consider_bzr_fileprops:
bzr_ancestors = ret.estimate_bzr_fileprop_ancestors()
if bzr_ancestors == 0:
consider_bzr_fileprops = False
else:
- ancestors = max(ancestors, bzr_ancestors)
+ fileprops_backoff = max(fileprops_backoff, bzr_ancestors)
if consider_svk_fileprops:
svk_ancestors = ret.estimate_svk_fileprop_ancestors()
if svk_ancestors == 0:
consider_svk_fileprops = False
else:
- ancestors = max(ancestors, svk_ancestors)
+ fileprops_backoff = max(fileprops_backoff, svk_ancestors)
- fileprops_backoff -= 1
+ if bp in paths:
+ fileprops_backoff -= 1
yield ret
def get_config(self):
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-09-02 10:11:44 +0000
+++ b/revmeta.py 2008-09-02 11:24:50 +0000
@@ -114,6 +114,9 @@
if self.is_bzr_revision():
return ()
+ if not self.branch_path in self.get_paths():
+ return ()
+
current = self.get_fileprops().get(SVN_PROP_SVK_MERGE, "")
if current == "":
return ()
More information about the bazaar-commits
mailing list