Rev 2745: BundleInfoV4.install_revisions should work in a write group in http://sourcefrog.net/bzr/pack-repository

Martin Pool mbp at sourcefrog.net
Tue Aug 28 08:43:04 BST 2007


At http://sourcefrog.net/bzr/pack-repository

------------------------------------------------------------
revno: 2745
revision-id: mbp at sourcefrog.net-20070828074300-iz1of17bwgr2owx0
parent: robertc at robertcollins.net-20070828021813-4p3w6xklwghhzwg9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: pack-repository
timestamp: Tue 2007-08-28 17:43:00 +1000
message:
  BundleInfoV4.install_revisions should work in a write group
modified:
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
=== modified file 'bzrlib/bundle/serializer/v4.py'
--- a/bzrlib/bundle/serializer/v4.py	2007-08-17 00:53:48 +0000
+++ b/bzrlib/bundle/serializer/v4.py	2007-08-28 07:43:00 +0000
@@ -402,9 +402,16 @@
         """
         repository.lock_write()
         try:
-            ri = RevisionInstaller(self.get_bundle_reader(stream_input),
-                                   self._serializer, repository)
-            return ri.install()
+            repository.start_write_group()
+            try:
+                ri = RevisionInstaller(self.get_bundle_reader(stream_input),
+                                       self._serializer, repository)
+                return ri.install()
+            except:
+                repository.abort_write_group()
+                raise
+            else:
+                repository.commit_write_group()
         finally:
             repository.unlock()
 




More information about the bazaar-commits mailing list