← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/v4.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/v4.py
19
19
import re
20
20
 
21
21
from bzrlib import (
22
 
    diff,
23
22
    errors,
24
23
    iterablefile,
25
24
    lru_cache,
33
32
    versionedfile as _mod_versionedfile,
34
33
    )
35
34
from bzrlib.bundle import bundle_data, serializer as bundle_serializer
 
35
from bzrlib.i18n import ngettext
36
36
from bzrlib import bencode
37
37
 
38
38
 
322
322
 
323
323
    def do_write(self):
324
324
        """Write all data to the bundle"""
325
 
        trace.note('Bundling %d revision(s).', len(self.revision_ids))
 
325
        trace.note(ngettext('Bundling %d revision.', 'Bundling %d revisions.',
 
326
                            len(self.revision_ids)), len(self.revision_ids))
326
327
        self.repository.lock_read()
327
328
        try:
328
329
            self.bundle.begin()