Rev 1765: Don't fetch file properties if they're not present in a later revision. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1765
revision-id: jelmer at samba.org-20080901204016-wekl3tys4uyogw41
parent: jelmer at samba.org-20080901203856-pz27las5fs2he10c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 22:40:16 +0200
message:
  Don't fetch file properties if they're not present in a later revision.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py	2008-09-01 20:01:10 +0000
+++ b/repository.py	2008-09-01 20:40:16 +0000
@@ -109,7 +109,7 @@
         # Only look for revprops if they could've been committed
         if (not self.repository.quick_log_revprops and 
                 self.repository.check_revprops):
-                order.append(lambda: is_bzr_revision_revprops(self.revprops))
+            order.append(lambda: is_bzr_revision_revprops(self.revprops))
         for fn in order:
             ret = fn()
             if ret is not None:
@@ -287,7 +287,7 @@
         self.branchprop_list = PathPropertyProvider(self._log)
 
         self.check_revprops = self.transport.has_capability("commit-revprops") in (True, None)
-        self.quick_log_revprops = self.transport.has_capability("log-revprops") == True
+        self.quick_log_revprops = (self.transport.has_capability("log-revprops") == True)
 
     def get_revmap(self):
         return self.revmap
@@ -811,12 +811,16 @@
         """
         history_iter = self.iter_changes(branch_path, from_revnum, to_revnum, 
                                          mapping, pb=pb, limit=limit)
+        consider_fileprops = True
         for (bp, paths, revnum, revprops) in history_iter:
             if not bp in paths:
                 svn_fileprops = {}
             else:
                 svn_fileprops = self.branchprop_list.get_changed_properties(bp, revnum, skip_check=True)
 
+            if consider_fileprops:
+                consider_fileprops = is_bzr_revision_fileprops(svn_fileprops)
+
             yield self._revmeta(bp, paths, revnum, revprops, svn_fileprops)
 
     def get_config(self):