Rev 2119: Fix revisions at rootlayouts. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2119
revision-id: jelmer at samba.org-20081201015522-mtyuxs4s3muihx4x
parent: jelmer at samba.org-20081201012556-b4xiuqofnqe2qupu
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-12-01 02:55:22 +0100
message:
  Fix revisions at rootlayouts.
modified:
  changes.py                     changes.py-20080330205801-lh92uht2ztppvdcz-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  upgrade.py                     upgrade.py-20070106192108-0rakplee2lzah4gs-1
=== modified file 'changes.py'
--- a/changes.py	2008-11-30 22:17:51 +0000
+++ b/changes.py	2008-12-01 01:55:22 +0000
@@ -116,6 +116,8 @@
         elif root.startswith("%s/" % p): # new path is parent of root
             root = p
         else:
+            if "" in paths:
+                return ""
             return None # Mismatch
     return root
 

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-01 01:25:56 +0000
+++ b/revmeta.py	2008-12-01 01:55:22 +0000
@@ -349,7 +349,7 @@
         This is a requirement for revisions pushed with bzr-svn using 
         file properties.
         """
-        return changes.changes_root(self.get_paths()) == self.branch_path
+        return changes.changes_root(self.get_paths().keys()) == self.branch_path
 
     def is_hidden(self, mapping):
         """Check whether this revision should be hidden from Bazaar history."""
@@ -374,7 +374,7 @@
         if self.consider_bzr_fileprops():
             order.append(self.is_bzr_revision_fileprops)
         # Only look for revprops if they could've been committed
-        if ((not self._log.quick_revprops) and self.check_revprops):
+        if (self.check_revprops and not self.is_bzr_revision_revprops in order):
             order.append(self.is_bzr_revision_revprops)
         for fn in order:
             ret = fn()

=== modified file 'upgrade.py'
--- a/upgrade.py	2008-11-29 02:52:14 +0000
+++ b/upgrade.py	2008-12-01 01:55:22 +0000
@@ -43,9 +43,9 @@
                 # Never a bzr-svn revision
                 continue
             # Find the root path of the change
-            bp = changes.changes_root(paths.keys())
+            bp = revprops.get(mapping.SVN_REVPROP_BZR_ROOT)
             if bp is None:
-                bp = revprops.get(mapping.SVN_REVPROP_BZR_ROOT)
+                bp = changes.changes_root(paths.keys())
             if bp is None:
                 # Not a bzr-svn revision, since there is not a single root
                 # (fileproperties) nor a bzr:root revision property