Rev 3651: Remove accidental merge in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/index_builder_cleanup

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/index_builder_cleanup

------------------------------------------------------------
revno: 3651
revision-id: john at arbash-meinel.com-20080825183623-n5h3h1d5ky8yr7d6
parent: john at arbash-meinel.com-20080825164422-8opo9lb960uev2ce
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 13:36:23 -0500
message:
  Remove accidental merge
-------------- next part --------------
=== modified file 'bzrlib/chunk_writer.py'
--- a/bzrlib/chunk_writer.py	2008-08-25 16:24:09 +0000
+++ b/bzrlib/chunk_writer.py	2008-08-25 18:36:23 +0000
@@ -93,16 +93,6 @@
         This returns the final compressed chunk, and either None, or the
         bytes that did not fit in the chunk.
         """
-        # self.bytes_list = self.bytes_in
-        # bytes_out_len = sum(map(len, self.bytes_list))
-        # if bytes_out_len > self.chunk_size:
-        #     raise Assertion("too much data: %d" % bytes_out_len)
-        # self.bytes_in = None
-        # nulls_needed = self.chunk_size - self.seen_bytes
-        # if nulls_needed:
-        #     self.bytes_list.append("\x00" * nulls_needed)
-        # return self.bytes_list, self.unused_bytes, nulls_needed
-
         self.bytes_in = None # Free the data cached so far, we don't need it
         out = self.compressor.flush(Z_FINISH)
         self.bytes_list.append(out)