Merge lp:~thumper/launchpad/hg-imports-using-url into lp:launchpad/db-devel

[Tim Penhey]

[Tim Penhey (thumper)]

This branch merges jelmer's hg import work into the imports-urls branch.

[Tim Penhey (thumper)]

We are now ready to go.

Local import succeeded \o/

[Michael Hudson-Doyle (mwhudson)]

Hi Tim,

Cool to see this arrive! Sadly, I'm not sure it can land yet, because
of the new sourcecode branch. Let's talk to a LOSA about that.

> === modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'

I think it would be good to create a Hg import in this test.

> --- lib/lp/code/stories/codeimport/xx-create-codeimport.txt 2010-01-11 22:40:42 +0000
> +++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt 2010-01-12 22:39:29 +0000
> @@ -32,6 +32,7 @@
>
> >>> print_radio_button_field(browser.contents, "rcs_type")
> ( ) Git
> + ( ) Mercurial
> (*) Subversion
> ( ) CVS
>
> @@ -66,21 +67,14 @@
> Requesting a Git import
> =======================
>
> -The default foreign VCS type is Subversion.
> -
> - >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
> - >>> print_radio_button_field(browser.contents, "rcs_type")
> - ( ) Git
> - (*) Subversion
> - ( ) CVS
> -
> The user is required to enter a project that the import is for,
> a name for the import branch, and a subversion branch location.
>
> + >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
> >>> browser.getControl('Project').value = "firefox"
> >>> browser.getControl('Branch Name').value = "git-import"
> >>> browser.getControl('Git').click()
> - >>> browser.getControl('Repo URL').value = (
> + >>> browser.getControl('Repo URL', index=0).value = (
> ... "git://example.com/firefox.git")
> >>> browser.getControl('Request Import').click()
>

> === modified file 'lib/lp/code/templates/branch-import-details.pt'
> --- lib/lp/code/templates/branch-import-details.pt 2010-01-11 21:21:00 +0000
> +++ lib/lp/code/templates/branch-import-details.pt 2010-01-12 22:39:29 +0000
> @@ -45,6 +45,12 @@
> </p>
> </tal:git-import>
>
> + <tal:hg-import condition="code_import/rcs_type/enumvalue:HG">
> + <p>This branch is an import of the Mercurial repo at

I think I overheard some conversation about this, but it's not really
an import of the repo, but of the tip branch or whatever it's called
for Mercurial. Should we try to explain this?

> + <span tal:replace="code_import/url" />.
> + </p>
> + </tal:hg-import>
> +
> <tal:svn-import condition="view/is_svn_import">
> <p id="svn-import-details">
> This branch is an import of the

> === modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
> --- lib/lp/codehosting/codeimport/tests/servers.py 2009-12-04 04:08:12 +0000
> +++ lib/lp/codehosting/codeimport/tests/servers.py 2010-01-12 22:39:29 +0000
> @@ -8,6 +8,7 @@
> __all__ = [
> 'CVSServer',
> 'GitServer',
> + 'MercurialServer',
> 'SubversionServer',
> ]
>
> @@ -210,3 +211,23 @@
> builder.finish()
> finally:
> os.chdir(wd)
> +
> +
> +class MercurialServer(Server):
> +
> + def __init__(self, repo_url):
> + super(MercurialServer, self).__init__()
> + self.repo_url = repo_url
> +
> + def makeRepo(self, tree_contents):
> + from mercurial.ui import ui
> + from mercurial.localrepo import localreposit...

review: Approve

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2009-11-17 11:27:51 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-01-13 02:53:16 +0000
@@ -402,6 +402,11 @@
 default_interval_git: 21600
 
 # The default value of the update interval of a code import from
+# Mercurial, in seconds.
+# datatype: integer
+default_interval_hg: 21600
+
+# The default value of the update interval of a code import from
 # CVS, in seconds.
 # datatype: integer
 default_interval_cvs: 43200
 
=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2010-01-13 02:53:14 +0000
+++ lib/lp/code/browser/codeimport.py	2010-01-13 02:53:16 +0000
@@ -213,7 +213,7 @@
     git_repo_url = URIField(
         title=_("Repo URL"), required=False,
         description=_(
-            "The URL of the git repository.  The MASTER branch will be "
+            "The URL of the git repository.  The HEAD branch will be "
             "imported."),
         allowed_schemes=["git"],
         allow_userinfo=False, # Only anonymous access is supported.
@@ -222,6 +222,18 @@
         allow_fragment=False,
         trailing_slash=False)
 
+    hg_repo_url = URIField(
+        title=_("Repo URL"), required=False,
+        description=_(
+            "The URL of the Mercurial repository.  The tip branch will be "
+            "imported."),
+        allowed_schemes=["http", "https"],
+        allow_userinfo=False, # Only anonymous access is supported.
+        allow_port=True,
+        allow_query=False,    # Query makes no sense in Mercurial
+        allow_fragment=False, # Fragment makes no sense in Mercurial
+        trailing_slash=False) # See http://launchpad.net/bugs/56357.
+
     branch_name = copy_field(
         IBranch['name'],
         __name__='branch_name',
@@ -258,16 +270,18 @@
         # display them separately in the form.
         soup = BeautifulSoup(self.widgets['rcs_type']())
         fields = soup.findAll('input')
-        [cvs_button, svn_button, git_button, empty_marker] = [
+        [cvs_button, svn_button, git_button, hg_button, empty_marker] = [
             field for field in fields
-            if field.get('value') in ['CVS', 'BZR_SVN', 'GIT', '1']]
+            if field.get('value') in ['CVS', 'BZR_SVN', 'GIT', 'HG', '1']]
         cvs_button['onclick'] = 'updateWidgets()'
         svn_button['onclick'] = 'updateWidgets()'
         git_button['onclick'] = 'updateWidgets()'
+        hg_button['onclick'] = 'updateWidgets()'
         # The following attributes are used only in the page template.
         self.rcs_type_cvs = str(cvs_button)
         self.rcs_type_svn = str(svn_button)
         self.rcs_type_git = str(git_button)
+        self.rcs_type_hg = str(hg_button)
         self.rcs_type_emptymarker = str(empty_marker)
 
     def _getImportLocation(self, data):
@@ -279,6 +293,8 @@
             return None, None, data.get('svn_branch_url')
         elif rcs_type == RevisionControlSystems.GIT:
             return None, None, data.get('git_repo_url')
+        elif rcs_type == RevisionControlSystems.HG:
+            return None, None, data.get('hg_repo_url')
         else:
             raise AssertionError(
                 'Unexpected revision control type %r.' % rcs_type)
@@ -379,6 +395,9 @@
         elif rcs_type == RevisionControlSystems.GIT:
             self._validateURL(
                 data.get('git_repo_url'), field_name='git_repo_url')
+        elif rcs_type == RevisionControlSystems.HG:
+            self._validateURL(
+                data.get('hg_repo_url'), field_name='hg_repo_url')
         else:
             raise AssertionError(
                 'Unexpected revision control type %r.' % rcs_type)
@@ -469,7 +488,8 @@
             self.form_fields = self.form_fields.omit('url')
         elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
                                            RevisionControlSystems.BZR_SVN,
-                                           RevisionControlSystems.GIT):
+                                           RevisionControlSystems.GIT,
+                                           RevisionControlSystems.HG):
             self.form_fields = self.form_fields.omit(
                 'cvs_root', 'cvs_module')
         else:
@@ -503,7 +523,8 @@
                 self.code_import)
         elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
                                            RevisionControlSystems.BZR_SVN,
-                                           RevisionControlSystems.GIT):
+                                           RevisionControlSystems.GIT,
+                                           RevisionControlSystems.HG):
             self._validateURL(data.get('url'), self.code_import)
         else:
             raise AssertionError('Unknown rcs_type for code import.')
 
=== modified file 'lib/lp/code/doc/codeimport-event.txt'
--- lib/lp/code/doc/codeimport-event.txt	2010-01-13 02:53:14 +0000
+++ lib/lp/code/doc/codeimport-event.txt	2010-01-13 02:53:16 +0000
@@ -165,6 +165,20 @@
     URL u'git://git.example.org/main.git'
 
 
+And for a Mercurial import, the hg details are recorded.
+
+    >>> hg_import = factory.makeCodeImport(
+    ...     hg_repo_url='http://hg.example.org/main')
+    >>> hg_create_event = event_set.newCreate(hg_import, nopriv)
+    >>> print_items(hg_create_event)
+    CODE_IMPORT <muted>
+    OWNER ...
+    REVIEW_STATUS u'REVIEWED'
+    ASSIGNEE None
+    UPDATE_INTERVAL None
+    URL u'http://hg.example.org/main'
+
+
 == MODIFY ==
 
 When a code import is modified, the ICodeImportEventSet utility should
 
=== modified file 'lib/lp/code/doc/codeimport.txt'
--- lib/lp/code/doc/codeimport.txt	2010-01-13 02:53:14 +0000
+++ lib/lp/code/doc/codeimport.txt	2010-01-13 02:53:16 +0000
@@ -197,6 +197,33 @@
     >>> git_import == existing_import
     True
 
+Import from Mercurial
++++++++++++++++++++++
+
+Code imports from Mercurial specify the URL used with "hg clone" to
+retrieve the branch to import.
+
+    >>> hg = RevisionControlSystems.HG
+    >>> hg_url = 'http://hg.example.com/metallic'
+    >>> hg_import = code_import_set.new(
+    ...     registrant=nopriv, product=product, branch_name='trunk-hg',
+    ...     rcs_type=hg, url=hg_url)
+    >>> verifyObject(ICodeImport, removeSecurityProxy(hg_import))
+    True
+
+Creating a CodeImport object creates a corresponding CodeImportEvent.
+
+    >>> hg_events = event_set.getEventsForCodeImport(hg_import)
+    >>> [event.event_type.name for event in hg_events]
+    ['CREATE']
+
+The CodeImportSet is also able to retrieve the code imports with the
+specified hg repo url.
+
+    >>> existing_import = code_import_set.getByURL(url=hg_url)
+    >>> hg_import == existing_import
+    True
+
 
 Updating code import details
 ----------------------------
@@ -316,6 +343,8 @@
     ...     seconds=config.codeimport.default_interval_subversion)
     >>> default_interval_git = timedelta(
     ...     seconds=config.codeimport.default_interval_git)
+    >>> default_interval_hg = timedelta(
+    ...     seconds=config.codeimport.default_interval_hg)
 
 By default, code imports are created with an unspecified update interval.
 
@@ -345,6 +374,12 @@
     >>> git_import.effective_update_interval
     datetime.timedelta(0, 21600)
 
+    >>> default_interval_hg
+    datetime.timedelta(0, 21600)
+    >>> hg_import.effective_update_interval
+    datetime.timedelta(0, 21600)
+
+
 If the update interval is set, then it overrides the default value.
 
 As explained in the "Modify CodeImports" section, the interface does not allow
@@ -477,7 +512,7 @@
     instead of:
         hello from :pserver:[e-mail]:/cvsroot
 
-And for Git.
+For Git.
 
     >>> data = {'url': 'git://git.example.com/goodbye.git'}
     >>> modify_event = git_import.updateFromData(data, nopriv)
@@ -499,6 +534,16 @@
     instead of:
         svn://svn.example.com/for-bzr-svn/trunk
 
+And for Mercurial.
+
+    >>> data = {'url': 'http://metal.example.com/byebye.hg'}
+    >>> modify_event = hg_import.updateFromData(data, nopriv)
+    >>> print make_email_body_for_code_import_update(
+    ...     hg_import, modify_event, None)
+    ~no-priv/firefox/trunk-hg is now being imported from:
+        http://metal.example.com/byebye.hg
+    instead of:
+        http://hg.example.com/metallic
 
 In addition, updateFromData can be used to set the branch whiteboard,
 which is also described in the email that is sent.
 
=== modified file 'lib/lp/code/mail/codeimport.py'
--- lib/lp/code/mail/codeimport.py	2010-01-13 02:53:14 +0000
+++ lib/lp/code/mail/codeimport.py	2010-01-13 02:53:16 +0000
@@ -97,7 +97,8 @@
                 "\ninstead of:\n" + old_details)
     elif code_import.rcs_type in (RevisionControlSystems.SVN,
                                   RevisionControlSystems.BZR_SVN,
-                                  RevisionControlSystems.GIT):
+                                  RevisionControlSystems.GIT,
+                                  RevisionControlSystems.HG):
         if CodeImportEventDataType.OLD_URL in event_data:
             old_url = event_data[CodeImportEventDataType.OLD_URL]
             body.append(
 
=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-01-13 02:53:13 +0000
+++ lib/lp/code/model/codeimport.py	2010-01-13 02:53:16 +0000
@@ -106,6 +106,8 @@
                 config.codeimport.default_interval_subversion,
             RevisionControlSystems.GIT:
                 config.codeimport.default_interval_git,
+            RevisionControlSystems.HG:
+                config.codeimport.default_interval_hg,
             }
         seconds = default_interval_dict[self.rcs_type]
         return timedelta(seconds=seconds)
@@ -122,7 +124,8 @@
         elif self.rcs_type in (
             RevisionControlSystems.SVN,
             RevisionControlSystems.GIT,
-            RevisionControlSystems.BZR_SVN):
+            RevisionControlSystems.BZR_SVN,
+            RevisionControlSystems.HG):
             return self.url
         else:
             raise AssertionError(
@@ -218,7 +221,8 @@
             assert url is None
         elif rcs_type in (RevisionControlSystems.SVN,
                           RevisionControlSystems.BZR_SVN,
-                          RevisionControlSystems.GIT):
+                          RevisionControlSystems.GIT,
+                          RevisionControlSystems.HG):
             assert cvs_root is None and cvs_module is None
             assert url is not None
         else:
@@ -226,8 +230,9 @@
                 "Don't know how to sanity check source details for unknown "
                 "rcs_type %s"%rcs_type)
         if review_status is None:
-            # Auto approve git imports.
-            if rcs_type == RevisionControlSystems.GIT:
+            # Auto approve git and hg imports.
+            if rcs_type in (
+                RevisionControlSystems.GIT, RevisionControlSystems.HG):
                 review_status = CodeImportReviewStatus.REVIEWED
             else:
                 review_status = CodeImportReviewStatus.NEW
 
=== modified file 'lib/lp/code/model/codeimportevent.py'
--- lib/lp/code/model/codeimportevent.py	2010-01-13 02:53:14 +0000
+++ lib/lp/code/model/codeimportevent.py	2010-01-13 02:53:16 +0000
@@ -258,7 +258,8 @@
         """Yield key-value tuples describing the source of the import."""
         if code_import.rcs_type in (RevisionControlSystems.SVN,
                                     RevisionControlSystems.BZR_SVN,
-                                    RevisionControlSystems.GIT):
+                                    RevisionControlSystems.GIT,
+                                    RevisionControlSystems.HG):
             yield 'URL', code_import.url
         elif code_import.rcs_type == RevisionControlSystems.CVS:
             yield 'CVS_ROOT', code_import.cvs_root
 
=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-01-13 02:53:14 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-01-13 02:53:16 +0000
@@ -24,26 +24,17 @@
 from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
 from lp.testing import (
     login, login_person, logout, TestCaseWithFactory, time_counter)
-from lp.testing.factory import LaunchpadObjectFactory
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.testing import (
     DatabaseFunctionalLayer, LaunchpadFunctionalLayer,
     LaunchpadZopelessLayer)
 
 
-class TestCodeImportCreation(unittest.TestCase):
+class TestCodeImportCreation(TestCaseWithFactory):
     """Test the creation of CodeImports."""
 
     layer = DatabaseFunctionalLayer
 
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-        self.factory = LaunchpadObjectFactory()
-        login('[e-mail]')
-
-    def tearDown(self):
-        logout()
-
     def test_new_svn_import(self):
         """A new subversion code import should have NEW status."""
         code_import = CodeImportSet().new(
@@ -56,7 +47,7 @@
             CodeImportReviewStatus.NEW,
             code_import.review_status)
         # No job is created for the import.
-        self.assertTrue(code_import.import_job is None)
+        self.assertIs(None, code_import.import_job)
 
     def test_reviewed_svn_import(self):
         """A specific review status can be set for a new import."""
@@ -71,7 +62,7 @@
             CodeImportReviewStatus.REVIEWED,
             code_import.review_status)
         # A job is created for the import.
-        self.assertTrue(code_import.import_job is not None)
+        self.assertIsNot(None, code_import.import_job)
 
     def test_new_cvs_import(self):
         """A new CVS code import should have NEW status."""
@@ -86,7 +77,7 @@
             CodeImportReviewStatus.NEW,
             code_import.review_status)
         # No job is created for the import.
-        self.assertTrue(code_import.import_job is None)
+        self.assertIs(None, code_import.import_job)
 
     def test_reviewed_cvs_import(self):
         """A specific review status can be set for a new import."""
@@ -102,7 +93,7 @@
             CodeImportReviewStatus.REVIEWED,
             code_import.review_status)
         # A job is created for the import.
-        self.assertTrue(code_import.import_job is not None)
+        self.assertIsNot(None, code_import.import_job)
 
     def test_git_import_reviewed(self):
         """A new git import is always reviewed by default."""
@@ -117,23 +108,29 @@
             CodeImportReviewStatus.REVIEWED,
             code_import.review_status)
         # A job is created for the import.
-        self.assertTrue(code_import.import_job is not None)
-
-
-class TestCodeImportDeletion(unittest.TestCase):
+        self.assertIsNot(None, code_import.import_job)
+
+    def test_hg_import_reviewed(self):
+        """A new hg import is always reviewed by default."""
+        code_import = CodeImportSet().new(
+            registrant=self.factory.makePerson(),
+            product=self.factory.makeProduct(),
+            branch_name='imported',
+            rcs_type=RevisionControlSystems.HG,
+            url=self.factory.getUniqueURL(),
+            review_status=None)
+        self.assertEqual(
+            CodeImportReviewStatus.REVIEWED,
+            code_import.review_status)
+        # No job is created for the import.
+        self.assertIsNot(None, code_import.import_job)
+
+
+class TestCodeImportDeletion(TestCaseWithFactory):
     """Test the deletion of CodeImports."""
 
     layer = LaunchpadFunctionalLayer
 
-    def setUp(self):
-        unittest.TestCase.setUp(self)
-        self.factory = LaunchpadObjectFactory()
-        # Log in a vcs import member.
-        login('[e-mail]')
-
-    def tearDown(self):
-        logout()
-
     def test_delete(self):
         """Ensure CodeImport objects can be deleted via CodeImportSet."""
         code_import = self.factory.makeCodeImport()
@@ -302,15 +299,13 @@
             CodeImportReviewStatus.FAILING, code_import.review_status)
 
 
-class TestCodeImportResultsAttribute(unittest.TestCase):
+class TestCodeImportResultsAttribute(TestCaseWithFactory):
     """Test the results attribute of a CodeImport."""
 
     layer = LaunchpadFunctionalLayer
 
     def setUp(self):
-        unittest.TestCase.setUp(self)
-        login('[e-mail]')
-        self.factory = LaunchpadObjectFactory()
+        TestCaseWithFactory.setUp(self)
         self.code_import = self.factory.makeCodeImport()
 
     def tearDown(self):
@@ -534,7 +529,7 @@
 def make_active_import(factory, project_name=None, product_name=None,
                        branch_name=None, svn_branch_url=None,
                        cvs_root=None, cvs_module=None, git_repo_url=None,
-                       last_update=None, rcs_type=None):
+                       hg_repo_url=None, last_update=None, rcs_type=None):
     """Make a new CodeImport for a new Product, maybe in a new Project.
 
     The import will be 'active' in the sense used by
@@ -549,7 +544,8 @@
     code_import = factory.makeCodeImport(
         product=product, branch_name=branch_name,
         svn_branch_url=svn_branch_url, cvs_root=cvs_root,
-        cvs_module=cvs_module, git_repo_url=git_repo_url, rcs_type=rcs_type)
+        cvs_module=cvs_module, git_repo_url=git_repo_url,
+        hg_repo_url=hg_repo_url, rcs_type=None)
     make_import_active(factory, code_import, last_update)
     return code_import
 
 
=== modified file 'lib/lp/code/stories/codeimport/xx-admin-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-01-13 02:53:14 +0000
+++ lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-01-13 02:53:16 +0000
@@ -32,6 +32,12 @@
     ...     git_repo_url="git://git.example.org/fooix")
     >>> git_import_location = str(canonical_url(git_import.branch))
     >>> git_import_branch_unique_name = git_import.branch.unique_name
+
+    >>> hg_import = factory.makeCodeImport(
+    ...     hg_repo_url="http://hg.example.org/bar")
+    >>> hg_import_location = str(canonical_url(hg_import.branch))
+    >>> hg_import_branch_unique_name = hg_import.branch.unique_name
+
     >>> logout()
 
     >>> import_browser = setupBrowser(
@@ -97,6 +103,12 @@
     >>> print_form_fields(import_browser)
     field.url: git://git.example.org/fooix
 
+    >>> import_browser.open(hg_import_location)
+    >>> import_browser.getLink('Edit import source or review import').click()
+    >>> print_form_fields(import_browser)
+    field.url: http://hg.example.org/bar
+
+
 Editing the import location
 +++++++++++++++++++++++++++
 
@@ -135,7 +147,7 @@
     ...     print extract_text(message)
     The code import has been updated.
 
-and Git imports.
+Git imports,
 
     >>> import_browser.open(git_import_location + '/+edit-import')
     >>> import_browser.getControl('URL').value = \
@@ -145,6 +157,15 @@
     ...     print extract_text(message)
     The code import has been updated.
 
+and Mercurial imports.
+
+    >>> import_browser.open(hg_import_location + '/+edit-import')
+    >>> import_browser.getControl('URL').value = \
+    ...     'http://metal.example.org/bar'
+    >>> import_browser.getControl('Update').click()
+    >>> for message in get_feedback_messages(import_browser.contents):
+    ...     print extract_text(message)
+    The code import has been updated.
 
 Approving an import
 +++++++++++++++++++
 
=== modified file 'lib/lp/code/stories/codeimport/xx-codeimport-list.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-list.txt	2009-12-08 04:31:34 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-list.txt	2010-01-13 02:53:16 +0000
@@ -34,14 +34,18 @@
     ...     factory, product_name="herproj", branch_name="master",
     ...     git_repo_url="git://git.example.org/herproj",
     ...     last_update=datetime.datetime(2007, 1, 4, tzinfo=pytz.UTC))
+    >>> active_hg_import = make_active_import(
+    ...     factory, product_name="hg-proj", branch_name="tip",
+    ...     hg_repo_url="http://hg.example.org/proj",
+    ...     last_update=datetime.datetime(2007, 1, 5, tzinfo=pytz.UTC))
     >>> len(list(code_import_set.getActiveImports()))
-    4
+    5
     >>> logout()
 
 The page is linked to from the "$N imported branches" text.
 
     >>> browser.open('http://code.launchpad.dev')
-    >>> browser.getLink('4 imported branches').click()
+    >>> browser.getLink('5 imported branches').click()
     >>> print browser.title
     Available code imports
 
@@ -54,6 +58,7 @@
    >>> print_import_table()
    Project    Branch Name Source Details                             Last Updated
    herproj    master      git://git.example.org/herproj              2007-01-04
+   hg-proj    tip         http://hg.example.org/proj                 2007-01-05
    hisproj    main        :pserver:[e-mail]:/cvs hisproj     2007-01-03
    myproject  trunk       http://example.com/svn/myproject/trunk     2007-01-01
    ourproject trunk       http://example.com/bzr-svn/myproject/trunk 2007-01-02
 
=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-01-13 02:53:14 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-01-13 02:53:16 +0000
@@ -32,6 +32,7 @@
 
     >>> print_radio_button_field(browser.contents, "rcs_type")
     ( ) Git
+    ( ) Mercurial
     (*) Subversion
     ( ) CVS
 
@@ -63,24 +64,18 @@
     >>> print svn_span['title']
     Subversion via bzr-svn
 
+
 Requesting a Git import
 =======================
 
-The default foreign VCS type is Subversion.
-
-    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
-    >>> print_radio_button_field(browser.contents, "rcs_type")
-    ( ) Git
-    (*) Subversion
-    ( ) CVS
-
 The user is required to enter a project that the import is for,
 a name for the import branch, and a subversion branch location.
 
+    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
     >>> browser.getControl('Project').value = "firefox"
     >>> browser.getControl('Branch Name').value = "git-import"
     >>> browser.getControl('Git').click()
-    >>> browser.getControl('Repo URL').value = (
+    >>> browser.getControl('Repo URL', index=0).value = (
     ...     "git://example.com/firefox.git")
     >>> browser.getControl('Request Import').click()
 
@@ -88,11 +83,34 @@
 
     >>> print extract_text(find_tag_by_id(browser.contents, "import-details"))
     Import Status: Reviewed
-    This branch is an import of the MASTER branch from the Git repo at
+    This branch is an import of the HEAD branch of the Git repository at
     git://example.com/firefox.git.
     The next import is scheduled to run as soon as possible.
 
 
+Requesting a Mercurial import
+=======================
+
+The user is required to enter a project that the import is for,
+a name for the import branch, and a mercurial branch location.
+
+    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
+    >>> browser.getControl('Project').value = "firefox"
+    >>> browser.getControl('Branch Name').value = "hg-import"
+    >>> browser.getControl('Mercurial').click()
+    >>> browser.getControl('Repo URL', index=1).value = (
+    ...     "http://example.com/firefox.hg")
+    >>> browser.getControl('Request Import').click()
+
+When the user clicks continue, the approved import branch is created
+
+    >>> print extract_text(find_tag_by_id(browser.contents, "import-details"))
+    Import Status: Reviewed
+    This branch is an import of the tip branch of the Mercurial repository at
+    http://example.com/firefox.hg.
+    The next import is scheduled to run as soon as possible.
+
+
 Requesting a CVS import
 =======================
 
 
=== modified file 'lib/lp/code/templates/branch-import-details.pt'
--- lib/lp/code/templates/branch-import-details.pt	2010-01-13 02:53:14 +0000
+++ lib/lp/code/templates/branch-import-details.pt	2010-01-13 02:53:16 +0000
@@ -40,11 +40,17 @@
         </div>
 
         <tal:git-import condition="code_import/rcs_type/enumvalue:GIT">
-          <p>This branch is an import of the MASTER branch from the Git repo at
+          <p>This branch is an import of the HEAD branch of the Git repository at
             <span tal:replace="code_import/url" />.
           </p>
         </tal:git-import>
 
+        <tal:hg-import condition="code_import/rcs_type/enumvalue:HG">
+          <p>This branch is an import of the tip branch of the Mercurial repository at
+            <span tal:replace="code_import/url" />.
+          </p>
+        </tal:hg-import>
+
         <tal:svn-import condition="view/is_svn_import">
           <p id="svn-import-details">
             This branch is an import of the
 
=== modified file 'lib/lp/code/templates/codeimport-new.pt'
--- lib/lp/code/templates/codeimport-new.pt	2009-12-08 02:32:03 +0000
+++ lib/lp/code/templates/codeimport-new.pt	2010-01-13 02:53:16 +0000
@@ -62,6 +62,20 @@
         <tr>
           <td>
             <label>
+              <input tal:replace="structure view/rcs_type_hg" />
+              Mercurial
+            </label>
+            <table class="importdetails">
+              <tal:widget define="widget nocall:view/widgets/hg_repo_url">
+                <metal:block use-macro="context/@@launchpad_form/widget_row" />
+              </tal:widget>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td>
+            <label>
               <input tal:replace="structure view/rcs_type_svn" />
               Subversion
             </label>
@@ -108,6 +122,8 @@
           }
           // GIT
           updateField(form['field.git_repo_url'], rcs_type == 'GIT');
+          // HG
+          updateField(form['field.hg_repo_url'], rcs_type == 'HG');
           // CVS
           updateField(form['field.cvs_root'], rcs_type == 'CVS');
           updateField(form['field.cvs_module'], rcs_type == 'CVS');
 
=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
--- lib/lp/codehosting/codeimport/tests/servers.py	2009-12-04 04:08:12 +0000
+++ lib/lp/codehosting/codeimport/tests/servers.py	2010-01-13 02:53:16 +0000
@@ -8,6 +8,7 @@
 __all__ = [
     'CVSServer',
     'GitServer',
+    'MercurialServer',
     'SubversionServer',
     ]
 
@@ -210,3 +211,23 @@
             builder.finish()
         finally:
             os.chdir(wd)
+
+
+class MercurialServer(Server):
+
+    def __init__(self, repo_url):
+        super(MercurialServer, self).__init__()
+        self.repo_url = repo_url
+
+    def makeRepo(self, tree_contents):
+        from mercurial.ui import ui
+        from mercurial.localrepo import localrepository
+        repo = localrepository(ui(), self.repo_url, create=1)
+        for filename, contents in tree_contents:
+            f = open(os.path.join(self.repo_url, filename), 'w')
+            try:
+                f.write(contents)
+            finally:
+                f.close()
+            repo.add([filename])
+        repo.commit(text='<The commit message>', user='jane Foo <[e-mail]>')
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-01-13 02:53:14 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-01-13 02:53:16 +0000
@@ -9,7 +9,6 @@
 import os
 import shutil
 import subprocess
-import sys
 import tempfile
 import time
 import unittest
@@ -32,10 +31,10 @@
 from lp.codehosting import load_optional_plugin
 from lp.codehosting.codeimport.worker import (
     BazaarBranchStore, BzrSvnImportWorker, CSCVSImportWorker,
-    ForeignTreeStore, GitImportWorker, ImportDataStore, ImportWorker,
-    get_default_bazaar_branch_store)
+    ForeignTreeStore, GitImportWorker, HgImportWorker, ImportDataStore,
+    ImportWorker, get_default_bazaar_branch_store)
 from lp.codehosting.codeimport.tests.servers import (
-    CVSServer, GitServer, SubversionServer)
+    CVSServer, GitServer, MercurialServer, SubversionServer)
 from lp.codehosting.tests.helpers import (
     create_branch_with_one_revision)
 from lp.testing.factory import LaunchpadObjectFactory
@@ -822,7 +821,7 @@
         # import should be rejected.
         args = {'rcstype': self.rcstype}
         reference_url = self.createBranchReference()
-        if self.rcstype in ('git', 'bzr-svn'):
+        if self.rcstype in ('git', 'bzr-svn', 'hg'):
             args['url'] = reference_url
         else:
             raise AssertionError("unexpected rcs_type %r" % self.rcs_type)
@@ -886,6 +885,57 @@
             rcstype='git', url=repository_path)
 
 
+class TestMercurialImport(WorkerTest, TestActualImportMixin,
+                          PullingImportWorkerTests):
+
+    rcstype = 'hg'
+
+    def setUp(self):
+        super(TestMercurialImport, self).setUp()
+        load_optional_plugin('hg')
+        self.setUpImport()
+
+    def tearDown(self):
+        """Clear bzr-hg's cache of sqlite connections.
+
+        This is rather obscure: different test runs tend to re-use the same
+        paths on disk, which confuses bzr-hg as it keeps a cache that maps
+        paths to database connections, which happily returns the connection
+        that corresponds to a path that no longer exists.
+        """
+        from bzrlib.plugins.hg.idmap import mapdbs
+        mapdbs().clear()
+        WorkerTest.tearDown(self)
+
+    def makeImportWorker(self, source_details):
+        """Make a new `ImportWorker`."""
+        return HgImportWorker(
+            source_details, self.get_transport('import_data'),
+            self.bazaar_store, logging.getLogger())
+
+    def makeForeignCommit(self, source_details):
+        """Change the foreign tree, generating exactly one commit."""
+        from mercurial.ui import ui
+        from mercurial.localrepo import localrepository
+        repo = localrepository(ui(), source_details.url)
+        repo.commit(text="hello world!", user="Jane Random Hacker", force=1)
+        self.foreign_commit_count += 1
+
+    def makeSourceDetails(self, branch_name, files):
+        """Make a Mercurial `CodeImportSourceDetails` pointing at a real repo.
+        """
+        repository_path = self.makeTemporaryDirectory()
+        hg_server = MercurialServer(repository_path)
+        hg_server.setUp()
+        self.addCleanup(hg_server.tearDown)
+
+        hg_server.makeRepo(files)
+        self.foreign_commit_count = 1
+
+        return self.factory.makeCodeImportSourceDetails(
+            rcstype='hg', url=repository_path)
+
+
 class TestBzrSvnImport(WorkerTest, SubversionImportHelpers,
                        TestActualImportMixin, PullingImportWorkerTests):
 
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-01-13 02:53:14 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-01-13 02:53:16 +0000
@@ -43,7 +43,7 @@
     CodeImportWorkerMonitor, CodeImportWorkerMonitorProtocol, ExitQuietly,
     read_only_transaction)
 from lp.codehosting.codeimport.tests.servers import (
-    CVSServer, GitServer, SubversionServer)
+    CVSServer, GitServer, MercurialServer, SubversionServer)
 from lp.codehosting.codeimport.tests.test_worker import (
     clean_up_default_stores_for_import)
 from lp.testing import login, logout
@@ -501,6 +501,18 @@
 
         return self.factory.makeCodeImport(git_repo_url=self.repo_path)
 
+    def makeHgCodeImport(self):
+        """Make a `CodeImport` that points to a real Mercurial repository."""
+        load_optional_plugin('hg')
+        self.hg_server = MercurialServer(self.repo_path)
+        self.hg_server.setUp()
+        self.addCleanup(self.hg_server.tearDown)
+
+        self.hg_server.makeRepo([('README', 'contents')])
+        self.foreign_commit_count = 1
+
+        return self.factory.makeCodeImport(hg_repo_url=self.repo_path)
+
     def getStartedJobForImport(self, code_import):
         """Get a started `CodeImportJob` for `code_import`.
 
@@ -592,6 +604,15 @@
         result = self.performImport(job_id)
         return result.addCallback(self.assertImported, code_import_id)
 
+    def test_import_hg(self):
+        # Create a Mercurial CodeImport and import it.
+        job = self.getStartedJobForImport(self.makeHgCodeImport())
+        code_import_id = job.code_import.id
+        job_id = job.id
+        self.layer.txn.commit()
+        result = self.performImport(job_id)
+        return result.addCallback(self.assertImported, code_import_id)
+
     def test_import_bzrsvn(self):
         # Create a Subversion-via-bzr-svn CodeImport and import it.
         job = self.getStartedJobForImport(self.makeBzrSvnCodeImport())
 
=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-01-13 02:53:14 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2010-01-13 02:53:16 +0000
@@ -11,6 +11,7 @@
     'CodeImportSourceDetails',
     'ForeignTreeStore',
     'GitImportWorker',
+    'HgImportWorker',
     'ImportWorker',
     'get_default_bazaar_branch_store',
     ]
@@ -126,7 +127,7 @@
         """Convert command line-style arguments to an instance."""
         branch_id = int(arguments.pop(0))
         rcstype = arguments.pop(0)
-        if rcstype in ['svn', 'bzr-svn', 'git']:
+        if rcstype in ['svn', 'bzr-svn', 'git', 'hg']:
             [url] = arguments
             cvs_root = cvs_module = None
         elif rcstype == 'cvs':
@@ -151,6 +152,8 @@
                 cvs_module=str(code_import.cvs_module))
         elif code_import.rcs_type == RevisionControlSystems.GIT:
             return cls(branch_id, 'git', str(code_import.url))
+        elif code_import.rcs_type == RevisionControlSystems.HG:
+            return cls(branch_id, 'hg', str(code_import.url))
         else:
             raise AssertionError("Unknown rcstype %r." % code_import.rcs_type)
 
@@ -158,7 +161,7 @@
         """Return a list of arguments suitable for passing to a child process.
         """
         result = [str(self.branch_id), self.rcstype]
-        if self.rcstype in ['svn', 'bzr-svn', 'git']:
+        if self.rcstype in ['svn', 'bzr-svn', 'git', 'hg']:
             result.append(self.url)
         elif self.rcstype == 'cvs':
             result.append(self.cvs_root)
@@ -544,6 +547,45 @@
             'git.db', bazaar_tree.branch.repository._transport)
 
 
+class HgImportWorker(PullingImportWorker):
+    """An import worker for Mercurial imports.
+
+    The only behaviour we add is preserving the id-sha map between runs.
+    """
+
+    db_file = 'hg-v2.db'
+
+    @property
+    def format_classes(self):
+        """See `PullingImportWorker.opening_format`."""
+        # We only return HgLocalRepository for tests.
+        from bzrlib.plugins.hg import HgBzrDirFormat
+        return [HgBzrDirFormat]
+
+    def getBazaarWorkingTree(self):
+        """See `ImportWorker.getBazaarWorkingTree`.
+
+        In addition to the superclass' behaviour, we retrieve the 'hg-v2.db'
+        map from the import data store and put it where bzr-hg will find
+        it in the Bazaar tree, that is at '.bzr/repository/hg-v2.db'.
+        """
+        tree = PullingImportWorker.getBazaarWorkingTree(self)
+        self.import_data_store.fetch(
+            self.db_file, tree.branch.repository._transport)
+        return tree
+
+    def pushBazaarWorkingTree(self, bazaar_tree):
+        """See `ImportWorker.pushBazaarWorkingTree`.
+
+        In addition to the superclass' behaviour, we store the 'hg-v2.db' shamap
+        that bzr-hg will have created at .bzr/repository/hg-v2.db into the
+        import data store.
+        """
+        PullingImportWorker.pushBazaarWorkingTree(self, bazaar_tree)
+        self.import_data_store.put(
+            self.db_file, bazaar_tree.branch.repository._transport)
+
+
 class BzrSvnImportWorker(PullingImportWorker):
     """An import worker for importing Subversion via bzr-svn."""
 
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-01-13 02:53:14 +0000
+++ lib/lp/testing/factory.py	2010-01-13 02:53:16 +0000
@@ -1216,14 +1216,16 @@
 
     def makeCodeImport(self, svn_branch_url=None, cvs_root=None,
                        cvs_module=None, product=None, branch_name=None,
-                       git_repo_url=None, registrant=None, rcs_type=None):
+                       git_repo_url=None, hg_repo_url=None, registrant=None,
+                       rcs_type=None):
         """Create and return a new, arbitrary code import.
 
         The type of code import will be inferred from the source details
         passed in, but defaults to a Subversion import from an arbitrary
         unique URL.
         """
-        if svn_branch_url is cvs_root is cvs_module is git_repo_url is None:
+        if (svn_branch_url is cvs_root is cvs_module is git_repo_url is hg_repo_url
+            is None):
             svn_branch_url = self.getUniqueURL()
 
         if product is None:
@@ -1249,6 +1251,11 @@
                 registrant, product, branch_name,
                 rcs_type=RevisionControlSystems.GIT,
                 url=git_repo_url)
+        elif hg_repo_url is not None:
+            return code_import_set.new(
+                registrant, product, branch_name,
+                rcs_type=RevisionControlSystems.HG,
+                url=hg_repo_url)
         else:
             assert rcs_type in (None, RevisionControlSystems.CVS)
             return code_import_set.new(
@@ -1322,7 +1329,7 @@
             branch_id = self.getUniqueInteger()
         if rcstype is None:
             rcstype = 'svn'
-        if rcstype in ['svn', 'bzr-svn']:
+        if rcstype in ['svn', 'bzr-svn', 'hg']:
             assert cvs_root is cvs_module is None
             if url is None:
                 url = self.getUniqueURL()
 
=== added symlink 'lib/mercurial'
=== target is u'../sourcecode/mercurial/mercurial'
=== added symlink 'optionalbzrplugins/hg'
=== target is u'../sourcecode/bzr-hg'
=== modified file 'scripts/code-import-worker.py'
--- scripts/code-import-worker.py	2009-11-17 02:49:41 +0000
+++ scripts/code-import-worker.py	2010-01-13 02:53:16 +0000
@@ -26,7 +26,7 @@
 from lp.codehosting import load_optional_plugin
 from lp.codehosting.codeimport.worker import (
     BzrSvnImportWorker, CSCVSImportWorker, CodeImportSourceDetails,
-    GitImportWorker, get_default_bazaar_branch_store)
+    GitImportWorker, HgImportWorker, get_default_bazaar_branch_store)
 from canonical.launchpad import scripts
 
 
@@ -46,6 +46,9 @@
         elif source_details.rcstype == 'bzr-svn':
             load_optional_plugin('svn')
             import_worker_cls = BzrSvnImportWorker
+        elif source_details.rcstype == 'hg':
+            load_optional_plugin('hg')
+            import_worker_cls = HgImportWorker
         else:
             if source_details.rcstype not in ['cvs', 'svn']:
                 raise AssertionError(
 
=== modified file 'setup.py'
--- setup.py	2010-01-12 01:45:22 +0000
+++ setup.py	2010-01-13 02:53:16 +0000
@@ -43,6 +43,7 @@
         'lazr.uri',
         'lazr-js',
         'mechanize',
+        'mercurial',
         'mocker',
         'oauth',
         'paramiko',
 
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2009-12-02 02:46:05 +0000
+++ utilities/sourcedeps.conf	2010-01-13 02:53:16 +0000
@@ -1,4 +1,5 @@
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=248
+bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2706
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=430
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-01-12 01:45:22 +0000
+++ versions.cfg	2010-01-13 02:53:16 +0000
@@ -40,6 +40,7 @@
 lazr-js = 0.9.2DEV
 martian = 0.11
 mechanize = 0.1.11
+mercurial = 1.3.1
 mocker = 0.10.1
 mozrunner = 1.3.4
 oauth = 1.0