Rev 3882: Change the notes into mutters, include a total. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

John Arbash Meinel john at arbash-meinel.com
Mon Mar 23 02:38:53 GMT 2009


At http://bzr.arbash-meinel.com/branches/bzr/brisbane/hack3

------------------------------------------------------------
revno: 3882
revision-id: john at arbash-meinel.com-20090323023016-3qby2h38tf7l417s
parent: john at arbash-meinel.com-20090321025134-ipzu31xnfsfnn631
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hack3
timestamp: Sun 2009-03-22 21:30:16 -0500
message:
  Change the notes into mutters, include a total.
-------------- next part --------------
=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py	2009-03-20 17:04:30 +0000
+++ b/bzrlib/groupcompress.py	2009-03-23 02:30:16 +0000
@@ -1411,16 +1411,17 @@
         self._compressor = GroupCompressor(self._check_for_dupes)
         self._unadded_refs = {}
         keys_to_add = []
-        total_deduped = [0, 0]
+        total_deduped = [0, 0, 0]
         def flush():
+            total_deduped[0] += self._compressor._deduped_entries
+            total_deduped[1] += self._compressor._empty_entries
+            total_deduped[2] += len(self._compressor._entries)
             if (self._compressor._deduped_entries > 0
                 or self._compressor._empty_entries > 0):
-                total_deduped[0] += self._compressor._deduped_entries
-                total_deduped[1] += self._compressor._empty_entries
-                trace.note('Dedupped %d out of %d entries, %d empty',
-                           self._compressor._deduped_entries,
-                           len(self._compressor._block._entries),
-                           self._compressor._empty_entries)
+                # trace.note('Dedupped %d out of %d entries, %d empty',
+                #            self._compressor._deduped_entries,
+                #            len(self._compressor._block._entries),
+                #            self._compressor._empty_entries)
             bytes = self._compressor.flush().to_bytes()
             index, start, length = self._access.add_raw_records(
                 [(None, len(bytes))], bytes)[0]
@@ -1545,8 +1546,8 @@
             flush()
         self._compressor = None
         if total_deduped[0] > 0 or total_deduped[1] > 0:
-            trace.note('Total deduped = %d, total empty = %d\n',
-                       total_deduped[0], total_deduped[1])
+            trace.mutter('Total deduped = %d, total empty = %d, out of %d\n',
+                         total_deduped[0], total_deduped[1], total_deduped[2])
 
     def iter_lines_added_or_present_in_keys(self, keys, pb=None):
         """Iterate over the lines in the versioned files from keys.



More information about the bazaar-commits mailing list