~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/remote.py

Committer: Canonical.com Patch Queue Manager
Date: 2009-08-30 21:01:06 UTC
mfrom: (4634.14.1 2.0)
mto: (4663.1.1 integration) (4634.39.1 pdf-chm-docs) (4664.1.1 integration) (4665.3.1 2.1b1-pack-on-the-fly) (4443.2.2 eol-update-bug) (4641.5.14 2.0b1-stable-groupcompress-order) (4670.1.1 integration) (4675.1.1 integration) (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) (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) (4778.1.1 2.1.0b2) (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 4664.
Revision ID: pqm@pqm.ubuntu.com-20090830210106-8ga0smu5kssgxkzi

(robertc) Handle IncompatibleRepositories better with bzr://
connections. (Robert Collins)

added added

removed removed

2759

'Missing key %r in context %r', key_err.args[0], context)

2760

raise err

2761

2762

if err.error_verb == 'NoSuchRevision':

2762

if err.error_verb == 'IncompatibleRepositories':

2763

raise errors.IncompatibleRepositories(err.error_args[0],

2764

err.error_args[1], err.error_args[2])

2765

elif err.error_verb == 'NoSuchRevision':

2763

2766

raise NoSuchRevision(find('branch'), err.error_args[0])

2764

2767

elif err.error_verb == 'nosuchrevision':

2765

2768

raise NoSuchRevision(find('repository'), err.error_args[0])