37
37
from bzrlib.api import require_any_api
39
require_any_api(bzrlib, [(1, 13, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0)])
39
require_any_api(bzrlib, [(1, 11, 0), (1, 13, 0), (1, 15, 0)])
41
# TODO: This should provide a new type of server that can be used by bzr
42
# serve, maybe through a registry, rather than overriding the command. Though
43
# maybe we should keep the wrapper to work with older bzr releases, at least
41
46
# NB: Normally plugins should lazily load almost everything, but this
42
47
# seems reasonable to have in-line here: bzrlib.commands and options are
43
48
# normally loaded, and the rest of loggerhead won't be loaded until serve
46
# transport_server_registry was added in bzr 1.16. When we drop support for
47
# older releases, we can remove the code to override cmd_serve.
50
from bzrlib.transport import transport_server_registry
52
transport_server_registry = None
54
DEFAULT_HOST = '0.0.0.0'
51
import bzrlib.builtins
52
from bzrlib.commands import get_cmd_object, register_command
53
from bzrlib.option import Option
55
_original_command = get_cmd_object('serve')
55
57
DEFAULT_PORT = 8080
56
HELP = ('Loggerhead, a web-based code viewer and server. (default port: %d)' %
59
def serve_http(transport, host=None, port=None, inet=None):
60
# loggerhead internal code will try to 'import loggerhead', so
61
# let's put it on the path if we can't find it in the existing path
66
sys.path.append(os.path.dirname(__file__))
68
from loggerhead.apps.transport import BranchesFromTransportRoot
69
from loggerhead.config import LoggerheadConfig
70
from paste.httpexceptions import HTTPExceptionHandler
71
from paste.httpserver import serve
76
argv = ['--host', host, '--port', str(port), '--', transport.base]
77
if not transport.is_readonly():
78
argv.insert(0, '--allow-writes')
79
config = LoggerheadConfig(argv)
80
app = BranchesFromTransportRoot(transport, config)
81
app = HTTPExceptionHandler(app)
82
serve(app, host=host, port=port)
84
if transport_server_registry is not None:
85
transport_server_registry.register('http', serve_http, help=HELP)
87
import bzrlib.builtins
88
from bzrlib.commands import get_cmd_object, register_command
89
from bzrlib.option import Option
91
_original_command = get_cmd_object('serve')
93
class cmd_serve(bzrlib.builtins.cmd_serve):
94
__doc__ = _original_command.__doc__
96
takes_options = _original_command.takes_options + [
97
Option('http', help=HELP)]
99
def run(self, *args, **kw):
101
from bzrlib.transport import get_transport
102
allow_writes = kw.get('allow_writes', False)
103
path = kw.get('directory', '.')
104
port = kw.get('port', DEFAULT_PORT)
105
# port might be an int already...
106
if isinstance(port, basestring) and ':' in port:
107
host, port = port.split(':')
111
transport = get_transport(path)
113
transport = get_transport('readonly+' + path)
114
serve_http(transport, host, port)
59
class cmd_serve(bzrlib.builtins.cmd_serve):
60
__doc__ = _original_command.__doc__
62
takes_options = _original_command.takes_options + [
64
help='Run an http (Loggerhead) server to browse code, '
65
'by default on port %s.' % DEFAULT_PORT)]
67
def run(self, *args, **kw):
69
# loggerhead internal code will try to 'import loggerhead', so
70
# let's put it on the path
72
sys.path.append(os.path.dirname(__file__))
74
from bzrlib.transport import get_transport
75
from loggerhead.apps.transport import BranchesFromTransportRoot
76
from loggerhead.config import LoggerheadConfig
77
from paste.httpexceptions import HTTPExceptionHandler
78
from paste.httpserver import serve
79
path = kw.get('directory', '.')
80
port = kw.get('port', DEFAULT_PORT)
81
# port might be an int already...
82
if isinstance(port, basestring) and ':' in port:
83
host, port = port.split(':')
116
super(cmd_serve, self).run(*args, **kw)
86
argv = ['--host', host, '--port', str(port), path]
87
config = LoggerheadConfig(argv)
88
transport = get_transport(path)
89
app = BranchesFromTransportRoot(transport, config)
90
app = HTTPExceptionHandler(app)
91
serve(app, host=host, port=port)
93
super(cmd_serve, self).run(*args, **kw)
118
register_command(cmd_serve)
95
register_command(cmd_serve)
added
removed
__init__.py
