~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

(parthm) Estimated records to be fetched are now shown for fetch (2a only).

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
    symbol_versioning,
44
44
    trace,
45
45
    tsort,
46
 
    ui,
47
46
    versionedfile,
48
47
    )
49
48
from bzrlib.bundle import serializer
55
54
from bzrlib import (
56
55
    errors,
57
56
    registry,
 
57
    ui,
58
58
    )
59
59
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
60
60
from bzrlib.inter import InterObject
64
64
    ROOT_ID,
65
65
    entry_factory,
66
66
    )
 
67
from bzrlib.recordcounter import RecordCounter
67
68
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
68
69
from bzrlib.trace import (
69
70
    log_exception_quietly, note, mutter, mutter_callsite, warning)
4283
4284
                is_resume = False
4284
4285
            try:
4285
4286
                # locked_insert_stream performs a commit|suspend.
4286
 
                return self._locked_insert_stream(stream, src_format, is_resume)
 
4287
                return self._locked_insert_stream(stream, src_format,
 
4288
                    is_resume)
4287
4289
            except:
4288
4290
                self.target_repo.abort_write_group(suppress_errors=True)
4289
4291
                raise
4336
4338
                # required if the serializers are different only in terms of
4337
4339
                # the inventory.
4338
4340
                if src_serializer == to_serializer:
4339
 
                    self.target_repo.revisions.insert_record_stream(
4340
 
                        substream)
 
4341
                    self.target_repo.revisions.insert_record_stream(substream)
4341
4342
                else:
4342
4343
                    self._extract_and_insert_revisions(substream,
4343
4344
                        src_serializer)
4451
4452
        """Create a StreamSource streaming from from_repository."""
4452
4453
        self.from_repository = from_repository
4453
4454
        self.to_format = to_format
 
4455
        self._record_counter = RecordCounter()
4454
4456
 
4455
4457
    def delta_on_metadata(self):
4456
4458
        """Return True if delta's are permitted on metadata streams.