Merge lp:~mwhudson/launchpad/no-hosted-area-one-codehosting-endpoint into lp:launchpad

[Michael Hudson-Doyle]

Hi yet again Tim,

This large and EXTREMELY BORING branch combines the two codehosting api endpoints we currently have -- IBranchPuller and IBranchFileSystem -- into one -- ICodehostingAPI -- so that the puller can call the branchChanged method that is currently on IBranchPuller.

Cheers,
mwh

PS: it's very boring.

[Tim Penhey (thumper)]

The xmlrpc-codehosting.txt file has the heading "The BranchPuller application".

Perhaps we could rename the 'self.storage' to 'self.codehosting' in the
CodehostingTest, or 'self.codehosting_api' to be even move verbose.
M-% FTW

lib/lp/codehosting/sshserver/daemon.py
 - still mentions the authserver :-)

Apart from that, your were right, it is a boring branch, but good to go some renames.

review: Approve

[Jonathan Lange (jml)]

There is still an XML-RPC interface called IAuthServer. It's not a great name, but it's not a terrible name either.

[Michael Hudson-Doyle (mwhudson)]

It's not too terrible a name for the endpoint that implements authentication. It's a bit silly for all the other ones :-)

=== modified file 'bzrplugins/lpserve.py'
--- bzrplugins/lpserve.py	2010-04-27 02:11:16 +0000
+++ bzrplugins/lpserve.py	2010-04-27 02:11:35 +0000
@@ -45,9 +45,9 @@
         Option('mirror-directory',
                help='serve branches from this directory. Defaults to '
                     'config.codehosting.mirrored_branches_root.'),
-        Option('branchfs-endpoint',
+        Option('codehosting-endpoint',
                help='the url of the internal XML-RPC server. Defaults to '
-                    'config.codehosting.branchfs_endpoint.',
+                    'config.codehosting.codehosting_endpoint.',
                type=unicode),
         ]
 
@@ -86,7 +86,7 @@
             ui.ui_factory = old_factory
 
     def run(self, user_id, port=None, branch_directory=None,
-            branchfs_endpoint_url=None, inet=False):
+            codehosting_endpoint_url=None, inet=False):
         from lp.codehosting.bzrutils import install_oops_handler
         from lp.codehosting.vfs import get_lp_server, hooks
         install_oops_handler(user_id)
@@ -94,7 +94,7 @@
         resource.setrlimit(resource.RLIMIT_AS, (four_gig, four_gig))
         seen_new_branch = hooks.SetProcTitleHook()
         lp_server = get_lp_server(
-            int(user_id), branchfs_endpoint_url, branch_directory,
+            int(user_id), codehosting_endpoint_url, branch_directory,
             seen_new_branch.seen)
         lp_server.start_server()
 
 
=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2010-04-27 02:11:16 +0000
+++ configs/development/launchpad-lazr.conf	2010-04-27 02:11:35 +0000
@@ -52,8 +52,7 @@
 [codehosting]
 launch: True
 authentication_endpoint: http://xmlrpc-private.launchpad.dev:8087/authserver
-branchfs_endpoint: http://xmlrpc-private.launchpad.dev:8087/branchfilesystem
-branch_puller_endpoint: http://xmlrpc-private.launchpad.dev:8087/branch_puller
+codehosting_endpoint: http://xmlrpc-private.launchpad.dev:8087/codehosting
 supermirror_root: http://bazaar.launchpad.dev/
 hosted_branches_root: /var/tmp/bazaar.launchpad.dev/push-branches/
 codebrowse_root: http://bazaar.launchpad.dev/
 
=== modified file 'cronscripts/supermirror-pull.py'
--- cronscripts/supermirror-pull.py	2010-03-25 18:06:39 +0000
+++ cronscripts/supermirror-pull.py	2010-04-27 02:11:35 +0000
@@ -44,7 +44,7 @@
         parser.error("Unhandled arguments %s" % repr(arguments))
     log = set_up_logging_for_script(options, 'supermirror_puller')
     manager = scheduler.JobScheduler(
-        LoggingProxy(config.codehosting.branch_puller_endpoint, log), log,
+        LoggingProxy(config.codehosting.codehosting_endpoint, log), log,
         options.branch_type)
 
     reactor.callWhenRunning(run_mirror, log, manager)
 
=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-04-27 02:11:16 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-04-27 02:11:35 +0000
@@ -289,19 +289,17 @@
 # datatype: string
 authentication_endpoint: none
 
-# The URL of the XML-RPC endpoint used to provide the data that drives the
-# virtual file systems used by the code hosting service. This should
-# implement IBranchFileSystem.
-#
-# datatype: string
+# Obsolete.
 branchfs_endpoint: none
 
-# The URL of the XML-RPC endpoint that provides the interface from the
-# puller to the rest of Launchpad. This should implement IPullerAPI.
-#
-# datatype: string
+# Obsolete.
 branch_puller_endpoint: none
 
+# The URL of the XML-RPC endpoint that implements ICodehostingAPI.
+#
+# datatype: string
+codehosting_endpoint: none
+
 # See [error_reports].
 oops_prefix: none
 
 
=== added directory 'lib/canonical/launchpad/apidoc'
=== modified file 'lib/canonical/launchpad/interfaces/launchpad.py'
--- lib/canonical/launchpad/interfaces/launchpad.py	2010-04-19 14:47:49 +0000
+++ lib/canonical/launchpad/interfaces/launchpad.py	2010-04-27 02:11:35 +0000
@@ -292,9 +292,7 @@
 
     codeimportscheduler = Attribute("""Code import scheduler end point.""")
 
-    branch_puller = Attribute("""Branch puller end point.""")
-
-    branchfilesystem = Attribute("""The branch filesystem end point.""")
+    codehosting = Attribute("""Codehosting end point.""")
 
     mailinglists = Attribute("""Mailing list XML-RPC end point.""")
 
 
=== modified file 'lib/canonical/launchpad/systemhomes.py'
--- lib/canonical/launchpad/systemhomes.py	2010-04-05 16:06:06 +0000
+++ lib/canonical/launchpad/systemhomes.py	2010-04-27 02:11:35 +0000
@@ -42,8 +42,7 @@
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from lp.bugs.interfaces.bug import (
     CreateBugParams, IBugSet, InvalidBugTargetType)
-from lp.code.interfaces.codehosting import (
-    IBranchFileSystemApplication, IBranchPullerApplication)
+from lp.code.interfaces.codehosting import ICodehostingApplication
 from lp.code.interfaces.codeimportscheduler import (
     ICodeImportSchedulerApplication)
 from lp.registry.interfaces.product import IProduct
@@ -61,18 +60,11 @@
     title = "Auth Server"
 
 
-class BranchFileSystemApplication:
-    """BranchFileSystem End-Point."""
-    implements(IBranchFileSystemApplication)
-
-    title = "Branch File System"
-
-
-class BranchPullerApplication:
-    """BranchPuller End-Point."""
-    implements(IBranchPullerApplication)
-
-    title = "Puller API"
+class CodehostingApplication:
+    """Codehosting End-Point."""
+    implements(ICodehostingApplication)
+
+    title = "Codehosting API"
 
 
 class CodeImportSchedulerApplication:
 
=== modified file 'lib/canonical/launchpad/xmlrpc/application.py'
--- lib/canonical/launchpad/xmlrpc/application.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/xmlrpc/application.py	2010-04-27 02:11:35 +0000
@@ -24,8 +24,7 @@
     IAuthServerApplication, ILaunchBag,
     IMailingListApplication, IPrivateApplication,
     IPrivateMaloneApplication)
-from lp.code.interfaces.codehosting import (
-    IBranchFileSystemApplication, IBranchPullerApplication)
+from lp.code.interfaces.codehosting import ICodehostingApplication
 from lp.code.interfaces.codeimportscheduler import (
     ICodeImportSchedulerApplication)
 from canonical.launchpad.webapp import LaunchpadXMLRPCView
@@ -45,14 +44,9 @@
         return getUtility(IAuthServerApplication)
 
     @property
-    def branch_puller(self):
-        """See `IPrivateApplication`."""
-        return getUtility(IBranchPullerApplication)
-
-    @property
-    def branchfilesystem(self):
-        """See `IPrivateApplication`."""
-        return getUtility(IBranchFileSystemApplication)
+    def codehosting(self):
+        """See `IPrivateApplication`."""
+        return getUtility(ICodehostingApplication)
 
     @property
     def codeimportscheduler(self):
 
=== modified file 'lib/canonical/launchpad/xmlrpc/configure.zcml'
--- lib/canonical/launchpad/xmlrpc/configure.zcml	2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/xmlrpc/configure.zcml	2010-04-27 02:11:35 +0000
@@ -28,28 +28,15 @@
     />
 
   <securedutility
-    class="canonical.launchpad.systemhomes.BranchPullerApplication"
-    provides="lp.code.interfaces.codehosting.IBranchPullerApplication">
-    <allow interface="lp.code.interfaces.codehosting.IBranchPullerApplication"/>
-  </securedutility>
-
-  <xmlrpc:view
-    for="lp.code.interfaces.codehosting.IBranchPullerApplication"
-    interface="lp.code.interfaces.codehosting.IBranchPuller"
-    class="lp.code.xmlrpc.codehosting.BranchPuller"
-    permission="zope.Public"
-    />
-
-  <securedutility
-    class="canonical.launchpad.systemhomes.BranchFileSystemApplication"
-    provides="lp.code.interfaces.codehosting.IBranchFileSystemApplication">
-    <allow interface="lp.code.interfaces.codehosting.IBranchFileSystemApplication"/>
-  </securedutility>
-
-  <xmlrpc:view
-    for="lp.code.interfaces.codehosting.IBranchFileSystemApplication"
-    interface="lp.code.interfaces.codehosting.IBranchFileSystem"
-    class="lp.code.xmlrpc.codehosting.BranchFileSystem"
+    class="canonical.launchpad.systemhomes.CodehostingApplication"
+    provides="lp.code.interfaces.codehosting.ICodehostingApplication">
+    <allow interface="lp.code.interfaces.codehosting.ICodehostingApplication"/>
+  </securedutility>
+
+  <xmlrpc:view
+    for="lp.code.interfaces.codehosting.ICodehostingApplication"
+    interface="lp.code.interfaces.codehosting.ICodehostingAPI"
+    class="lp.code.xmlrpc.codehosting.CodehostingAPI"
     permission="zope.Public"
     />
 
 
=== removed file 'lib/lp/code/doc/xmlrpc-branch-filesystem.txt'
--- lib/lp/code/doc/xmlrpc-branch-filesystem.txt	2009-10-22 11:55:51 +0000
+++ lib/lp/code/doc/xmlrpc-branch-filesystem.txt	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-= The BranchFileSystem application =
-
-The branch file system application is an XMLRPC service that provides
-data for the virtual filesystems used by the codehosting service.  It
-is available as the branchfilesystem attribute of our private XMLRPC
-instance.
-
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPrivateApplication)
-    >>> from lp.code.interfaces.codehosting import (
-    ...     IBranchFileSystemApplication)
-    >>> from canonical.launchpad.webapp.testing import verifyObject
-
-    >>> private_root = getUtility(IPrivateApplication)
-    >>> verifyObject(
-    ...     IBranchFileSystemApplication,
-    ...     private_root.branchfilesystem)
-    True
-
-The end point is implemented by the BranchFileSystem, which implements
-the IBranchFileSystem class.
-
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from lp.code.interfaces.codehosting import IBranchFileSystem
-    >>> from lp.code.xmlrpc.codehosting import (
-    ...     BranchFileSystem)
-
-    >>> branchfs_api = BranchFileSystem(
-    ...     private_root.branchfilesystem, LaunchpadTestRequest())
-    >>> verifyObject(IBranchFileSystem, branchfs_api)
-    True
 
=== removed file 'lib/lp/code/doc/xmlrpc-branch-puller.txt'
--- lib/lp/code/doc/xmlrpc-branch-puller.txt	2010-02-24 01:57:35 +0000
+++ lib/lp/code/doc/xmlrpc-branch-puller.txt	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-= The BranchPuller application =
-
-The branch puller application is an XMLRPC service that allows the puller
-to find and update the status of branches.  It is available as the
-branch_puller attribute of our private XMLRPC instance.
-
-    >>> from canonical.launchpad.interfaces import (
-    ...     IPrivateApplication)
-    >>> from lp.code.interfaces.codehosting import (
-    ...     IBranchPullerApplication)
-    >>> from canonical.launchpad.webapp.testing import verifyObject
-
-    >>> private_root = getUtility(IPrivateApplication)
-    >>> verifyObject(
-    ...     IBranchPullerApplication,
-    ...     private_root.branch_puller)
-    True
-
-The BranchPuller view provides the IBranchPuller XML-RPC API:
-
-    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
-    >>> from lp.code.interfaces.codehosting import IBranchPuller
-    >>> from lp.code.xmlrpc.codehosting import BranchPuller
-
-    >>> branch_puller = BranchPuller(
-    ...     private_root.branch_puller, LaunchpadTestRequest())
-    >>> verifyObject(IBranchPuller, branch_puller)
-    True
-
-The IBranchPuller interface defines some methods, for which see the unit
-tests.
 
=== added file 'lib/lp/code/doc/xmlrpc-codehosting.txt'
--- lib/lp/code/doc/xmlrpc-codehosting.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/doc/xmlrpc-codehosting.txt	2010-04-27 02:11:35 +0000
@@ -0,0 +1,32 @@
+= The BranchPuller application =
+
+The codehosting application is an XMLRPC service that allows the
+codehosting service and puller to find and update the status of
+branches.  It is available as the codehosting attribute of our private
+XMLRPC instance.
+
+    >>> from canonical.launchpad.interfaces import (
+    ...     IPrivateApplication)
+    >>> from lp.code.interfaces.codehosting import (
+    ...     ICodehostingApplication)
+    >>> from canonical.launchpad.webapp.testing import verifyObject
+
+    >>> private_root = getUtility(IPrivateApplication)
+    >>> verifyObject(
+    ...     ICodehostingApplication,
+    ...     private_root.codehosting)
+    True
+
+The CodeHosting view provides the ICodehostingAPI XML-RPC API:
+
+    >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
+    >>> from lp.code.interfaces.codehosting import ICodehostingAPI
+    >>> from lp.code.xmlrpc.codehosting import CodehostingAPI
+
+    >>> codehosting_api = CodehostingAPI(
+    ...     private_root.codehosting, LaunchpadTestRequest())
+    >>> verifyObject(ICodehostingAPI, codehosting_api)
+    True
+
+The ICodehostingAPI interface defines some methods, for which see the
+unit tests.
 
=== modified file 'lib/lp/code/interfaces/codehosting.py'
--- lib/lp/code/interfaces/codehosting.py	2010-04-27 02:11:16 +0000
+++ lib/lp/code/interfaces/codehosting.py	2010-04-27 02:11:35 +0000
@@ -9,10 +9,8 @@
 __all__ = [
     'BRANCH_TRANSPORT',
     'CONTROL_TRANSPORT',
-    'IBranchPuller',
-    'IBranchPullerApplication',
-    'IBranchFileSystem',
-    'IBranchFileSystemApplication',
+    'ICodehostingAPI',
+    'ICodehostingApplication',
     'LAUNCHPAD_ANONYMOUS',
     'LAUNCHPAD_SERVICES',
     'READ_ONLY',
@@ -48,14 +46,17 @@
 CONTROL_TRANSPORT = 'CONTROL_TRANSPORT'
 
 
-class IBranchPullerApplication(ILaunchpadApplication):
+class ICodehostingApplication(ILaunchpadApplication):
     """Branch Puller application root."""
 
 
-class IBranchPuller(Interface):
-    """The puller's interface to the rest of Launchpad.
-
-    Published at 'branch_puller' on the private XML-RPC server.
+class ICodehostingAPI(Interface):
+    """The codehosting XML-RPC interface to Launchpad.
+
+    Published at 'codehosting' on the private XML-RPC server.
+
+    The code hosting service and puller use this to register branches, to
+    retrieve information about a user's branches, and to update their status.
     """
 
     def acquireBranchToPull(branch_type_names):
@@ -144,20 +145,6 @@
             'stacked_on_location'.
         """
 
-
-class IBranchFileSystemApplication(ILaunchpadApplication):
-    """Branch File System end point root."""
-
-
-class IBranchFileSystem(Interface):
-    """An interface for dealing with hosted branches in Launchpad.
-
-    Published at `branchfilesystem`.
-
-    The code hosting service uses this to register branches, to retrieve
-    information about a user's branches, and to update their status.
-    """
-
     def createBranch(login_id, branch_path):
         """Register a new hosted branch in Launchpad.
 
 
=== modified file 'lib/lp/code/xmlrpc/codehosting.py'
--- lib/lp/code/xmlrpc/codehosting.py	2010-04-27 02:11:16 +0000
+++ lib/lp/code/xmlrpc/codehosting.py	2010-04-27 02:11:35 +0000
@@ -5,8 +5,7 @@
 
 __metaclass__ = type
 __all__ = [
-    'BranchFileSystem',
-    'BranchPuller',
+    'CodehostingAPI',
     'datetime_from_tuple',
     ]
 
@@ -43,8 +42,8 @@
     InvalidNamespace, lookup_branch_namespace, split_unique_name)
 from lp.code.interfaces import branchpuller
 from lp.code.interfaces.codehosting import (
-    BRANCH_TRANSPORT, CONTROL_TRANSPORT, IBranchFileSystem, IBranchPuller,
-    LAUNCHPAD_ANONYMOUS, LAUNCHPAD_SERVICES)
+    BRANCH_TRANSPORT, CONTROL_TRANSPORT, ICodehostingAPI, LAUNCHPAD_ANONYMOUS,
+    LAUNCHPAD_SERVICES)
 from lp.registry.interfaces.person import IPersonSet, NoSuchPerson
 from lp.registry.interfaces.product import NoSuchProduct
 from lp.services.scripts.interfaces.scriptactivity import IScriptActivitySet
@@ -54,13 +53,54 @@
 UTC = pytz.timezone('UTC')
 
 
-class BranchPuller(LaunchpadXMLRPCView):
-    """See `IBranchPuller`."""
-
-    implements(IBranchPuller)
+def datetime_from_tuple(time_tuple):
+    """Create a datetime from a sequence that quacks like time.struct_time.
+
+    The tm_isdst is (index 8) is ignored. The created datetime uses
+    tzinfo=UTC.
+    """
+    [year, month, day, hour, minute, second, unused, unused, unused] = (
+        time_tuple)
+    return datetime.datetime(
+        year, month, day, hour, minute, second, tzinfo=UTC)
+
+
+def run_with_login(login_id, function, *args, **kwargs):
+    """Run 'function' logged in with 'login_id'.
+
+    The first argument passed to 'function' will be the Launchpad
+    `Person` object corresponding to 'login_id'.
+
+    The exception is when the requesting login ID is `LAUNCHPAD_SERVICES`. In
+    that case, we'll pass through the `LAUNCHPAD_SERVICES` variable and the
+    method will do whatever security proxy hackery is required to provide read
+    privileges to the Launchpad services.
+    """
+    if login_id == LAUNCHPAD_SERVICES or login_id == LAUNCHPAD_ANONYMOUS:
+        # Don't pass in an actual user. Instead pass in LAUNCHPAD_SERVICES
+        # and expect `function` to use `removeSecurityProxy` or similar.
+        return function(login_id, *args, **kwargs)
+    if isinstance(login_id, basestring):
+        requester = getUtility(IPersonSet).getByName(login_id)
+    else:
+        requester = getUtility(IPersonSet).get(login_id)
+    if requester is None:
+        raise NotFoundError("No person with id %s." % login_id)
+    setupInteractionForPerson(requester)
+    try:
+        return function(requester, *args, **kwargs)
+    finally:
+        endInteraction()
+
+
+
+class CodehostingAPI(LaunchpadXMLRPCView):
+    """See `ICodehostingAPI`."""
+
+    implements(ICodehostingAPI)
 
     def acquireBranchToPull(self, branch_type_names):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         branch_types = []
         for branch_type_name in branch_type_names:
             try:
@@ -86,7 +126,7 @@
             return ()
 
     def mirrorComplete(self, branch_id, last_revision_id):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         branch = getUtility(IBranchLookup).get(branch_id)
         if branch is None:
             return faults.NoBranchWithID(branch_id)
@@ -96,7 +136,7 @@
         return True
 
     def mirrorFailed(self, branch_id, reason):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         branch = getUtility(IBranchLookup).get(branch_id)
         if branch is None:
             return faults.NoBranchWithID(branch_id)
@@ -105,7 +145,7 @@
         return True
 
     def recordSuccess(self, name, hostname, started_tuple, completed_tuple):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         date_started = datetime_from_tuple(started_tuple)
         date_completed = datetime_from_tuple(completed_tuple)
         getUtility(IScriptActivitySet).recordSuccess(
@@ -114,7 +154,7 @@
         return True
 
     def startMirroring(self, branch_id):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         branch = getUtility(IBranchLookup).get(branch_id)
         if branch is None:
             return faults.NoBranchWithID(branch_id)
@@ -124,7 +164,7 @@
         return True
 
     def setStackedOn(self, branch_id, stacked_on_location):
-        """See `IBranchPuller`."""
+        """See `ICodehostingAPI`."""
         # We don't want the security proxy on the branch set because this
         # method should be able to see all branches and set stacking
         # information on any of them.
@@ -146,54 +186,8 @@
         stacked_branch.stacked_on = stacked_on_branch
         return True
 
-
-def datetime_from_tuple(time_tuple):
-    """Create a datetime from a sequence that quacks like time.struct_time.
-
-    The tm_isdst is (index 8) is ignored. The created datetime uses
-    tzinfo=UTC.
-    """
-    [year, month, day, hour, minute, second, unused, unused, unused] = (
-        time_tuple)
-    return datetime.datetime(
-        year, month, day, hour, minute, second, tzinfo=UTC)
-
-
-def run_with_login(login_id, function, *args, **kwargs):
-    """Run 'function' logged in with 'login_id'.
-
-    The first argument passed to 'function' will be the Launchpad
-    `Person` object corresponding to 'login_id'.
-
-    The exception is when the requesting login ID is `LAUNCHPAD_SERVICES`. In
-    that case, we'll pass through the `LAUNCHPAD_SERVICES` variable and the
-    method will do whatever security proxy hackery is required to provide read
-    privileges to the Launchpad services.
-    """
-    if login_id == LAUNCHPAD_SERVICES or login_id == LAUNCHPAD_ANONYMOUS:
-        # Don't pass in an actual user. Instead pass in LAUNCHPAD_SERVICES
-        # and expect `function` to use `removeSecurityProxy` or similar.
-        return function(login_id, *args, **kwargs)
-    if isinstance(login_id, basestring):
-        requester = getUtility(IPersonSet).getByName(login_id)
-    else:
-        requester = getUtility(IPersonSet).get(login_id)
-    if requester is None:
-        raise NotFoundError("No person with id %s." % login_id)
-    setupInteractionForPerson(requester)
-    try:
-        return function(requester, *args, **kwargs)
-    finally:
-        endInteraction()
-
-
-class BranchFileSystem(LaunchpadXMLRPCView):
-    """See `IBranchFileSystem`."""
-
-    implements(IBranchFileSystem)
-
     def createBranch(self, login_id, branch_path):
-        """See `IBranchFileSystem`."""
+        """See `ICodehostingAPI`."""
         def create_branch(requester):
             if not branch_path.startswith('/'):
                 return faults.InvalidPath(branch_path)
@@ -238,7 +232,7 @@
                 and check_permission('launchpad.Edit', branch))
 
     def requestMirror(self, login_id, branchID):
-        """See `IBranchFileSystem`."""
+        """See `ICodehostingAPI`."""
         def request_mirror(requester):
             branch = getUtility(IBranchLookup).get(branchID)
             # We don't really care who requests a mirror of a branch.
@@ -248,7 +242,7 @@
 
     def branchChanged(self, branch_id, stacked_on_location, last_revision_id,
                       control_string, branch_string, repository_string):
-        """See `IBranchFileSystem`."""
+        """See `ICodehostingAPI`."""
         branch_set = removeSecurityProxy(getUtility(IBranchLookup))
         branch = branch_set.get(branch_id)
         if branch is None:
@@ -322,7 +316,7 @@
             trailing_path)
 
     def translatePath(self, requester_id, path):
-        """See `IBranchFileSystem`."""
+        """See `ICodehostingAPI`."""
         @return_fault
         def translate_path(requester):
             if not path.startswith('/'):
 
=== modified file 'lib/lp/code/xmlrpc/tests/test_codehosting.py'
--- lib/lp/code/xmlrpc/tests/test_codehosting.py	2010-04-27 02:11:16 +0000
+++ lib/lp/code/xmlrpc/tests/test_codehosting.py	2010-04-27 02:11:35 +0000
@@ -20,8 +20,7 @@
 from canonical.launchpad.ftests import ANONYMOUS, login, logout
 from lp.services.scripts.interfaces.scriptactivity import (
     IScriptActivitySet)
-from lp.code.interfaces.codehosting import (
-    BRANCH_TRANSPORT, CONTROL_TRANSPORT)
+from lp.code.interfaces.codehosting import BRANCH_TRANSPORT, CONTROL_TRANSPORT
 from canonical.launchpad.interfaces.launchpad import ILaunchBag
 from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
@@ -38,8 +37,7 @@
 from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.model.tests.test_branchpuller import AcquireBranchToPullTests
 from lp.code.xmlrpc.codehosting import (
-    BranchFileSystem, BranchPuller, LAUNCHPAD_ANONYMOUS, LAUNCHPAD_SERVICES,
-    run_with_login)
+    CodehostingAPI, LAUNCHPAD_ANONYMOUS, LAUNCHPAD_SERVICES, run_with_login)
 
 from lp.codehosting.inmemory import InMemoryFrontend
 
@@ -126,17 +124,17 @@
         self.assertEqual(None, login_id)
 
 
-class BranchPullerTest(TestCaseWithFactory):
-    """Tests for the implementation of `IBranchPuller`.
+class CodehostingTest(TestCaseWithFactory):
+    """Tests for the implementation of `ICodehostingAPI`.
 
     :ivar frontend: A nullary callable that returns an object that implements
-        getPullerEndpoint, getLaunchpadObjectFactory and getBranchLookup.
+        getCodehostingEndpoint, getLaunchpadObjectFactory and getBranchLookup.
     """
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
         frontend = self.frontend()
-        self.storage = frontend.getPullerEndpoint()
+        self.codehosting_api = frontend.getCodehostingEndpoint()
         self.factory = frontend.getLaunchpadObjectFactory()
         self.branch_lookup = frontend.getBranchLookup()
         self.getLastActivity = frontend.getLastActivity
@@ -189,7 +187,7 @@
         branch = self.factory.makeAnyBranch()
         self.assertUnmirrored(branch)
 
-        success = self.storage.startMirroring(branch.id)
+        success = self.codehosting_api.startMirroring(branch.id)
         self.assertEqual(success, True)
 
         self.assertSqlAttributeEqualsDate(
@@ -200,23 +198,23 @@
         # startMirroring returns False when given a branch id which does not
         # exist.
         invalid_id = self.getUnusedBranchID()
-        fault = self.storage.startMirroring(invalid_id)
+        fault = self.codehosting_api.startMirroring(invalid_id)
         self.assertEqual(faults.NoBranchWithID(invalid_id), fault)
 
     def test_mirrorFailed(self):
         branch = self.factory.makeAnyBranch()
         self.assertUnmirrored(branch)
 
-        self.storage.startMirroring(branch.id)
+        self.codehosting_api.startMirroring(branch.id)
         failure_message = self.factory.getUniqueString()
-        success = self.storage.mirrorFailed(branch.id, failure_message)
+        success = self.codehosting_api.mirrorFailed(branch.id, failure_message)
         self.assertEqual(True, success)
         self.assertMirrorFailed(branch, failure_message)
 
     def test_mirrorFailedWithNotBranchID(self):
         branch_id = self.getUnusedBranchID()
         failure_message = self.factory.getUniqueString()
-        fault = self.storage.mirrorFailed(branch_id, failure_message)
+        fault = self.codehosting_api.mirrorFailed(branch_id, failure_message)
         self.assertEqual(faults.NoBranchWithID(branch_id), fault)
 
     def test_mirrorComplete(self):
@@ -225,9 +223,9 @@
         branch = self.factory.makeAnyBranch()
         self.assertUnmirrored(branch)
 
-        self.storage.startMirroring(branch.id)
+        self.codehosting_api.startMirroring(branch.id)
         revision_id = self.factory.getUniqueString()
-        success = self.storage.mirrorComplete(branch.id, revision_id)
+        success = self.codehosting_api.mirrorComplete(branch.id, revision_id)
         self.assertEqual(True, success)
         self.assertMirrorSucceeded(branch, revision_id)
 
@@ -235,7 +233,7 @@
         # mirrorComplete returns a Fault if there's no branch with the given
         # ID.
         branch_id = self.getUnusedBranchID()
-        fault = self.storage.mirrorComplete(
+        fault = self.codehosting_api.mirrorComplete(
             branch_id, self.factory.getUniqueString())
         self.assertEqual(faults.NoBranchWithID(branch_id), fault)
 
@@ -245,15 +243,15 @@
 
         # First, mark the branch as failed.
         branch = self.factory.makeAnyBranch()
-        self.storage.startMirroring(branch.id)
+        self.codehosting_api.startMirroring(branch.id)
         failure_message = self.factory.getUniqueString()
-        self.storage.mirrorFailed(branch.id, failure_message)
+        self.codehosting_api.mirrorFailed(branch.id, failure_message)
         self.assertMirrorFailed(branch, failure_message)
 
         # Start and successfully finish a mirror.
-        self.storage.startMirroring(branch.id)
+        self.codehosting_api.startMirroring(branch.id)
         revision_id = self.factory.getUniqueString()
-        self.storage.mirrorComplete(branch.id, revision_id)
+        self.codehosting_api.mirrorComplete(branch.id, revision_id)
 
         # Confirm that it succeeded.
         self.assertMirrorSucceeded(branch, revision_id)
@@ -267,8 +265,9 @@
         branch.requestMirror()
 
         # Simulate successfully mirroring the branch.
-        self.storage.startMirroring(branch.id)
-        self.storage.mirrorComplete(branch.id, self.factory.getUniqueString())
+        self.codehosting_api.startMirroring(branch.id)
+        self.codehosting_api.mirrorComplete(
+            branch.id, self.factory.getUniqueString())
 
         self.assertIs(None, branch.next_mirror_time)
 
@@ -278,7 +277,7 @@
         completed = datetime.datetime(2007, 07, 05, 19, 34, 24, tzinfo=UTC)
         started_tuple = tuple(started.utctimetuple())
         completed_tuple = tuple(completed.utctimetuple())
-        success = self.storage.recordSuccess(
+        success = self.codehosting_api.recordSuccess(
             'test-recordsuccess', 'vostok', started_tuple, completed_tuple)
         self.assertEqual(True, success)
 
@@ -293,7 +292,7 @@
         # generated as part of Launchpad's default stacking.
         stacked_branch = self.factory.makeAnyBranch()
         stacked_on_branch = self.factory.makeAnyBranch()
-        self.storage.setStackedOn(
+        self.codehosting_api.setStackedOn(
             stacked_branch.id, '/%s' % stacked_on_branch.unique_name)
         self.assertEqual(stacked_branch.stacked_on, stacked_on_branch)
 
@@ -304,7 +303,8 @@
         stacked_branch = self.factory.makeAnyBranch()
         stacked_on_branch = self.factory.makeAnyBranch(
             branch_type=BranchType.MIRRORED)
-        self.storage.setStackedOn(stacked_branch.id, stacked_on_branch.url)
+        self.codehosting_api.setStackedOn(
+            stacked_branch.id, stacked_on_branch.url)
         self.assertEqual(stacked_branch.stacked_on, stacked_on_branch)
 
     def test_setStackedOnExternalURLWithTrailingSlash(self):
@@ -315,7 +315,7 @@
         stacked_on_branch = self.factory.makeAnyBranch(
             branch_type=BranchType.MIRRORED)
         url = stacked_on_branch.url + '/'
-        self.storage.setStackedOn(stacked_branch.id, url)
+        self.codehosting_api.setStackedOn(stacked_branch.id, url)
         self.assertEqual(stacked_branch.stacked_on, stacked_on_branch)
 
     def test_setStackedOnNothing(self):
@@ -324,7 +324,7 @@
         stacked_on_branch = self.factory.makeAnyBranch()
         stacked_branch = self.factory.makeAnyBranch(
             stacked_on=stacked_on_branch)
-        self.storage.setStackedOn(stacked_branch.id, '')
+        self.codehosting_api.setStackedOn(stacked_branch.id, '')
         self.assertIs(stacked_branch.stacked_on, None)
 
     def test_setStackedOnBranchNotFound(self):
@@ -332,7 +332,7 @@
         # return a Fault.
         stacked_branch = self.factory.makeAnyBranch()
         url = self.factory.getUniqueURL()
-        fault = self.storage.setStackedOn(stacked_branch.id, url)
+        fault = self.codehosting_api.setStackedOn(stacked_branch.id, url)
         self.assertEqual(faults.NoSuchBranch(url), fault)
 
     def test_setStackedOnNoBranchWithID(self):
@@ -341,110 +341,17 @@
         stacked_on_branch = self.factory.makeAnyBranch(
             branch_type=BranchType.MIRRORED)
         branch_id = self.getUnusedBranchID()
-        fault = self.storage.setStackedOn(branch_id, stacked_on_branch.url)
+        fault = self.codehosting_api.setStackedOn(
+            branch_id, stacked_on_branch.url)
         self.assertEqual(faults.NoBranchWithID(branch_id), fault)
 
-
-class AcquireBranchToPullTestsViaEndpoint(TestCaseWithFactory,
-                                          AcquireBranchToPullTests):
-    """Tests for `acquireBranchToPull` method of `IBranchPuller`."""
-
-    def setUp(self):
-        super(AcquireBranchToPullTestsViaEndpoint, self).setUp()
-        frontend = self.frontend()
-        self.storage = frontend.getPullerEndpoint()
-        self.factory = frontend.getLaunchpadObjectFactory()
-
-    def assertNoBranchIsAquired(self, *branch_types):
-        """See `AcquireBranchToPullTests`."""
-        branch_types = tuple(branch_type.name for branch_type in branch_types)
-        pull_info = self.storage.acquireBranchToPull(branch_types)
-        self.assertEqual((), pull_info)
-
-    def assertBranchIsAquired(self, branch, *branch_types):
-        """See `AcquireBranchToPullTests`."""
-        branch = removeSecurityProxy(branch)
-        branch_types = tuple(branch_type.name for branch_type in branch_types)
-        pull_info = self.storage.acquireBranchToPull(branch_types)
-        default_branch = branch.target.default_stacked_on_branch
-        if default_branch:
-            default_branch_name = default_branch
-        else:
-            default_branch_name = ''
-        self.assertEqual(
-            pull_info,
-            (branch.id, branch.getPullURL(), branch.unique_name,
-             default_branch_name, branch.branch_type.name))
-        self.assertIsNot(None, branch.last_mirror_attempt)
-        self.assertIs(None, branch.next_mirror_time)
-
-    def startMirroring(self, branch):
-        """See `AcquireBranchToPullTests`."""
-        self.storage.startMirroring(branch.id)
-
-    def test_branch_type_returned_mirrored(self):
-        branch = self.factory.makeAnyBranch(branch_type=BranchType.MIRRORED)
-        branch.requestMirror()
-        pull_info = self.storage.acquireBranchToPull(())
-        _, _, _, _, branch_type = pull_info
-        self.assertEqual('MIRRORED', branch_type)
-
-    def test_branch_type_returned_import(self):
-        branch = self.factory.makeAnyBranch(branch_type=BranchType.IMPORTED)
-        branch.requestMirror()
-        pull_info = self.storage.acquireBranchToPull(())
-        _, _, _, _, branch_type = pull_info
-        self.assertEqual('IMPORTED', branch_type)
-
-    def test_default_stacked_on_branch_returned(self):
-        branch = self.factory.makeProductBranch(
-            branch_type=BranchType.MIRRORED)
-        self.factory.enableDefaultStackingForProduct(branch.product)
-        branch.requestMirror()
-        pull_info = self.storage.acquireBranchToPull(())
-        _, _, _, default_stacked_on_branch, _ = pull_info
-        self.assertEqual(
-            default_stacked_on_branch,
-            '/' + branch.target.default_stacked_on_branch.unique_name)
-
-    def test_private_default_stacked_not_returned_for_mirrored_branch(self):
-        # We don't stack mirrored branches on a private default stacked on
-        # branch.
-        product = self.factory.makeProduct()
-        default_branch = self.factory.makeProductBranch(
-            product=product, private=True)
-        self.factory.enableDefaultStackingForProduct(product, default_branch)
-        mirrored_branch = self.factory.makeProductBranch(
-            branch_type=BranchType.MIRRORED, product=product)
-        mirrored_branch.requestMirror()
-        pull_info = self.storage.acquireBranchToPull(())
-        _, _, _, default_stacked_on_branch, _ = pull_info
-        self.assertEqual(
-            '', default_stacked_on_branch)
-
-    def test_unknown_branch_type_name_raises(self):
-        self.assertRaises(
-            UnknownBranchTypeError, self.storage.acquireBranchToPull,
-            ('NO_SUCH_TYPE',))
-
-
-class BranchFileSystemTest(TestCaseWithFactory):
-    """Tests for the implementation of `IBranchFileSystem`."""
-
-    def setUp(self):
-        super(BranchFileSystemTest, self).setUp()
-        frontend = self.frontend()
-        self.branchfs = frontend.getFilesystemEndpoint()
-        self.factory = frontend.getLaunchpadObjectFactory()
-        self.branch_lookup = frontend.getBranchLookup()
-
     def test_createBranch(self):
         # createBranch creates a branch with the supplied details and the
         # caller as registrant.
         owner = self.factory.makePerson()
         product = self.factory.makeProduct()
         name = self.factory.getUniqueString()
-        branch_id = self.branchfs.createBranch(
+        branch_id = self.codehosting_api.createBranch(
             owner.id, escape('/~%s/%s/%s' % (owner.name, product.name, name)))
         login(ANONYMOUS)
         branch = self.branch_lookup.get(branch_id)
@@ -457,7 +364,7 @@
     def test_createBranch_no_preceding_slash(self):
         requester = self.factory.makePerson()
         path = escape(u'invalid')
-        fault = self.branchfs.createBranch(requester.id, path)
+        fault = self.codehosting_api.createBranch(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(faults.InvalidPath(path), fault)
 
@@ -465,7 +372,7 @@
         # createBranch can create +junk branches.
         owner = self.factory.makePerson()
         name = self.factory.getUniqueString()
-        branch_id = self.branchfs.createBranch(
+        branch_id = self.codehosting_api.createBranch(
             owner.id, escape('/~%s/%s/%s' % (owner.name, '+junk', name)))
         login(ANONYMOUS)
         branch = self.branch_lookup.get(branch_id)
@@ -480,7 +387,7 @@
         registrant = self.factory.makePerson()
         team = self.factory.makeTeam(registrant)
         name = self.factory.getUniqueString()
-        branch_id = self.branchfs.createBranch(
+        branch_id = self.codehosting_api.createBranch(
             registrant.id, escape('/~%s/+junk/%s' % (team.name, name)))
         login(ANONYMOUS)
         branch = self.branch_lookup.get(branch_id)
@@ -495,7 +402,7 @@
         owner = self.factory.makePerson()
         name = self.factory.getUniqueString()
         message = "Project 'no-such-product' does not exist."
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             owner.id, escape('/~%s/no-such-product/%s' % (owner.name, name)))
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -507,7 +414,7 @@
         name = self.factory.getUniqueString()
         message = ("%s cannot create branches owned by %s"
                    % (creator.displayname, other_person.displayname))
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             creator.id,
             escape('/~%s/%s/%s' % (other_person.name, product.name, name)))
         self.assertEqual(faults.PermissionDenied(message), fault)
@@ -519,7 +426,7 @@
         invalid_name = 'invalid name!'
         message = ("Invalid branch name '%s'. %s"
                    % (invalid_name, BRANCH_NAME_VALIDATION_ERROR_MESSAGE))
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             owner.id, escape(
                 '/~%s/%s/%s' % (owner.name, product.name, invalid_name)))
         self.assertEqual(faults.PermissionDenied(message), fault)
@@ -532,7 +439,7 @@
         message = ("Invalid branch name '%s'. %s"
                    % (invalid_name.encode('utf-8'),
                       str(BRANCH_NAME_VALIDATION_ERROR_MESSAGE)))
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             owner.id, escape(
                 '/~%s/%s/%s' % (owner.name, product.name, invalid_name)))
         self.assertEqual(
@@ -544,7 +451,7 @@
         product = self.factory.makeProduct()
         name = self.factory.getUniqueString()
         message = "User/team 'no-one' does not exist."
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             owner.id, escape('/~no-one/%s/%s' % (product.name, name)))
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -555,7 +462,7 @@
         owner = self.factory.makePerson()
         name = self.factory.getUniqueString()
         message = "User/team 'no-one' does not exist."
-        fault = self.branchfs.createBranch(
+        fault = self.codehosting_api.createBranch(
             owner.id, escape('/~no-one/no-product/%s' % (name,)))
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -564,7 +471,7 @@
         # raises a PermissionDenied fault.
         owner = self.factory.makePerson()
         path = escape('/~%s' % owner.name)
-        fault = self.branchfs.createBranch(owner.id, path)
+        fault = self.codehosting_api.createBranch(owner.id, path)
         message = "Cannot create branch at '%s'" % path
         self.assertEqual(faults.PermissionDenied(message), fault)
 
@@ -580,7 +487,8 @@
             sourcepackage.distroseries.name,
             sourcepackage.sourcepackagename.name,
             branch_name)
-        branch_id = self.branchfs.createBranch(owner.id, escape(unique_name))
+        branch_id = self.codehosting_api.createBranch(
+            owner.id, escape(unique_name))
         login(ANONYMOUS)
         branch = self.branch_lookup.get(branch_id)
         self.assertEqual(owner, branch.owner)
@@ -601,7 +509,7 @@
         unique_name = '/~%s/ningnangnong/%s/%s/%s' % (
             owner.name, distroseries.name, sourcepackagename.name,
             branch_name)
-        fault = self.branchfs.createBranch(owner.id, escape(unique_name))
+        fault = self.codehosting_api.createBranch(owner.id, escape(unique_name))
         message = "No such distribution: 'ningnangnong'."
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -615,7 +523,8 @@
         unique_name = '/~%s/%s/ningnangnong/%s/%s' % (
             owner.name, distribution.name, sourcepackagename.name,
             branch_name)
-        fault = self.branchfs.createBranch(owner.id, escape(unique_name))
+        fault = self.codehosting_api.createBranch(
+            owner.id, escape(unique_name))
         message = "No such distribution series: 'ningnangnong'."
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -628,7 +537,7 @@
         unique_name = '/~%s/%s/%s/ningnangnong/%s' % (
             owner.name, distroseries.distribution.name, distroseries.name,
             branch_name)
-        fault = self.branchfs.createBranch(owner.id, escape(unique_name))
+        fault = self.codehosting_api.createBranch(owner.id, escape(unique_name))
         message = "No such source package: 'ningnangnong'."
         self.assertEqual(faults.NotFound(message), fault)
 
@@ -643,7 +552,7 @@
         # current time.
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch(branch_type=BranchType.HOSTED)
-        self.branchfs.requestMirror(requester.id, branch.id)
+        self.codehosting_api.requestMirror(requester.id, branch.id)
         self.assertSqlAttributeEqualsDate(
             branch, 'next_mirror_time', UTC_NOW)
 
@@ -652,7 +561,7 @@
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch(owner=requester, private=True)
         branch = removeSecurityProxy(branch)
-        self.branchfs.requestMirror(requester.id, branch.id)
+        self.codehosting_api.requestMirror(requester.id, branch.id)
         self.assertSqlAttributeEqualsDate(
             branch, 'next_mirror_time', UTC_NOW)
 
@@ -672,7 +581,7 @@
         # branchChanged sets the last_mirrored_id attribute on the branch.
         revid = self.factory.getUniqueString()
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', revid, *self.arbitrary_format_strings)
         self.assertEqual(revid, branch.last_mirrored_id)
 
@@ -681,7 +590,7 @@
         # passed in.
         branch = self.factory.makeAnyBranch()
         stacked_on = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, stacked_on.unique_name, '',
             *self.arbitrary_format_strings)
         self.assertEqual(stacked_on, branch.stacked_on)
@@ -691,7 +600,7 @@
         # passed in as the stacked_on location.
         branch = self.factory.makeAnyBranch()
         removeSecurityProxy(branch).stacked_on = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', '', *self.arbitrary_format_strings)
         self.assertIs(None, branch.stacked_on)
 
@@ -699,7 +608,7 @@
         # branchChanged sets the last_mirrored attribute on the branch to the
         # current time.
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', '', *self.arbitrary_format_strings)
         if self.frontend == LaunchpadDatabaseFrontend:
             self.assertSqlAttributeEqualsDate(
@@ -712,7 +621,7 @@
         # mirror_status_message is set to indicate the problem and stacked_on
         # set to None.
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '~does/not/exist', '', *self.arbitrary_format_strings)
         self.assertIs(None, branch.stacked_on)
         self.assertTrue('~does/not/exist' in branch.mirror_status_message)
@@ -722,7 +631,7 @@
         # mirror_status_message.
         branch = self.factory.makeAnyBranch()
         removeSecurityProxy(branch).mirror_status_message = 'foo'
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', '', *self.arbitrary_format_strings)
         self.assertIs(None, branch.mirror_status_message)
 
@@ -731,7 +640,7 @@
         # "NoBranchWithID" is returned.
         unused_id = -1
         expected_fault = faults.NoBranchWithID(unused_id)
-        received_fault = self.branchfs.branchChanged(
+        received_fault = self.codehosting_api.branchChanged(
             unused_id, '', '', *self.arbitrary_format_strings)
         self.assertEqual(
             (expected_fault.faultCode, expected_fault.faultString),
@@ -744,7 +653,7 @@
         branch = self.factory.makeAnyBranch()
         jobs = list(getUtility(IBranchScanJobSource).iterReady())
         self.assertEqual(0, len(jobs))
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', 'rev1', *self.arbitrary_format_strings)
         jobs = list(getUtility(IBranchScanJobSource).iterReady())
         self.assertEqual(1, len(jobs))
@@ -756,14 +665,14 @@
         removeSecurityProxy(branch).last_mirrored_id = 'rev1'
         jobs = list(getUtility(IBranchScanJobSource).iterReady())
         self.assertEqual(0, len(jobs))
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', 'rev1', *self.arbitrary_format_strings)
         jobs = list(getUtility(IBranchScanJobSource).iterReady())
         self.assertEqual(0, len(jobs))
 
     def test_branchChanged_2a_format(self):
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', 'rev1', *self.getFormatStringsForFormatName('2a'))
         self.assertEqual(
             (ControlFormat.BZR_METADIR_1, BranchFormat.BZR_BRANCH_7,
@@ -773,7 +682,7 @@
 
     def test_branchChanged_packs_format(self):
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', 'rev1',
             *self.getFormatStringsForFormatName('pack-0.92'))
         self.assertEqual(
@@ -784,7 +693,7 @@
 
     def test_branchChanged_knits_format(self):
         branch = self.factory.makeAnyBranch()
-        self.branchfs.branchChanged(
+        self.codehosting_api.branchChanged(
             branch.id, '', 'rev1',
             *self.getFormatStringsForFormatName('knit'))
         self.assertEqual(
@@ -795,21 +704,21 @@
 
     def assertCannotTranslate(self, requester, path):
         """Assert that we cannot translate 'path'."""
-        fault = self.branchfs.translatePath(requester.id, path)
+        fault = self.codehosting_api.translatePath(requester.id, path)
         self.assertEqual(faults.PathTranslationError(path), fault)
 
     def assertNotFound(self, requester, path):
         """Assert that the given path cannot be found."""
         if requester not in [LAUNCHPAD_ANONYMOUS, LAUNCHPAD_SERVICES]:
             requester = requester.id
-        fault = self.branchfs.translatePath(requester, path)
+        fault = self.codehosting_api.translatePath(requester, path)
         self.assertEqual(faults.PathTranslationError(path), fault)
 
     def assertPermissionDenied(self, requester, path):
         """Assert that looking at the given path gives permission denied."""
         if requester not in [LAUNCHPAD_ANONYMOUS, LAUNCHPAD_SERVICES]:
             requester = requester.id
-        fault = self.branchfs.translatePath(requester, path)
+        fault = self.codehosting_api.translatePath(requester, path)
         self.assertEqual(faults.PermissionDenied(), fault)
 
     def _makeProductWithDevFocus(self, private=False):
@@ -837,14 +746,14 @@
     def test_translatePath_no_preceding_slash(self):
         requester = self.factory.makePerson()
         path = escape(u'invalid')
-        fault = self.branchfs.translatePath(requester.id, path)
+        fault = self.codehosting_api.translatePath(requester.id, path)
         self.assertEqual(faults.InvalidPath(path), fault)
 
     def test_translatePath_branch(self):
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch()
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -854,7 +763,7 @@
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch()
         path = escape(u'/%s/' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -864,7 +773,7 @@
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch()
         path = escape(u'/%s/child' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, 'child'),
@@ -874,7 +783,7 @@
         requester = self.factory.makePerson()
         branch = self.factory.makeAnyBranch()
         path = escape(u'/%s/a/b' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, 'a/b'),
@@ -888,7 +797,7 @@
         # escaped.
         self.assertNotEqual(escape(child_path), child_path.encode('utf-8'))
         path = escape(u'/%s/%s' % (branch.unique_name, child_path))
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT,
@@ -925,7 +834,7 @@
             self.factory.makeAnyBranch(
                 branch_type=BranchType.HOSTED, private=True, owner=requester))
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': True}, ''),
@@ -946,7 +855,8 @@
     def test_translatePath_launchpad_services_private(self):
         branch = removeSecurityProxy(self.factory.makeAnyBranch(private=True))
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(LAUNCHPAD_SERVICES, path)
+        translation = self.codehosting_api.translatePath(
+            LAUNCHPAD_SERVICES, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -960,7 +870,8 @@
     def test_translatePath_anonymous_public_branch(self):
         branch = self.factory.makeAnyBranch()
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(LAUNCHPAD_ANONYMOUS, path)
+        translation = self.codehosting_api.translatePath(
+            LAUNCHPAD_ANONYMOUS, path)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
             translation)
@@ -970,7 +881,7 @@
         branch = self.factory.makeAnyBranch(
             branch_type=BranchType.HOSTED, owner=requester)
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': True}, ''),
@@ -982,7 +893,7 @@
         branch = self.factory.makeAnyBranch(
             branch_type=BranchType.HOSTED, owner=team)
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': True}, ''),
@@ -994,7 +905,7 @@
         branch = self.factory.makeAnyBranch(
             branch_type=BranchType.HOSTED, owner=team)
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -1005,7 +916,7 @@
         branch = self.factory.makeAnyBranch(
             branch_type=BranchType.MIRRORED, owner=requester)
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -1016,7 +927,7 @@
         branch = self.factory.makeAnyBranch(
             branch_type=BranchType.IMPORTED, owner=requester)
         path = escape(u'/%s' % branch.unique_name)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertEqual(
             (BRANCH_TRANSPORT, {'id': branch.id, 'writable': False}, ''),
@@ -1036,7 +947,7 @@
         requester = self.factory.makePerson()
         product, branch = self._makeProductWithDevFocus()
         path = escape(u'/~%s/%s/.bzr' % (requester.name, product.name))
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertTranslationIsControlDirectory(
             translation,
@@ -1062,7 +973,7 @@
         branch = removeSecurityProxy(branch)
         requester = branch.owner
         path = escape(u'/~%s/%s/.bzr/' % (requester.name, product.name))
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertTranslationIsControlDirectory(
             translation,
@@ -1074,7 +985,7 @@
         product, branch = self._makeProductWithDevFocus()
         owner = self.factory.makePerson()
         path = escape(u'/~%s/%s/.bzr' % (owner.name, product.name))
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertTranslationIsControlDirectory(
             translation,
@@ -1100,7 +1011,7 @@
         self.assertIsNot(
             None, IBranchTarget(package).default_stacked_on_branch)
         path = '/~%s/%s/.bzr/' % (requester.name, package.path)
-        translation = self.branchfs.translatePath(requester.id, path)
+        translation = self.codehosting_api.translatePath(requester.id, path)
         login(ANONYMOUS)
         self.assertTranslationIsControlDirectory(
             translation,
@@ -1108,6 +1019,89 @@
             trailing_path='.bzr')
 
 
+class AcquireBranchToPullTestsViaEndpoint(TestCaseWithFactory,
+                                          AcquireBranchToPullTests):
+    """Tests for `acquireBranchToPull` method of `ICodehostingAPI`."""
+
+    def setUp(self):
+        super(AcquireBranchToPullTestsViaEndpoint, self).setUp()
+        frontend = self.frontend()
+        self.codehosting_api = frontend.getCodehostingEndpoint()
+        self.factory = frontend.getLaunchpadObjectFactory()
+
+    def assertNoBranchIsAquired(self, *branch_types):
+        """See `AcquireBranchToPullTests`."""
+        branch_types = tuple(branch_type.name for branch_type in branch_types)
+        pull_info = self.codehosting_api.acquireBranchToPull(branch_types)
+        self.assertEqual((), pull_info)
+
+    def assertBranchIsAquired(self, branch, *branch_types):
+        """See `AcquireBranchToPullTests`."""
+        branch = removeSecurityProxy(branch)
+        branch_types = tuple(branch_type.name for branch_type in branch_types)
+        pull_info = self.codehosting_api.acquireBranchToPull(branch_types)
+        default_branch = branch.target.default_stacked_on_branch
+        if default_branch:
+            default_branch_name = default_branch
+        else:
+            default_branch_name = ''
+        self.assertEqual(
+            pull_info,
+            (branch.id, branch.getPullURL(), branch.unique_name,
+             default_branch_name, branch.branch_type.name))
+        self.assertIsNot(None, branch.last_mirror_attempt)
+        self.assertIs(None, branch.next_mirror_time)
+
+    def startMirroring(self, branch):
+        """See `AcquireBranchToPullTests`."""
+        self.codehosting_api.startMirroring(branch.id)
+
+    def test_branch_type_returned_mirrored(self):
+        branch = self.factory.makeAnyBranch(branch_type=BranchType.MIRRORED)
+        branch.requestMirror()
+        pull_info = self.codehosting_api.acquireBranchToPull(())
+        _, _, _, _, branch_type = pull_info
+        self.assertEqual('MIRRORED', branch_type)
+
+    def test_branch_type_returned_import(self):
+        branch = self.factory.makeAnyBranch(branch_type=BranchType.IMPORTED)
+        branch.requestMirror()
+        pull_info = self.codehosting_api.acquireBranchToPull(())
+        _, _, _, _, branch_type = pull_info
+        self.assertEqual('IMPORTED', branch_type)
+
+    def test_default_stacked_on_branch_returned(self):
+        branch = self.factory.makeProductBranch(
+            branch_type=BranchType.MIRRORED)
+        self.factory.enableDefaultStackingForProduct(branch.product)
+        branch.requestMirror()
+        pull_info = self.codehosting_api.acquireBranchToPull(())
+        _, _, _, default_stacked_on_branch, _ = pull_info
+        self.assertEqual(
+            default_stacked_on_branch,
+            '/' + branch.target.default_stacked_on_branch.unique_name)
+
+    def test_private_default_stacked_not_returned_for_mirrored_branch(self):
+        # We don't stack mirrored branches on a private default stacked on
+        # branch.
+        product = self.factory.makeProduct()
+        default_branch = self.factory.makeProductBranch(
+            product=product, private=True)
+        self.factory.enableDefaultStackingForProduct(product, default_branch)
+        mirrored_branch = self.factory.makeProductBranch(
+            branch_type=BranchType.MIRRORED, product=product)
+        mirrored_branch.requestMirror()
+        pull_info = self.codehosting_api.acquireBranchToPull(())
+        _, _, _, default_stacked_on_branch, _ = pull_info
+        self.assertEqual(
+            '', default_stacked_on_branch)
+
+    def test_unknown_branch_type_name_raises(self):
+        self.assertRaises(
+            UnknownBranchTypeError, self.codehosting_api.acquireBranchToPull,
+            ('NO_SUCH_TYPE',))
+
+
 class LaunchpadDatabaseFrontend:
     """A 'frontend' to Launchpad's branch services.
 
@@ -1119,13 +1113,9 @@
     alternative implementations can be provided, see `InMemoryFrontend`.
     """
 
-    def getFilesystemEndpoint(self):
+    def getCodehostingEndpoint(self):
         """Return the branch filesystem endpoint for testing."""
-        return BranchFileSystem(None, None)
-
-    def getPullerEndpoint(self):
-        """Return the branch puller endpoint for testing."""
-        return BranchPuller(None, None)
+        return CodehostingAPI(None, None)
 
     def getLaunchpadObjectFactory(self):
         """Return the Launchpad object factory for testing.
@@ -1148,13 +1138,13 @@
         return getUtility(IScriptActivitySet).getLastActivity(activity_name)
 
 
+
 def test_suite():
     loader = unittest.TestLoader()
     suite = unittest.TestSuite()
-    puller_tests = unittest.TestSuite(
-        [loader.loadTestsFromTestCase(BranchPullerTest),
-         loader.loadTestsFromTestCase(AcquireBranchToPullTestsViaEndpoint),
-         loader.loadTestsFromTestCase(BranchFileSystemTest),
+    endpoint_tests = unittest.TestSuite(
+        [loader.loadTestsFromTestCase(AcquireBranchToPullTestsViaEndpoint),
+         loader.loadTestsFromTestCase(CodehostingTest),
          ])
     scenarios = [
         ('db', {'frontend': LaunchpadDatabaseFrontend,
@@ -1162,6 +1152,6 @@
         ('inmemory', {'frontend': InMemoryFrontend,
                       'layer': FunctionalLayer}),
         ]
-    multiply_tests(puller_tests, scenarios, suite)
+    multiply_tests(endpoint_tests, scenarios, suite)
     suite.addTests(loader.loadTestsFromTestCase(TestRunWithLogin))
     return suite
 
=== modified file 'lib/lp/codehosting/inmemory.py'
--- lib/lp/codehosting/inmemory.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/inmemory.py	2010-04-27 02:11:35 +0000
@@ -449,10 +449,18 @@
         return branch
 
 
-class FakeBranchPuller:
+class FakeCodehosting:
 
-    def __init__(self, branch_set, script_activity_set):
+    def __init__(self, branch_set, person_set, product_set, distribution_set,
+                 distroseries_set, sourcepackagename_set, factory,
+                 script_activity_set):
         self._branch_set = branch_set
+        self._person_set = person_set
+        self._product_set = product_set
+        self._distribution_set = distribution_set
+        self._distroseries_set = distroseries_set
+        self._sourcepackagename_set = sourcepackagename_set
+        self._factory = factory
         self._script_activity_set = script_activity_set
 
     def acquireBranchToPull(self, branch_type_names):
@@ -538,19 +546,6 @@
             return faults.NoSuchBranch(stacked_on_location)
         return True
 
-
-class FakeBranchFilesystem:
-
-    def __init__(self, branch_set, person_set, product_set, distribution_set,
-                 distroseries_set, sourcepackagename_set, factory):
-        self._branch_set = branch_set
-        self._person_set = person_set
-        self._product_set = product_set
-        self._distribution_set = distribution_set
-        self._distroseries_set = distroseries_set
-        self._sourcepackagename_set = sourcepackagename_set
-        self._factory = factory
-
     def createBranch(self, requester_id, branch_path):
         if not branch_path.startswith('/'):
             return faults.InvalidPath(branch_path)
@@ -780,31 +775,22 @@
             self._branch_set, self._person_set, self._product_set,
             self._distribution_set, self._distroseries_set,
             self._sourcepackagename_set)
-        self._puller = FakeBranchPuller(
-            self._branch_set, self._script_activity_set)
-        self._branchfs = FakeBranchFilesystem(
+        self._codehosting = FakeCodehosting(
             self._branch_set, self._person_set, self._product_set,
             self._distribution_set, self._distroseries_set,
-            self._sourcepackagename_set, self._factory)
+            self._sourcepackagename_set, self._factory,
+            self._script_activity_set)
         sm = getSiteManager()
         sm.registerAdapter(fake_product_to_branch_target)
         sm.registerAdapter(fake_source_package_to_branch_target)
 
-    def getFilesystemEndpoint(self):
+    def getCodehostingEndpoint(self):
         """See `LaunchpadDatabaseFrontend`.
 
         Return an in-memory implementation of IBranchFileSystem that passes
         the tests in `test_codehosting`.
         """
-        return self._branchfs
-
-    def getPullerEndpoint(self):
-        """See `LaunchpadDatabaseFrontend`.
-
-        Return an in-memory implementation of IBranchPuller that passes the
-        tests in `test_codehosting`.
-        """
-        return self._puller
+        return self._codehosting
 
     def getLaunchpadObjectFactory(self):
         """See `LaunchpadDatabaseFrontend`.
 
=== modified file 'lib/lp/codehosting/puller/scheduler.py'
--- lib/lp/codehosting/puller/scheduler.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/puller/scheduler.py	2010-04-27 02:11:35 +0000
@@ -296,7 +296,7 @@
         self.branch_type_name = branch_type_name
         self.default_stacked_on_url = default_stacked_on_url
         self.logger = logger
-        self.branch_puller_endpoint = client
+        self.codehosting_endpoint = client
         self._available_oops_prefixes = available_oops_prefixes
 
     @cachedproperty
@@ -348,7 +348,7 @@
         return deferred
 
     def setStackedOn(self, stacked_on_location):
-        deferred = self.branch_puller_endpoint.callRemote(
+        deferred = self.codehosting_endpoint.callRemote(
             'setStackedOn', self.branch_id, stacked_on_location)
         def no_such_branch(failure):
             # If there's no branch for stacked_on_location, then we just
@@ -365,7 +365,7 @@
     def mirrorFailed(self, reason, oops):
         self.logger.info('Recorded %s', oops)
         self.logger.info('Recorded failure: %s', str(reason))
-        return self.branch_puller_endpoint.callRemote(
+        return self.codehosting_endpoint.callRemote(
             'mirrorFailed', self.branch_id, reason)
 
     def mirrorSucceeded(self, revid_before, revid_after):
@@ -377,7 +377,7 @@
             'Successfully mirrored %s branch %d %s to %s to from rev %s to %s'
             ' (%s)', self.branch_type_name, self.branch_id, self.source_url,
             self.destination_url, revid_before, revid_after, was_noop)
-        return self.branch_puller_endpoint.callRemote(
+        return self.codehosting_endpoint.callRemote(
             'mirrorComplete', self.branch_id, revid_after)
 
     def log(self, message):
@@ -411,8 +411,8 @@
     branches.
     """
 
-    def __init__(self, branch_puller_endpoint, logger, branch_type_names):
-        self.branch_puller_endpoint = branch_puller_endpoint
+    def __init__(self, codehosting_endpoint, logger, branch_type_names):
+        self.codehosting_endpoint = codehosting_endpoint
         self.logger = logger
         self.branch_type_names = branch_type_names
         self.actualLock = None
@@ -445,11 +445,11 @@
         master = PullerMaster(
             branch_id, pull_url, unique_name, branch_type_name,
             default_stacked_on_url, self.logger,
-            self.branch_puller_endpoint, self.available_oops_prefixes)
+            self.codehosting_endpoint, self.available_oops_prefixes)
         return master.run
 
     def _poll(self):
-        deferred = self.branch_puller_endpoint.callRemote(
+        deferred = self.codehosting_endpoint.callRemote(
             'acquireBranchToPull', self.branch_type_names)
         deferred.addCallback(self._turnJobTupleIntoTask)
         return deferred
@@ -483,7 +483,7 @@
         """Record successful completion of the script."""
         started_tuple = tuple(date_started.utctimetuple())
         completed_tuple = tuple(date_completed.utctimetuple())
-        return self.branch_puller_endpoint.callRemote(
+        return self.codehosting_endpoint.callRemote(
             'recordSuccess', self.name, socket.gethostname(), started_tuple,
             completed_tuple)
 
 
=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
--- lib/lp/codehosting/puller/tests/test_scheduler.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/puller/tests/test_scheduler.py	2010-04-27 02:11:35 +0000
@@ -40,7 +40,7 @@
 from lp.testing.factory import ObjectFactory
 
 
-class FakePullerEndpointProxy:
+class FakeCodehostingEndpointProxy:
 
     def __init__(self):
         self.calls = []
@@ -81,7 +81,8 @@
 
     def makeJobScheduler(self, branch_type_names=()):
         return scheduler.JobScheduler(
-            FakePullerEndpointProxy(), logging.getLogger(), branch_type_names)
+            FakeCodehostingEndpointProxy(), logging.getLogger(),
+            branch_type_names)
 
     def testManagerCreatesLocks(self):
         manager = self.makeJobScheduler()
@@ -105,7 +106,7 @@
         manager.run()
         self.assertEqual(
             [('acquireBranchToPull', ('MIRRORED',))],
-            manager.branch_puller_endpoint.calls)
+            manager.codehosting_endpoint.calls)
 
 
 class TestPullerWireProtocol(TrialTestCase):
@@ -421,7 +422,7 @@
     layer = TwistedLayer
 
     def setUp(self):
-        self.status_client = FakePullerEndpointProxy()
+        self.status_client = FakeCodehostingEndpointProxy()
         self.arbitrary_branch_id = 1
         self.eventHandler = scheduler.PullerMaster(
             self.arbitrary_branch_id, 'arbitrary-source', 'arbitrary-dest',
@@ -528,7 +529,7 @@
             branch_type_name=branch_type_name,
             default_stacked_on_url=default_stacked_on_url,
             logger=logging.getLogger(),
-            client=FakePullerEndpointProxy(),
+            client=FakeCodehostingEndpointProxy(),
             available_oops_prefixes=oops_prefixes)
 
     @property
@@ -642,7 +643,7 @@
             branch_type=BranchType.MIRRORED, url=url).id
         self.layer.txn.commit()
         self.db_branch = getUtility(IBranchLookup).get(branch_id)
-        self.client = FakePullerEndpointProxy()
+        self.client = FakeCodehostingEndpointProxy()
 
     def run(self, result):
         # We want to use Trial's run() method so we can return Deferreds.
 
=== modified file 'lib/lp/codehosting/sftp.py'
--- lib/lp/codehosting/sftp.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/sftp.py	2010-04-27 02:11:35 +0000
@@ -244,7 +244,8 @@
     user_id = avatar.user_id
     branch_transport = _get_transport_for_dir(
         config.codehosting.mirrored_branches_root)
-    server = LaunchpadServer(avatar.branchfs_proxy, user_id, branch_transport)
+    server = LaunchpadServer(
+        avatar.codehosting_proxy, user_id, branch_transport)
     server.start_server()
     transport = AsyncLaunchpadTransport(server, server.get_url())
     return TransportSFTPServer(transport)
 
=== modified file 'lib/lp/codehosting/sshserver/daemon.py'
--- lib/lp/codehosting/sshserver/daemon.py	2010-04-15 15:27:30 +0000
+++ lib/lp/codehosting/sshserver/daemon.py	2010-04-27 02:11:35 +0000
@@ -45,13 +45,13 @@
 class CodehostingAvatar(LaunchpadAvatar):
     """An SSH avatar specific to codehosting.
 
-    :ivar branchfs_proxy: A Twisted XML-RPC client for the authserver. The
-        server must implement `IBranchFileSystem`.
+    :ivar codehosting_proxy: A Twisted XML-RPC client for the private XML-RPC
+        server. The server must implement `ICodehostingAPI`.
     """
 
-    def __init__(self, user_dict, branchfs_proxy):
+    def __init__(self, user_dict, codehosting_proxy):
         LaunchpadAvatar.__init__(self, user_dict)
-        self.branchfs_proxy = branchfs_proxy
+        self.codehosting_proxy = codehosting_proxy
 
 
 components.registerAdapter(launch_smart_server, CodehostingAvatar, ISession)
@@ -63,9 +63,9 @@
 class Realm:
     implements(IRealm)
 
-    def __init__(self, authentication_proxy, branchfs_proxy):
+    def __init__(self, authentication_proxy, codehosting_proxy):
         self.authentication_proxy = authentication_proxy
-        self.branchfs_proxy = branchfs_proxy
+        self.codehosting_proxy = codehosting_proxy
 
     def requestAvatar(self, avatar_id, mind, *interfaces):
         # Fetch the user's details from the authserver
@@ -74,15 +74,15 @@
 
         # Once all those details are retrieved, we can construct the avatar.
         def got_user_dict(user_dict):
-            avatar = CodehostingAvatar(user_dict, self.branchfs_proxy)
+            avatar = CodehostingAvatar(user_dict, self.codehosting_proxy)
             return interfaces[0], avatar, avatar.logout
 
         return deferred.addCallback(got_user_dict)
 
 
-def get_portal(authentication_proxy, branchfs_proxy):
+def get_portal(authentication_proxy, codehosting_proxy):
     """Get a portal for connecting to Launchpad codehosting."""
-    portal = Portal(Realm(authentication_proxy, branchfs_proxy))
+    portal = Portal(Realm(authentication_proxy, codehosting_proxy))
     portal.registerChecker(
         PublicKeyFromLaunchpadChecker(authentication_proxy))
     return portal
@@ -101,5 +101,5 @@
     """
     authentication_proxy = Proxy(
         config.codehosting.authentication_endpoint)
-    branchfs_proxy = Proxy(config.codehosting.branchfs_endpoint)
-    return get_portal(authentication_proxy, branchfs_proxy)
+    codehosting_proxy = Proxy(config.codehosting.codehosting_endpoint)
+    return get_portal(authentication_proxy, codehosting_proxy)
 
=== modified file 'lib/lp/codehosting/tests/test_acceptance.py'
--- lib/lp/codehosting/tests/test_acceptance.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/tests/test_acceptance.py	2010-04-27 02:11:35 +0000
@@ -230,14 +230,15 @@
         """
         authserver = xmlrpclib.ServerProxy(
             config.codehosting.authentication_endpoint)
-        branchfs = xmlrpclib.ServerProxy(config.codehosting.branchfs_endpoint)
+        codehosting_api = xmlrpclib.ServerProxy(
+            config.codehosting.codehosting_endpoint)
         if creator is None:
             creator_id = authserver.getUserAndSSHKeys(user)['id']
         else:
             creator_id = authserver.getUserAndSSHKeys(creator)['id']
         if branch_root is None:
             branch_root = self.server._mirror_root
-        branch_id = branchfs.createBranch(
+        branch_id = codehosting_api.createBranch(
             creator_id, '/~%s/%s/%s' % (user, product, branch))
         branch_url = 'file://' + os.path.abspath(
             os.path.join(branch_root, branch_id_to_path(branch_id)))
 
=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
--- lib/lp/codehosting/tests/test_sftp.py	2010-04-15 14:29:42 +0000
+++ lib/lp/codehosting/tests/test_sftp.py	2010-04-27 02:11:35 +0000
@@ -107,13 +107,13 @@
         TrialTestCase.setUp(self)
         frontend = InMemoryFrontend()
         self.factory = frontend.getLaunchpadObjectFactory()
-        self.branchfs_endpoint = XMLRPCWrapper(
-            frontend.getFilesystemEndpoint())
+        self.codehosting_endpoint = XMLRPCWrapper(
+            frontend.getCodehostingEndpoint())
 
     def makeCodehostingAvatar(self):
         user = self.factory.makePerson()
         user_dict = dict(id=user.id, name=user.name)
-        return CodehostingAvatar(user_dict, self.branchfs_endpoint)
+        return CodehostingAvatar(user_dict, self.codehosting_endpoint)
 
     def test_canAdaptToSFTPServer(self):
         avatar = self.makeCodehostingAvatar()
 
=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2010-04-27 02:11:35 +0000
@@ -68,8 +68,8 @@
 from bzrlib.bzrdir import BzrDir, BzrDirFormat
 from bzrlib.config import TransportConfig
 from bzrlib.errors import (
-    NoSuchFile, NotBranchError, NotStacked, PermissionDenied,
-    TransportNotPossible, UnstackableBranchFormat)
+    NoSuchFile, NotStacked, PermissionDenied, TransportNotPossible,
+    UnstackableBranchFormat)
 from bzrlib.plugins.loom.branch import LoomSupport
 from bzrlib.smart.request import jail_info
 from bzrlib.transport import get_transport
@@ -169,12 +169,12 @@
 
 def get_scanner_server():
     """Get a Launchpad internal server for scanning branches."""
-    proxy = xmlrpclib.ServerProxy(config.codehosting.branchfs_endpoint)
-    branchfs_endpoint = BlockingProxy(proxy)
+    proxy = xmlrpclib.ServerProxy(config.codehosting.codehosting_endpoint)
+    codehosting_endpoint = BlockingProxy(proxy)
     branch_transport = get_readonly_transport(
         get_transport(config.codehosting.internal_branch_by_id_root))
     return LaunchpadInternalServer(
-        'lp-mirrored:///', branchfs_endpoint, branch_transport)
+        'lp-mirrored:///', codehosting_endpoint, branch_transport)
 
 
 def get_rw_server():
@@ -185,10 +185,10 @@
     """
     hosted_transport = get_chrooted_transport(
         config.codehosting.mirrored_branches_root, mkdir=True)
-    proxy = xmlrpclib.ServerProxy(config.codehosting.branchfs_endpoint)
-    branchfs_endpoint = BlockingProxy(proxy)
+    proxy = xmlrpclib.ServerProxy(config.codehosting.codehosting_endpoint)
+    codehosting_endpoint = BlockingProxy(proxy)
     return LaunchpadInternalServer(
-        'lp-internal:///', branchfs_endpoint, hosted_transport)
+        'lp-internal:///', codehosting_endpoint, hosted_transport)
 
 
 def get_multi_server(write_hosted=False, write_mirrored=False,
@@ -223,11 +223,11 @@
     if direct_database:
         make_server = DirectDatabaseLaunchpadServer
     else:
-        proxy = xmlrpclib.ServerProxy(config.codehosting.branchfs_endpoint)
-        branchfs_endpoint = BlockingProxy(proxy)
+        proxy = xmlrpclib.ServerProxy(config.codehosting.codehosting_endpoint)
+        codehosting_endpoint = BlockingProxy(proxy)
         def make_server(scheme, transport):
             return LaunchpadInternalServer(
-                scheme, branchfs_endpoint, transport)
+                scheme, codehosting_endpoint, transport)
     hosted_server = make_server('lp-hosted:///', hosted_transport)
     mirrored_server = make_server('lp-mirrored:///', mirrored_transport)
     return _MultiServer(hosted_server, mirrored_server)
@@ -367,39 +367,41 @@
 
     For more information, see the module docstring.
 
-    :ivar _authserver: An object that has a method 'translatePath' that
+    :ivar _branchfs_client: An object that has a method 'translatePath' that
         returns a Deferred that fires information about how a path can be
         translated into a transport. See `IBranchFilesystem['translatePath']`.
 
     :ivar _transport_dispatch: An `ITransportDispatch` provider used to
-        convert the data from the authserver into an actual transport and
+        convert the data from the branchfs client into an actual transport and
         path on that transport.
     """
 
-    def __init__(self, scheme, authserver, user_id,
+    def __init__(self, scheme, codehosting_api, user_id,
                  seen_new_branch_hook=None):
         """Construct a LaunchpadServer.
 
         :param scheme: The URL scheme to use.
-        :param authserver: An XML-RPC client that implements callRemote.
+        :param codehosting_api: An XML-RPC client that implements callRemote.
         :param user_id: The database ID for the user who is accessing
             branches.
         :param seen_new_branch_hook: A callable that will be called once for
             each branch accessed via this server.
         """
         AsyncVirtualServer.__init__(self, scheme)
-        self._authserver = BranchFileSystemClient(
-            authserver, user_id, seen_new_branch_hook=seen_new_branch_hook)
+        self._branchfs_client = BranchFileSystemClient(
+            codehosting_api, user_id,
+            seen_new_branch_hook=seen_new_branch_hook)
         self._is_start_server = False
 
     def translateVirtualPath(self, virtual_url_fragment):
         """See `AsyncVirtualServer.translateVirtualPath`.
 
-        Call 'translatePath' on the authserver with the fragment and then use
-        'makeTransport' on the _transport_dispatch to translate that result
-        into a transport and trailing path.
+        Call 'translatePath' on the branchfs client with the fragment and then
+        use 'makeTransport' on the _transport_dispatch to translate that
+        result into a transport and trailing path.
         """
-        deferred = self._authserver.translatePath('/' + virtual_url_fragment)
+        deferred = self._branchfs_client.translatePath(
+            '/' + virtual_url_fragment)
 
         def path_not_translated(failure):
             trap_fault(
@@ -426,19 +428,20 @@
     Intended for use with the branch puller and scanner.
     """
 
-    def __init__(self, scheme, authserver, branch_transport):
+    def __init__(self, scheme, codehosting_api, branch_transport):
         """Construct a `LaunchpadInternalServer`.
 
         :param scheme: The URL scheme to use.
 
-        :param authserver: An object that provides a 'translatePath' method.
+        :param codehosting_api: An object that provides a 'translatePath'
+            method.
 
         :param branch_transport: A Bazaar `Transport` that refers to an
             area where Launchpad branches are stored, generally either the
             hosted or mirrored areas.
         """
         super(LaunchpadInternalServer, self).__init__(
-            scheme, authserver, LAUNCHPAD_SERVICES)
+            scheme, codehosting_api, LAUNCHPAD_SERVICES)
         self._transport_dispatch = BranchTransportDispatch(branch_transport)
 
     def start_server(self):
@@ -564,13 +567,13 @@
 
     asyncTransportFactory = AsyncLaunchpadTransport
 
-    def __init__(self, authserver, user_id, branch_transport,
+    def __init__(self, codehosting_api, user_id, branch_transport,
                  seen_new_branch_hook=None):
         """Construct a `LaunchpadServer`.
 
         See `_BaseLaunchpadServer` for more information.
 
-        :param authserver: An object that has 'createBranch' and
+        :param codehosting_api: An object that has 'createBranch' and
             'branchChanged' methods in addition to a 'translatePath' method.
             These methods should return Deferreds.
             XXX: JonathanLange 2008-11-19: Specify this interface better.
@@ -583,7 +586,7 @@
         """
         scheme = 'lp-%d:///' % id(self)
         super(LaunchpadServer, self).__init__(
-            scheme, authserver, user_id, seen_new_branch_hook)
+            scheme, codehosting_api, user_id, seen_new_branch_hook)
         self._transport_dispatch = TransportDispatch(branch_transport)
 
     def createBranch(self, virtual_url_fragment):
@@ -604,7 +607,7 @@
             that its creation is forbidden by a policy.
         :raise Fault: If the XML-RPC server raises errors.
         """
-        deferred = self._authserver.createBranch(virtual_url_fragment)
+        deferred = self._branchfs_client.createBranch(virtual_url_fragment)
 
         def translate_fault(failure):
             # We turn faults.NotFound into a PermissionDenied, even
@@ -667,7 +670,8 @@
         :param virtual_url_fragment: A url fragment that points to a path
             owned by a branch.
         """
-        deferred = self._authserver.translatePath('/' + virtual_url_fragment)
+        deferred = self._branchfs_client.translatePath(
+            '/' + virtual_url_fragment)
 
         def got_path_info((transport_type, data, trailing_path)):
             if transport_type != BRANCH_TRANSPORT:
@@ -693,7 +697,7 @@
                     jail_info.transports.remove(transport)
             if stacked_on_url is None:
                 stacked_on_url = ''
-            return self._authserver.branchChanged(
+            return self._branchfs_client.branchChanged(
                 data['id'], stacked_on_url, last_revision,
                 control_string, branch_string, repository_string)
 
@@ -703,29 +707,29 @@
         return deferred.addCallback(got_path_info).addErrback(log.err)
 
 
-def get_lp_server(user_id, branchfs_endpoint_url=None, branch_directory=None,
+def get_lp_server(user_id, codehosting_endpoint_url=None, branch_directory=None,
                   seen_new_branch_hook=None):
     """Create a Launchpad server.
 
     :param user_id: A unique database ID of the user whose branches are
         being served.
-    :param branchfs_endpoint_url: URL for the branch file system end-point.
+    :param codehosting_endpoint_url: URL for the branch file system end-point.
     :param hosted_directory: Where the branches are uploaded to.
     :param mirror_directory: Where all Launchpad branches are mirrored.
     :param seen_new_branch_hook:
     :return: A `LaunchpadServer`.
     """
     # Get the defaults from the config.
-    if branchfs_endpoint_url is None:
-        branchfs_endpoint_url = config.codehosting.branchfs_endpoint
+    if codehosting_endpoint_url is None:
+        codehosting_endpoint_url = config.codehosting.codehosting_endpoint
     if branch_directory is None:
         branch_directory = config.codehosting.mirrored_branches_root
 
     branch_url = urlutils.local_path_to_url(branch_directory)
-    branchfs_client = xmlrpclib.ServerProxy(branchfs_endpoint_url)
+    codehosting_client = xmlrpclib.ServerProxy(codehosting_endpoint_url)
     branch_transport = get_chrooted_transport(branch_url)
     lp_server = LaunchpadServer(
-        BlockingProxy(branchfs_client), user_id, branch_transport,
+        BlockingProxy(codehosting_client), user_id, branch_transport,
         seen_new_branch_hook)
     return lp_server
 
 
=== modified file 'lib/lp/codehosting/vfs/branchfsclient.py'
--- lib/lp/codehosting/vfs/branchfsclient.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/vfs/branchfsclient.py	2010-04-27 02:11:35 +0000
@@ -34,20 +34,23 @@
 
 
 class BranchFileSystemClient:
-    """Wrapper for the branch filesystem endpoint for a particular user.
-
-    This wrapper caches the results of calls to translatePath in order to
+    """Wrapper for some methods of the codehosting endpoint.
+
+    Instances of this class wrap the methods of the codehosting endpoint
+    required by the VFS code, specialized for a particular user.
+
+    The wrapper also caches the results of calls to translatePath in order to
     avoid a large number of roundtrips. In the normal course of operation, our
     Bazaar transport translates virtual paths to real paths on disk using this
     client. It does this many, many times for a single Bazaar operation, so we
     cache the results here.
     """
 
-    def __init__(self, branchfs_endpoint, user_id, expiry_time=None,
+    def __init__(self, codehosting_endpoint, user_id, expiry_time=None,
                  seen_new_branch_hook=None, _now=time.time):
-        """Construct a caching branchfs_endpoint.
+        """Construct a caching codehosting_endpoint.
 
-        :param branchfs_endpoint: An XML-RPC proxy that implements callRemote.
+        :param codehosting_endpoint: An XML-RPC proxy that implements callRemote.
         :param user_id: The database ID of the user who will be making these
             requests. An integer.
         :param expiry_time: If supplied, only cache the results of
@@ -56,7 +59,7 @@
         :param seen_new_branch_hook: A callable that will be called with the
             unique_name of each new branch that is accessed.
         """
-        self._branchfs_endpoint = branchfs_endpoint
+        self._codehosting_endpoint = codehosting_endpoint
         self._cache = {}
         self._user_id = user_id
         self.expiry_time = expiry_time
@@ -104,16 +107,16 @@
     def createBranch(self, branch_path):
         """Create a Launchpad `IBranch` in the database.
 
-        This raises any Faults that might be raised by the branchfs_endpoint's
-        `createBranch` method, so for more information see
-        `IBranchFileSystem.createBranch`.
+        This raises any Faults that might be raised by the
+        codehosting_endpoint's `createBranch` method, so for more information
+        see `IBranchFileSystem.createBranch`.
 
         :param branch_path: The path to the branch to create.
         :return: A `Deferred` that fires the ID of the created branch.
         """
         return defer.maybeDeferred(
-            self._branchfs_endpoint.callRemote, 'createBranch', self._user_id,
-            branch_path)
+            self._codehosting_endpoint.callRemote, 'createBranch',
+            self._user_id, branch_path)
 
     def branchChanged(self, branch_id, stacked_on_url, last_revision_id,
                       control_string, branch_string, repository_string):
@@ -122,7 +125,7 @@
         :param branch_id: The database ID of the branch.
         """
         return defer.maybeDeferred(
-            self._branchfs_endpoint.callRemote,
+            self._codehosting_endpoint.callRemote,
             'branchChanged', branch_id, stacked_on_url, last_revision_id,
             control_string, branch_string, repository_string)
 
@@ -132,7 +135,7 @@
             return defer.succeed(self._getFromCache(path))
         except NotInCache:
             deferred = defer.maybeDeferred(
-                self._branchfs_endpoint.callRemote,
+                self._codehosting_endpoint.callRemote,
                 'translatePath', self._user_id, path)
             deferred.addCallback(self._addToCache, path)
             return deferred
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfs.py'
--- lib/lp/codehosting/vfs/tests/test_branchfs.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/vfs/tests/test_branchfs.py	2010-04-27 02:11:35 +0000
@@ -176,13 +176,13 @@
 
     def setUp(self):
         frontend = InMemoryFrontend()
-        self.authserver = frontend.getFilesystemEndpoint()
+        self.codehosting_api = frontend.getCodehostingEndpoint()
         self.factory = frontend.getLaunchpadObjectFactory()
         self.requester = self.factory.makePerson()
         self.server = self.getLaunchpadServer(
-            self.authserver, self.requester.id)
+            self.codehosting_api, self.requester.id)
 
-    def getLaunchpadServer(self, authserver, user_id):
+    def getLaunchpadServer(self, codehosting_api, user_id):
         raise NotImplementedError(
             "Override this with a Launchpad server factory.")
 
@@ -213,9 +213,9 @@
         BzrTestCase.setUp(self)
         MixinBaseLaunchpadServerTests.setUp(self)
 
-    def getLaunchpadServer(self, authserver, user_id):
+    def getLaunchpadServer(self, codehosting_api, user_id):
         return LaunchpadServer(
-            XMLRPCWrapper(authserver), user_id, MemoryTransport())
+            XMLRPCWrapper(codehosting_api), user_id, MemoryTransport())
 
     def test_translateControlPath(self):
         branch = self.factory.makeProductBranch(owner=self.requester)
@@ -342,9 +342,9 @@
         self.disable_directory_isolation()
         MixinBaseLaunchpadServerTests.setUp(self)
 
-    def getLaunchpadServer(self, authserver, user_id):
+    def getLaunchpadServer(self, codehosting_api, user_id):
         return LaunchpadInternalServer(
-            'lp-test:///', XMLRPCWrapper(authserver), MemoryTransport())
+            'lp-test:///', XMLRPCWrapper(codehosting_api), MemoryTransport())
 
 
 class TestDirectDatabaseLaunchpadServer(TestCaseWithFactory, TrialTestCase,
@@ -472,11 +472,11 @@
     def setUp(self):
         frontend = InMemoryFrontend()
         self.factory = frontend.getLaunchpadObjectFactory()
-        authserver = frontend.getFilesystemEndpoint()
+        codehosting_api = frontend.getCodehostingEndpoint()
         self.requester = self.factory.makePerson()
         self.backing_transport = MemoryTransport()
         self.server = self.getServer(
-            authserver, self.requester.id, self.backing_transport)
+            codehosting_api, self.requester.id, self.backing_transport)
         self.server.start_server()
         self.addCleanup(self.server.stop_server)
 
@@ -507,9 +507,9 @@
         """Call `function` and return an appropriate Deferred."""
         raise NotImplementedError
 
-    def getServer(self, authserver, user_id, backing_transport):
+    def getServer(self, codehosting_api, user_id, backing_transport):
         return LaunchpadServer(
-            XMLRPCWrapper(authserver), user_id, backing_transport)
+            XMLRPCWrapper(codehosting_api), user_id, backing_transport)
 
     def getTransport(self):
         """Return the transport to be tested."""
@@ -820,8 +820,8 @@
         self._branch_changed_log = []
         frontend = InMemoryFrontend()
         self.factory = frontend.getLaunchpadObjectFactory()
-        self.authserver = frontend.getFilesystemEndpoint()
-        self.authserver.branchChanged = self._replacement_branchChanged
+        self.codehosting_api = frontend.getCodehostingEndpoint()
+        self.codehosting_api.branchChanged = self._replacement_branchChanged
         self.requester = self.factory.makePerson()
         self.backing_transport = MemoryTransport()
         self.disable_directory_isolation()
@@ -835,7 +835,7 @@
     def get_server(self):
         if self._server is None:
             self._server = LaunchpadServer(
-                XMLRPCWrapper(self.authserver), self.requester.id,
+                XMLRPCWrapper(self.codehosting_api), self.requester.id,
                 self.backing_transport)
             self._server.start_server()
             self.addCleanup(self._server.stop_server)
@@ -987,7 +987,7 @@
         self._frontend = InMemoryFrontend()
         self.factory = self._frontend.getLaunchpadObjectFactory()
 
-        authserver = self._frontend.getFilesystemEndpoint()
+        codehosting_api = self._frontend.getCodehostingEndpoint()
         self.requester = self.factory.makePerson()
 
         self.writable_branch = self.factory.makeAnyBranch(
@@ -997,7 +997,7 @@
             branch_type=BranchType.HOSTED).unique_name
 
         self.lp_server = self._setUpLaunchpadServer(
-            self.requester.id, authserver, backing_transport)
+            self.requester.id, codehosting_api, backing_transport)
         self.lp_transport = get_transport(self.lp_server.get_url())
         self.lp_transport.mkdir(os.path.dirname(self.writable_file))
         self.lp_transport.put_bytes(self.writable_file, 'Hello World!')
@@ -1008,9 +1008,9 @@
         self.addCleanup(memory_server.stop_server)
         return memory_server
 
-    def _setUpLaunchpadServer(self, user_id, authserver, backing_transport):
+    def _setUpLaunchpadServer(self, user_id, codehosting_api, backing_transport):
         server = LaunchpadServer(
-            XMLRPCWrapper(authserver), user_id, backing_transport)
+            XMLRPCWrapper(codehosting_api), user_id, backing_transport)
         server.start_server()
         self.addCleanup(server.stop_server)
         return server
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfsclient.py'
--- lib/lp/codehosting/vfs/tests/test_branchfsclient.py	2010-04-09 12:39:23 +0000
+++ lib/lp/codehosting/vfs/tests/test_branchfsclient.py	2010-04-27 02:11:35 +0000
@@ -25,7 +25,7 @@
         frontend = InMemoryFrontend()
         self.factory = frontend.getLaunchpadObjectFactory()
         self.user = self.factory.makePerson()
-        self._xmlrpc_client = XMLRPCWrapper(frontend.getFilesystemEndpoint())
+        self._xmlrpc_client = XMLRPCWrapper(frontend.getCodehostingEndpoint())
         self.fake_time = FakeTime(12345)
 
     def advanceTime(self, amount):
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_filesystem.py'
--- lib/lp/codehosting/vfs/tests/test_filesystem.py	2010-04-27 02:11:16 +0000
+++ lib/lp/codehosting/vfs/tests/test_filesystem.py	2010-04-27 02:11:35 +0000
@@ -30,7 +30,7 @@
         self.disable_directory_isolation()
         frontend = InMemoryFrontend()
         self.factory = frontend.getLaunchpadObjectFactory()
-        endpoint = XMLRPCWrapper(frontend.getFilesystemEndpoint())
+        endpoint = XMLRPCWrapper(frontend.getCodehostingEndpoint())
         self.requester = self.factory.makePerson()
         self._server = LaunchpadServer(
             endpoint, self.requester.id, MemoryTransport())
 
=== modified file 'lib/lp/codehosting/vfs/tests/test_transport.py'
--- lib/lp/codehosting/vfs/tests/test_transport.py	2010-01-20 02:00:32 +0000
+++ lib/lp/codehosting/vfs/tests/test_transport.py	2010-04-27 02:11:35 +0000
@@ -32,7 +32,7 @@
         an in-memory XML-RPC client and backed onto a LocalTransport.
         """
         frontend = InMemoryFrontend()
-        branchfs = frontend.getFilesystemEndpoint()
+        branchfs = frontend.getCodehostingEndpoint()
         branch = frontend.getLaunchpadObjectFactory().makeAnyBranch()
         self._branch_path = branch.unique_name
         # XXX: JonathanLange bug=276972 2008-10-07: This should back on to a
 
=== modified file 'scripts/update-stacked-on.py'
--- scripts/update-stacked-on.py	2010-02-16 15:25:52 +0000
+++ scripts/update-stacked-on.py	2010-04-27 02:11:35 +0000
@@ -39,7 +39,7 @@
 
 def get_server(read_only):
     """Get a server that can write to both hosted and mirrored areas."""
-    proxy = xmlrpclib.ServerProxy(config.codehosting.branchfs_endpoint)
+    proxy = xmlrpclib.ServerProxy(config.codehosting.codehosting_endpoint)
     authserver = BlockingProxy(proxy)
     hosted_transport = get_chrooted_transport(
         config.codehosting.hosted_branches_root)