~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1360
1360
        if symbol_versioning.deprecated_passed(revision_id):
1361
1361
            symbol_versioning.warn(
1362
1362
                'search_missing_revision_ids(revision_id=...) was '
1363
 
                'deprecated in 2.3.  Use revision_ids=[...] instead.',
 
1363
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
1364
1364
                DeprecationWarning, stacklevel=2)
1365
1365
            if revision_ids is not None:
1366
1366
                raise AssertionError(
1991
1991
                if isinstance(search, graph.EverythingResult):
1992
1992
                    error_verb = e.error_from_smart_server.error_verb
1993
1993
                    if error_verb == 'BadSearch':
1994
 
                        # Pre-2.3 servers don't support this sort of search.
 
1994
                        # Pre-2.4 servers don't support this sort of search.
1995
1995
                        # XXX: perhaps falling back to VFS on BadSearch is a
1996
1996
                        # good idea in general?  It might provide a little bit
1997
1997
                        # of protection against client-side bugs.
1998
 
                        medium._remember_remote_is_before((2, 3))
 
1998
                        medium._remember_remote_is_before((2, 4))
1999
1999
                        break
2000
2000
                raise
2001
2001
            else: