← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 12:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 6009.
  • Revision ID: martin.vgagern@gmx.net-20110601125356-lwozv2vecea6hxfz
Change from no_decorate to classify as name for the argument.

The command line switch remains as --no-classify, to keep backwards
compatibility.  Users are free to include --no-classify in an alias, and
still use --classify to change back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
39
39
    )
40
40
 
41
41
from bzrlib.repofmt import pack_repo
42
 
from bzrlib.i18n import gettext
43
42
""")
44
43
 
45
44
from bzrlib.btree_index import BTreeBuilder
467
466
                # Grab and cache the raw bytes for this entry
468
467
                # and break the ref-cycle with _manager since we don't need it
469
468
                # anymore
470
 
                try:
471
 
                    self._manager._prepare_for_extract()
472
 
                except zlib.error as value:
473
 
                    raise errors.DecompressCorruption("zlib: " + str(value))
 
469
                self._manager._prepare_for_extract()
474
470
                block = self._manager._block
475
471
                self._bytes = block.extract(self.key, self._start, self._end)
476
472
                # There are code paths that first extract as fulltext, and then
1755
1751
                raise errors.RevisionNotPresent(record.key, self)
1756
1752
            if random_id:
1757
1753
                if record.key in inserted_keys:
1758
 
                    trace.note(gettext('Insert claimed random_id=True,'
1759
 
                               ' but then inserted %r two times'), record.key)
 
1754
                    trace.note('Insert claimed random_id=True,'
 
1755
                               ' but then inserted %r two times', record.key)
1760
1756
                    continue
1761
1757
                inserted_keys.add(record.key)
1762
1758
            if reuse_blocks: