Rev 2101: More reformatting. 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: 2101
revision-id: jelmer at samba.org-20081129051428-9zz2ijdqh5py2wqj
parent: jelmer at samba.org-20081129043410-kcnan2im0fen63os
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sat 2008-11-29 06:14:28 +0100
message:
  More reformatting.
modified:
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revids.py'
--- a/revids.py	2008-11-24 23:20:27 +0000
+++ b/revids.py	2008-11-29 05:14:28 +0000
@@ -64,8 +64,8 @@
 
         for entry_revid, branch, min_revno, max_revno, mapping in self.discover_fileprop_revids(layout, 0, fileprops_to_revnum, project):
             if revid == entry_revid:
-                (bp, revnum, mapping_name) = self.bisect_revid_revnum(revid, branch, min_revno, max_revno)
-                return (self.repos.uuid, bp, revnum), mapping_name
+                (foreign_revid, mapping_name) = self.bisect_revid_revnum(revid, branch, min_revno, max_revno)
+                return (foreign_revid, mapping_name)
         raise NoSuchRevision(self, revid)
 
     def discover_revprop_revids(self, layout, from_revnum, to_revnum):
@@ -138,12 +138,13 @@
                     mapping_name = propname[len(SVN_PROP_BZR_REVISION_ID):]
                     mapping = mapping_registry.parse_mapping_name("svn-" + mapping_name)
                     assert mapping.is_branch_or_tag(revmeta.branch_path)
-                    return (revmeta.branch_path, revmeta.revnum, mapping)
+                    return (revmeta.get_foreign_revid(), mapping)
 
         raise InvalidBzrSvnRevision(revid)
 
 
 class CachingRevidMap(object):
+
     def __init__(self, actual, cachedb=None):
         self.cache = RevisionIdMapCache(cachedb)
         self.actual = actual
@@ -208,10 +209,10 @@
             assert min_revnum <= max_revnum
             assert isinstance(branch_path, str)
 
-        (branch_path, revnum, mapping) = self.actual.bisect_revid_revnum(revid, 
+        ((uuid, branch_path, revnum), mapping) = self.actual.bisect_revid_revnum(revid, 
             branch_path, min_revnum, max_revnum)
         self.cache.insert_revid(revid, branch_path, revnum, revnum, mapping.name)
-        return (self.actual.repos.uuid, branch_path, revnum), mapping
+        return (uuid, branch_path, revnum), mapping
 
 
 class RevisionIdMapCache(CacheTable):

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-11-29 04:31:03 +0000
+++ b/revmeta.py	2008-11-29 05:14:28 +0000
@@ -287,16 +287,16 @@
 
         """
         if not self.knows_fileprops() and not self.consider_bzr_fileprops():
-            # This revisions descendant doesn't have bzr fileprops set, so this one can't have 
-            # them either.
+            # This revisions descendant doesn't have bzr fileprops set, so 
+            # this one can't have them either.
             return 0
         return estimate_bzr_ancestors(self.get_fileprops())
 
     def estimate_svk_fileprop_ancestors(self):
         """Estimate how many svk ancestors this revision has."""
         if not self.knows_fileprops() and not self.consider_svk_fileprops():
-            # This revisions descendant doesn't have svk fileprops set, so this one can't have 
-            # them either.
+            # This revisions descendant doesn't have svk fileprops set, so
+            # this one can't have them either.
             return 0
         return estimate_svk_ancestors(self.get_fileprops())
 
@@ -305,9 +305,6 @@
         """
         return is_bzr_revision_revprops(self.get_revprops())
 
-    def is_changes_root(self):
-        return changes.changes_root(self.get_paths()) == self.branch_path
-
     def is_bzr_revision_fileprops(self):
         """Check if any file properties indicate this is a bzr revision.
         """
@@ -315,6 +312,9 @@
             return False
         return is_bzr_revision_fileprops(self.get_changed_fileprops())
 
+    def is_changes_root(self):
+        return changes.changes_root(self.get_paths()) == self.branch_path
+
     def is_hidden(self, mapping):
         """Check whether this revision should be hidden from Bazaar history."""
         if not mapping.supports_hidden:
@@ -347,7 +347,8 @@
 
     def get_bzr_merges(self, mapping):
         """Check what Bazaar revisions were merged in this revision."""
-        return mapping.get_rhs_parents(self.branch_path, self.get_revprops(), self.get_changed_fileprops())
+        return mapping.get_rhs_parents(self.branch_path, self.get_revprops(), 
+                                       self.get_changed_fileprops())
 
     def get_svk_merges(self, mapping):
         """Check what SVK revisions were merged in this revision."""
@@ -436,16 +437,19 @@
         rev.svn_meta = self
 
         mapping.import_revision(self.get_revprops(), 
-                                self.get_changed_fileprops(), self.get_foreign_revid(), rev)
+                                self.get_changed_fileprops(), 
+                                self.get_foreign_revid(), rev)
 
         return rev
 
     def get_fileid_map(self, mapping):
         """Find the file id override map for this revision."""
-        return mapping.import_fileid_map(self.get_revprops(), self.get_changed_fileprops())
+        return mapping.import_fileid_map(self.get_revprops(), 
+                                         self.get_changed_fileprops())
 
     def get_text_revisions(self, mapping):
-        return mapping.import_text_revisions(self.get_revprops(), self.get_changed_fileprops())
+        return mapping.import_text_revisions(self.get_revprops(), 
+                                             self.get_changed_fileprops())
 
     def consider_bzr_fileprops(self):
         return self.metabranch is None or self.metabranch.consider_bzr_fileprops(self)