Rev 2222: Remove find_children. in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sun Dec 7 21:28:19 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2222
revision-id: jelmer at samba.org-20081207212816-c73r6k68qqi5zjd2
parent: jelmer at samba.org-20081207203639-533qdkwpj2wqrg0s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 22:28:16 +0100
message:
Remove find_children.
modified:
fileids.py fileids.py-20060714013623-u5iiyqqnko11grcf-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revmeta.py revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
tests/test_logwalker.py test_logwalker.py-20060622141944-pkocc3rj8g62ukbi-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'fileids.py'
--- a/fileids.py 2008-12-06 03:05:12 +0000
+++ b/fileids.py 2008-12-07 21:28:16 +0000
@@ -177,7 +177,7 @@
continue
revid = revmeta.get_revision_id(mapping)
(idmap, changes) = self.apply_changes(revmeta,
- mapping, self.repos._log.find_children)
+ mapping, self.repos.find_children)
self.update_map(map, revid, idmap, changes)
self._use_text_revids(mapping, revmeta, map)
parent_revs = next_parent_revs
@@ -293,11 +293,9 @@
for i, (revmeta, mapping) in enumerate(reversed(todo)):
pb.update('generating file id map', i, len(todo))
revid = revmeta.get_revision_id(mapping)
- def log_find_children(path, revnum):
- return self.repos._log.find_children(path, revnum)
(idmap, changes) = self.actual.apply_changes(
- revmeta, mapping, log_find_children)
+ revmeta, mapping, self.repos.find_children)
self.actual.update_map(map, revid, idmap, changes)
self._use_text_revids(mapping, revmeta, map)
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-12-07 18:05:41 +0000
+++ b/logwalker.py 2008-12-07 21:28:16 +0000
@@ -237,7 +237,6 @@
self.actual = actual
self.quick_revprops = actual.quick_revprops
self._transport = actual._transport
- self.find_children = actual.find_children
self.saved_revnum = self.cache.last_revnum()
self._latest_revnum = None
@@ -518,35 +517,4 @@
revision="Revision number %d" % revnum)
raise
- def find_children(self, path, revnum, pb=None):
- """Find all children of path in revnum.
- :param path: Path to check
- :param revnum: Revision to check
- """
- assert isinstance(path, str), "invalid path"
- path = path.strip("/")
- conn = self._transport.connections.get(self._transport.get_svn_repos_root())
- results = []
- unchecked_dirs = set([path])
- num_checked = 0
- try:
- while len(unchecked_dirs) > 0:
- if pb is not None:
- pb.update("listing branch contents", num_checked, num_checked+len(unchecked_dirs))
- nextp = unchecked_dirs.pop()
- num_checked += 1
- try:
- dirents = conn.get_dir(nextp, revnum, subvertpy.ra.DIRENT_KIND)[0]
- except subvertpy.SubversionException, (_, num):
- if num == subvertpy.ERR_FS_NOT_DIRECTORY:
- continue
- raise
- for k, v in dirents.iteritems():
- childp = urlutils.join(nextp, k)
- if v['kind'] == subvertpy.NODE_DIR:
- unchecked_dirs.add(childp)
- results.append(childp)
- finally:
- self._transport.connections.add(conn)
- return results
=== modified file 'repository.py'
--- a/repository.py 2008-12-07 20:36:39 +0000
+++ b/repository.py 2008-12-07 21:28:16 +0000
@@ -804,6 +804,39 @@
else:
return iter(self.find_branchpaths(layout, from_revnum, to_revnum, project))
+ def find_children(self, path, revnum, pb=None):
+ """Find all children of path in revnum.
+
+ :param path: Path to check
+ :param revnum: Revision to check
+ """
+ assert isinstance(path, str), "invalid path"
+ path = path.strip("/")
+ conn = self.transport.connections.get(self.transport.get_svn_repos_root())
+ results = []
+ unchecked_dirs = set([path])
+ num_checked = 0
+ try:
+ while len(unchecked_dirs) > 0:
+ if pb is not None:
+ pb.update("listing branch contents", num_checked, num_checked+len(unchecked_dirs))
+ nextp = unchecked_dirs.pop()
+ num_checked += 1
+ try:
+ dirents = conn.get_dir(nextp, revnum, subvertpy.ra.DIRENT_KIND)[0]
+ except subvertpy.SubversionException, (_, num):
+ if num == subvertpy.ERR_FS_NOT_DIRECTORY:
+ continue
+ raise
+ for k, v in dirents.iteritems():
+ childp = urlutils.join(nextp, k)
+ if v['kind'] == subvertpy.NODE_DIR:
+ unchecked_dirs.add(childp)
+ results.append(childp)
+ finally:
+ self.transport.connections.add(conn)
+ return results
+
def abort_write_group(self, suppress_errors=False):
"""See Repository.abort_write_group()."""
self._write_group = None
=== modified file 'revmeta.py'
--- a/revmeta.py 2008-12-07 20:36:39 +0000
+++ b/revmeta.py 2008-12-07 21:28:16 +0000
@@ -169,7 +169,7 @@
# (anything < v4) restricts what paths can be valid branches
paths = dict(self._paths.items())
lazypaths = logwalker.lazy_dict(paths, full_paths,
- self.repository._log.find_children, paths,
+ self.repository.find_children, paths,
self.branch_path, next[0], next[1])
paths[self.branch_path] = ('A', None, -1)
return lazypaths
=== modified file 'tests/test_logwalker.py'
--- a/tests/test_logwalker.py 2008-12-02 13:03:38 +0000
+++ b/tests/test_logwalker.py 2008-12-07 21:28:16 +0000
@@ -423,66 +423,6 @@
'trunk/afile': ('A', None, -1),
'trunk': (u'A', None, -1)}, 1)], items)
- def test_find_children_empty(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- cb.add_dir("trunk")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual([], list(walker.find_children("trunk", 1)))
-
- def test_find_children_one(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- t = cb.add_dir("trunk")
- t.add_file("trunk/data")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual(['trunk/data'], list(walker.find_children("trunk", 1)))
-
- def test_find_children_nested(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- t = cb.add_dir("trunk")
- td = t.add_dir("trunk/data")
- td.add_file("trunk/data/bla")
- t.add_file("trunk/file")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual(
- set(['trunk/data', 'trunk/data/bla', 'trunk/file']),
- set(walker.find_children("trunk", 1)))
-
- def test_find_children_later(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- t = cb.add_dir("trunk")
- td = t.add_dir("trunk/data")
- td.add_file("trunk/data/bla")
- cb.close()
-
- cb = self.get_commit_editor(repos_url)
- t = cb.open_dir("trunk")
- t.add_file("trunk/file")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual(set(['trunk/data', 'trunk/data/bla']),
- set(walker.find_children("trunk", 1)))
- self.assertEqual(set(['trunk/data', 'trunk/data/bla', 'trunk/file']),
- set(walker.find_children("trunk", 2)))
-
def test_revprop_list(self):
repos_url = self.make_repository("a")
@@ -514,64 +454,6 @@
props = walker.revprop_list(1)
self.assertEquals("blaaa", props["foo"])
- def test_find_children_copy(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- t = cb.add_dir("trunk")
- td = t.add_dir("trunk/data")
- td.add_file("trunk/data/bla").modify()
- db = t.add_dir("trunk/db")
- db.add_file("trunk/db/f1").modify()
- db.add_file("trunk/db/f2").modify()
- cb.close()
-
- cb = self.get_commit_editor(repos_url)
- t = cb.open_dir("trunk")
- td = t.open_dir("trunk/data")
- td.add_dir("trunk/data/fg", "trunk/db")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual(set(['trunk/data', 'trunk/data/bla',
- 'trunk/data/fg', 'trunk/data/fg/f1',
- 'trunk/data/fg/f2', 'trunk/db',
- 'trunk/db/f1', 'trunk/db/f2']),
- set(walker.find_children("trunk", 2)))
-
- def test_find_children_copy_del(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
- t = cb.add_dir("trunk")
- td = t.add_dir("trunk/data")
- td.add_file("trunk/data/bla")
- db = t.add_dir("trunk/db")
- db.add_file("trunk/db/f1")
- db.add_file("trunk/db/f2")
- cb.close()
-
- cb = self.get_commit_editor(repos_url)
- t = cb.open_dir("trunk")
- td = t.open_dir("trunk/data")
- td.add_dir("trunk/data/fg", "trunk/db")
- cb.close()
-
- cb = self.get_commit_editor(repos_url)
- t = cb.open_dir("trunk")
- td = t.open_dir("trunk/data")
- fg = td.open_dir("trunk/data/fg")
- fg.delete("trunk/data/fg/f2")
- cb.close()
-
- walker = self.get_log_walker(transport=SvnRaTransport(repos_url))
-
- self.assertEqual(set(['trunk/data', 'trunk/data/bla',
- 'trunk/data/fg', 'trunk/data/fg/f1', 'trunk/db',
- 'trunk/db/f1', 'trunk/db/f2']),
- set(walker.find_children("trunk", 3)))
-
def test_iter_changes_property_change(self):
repos_url = self.make_repository('d')
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py 2008-11-19 00:40:35 +0000
+++ b/tests/test_repository.py 2008-12-07 21:28:16 +0000
@@ -111,6 +111,127 @@
self.assertFalse(repos.seen_bzr_revprops())
+ def test_find_children_empty(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ cb.add_dir("trunk")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual([], list(walker.find_children("trunk", 1)))
+
+ def test_find_children_one(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.add_dir("trunk")
+ t.add_file("trunk/data")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual(['trunk/data'], list(walker.find_children("trunk", 1)))
+
+ def test_find_children_nested(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.add_dir("trunk")
+ td = t.add_dir("trunk/data")
+ td.add_file("trunk/data/bla")
+ t.add_file("trunk/file")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual(
+ set(['trunk/data', 'trunk/data/bla', 'trunk/file']),
+ set(walker.find_children("trunk", 1)))
+
+ def test_find_children_later(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.add_dir("trunk")
+ td = t.add_dir("trunk/data")
+ td.add_file("trunk/data/bla")
+ cb.close()
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.open_dir("trunk")
+ t.add_file("trunk/file")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual(set(['trunk/data', 'trunk/data/bla']),
+ set(walker.find_children("trunk", 1)))
+ self.assertEqual(set(['trunk/data', 'trunk/data/bla', 'trunk/file']),
+ set(walker.find_children("trunk", 2)))
+
+
+ def test_find_children_copy(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.add_dir("trunk")
+ td = t.add_dir("trunk/data")
+ td.add_file("trunk/data/bla").modify()
+ db = t.add_dir("trunk/db")
+ db.add_file("trunk/db/f1").modify()
+ db.add_file("trunk/db/f2").modify()
+ cb.close()
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.open_dir("trunk")
+ td = t.open_dir("trunk/data")
+ td.add_dir("trunk/data/fg", "trunk/db")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual(set(['trunk/data', 'trunk/data/bla',
+ 'trunk/data/fg', 'trunk/data/fg/f1',
+ 'trunk/data/fg/f2', 'trunk/db',
+ 'trunk/db/f1', 'trunk/db/f2']),
+ set(walker.find_children("trunk", 2)))
+
+ def test_find_children_copy_del(self):
+ repos_url = self.make_repository("a")
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.add_dir("trunk")
+ td = t.add_dir("trunk/data")
+ td.add_file("trunk/data/bla")
+ db = t.add_dir("trunk/db")
+ db.add_file("trunk/db/f1")
+ db.add_file("trunk/db/f2")
+ cb.close()
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.open_dir("trunk")
+ td = t.open_dir("trunk/data")
+ td.add_dir("trunk/data/fg", "trunk/db")
+ cb.close()
+
+ cb = self.get_commit_editor(repos_url)
+ t = cb.open_dir("trunk")
+ td = t.open_dir("trunk/data")
+ fg = td.open_dir("trunk/data/fg")
+ fg.delete("trunk/data/fg/f2")
+ cb.close()
+
+ walker = Repository.open(repos_url))
+
+ self.assertEqual(set(['trunk/data', 'trunk/data/bla',
+ 'trunk/data/fg', 'trunk/data/fg/f1', 'trunk/db',
+ 'trunk/db/f1', 'trunk/db/f2']),
+ set(walker.find_children("trunk", 3)))
+
+
+
class SvnRepositoryFormatTests(TestCase):
def setUp(self):
More information about the bazaar-commits
mailing list