Rev 3304: Allow pulling from lp: urls (abentley, #181945) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Mar 25 08:34:41 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3304
revision-id:pqm at pqm.ubuntu.com-20080325083430-0w0gjtnkegce7718
parent: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
parent: aaron at aaronbentley.com-20080325054055-se4iycu8hm71i1db
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-03-25 08:34:30 +0000
message:
Allow pulling from lp: urls (abentley, #181945)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
------------------------------------------------------------
revno: 3251.3.1.1.12
revision-id:aaron at aaronbentley.com-20080325054055-se4iycu8hm71i1db
parent: aaron at aaronbentley.com-20080325012528-mk25xr8eh1uomdyn
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: pull-lp
timestamp: Tue 2008-03-25 01:40:55 -0400
message:
Updates from review
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3251.3.1.1.11
revision-id:aaron at aaronbentley.com-20080325012528-mk25xr8eh1uomdyn
parent: aaron at aaronbentley.com-20080324234351-53hoobvvh6n6nb5v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: lp-service
timestamp: Mon 2008-03-24 21:25:28 -0400
message:
Fix wrong local lookups
modified:
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
------------------------------------------------------------
revno: 3251.3.1.1.10
revision-id:aaron at aaronbentley.com-20080324234351-53hoobvvh6n6nb5v
parent: aaron at aaronbentley.com-20080324212506-irctyrxto9u4h0xi
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: lp-service
timestamp: Mon 2008-03-24 19:43:51 -0400
message:
Pull of launchpad locations works (abentley, #181945)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
------------------------------------------------------------
revno: 3251.3.1.1.9
revision-id:aaron at aaronbentley.com-20080324212506-irctyrxto9u4h0xi
parent: aaron at aaronbentley.com-20080307135143-v84thnmby9tllh70
parent: pqm at pqm.ubuntu.com-20080323231145-nh7pyfd19alqp471
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: lp-service
timestamp: Mon 2008-03-24 17:25:06 -0400
message:
Merge with bzr.dev
added:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_uncommit.py test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS 2008-03-25 05:25:38 +0000
+++ b/NEWS 2008-03-25 08:34:30 +0000
@@ -51,6 +51,8 @@
* Implement handling of basename parameter for DefaultMail. (James Westby)
+ * Launchpad locations (lp: URLs) can be pulled. (Aaron Bentley, #181945)
+
DOCUMENTATION:
API BREAKS:
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-03-20 16:24:32 +0000
+++ b/bzrlib/builtins.py 2008-03-24 23:43:51 +0000
@@ -622,8 +622,11 @@
possible_transports = []
if location is not None:
- mergeable, location_transport = _get_mergeable_helper(location)
- possible_transports.append(location_transport)
+ try:
+ mergeable = bundle.read_mergeable_from_url(location,
+ possible_transports=possible_transports)
+ except errors.NotABundle:
+ mergeable = None
stored_loc = branch_to.get_parent()
if location is None:
@@ -636,8 +639,6 @@
if not is_quiet():
self.outf.write("Using saved location: %s\n" % display_url)
location = stored_loc
- location_transport = transport.get_transport(
- location, possible_transports=possible_transports)
if mergeable is not None:
if revision is not None:
@@ -648,7 +649,8 @@
mergeable.get_merge_request(branch_to.repository)
branch_from = branch_to
else:
- branch_from = Branch.open_from_transport(location_transport)
+ branch_from = Branch.open(location,
+ possible_transports=possible_transports)
if branch_to.get_parent() is None or remember:
branch_to.set_parent(branch_from.base)
@@ -2860,8 +2862,12 @@
tree.lock_write()
cleanups.append(tree.unlock)
if location is not None:
- mergeable, other_transport = _get_mergeable_helper(location)
- if mergeable:
+ try:
+ mergeable = bundle.read_mergeable_from_url(location,
+ possible_transports=possible_transports)
+ except errors.NotABundle:
+ mergeable = None
+ else:
if uncommitted:
raise errors.BzrCommandError('Cannot use --uncommitted'
' with bundles or merge directives.')
@@ -2871,7 +2877,6 @@
'Cannot use -r with merge directives or bundles')
merger, verified = _mod_merge.Merger.from_mergeable(tree,
mergeable, pb)
- possible_transports.append(other_transport)
if merger is None and uncommitted:
if revision is not None and len(revision) > 0:
@@ -4520,34 +4525,6 @@
cur_transport.ensure_base()
-def _get_mergeable_helper(location):
- """Get a merge directive or bundle if 'location' points to one.
-
- Try try to identify a bundle and returns its mergeable form. If it's not,
- we return the tried transport anyway so that it can reused to access the
- branch
-
- :param location: can point to a bundle or a branch.
-
- :return: mergeable, transport
- """
- mergeable = None
- url = urlutils.normalize_url(location)
- url, filename = urlutils.split(url, exclude_trailing_slash=False)
- location_transport = transport.get_transport(url)
- if filename:
- try:
- # There may be redirections but we ignore the intermediate
- # and final transports used
- read = bundle.read_mergeable_from_transport
- mergeable, t = read(location_transport, filename)
- except errors.NotABundle:
- # Continue on considering this url a Branch but adjust the
- # location_transport
- location_transport = location_transport.clone(filename)
- return mergeable, location_transport
-
-
# these get imported and then picked up by the scan for cmd_*
# TODO: Some more consistent way to split command definitions across files;
# we do need to load at least some information about them to know of
=== modified file 'bzrlib/bundle/__init__.py'
--- a/bzrlib/bundle/__init__.py 2007-06-05 15:52:12 +0000
+++ b/bzrlib/bundle/__init__.py 2008-03-25 01:25:28 +0000
@@ -35,20 +35,20 @@
return read_mergeable_from_url(url, _do_directive=False)
-def read_mergeable_from_url(url, _do_directive=True):
+def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
"""Read mergable object from a given URL.
:return: An object supporting get_target_revision. Raises NotABundle if
the target is not a mergeable type.
"""
- url = urlutils.normalize_url(url)
- url, filename = urlutils.split(url, exclude_trailing_slash=False)
- if not filename:
+ child_transport = get_transport(url,
+ possible_transports=possible_transports)
+ transport = child_transport.clone('..')
+ filename = transport.relpath(child_transport.base)
+ if filename.endswith('/'):
# A path to a directory was passed in
# definitely not a bundle
raise errors.NotABundle('A directory cannot be a bundle')
-
- transport = get_transport(url)
mergeable, transport = read_mergeable_from_transport(transport, filename,
_do_directive)
return mergeable
=== modified file 'bzrlib/tests/blackbox/test_pull.py'
--- a/bzrlib/tests/blackbox/test_pull.py 2008-01-29 20:12:28 +0000
+++ b/bzrlib/tests/blackbox/test_pull.py 2008-03-25 05:40:55 +0000
@@ -21,6 +21,7 @@
import sys
from bzrlib.branch import Branch
+from bzrlib.directory_service import directories
from bzrlib.osutils import pathjoin
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.uncommit import uncommit
@@ -324,3 +325,18 @@
self.assertEqual(out, '')
self.assertEqual(err, '')
self.assertEqual(tree_b.last_revision(), revision_id)
+
+ def test_pull_from_directory_service(self):
+ source = self.make_branch_and_tree('source')
+ source.commit('commit 1')
+ target = source.bzrdir.sprout('target').open_workingtree()
+ source_last = source.commit('commit 2')
+ class FooService(object):
+ """A directory service that always returns source"""
+
+ def look_up(self, name, url):
+ return 'source'
+ directories.register('foo:', FooService, 'Testing directory service')
+ self.addCleanup(lambda: directories.remove('foo:'))
+ self.run_bzr('pull foo:bar -d target')
+ self.assertEqual(source_last, target.last_revision())
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2007-12-29 22:42:51 +0000
+++ b/bzrlib/tests/test_bundle.py 2008-03-25 05:40:55 +0000
@@ -28,8 +28,10 @@
treebuilder,
)
from bzrlib.bzrdir import BzrDir
+from bzrlib.bundle import read_mergeable_from_url
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
from bzrlib.bundle.bundle_data import BundleTree
+from bzrlib.directory_service import directories
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
@@ -47,6 +49,7 @@
TestCaseInTempDir,
TestCaseWithTransport,
TestSkipped,
+ test_read_bundle,
test_commit,
)
from bzrlib.transform import TreeTransform
@@ -1559,3 +1562,21 @@
self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
'info', None, None), record)
self.assertRaises(BadBundle, record_iter.next)
+
+
+class TestReadMergeableFromUrl(TestCaseWithTransport):
+
+ def test_read_mergeable_skips_local(self):
+ """A local bundle named like the URL should not be read.
+ """
+ out, wt = test_read_bundle.create_bundle_file(self)
+ class FooService(object):
+ """A directory service that always returns source"""
+
+ def look_up(self, name, url):
+ return 'source'
+ directories.register('foo:', FooService, 'Testing directory service')
+ self.addCleanup(lambda: directories.remove('foo:'))
+ self.build_tree_contents([('./foo:bar', out.getvalue())])
+ self.assertRaises(errors.NotABundle, read_mergeable_from_url,
+ 'foo:bar')
=== modified file 'bzrlib/tests/test_read_bundle.py'
--- a/bzrlib/tests/test_read_bundle.py 2007-07-17 13:27:14 +0000
+++ b/bzrlib/tests/test_read_bundle.py 2008-03-25 01:25:28 +0000
@@ -23,13 +23,33 @@
from bzrlib.bundle.serializer import write_bundle
import bzrlib.bzrdir
import bzrlib.errors as errors
-from bzrlib.tests import TestCaseInTempDir
+from bzrlib import tests
from bzrlib.tests.test_transport import TestTransportImplementation
import bzrlib.transport
from bzrlib.transport.memory import MemoryTransport
import bzrlib.urlutils
+def create_bundle_file(test_case):
+ test_case.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
+
+ format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
+
+ bzrdir = format.initialize('tree')
+ repo = bzrdir.create_repository()
+ branch = repo.bzrdir.create_branch()
+ wt = branch.bzrdir.create_workingtree()
+
+ wt.add(['a', 'subdir/'])
+ wt.commit('new project', rev_id='commit-1')
+
+ out = cStringIO.StringIO()
+ rev_ids = write_bundle(wt.branch.repository,
+ wt.get_parent_ids()[0], 'null:', out)
+ out.seek(0)
+ return out, wt
+
+
class TestReadBundleFromURL(TestTransportImplementation):
"""Test that read_bundle works properly across multiple transports"""
@@ -37,22 +57,7 @@
return bzrlib.urlutils.join(self._server.get_url(), relpath)
def create_test_bundle(self):
- self.build_tree(['tree/', 'tree/a', 'tree/subdir/'])
-
- format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
-
- bzrdir = format.initialize('tree')
- repo = bzrdir.create_repository()
- branch = repo.bzrdir.create_branch()
- wt = branch.bzrdir.create_workingtree()
-
- wt.add(['a', 'subdir/'])
- wt.commit('new project', rev_id='commit-1')
-
- out = cStringIO.StringIO()
- rev_ids = write_bundle(wt.branch.repository,
- wt.get_parent_ids()[0], 'null:', out)
- out.seek(0)
+ out, wt = create_bundle_file(self)
if self.get_transport().is_readonly():
f = open('test_bundle', 'wb')
f.write(out.getvalue())
@@ -86,3 +91,14 @@
self.assertRaises(errors.NotABundle,
bzrlib.bundle.read_bundle_from_url,
self.get_url('tree/a'))
+
+ def test_read_mergeable_populates_possible_transports(self):
+ self._captureVar('BZR_NO_SMART_VFS', None)
+ wt = self.create_test_bundle()
+ if wt is None:
+ return
+ possible_transports = []
+ url = unicode(self.get_url('test_bundle'))
+ info = bzrlib.bundle.read_mergeable_from_url(url,
+ possible_transports=possible_transports)
+ self.assertEqual(1, len(possible_transports))
More information about the bazaar-commits
mailing list