Rev 4200: Some cleanup and fix the copyright spelling test failure (still 9 errors, 10 failures) in file:///home/vila/src/bzr/experimental/gc-py-bbc/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/gc-py-bbc/

------------------------------------------------------------
revno: 4200
revision-id: v.ladeuil+lp at free.fr-20090327103826-p92434kmgu4c5p23
parent: v.ladeuil+lp at free.fr-20090327075357-xeqzulo3r406b1jt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: groupcompress-python-only
timestamp: Fri 2009-03-27 11:38:26 +0100
message:
  Some cleanup and fix the copyright spelling test failure (still 9 errors, 10 failures)
-------------- next part --------------
=== modified file 'bzrlib/_groupcompress_py.py'
--- a/bzrlib/_groupcompress_py.py	2009-03-25 21:20:18 +0000
+++ b/bzrlib/_groupcompress_py.py	2009-03-27 10:38:26 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Limited.
+# Copyright (C) 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as published
@@ -23,7 +23,6 @@
 from bzrlib import osutils
 
 
-### v imported from gc plugin at revno30
 class EquivalenceTable(object):
     """This class tracks equivalencies between lists of hashable objects.
 
@@ -71,8 +70,8 @@
             if locations is None:
                 locations = self.get_idx_matches(pos)
             if locations is None:
-                # No more matches, just return whatever we have, but we know that
-                # this last position is not going to match anything
+                # No more matches, just return whatever we have, but we know
+                # that this last position is not going to match anything
                 pos += 1
                 break
             else:
@@ -230,7 +229,6 @@
         return out_lines, index_lines
 
 
-
 def encode_copy_instruction(offset, length):
     """Convert this offset into a control code and bytes."""
     copy_command = 0x80
@@ -282,6 +280,3 @@
         else:
             lines.extend(delta_lines)
     return lines
-
-
-### ^ imported from gc plugin at revno30

=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py	2009-03-25 21:20:18 +0000
+++ b/bzrlib/groupcompress.py	2009-03-27 10:38:26 +0000
@@ -87,8 +87,8 @@
 def sort_gc_optimal(parent_map):
     """Sort and group the keys in parent_map into groupcompress order.
 
-    groupcompress is defined (currently) as reverse-topological order, grouped by
-    the key prefix.
+    groupcompress is defined (currently) as reverse-topological order, grouped
+    by the key prefix.
 
     :return: A sorted-list of keys
     """
@@ -812,7 +812,6 @@
         self.lines = self.line_locations.lines
         self._present_prefixes = set()
 
-    # FIXME: implement nostore_sha
     def compress(self, key, bytes, expected_sha, nostore_sha=None, soft=False):
         """Compress lines with label key.
 
@@ -872,11 +871,9 @@
         self.input_bytes += bytes_length
         delta_end = (self.endpoint, len(self.lines))
         self.labels_deltas[key] = (delta_start, delta_end)
-        # FIXME: lot of guessing below
         return sha1, start, self.endpoint, 'delta', out_length
 
     def flush(self):
-        # FIXME: ugly hack to masquerade ourself as the pyrex version
         self._block.set_content(''.join(self.lines))
         return self._block