Rev 2098: Some more refactoring. 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: 2098
revision-id: jelmer at samba.org-20081129041448-crcg2f0wmtzixvhn
parent: jelmer at samba.org-20081129035903-glfk6ram2xs4p43p
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sat 2008-11-29 05:14:48 +0100
message:
  Some more refactoring.
modified:
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revmeta.py'
--- a/revmeta.py	2008-11-29 03:59:03 +0000
+++ b/revmeta.py	2008-11-29 04:14:48 +0000
@@ -305,10 +305,13 @@
         """
         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.
         """
-        if changes.changes_root(self.get_paths()) != self.branch_path:
+        if not self.is_changes_root():
             return False
         return is_bzr_revision_fileprops(self.get_changed_fileprops())
 
@@ -333,7 +336,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.consider_bzr_revprops()):
+        if ((not self._log.quick_revprops) and self.check_revprops):
             order.append(self.is_bzr_revision_revprops)
         for fn in order:
             ret = fn()
@@ -447,9 +450,6 @@
     def consider_bzr_fileprops(self):
         return self.metabranch is None or self.metabranch.consider_bzr_fileprops(self)
 
-    def consider_bzr_revprops(self):
-        return self.check_revprops
-
     def consider_svk_fileprops(self):
         return self.metabranch is None or self.metabranch.consider_svk_fileprops(self)
 
@@ -573,6 +573,8 @@
         return ret
 
     def _index(self, revmeta):
+        """Find the location of a revmeta object, counted from the 
+        most recent revision."""
         i = len(self._revs) - bisect.bisect_right(self._revnums, revmeta.revnum)
         assert i == len(self._revs) or self._revs[i] == revmeta
         return i