Rev 2229: Fix indentation. in file:///data/jelmer/bzr-svn/mappings/

Jelmer Vernooij jelmer at samba.org
Mon Dec 8 01:06:24 GMT 2008


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

------------------------------------------------------------
revno: 2229
revision-id: jelmer at samba.org-20081208010618-z1om28kjtxp4nz28
parent: jelmer at samba.org-20081208010355-tv9rjnzqrexbqj0k
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Mon 2008-12-08 02:06:18 +0100
message:
  Fix indentation.
modified:
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-08 01:03:55 +0000
+++ b/revmeta.py	2008-12-08 01:06:18 +0000
@@ -635,8 +635,12 @@
             return self._consider_bzr_revprops
         if not self.is_changes_root():
             self._consider_bzr_revprops = False
-        elif not self._log._transport.has_capability("commit-revprops"):
+        elif self._log._transport.has_capability("commit-revprops") == False:
+            # Server doesn't support setting revision properties
             self._consider_bzr_revprops = False
+        elif self._log._transport.has_capability("log-revprops") is None:
+            # Client doesn't know log-revprops capability
+            self._consider_bzr_revprops = True
         else:
             # Check nearest descendant with bzr:see-revprops set
             # and return True if revnum in that property < self.revnum
@@ -653,9 +657,9 @@
                 self._revprop_redirect_revnum = int(self.get_fileprops()[SVN_PROP_BZR_REVPROP_REDIRECT])
             else:
                 self._revprop_redirect_revnum = None
-            else:
-                next = iter(self.children).next()
-                self._revprop_redirect_revnum = next._get_revprop_redirect_revnum()
+        else:
+            next = iter(self.children).next()
+            self._revprop_redirect_revnum = next._get_revprop_redirect_revnum()
         return self._revprop_redirect_revnum
 
     def consider_bzr_hidden_fileprops(self):




More information about the bazaar-commits mailing list