Bazaar

Merge lp://staging/~vila/bzr/583667-lp-no-edge into lp://staging/bzr/2.0

583667-lp-no-edge
Merge into 2.0

Proposed by Vincent Ladeuil on 2010-11-26

Status:

Merged

Approved by:

Vincent Ladeuil on 2010-11-30

Approved revision:

no longer in the source branch.

Merged at revision:

4764

Proposed branch:

lp://staging/~vila/bzr/583667-lp-no-edge

Merge into:

lp://staging/bzr/2.0

Diff against target:

484 lines (+49/-56)

26 files modified

NEWS (+9/-1)
bzrlib/lockdir.py (+1/-1)
bzrlib/plugins/launchpad/__init__.py (+1/-1)
bzrlib/plugins/launchpad/lp_registration.py (+3/-6)
bzrlib/plugins/launchpad/test_lp_directory.py (+1/-1)
bzrlib/plugins/launchpad/test_lp_open.py (+4/-4)
bzrlib/plugins/launchpad/test_lp_service.py (+2/-14)
bzrlib/plugins/launchpad/test_register.py (+4/-4)
bzrlib/reconcile.py (+1/-1)
bzrlib/remote.py (+1/-1)
bzrlib/repository.py (+1/-1)
bzrlib/tests/__init__.py (+1/-1)
bzrlib/tests/blackbox/test_branch.py (+1/-1)
bzrlib/tests/blackbox/test_checkout.py (+1/-1)
bzrlib/tests/blackbox/test_commit.py (+1/-1)
bzrlib/tests/blackbox/test_merge.py (+1/-1)
bzrlib/tests/blackbox/test_reconfigure.py (+1/-1)
bzrlib/tests/per_tree/test_inv.py (+1/-1)
bzrlib/tests/per_workingtree/test_content_filters.py (+1/-1)
bzrlib/tests/test_errors.py (+1/-1)
bzrlib/tests/test_lockdir.py (+2/-2)
bzrlib/tests/test_osutils.py (+1/-1)
bzrlib/tests/test_remote.py (+1/-1)
bzrlib/tests/test_ui.py (+2/-2)
bzrlib/workingtree_4.py (+4/-4)
setup.py (+2/-2)

To merge this branch:

bzr merge lp://staging/~vila/bzr/583667-lp-no-edge

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Martin Pool		2010-11-26	Needs Fixing on 2010-11-30
Review via email: mp+41958@code.staging.launchpad.net

Commit message

Get rid of edge.launchpad.net references.

Description of the change

The ``edge.launchpad.net`` server is about to be/has been
deprecated. ``bzr`` is currently relying on it to transparently
resolve access to the edge or production servers. This is not
true anymore and instead we are now advised to to the opposite.

So this path fixes bug #583667 by removing all references to the
edge servers.

There are three parts:
* Fix a typo in a comment mentionning BZR_LP_XMLRPC_URL since
that's how I started working on this bug.
* Totally delete all references to edge in the launchpad plugin
and the corresponding tests.
* Fix all comments where bugs.edge.launchpad.net was used.

Code-wise, the relevant changes are in:
bzrlib/plugins/launchpad/__init__.py
bzrlib/plugins/launchpad/lp_registration.py

And for the tests in:
bzrlib/plugins/launchpad/test_lp_directory.py
bzrlib/plugins/launchpad/test_lp_open.py
bzrlib/plugins/launchpad/test_lp_service.py
bzrlib/plugins/launchpad/test_register.py

The other modifications are only in comments and don't need a
careful review.

I plan to merge this up in the other stable branches taking care
of conflicts and ensuring no other references were introduced.

Revision history for this message

Robert Collins (lifeless) wrote on 2010-11-26:

I also see these references to edge:

./bzrlib/plugins/launchpad/lp_api.py: EDGE_SERVICE_ROOT,
./bzrlib/plugins/launchpad/lp_api.py: 'edge': EDGE_SERVICE_ROOT,
./bzrlib/plugins/launchpad/lp_api.py:
launchpadlib.launchpad.EDGE_SERVICE_ROOT.

Revision history for this message

Vincent Ladeuil (vila) wrote on 2010-11-26:

Thanks, but they are not in 2.0, I'm taking care of them while walking up to 2.3 (these one are in 2.1).

Revision history for this message

Martin Pool (mbp) wrote on 2010-11-30:

+* The ``edge.launchpad.net`` server has been deprecated and all references to
+ it have been removed from the code base. This ensures that users upgrading
+ to bzr 2.0.7 or better will never try to contact the 'edge' server. Users of
+ previous versions can workaround connection problems by setting the
+ ``BZR_LP_XMLRPC_URL`` environment variable to
+ ``http://xmlrpc.launchpad.net/bazaar/``. (Vincent Ladeuil, #583667)

I think the news entry should also link to the blog post explaining why we have to do this, for the sake of people justifying SRUs at least. (I realize you can reach it from the bug number but let's make it clear.)

The first sentence makes it sound like the server was deprecated in bzr.

Launchpad has announced that the edge.launchpad.net instance is deprecated and may be shut down in the future <http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore been updated in this release to talk to the main ('lpnet') servers, rather than edge.

I don't think that setting BZR_LP_XMLRPC_URL will be enough, because at least in later bzr releases we also use launchpadlib to talk to REST APIs.

I don't think there is a whatsnew in 2.0 but for series that have one we should mention this there too.

The code changes look ok to me.

review: Needs Fixing

Revision history for this message

Martin Pool (mbp) wrote on 2010-11-30:

> I also see these references to edge:
>
> ./bzrlib/plugins/launchpad/lp_api.py: EDGE_SERVICE_ROOT,
> ./bzrlib/plugins/launchpad/lp_api.py: 'edge': EDGE_SERVICE_ROOT,
> ./bzrlib/plugins/launchpad/lp_api.py:
> launchpadlib.launchpad.EDGE_SERVICE_ROOT.

Those just let you ask for edge if you want it. At least for the sake of developers we might as well keep them until edge is expunged from reality.

(Perhaps instead lplib should read an environment variable? bzr doesn't really need this code.)

Revision history for this message

Martin Packman (gz) wrote on 2010-11-30:

This looks like it has considerable overlap with lp:~gz/bzr/use_production_launchpad_581670 which is on trunk already so merging up may be a little interesting. I take it whatever broke lp-propose with production is long-since fixed?

Revision history for this message

Vincent Ladeuil (vila) wrote on 2010-11-30:

@Martin [gz]: yes, there is some overlap, but the merge went pretty darn well ;)

I hope what broke lp-propose has been fixed, but we'll hear about it soon enough. Anyway, I'll make different mps for 2.1, 2.2 and trunk to ensure we could discuss about relevant problems in relevant mps, lp-propose doesn't exist in 2.0, it has been introduced in 2.2.

@poolie: same goes for lp_api, introduced in 2.1

So I'll land this one for 2.0 first with the NEWS entry tweaked.

Revision history for this message

Vincent Ladeuil (vila) wrote on 2010-11-30:

> Those just let you ask for edge if you want it. At least for the sake of
> developers we might as well keep them until edge is expunged from reality.
>
> (Perhaps instead lplib should read an environment variable? bzr doesn't
> really need this code.)

Yup, I don't think bzr has to care about this corner case.

Revision history for this message

Vincent Ladeuil (vila) wrote on 2010-11-30:

sent to pqm by email