Rev 5175: Bring into bzr.dev, and update NEWS. in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 5175 [merge]
revision-id: john at arbash-meinel.com-20100422190514-udvjsm6n2a6sh0jv
parent: pqm at pqm.ubuntu.com-20100422170827-h0bb41yq5nkosu6t
parent: john at arbash-meinel.com-20100419220859-1d0eqz225pf9tgz0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2010-04-22 14:05:14 -0500
message:
  Bring into bzr.dev, and update NEWS.
  
  I can't land in 2.0 right now because PQM is broken.
  But at least I can land in trunk.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-04-22 13:32:23 +0000
+++ b/NEWS	2010-04-22 19:05:14 +0000
@@ -5,10 +5,10 @@
 .. contents:: List of Releases
    :depth: 1
 
-bzr 2.2.b3
+bzr 2.2b3
 ##########
 
-:2.2.b3: NOT RELEASED YET
+:2.2b3: NOT RELEASED YET
 
 Compatibility Breaks
 ********************
@@ -19,6 +19,9 @@
 Bug Fixes
 *********
 
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
 Improvements
 ************
 
@@ -876,6 +879,10 @@
 Bug Fixes
 *********
 
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
 * ``bzr revert`` now only takes write lock on working tree, instead of on 
   both working tree and branch.
   (Danny van Heumen, #498409)
@@ -884,9 +891,6 @@
   permissions as ``.bzr`` directory on a POSIX OS.
   (Parth Malwankar, #262450)
 
-* Additional merges after an unrelated branch has been merged with its
-  history no longer crash when deleted files are involved.
-  (Vincent Ladeuil, John Arbash Meinel, #375898)
 
 bzr 2.0.5
 #########

=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py	2010-02-17 17:11:16 +0000
+++ b/bzrlib/groupcompress.py	2010-04-22 19:05:14 +0000
@@ -1631,6 +1631,7 @@
         keys_to_add = []
         def flush():
             bytes = self._compressor.flush().to_bytes()
+            self._compressor = GroupCompressor()
             index, start, length = self._access.add_raw_records(
                 [(None, len(bytes))], bytes)[0]
             nodes = []
@@ -1639,7 +1640,6 @@
             self._index.add_records(nodes, random_id=random_id)
             self._unadded_refs = {}
             del keys_to_add[:]
-            self._compressor = GroupCompressor()
 
         last_prefix = None
         max_fulltext_len = 0