Rev 1992: Abort reporter if exceptions are raised. in file:///data/jelmer/bzr-svn/0.5/

Jelmer Vernooij jelmer at samba.org
Mon Nov 17 00:46:53 GMT 2008


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

------------------------------------------------------------
revno: 1992
revision-id: jelmer at samba.org-20081117004651-pgs14je5e4086xou
parent: jelmer at samba.org-20081116234458-6c1hjrb6nua9hv5l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-11-17 01:46:51 +0100
message:
  Abort reporter if exceptions are raised.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'repository.py'
--- a/repository.py	2008-11-12 19:49:51 +0000
+++ b/repository.py	2008-11-17 00:46:51 +0000
@@ -299,8 +299,12 @@
         conn = self.transport.get_connection(parent_branch_path)
         try:
             reporter = conn.do_diff(revision.svn_meta.revnum, "", urlutils.join(self.transport.get_svn_repos_root(), revision.svn_meta.branch_path), editor, True, True, False)
-            reporter.set_path("", parentrevnum, start_empty)
-            reporter.finish()
+            try:
+                reporter.set_path("", parentrevnum, start_empty)
+                reporter.finish()
+            except:
+                reporter.abort()
+                raise
         finally:
             self.transport.add_connection(conn)
         return editor.delta




More information about the bazaar-commits mailing list