37
37
from bzrlib.api import require_any_api
39
require_any_api(bzrlib, [(1, 11, 0), (1, 13, 0), (1, 15, 0)])
39
require_any_api(bzrlib, [(1, 11, 0), (1, 13, 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 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
63
sys.path.append(os.path.dirname(__file__))
65
from loggerhead.apps.transport import BranchesFromTransportRoot
66
from loggerhead.config import LoggerheadConfig
67
from paste.httpexceptions import HTTPExceptionHandler
68
from paste.httpserver import serve
73
argv = ['--host', host, '--port', str(port), transport.base]
74
config = LoggerheadConfig(argv)
75
app = BranchesFromTransportRoot(transport, config)
76
app = HTTPExceptionHandler(app)
77
serve(app, host=host, port=port)
79
if transport_server_registry is not None:
80
transport_server_registry.register('http', serve_http, help=HELP)
82
import bzrlib.builtins
83
from bzrlib.commands import get_cmd_object, register_command
84
from bzrlib.option import Option
86
_original_command = get_cmd_object('serve')
88
class cmd_serve(bzrlib.builtins.cmd_serve):
89
__doc__ = _original_command.__doc__
91
takes_options = _original_command.takes_options + [
92
Option('http', help=HELP)]
94
def run(self, *args, **kw):
96
from bzrlib.transport import get_transport
97
path = kw.get('directory', '.')
98
port = kw.get('port', DEFAULT_PORT)
99
# port might be an int already...
100
if isinstance(port, basestring) and ':' in port:
101
host, port = port.split(':')
104
transport = get_transport(path)
105
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 loggerhead.apps.filesystem import BranchesFromFileSystemRoot
75
from paste.httpexceptions import HTTPExceptionHandler
76
from paste.httpserver import serve
77
a = HTTPExceptionHandler(BranchesFromFileSystemRoot('.'))
78
port = kw.get('port', DEFAULT_PORT)
79
# port might be an int already...
80
if isinstance(port, basestring) and ':' in port:
81
host, port = port.split(':')
107
super(cmd_serve, self).run(*args, **kw)
84
serve(a, host=host, port=port)
86
super(cmd_serve, self).run(*args, **kw)
109
register_command(cmd_serve)
88
register_command(cmd_serve)
added
removed
__init__.py
