~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/remote.py

Committer: Canonical.com Patch Queue Manager
Date: 2009-09-09 03:25:29 UTC
mfrom: (4634.35.22 insert-stream-check-chks-part-2)
mto: (4634.40.1 2.0.0) (4679.1.1 merge-2.0-into-bzr.dev) (4676.4.1 integration) (4699.2.1 jam-integration) (4744.3.1 robust-cleanup-in-commit) (4715.1.1 jam-integration) (4722.1.1 merge-2.0-into-dev) (4737.1.1 merge-2.0-into-devel) (4769.1.1 merge-2.0-into-devel) (4776.1.1 jam-integration) (4778.1.1 2.1.0b2) (4782.1.1 jam-integration) (4797.17.1 alias-loc-docs-337834-2.1) (4854.1.1 merge-2.0-into-devel) (4896.1.1 2.1.0b4-dev) (4899.1.1 jam-integration) (4927.1.1 merge-2.0-into-devel) (4931.1.2 jam-integration) (4932.1.1 2.1.0rc1-pyrex-propagation) (4946.1.1 2.1.0rc1-unregister-mem-trans) (4949.1.1 integration) (4953.1.1 jam-integration) (4957.1.1 jam-integration) (4964.1.1 integration) (4967.1.1 jam-integration) (4981.1.2 2.1.0rc1-dev) (4999.3.1 apport) (5051.4.1 376388-dot-bazaar-ownership) (5045.1.1 369501-version) (5346.4.1 cleanup) (5174.1.1 jam-integration) (5074.5.1 fix-523746-dev) (4668.1.4 2.1.0b2) (4734.2.2 2.1.0b1) (4746.1.2 start-2.1.0b2)
mto: This revision was merged to the branch mainline in revision 4680.
Revision ID: pqm@pqm.ubuntu.com-20090909032529-n52rkqmqm7x1eg3k

(andrew) Fail commit_write_group for 2a if any relevant inventory,
chk_bytes or text reference is absent (#406687).

added added

removed removed

1739

# The stream included an inventory-delta record, but the remote

1740

# side isn't new enough to support them. So we need to send the

1741

# rest of the stream via VFS.

1742

self.target_repo.refresh_data()

1742

1743

return self._resume_stream_with_vfs(response, src_format)

1743

1744

if response[0][0] == 'missing-basis':

1744

1745

tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])