← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-03 07:56:45 UTC
  • mfrom: (5695.1.1 merge-2.3-to-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110303075645-hncdmrbpczkxcvt4
(spiv) Merge lp:bzr/2.3 into lp:bzr,
 including fix for #726584. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2151
2151
        repo_format = response_tuple_to_repo_format(response[3:])
2152
2152
        repo_path = response[2]
2153
2153
        if repository is not None:
2154
 
            remote_repo_url = urlutils.join(medium.base, repo_path)
 
2154
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
2155
2155
            url_diff = urlutils.relative_url(repository.user_url,
2156
2156
                    remote_repo_url)
2157
2157
            if url_diff != '.':
2158
2158
                raise AssertionError(
2159
2159
                    'repository.user_url %r does not match URL from server '
2160
2160
                    'response (%r + %r)'
2161
 
                    % (repository.user_url, medium.base, repo_path))
 
2161
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
2162
2162
            remote_repo = repository
2163
2163
        else:
2164
2164
            if repo_path == '':