← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-02 00:03:24 UTC
  • mfrom: (6236.1.2 allow-serving-from-url)
  • Revision ID: pqm@pqm.ubuntu.com-20111102000324-ogs34omxu95ebikb
(jelmer) Support serving from URL in `bzr serve`. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
5349
5349
        if protocol is None:
5350
5350
            protocol = transport.transport_server_registry.get()
5351
5351
        host, port = self.get_host_and_port(port)
5352
 
        url = urlutils.local_path_to_url(directory)
 
5352
        url = transport.location_to_url(directory)
5353
5353
        if not allow_writes:
5354
5354
            url = 'readonly+' + url
5355
 
        t = transport.get_transport(url)
 
5355
        t = transport.get_transport_from_url(url)
5356
5356
        try:
5357
5357
            protocol(t, host, port, inet, client_timeout)
5358
5358
        except TypeError, e: