Rev 3169: RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3169
revision-id:pqm at pqm.ubuntu.com-20080105015401-67wgbytv81394cl1
parent: pqm at pqm.ubuntu.com-20080105005447-knh8rur0s7k5xfcl
parent: mbp at sourcefrog.net-20080104005818-1928g4frcjkxkhw3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-01-05 01:54:01 +0000
message:
  RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  README                         README-20050309040720-8f368abf9f346b9d
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3163.1.3
    revision-id:mbp at sourcefrog.net-20080104005818-1928g4frcjkxkhw3
    parent: mbp at sourcefrog.net-20080104005635-hbb6fitg6il7c6bs
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2008-01-04 11:58:18 +1100
    message:
      Update NEWS
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3163.1.2
    revision-id:mbp at sourcefrog.net-20080104005635-hbb6fitg6il7c6bs
    parent: mbp at sourcefrog.net-20080104004206-vsi8oyind9rkfd96
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2008-01-04 11:56:35 +1100
    message:
      RepositoryPackCollection._abort_write_group should check it actually has a new pack before aborting (#180208)
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 3163.1.1
    revision-id:mbp at sourcefrog.net-20080104004206-vsi8oyind9rkfd96
    parent: pqm at pqm.ubuntu.com-20080103220910-yajpwrwzbuyafqcg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2008-01-04 11:42:06 +1100
    message:
      README ReST syntax fix
    modified:
      README                         README-20050309040720-8f368abf9f346b9d
=== modified file 'NEWS'
--- a/NEWS	2008-01-03 23:18:14 +0000
+++ b/NEWS	2008-01-05 01:54:01 +0000
@@ -64,6 +64,9 @@
 
   BUGFIXES:
 
+   * Avoid AttributeError when unlocking a pack repository when an error occurs.
+     (Martin Pool, #180208)
+
    * Better handle short reads when processing multiple range requests.
      (Vincent Ladeuil, #179368)
 

=== modified file 'README'
--- a/README	2007-12-07 06:18:57 +0000
+++ b/README	2008-01-04 00:42:06 +0000
@@ -26,17 +26,17 @@
 Bazaar highlights
 =================
 
-  * Easy to use and intuitive.
-
-    Only five commands are needed to do all basic operations, and all
-    commands have documentation accessible via 'bzr help command'.
-    Bazaar's interface is also easy to learn for CVS and Subversion users.
-
-  * Robust and reliable.
-
-    Bazaar is developed under an extensive test suite. Branches can be
-    checked and verified for integrity at any time, and revisions can be
-    signed with PGP/GnuPG.
+ * Easy to use and intuitive.
+
+   Only five commands are needed to do all basic operations, and all
+   commands have documentation accessible via 'bzr help command'.
+   Bazaar's interface is also easy to learn for CVS and Subversion users.
+
+ * Robust and reliable.
+
+   Bazaar is developed under an extensive test suite. Branches can be
+   checked and verified for integrity at any time, and revisions can be
+   signed with PGP/GnuPG.
 
  * Publish branches with HTTP.
 
@@ -57,8 +57,8 @@
 
  * Smart merging.
 
-    Changes will never be merged more than once, conflicts will be
-    minimized, and identical changes are dealt with well.
+   Changes will never be merged more than once, conflicts will be
+   minimized, and identical changes are dealt with well.
 
  * Vibrant and active community.
 

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2008-01-02 05:32:20 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2008-01-04 00:56:35 +0000
@@ -1648,9 +1648,10 @@
     def _abort_write_group(self):
         # FIXME: just drop the transient index.
         # forget what names there are
-        self._new_pack.abort()
-        self._remove_pack_indices(self._new_pack)
-        self._new_pack = None
+        if self._new_pack is not None:
+            self._new_pack.abort()
+            self._remove_pack_indices(self._new_pack)
+            self._new_pack = None
         self.repo._text_knit = None
 
     def _commit_write_group(self):