Merge lp:~jameinel/bzr/1.16-abort-resume-aborts-start into lp:~bzr/bzr/trunk-old

[John A Meinel]

[John A Meinel (jameinel)]

This gives a cleaner test suite run on Windows.

Basically, Repository.resume_write_group() internally _starts_write_group() and then resumes the given tokens.

However, tokens can fail to be resumed, which leaves things in an intermediate state. Namely, the _start_write_group finished, but wasn't aborted. Which leaves open the NewPack.

I don't know if this ever matters in practice, but at least on Windows it causes
    def test_cannot_resume_aborted_write_group(self):

To give cleanup stipple because we can't cleanup the working dir because of the open file handle.

[Andrew Bennetts (spiv)]

review: Approve

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- bzrlib/repofmt/pack_repo.py	2009-06-03 21:28:52 +0000
+++ bzrlib/repofmt/pack_repo.py	2009-06-05 02:36:05 +0000
@@ -2289,7 +2289,11 @@
 
     def _resume_write_group(self, tokens):
         self._start_write_group()
-        self._pack_collection._resume_write_group(tokens)
+        try:
+            self._pack_collection._resume_write_group(tokens)
+        except errors.UnresumableWriteGroup:
+            self._abort_write_group()
+            raise
         for pack in self._pack_collection._resumed_packs:
             self.revisions._index.scan_unvalidated_index(pack.revision_index)