Rev 305: Remove scheme property from logwalker. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Tue Dec 26 16:43:44 GMT 2006


------------------------------------------------------------
revno: 305
revision-id: jelmer at samba.org-20061226164250-ofgmt9boudgxei2y
parent: jelmer at samba.org-20061226161240-bmoe91d09xx4ha4e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2006-12-26 17:42:50 +0100
message:
  Remove scheme property from logwalker.
modified:
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_branchprops.py      test_branchprops.py-20061223210444-04xf5224zcg69m3w-1
  tests/test_logwalker.py        test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
=== modified file 'fileids.py'
--- a/fileids.py	2006-12-26 02:35:40 +0000
+++ b/fileids.py	2006-12-26 16:42:50 +0000
@@ -77,8 +77,8 @@
 
     revnum -> branch -> path -> fileid
     """
-    def __init__(self, log, cache_db):
-        self._log = log
+    def __init__(self, repos, cache_db):
+        self.repos = repos
         self.cachedb = cache_db
         self.cachedb.executescript("""
         create table if not exists filemap (filename text, id integer, create_revid text, revid text);
@@ -107,13 +107,13 @@
         :param branch: Branch path where changes happened
         :param global_changes: Dict with global changes that happened
         """
-        changes = get_local_changes(global_changes, self._log.scheme,
+        changes = get_local_changes(global_changes, self.repos.scheme,
                                         uuid)
 
         def find_children(path, revid):
             (_, bp, revnum) = parse_svn_revision_id(revid)
-            for p in self._log.find_children(bp+"/"+path, revnum):
-                yield self._log.scheme.unprefix(p)[1]
+            for p in self.repos._log.find_children(bp+"/"+path, revnum):
+                yield self.repos.scheme.unprefix(p)[1]
 
         revid = generate_svn_revision_id(uuid, revnum, branch)
 
@@ -125,7 +125,7 @@
         todo = []
         next_parent_revs = []
         map = {"": (ROOT_ID, None)} # No history -> empty map
-        for (bp, paths, rev) in self._log.follow_history(branch, revnum):
+        for (bp, paths, rev) in self.repos.follow_history(branch, revnum):
             revid = generate_svn_revision_id(uuid, rev, bp)
             map = self.load(revid)
             if map != {}:
@@ -144,7 +144,7 @@
 
         i = 0
         for (revid, global_changes) in todo:
-            changes = get_local_changes(global_changes, self._log.scheme,
+            changes = get_local_changes(global_changes, self.repos.scheme,
                                         uuid)
             mutter('generating file id map for %r' % revid)
             if pb is not None:
@@ -152,8 +152,8 @@
 
             def find_children(path, revid):
                 (_, bp, revnum) = parse_svn_revision_id(revid)
-                for p in self._log.find_children(bp+"/"+path, revnum):
-                    yield self._log.scheme.unprefix(p)[1]
+                for p in self.repos._log.find_children(bp+"/"+path, revnum):
+                    yield self.repos.scheme.unprefix(p)[1]
 
             parent_revs = next_parent_revs
             map = self._apply_changes(map, revid, changes, find_children)

=== modified file 'logwalker.py'
--- a/logwalker.py	2006-12-26 16:12:40 +0000
+++ b/logwalker.py	2006-12-26 16:42:50 +0000
@@ -56,16 +56,14 @@
 
 class LogWalker(object):
     """Easy way to access the history of a Subversion repository."""
-    def __init__(self, scheme, transport=None, cache_db=None, last_revnum=None, pb=None):
+    def __init__(self, transport=None, cache_db=None, last_revnum=None):
         """Create a new instance.
 
-        :param scheme:  Branching scheme to use.
         :param transport:   SvnRaTransport to use to access the repository.
         :param cache_db:    Optional sql database connection to use. Doesn't 
                             cache if not set.
         :param last_revnum: Last known revnum in the repository. Will be 
                             determined if not specified.
-        :param pb:          Progress bar to report progress to.
         """
         assert isinstance(transport, SvnRaTransport)
 
@@ -75,7 +73,6 @@
         self.last_revnum = last_revnum
 
         self.transport = SvnRaTransport(transport.get_repos_root())
-        self.scheme = scheme
 
         if cache_db is None:
             self.db = sqlite3.connect(":memory:")
@@ -148,9 +145,15 @@
     def follow_history(self, branch_path, revnum):
         """Return iterator over all the revisions between revnum and 
         0 names branch_path or inside branch_path.
+
+        If branch_path is None, all changes will be reported.
         
         :param branch_path:   Branch path to start reporting (in revnum)
         :param revnum:        Start revision.
+
+        :return: An iterators that yields tuples with (branch_path, paths, revnum)
+        where paths is a dictionary with all changes that happened in branch_path 
+        in revnum.
         """
         assert revnum >= 0
 
@@ -172,26 +175,8 @@
 
             continue_revnum = None
 
-            changed_paths = {}
             revpaths = self.get_revision_paths(i)
-            for p in revpaths:
-                if (branch_path is None or 
-                    p == branch_path or
-                    branch_path == "" or
-                    p.startswith(branch_path+"/")):
-
-                    try:
-                        (bp, rp) = self.scheme.unprefix(p)
-                        if not changed_paths.has_key(bp):
-                            changed_paths[bp] = {}
-                        changed_paths[bp][p] = revpaths[p]
-                    except NotBranchError:
-                        pass
-
-            assert branch_path is None or len(changed_paths) <= 1
-
-            for bp in changed_paths:
-                yield (bp, changed_paths[bp], i)
+            yield (branch_path, revpaths, i)
 
             if (not branch_path is None and 
                 revpaths.has_key(branch_path) and
@@ -205,14 +190,9 @@
                 # In this revision, this branch was copied from 
                 # somewhere else
                 continue_revnum = revpaths[branch_path][2]
-                # FIXME: if copyfrom_path is not a branch path, 
-                # should simulate a reverse "split" of a branch
                 branch_path = revpaths[branch_path][1]
-                if not self.scheme.is_branch(branch_path):
-                    warn('directory %r:%d upgraded to branch in %d. This is not currently supported.' % 
-                            (branch_path, continue_revnum, i))
 
-    def find_branches(self, revnum):
+    def find_branches(self, revnum, scheme):
         """Find all branches that were changed in the specified revision number.
 
         :param revnum: Revision to search for branches.
@@ -225,7 +205,7 @@
             else:
                 paths = self.get_revision_paths(i)
             for p in paths:
-                if self.scheme.is_branch(p):
+                if scheme.is_branch(p):
                     if paths[p][0] in ('R', 'D'):
                         del created_branches[p]
                         yield (p, i, False)

=== modified file 'repository.py'
--- a/repository.py	2006-12-26 16:12:40 +0000
+++ b/repository.py	2006-12-26 16:42:50 +0000
@@ -243,17 +243,15 @@
             cachedbs[cache_file] = sqlite3.connect(cache_file)
         self.cachedb = cachedbs[cache_file]
 
-        self._log = logwalker.LogWalker(self.scheme, 
-                                        transport=transport,
+        self._log = logwalker.LogWalker(transport=transport,
                                         cache_db=self.cachedb,
                                         last_revnum=self._latest_revnum)
 
         self.branchprop_list = BranchPropertyList(self._log, self.cachedb)
-        self.fileid_map = SimpleFileIdMap(self._log, self.cachedb)
+        self.fileid_map = SimpleFileIdMap(self, self.cachedb)
 
     def set_branching_scheme(self, scheme):
         self.scheme = scheme
-        self._log.scheme = scheme
 
     def _warn_if_deprecated(self):
         # This class isn't deprecated
@@ -522,18 +520,39 @@
         return osutils.sha_string(self.get_revision_xml(revision_id))
 
     def follow_branch(self, branch_path, revnum):
-        if not branch_path is None and not self.scheme.is_branch(branch_path):
-            raise NotSvnBranchPath(branch_path, revnum)
-
-        for (bp, _, rev) in self._log.follow_history(branch_path, revnum):
+        for (bp, _, rev) in self.follow_history(branch_path, revnum):
             yield (bp, rev)
 
     def follow_history(self, branch_path, revnum):
         if not branch_path is None and not self.scheme.is_branch(branch_path):
             raise NotSvnBranchPath(branch_path, revnum)
 
-        for (bp, paths, rev) in self._log.follow_history(branch_path, revnum):
-            yield (bp, paths, rev)
+        for (branch_path, paths, revnum) in self._log.follow_history(branch_path, revnum):
+            if branch_path is not None and not self.scheme.is_branch(branch_path):
+                # FIXME: if copyfrom_path is not a branch path, 
+                # should simulate a reverse "split" of a branch
+                warn('directory %r:%d upgraded to branch. This is not currently supported.' % 
+                     (branch_path, revnum))
+
+            changed_paths = {}
+            for p in paths:
+                if (branch_path is None or 
+                    p == branch_path or
+                    branch_path == "" or
+                    p.startswith(branch_path+"/")):
+
+                    try:
+                        (bp, rp) = self.scheme.unprefix(p)
+                        if not changed_paths.has_key(bp):
+                            changed_paths[bp] = {}
+                        changed_paths[bp][p] = paths[p]
+                    except NotBranchError:
+                        pass
+
+            assert branch_path is None or len(changed_paths) <= 1
+
+            for bp in changed_paths:
+                yield (bp, changed_paths[bp], revnum)
 
     def has_signature_for_revision_id(self, revision_id):
         # TODO: Retrieve from SVN_PROP_BZR_SIGNATURE 
@@ -566,7 +585,7 @@
     def find_branches(self, revnum=None):
         if revnum is None:
             revnum = self.transport.get_latest_revnum()
-        return self._log.find_branches(revnum)
+        return self._log.find_branches(revnum, self.scheme)
 
     def is_shared(self):
         """Return True if this repository is flagged as a shared repository."""

=== modified file 'tests/test_branchprops.py'
--- a/tests/test_branchprops.py	2006-12-23 22:56:57 +0000
+++ b/tests/test_branchprops.py	2006-12-26 16:42:50 +0000
@@ -35,7 +35,7 @@
         self.client_set_prop("dc", "myprop", "data")
         self.client_commit("dc", "My Message")
 
-        logwalk = LogWalker(scheme=NoBranchingScheme(), transport=SvnRaTransport(repos_url))
+        logwalk = LogWalker(transport=SvnRaTransport(repos_url))
 
         bp = BranchPropertyList(logwalk, self.db)
         self.assertEqual("data", bp.get_property("", 1, "myprop"))
@@ -48,7 +48,7 @@
         self.client_add("dc/foo")
         self.client_commit("dc", "My Message")
 
-        logwalk = LogWalker(scheme=NoBranchingScheme(), transport=SvnRaTransport(repos_url))
+        logwalk = LogWalker(transport=SvnRaTransport(repos_url))
 
         bp = BranchPropertyList(logwalk, self.db)
         self.assertEqual("data", bp.get_property("", 2, "myprop"))
@@ -58,7 +58,7 @@
         self.client_set_prop("dc", "myprop", "data")
         self.client_commit("dc", "My Message")
 
-        logwalk = LogWalker(scheme=NoBranchingScheme(), transport=SvnRaTransport(repos_url))
+        logwalk = LogWalker(transport=SvnRaTransport(repos_url))
 
         bp = BranchPropertyList(logwalk, self.db)
         self.assertEqual(None, bp.get_property("", 1, "otherprop"))
@@ -69,7 +69,7 @@
         self.client_commit("dc", "My Message")
 
         transport = SvnRaTransport(repos_url)
-        logwalk = LogWalker(scheme=NoBranchingScheme(), transport=transport)
+        logwalk = LogWalker(transport=transport)
 
         bp = BranchPropertyList(logwalk, self.db)
         props = bp.get_properties("", 1)
@@ -86,7 +86,7 @@
         self.client_set_prop("dc", "myprop", "data\ndata2\n")
         self.client_commit("dc", "My Message")
 
-        logwalk = LogWalker(scheme=NoBranchingScheme(), transport=SvnRaTransport(repos_url))
+        logwalk = LogWalker(transport=SvnRaTransport(repos_url))
 
         bp = BranchPropertyList(logwalk, self.db)
         self.assertEqual("data2\n", bp.get_property_diff("", 2, "myprop"))

=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py	2006-12-26 16:12:40 +0000
+++ b/tests/test_logwalker.py	2006-12-26 16:42:50 +0000
@@ -32,7 +32,7 @@
 
     def test_create(self):
         repos_url = self.make_client("a", "ac")
-        logwalker.LogWalker(NoBranchingScheme(), transport=SvnRaTransport(repos_url))
+        logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
     def test_get_branch_log(self):
         repos_url = self.make_client("a", "dc")
@@ -40,15 +40,13 @@
         self.client_add("dc/foo")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(1, len(list(walker.follow_history("", 1))))
 
     def test_get_branch_invalid_revision(self):
         repos_url = self.make_client("a", "dc")
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
         self.assertRaises(NoSuchRevision, list, 
                           walker.follow_history("/", 20))
 
@@ -60,8 +58,7 @@
         self.client_add("dc/foo")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(1, len(list(walker.follow_history(None, 1))))
 
@@ -76,8 +73,7 @@
         self.client_add("dc/branches")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(1, len(list(walker.follow_history("branches/brancha",
             1))))
@@ -85,10 +81,9 @@
     def test_find_branches_no(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
-        self.assertEqual([("", 0, True)], list(walker.find_branches(0)))
+        self.assertEqual([("", 0, True)], list(walker.find_branches(0, NoBranchingScheme())))
 
     def test_find_latest_none(self):
         repos_url = self.make_client("a", "dc")
@@ -96,8 +91,7 @@
         self.client_add("dc/branches")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(0, walker.find_latest_change("", 1))
 
@@ -107,8 +101,7 @@
         self.client_add("dc/branches")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(1, walker.find_latest_change("branches", 1))
 
@@ -121,8 +114,7 @@
         self.client_add("dc/branches/foo")
         self.client_commit("dc", "My Message2")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(1, walker.find_latest_change("branches", 2))
 
@@ -137,8 +129,7 @@
         self.client_add("dc/branches/foo")
         self.client_commit("dc", "My Message2")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(2, walker.find_latest_change("branches", 3))
 
@@ -153,8 +144,7 @@
         self.build_tree({'dc/branches/foo': 'data4'})
         self.client_commit("dc", "My Message2")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(3, walker.find_latest_change("branches/foo", 3))
 
@@ -169,44 +159,39 @@
         self.build_tree({'dc/branches/foo': 'data4'})
         self.client_commit("dc", "My Message2")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(2, walker.find_latest_change("branches/foo", 2))
 
     def test_find_branches_no_later(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
-        self.assertEqual([("", 0, True)], list(walker.find_branches(0)))
+        self.assertEqual([("", 0, True)], list(walker.find_branches(0, NoBranchingScheme())))
 
     def test_find_branches_trunk_empty(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
-        self.assertEqual([], list(walker.find_branches(0)))
+        self.assertEqual([], list(walker.find_branches(0, TrunkBranchingScheme())))
 
     def test_find_branches_trunk_one(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.build_tree({'dc/trunk/foo': "data"})
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        self.assertEqual([("trunk", 1, True)], list(walker.find_branches(1)))
+        self.assertEqual([("trunk", 1, True)], list(walker.find_branches(1, TrunkBranchingScheme())))
 
     def test_find_branches_removed(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.build_tree({'dc/trunk/foo': "data"})
         self.client_add("dc/trunk")
@@ -215,8 +200,8 @@
         self.client_delete("dc/trunk")
         self.client_commit("dc", "remove")
 
-        self.assertEqual([("trunk", 1, True)], list(walker.find_branches(1)))
-        self.assertEqual([("trunk", 2, False)], list(walker.find_branches(2)))
+        self.assertEqual([("trunk", 1, True)], list(walker.find_branches(1, TrunkBranchingScheme())))
+        self.assertEqual([("trunk", 2, False)], list(walker.find_branches(2,  TrunkBranchingScheme())))
 
     def test_follow_history_branch_replace(self):
         repos_url = self.make_client("a", "dc")
@@ -232,16 +217,14 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "Cm1")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
         self.assertEqual([("trunk", {"trunk/data": ('A', None, -1),
                                      "trunk": ('A', None, -1)}, 3)], 
                 list(walker.follow_history("trunk", 3)))
 
     def test_follow_history(self):
         repos_url = self.make_client("a", "dc")
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.build_tree({'dc/foo': "data"})
         self.client_add("dc/foo")
@@ -254,16 +237,14 @@
 
     def test_follow_history_nohist(self):
         repos_url = self.make_client("a", "dc")
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual([], list(walker.follow_history("", 0)))
 
     def test_later_update(self):
         repos_url = self.make_client("a", "dc")
 
-        walker = logwalker.LogWalker(NoBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.build_tree({'dc/foo': "data"})
         self.client_add("dc/foo")
@@ -287,8 +268,7 @@
         self.client_copy("dc/trunk", "dc/branches/abranch")
         self.client_commit("dc", "Create branch")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         items = list(walker.follow_history("branches/abranch", 2))
         self.assertEqual(2, len(items))
@@ -299,8 +279,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertTrue(walker.touches_path("trunk", 1))
 
@@ -310,8 +289,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertTrue(walker.touches_path("", 0))
 
@@ -321,8 +299,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertFalse(walker.touches_path("", 1))
 
@@ -334,8 +311,7 @@
         self.build_tree({'dc/trunk/afile': "data2"})
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertFalse(walker.touches_path("trunk", 2))
 
@@ -348,8 +324,7 @@
         self.client_set_prop("dc/trunk", "myprop", "mydata")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(("trunk", 1), walker.get_previous("trunk", 2))
 
@@ -362,8 +337,7 @@
         self.client_set_prop("dc/trunk", "myprop", "mydata")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual((None, -1), walker.get_previous("trunk", 1))
 
@@ -375,8 +349,7 @@
         self.client_copy("dc/trunk", "dc/anotherfile")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(("trunk", 1), walker.get_previous("anotherfile", 2))
 
@@ -386,8 +359,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         info = walker.get_revision_info(1)
 
@@ -400,8 +372,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual([], list(walker.find_children("trunk", 1)))
 
@@ -411,8 +382,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(['trunk/data'], list(walker.find_children("trunk", 1)))
 
@@ -422,8 +392,7 @@
         self.client_add("dc/trunk")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(['trunk/data', 'trunk/data/bla', 'trunk/file'], 
                 list(walker.find_children("trunk", 1)))
@@ -437,8 +406,7 @@
         self.client_add("dc/trunk/file")
         self.client_commit("dc", "My Message")
 
-        walker = logwalker.LogWalker(TrunkBranchingScheme(), 
-                                     transport=SvnRaTransport(repos_url))
+        walker = logwalker.LogWalker(transport=SvnRaTransport(repos_url))
 
         self.assertEqual(['trunk/data', 'trunk/data/bla'], 
                 list(walker.find_children("trunk", 1)))




More information about the bazaar-commits mailing list