/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-06 10:25:39 UTC
  • mfrom: (3690.1.2 nicer-error)
  • Revision ID: pqm@pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
Do not traceback on unexpected error responses from a smart server.
        (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1717
1717
      - bzrdir
1718
1718
      - token
1719
1719
      - other_branch
 
1720
 
 
1721
    If the error from the server doesn't match a known pattern, then
 
1722
    UnknownErrorFromSmartServer is raised.
1720
1723
    """
1721
1724
    def find(name):
1722
1725
        try:
1744
1747
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
1745
1748
    elif err.error_verb == 'TipChangeRejected':
1746
1749
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
1747
 
    raise
 
1750
    raise errors.UnknownErrorFromSmartServer(err)
1748
1751