Rev 1251: Remove LogWalker.get_revision_paths() from the public API. in http://people.samba.org/bzr/jelmer/bzr-svn/svn-1.5

Jelmer Vernooij jelmer at samba.org
Mon Jun 23 21:48:17 BST 2008


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

------------------------------------------------------------
revno: 1251
revision-id: jelmer at samba.org-20080623204807-p02ihfz5hoj7tgfy
parent: jelmer at samba.org-20080623204016-19v374f8e2y61pnh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: svn-1.5
timestamp: Mon 2008-06-23 22:48:07 +0200
message:
  Remove LogWalker.get_revision_paths() from the public API.
modified:
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
=== modified file 'logwalker.py'
--- a/logwalker.py	2008-06-23 20:38:16 +0000
+++ b/logwalker.py	2008-06-23 20:48:07 +0000
@@ -356,7 +356,7 @@
                     revision="Revision number %d" % from_revnum)
             raise
 
-    def get_revision_paths(self, revnum):
+    def _get_revision_paths(self, revnum):
         """Obtain dictionary with all the changes in a particular revision.
 
         :param revnum: Subversion revision number
@@ -440,7 +440,7 @@
             if revnum == 0:
                 return (None, -1)
             return (path, revnum - 1)
-        row = changes.find_prev_location(self.get_revision_paths(revnum), path, revnum)
+        row = changes.find_prev_location(self._get_revision_paths(revnum), path, revnum)
         if row is None:
             return (None, -1)
         return row
@@ -452,7 +452,7 @@
         :param path:  Path to check
         :param revnum:  Revision to check
         """
-        return changes.changes_path(self.get_revision_paths(revnum), path)
+        return changes.changes_path(self._get_revision_paths(revnum), path)
 
 
 class CachingLogWalker(LogWalker):
@@ -517,7 +517,10 @@
             if pb is not None:
                 pb.update("determining changes", from_revnum-revnum, from_revnum)
             assert revnum > 0 or path == "", "Inconsistent path,revnum: %r,%r" % (revnum, path)
-            revpaths = self._get_revision_paths(revnum)
+            if revnum == 0:
+                revpaths = {'': ('A', None, -1)}
+            else:
+                revpaths = self.cache.get_revision_paths(revnum)
 
             if ascending:
                 next = (path, revnum+1)
@@ -586,24 +589,6 @@
             return (None, -1) # newly added
         return (copyfrom_path + path[len(branch_path):], copyfrom_rev)
 
-    def _get_revision_paths(self, revnum):
-        if revnum == 0:
-            return {'': ('A', None, -1)}
-
-        return self.cache.get_revision_paths(revnum)
-
-    def get_revision_paths(self, revnum):
-        """Obtain dictionary with all the changes in a particular revision.
-
-        :param revnum: Subversion revision number
-        :returns: dictionary with paths as keys and 
-                  (action, copyfrom_path, copyfrom_rev) as values.
-        """
-        self.mutter("revision paths: %r", revnum)
-
-        self._fetch_revisions("", revnum)
-        return self._get_revision_paths(revnum)
-
     def changes_path(self, path, revnum):
         """Check if one of the specified changes applies 
         to path or one of its children.

=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py	2008-06-23 20:38:16 +0000
+++ b/tests/test_logwalker.py	2008-06-23 20:48:07 +0000
@@ -142,25 +142,6 @@
                            "trunk": ('A', None, -1)}, 1)
             ], [l[:2] for l in walker.iter_changes(["branches/abranch/foo"], 3)])
 
-    def test_get_revision_paths(self):
-        repos_url = self.make_repository("a")
-        cb = self.get_commit_editor(repos_url)
-        cb.add_file("foo").modify()
-        cb.close()
-        walker = self.get_log_walker(SvnRaTransport(repos_url))
-        self.assertEqual({"foo": ('A', None, -1)}, walker.get_revision_paths(1))
-        self.assertEqual({"": ('A', None, -1)}, walker.get_revision_paths(0))
-
-    def test_get_revision_paths_zero(self):
-        repos_url = self.make_repository("a")
-        walker = self.get_log_walker(SvnRaTransport(repos_url))
-        self.assertEqual({'': ('A', None, -1)}, walker.get_revision_paths(0))
-
-    def test_get_revision_paths_invalid(self):
-        repos_url = self.make_repository("a")
-        walker = self.get_log_walker(SvnRaTransport(repos_url))
-        self.assertRaises(NoSuchRevision, lambda: walker.get_revision_paths(42))
-
     def test_get_branch_invalid_revision(self):
         repos_url = self.make_repository("a")
         walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
@@ -781,7 +762,7 @@
         cb.close()
 
         walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-        self.assertEquals({'trunk': ('M', None, -1)}, walker.get_revision_paths(3))
+        self.assertTrue(walker.changes_path("trunk", 3))
 
     def test_iter_changes_property_change(self):
         repos_url = self.make_repository('d')




More information about the bazaar-commits mailing list