[MERGE] Launchpad locations can be pulled #181945

[Andrew Bennetts]

This looks good to me.  I have a couple of minor comments, but they're almost
trivial.

bb:tweak

Aaron Bentley wrote:
[...]
> === modified file 'NEWS'
> --- NEWS	2008-03-23 23:11:45 +0000
> +++ NEWS	2008-03-24 23:43:51 +0000
> @@ -48,6 +48,8 @@
>  
>      * Implement handling of basename parameter for DefaultMail.  (James Westby)
>  
> +    * Launchpad locations can be pulled.  (Aaron Bentley, #181945)

Maybe say “Launchpad locations (lp: URLs) can be pulled”?

> === modified file 'bzrlib/tests/blackbox/test_pull.py'
[...]
> +    def test_pull_directory(self):

Maybe “test_pull_from_directory_service”, just to be a little clearer?

> +        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, 'Map foo URLs to http urls')

The description on this registration seems bogus.  Passing FooService.__doc__ or
“Test directory service.” would make more sense.

> === modified file 'bzrlib/tests/test_bundle.py'
[...]
> +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, 'Map foo URLs to http urls')

Ditto.

-Andrew.