Merge lp:~maxb/bzr-svn/unused into lp:bzr-svn/1.0

[Max Bowsher]

As I was reading bzr-svn code recently, I found some pieces of code which, AFAICS, are unused / redundant. At least, I couldn't find anything using them by grepping the bzr and bzr-svn code.

[Jelmer Vernooij (jelmer)]

As discussed on IRC, I'd like to keep get_rhs_ancestors().

review: Needs Fixing

[Max Bowsher (maxb)]

> As discussed on IRC, I'd like to keep get_rhs_ancestors().

Accordingly, I have replayed the revisions that were still applicable on top of tip of trunk.

Please excuse the noise in the MP - Launchpad has listed every trunk revision since my initial branch in the MP comment trail.

review: Resubmit

[Max Bowsher (maxb)]

> Please excuse the noise in the MP - Launchpad has listed every trunk revision
> since my initial branch in the MP comment trail.

Huh. Except now it has removed them again.

=== modified file 'mapping4.py'
--- mapping4.py	2009-11-26 20:57:57 +0000
+++ mapping4.py	2010-09-17 21:42:45 +0000
@@ -59,10 +59,7 @@
 
     @classmethod
     def from_repository(cls, repository, _hinted_branch_path=None):
-        if _hinted_branch_path == "":
-            return cls()
-        else:
-            return cls()
+        return cls()
 
     @classmethod
     def from_revprops(cls, revprops):

=== modified file 'repository.py'
--- repository.py	2010-09-15 00:07:26 +0000
+++ repository.py	2010-09-17 21:42:45 +0000
@@ -443,8 +443,7 @@
         self.branchprop_list = PathPropertyProvider(self._log)
 
         self._revmeta_provider = revmeta.RevisionMetadataProvider(self,
-                self.revinfo_cache is not None,
-                self.transport.has_capability("commit-revprops") in (True, None))
+                self.revinfo_cache is not None)
 
     def get_transaction(self):
         """See Repository.get_transaction()."""

=== modified file 'revmeta.py'
--- revmeta.py	2010-09-15 00:07:26 +0000
+++ revmeta.py	2010-09-17 21:42:45 +0000
@@ -189,14 +189,14 @@
     from other known data before contacting the Subversions server.
     """
 
-    __slots__ = ('check_revprops', '_get_fileprops_fn',
+    __slots__ = ('_get_fileprops_fn',
                  '_changed_fileprops', '_fileprops',
                  '_direct_lhs_parent_known', '_consider_bzr_fileprops',
                  '_consider_bzr_revprops', '_estimated_fileprop_ancestors',
                  'metaiterators', 'children',
                  '_direct_lhs_parent_revmeta', '_revprop_redirect_revnum')
 
-    def __init__(self, repository, check_revprops, get_fileprops_fn,
+    def __init__(self, repository, get_fileprops_fn,
                  branch_path, logwalker, revnum, paths, revprops,
                  changed_fileprops=None, fileprops=None,
                  metaiterator=None):
@@ -204,7 +204,6 @@
             repository.uuid, branch_path, revnum, paths=paths,
             revprops=revprops)
         self.repository = repository
-        self.check_revprops = check_revprops
         self._get_fileprops_fn = get_fileprops_fn
         self._changed_fileprops = changed_fileprops
         self._fileprops = fileprops
@@ -1274,12 +1273,11 @@
 class RevisionMetadataProvider(object):
     """A RevisionMetadata provider."""
 
-    def __init__(self, repository, cache, check_revprops):
+    def __init__(self, repository, cache):
         self._revmeta_cache = {}
         self.repository = repository
         self._get_fileprops_fn = self.repository.branchprop_list.get_properties
         self._log = repository._log
-        self.check_revprops = check_revprops
         self._open_metaiterators = []
         if cache:
             self._revmeta_cls = CachingBzrRevisionMetadata
@@ -1292,7 +1290,7 @@
         """Create a new RevisionMetadata instance, assuming this
         revision isn't cached yet.
         """
-        return self._revmeta_cls(self.repository, self.check_revprops,
+        return self._revmeta_cls(self.repository,
                                  self._get_fileprops_fn,
                                  path, self._log, revnum, changes, revprops,
                                  changed_fileprops=changed_fileprops,