Rev 327: Allow specifying find_children() function. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 327
revision-id: jelmer at samba.org-20061229171536-42b4448bos7zjhp4
parent: jelmer at samba.org-20061229165621-bm2p23gukm0yj8fx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Fri 2006-12-29 18:15:36 +0100
message:
  Allow specifying find_children() function.
modified:
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'fileids.py'
--- a/fileids.py	2006-12-29 05:17:51 +0000
+++ b/fileids.py	2006-12-29 17:15:36 +0000
@@ -109,7 +109,8 @@
 
         return map
 
-    def apply_changes(self, uuid, revnum, branch, global_changes):
+    def apply_changes(self, uuid, revnum, branch, global_changes, 
+                      find_children=None):
         """Change file id map to incorporate specified changes.
 
         :param uuid: UUID of repository changes happen in
@@ -118,16 +119,16 @@
         :param global_changes: Dict with global changes that happened
         """
         changes = get_local_changes(global_changes, self.repos.scheme,
-                                        uuid, self.repos._log.find_children)
+                                        uuid, find_children)
 
-        def find_children(path, revid):
+        def get_children(path, revid):
             (_, bp, revnum) = parse_svn_revision_id(revid)
-            for p in self.repos._log.find_children(bp+"/"+path, revnum):
+            for p in find_children(bp+"/"+path, revnum):
                 yield self.repos.scheme.unprefix(p)[1]
 
         revid = generate_svn_revision_id(uuid, revnum, branch)
 
-        return self._apply_changes(revid, changes, find_children)
+        return self._apply_changes(revid, changes, get_children)
 
     def get_map(self, uuid, revnum, branch, pb=None):
         """Make sure the map is up to date until revnum."""

=== modified file 'repository.py'
--- a/repository.py	2006-12-29 02:04:14 +0000
+++ b/repository.py	2006-12-29 17:15:36 +0000
@@ -256,7 +256,8 @@
         return self.fileid_map.get_map(self.uuid, revnum, path, pb)
 
     def transform_fileid_map(self, uuid, revnum, branch, changes):
-        return self.fileid_map.apply_changes(uuid, revnum, branch, changes)
+        return self.fileid_map.apply_changes(uuid, revnum, branch, changes,
+                find_children=self._log.find_children)
 
     def path_to_file_id(self, revnum, path):
         """Generate a bzr file id from a Subversion file name.