Rev 818: Don't mask exception in fetch code. in file:///data/jelmer/bzr-svn/0.4/

Jelmer Vernooij jelmer at samba.org
Fri Jan 18 04:05:51 GMT 2008


At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 818
revision-id:jelmer at samba.org-20071221201924-oahm630a02yawck6
parent: jelmer at samba.org-20071221144612-12avq8p5yq5xcyba
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-12-21 21:19:24 +0100
message:
  Don't mask exception in fetch code.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'NEWS'
--- a/NEWS	2007-12-21 14:46:12 +0000
+++ b/NEWS	2007-12-21 20:19:24 +0000
@@ -4,7 +4,7 @@
   
    * Remember where revids have already been detected. Makes incremental
      push a lot faster, in particular in Subversion repositories 
-	 with a lot of branches. (#139364)
+     with a lot of branches. (#139364)
 
    * Work around memory leak in the Python Subversion bindings of svn.ra.get_log(). 
 
@@ -22,6 +22,8 @@
 
    * Actually set symlink target when pushing commits that add or change symlinks. (#177890)
 
+   * Don't mask exception in fetch code. (#165177)
+
 bzr-svn 0.4.5	2007-12-01
 
   IMPROVEMENTS

=== modified file 'TODO'
--- a/TODO	2007-12-15 02:17:21 +0000
+++ b/TODO	2007-12-21 20:19:24 +0000
@@ -2,7 +2,6 @@
 - generate deltas rather than fulltexts when creating file id maps
 - BzrDir.create_branch() should set the revision id to NULL_REVISION
 - avoid extra connect in logwalker?
-- free memory! (#54253)
 - tests for setting svk:merge from .bzr checkout
 - tests for http-specific SvnRaTransport._request_path() code
 - tests for auth.py

=== modified file 'fetch.py'
--- a/fetch.py	2007-11-26 11:32:01 +0000
+++ b/fetch.py	2007-12-21 20:19:24 +0000
@@ -424,6 +424,7 @@
         self.weave_store = target.weave_store
 
     def _start_revision(self):
+        self._write_group_active = True
         self.target.start_write_group()
 
     def _store_directory(self, file_id, parents):
@@ -449,9 +450,12 @@
                 self.target.serialise_inventory(self.inventory))
         self.target.add_revision(self.revid, rev, self.inventory)
         self.target.commit_write_group()
+        self._write_group_active = False
 
     def abort_edit(self):
-        self.target.abort_write_group()
+        if self._write_group_active:
+            self.target.abort_write_group()
+            self._write_group_active = False
 
 
 class PackRevisionBuildEditor(WeaveRevisionBuildEditor):




More information about the bazaar-commits mailing list