← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/repository.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/repository.py
30
30
    osutils,
31
31
    pack,
32
32
    ui,
 
33
    versionedfile,
33
34
    )
34
35
from bzrlib.bzrdir import BzrDir
35
36
from bzrlib.smart.request import (
38
39
    SuccessfulSmartServerResponse,
39
40
    )
40
41
from bzrlib.repository import _strip_NULL_ghosts, network_format_registry
 
42
from bzrlib.recordcounter import RecordCounter
41
43
from bzrlib import revision as _mod_revision
42
44
from bzrlib.versionedfile import (
43
45
    NetworkRecordStream,
504
506
        for record in substream:
505
507
            if record.storage_kind in ('chunked', 'fulltext'):
506
508
                serialised = record_to_fulltext_bytes(record)
 
509
            elif record.storage_kind == 'inventory-delta':
 
510
                serialised = record_to_inventory_delta_bytes(record)
507
511
            elif record.storage_kind == 'absent':
508
512
                raise ValueError("Absent factory for %s" % (record.key,))
509
513
            else: