Rev 295: Use more pools. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

Jelmer Vernooij jelmer at samba.org
Mon Dec 25 23:32:26 GMT 2006


------------------------------------------------------------
revno: 295
revision-id: jelmer at samba.org-20061225233146-vjrnml25vfrv5o3w
parent: jelmer at samba.org-20061225230933-0so0ha9amws46pc4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Tue 2006-12-26 00:31:46 +0100
message:
  Use more pools.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'fetch.py'
--- a/fetch.py	2006-12-25 23:05:18 +0000
+++ b/fetch.py	2006-12-25 23:31:46 +0000
@@ -328,27 +328,25 @@
                                      self.source._log.get_revision_info(revnum),
                                      id_map, parent_branch, parent_id_map)
 
-            edit, edit_baton = svn.delta.make_editor(editor)
+            pool = Pool()
+            edit, edit_baton = svn.delta.make_editor(editor, pool)
 
             if parent_branch is None:
                 transport.reparent(repos_root)
             else:
                 transport.reparent("%s/%s" % (repos_root, parent_branch))
-            pool = Pool()
             if parent_branch != branch:
                 switch_url = "%s/%s" % (repos_root, branch)
                 mutter('svn switch %r:%r -> %r:%r' % 
                                (parent_branch, parent_revnum, switch_url, revnum))
                 reporter, reporter_baton = transport.do_switch(
                            revnum, "", True, 
-                           switch_url,
-                           edit, edit_baton, pool)
+                           switch_url, edit, edit_baton, pool)
             else:
                 mutter('svn update -r %r:%r %r' % 
                                (parent_revnum, revnum, branch))
                 reporter, reporter_baton = transport.do_update(
-                           revnum, "", True, 
-                           edit, edit_baton, pool)
+                           revnum, "", True, edit, edit_baton, pool)
 
             # Report status of existing paths
             svn.ra.reporter2_invoke_set_path(reporter, reporter_baton, 

=== modified file 'transport.py'
--- a/transport.py	2006-12-25 17:12:14 +0000
+++ b/transport.py	2006-12-25 23:31:46 +0000
@@ -168,7 +168,7 @@
         self.base = url
         self.svn_url = url
         if hasattr(svn.ra, 'reparent'):
-            svn.ra.reparent(self._ra, url)
+            svn.ra.reparent(self._ra, url, self.pool)
         else:
             self._ra = svn.client.open_ra_session(self.svn_url.encode('utf8'), 
                     self._client, self.pool)




More information about the bazaar-commits mailing list