Merge lp:~jelmer/launchpad/git-server into lp:launchpad

[Jelmer Vernooij]

Add the early beginnings of git+ssh support.

Add basic support for the Git SSH server in Launchpad, through bzr.

This is enough to make:

git clone git+ssh://bazaar.launchpad.dev/~vcs-imports/etckeeper/trunk

work on my machine, but that's about it.

What it doesn't do:
 * perform reasonably
 * update the ui to mention git+ssh
 * work for branches that have data in them that is not round-trippable (basically, anything that is not a git import) - bugs #863261 and #544776

This isn't ready yet, I'm submitting it here for the diff and to track its status. This has to be fixed before it can be reviewed/landed:

 * use a feature flag
 * path sanitization (see the FIXME)
 * tests

[lp:~jelmer/launchpad/git-server]

14510. By Jelmer Vernooij on 2012-01-03

Merge lp:launchpad.

14511. By Jelmer Vernooij on 2012-01-03

Add code.git feature flag.

14512. By Jelmer Vernooij on 2012-01-03

Rename feature to code.sshserver.git.

14513. By Jelmer Vernooij on 2012-01-03

Add bug #

Unmerged revisions

14513. By Jelmer Vernooij on 2012-01-03

Add bug #

14512. By Jelmer Vernooij on 2012-01-03

Rename feature to code.sshserver.git.

14511. By Jelmer Vernooij on 2012-01-03

Add code.git feature flag.

14510. By Jelmer Vernooij on 2012-01-03

Merge lp:launchpad.

14509. By Jelmer Vernooij on 2011-12-21

Drop git format support - focus just on the server in this branch.

14508. By Jelmer Vernooij on 2011-12-15

Update source code cache.

14507. By Jelmer Vernooij on 2011-12-15

Merge lp:launchpad

14506. By Jelmer Vernooij on 2011-12-13

merge lp:launchpad

14505. By Jelmer Vernooij on 2011-12-12

Merge lp:launchpad.

14504. By Jelmer Vernooij on 2011-12-12

Update to newer version of bzr-git.

=== modified file 'bzrplugins/lpserve/__init__.py'
--- bzrplugins/lpserve/__init__.py	2011-12-21 06:14:46 +0000
+++ bzrplugins/lpserve/__init__.py	2012-01-03 19:50:31 +0000
@@ -58,6 +58,34 @@
     aliases = ['lp-serve']
 
     takes_options = [
+<<<<<<< TREE
+        Option('inet',
+               help='serve on stdin/out for use from inetd or sshd'),
+        Option('port',
+               help='listen for connections on nominated port of the form '
+                    '[hostname:]portnumber. Passing 0 as the port number will'
+                    ' result in a dynamically allocated port. Default port is'
+                    ' 4155.',
+               type=str),
+        Option('directory',
+               help='Subdirectory to serve. Defaults to /.',
+               type=unicode),
+        Option('upload-directory',
+               help='upload branches to this directory. Defaults to '
+                    'config.codehosting.hosted_branches_root.',
+               type=unicode),
+        Option('mirror-directory',
+               help='serve branches from this directory. Defaults to '
+                    'config.codehosting.mirrored_branches_root.'),
+        Option('codehosting-endpoint',
+               help='the url of the internal XML-RPC server. Defaults to '
+                    'config.codehosting.codehosting_endpoint.',
+               type=unicode),
+        RegistryOption('protocol',
+               help="Protocol to serve.",
+               lazy_registry=('bzrlib.transport', 'transport_server_registry'),
+               value_switches=True),
+=======
         Option(
             'inet',
             help="serve on stdin/out for use from inetd or sshd"),
@@ -90,6 +118,7 @@
             'protocol', help="Protocol to serve.",
             lazy_registry=('bzrlib.transport', 'transport_server_registry'),
             value_switches=True),
+>>>>>>> MERGE-SOURCE
         ]
 
     takes_args = ['user_id']
@@ -126,7 +155,7 @@
             port = int(port)
         return host, port
 
-    def run(self, user_id, port=None, branch_directory=None,
+    def run(self, user_id, port=None, directory=None,
             codehosting_endpoint_url=None, inet=False, protocol=None):
         from lp.codehosting.bzrutils import install_oops_handler
         from lp.codehosting.vfs import get_lp_server, hooks
@@ -137,12 +166,14 @@
         if protocol is None:
             protocol = transport_server_registry.get()
         lp_server = get_lp_server(
-            int(user_id), codehosting_endpoint_url, branch_directory,
+            int(user_id), codehosting_endpoint_url, None,
             seen_new_branch.seen)
         lp_server.start_server()
         try:
             old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
             lp_transport = get_transport(lp_server.get_url())
+            if directory is not None:
+                lp_transport = lp_transport.clone(directory.encode('utf-8'))
             host, port = self.get_host_and_port(port)
             lockdir._DEFAULT_TIMEOUT_SECONDS = 0
             try:

=== modified file 'lib/lp/codehosting/sshserver/session.py'
--- lib/lp/codehosting/sshserver/session.py	2012-01-01 02:58:52 +0000
+++ lib/lp/codehosting/sshserver/session.py	2012-01-03 19:50:31 +0000
@@ -25,6 +25,7 @@
 
 from lp.codehosting import get_bzr_path
 from lp.services.config import config
+from lp.services.features import getFeatureFlag
 from lp.services.sshserver.events import AvatarEvent
 from lp.services.sshserver.session import DoNothingSession
 
@@ -459,6 +460,11 @@
 
     if command == 'bzr serve --inet --directory=/ --allow-writes':
         return command_template
+    if getFeatureFlag('code.sshserver.git'):
+        base_command, rest = command.split(" ", 1)
+        if base_command in ('git-receive-pack', 'git-upload-pack'):
+            # !!!XXX!!! JRV 2011-12-12 This could probably do with some escaping..
+            return command_template + " --" + base_command + " --directory=%s" % rest
     # At the moment, only bzr branch serving is allowed.
     raise ForbiddenCommand("Not allowed to execute %r." % (command,))
 

=== modified file 'lib/lp/codehosting/sshserver/tests/test_session.py'
--- lib/lp/codehosting/sshserver/tests/test_session.py	2012-01-01 02:58:52 +0000
+++ lib/lp/codehosting/sshserver/tests/test_session.py	2012-01-03 19:50:31 +0000
@@ -440,3 +440,11 @@
             ' lp-serve --inet %(user_id)s',
             lookup_command_template(
                 'bzr serve --inet --directory=/ --allow-writes'))
+
+    def test_git(self):
+        self.assertEquals(
+            config.root + '/bin/py ' + get_bzr_path() +
+            " lp-serve --inet %(user_id)s --git-receive-pack "
+            "'/data/git/jelmer/dulwich.git'",
+            lookup_command_template(
+                "git-receive-pack '/data/git/jelmer/dulwich.git'"))

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-12-22 22:20:19 +0000
+++ lib/lp/services/features/flags.py	2012-01-03 19:50:31 +0000
@@ -87,6 +87,12 @@
      '',
      '',
      ''),
+    ('code.sshserver.git',
+     'boolean',
+     'Enables git support in the SSH server.',
+     '',
+     '',
+     ''),
     ('code.incremental_diffs.enabled',
      'boolean',
      'Shows incremental diffs on merge proposals.',