Merge lp:~abentley/launchpad/run-via-celery into lp:launchpad

[Aaron Bentley]

Support running jobs via Celery

= Summary =
Support running Jobs via Celery

== Pre-implementation notes ==
Discussed with Deryck, adeuring, lifeless

LOC can be added because this is part of an arc that will remove most job-running code from Launchpad.

== Implementation details ==
Provide a Celery Task, CeleryRunJob, that will run a Job.

As CeleryRunJob's job source, provide UniversalJobSource, which uses Job.id to retrieve the corresponding RunnableJob. It also sets up an environment similar to the script environment for Launchpad code.

Move most code out of BranchScanJob.contextManager and BranchUpgradeJob.contextManager, so that lazr.jobrunner does not need to support per-job contextManagers.

To support UniversalJobSource, rework RegisteredSubclass as EnumeratedSubclass and make it the metaclass for BranchJobDerived.

CeleryRunJob overrides getJobRunner to return a BaseJobRunner, so that it knows how to run Launchpad jobs.

Switch to lazr.jobrunner's LeaseHeld exception, to ensure lease handling works correctly.

Update lp.codehosting.bzrutils.server to permit tests to override the server. This allows the server init code to move into Job.run.

Provide two different celeryconfigs:
- lib/lp/services/job/celeryconfig.py works for production or in the test suite. It gets its rabbitmq settings from lp.services.config.
- lib/lp/services/job/tests/celeryconfig.py works for running celeryd in the test suite. It gets its rabbitmq settings from the environment. It is single-process, to ensure tests are reproducible.

Update versions.cfg to list the current versions of Celery and its dependencies at this time.

== Tests ==
bin/test job -tCelery

== Demo and Q/A ==
None (this functionality is optional.)

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/services/job/tests/test_runner.py
  lib/lp/services/job/runner.py
  lib/lp/services/job/interfaces/job.py
  lib/lp/soyuz/model/packagecopyjob.py
  lib/lp/registry/tests/test_process_job_sources_cronjob.py
  buildout.cfg
  versions.cfg
  setup.py
  lib/lp/services/job/celeryjob.py
  lib/lp/codehosting/bzrutils.py
  lib/lp/translations/model/translationsharingjob.py
  lib/lp/testing/factory.py
  lib/lp/soyuz/tests/test_packagecopyjob.py
  lib/lp/services/job/tests/test_job.py
  lib/lp/services/job/tests/test_celeryjob.py
  lib/lp/services/job/tests/celeryconfig.py
  lib/lp/services/job/celeryconfig.py
  lib/lp/services/job/model/job.py
  lib/lp/code/model/branchjob.py

[Abel Deuring (adeuring)]

Overall, a very nice branch.

As discused on IRC, calling CeleryRunJob.delay(BrachScanJob.create(...)) creates a race condition.

Another remark:

> === modified file 'lib/lp/code/model/branch.py'
> --- lib/lp/code/model/branch.py 2012-03-21 12:34:12 +0000
> +++ lib/lp/code/model/branch.py 2012-03-27 14:40:29 +0000
> @@ -1032,7 +1032,8 @@
> return getUtility(IBranchLookup).getByUniqueName(location)
>
> def branchChanged(self, stacked_on_url, last_revision_id,
> - control_format, branch_format, repository_format):
> + control_format, branch_format, repository_format,
> + skip_celery=False):

This changes needs a related change in the interface class. I think
that the new parameter deserves a short explanation: As I understand it,
skip_celery should be False only in tests.

review: Needs Fixing

[Aaron Bentley (abentley)]

I've used Transaction.addAfterCommitHook to ensure that CeleryRunJob.delay is invoked on (successful) commit.

I've inverted skip_celery to celery_scan, to make the documentation simpler, and documented it.

[Abel Deuring (adeuring)]

Looks good. Just one nitpick:

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py 2012-02-20 02:07:55 +0000
+++ lib/lp/code/interfaces/branch.py 2012-03-27 18:56:12 +0000
@@ -1078,7 +1078,7 @@
         """Create an IBranchUpgradeJob to upgrade this branch."""

     def branchChanged(stacked_on_url, last_revision_id, control_format,
- branch_format, repository_format):
+ branch_format, repository_format, skip_celery=False):

s/skip_celery/celery_scan/

review: Approve

[Aaron Bentley (abentley)]

This branch can be QAed by pushing branches up to be scanned. This should behave normally. The celery side does not need to be tested, since it's not mandatory.

=== modified file 'Makefile'
--- Makefile	2012-03-14 12:01:42 +0000
+++ Makefile	2012-03-29 14:36:38 +0000
@@ -305,7 +305,7 @@
 	$(PY) scripts/stop-loggerhead.py
 
 run_codehosting: build inplace stop
-	bin/run -r librarian,sftp,forker,codebrowse -i $(LPCONFIG)
+	bin/run -r librarian,sftp,forker,codebrowse,rabbitmq -i $(LPCONFIG)
 
 start_librarian: compile
 	bin/start_librarian

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-03-16 11:09:03 +0000
+++ buildout.cfg	2012-03-29 14:36:38 +0000
@@ -65,6 +65,7 @@
 [scripts]
 recipe = z3c.recipe.scripts
 eggs = lp
+    celery
     funkload
     zc.zservertracelog
     pyinotify

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2012-03-29 14:36:36 +0000
+++ lib/lp/app/templates/base-layout.pt	2012-03-23 20:56:11 +0000
@@ -79,14 +79,9 @@
         <tal:login replace="structure context/@@login_status" />
       </div><!--id="locationbar"-->
 
-<<<<<<< TREE
       <div id="watermark" class="watermark-apps-portlet"
         tal:condition="view/macro:has-watermark">
         <div>
-=======
-      <div id="watermark" class="watermark-apps-portlet">
-        <div>
->>>>>>> MERGE-SOURCE
           <span tal:replace="structure view/watermark:logo"></span>
         </div>
         <div class="wide">

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2012-03-29 14:36:36 +0000
+++ lib/lp/bugs/model/bug.py	2012-03-29 06:02:46 +0000
@@ -394,7 +394,6 @@
     heat_last_updated = UtcDateTimeCol(default=None)
     latest_patch_uploaded = UtcDateTimeCol(default=None)
 
-<<<<<<< TREE
     @property
     def private(self):
         return self.information_type in PRIVATE_INFORMATION_TYPES
@@ -403,22 +402,6 @@
     def security_related(self):
         return self.information_type in SECURITY_INFORMATION_TYPES
 
-=======
-    @property
-    def private(self):
-        if self.information_type:
-            return self.information_type in PRIVATE_INFORMATION_TYPES
-        else:
-            return self._private
-
-    @property
-    def security_related(self):
-        if self.information_type:
-            return self.information_type in SECURITY_INFORMATION_TYPES
-        else:
-            return self._security_related
-
->>>>>>> MERGE-SOURCE
     @cachedproperty
     def _subscriber_cache(self):
         """Caches known subscribers."""
@@ -1727,106 +1710,6 @@
 
         return bugtask
 
-<<<<<<< TREE
-=======
-    def _setInformationType(self):
-        if self._private and self._security_related:
-            self.information_type = InformationType.EMBARGOEDSECURITY
-        elif self._private:
-            self.information_type = InformationType.USERDATA
-        elif self._security_related:
-            self.information_type = InformationType.UNEMBARGOEDSECURITY
-        else:
-            self.information_type = InformationType.PUBLIC
-
-    def setPrivacyAndSecurityRelated(self, private, security_related, who):
-        """ See `IBug`."""
-        private_changed = False
-        security_related_changed = False
-        bug_before_modification = Snapshot(self, providing=providedBy(self))
-
-        f_flag_str = 'disclosure.enhanced_private_bug_subscriptions.enabled'
-        f_flag = bool(getFeatureFlag(f_flag_str))
-        if f_flag:
-            # Before we update the privacy or security_related status, we
-            # need to reconcile the subscribers to avoid leaking private
-            # information.
-            if (self.private != private
-                    or self.security_related != security_related):
-                self.reconcileSubscribers(private, security_related, who)
-
-        if self.private != private:
-            # We do not allow multi-pillar private bugs except for those teams
-            # who want to shoot themselves in the foot.
-            if private:
-                allow_multi_pillar_private = bool(getFeatureFlag(
-                    'disclosure.allow_multipillar_private_bugs.enabled'))
-                if (not allow_multi_pillar_private
-                        and len(self.affected_pillars) > 1):
-                    raise BugCannotBePrivate(
-                        "Multi-pillar bugs cannot be private.")
-            private_changed = True
-            self._private = private
-
-            if private:
-                self.who_made_private = who
-                self.date_made_private = UTC_NOW
-            else:
-                self.who_made_private = None
-                self.date_made_private = None
-
-            # XXX: This should be a bulk update. RBC 20100827
-            # bug=https://bugs.launchpad.net/storm/+bug/625071
-            for attachment in self.attachments_unpopulated:
-                attachment.libraryfile.restricted = private
-
-        if self.security_related != security_related:
-            security_related_changed = True
-            self._security_related = security_related
-
-        if private_changed or security_related_changed:
-            # Correct the heat for the bug immediately, so that we don't have
-            # to wait for the next calculation job for the adjusted heat.
-            self.updateHeat()
-
-        self._setInformationType()
-
-        if private_changed or security_related_changed:
-            changed_fields = []
-
-            if private_changed:
-                changed_fields.append('private')
-                if not f_flag and private:
-                    # If we didn't call reconcileSubscribers, we may have
-                    # bug supervisors who should be on this bug, but aren't.
-                    supervisors = set()
-                    for bugtask in self.bugtasks:
-                        supervisors.add(bugtask.pillar.bug_supervisor)
-                    if None in supervisors:
-                        supervisors.remove(None)
-                    for s in supervisors:
-                        subscriptions = get_structural_subscriptions_for_bug(
-                                            self, s)
-                        if subscriptions != []:
-                            self.subscribe(s, who)
-
-            if security_related_changed:
-                changed_fields.append('security_related')
-                if not f_flag and security_related:
-                    # The bug turned out to be security-related, subscribe the
-                    # security contact. We do it here only if the feature flag
-                    # is not set, otherwise it's done in
-                    # reconcileSubscribers().
-                    for pillar in self.affected_pillars:
-                        if pillar.security_contact is not None:
-                            self.subscribe(pillar.security_contact, who)
-
-            notify(ObjectModifiedEvent(
-                    self, bug_before_modification, changed_fields, user=who))
-
-        return private_changed, security_related_changed
-
->>>>>>> MERGE-SOURCE
     def setPrivate(self, private, who):
         """See `IBug`.
 
@@ -2997,15 +2880,9 @@
             params.information_type in SECURITY_INFORMATION_TYPES)
         bug = Bug(
             title=params.title, description=params.description,
-<<<<<<< TREE
             owner=params.owner, datecreated=params.datecreated,
             information_type=params.information_type,
             _private=private, _security_related=security_related,
-=======
-            _private=params.private, owner=params.owner,
-            datecreated=params.datecreated,
-            _security_related=params.security_related,
->>>>>>> MERGE-SOURCE
             **extra_params)
 
         if params.subscribe_owner:

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2012-03-29 14:36:36 +0000
+++ lib/lp/bugs/model/bugtask.py	2012-03-29 00:48:21 +0000
@@ -43,10 +43,8 @@
     And,
     Join,
     Or,
-    Select,
     SQL,
     Sum,
-    Union,
     )
 from storm.store import (
     EmptyResultSet,

=== modified file 'lib/lp/bugs/scripts/bugimport.py'
--- lib/lp/bugs/scripts/bugimport.py	2012-03-29 14:36:36 +0000
+++ lib/lp/bugs/scripts/bugimport.py	2012-03-23 07:17:15 +0000
@@ -293,17 +293,11 @@
 
         private = get_value(bugnode, 'private') == 'True'
         security_related = get_value(bugnode, 'security_related') == 'True'
-<<<<<<< TREE
         # If the product has private_bugs, we force private to True.
         if self.product.private_bugs:
             private = True
         information_type = convert_to_information_type(
             private, security_related)
-=======
-        # If the product has private_bugs, we force private to True.
-        if self.product.private_bugs:
-            private = True
->>>>>>> MERGE-SOURCE
 
         if owner is None:
             owner = self.bug_importer
@@ -311,17 +305,8 @@
         msg = self.createMessage(commentnode, defaulttitle=title)
 
         bug = self.product.createBug(CreateBugParams(
-<<<<<<< TREE
             msg=msg, datecreated=datecreated, title=title,
             information_type=information_type, owner=owner))
-=======
-            msg=msg,
-            datecreated=datecreated,
-            title=title,
-            private=private or security_related,
-            security_related=security_related,
-            owner=owner))
->>>>>>> MERGE-SOURCE
         bugtask = bug.bugtasks[0]
         self.logger.info('Creating Launchpad bug #%d', bug.id)
 
@@ -336,18 +321,11 @@
             bug.linkMessage(msg)
             self.createAttachments(bug, msg, commentnode)
 
-<<<<<<< TREE
         # Security bugs must be created private, so set it correctly.
         if not self.product.private_bugs:
             information_type = convert_to_information_type(
                 private, security_related)
             bug.transitionToInformationType(information_type, owner)
-=======
-        # Security bugs must be created private, so set it correctly.
-        if not self.product.private_bugs:
-            bug.setPrivacyAndSecurityRelated(
-                private, security_related, owner)
->>>>>>> MERGE-SOURCE
         bug.name = get_value(bugnode, 'nickname')
         description = get_value(bugnode, 'description')
         if description:

=== modified file 'lib/lp/bugs/tests/test_bug_mirror_access_triggers.py'
--- lib/lp/bugs/tests/test_bug_mirror_access_triggers.py	2012-03-29 14:36:36 +0000
+++ lib/lp/bugs/tests/test_bug_mirror_access_triggers.py	2012-03-26 00:12:50 +0000
@@ -136,11 +136,7 @@
         bug = self.makeBugAndPolicies(private=True)
         self.assertIsNot(
             None, getUtility(IAccessArtifactSource).find([bug]).one())
-<<<<<<< TREE
         bug.setPrivate(False, bug.owner)
-=======
-        removeSecurityProxy(bug).setPrivate(False, bug.owner)
->>>>>>> MERGE-SOURCE
         self.assertIs(
             None, getUtility(IAccessArtifactSource).find([bug]).one())
 
@@ -148,11 +144,7 @@
         bug = self.makeBugAndPolicies(private=False)
         self.assertIs(
             None, getUtility(IAccessArtifactSource).find([bug]).one())
-<<<<<<< TREE
         bug.setPrivate(True, bug.owner)
-=======
-        removeSecurityProxy(bug).setPrivate(True, bug.owner)
->>>>>>> MERGE-SOURCE
         self.assertIsNot(
             None, getUtility(IAccessArtifactSource).find([bug]).one())
         self.assertEqual((1, 1), self.assertMirrored(bug))
@@ -166,11 +158,7 @@
         self.assertContentEqual(
             [InformationType.USERDATA],
             self.getPolicyTypesForArtifact(artifact))
-<<<<<<< TREE
         bug.setSecurityRelated(True, bug.owner)
-=======
-        removeSecurityProxy(bug).setSecurityRelated(True, bug.owner)
->>>>>>> MERGE-SOURCE
         self.assertEqual((1, 1), self.assertMirrored(bug))
         self.assertContentEqual(
             [InformationType.EMBARGOEDSECURITY],

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2012-02-20 02:07:55 +0000
+++ lib/lp/code/interfaces/branch.py	2012-03-29 14:36:38 +0000
@@ -1078,7 +1078,7 @@
         """Create an IBranchUpgradeJob to upgrade this branch."""
 
     def branchChanged(stacked_on_url, last_revision_id, control_format,
-                      branch_format, repository_format):
+                      branch_format, repository_format, celery_scan=True):
         """Record that a branch has been changed.
 
         This method records the stacked on branch tip revision id and format
@@ -1092,6 +1092,9 @@
         :param branch_format: The entry from BranchFormat for the branch.
         :param repository_format: The entry from RepositoryFormat for the
             branch.
+        :param celery_scan: If True, request a branch scan via Celery.
+            Otherwise, a BranchScanJob may be created, but not requested to
+            run.  Should only be False in certain tests.
         """
 
     @export_destructor_operation()

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-03-21 12:34:12 +0000
+++ lib/lp/code/model/branch.py	2012-03-29 14:36:38 +0000
@@ -40,6 +40,7 @@
     Reference,
     )
 from storm.store import Store
+import transaction
 from zope.component import getUtility
 from zope.event import notify
 from zope.interface import implements
@@ -1032,7 +1033,8 @@
             return getUtility(IBranchLookup).getByUniqueName(location)
 
     def branchChanged(self, stacked_on_url, last_revision_id,
-                      control_format, branch_format, repository_format):
+                      control_format, branch_format, repository_format,
+                      celery_scan=True):
         """See `IBranch`."""
         self.mirror_status_message = None
         if stacked_on_url == '' or stacked_on_url is None:
@@ -1057,7 +1059,15 @@
         self.last_mirrored_id = last_revision_id
         if self.last_scanned_id != last_revision_id:
             from lp.code.model.branchjob import BranchScanJob
-            BranchScanJob.create(self)
+            job_id = BranchScanJob.create(self).job_id
+            if celery_scan:
+                # lp.services.job.celery is imported only where needed.
+                from lp.services.job.celeryjob import CeleryRunJob
+                current = transaction.get()
+                def runHook(succeeded):
+                    if succeeded:
+                        CeleryRunJob.delay(job_id)
+                current.addAfterCommitHook(runHook)
         self.control_format = control_format
         self.branch_format = branch_format
         self.repository_format = repository_format

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2012-02-21 19:13:45 +0000
+++ lib/lp/code/model/branchjob.py	2012-03-29 14:36:38 +0000
@@ -80,6 +80,7 @@
 from lp.code.model.branch import Branch
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.revision import RevisionSet
+from lp.codehosting.bzrutils import server
 from lp.codehosting.scanner.bzrsync import BzrSync
 from lp.codehosting.vfs import (
     branch_id_to_path,
@@ -93,7 +94,10 @@
 from lp.services.database.lpstorm import IStore
 from lp.services.database.sqlbase import SQLBase
 from lp.services.job.interfaces.job import JobStatus
-from lp.services.job.model.job import Job
+from lp.services.job.model.job import (
+    EnumeratedSubclass,
+    Job,
+    )
 from lp.services.job.runner import BaseRunnableJob
 from lp.services.mail.sendmail import format_address_for_person
 from lp.services.webapp import (
@@ -212,9 +216,14 @@
         SQLBase.destroySelf(self)
         self.job.destroySelf()
 
+    def makeDerived(self):
+        return BranchJobDerived.makeSubclass(self)
+
 
 class BranchJobDerived(BaseRunnableJob):
 
+    __metaclass__ = EnumeratedSubclass
+
     delegates(IBranchJob)
 
     def __init__(self, branch_job):
@@ -287,29 +296,26 @@
     classProvides(IBranchScanJobSource)
     class_job_type = BranchJobType.SCAN_BRANCH
     memory_limit = 2 * (1024 ** 3)
-    server = None
 
     @classmethod
     def create(cls, branch):
         """See `IBranchScanJobSource`."""
-        branch_job = BranchJob(branch, BranchJobType.SCAN_BRANCH, {})
+        branch_job = BranchJob(branch, cls.class_job_type, {})
         return cls(branch_job)
 
     def run(self):
         """See `IBranchScanJob`."""
         from lp.services.scripts import log
-        bzrsync = BzrSync(self.branch, log)
-        bzrsync.syncBranchAndClose()
+        with server(get_ro_server(), no_replace=True):
+            bzrsync = BzrSync(self.branch, log)
+            bzrsync.syncBranchAndClose()
 
     @classmethod
     @contextlib.contextmanager
     def contextManager(cls):
         """See `IBranchScanJobSource`."""
         errorlog.globalErrorUtility.configure('branchscanner')
-        cls.server = get_ro_server()
-        cls.server.start_server()
         yield
-        cls.server.stop_server()
 
 
 class BranchUpgradeJob(BranchJobDerived):
@@ -330,7 +336,7 @@
         """See `IBranchUpgradeJobSource`."""
         branch.checkUpgrade()
         branch_job = BranchJob(
-            branch, BranchJobType.UPGRADE_BRANCH, {}, requester=requester)
+            branch, cls.class_job_type, {}, requester=requester)
         return cls(branch_job)
 
     @staticmethod
@@ -338,63 +344,63 @@
     def contextManager():
         """See `IBranchUpgradeJobSource`."""
         errorlog.globalErrorUtility.configure('upgrade_branches')
-        server = get_rw_server()
-        server.start_server()
         yield
-        server.stop_server()
 
     def run(self, _check_transaction=False):
         """See `IBranchUpgradeJob`."""
         # Set up the new branch structure
-        upgrade_branch_path = tempfile.mkdtemp()
-        try:
-            upgrade_transport = get_transport(upgrade_branch_path)
-            upgrade_transport.mkdir('.bzr')
-            source_branch_transport = get_transport(
-                self.branch.getInternalBzrUrl())
-            source_branch_transport.clone('.bzr').copy_tree_to_transport(
-                upgrade_transport.clone('.bzr'))
-            transaction.commit()
-            upgrade_branch = BzrBranch.open_from_transport(upgrade_transport)
-
-            # No transactions are open so the DB connection won't be killed.
-            with TransactionFreeOperation():
-                # Perform the upgrade.
-                upgrade(upgrade_branch.base)
-
-            # Re-open the branch, since its format has changed.
-            upgrade_branch = BzrBranch.open_from_transport(
-                upgrade_transport)
-            source_branch = BzrBranch.open_from_transport(
-                source_branch_transport)
-
-            source_branch.lock_write()
-            upgrade_branch.pull(source_branch)
-            upgrade_branch.fetch(source_branch)
-            source_branch.unlock()
-
-            # Move the branch in the old format to backup.bzr
+        with server(get_rw_server(), no_replace=True):
+            upgrade_branch_path = tempfile.mkdtemp()
             try:
-                source_branch_transport.delete_tree('backup.bzr')
-            except NoSuchFile:
-                pass
-            source_branch_transport.rename('.bzr', 'backup.bzr')
-            source_branch_transport.mkdir('.bzr')
-            upgrade_transport.clone('.bzr').copy_tree_to_transport(
-                source_branch_transport.clone('.bzr'))
-
-            # Re-open the source branch again.
-            source_branch = BzrBranch.open_from_transport(
-                source_branch_transport)
-
-            formats = get_branch_formats(source_branch)
-
-            self.branch.branchChanged(
-                self.branch.stacked_on,
-                self.branch.last_scanned_id,
-                *formats)
-        finally:
-            shutil.rmtree(upgrade_branch_path)
+                upgrade_transport = get_transport(upgrade_branch_path)
+                upgrade_transport.mkdir('.bzr')
+                source_branch_transport = get_transport(
+                    self.branch.getInternalBzrUrl())
+                source_branch_transport.clone('.bzr').copy_tree_to_transport(
+                    upgrade_transport.clone('.bzr'))
+                transaction.commit()
+                upgrade_branch = BzrBranch.open_from_transport(
+                    upgrade_transport)
+
+                # No transactions are open so the DB connection won't be
+                # killed.
+                with TransactionFreeOperation():
+                    # Perform the upgrade.
+                    upgrade(upgrade_branch.base)
+
+                # Re-open the branch, since its format has changed.
+                upgrade_branch = BzrBranch.open_from_transport(
+                    upgrade_transport)
+                source_branch = BzrBranch.open_from_transport(
+                    source_branch_transport)
+
+                source_branch.lock_write()
+                upgrade_branch.pull(source_branch)
+                upgrade_branch.fetch(source_branch)
+                source_branch.unlock()
+
+                # Move the branch in the old format to backup.bzr
+                try:
+                    source_branch_transport.delete_tree('backup.bzr')
+                except NoSuchFile:
+                    pass
+                source_branch_transport.rename('.bzr', 'backup.bzr')
+                source_branch_transport.mkdir('.bzr')
+                upgrade_transport.clone('.bzr').copy_tree_to_transport(
+                    source_branch_transport.clone('.bzr'))
+
+                # Re-open the source branch again.
+                source_branch = BzrBranch.open_from_transport(
+                    source_branch_transport)
+
+                formats = get_branch_formats(source_branch)
+
+                self.branch.branchChanged(
+                    self.branch.stacked_on,
+                    self.branch.last_scanned_id,
+                    *formats)
+            finally:
+                shutil.rmtree(upgrade_branch_path)
 
 
 class RevisionMailJob(BranchJobDerived):
@@ -415,7 +421,7 @@
             'body': body,
             'subject': subject,
         }
-        branch_job = BranchJob(branch, BranchJobType.REVISION_MAIL, metadata)
+        branch_job = BranchJob(branch, cls.class_job_type, metadata)
         return cls(branch_job)
 
     @property

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2012-02-15 08:13:51 +0000
+++ lib/lp/code/model/tests/test_branch.py	2012-03-29 14:36:38 +0000
@@ -130,6 +130,7 @@
 from lp.testing.layers import (
     AppServerLayer,
     DatabaseFunctionalLayer,
+    LaunchpadFunctionalLayer,
     LaunchpadZopelessLayer,
     )
 from lp.translations.model.translationtemplatesbuildjob import (
@@ -159,7 +160,7 @@
 class TestBranchChanged(TestCaseWithFactory):
     """Tests for `IBranch.branchChanged`."""
 
-    layer = DatabaseFunctionalLayer
+    layer = LaunchpadFunctionalLayer
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
@@ -2144,7 +2145,7 @@
 class TestPendingWrites(TestCaseWithFactory):
     """Are there changes to this branch not reflected in the database?"""
 
-    layer = DatabaseFunctionalLayer
+    layer = LaunchpadFunctionalLayer
 
     def test_new_branch_no_writes(self):
         # New branches have no pending writes.

=== modified file 'lib/lp/code/model/tests/test_branchpuller.py'
--- lib/lp/code/model/tests/test_branchpuller.py	2012-01-06 11:08:30 +0000
+++ lib/lp/code/model/tests/test_branchpuller.py	2012-03-29 14:36:38 +0000
@@ -89,7 +89,7 @@
         transaction.commit()
         branch.startMirroring()
         removeSecurityProxy(branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', 'rev1', None, None, None, celery_scan=False)
         self.assertEqual(None, branch.next_mirror_time)
 
     def test_mirrorFailureResetsMirrorRequest(self):
@@ -158,7 +158,7 @@
         transaction.commit()
         branch.startMirroring()
         removeSecurityProxy(branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', 'rev1', None, None, None, celery_scan=False)
         self.assertInFuture(branch.next_mirror_time, self.increment)
         self.assertEqual(0, branch.mirror_failures)
 

=== modified file 'lib/lp/code/model/tests/test_branchtarget.py'
--- lib/lp/code/model/tests/test_branchtarget.py	2012-01-01 02:58:52 +0000
+++ lib/lp/code/model/tests/test_branchtarget.py	2012-03-29 14:36:38 +0000
@@ -129,7 +129,8 @@
         default_branch = self.factory.makePackageBranch(
             sourcepackage=development_package)
         removeSecurityProxy(default_branch).branchChanged(
-            '', self.factory.getUniqueString(), None, None, None)
+            '', self.factory.getUniqueString(), None, None, None,
+            celery_scan=False)
         registrant = development_package.distribution.owner
         with person_logged_in(registrant):
             development_package.setBranch(
@@ -397,7 +398,7 @@
         branch = self.factory.makeProductBranch(product=self.original)
         self._setDevelopmentFocus(self.original, branch)
         removeSecurityProxy(branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', 'rev1', None, None, None, celery_scan=False)
         target = IBranchTarget(self.original)
         self.assertEqual(branch, target.default_stacked_on_branch)
 
@@ -537,7 +538,8 @@
         branch = self.factory.makeAnyBranch(branch_type=BranchType.MIRRORED)
         branch.startMirroring()
         removeSecurityProxy(branch).branchChanged(
-            '', self.factory.getUniqueString(), None, None, None)
+            '', self.factory.getUniqueString(), None, None, None,
+            celery_scan=False)
         removeSecurityProxy(branch).branch_type = BranchType.REMOTE
         self.assertIs(None, check_default_stacked_on(branch))
 
@@ -553,14 +555,16 @@
         branch = self.factory.makeAnyBranch(private=True)
         naked_branch = removeSecurityProxy(branch)
         naked_branch.branchChanged(
-            '', self.factory.getUniqueString(), None, None, None)
+            '', self.factory.getUniqueString(), None, None, None,
+            celery_scan=False)
         self.assertIs(None, check_default_stacked_on(branch))
 
     def test_been_mirrored(self):
         # `check_default_stacked_on` returns the branch if it has revisions.
         branch = self.factory.makeAnyBranch()
         removeSecurityProxy(branch).branchChanged(
-            '', self.factory.getUniqueString(), None, None, None)
+            '', self.factory.getUniqueString(), None, None, None,
+            celery_scan=False)
         self.assertEqual(branch, check_default_stacked_on(branch))
 
 

=== modified file 'lib/lp/code/tests/test_directbranchcommit.py'
--- lib/lp/code/tests/test_directbranchcommit.py	2012-01-01 02:58:52 +0000
+++ lib/lp/code/tests/test_directbranchcommit.py	2012-03-29 14:36:38 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `DirectBranchCommit`."""
@@ -20,6 +20,7 @@
 from lp.testing.fakemethod import FakeMethod
 from lp.testing.layers import (
     DatabaseFunctionalLayer,
+    LaunchpadZopelessLayer,
     ZopelessDatabaseLayer,
     )
 
@@ -63,7 +64,7 @@
 class TestDirectBranchCommit(DirectBranchCommitTestCase, TestCaseWithFactory):
     """Test `DirectBranchCommit`."""
 
-    layer = ZopelessDatabaseLayer
+    layer = LaunchpadZopelessLayer
 
     def test_defaults_to_branch_owner(self):
         # If no committer is given, DirectBranchCommits defaults to

=== modified file 'lib/lp/code/xmlrpc/tests/test_codehosting.py'
--- lib/lp/code/xmlrpc/tests/test_codehosting.py	2012-02-21 22:46:28 +0000
+++ lib/lp/code/xmlrpc/tests/test_codehosting.py	2012-03-29 14:36:38 +0000
@@ -56,6 +56,7 @@
 from lp.testing.layers import (
     DatabaseFunctionalLayer,
     FunctionalLayer,
+    LaunchpadFunctionalLayer,
     )
 from lp.xmlrpc import faults
 
@@ -1290,7 +1291,7 @@
          ])
     scenarios = [
         ('db', {'frontend': LaunchpadDatabaseFrontend,
-                'layer': DatabaseFunctionalLayer}),
+                'layer': LaunchpadFunctionalLayer}),
         ('inmemory', {'frontend': InMemoryFrontend,
                       'layer': FunctionalLayer}),
         ]

=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py	2012-02-24 16:51:25 +0000
+++ lib/lp/codehosting/bzrutils.py	2012-03-29 14:36:38 +0000
@@ -19,6 +19,7 @@
     'identical_formats',
     'install_oops_handler',
     'is_branch_stackable',
+    'server',
     'read_locked',
     'remove_exception_logging_hook',
     ]
@@ -33,6 +34,7 @@
     )
 from bzrlib.errors import (
     NotStacked,
+    UnsupportedProtocol,
     UnstackableBranchFormat,
     UnstackableRepositoryFormat,
     )
@@ -42,6 +44,7 @@
     RemoteRepository,
     )
 from bzrlib.transport import (
+    get_transport,
     register_transport,
     unregister_transport,
     )
@@ -332,9 +335,19 @@
 
 
 @contextmanager
-def server(server):
-    server.start_server()
+def server(server, no_replace=False):
+    run_server = True
+    if no_replace:
+        try:
+            get_transport(server.get_url())
+        except UnsupportedProtocol:
+            pass
+        else:
+            run_server = False
+    if run_server:
+        server.start_server()
     try:
         yield server
     finally:
-        server.stop_server()
+        if run_server:
+            server.stop_server()

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/browser/pillar.py	2012-03-28 01:51:45 +0000
@@ -20,13 +20,6 @@
 from lazr.restful import ResourceJSONEncoder
 from lazr.restful.interfaces import IJSONRequestCache
 import simplejson
-<<<<<<< TREE
-=======
-
-from lazr.restful import ResourceJSONEncoder
-from lazr.restful.interfaces import IJSONRequestCache
-
->>>>>>> MERGE-SOURCE
 from zope.component import getUtility
 from zope.interface import (
     implements,
@@ -48,19 +41,12 @@
 from lp.bugs.browser.structuralsubscription import (
     StructuralSubscriptionMenuMixin,
     )
-<<<<<<< TREE
 from lp.bugs.interfaces.bug import IBug
 from lp.code.interfaces.branch import IBranch
 from lp.registry.interfaces.accesspolicy import (
     IAccessPolicyGrantFlatSource,
     IAccessPolicySource,
     )
-=======
-from lp.registry.interfaces.accesspolicy import (
-    IAccessPolicyGrantFlatSource,
-    IAccessPolicySource,
-    )
->>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
     )
@@ -68,30 +54,15 @@
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pillar import IPillar
 from lp.registry.interfaces.projectgroup import IProjectGroup
-<<<<<<< TREE
 from lp.registry.model.pillar import PillarPerson
 from lp.services.config import config
 from lp.services.features import getFeatureFlag
-=======
-from lp.registry.interfaces.person import IPersonSet
-from lp.registry.model.pillar import PillarPerson
-from lp.services.config import config
->>>>>>> MERGE-SOURCE
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
-from lp.services.webapp.authorization import check_permission
-from lp.services.webapp.batching import (
-    BatchNavigator,
-    StormRangeFactory,
-    )
-=======
-from lp.services.features import getFeatureFlag
-from lp.services.webapp.authorization import check_permission
-from lp.services.webapp.batching import (
-    BatchNavigator,
-    StormRangeFactory,
-    )
->>>>>>> MERGE-SOURCE
+from lp.services.webapp.authorization import check_permission
+from lp.services.webapp.batching import (
+    BatchNavigator,
+    StormRangeFactory,
+    )
 from lp.services.webapp.menu import (
     ApplicationMenu,
     enabled_with_permission,
@@ -326,7 +297,6 @@
         return simplejson.dumps(
             self.sharing_picker_config, cls=ResourceJSONEncoder)
 
-<<<<<<< TREE
     def _getBatchNavigator(self, sharees):
         """Return the batch navigator to be used to batch the sharees."""
         return BatchNavigator(
@@ -344,25 +314,6 @@
 
     def unbatched_sharees(self):
         """All the sharees for a pillar."""
-=======
-    def _getBatchNavigator(self, sharees):
-        """Return the batch navigator to be used to batch the sharees."""
-        return BatchNavigator(
-            sharees, self.request,
-            hide_counts=True,
-            size=config.launchpad.default_batch_size,
-            range_factory=StormRangeFactory(sharees))
-
-    def shareeData(self):
-        """Return an `ITableBatchNavigator` for sharees."""
-        if self._batch_navigator is None:
-            unbatchedSharees = self.unbatchedShareeData()
-            self._batch_navigator = self._getBatchNavigator(unbatchedSharees)
-        return self._batch_navigator
-
-    def unbatchedShareeData(self):
-        """Return all the sharees for a pillar."""
->>>>>>> MERGE-SOURCE
         return self._getSharingService().getPillarSharees(self.context)
 
     def initialize(self):
@@ -379,7 +330,6 @@
             and check_permission('launchpad.Edit', self.context))
         cache.objects['information_types'] = self.information_types
         cache.objects['sharing_permissions'] = self.sharing_permissions
-<<<<<<< TREE
 
         view_names = set(reg.name for reg
             in iter_view_registrations(self.__class__))
@@ -455,49 +405,3 @@
                 branch_name=branch.unique_name,
                 branch_id=branch.id))
         return branch_data
-=======
-
-        view_names = set(reg.name for reg
-            in iter_view_registrations(self.__class__))
-        if len(view_names) != 1:
-            raise AssertionError("Ambiguous view name.")
-        cache.objects['view_name'] = view_names.pop()
-        batch_navigator = self.shareeData()
-        cache.objects['sharee_data'] = (
-            self._getSharingService().getPillarShareeData(
-                self.context, batch_navigator.batch))
-
-        def _getBatchInfo(batch):
-            if batch is None:
-                return None
-            return {'memo': batch.range_memo,
-                    'start': batch.startNumber() - 1}
-
-        next_batch = batch_navigator.batch.nextBatch()
-        cache.objects['next'] = _getBatchInfo(next_batch)
-        prev_batch = batch_navigator.batch.prevBatch()
-        cache.objects['prev'] = _getBatchInfo(prev_batch)
-        cache.objects['total'] = batch_navigator.batch.total()
-        cache.objects['forwards'] = batch_navigator.batch.range_forwards
-        last_batch = batch_navigator.batch.lastBatch()
-        cache.objects['last_start'] = last_batch.startNumber() - 1
-        cache.objects.update(_getBatchInfo(batch_navigator.batch))
-
-
-class PillarPersonSharingView(LaunchpadView):
-
-    page_title = "Person or team"
-    label = "Information shared with person or team"
-
-    def initialize(self):
-        enabled_flag = 'disclosure.enhanced_sharing.enabled'
-        enabled = bool(getFeatureFlag(enabled_flag))
-        if not enabled:
-            raise Unauthorized("This feature is not yet available.")
-
-        self.pillar = self.context.pillar
-        self.person = self.context.person
-
-        self.label = "Information shared with %s" % self.person.displayname
-        self.page_title = "%s" % self.person.displayname
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/browser/product.py	2012-03-22 23:21:24 +0000
@@ -194,13 +194,7 @@
 from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.batching import BatchNavigator
 from lp.services.webapp.breadcrumb import Breadcrumb
-<<<<<<< TREE
 from lp.services.webapp.interfaces import UnsafeFormGetSubmissionError
-=======
-from lp.services.webapp.interfaces import (
-    UnsafeFormGetSubmissionError,
-    )
->>>>>>> MERGE-SOURCE
 from lp.services.webapp.menu import NavigationMenu
 from lp.services.worlddata.helpers import browser_languages
 from lp.services.worlddata.interfaces.country import ICountry

=== modified file 'lib/lp/registry/browser/tests/test_pillar_sharing.py'
--- lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-03-28 01:51:45 +0000
@@ -7,7 +7,6 @@
 
 from BeautifulSoup import BeautifulSoup
 from lazr.restful.interfaces import IJSONRequestCache
-<<<<<<< TREE
 import simplejson
 from testtools.matchers import (
     LessThan,
@@ -15,29 +14,15 @@
     Not,
     Raises,
     )
-=======
-from testtools.matchers import (
-    LessThan,
-    MatchesException,
-    Not,
-    Raises,
-    )
->>>>>>> MERGE-SOURCE
 from zope.component import getUtility
 from zope.publisher.interfaces import NotFound
 from zope.security.interfaces import Unauthorized
 
 from lp.app.interfaces.services import IService
-<<<<<<< TREE
 from lp.registry.enums import InformationType
 from lp.registry.interfaces.accesspolicy import IAccessPolicyGrantFlatSource
 from lp.registry.model.pillar import PillarPerson
 from lp.services.config import config
-=======
-from lp.registry.enums import InformationType
-from lp.registry.model.pillar import PillarPerson
-from lp.services.config import config
->>>>>>> MERGE-SOURCE
 from lp.services.features.testing import FeatureFixture
 from lp.services.webapp.interfaces import StormRangeFactoryError
 from lp.services.webapp.publisher import canonical_url
@@ -55,7 +40,6 @@
     )
 
 
-<<<<<<< TREE
 DETAILS_ENABLED_FLAG = {'disclosure.enhanced_sharing_details.enabled': 'true'}
 ENABLED_FLAG = {'disclosure.enhanced_sharing.enabled': 'true'}
 WRITE_FLAG = {'disclosure.enhanced_sharing.writable': 'true'}
@@ -149,106 +133,12 @@
             owner=self.owner, driver=self.driver)
         login_person(self.driver)
 
-=======
-ENABLED_FLAG = {'disclosure.enhanced_sharing.enabled': 'true'}
-WRITE_FLAG = {'disclosure.enhanced_sharing.writable': 'true'}
-
-
-class PillarSharingDetailsMixin:
-    """Test the pillar sharing details view."""
-
-    layer = DatabaseFunctionalLayer
-
-    def getPillarPerson(self, person=None, with_sharing=True):
-        if person is None:
-            person = self.factory.makePerson()
-        if with_sharing:
-            if self.pillar_type == 'product':
-                bug = self.factory.makeBug(product=self.pillar, private=True)
-            elif self.pillar_type == 'distribution':
-                bug = self.factory.makeBug(
-                    distribution=self.pillar, private=True)
-            artifact = self.factory.makeAccessArtifact(concrete=bug)
-            policy = self.factory.makeAccessPolicy(pillar=self.pillar)
-            self.factory.makeAccessPolicyArtifact(
-                artifact=artifact, policy=policy)
-            self.factory.makeAccessArtifactGrant(
-                artifact=artifact, grantee=person, grantor=self.pillar.owner)
-
-        return PillarPerson(self.pillar, person)
-
-    def test_view_traverses_plus_sharingdetails(self):
-        # The traversed url in the app is pillar/+sharingdetails/person
-        with FeatureFixture(ENABLED_FLAG):
-            # We have to do some fun url hacking to force the traversal a user
-            # encounters.
-            pillarperson = self.getPillarPerson()
-            expected = pillarperson.person.displayname
-            url = 'http://launchpad.dev/%s/+sharingdetails/%s' % (
-                pillarperson.pillar.name, pillarperson.person.name)
-            browser = self.getUserBrowser(user=self.driver, url=url)
-            self.assertEqual(expected, browser.title)
-
-    def test_not_found_without_sharing(self):
-        # If there is no sharing between pillar and person, NotFound is the
-        # result.
-        with FeatureFixture(ENABLED_FLAG):
-            # We have to do some fun url hacking to force the traversal a user
-            # encounters.
-            pillarperson = self.getPillarPerson(with_sharing=False)
-            url = 'http://launchpad.dev/%s/+sharingdetails/%s' % (
-                pillarperson.pillar.name, pillarperson.person.name)
-            browser = self.getUserBrowser(user=self.driver)
-            self.assertRaises(NotFound, browser.open, url)
-
-    def test_init_without_feature_flag(self):
-        # We need a feature flag to enable the view.
-        pillarperson = self.getPillarPerson()
-        self.assertRaises(
-            Unauthorized, create_initialized_view, pillarperson, '+index')
-
-    def test_init_with_feature_flag(self):
-        # The view works with a feature flag.
-        with FeatureFixture(ENABLED_FLAG):
-            pillarperson = self.getPillarPerson()
-            view = create_initialized_view(pillarperson, '+index')
-            self.assertEqual(pillarperson.person.displayname, view.page_title)
-
-
-class TestProductSharingDetailsView(
-    TestCaseWithFactory, PillarSharingDetailsMixin):
-
-    pillar_type = 'product'
-
-    def setUp(self):
-        super(TestProductSharingDetailsView, self).setUp()
-        self.driver = self.factory.makePerson()
-        self.owner = self.factory.makePerson()
-        self.pillar = self.factory.makeProduct(
-            owner=self.owner, driver=self.driver)
-        login_person(self.driver)
-
-
-class TestDistributionSharingDetailsView(
-    TestCaseWithFactory, PillarSharingDetailsMixin):
-
-    pillar_type = 'distribution'
-
-    def setUp(self):
-        super(TestDistributionSharingDetailsView, self).setUp()
-        self.driver = self.factory.makePerson()
-        self.owner = self.factory.makePerson()
-        self.pillar = self.factory.makeProduct(
-            owner=self.owner, driver=self.driver)
-        login_person(self.driver)
->>>>>>> MERGE-SOURCE
 
 class PillarSharingViewTestMixin:
     """Test the PillarSharingView."""
 
     layer = DatabaseFunctionalLayer
 
-<<<<<<< TREE
     def createSharees(self):
         login_person(self.owner)
         self.access_policy = self.factory.makeAccessPolicy(
@@ -271,30 +161,6 @@
         for x in range(10):
             makeGrants('name%s' % x)
 
-=======
-    def createSharees(self):
-        login_person(self.owner)
-        access_policy = self.factory.makeAccessPolicy(
-            pillar=self.pillar,
-            type=InformationType.PROPRIETARY)
-        self.grantees = []
-
-        def makeGrants(name):
-            grantee = self.factory.makePerson(name=name)
-            self.grantees.append(grantee)
-            # Make access policy grant so that 'All' is returned.
-            self.factory.makeAccessPolicyGrant(access_policy, grantee)
-            # Make access artifact grants so that 'Some' is returned.
-            artifact_grant = self.factory.makeAccessArtifactGrant()
-            self.factory.makeAccessPolicyArtifact(
-                artifact=artifact_grant.abstract_artifact,
-                policy=access_policy)
-        # Make grants for grantees in ascending order so we can slice off the
-        # first elements in the pillar observer results to check batching.
-        for x in range(10):
-            makeGrants('name%s' % x)
-
->>>>>>> MERGE-SOURCE
     def test_init_without_feature_flag(self):
         # We need a feature flag to enable the view.
         self.assertRaises(
@@ -343,7 +209,6 @@
             cache = IJSONRequestCache(view.request)
             self.assertIsNotNone(cache.objects.get('information_types'))
             self.assertIsNotNone(cache.objects.get('sharing_permissions'))
-<<<<<<< TREE
             batch_size = config.launchpad.default_batch_size
             apgfs = getUtility(IAccessPolicyGrantFlatSource)
             sharees = apgfs.findGranteePermissionsByPolicy(
@@ -403,65 +268,6 @@
             view = create_initialized_view(self.pillar, name='+sharing')
             cache = IJSONRequestCache(view.request)
             self.assertTrue(cache.objects.get('sharing_write_enabled'))
-=======
-            aps = getUtility(IService, 'sharing')
-            batch_size = config.launchpad.default_batch_size
-            observers = aps.getPillarShareeData(
-                self.pillar, grantees=self.grantees[:batch_size])
-            self.assertContentEqual(
-                observers, cache.objects.get('sharee_data'))
-
-    def test_view_batch_data(self):
-        # Test the expected batching data is in the json request cache.
-        with FeatureFixture(ENABLED_FLAG):
-            view = create_initialized_view(self.pillar, name='+sharing')
-            cache = IJSONRequestCache(view.request)
-            # Test one expected data value (there are many).
-            next_batch = view.shareeData().batch.nextBatch()
-            self.assertContentEqual(
-                next_batch.range_memo, cache.objects.get('next')['memo'])
-
-    def test_view_range_factory(self):
-        # Test the view range factory is properly configured.
-        with FeatureFixture(ENABLED_FLAG):
-            view = create_initialized_view(self.pillar, name='+sharing')
-            range_factory = view.shareeData().batch.range_factory
-
-            def test_range_factory():
-                row = range_factory.resultset.get_plain_result_set()[0]
-                range_factory.getOrderValuesFor(row)
-
-            self.assertThat(
-                test_range_factory,
-                Not(Raises(MatchesException(StormRangeFactoryError))))
-
-    def test_view_query_count(self):
-        # Test the query count is within expected limit.
-        with FeatureFixture(ENABLED_FLAG):
-            view = create_view(self.pillar, name='+sharing')
-            with StormStatementRecorder() as recorder:
-                view.initialize()
-            self.assertThat(recorder, HasQueryCount(LessThan(7)))
-
-    def test_view_write_enabled_without_feature_flag(self):
-        # Test that sharing_write_enabled is not set without the feature flag.
-        with FeatureFixture(ENABLED_FLAG):
-            login_person(self.owner)
-            view = create_initialized_view(self.pillar, name='+sharing')
-            cache = IJSONRequestCache(view.request)
-            self.assertFalse(cache.objects.get('sharing_write_enabled'))
-
-    def test_view_write_enabled_with_feature_flag(self):
-        # Test that sharing_write_enabled is set when required.
-        with FeatureFixture(WRITE_FLAG):
-            view = create_initialized_view(self.pillar, name='+sharing')
-            cache = IJSONRequestCache(view.request)
-            self.assertFalse(cache.objects.get('sharing_write_enabled'))
-            login_person(self.owner)
-            view = create_initialized_view(self.pillar, name='+sharing')
-            cache = IJSONRequestCache(view.request)
-            self.assertTrue(cache.objects.get('sharing_write_enabled'))
->>>>>>> MERGE-SOURCE
 
 
 class TestProductSharingView(PillarSharingViewTestMixin,

=== modified file 'lib/lp/registry/enums.py'
--- lib/lp/registry/enums.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/enums.py	2012-03-29 00:48:21 +0000
@@ -9,16 +9,10 @@
     'DistroSeriesDifferenceType',
     'InformationType',
     'PersonTransferJobType',
-<<<<<<< TREE
     'PRIVATE_INFORMATION_TYPES',
     'PUBLIC_INFORMATION_TYPES',
     'ProductJobType',
     'SECURITY_INFORMATION_TYPES',
-=======
-    'PRIVATE_INFORMATION_TYPES',
-    'ProductJobType',
-    'SECURITY_INFORMATION_TYPES',
->>>>>>> MERGE-SOURCE
     'SharingPermission',
     ]
 
@@ -70,7 +64,6 @@
         """)
 
 
-<<<<<<< TREE
 PUBLIC_INFORMATION_TYPES = (
     InformationType.PUBLIC, InformationType.UNEMBARGOEDSECURITY)
 
@@ -84,17 +77,6 @@
     InformationType.UNEMBARGOEDSECURITY, InformationType.EMBARGOEDSECURITY)
 
 
-=======
-PRIVATE_INFORMATION_TYPES = (
-    InformationType.EMBARGOEDSECURITY, InformationType.USERDATA,
-    InformationType.PROPRIETARY)
-
-
-SECURITY_INFORMATION_TYPES = (
-    InformationType.UNEMBARGOEDSECURITY, InformationType.EMBARGOEDSECURITY)
-
-
->>>>>>> MERGE-SOURCE
 class SharingPermission(DBEnumeratedType):
     """Sharing permission.
 

=== modified file 'lib/lp/registry/interfaces/accesspolicy.py'
--- lib/lp/registry/interfaces/accesspolicy.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/interfaces/accesspolicy.py	2012-03-22 09:00:36 +0000
@@ -215,7 +215,6 @@
     """Experimental query utility to search through the flattened schema."""
 
     def findGranteesByPolicy(policies):
-<<<<<<< TREE
         """Find teams or users with access grants for the policies.
 
         This includes grants for artifacts in the policies.
@@ -237,29 +236,6 @@
             ALL means the person has an access policy grant and can see all
             artifacts for the associated pillar.
             SOME means the person only has specified access artifact grants.
-=======
-        """Find teams or users with access grants for the policies.
-
-        This includes grants for artifacts in the policies.
-
-        :param policies: a collection of `IAccesPolicy`s.
-        :return: a collection of `IPerson`.
-        """
-
-    def findGranteePermissionsByPolicy(policies, grantees=None):
-        """Find teams or users with access grants for the policies.
-
-        This includes grants for artifacts in the policies.
-
-        :param policies: a collection of `IAccesPolicy`s.
-        :param grantees: if not None, the result only includes people in the
-            specified list of grantees.
-        :return: a collection of (`IPerson`, `IAccessPolicy`, permission)
-            where permission is a SharingPermission value.
-            'ALL' means the person has an access policy grant and can see all
-            artifacts for the associated pillar.
-            'SOME' means the person only has specified access artifact grants.
->>>>>>> MERGE-SOURCE
         """
 
     def findArtifactsByGrantee(grantee, policies):

=== modified file 'lib/lp/registry/interfaces/productjob.py'
--- lib/lp/registry/interfaces/productjob.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/interfaces/productjob.py	2012-03-24 12:41:36 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -120,72 +119,3 @@
         :param reply_to_commercial: Set the reply_to property to the
             commercial email address.
         """
-=======
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Interfaces for the Jobs system to update products and send notifications."""
-
-__metaclass__ = type
-__all__ = [
-    'IProductJob',
-    'IProductJobSource',
-    ]
-
-from zope.interface import Attribute
-from zope.schema import (
-    Int,
-    Object,
-    )
-
-from lp import _
-from lp.registry.interfaces.product import IProduct
-
-from lp.services.job.interfaces.job import (
-    IJob,
-    IJobSource,
-    IRunnableJob,
-    )
-
-
-class IProductJob(IRunnableJob):
-    """A Job related to an `IProduct`."""
-
-    id = Int(
-        title=_('DB ID'), required=True, readonly=True,
-        description=_("The tracking number of this job."))
-
-    job = Object(
-        title=_('The common Job attributes'),
-        schema=IJob,
-        required=True)
-
-    product = Object(
-        title=_('The product the job is for'),
-        schema=IProduct,
-        required=True)
-
-    metadata = Attribute('A dict of data for the job')
-
-
-class IProductJobSource(IJobSource):
-    """An interface for creating and finding `IProductJob`s."""
-
-    def create(product, metadata):
-        """Create a new `IProductJob`.
-
-        :param product: An IProduct.
-        :param metadata: a dict of configuration data for the job.
-            The data must be JSON compatible keys and values.
-        """
-
-    def find(product=None, date_since=None, job_type=None):
-        """Find `IProductJob`s that match the specified criteria.
-
-        :param product: Match jobs for specific product.
-        :param date_since: Match jobs since the specified date.
-        :param job_type: Match jobs of a specific type. Type is expected
-            to be a class name.
-        :return: A `ResultSet` yielding `IProductJob`.
-        """
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/interfaces/sharingservice.py'
--- lib/lp/registry/interfaces/sharingservice.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/interfaces/sharingservice.py	2012-03-26 14:10:32 +0000
@@ -59,7 +59,6 @@
     def getPillarSharees(pillar):
         """Return people/teams who can see pillar artifacts."""
 
-<<<<<<< TREE
     @export_read_operation()
     @operation_parameters(
         pillar=Reference(IPillar, title=_('Pillar'), required=True))
@@ -83,20 +82,6 @@
             - permissions they have for each information type.
         """
 
-=======
-    @export_read_operation()
-    @operation_parameters(
-        pillar=Reference(IPillar, title=_('Pillar'), required=True))
-    @operation_for_version('devel')
-    def getPillarShareeData(pillar, grantees=None):
-        """Return people/teams who can see pillar artifacts.
-
-        The result records are json data which includes:
-            - person name
-            - permissions they have for each information type.
-        """
-
->>>>>>> MERGE-SOURCE
     @export_write_operation()
     @call_with(user=REQUEST_USER)
     @operation_parameters(

=== modified file 'lib/lp/registry/javascript/sharing/pillarsharingview.js'
--- lib/lp/registry/javascript/sharing/pillarsharingview.js	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/pillarsharingview.js	2012-03-26 01:11:56 +0000
@@ -103,16 +103,10 @@
         var otns = Y.lp.registry.sharing.shareetable;
         var sharee_table = new otns.ShareeTableWidget({
             sharees: sharee_data,
-<<<<<<< TREE
             sharing_permissions:
                 this.get('sharing_permissions_by_value'),
             information_types: this.get('information_types_by_value'),
             write_enabled: this.get('write_enabled')
-=======
-            sharing_permissions: sharing_permissions,
-            information_types: this.get('information_types_by_value'),
-            write_enabled: this.get('write_enabled')
->>>>>>> MERGE-SOURCE
         });
         this.set('sharee_table', sharee_table);
         sharee_table.render();

=== modified file 'lib/lp/registry/javascript/sharing/shareepicker.js'
--- lib/lp/registry/javascript/sharing/shareepicker.js	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/shareepicker.js	2012-03-28 00:44:36 +0000
@@ -51,12 +51,8 @@
             }
         }
         this.set('information_types', information_types);
-<<<<<<< TREE
         this.set('sharing_permissions', sharing_permissions);
         this.step_one_header = this.get('headerContent');
-=======
-        this.set('sharing_permissions', sharing_permissions);
->>>>>>> MERGE-SOURCE
         var self = this;
         this.subscribe('save', function (e) {
             e.halt();
@@ -173,67 +169,10 @@
         var step_one_content = contentBox.one('.yui3-widget-bd');
         var step_two_content = contentBox.one('.picker-content-two');
         if (step_two_content === null) {
-<<<<<<< TREE
             step_two_content = this._render_step_two(
                 data.back_enabled, data.allowed_permissions);
-=======
-            var step_two_html = [
-                '<div class="picker-content-two transparent">',
-                '<div class="step-links">',
-                '<a class="prev js-action" href="#">Back</a>',
-                '<button class="next lazr-pos lazr-btn"></button>',
-                '<a class="next js-action" href="#">Select</a>',
-                '</div></div>'
-                ].join(' ');
-            step_two_content = Y.Node.create(step_two_html);
-            var self = this;
-            // Remove the back link if required.
-            if (Y.Lang.isBoolean(data.back_enabled)
-                    && !data.back_enabled ) {
-                step_two_content.one('a.prev').remove(true);
-            } else {
-                step_two_content.one('a.prev').on('click', function(e) {
-                    e.halt();
-                    self._display_step_one();
-                });
-            }
-            // Wire up the next (ie submit) links.
-            step_two_content.all('.next').on('click', function(e) {
-                e.halt();
-                // Only submit if at least one info type is selected.
-                if (!self._all_info_choices_unticked(step_two_content)) {
-                    self.fire('save', data, 2);
-                }
-            });
-            // By default, we only show All or Nothing.
-            var allowed_permissions = ['ALL', 'NOTHING'];
-            if (Y.Lang.isValue(data.allowed_permissions)) {
-                allowed_permissions = data.allowed_permissions;
-            }
-            var sharing_permissions = [];
-            Y.Array.each(this.get('sharing_permissions'),
-                    function(permission) {
-                if (Y.Array.indexOf(
-                        allowed_permissions, permission.value) >=0) {
-                    sharing_permissions.push(permission);
-                }
-            });
-            var policy_selector = self._make_policy_selector(
-                sharing_permissions);
-            step_two_content.one('div.step-links')
-                .insert(policy_selector, 'before');
->>>>>>> MERGE-SOURCE
             step_one_content.insert(step_two_content, 'after');
-<<<<<<< TREE
-=======
-            step_two_content.all('input[name^=field.permission]')
-                    .on('click', function(e) {
-                self._disable_select_if_all_info_choices_unticked(
-                    step_two_content);
-            });
->>>>>>> MERGE-SOURCE
         }
-<<<<<<< TREE
         // Wire up the next (ie submit) links.
         step_two_content.detach('click');
         step_two_content.delegate('click', function(e) {
@@ -252,17 +191,6 @@
         // sharee_permissions.
         if (Y.Lang.isObject(data.sharee_permissions)) {
             Y.each(data.sharee_permissions, function(perm, type) {
-=======
-        // Initially set all radio buttons to Nothing.
-        step_two_content.all('input[name^=field.permission][value=NOTHING]')
-                .each(function(radio_button) {
-            radio_button.set('checked', true);
-        });
-        // Ensure the correct radio buttons are ticked according to the
-        // sharee_permissions.
-        if (Y.Lang.isObject(data.sharee_permissions)) {
-            Y.each(data.sharee_permissions, function(perm, type) {
->>>>>>> MERGE-SOURCE
                 var cb = step_two_content.one(
                     'input[name=field.permission.'+type+']' +
                     '[value="' + perm + '"]');
@@ -326,7 +254,6 @@
         this.fire('save', data, 0);
     },
 
-<<<<<<< TREE
     _sharing_permission_template: function() {
         return [
             '<table class="radio-button-widget"><tbody>',
@@ -348,29 +275,6 @@
     },
 
     _make_policy_selector: function(allowed_permissions) {
-=======
-    _sharing_permission_template: function() {
-        return [
-            '<table class="radio-button-widget"><tbody>',
-            '{{#permissions}}',
-            '<tr>',
-            '      <input type="radio"',
-            '        value="{{value}}"',
-            '        name="field.permission.{{info_type}}"',
-            '        id="field.permission.{{info_type}}.{{index}}"',
-            '        class="radioType">',
-            '    <label for="field.permission.{{info_type}}"',
-            '        title="{{description}}">',
-            '        {{title}}',
-            '    </label>',
-            '</tr>',
-            '{{/permissions}}',
-            '</tbody></table>'
-        ].join('');
-    },
-
-    _make_policy_selector: function(allowed_permissions) {
->>>>>>> MERGE-SOURCE
         // The policy selector is a set of radio buttons.
         var sharing_permissions_template = this._sharing_permission_template();
         var html = Y.lp.mustache.to_html([

=== modified file 'lib/lp/registry/javascript/sharing/shareetable.js'
--- lib/lp/registry/javascript/sharing/shareetable.js	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/shareetable.js	2012-03-28 03:50:33 +0000
@@ -49,7 +49,7 @@
     },
     // The sharing permission choices: all, some, nothing etc.
     sharing_permissions: {
-        value: []
+        value: {}
     },
     // The node holding the sharee table.
     sharee_table: {
@@ -273,25 +273,11 @@
     },
 
     renderUI: function() {
-<<<<<<< TREE
-        this._render_sharees(this.get('sharees'));
-    },
-
-    _render_sharees: function(sharees) {
-        var sharee_table = this.get('sharee_table');
-=======
-        this._render_sharees(this.get('sharees'));
-    },
-
-    _render_sharees: function(sharees) {
-        var sharee_table = this.get('sharee_table');
-        if (sharees.length === 0) {
-            sharee_table.one('tr#sharee-table-loading td')
-                .setContent("This project's private information is " +
-                            "not shared with anyone.");
-            return;
-        }
->>>>>>> MERGE-SOURCE
+        this._render_sharees(this.get('sharees'));
+    },
+
+    _render_sharees: function(sharees) {
+        var sharee_table = this.get('sharee_table');
         var partials = {
             sharee_access_policies:
                 this.get('sharee_policy_template'),
@@ -302,7 +288,6 @@
             this.get('sharee_table_template'),
             {sharees: sharees}, partials);
         var table_node = Y.Node.create(html);
-<<<<<<< TREE
         if (sharees.length === 0) {
             table_node.one('tbody').appendChild(
                 Y.Node.create(this.get('sharee_table_empty_row')));
@@ -311,12 +296,6 @@
         this.render_sharing_info(sharees);
         this._update_editable_status();
         this.set('sharees', sharees);
-=======
-        sharee_table.replace(table_node);
-        this.render_sharing_info(sharees);
-        this._update_editable_status();
-        this.set('sharees', sharees);
->>>>>>> MERGE-SOURCE
     },
 
     bindUI: function() {
@@ -521,7 +500,6 @@
         var rows_to_delete = sharee_table.all(deleted_row_selectors.join(','));
         var delete_rows = function() {
             rows_to_delete.remove(true);
-<<<<<<< TREE
             if (all_rows_deleted === true) {
                 sharee_table.one('tbody')
                     .appendChild('<tr id="sharee-table-not-shared"></tr>')
@@ -529,15 +507,6 @@
                     .setContent("This project's private information " +
                                 "is not shared with anyone.");
             }
-=======
-            if (all_rows_deleted === true) {
-                sharee_table.one('tbody')
-                    .appendChild('<tr id="sharee-table-loading"></tr>')
-                    .appendChild('<td></td>')
-                    .setContent("This project's private information " +
-                                "is not shared with anyone.");
-            }
->>>>>>> MERGE-SOURCE
         };
         var anim_duration = this.get('anim_duration');
         if (anim_duration === 0 ) {

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareelisting_navigator.html'
--- lib/lp/registry/javascript/sharing/tests/test_shareelisting_navigator.html	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareelisting_navigator.html	2012-03-28 03:50:33 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
   "http://www.w3.org/TR/html4/strict.dtd">
 <!--
@@ -61,67 +60,3 @@
         </script>
     </body>
 </html>
-=======
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-Copyright 2012 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file LICENSE).
--->
-
-<html>
-  <head>
-      <title>Sharee Listing Navigator Tests</title>
-
-      <!-- YUI and test setup -->
-      <script type="text/javascript"
-              src="../../../../../../build/js/yui/yui/yui.js">
-      </script>
-      <link rel="stylesheet"
-      href="../../../../../../build/js/yui/console/assets/console-core.css" />
-      <link rel="stylesheet"
-      href="../../../../../../build/js/yui/console/assets/skins/sam/console.css" />
-      <link rel="stylesheet"
-      href="../../../../../../build/js/yui/test/assets/skins/sam/test.css" />
-
-      <script type="text/javascript"
-              src="../../../../../../build/js/lp/app/testing/testrunner.js"></script>
-
-      <link rel="stylesheet" href="../../../../app/javascript/testing/test.css" />
-
-      <!-- Dependencies -->
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/client.js"></script>
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/lp.js"></script>
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/mustache.js"></script>
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/indicator/indicator.js"></script>
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/overlay/overlay.js"></script>
-      <script type="text/javascript"
-          src="../../../../../../build/js/lp/app/listing_navigator.js"></script>
-
-      <!-- The module under test. -->
-      <script type="text/javascript" src="../shareelisting_navigator.js"></script>
-
-      <!-- The test suite -->
-      <script type="text/javascript" src="test_shareelisting_navigator.js"></script>
-
-    </head>
-    <body class="yui3-skin-sam">
-        <ul id="suites">
-            <li>lp.registry.sharing.shareelisting_navigator.test</li>
-        </ul>
-        <div id="fixture"></div>
-        <script type="text/x-template" id="sharee-table-template">
-            <table id='sharee-table'>
-                <tr id='sharee-table-loading'><td>
-                    Loading...
-                </td></tr>
-            </table>
-        </script>
-    </body>
-</html>
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareepicker.js'
--- lib/lp/registry/javascript/sharing/tests/test_shareepicker.js	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareepicker.js	2012-03-27 02:27:21 +0000
@@ -181,7 +181,6 @@
             // Check the title and step title are correct.
             var steptitle = cb.one('.contains-steptitle h2').getContent();
             Y.Assert.areEqual(
-<<<<<<< TREE
                 'Update sharing policies',
                 this.picker.get('headerContent').get('text'));
             Y.Assert.areEqual(
@@ -191,14 +190,6 @@
             Y.Assert.isNotNull(cb.one('input[value=ALL]'));
             Y.Assert.isNotNull(cb.one('input[value=NOTHING]'));
             Y.Assert.isNull(cb.one('input[value=SOME]'));
-=======
-                'Select sharing policies for Fred', steptitle);
-            // By default, selections only for ALL and NOTHING are available
-            // (and no others).
-            Y.Assert.isNotNull(cb.one('input[value=ALL]'));
-            Y.Assert.isNotNull(cb.one('input[value=NOTHING]'));
-            Y.Assert.isNull(cb.one('input[value=SOME]'));
->>>>>>> MERGE-SOURCE
             // Selected permission checkboxes should be ticked.
             cb.all('input[name=field.permission.P1]')
                     .each(function(node) {

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareetable.html'
--- lib/lp/registry/javascript/sharing/tests/test_shareetable.html	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareetable.html	2012-03-28 03:50:33 +0000
@@ -73,7 +73,6 @@
         <ul id="suites">
             <li>lp.registry.sharing.shareetable.test</li>
         </ul>
-<<<<<<< TREE
         <div id="fixture"></div>
         <script type="text/x-template" id="sharee-table-template">
             <table id='sharee-table'>
@@ -82,15 +81,5 @@
                 </td></tr>
             </table>
         </script>
-=======
-        <div id="fixture"></div>
-        <script type="text/x-template" id="sharee-table-template">
-            <table id='sharee-table'>
-                <tr id='sharee-table-loading'><td>
-                    Loading...
-                </td></tr>
-            </table>
-        </script>
->>>>>>> MERGE-SOURCE
     </body>
 </html>

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareetable.js'
--- lib/lp/registry/javascript/sharing/tests/test_shareetable.js	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareetable.js	2012-03-28 03:50:33 +0000
@@ -25,7 +25,6 @@
                     ]
                 }
             };
-<<<<<<< TREE
             this.sharing_permissions = {
                 s1: 'S1',
                 s2: 'S2'
@@ -40,27 +39,13 @@
                     Y.one('#sharee-table-template').getContent());
             this.fixture.appendChild(sharee_table);
 
-=======
-            this.fixture = Y.one('#fixture');
-            var sharee_table = Y.Node.create(
-                    Y.one('#sharee-table-template').getContent());
-            this.fixture.appendChild(sharee_table);
-
->>>>>>> MERGE-SOURCE
         },
 
         tearDown: function () {
-<<<<<<< TREE
             if (this.fixture !== null) {
                 this.fixture.empty(true);
             }
             delete this.fixture;
-=======
-            if (this.fixture !== null) {
-                this.fixture.empty();
-            }
-            delete this.fixture;
->>>>>>> MERGE-SOURCE
             delete window.LP;
         },
 
@@ -72,7 +57,6 @@
                 sharee_table: Y.one('#sharee-table'),
                 anim_duration: 0,
                 sharees: window.LP.cache.sharee_data,
-<<<<<<< TREE
                 sharing_permissions: this.sharing_permissions,
                 information_types: this.information_types,
                 write_enabled: true
@@ -80,14 +64,6 @@
             window.LP.cache.sharee_data = config.sharees;
             var ns = Y.lp.registry.sharing.shareetable;
             return new ns.ShareeTableWidget(config);
-=======
-                sharing_permissions: window.LP.cache.sharing_permissions,
-                information_types: window.LP.cache.information_types,
-                write_enabled: true
-            }, overrides);
-            var ns = Y.lp.registry.sharing.shareetable;
-            return new ns.ShareeTableWidget(config);
->>>>>>> MERGE-SOURCE
         },
 
         test_library_exists: function () {
@@ -104,7 +80,6 @@
                 "Sharee table failed to be instantiated");
         },
 
-<<<<<<< TREE
         // Read only mode disables the correct things.
         test_readonly: function() {
             this.sharee_table = this._create_Widget({
@@ -146,34 +121,6 @@
             Y.Assert.isNull(Y.one('tr#sharee-table-not-shared'));
         },
 
-=======
-        // Read only mode disables the correct things.
-        test_readonly: function() {
-            this.sharee_table = this._create_Widget({
-                write_enabled: false
-            });
-            this.sharee_table.render();
-            Y.all('#sharee-table ' +
-                  '.sprite.add, .sprite.edit, .sprite.remove a')
-                .each(function(link) {
-                    Y.Assert.isTrue(link.hasClass('unseen'));
-            });
-        },
-
-        // When there are no sharees, the table contains an informative message.
-        test_no_sharee_message: function() {
-            this.sharee_table = this._create_Widget({
-                sharees: []
-            });
-            this.sharee_table.render();
-            Y.Assert.areEqual(
-                "This project's private information is not shared " +
-                "with anyone.",
-                Y.one('#sharee-table tr#sharee-table-loading td')
-                    .getContent());
-        },
-
->>>>>>> MERGE-SOURCE
         // The given sharee is correctly rendered.
         _test_sharee_rendered: function(sharee) {
             // The sharee row
@@ -344,7 +291,6 @@
             this.sharee_table.syncUI();
             // Check the results.
             var self = this;
-<<<<<<< TREE
             Y.Array.each(sharee_data, function(sharee) {
                 self._test_sharee_rendered(sharee);
             });
@@ -400,63 +346,6 @@
                 'permissions': {'P1': 's2'}};
             this.sharee_table.navigator.fire('updateContent', [new_sharee]);
             this._test_sharee_rendered(new_sharee);
-=======
-            Y.Array.each(sharee_data, function(sharee) {
-                self._test_sharee_rendered(sharee);
-            });
-            var deleted_row = '#sharee-table tr[id=permission-fred]';
-            Y.Assert.isNull(Y.one(deleted_row));
-        },
-
-        // The navigator model total attribute is updated when the currently
-        // displayed sharee data changes.
-        test_navigation_totals_updated: function() {
-            this.sharee_table = this._create_Widget();
-            this.sharee_table.render();
-            // We manipulate the cached model data - delete, add and update
-            var sharee_data = window.LP.cache.sharee_data;
-            // Insert a new record.
-            var new_sharee = {
-                'name': 'joe', 'display_name': 'Joe Smith',
-                'role': '(Maintainer)', web_link: '~joe',
-                'self_link': '~joe',
-                'permissions': {'P1': 's2'}};
-            sharee_data.splice(0, 0, new_sharee);
-            this.sharee_table.syncUI();
-            // Check the results.
-            Y.Assert.areEqual(
-                3, this.sharee_table.navigator.get('model').get('total'));
-        },
-
-        // When all rows are deleted, the table contains an informative message.
-        test_delete_all: function() {
-            this.sharee_table = this._create_Widget();
-            this.sharee_table.render();
-            // We manipulate the cached model data.
-            var sharee_data = window.LP.cache.sharee_data;
-            // Delete all the records.
-            sharee_data.splice(0, 2);
-            this.sharee_table.syncUI();
-            // Check the results.
-            Y.Assert.areEqual(
-                "This project's private information is not shared " +
-                "with anyone.",
-                Y.one('#sharee-table tr#sharee-table-loading td')
-                    .getContent());
-        },
-
-        // A batch update is correctly rendered.
-        test_navigator_content_update: function() {
-            this.sharee_table = this._create_Widget();
-            this.sharee_table.render();
-            var new_sharee = {
-                'name': 'joe', 'display_name': 'Joe Smith',
-                'role': '(Maintainer)', web_link: '~joe',
-                'self_link': '~joe',
-                'permissions': {'P1': 's2'}};
-            this.sharee_table.navigator.fire('updateContent', [new_sharee]);
-            this._test_sharee_rendered(new_sharee);
->>>>>>> MERGE-SOURCE
         }
     }));
 

=== modified file 'lib/lp/registry/model/accesspolicy.py'
--- lib/lp/registry/model/accesspolicy.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/model/accesspolicy.py	2012-03-23 04:12:59 +0000
@@ -18,12 +18,8 @@
     And,
     In,
     Or,
-<<<<<<< TREE
     Select,
     SQL,
-=======
-    SQL,
->>>>>>> MERGE-SOURCE
     )
 from storm.properties import (
     DateTime,
@@ -359,7 +355,6 @@
             Person, Person.id == cls.grantee_id, cls.policy_id.is_in(ids))
 
     @classmethod
-<<<<<<< TREE
     def findGranteePermissionsByPolicy(cls, policies, grantees=None):
         """See `IAccessPolicyGrantFlatSource`."""
         policies_by_id = dict((policy.id, policy) for policy in policies)
@@ -409,30 +404,6 @@
             result_decorator=set_permission, pre_iter_hook=load_permissions)
 
     @classmethod
-=======
-    def findGranteePermissionsByPolicy(cls, policies, grantees=None):
-        """See `IAccessPolicyGrantFlatSource`."""
-        ids = [policy.id for policy in policies]
-        sharing_permission_term = SQL("""
-            CASE(
-                MIN(COALESCE(artifact, 0)))
-            WHEN 0 THEN 'ALL'
-            ELSE 'SOME'
-            END
-        """)
-        constraints = [
-            Person.id == cls.grantee_id,
-            AccessPolicy.id == cls.policy_id,
-            cls.policy_id.is_in(ids)]
-        if grantees:
-            grantee_ids = [grantee.id for grantee in grantees]
-            constraints.append(cls.grantee_id.is_in(grantee_ids))
-        return IStore(cls).find(
-            (Person, AccessPolicy, sharing_permission_term),
-            *constraints).group_by(Person, AccessPolicy)
-
-    @classmethod
->>>>>>> MERGE-SOURCE
     def findArtifactsByGrantee(cls, grantee, policies):
         """See `IAccessPolicyGrantFlatSource`."""
         ids = [policy.id for policy in policies]

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/model/person.py	2012-03-29 06:02:46 +0000
@@ -1850,24 +1850,16 @@
                     Bug,
                     Join(BugSubscription, BugSubscription.bug_id == Bug.id)),
                 where=And(
-<<<<<<< TREE
                     Bug.information_type.is_in(PRIVATE_INFORMATION_TYPES),
-=======
-                    Bug._private == True,
->>>>>>> MERGE-SOURCE
                     BugSubscription.person_id == self.id)),
             Select(
                 Bug.id,
                 tables=(
                     Bug,
                     Join(BugTask, BugTask.bugID == Bug.id)),
-<<<<<<< TREE
                 where=And(Bug.information_type.is_in(
                     PRIVATE_INFORMATION_TYPES),
                     BugTask.assignee == self.id)),
-=======
-                where=And(Bug._private == True, BugTask.assignee == self.id)),
->>>>>>> MERGE-SOURCE
             limit=1))
         if private_bugs_involved.rowcount:
             raise TeamSubscriptionPolicyError(

=== modified file 'lib/lp/registry/model/productjob.py'
--- lib/lp/registry/model/productjob.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/model/productjob.py	2012-03-24 12:36:13 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -283,156 +282,3 @@
             'Launchpad', config.canonical.noreply_from_address)
         self.sendEmailToMaintainer(
             self.email_template_name, self.subject, from_address)
-=======
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Jobs classes to update products and send notifications."""
-
-__metaclass__ = type
-__all__ = [
-    'ProductJob',
-    ]
-
-from lazr.delegates import delegates
-import simplejson
-from storm.expr import (
-    And,
-    )
-from storm.locals import (
-    Int,
-    Reference,
-    Unicode,
-    )
-from zope.interface import (
-    classProvides,
-    implements,
-    )
-
-from lp.registry.enums import ProductJobType
-from lp.registry.interfaces.product import (
-    IProduct,
-    )
-from lp.registry.interfaces.productjob import (
-    IProductJob,
-    IProductJobSource,
-    )
-from lp.registry.model.product import Product
-from lp.services.database.decoratedresultset import DecoratedResultSet
-from lp.services.database.enumcol import EnumCol
-from lp.services.database.lpstorm import (
-    IMasterStore,
-    IStore,
-    )
-from lp.services.database.stormbase import StormBase
-from lp.services.job.model.job import Job
-from lp.services.job.runner import BaseRunnableJob
-
-
-class ProductJob(StormBase):
-    """Base class for product jobs."""
-
-    implements(IProductJob)
-
-    __storm_table__ = 'ProductJob'
-
-    id = Int(primary=True)
-
-    job_id = Int(name='job')
-    job = Reference(job_id, Job.id)
-
-    product_id = Int(name='product')
-    product = Reference(product_id, Product.id)
-
-    job_type = EnumCol(enum=ProductJobType, notNull=True)
-
-    _json_data = Unicode('json_data')
-
-    @property
-    def metadata(self):
-        return simplejson.loads(self._json_data)
-
-    def __init__(self, product, job_type, metadata):
-        """Constructor.
-
-        :param product: The product the job is for.
-        :param job_type: The type job the product needs run.
-        :param metadata: A dict of JSON-compatible data to pass to the job.
-        """
-        super(ProductJob, self).__init__()
-        self.job = Job()
-        self.product = product
-        self.job_type = job_type
-        json_data = simplejson.dumps(metadata)
-        self._json_data = json_data.decode('utf-8')
-
-
-class ProductJobDerived(BaseRunnableJob):
-    """Intermediate class for deriving from ProductJob.
-
-    Storm classes can't simply be subclassed or you can end up with
-    multiple objects referencing the same row in the db. This class uses
-    lazr.delegates, which is a little bit simpler than storm's
-    inheritance solution to the problem. Subclasses need to override
-    the run() method.
-    """
-
-    delegates(IProductJob)
-    classProvides(IProductJobSource)
-
-    def __init__(self, job):
-        self.context = job
-
-    def __repr__(self):
-        return (
-            "<{self.__class__.__name__} for {self.product.name} "
-            "status={self.job.status}>").format(self=self)
-
-    @classmethod
-    def create(cls, product, metadata):
-        """See `IProductJob`."""
-        if not IProduct.providedBy(product):
-            raise TypeError("Product must be an IProduct: %s" % repr(product))
-        job = ProductJob(
-            product=product, job_type=cls.class_job_type, metadata=metadata)
-        return cls(job)
-
-    @classmethod
-    def find(cls, product, date_since=None, job_type=None):
-        """See `IPersonMergeJobSource`."""
-        conditions = [
-            ProductJob.job_id == Job.id,
-            ProductJob.product == product.id,
-            ]
-        if date_since is not None:
-            conditions.append(
-                Job.date_created >= date_since)
-        if job_type is not None:
-            conditions.append(
-                ProductJob.job_type == job_type)
-        return DecoratedResultSet(
-            IStore(ProductJob).find(
-                ProductJob, *conditions), cls)
-
-    @classmethod
-    def iterReady(cls):
-        """Iterate through all ready ProductJobs."""
-        store = IMasterStore(ProductJob)
-        jobs = store.find(
-            ProductJob,
-            And(ProductJob.job_type == cls.class_job_type,
-                ProductJob.job_id.is_in(Job.ready_jobs)))
-        return (cls(job) for job in jobs)
-
-    @property
-    def log_name(self):
-        return self.__class__.__name__
-
-    def getOopsVars(self):
-        """See `IRunnableJob`."""
-        vars = BaseRunnableJob.getOopsVars(self)
-        vars.extend([
-            ('product', self.context.product.name),
-            ])
-        return vars
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/services/sharingservice.py'
--- lib/lp/registry/services/sharingservice.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/services/sharingservice.py	2012-03-26 20:49:13 +0000
@@ -27,14 +27,9 @@
     )
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.projectgroup import IProjectGroup
-<<<<<<< TREE
 from lp.registry.interfaces.sharingservice import ISharingService
 from lp.registry.model.person import Person
 from lp.services.features import getFeatureFlag
-=======
-from lp.registry.model.person import Person
-from lp.services.features import getFeatureFlag
->>>>>>> MERGE-SOURCE
 from lp.services.webapp.authorization import available_with_permission
 
 
@@ -52,7 +47,6 @@
         """See `IService`."""
         return 'sharing'
 
-<<<<<<< TREE
     @property
     def write_enabled(self):
         return bool(getFeatureFlag(
@@ -64,13 +58,6 @@
         return [a for a in
             flat_source.findArtifactsByGrantee(person, policies)]
 
-=======
-    @property
-    def write_enabled(self):
-        return bool(getFeatureFlag(
-            'disclosure.enhanced_sharing.writable'))
-
->>>>>>> MERGE-SOURCE
     def getInformationTypes(self, pillar):
         """See `ISharingService`."""
         allowed_types = [
@@ -115,7 +102,6 @@
     @available_with_permission('launchpad.Driver', 'pillar')
     def getPillarSharees(self, pillar):
         """See `ISharingService`."""
-<<<<<<< TREE
         policies = getUtility(IAccessPolicySource).findByPillar([pillar])
         ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
         # XXX 2012-03-22 wallyworld bug 961836
@@ -135,31 +121,8 @@
 
     def jsonShareeData(self, grant_permissions):
         """See `ISharingService`."""
-=======
-        policies = getUtility(IAccessPolicySource).findByPillar([pillar])
-        ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
-        # XXX 2012-03-22 wallyworld bug 961836
-        # We want to use person_sort_key(Person.displayname, Person.name) but
-        # StormRangeFactory doesn't support that yet.
-        grantees = ap_grant_flat.findGranteesByPolicy(
-            policies).order_by(Person.displayname, Person.name)
-        return grantees
-
-    @available_with_permission('launchpad.Driver', 'pillar')
-    def getPillarShareeData(self, pillar, grantees=None):
-        """See `ISharingService`."""
-        policies = getUtility(IAccessPolicySource).findByPillar([pillar])
-        ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
-        # XXX 2012-03-22 wallyworld bug 961836
-        # We want to use person_sort_key(Person.displayname, Person.name) but
-        # StormRangeFactory doesn't support that yet.
-        grant_permissions = ap_grant_flat.findGranteePermissionsByPolicy(
-            policies, grantees).order_by(Person.displayname, Person.name)
-
->>>>>>> MERGE-SOURCE
         result = []
         request = get_current_web_service_request()
-<<<<<<< TREE
         browser_request = IWebBrowserOriginatingRequest(request)
         for (grantee, permissions) in grant_permissions:
             result.append({
@@ -171,22 +134,6 @@
                 'permissions': dict(
                     (policy.type.name, permission.name)
                     for (policy, permission) in permissions.iteritems())})
-=======
-        browser_request = IWebBrowserOriginatingRequest(request)
-        for (grantee, policy, sharing_permission) in grant_permissions:
-            if not grantee.id in person_by_id:
-                person_data = {
-                    'name': grantee.name,
-                    'meta': 'team' if grantee.is_team else 'person',
-                    'display_name': grantee.displayname,
-                    'self_link': absoluteURL(grantee, request),
-                    'permissions': {}}
-                person_data['web_link'] = absoluteURL(grantee, browser_request)
-                person_by_id[grantee.id] = person_data
-                result.append(person_data)
-            person_data = person_by_id[grantee.id]
-            person_data['permissions'][policy.type.name] = sharing_permission
->>>>>>> MERGE-SOURCE
         return result
 
     @available_with_permission('launchpad.Edit', 'pillar')
@@ -251,7 +198,6 @@
             self.deletePillarSharee(pillar, sharee, info_types_for_nothing)
 
         # Return sharee data to the caller.
-<<<<<<< TREE
         ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
         grant_permissions = list(ap_grant_flat.findGranteePermissionsByPolicy(
             all_pillar_policies, [sharee]))
@@ -259,12 +205,6 @@
             return None
         [sharee] = self.jsonShareeData(grant_permissions)
         return sharee
-=======
-        sharees = self.getPillarShareeData(pillar, [sharee])
-        if not sharees:
-            return None
-        return sharees[0]
->>>>>>> MERGE-SOURCE
 
     @available_with_permission('launchpad.Edit', 'pillar')
     def deletePillarSharee(self, pillar, sharee,
@@ -296,18 +236,9 @@
 
         # Second delete any access artifact grants.
         ap_grant_flat = getUtility(IAccessPolicyGrantFlatSource)
-<<<<<<< TREE
         to_delete = list(ap_grant_flat.findArtifactsByGrantee(
             sharee, pillar_policies))
         if len(to_delete) > 0:
             accessartifact_grant_source = getUtility(
                 IAccessArtifactGrantSource)
             accessartifact_grant_source.revokeByArtifact(to_delete)
-=======
-        to_delete = ap_grant_flat.findArtifactsByGrantee(
-            sharee, pillar_policies)
-        if to_delete.count() > 0:
-            accessartifact_grant_source = getUtility(
-                IAccessArtifactGrantSource)
-            accessartifact_grant_source.revokeByArtifact(to_delete)
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/services/tests/test_sharingservice.py'
--- lib/lp/registry/services/tests/test_sharingservice.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/services/tests/test_sharingservice.py	2012-03-23 04:00:29 +0000
@@ -123,7 +123,6 @@
             distro,
             [InformationType.EMBARGOEDSECURITY, InformationType.USERDATA])
 
-<<<<<<< TREE
     def test_jsonShareeData(self):
         # jsonShareeData returns the expected data.
         product = self.factory.makeProduct()
@@ -246,123 +245,6 @@
         self._assert_getPillarShareeDataUnauthorized(product)
 
     def _assert_getPillarSharees(self, pillar):
-=======
-    def _assert_getPillarShareeData(self, pillar):
-        # getPillarShareeData returns the expected data.
-        access_policy = self.factory.makeAccessPolicy(
-            pillar=pillar,
-            type=InformationType.PROPRIETARY)
-        grantee = self.factory.makePerson()
-        # Make access policy grant so that 'All' is returned.
-        self.factory.makeAccessPolicyGrant(access_policy, grantee)
-        # Make access artifact grants so that 'Some' is returned.
-        artifact_grant = self.factory.makeAccessArtifactGrant()
-        self.factory.makeAccessPolicyArtifact(
-            artifact=artifact_grant.abstract_artifact, policy=access_policy)
-
-        sharees = self.service.getPillarShareeData(pillar)
-        expected_sharees = [
-            self._makeShareeData(
-                grantee,
-                [(InformationType.PROPRIETARY, SharingPermission.ALL)]),
-            self._makeShareeData(
-                artifact_grant.grantee,
-                [(InformationType.PROPRIETARY, SharingPermission.SOME)])]
-        self.assertContentEqual(expected_sharees, sharees)
-
-    def test_getProductShareeData(self):
-        # Users with launchpad.Driver can view sharees.
-        driver = self.factory.makePerson()
-        product = self.factory.makeProduct(driver=driver)
-        login_person(driver)
-        self._assert_getPillarShareeData(product)
-
-    def test_getDistroShareeData(self):
-        # Users with launchpad.Driver can view sharees.
-        driver = self.factory.makePerson()
-        distro = self.factory.makeDistribution(driver=driver)
-        login_person(driver)
-        self._assert_getPillarShareeData(distro)
-
-    def test_getPillarShareeDataQueryCount(self):
-        # getPillarShareeData only should use 2 queries regardless of how many
-        # sharees are returned.
-        driver = self.factory.makePerson()
-        product = self.factory.makeProduct(driver=driver)
-        login_person(driver)
-        access_policy = self.factory.makeAccessPolicy(
-            pillar=product,
-            type=InformationType.PROPRIETARY)
-
-        def makeGrants():
-            grantee = self.factory.makePerson()
-            # Make access policy grant so that 'All' is returned.
-            self.factory.makeAccessPolicyGrant(access_policy, grantee)
-            # Make access artifact grants so that 'Some' is returned.
-            artifact_grant = self.factory.makeAccessArtifactGrant()
-            self.factory.makeAccessPolicyArtifact(
-                artifact=artifact_grant.abstract_artifact,
-                policy=access_policy)
-
-        # Make some grants and check the count.
-        for x in range(5):
-            makeGrants()
-        with StormStatementRecorder() as recorder:
-            sharees = self.service.getPillarShareeData(product)
-        self.assertEqual(10, len(sharees))
-        self.assertThat(recorder, HasQueryCount(Equals(2)))
-        # Make some more grants and check again.
-        for x in range(5):
-            makeGrants()
-        with StormStatementRecorder() as recorder:
-            sharees = self.service.getPillarShareeData(product)
-        self.assertEqual(20, len(sharees))
-        self.assertThat(recorder, HasQueryCount(Equals(2)))
-
-    def test_getPillarShareeData_filter_grantees(self):
-        # getPillarShareeData only returns grantees in the specified list.
-        driver = self.factory.makePerson()
-        pillar = self.factory.makeProduct(driver=driver)
-        login_person(driver)
-        access_policy = self.factory.makeAccessPolicy(
-            pillar=pillar,
-            type=InformationType.PROPRIETARY)
-        grantee_in_result = self.factory.makePerson()
-        grantee_not_in_result = self.factory.makePerson()
-        self.factory.makeAccessPolicyGrant(access_policy, grantee_in_result)
-        self.factory.makeAccessPolicyGrant(
-            access_policy, grantee_not_in_result)
-
-        sharees = self.service.getPillarShareeData(pillar, [grantee_in_result])
-        expected_sharees = [
-            self._makeShareeData(
-                grantee_in_result,
-                [(InformationType.PROPRIETARY, SharingPermission.ALL)])]
-        self.assertContentEqual(expected_sharees, sharees)
-
-    def _assert_getPillarShareeDataUnauthorized(self, pillar):
-        # getPillarShareeData raises an Unauthorized exception if the user is
-        # not permitted to do so.
-        access_policy = self.factory.makeAccessPolicy(pillar=pillar)
-        grantee = self.factory.makePerson()
-        self.factory.makeAccessPolicyGrant(access_policy, grantee)
-        self.assertRaises(
-            Unauthorized, self.service.getPillarShareeData, pillar)
-
-    def test_getPillarShareeDataAnonymous(self):
-        # Anonymous users are not allowed.
-        product = self.factory.makeProduct()
-        login(ANONYMOUS)
-        self._assert_getPillarShareeDataUnauthorized(product)
-
-    def test_getPillarShareeDataAnyone(self):
-        # Unauthorized users are not allowed.
-        product = self.factory.makeProduct()
-        login_person(self.factory.makePerson())
-        self._assert_getPillarShareeDataUnauthorized(product)
-
-    def _assert_getPillarSharees(self, pillar):
->>>>>>> MERGE-SOURCE
         # getPillarSharees returns the expected data.
         access_policy = self.factory.makeAccessPolicy(
             pillar=pillar,
@@ -370,7 +252,6 @@
         grantee = self.factory.makePerson()
         # Make access policy grant so that 'All' is returned.
         self.factory.makeAccessPolicyGrant(access_policy, grantee)
-<<<<<<< TREE
         # Make access artifact grants so that 'Some' is returned.
         artifact_grant = self.factory.makeAccessArtifactGrant()
         self.factory.makeAccessPolicyArtifact(
@@ -381,16 +262,6 @@
             (grantee, {access_policy: SharingPermission.ALL}),
             (artifact_grant.grantee, {access_policy: SharingPermission.SOME})]
         self.assertContentEqual(expected_sharees, sharees)
-=======
-        # Make access artifact grants so that 'Some' is returned.
-        artifact_grant = self.factory.makeAccessArtifactGrant()
-        self.factory.makeAccessPolicyArtifact(
-            artifact=artifact_grant.abstract_artifact, policy=access_policy)
-
-        sharees = self.service.getPillarSharees(pillar)
-        expected_sharees = [grantee, artifact_grant.grantee]
-        self.assertContentEqual(expected_sharees, sharees)
->>>>>>> MERGE-SOURCE
 
     def test_getProductSharees(self):
         # Users with launchpad.Driver can view sharees.
@@ -483,14 +354,7 @@
             (InformationType.EMBARGOEDSECURITY, SharingPermission.ALL),
             (InformationType.USERDATA, SharingPermission.SOME)]
         expected_sharee_data = self._makeShareeData(
-<<<<<<< TREE
-            sharee, expected_permissions)
-=======
-            sharee, expected_permissions)
-        self.assertEqual(expected_sharee_data, sharee_data)
-        # Check that getPillarShareeData returns what we expect.
-        [sharee_data] = self.service.getPillarShareeData(pillar)
->>>>>>> MERGE-SOURCE
+            sharee, expected_permissions)
         self.assertEqual(expected_sharee_data, sharee_data)
         # Check that getPillarSharees returns what we expect.
         expected_sharee_grants = [
@@ -604,7 +468,6 @@
         if types_to_delete is not None:
             expected_information_types = (
                 set(information_types).difference(types_to_delete))
-<<<<<<< TREE
             expected_policies = [
                 access_policy for access_policy in access_policies
                 if access_policy.type in expected_information_types]
@@ -614,20 +477,9 @@
         # Add the expected data for the other sharee.
         another_person_data = (
             another, {access_policies[0]: SharingPermission.ALL})
-=======
-            remaining_grantee_person_data = self._makeShareeData(
-                grantee,
-                [(info_type, SharingPermission.ALL)
-                for info_type in expected_information_types])
-
-            expected_data.append(remaining_grantee_person_data)
-        # Add the data for the other sharee.
-        another_person_data = self._makeShareeData(
-            another, [(information_types[0], SharingPermission.ALL)])
->>>>>>> MERGE-SOURCE
         expected_data.append(another_person_data)
         self.assertContentEqual(
-            expected_data, self.service.getPillarShareeData(pillar))
+            expected_data, self.service.getPillarSharees(pillar))
 
     def test_deleteProductShareeAll(self):
         # Users with launchpad.Edit can delete all access for a sharee.

=== modified file 'lib/lp/registry/subscribers.py'
--- lib/lp/registry/subscribers.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/subscribers.py	2012-03-22 23:21:24 +0000
@@ -8,281 +8,140 @@
     'product_licenses_modified',
     ]
 
-<<<<<<< TREE
-from datetime import datetime
-import textwrap
-
-import pytz
-from zope.security.proxy import removeSecurityProxy
-
-from lp.registry.interfaces.person import IPerson
-from lp.registry.interfaces.product import License
-from lp.services.config import config
-from lp.services.mail.helpers import get_email_template
-from lp.services.mail.sendmail import (
-    format_address,
-    simple_sendmail,
-    )
-from lp.services.webapp.menu import structured
-from lp.services.webapp.publisher import (
-    canonical_url,
-    get_current_browser_request,
-    )
-
-
-def product_licenses_modified(product, event):
-    """Send a notification if licenses changed and a license is special."""
-    if not event.edited_fields:
-        return
-    licenses_changed = 'licenses' in event.edited_fields
-    needs_notification = LicenseNotification.needs_notification(product)
-    if licenses_changed and needs_notification:
-        user = IPerson(event.user)
-        notification = LicenseNotification(product, user)
-        notification.send()
-        notification.display()
-
-
-class LicenseNotification:
-    """Send notification about special licenses to the user."""
-
-    def __init__(self, product, user):
-        self.product = product
-        self.user = user
-
-    @staticmethod
-    def needs_notification(product):
-        licenses = list(product.licenses)
-        return (
-            License.OTHER_PROPRIETARY in licenses
-            or License.OTHER_OPEN_SOURCE in licenses
-            or [License.DONT_KNOW] == licenses)
-
-    def getTemplateName(self):
-        """Return the name of the email template for the licensing case."""
-        licenses = list(self.product.licenses)
-        if [License.DONT_KNOW] == licenses:
-            template_name = 'product-license-dont-know.txt'
-        elif License.OTHER_PROPRIETARY in licenses:
-            template_name = 'product-license-other-proprietary.txt'
-        else:
-            template_name = 'product-license-other-open-source.txt'
-        return template_name
-
-    def getCommercialUseMessage(self):
-        """Return a message explaining the current commercial subscription."""
-        commercial_subscription = self.product.commercial_subscription
-        if commercial_subscription is None:
-            return ''
-        iso_date = commercial_subscription.date_expires.date().isoformat()
-        if not self.product.has_current_commercial_subscription:
-            message = "%s's commercial subscription expired on %s."
-        elif 'complimentary' in commercial_subscription.sales_system_id:
-            message = (
-                "%s's complimentary commercial subscription expires on %s.")
-        else:
-            message = "%s's commercial subscription expires on %s."
-        message = message % (self.product.displayname, iso_date)
-        return textwrap.fill(message, 72)
-
-    def send(self):
-        """Send a message to the user about the product's license."""
-        if not self.needs_notification(self.product):
-            # The project has a common license.
-            return False
-        user_address = format_address(
-            self.user.displayname, self.user.preferredemail.email)
-        from_address = format_address(
-            "Launchpad", config.canonical.noreply_from_address)
-        commercial_address = format_address(
-            'Commercial', '[e-mail]')
-        substitutions = dict(
-            user_displayname=self.user.displayname,
-            user_name=self.user.name,
-            product_name=self.product.name,
-            product_url=canonical_url(self.product),
-            commercial_use_expiration=self.getCommercialUseMessage(),
-            )
-        # Email the user about license policy.
-        subject = (
-            "License information for %(product_name)s "
-            "in Launchpad" % substitutions)
-        template = get_email_template(
-            self.getTemplateName(), app='registry')
-        message = template % substitutions
-        simple_sendmail(
-            from_address, user_address,
-            subject, message, headers={'Reply-To': commercial_address})
-        # Inform that Launchpad recognized the license change.
-        self._addLicenseChangeToReviewWhiteboard()
-        return True
-
-    def display(self):
-        """Show a message in a browser page about the product's license."""
-        request = get_current_browser_request()
-        message = self.getCommercialUseMessage()
-        if request is None or message == '':
-            return False
-        safe_message = structured(
-            '%s<br />Learn more about '
-            '<a href="https://help.launchpad.net/CommercialHosting">'
-            'commercial subscriptions</a>', message)
-        request.response.addNotification(safe_message)
-        return True
-
-    @staticmethod
-    def _formatDate(now=None):
-        """Return the date formatted for messages."""
-        if now is None:
-            now = datetime.now(tz=pytz.UTC)
-        return now.strftime('%Y-%m-%d')
-
-    def _addLicenseChangeToReviewWhiteboard(self):
-        """Update the whiteboard for the reviewer's benefit."""
-        now = self._formatDate()
-        whiteboard = 'User notified of license policy on %s.' % now
-        naked_product = removeSecurityProxy(self.product)
-        if naked_product.reviewer_whiteboard is None:
-            naked_product.reviewer_whiteboard = whiteboard
-        else:
-            naked_product.reviewer_whiteboard += '\n' + whiteboard
-=======
-from datetime import datetime
-import textwrap
-
-import pytz
-
-from zope.security.proxy import removeSecurityProxy
-
-from lp.registry.interfaces.person import IPerson
-from lp.registry.interfaces.product import License
-from lp.services.config import config
-from lp.services.mail.helpers import get_email_template
-from lp.services.mail.sendmail import (
-    format_address,
-    simple_sendmail,
-    )
-from lp.services.webapp.menu import structured
-from lp.services.webapp.publisher import (
-    canonical_url,
-    get_current_browser_request,
-    )
-
-
-def product_licenses_modified(product, event):
-    """Send a notification if licenses changed and a license is special."""
-    if not event.edited_fields:
-        return
-    licenses_changed = 'licenses' in event.edited_fields
-    needs_notification = LicenseNotification.needs_notification(product)
-    if licenses_changed and needs_notification:
-        user = IPerson(event.user)
-        notification = LicenseNotification(product, user)
-        notification.send()
-        notification.display()
-
-
-class LicenseNotification:
-    """Send notification about special licenses to the user."""
-
-    def __init__(self, product, user):
-        self.product = product
-        self.user = user
-
-    @staticmethod
-    def needs_notification(product):
-        licenses = list(product.licenses)
-        return (
-            License.OTHER_PROPRIETARY in licenses
-            or License.OTHER_OPEN_SOURCE in licenses
-            or [License.DONT_KNOW] == licenses)
-
-    def getTemplateName(self):
-        """Return the name of the email template for the licensing case."""
-        licenses = list(self.product.licenses)
-        if [License.DONT_KNOW] == licenses:
-            template_name = 'product-license-dont-know.txt'
-        elif License.OTHER_PROPRIETARY in licenses:
-            template_name = 'product-license-other-proprietary.txt'
-        else:
-            template_name = 'product-license-other-open-source.txt'
-        return template_name
-
-    def getCommercialUseMessage(self):
-        """Return a message explaining the current commercial subscription."""
-        commercial_subscription = self.product.commercial_subscription
-        if commercial_subscription is None:
-            return ''
-        iso_date = commercial_subscription.date_expires.date().isoformat()
-        if not self.product.has_current_commercial_subscription:
-            message = "%s's commercial subscription expired on %s."
-        elif 'complimentary' in commercial_subscription.sales_system_id:
-            message = (
-                "%s's complimentary commercial subscription expires on %s.")
-        else:
-            message = "%s's commercial subscription expires on %s."
-        message = message % (self.product.displayname, iso_date)
-        return textwrap.fill(message, 72)
-
-    def send(self):
-        """Send a message to the user about the product's license."""
-        if not self.needs_notification(self.product):
-            # The project has a common license.
-            return False
-        user_address = format_address(
-            self.user.displayname, self.user.preferredemail.email)
-        from_address = format_address(
-            "Launchpad", config.canonical.noreply_from_address)
-        commercial_address = format_address(
-            'Commercial', '[e-mail]')
-        substitutions = dict(
-            user_displayname=self.user.displayname,
-            user_name=self.user.name,
-            product_name=self.product.name,
-            product_url=canonical_url(self.product),
-            commercial_use_expiration=self.getCommercialUseMessage(),
-            )
-        # Email the user about license policy.
-        subject = (
-            "License information for %(product_name)s "
-            "in Launchpad" % substitutions)
-        template = get_email_template(
-            self.getTemplateName(), app='registry')
-        message = template % substitutions
-        simple_sendmail(
-            from_address, user_address,
-            subject, message, headers={'Reply-To': commercial_address})
-        # Inform that Launchpad recognized the license change.
-        self._addLicenseChangeToReviewWhiteboard()
-        return True
-
-    def display(self):
-        """Show a message in a browser page about the product's license."""
-        request = get_current_browser_request()
-        message = self.getCommercialUseMessage()
-        if request is None or message == '':
-            return False
-        safe_message = structured(
-            '%s<br />Learn more about '
-            '<a href="https://help.launchpad.net/CommercialHosting">'
-            'commercial subscriptions</a>', message)
-        request.response.addNotification(safe_message)
-        return True
-
-    @staticmethod
-    def _formatDate(now=None):
-        """Return the date formatted for messages."""
-        if now is None:
-            now = datetime.now(tz=pytz.UTC)
-        return now.strftime('%Y-%m-%d')
-
-    def _addLicenseChangeToReviewWhiteboard(self):
-        """Update the whiteboard for the reviewer's benefit."""
-        now = self._formatDate()
-        whiteboard = 'User notified of license policy on %s.' % now
-        naked_product = removeSecurityProxy(self.product)
-        if naked_product.reviewer_whiteboard is None:
-            naked_product.reviewer_whiteboard = whiteboard
-        else:
-            naked_product.reviewer_whiteboard += '\n' + whiteboard
->>>>>>> MERGE-SOURCE
+from datetime import datetime
+import textwrap
+
+import pytz
+from zope.security.proxy import removeSecurityProxy
+
+from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.product import License
+from lp.services.config import config
+from lp.services.mail.helpers import get_email_template
+from lp.services.mail.sendmail import (
+    format_address,
+    simple_sendmail,
+    )
+from lp.services.webapp.menu import structured
+from lp.services.webapp.publisher import (
+    canonical_url,
+    get_current_browser_request,
+    )
+
+
+def product_licenses_modified(product, event):
+    """Send a notification if licenses changed and a license is special."""
+    if not event.edited_fields:
+        return
+    licenses_changed = 'licenses' in event.edited_fields
+    needs_notification = LicenseNotification.needs_notification(product)
+    if licenses_changed and needs_notification:
+        user = IPerson(event.user)
+        notification = LicenseNotification(product, user)
+        notification.send()
+        notification.display()
+
+
+class LicenseNotification:
+    """Send notification about special licenses to the user."""
+
+    def __init__(self, product, user):
+        self.product = product
+        self.user = user
+
+    @staticmethod
+    def needs_notification(product):
+        licenses = list(product.licenses)
+        return (
+            License.OTHER_PROPRIETARY in licenses
+            or License.OTHER_OPEN_SOURCE in licenses
+            or [License.DONT_KNOW] == licenses)
+
+    def getTemplateName(self):
+        """Return the name of the email template for the licensing case."""
+        licenses = list(self.product.licenses)
+        if [License.DONT_KNOW] == licenses:
+            template_name = 'product-license-dont-know.txt'
+        elif License.OTHER_PROPRIETARY in licenses:
+            template_name = 'product-license-other-proprietary.txt'
+        else:
+            template_name = 'product-license-other-open-source.txt'
+        return template_name
+
+    def getCommercialUseMessage(self):
+        """Return a message explaining the current commercial subscription."""
+        commercial_subscription = self.product.commercial_subscription
+        if commercial_subscription is None:
+            return ''
+        iso_date = commercial_subscription.date_expires.date().isoformat()
+        if not self.product.has_current_commercial_subscription:
+            message = "%s's commercial subscription expired on %s."
+        elif 'complimentary' in commercial_subscription.sales_system_id:
+            message = (
+                "%s's complimentary commercial subscription expires on %s.")
+        else:
+            message = "%s's commercial subscription expires on %s."
+        message = message % (self.product.displayname, iso_date)
+        return textwrap.fill(message, 72)
+
+    def send(self):
+        """Send a message to the user about the product's license."""
+        if not self.needs_notification(self.product):
+            # The project has a common license.
+            return False
+        user_address = format_address(
+            self.user.displayname, self.user.preferredemail.email)
+        from_address = format_address(
+            "Launchpad", config.canonical.noreply_from_address)
+        commercial_address = format_address(
+            'Commercial', '[e-mail]')
+        substitutions = dict(
+            user_displayname=self.user.displayname,
+            user_name=self.user.name,
+            product_name=self.product.name,
+            product_url=canonical_url(self.product),
+            commercial_use_expiration=self.getCommercialUseMessage(),
+            )
+        # Email the user about license policy.
+        subject = (
+            "License information for %(product_name)s "
+            "in Launchpad" % substitutions)
+        template = get_email_template(
+            self.getTemplateName(), app='registry')
+        message = template % substitutions
+        simple_sendmail(
+            from_address, user_address,
+            subject, message, headers={'Reply-To': commercial_address})
+        # Inform that Launchpad recognized the license change.
+        self._addLicenseChangeToReviewWhiteboard()
+        return True
+
+    def display(self):
+        """Show a message in a browser page about the product's license."""
+        request = get_current_browser_request()
+        message = self.getCommercialUseMessage()
+        if request is None or message == '':
+            return False
+        safe_message = structured(
+            '%s<br />Learn more about '
+            '<a href="https://help.launchpad.net/CommercialHosting">'
+            'commercial subscriptions</a>', message)
+        request.response.addNotification(safe_message)
+        return True
+
+    @staticmethod
+    def _formatDate(now=None):
+        """Return the date formatted for messages."""
+        if now is None:
+            now = datetime.now(tz=pytz.UTC)
+        return now.strftime('%Y-%m-%d')
+
+    def _addLicenseChangeToReviewWhiteboard(self):
+        """Update the whiteboard for the reviewer's benefit."""
+        now = self._formatDate()
+        whiteboard = 'User notified of license policy on %s.' % now
+        naked_product = removeSecurityProxy(self.product)
+        if naked_product.reviewer_whiteboard is None:
+            naked_product.reviewer_whiteboard = whiteboard
+        else:
+            naked_product.reviewer_whiteboard += '\n' + whiteboard

=== modified file 'lib/lp/registry/templates/pillar-sharing-details.pt'
--- lib/lp/registry/templates/pillar-sharing-details.pt	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/templates/pillar-sharing-details.pt	2012-03-26 20:49:13 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
@@ -61,19 +60,3 @@
   </div>
 </body>
 </html>
-=======
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  metal:use-macro="view/macro:page/main_only"
-  i18n:domain="launchpad"
->
-
-<body>
-  <div metal:fill-slot="main">
-  </div>
-</body>
-</html>
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/templates/pillar-sharing.pt'
--- lib/lp/registry/templates/pillar-sharing.pt	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/templates/pillar-sharing.pt	2012-03-22 09:00:36 +0000
@@ -28,7 +28,6 @@
       Proprietary, embargoed security, or user-data information is
       shared with these users and teams.
     </p>
-<<<<<<< TREE
     <ul class="horizontal">
       <li><a id='add-sharee-link' class='sprite add js-action' href="#">Share
         with someone</a></li>
@@ -41,19 +40,5 @@
 
   </div>
 
-=======
-    <ul class="horizontal">
-      <li><a id='add-sharee-link' class='sprite add js-action' href="#">Share
-        with someone</a></li>
-      <li><a id="audit-link" class="sprite info" href='#'>Audit sharing</a></li>
-    </ul>
-
-    <div tal:define="batch_navigator view/shareeData">
-      <tal:shareelisting content="structure batch_navigator/@@+sharee-table-view" />
-    </div>
-
-  </div>
-
->>>>>>> MERGE-SOURCE
 </body>
 </html>

=== modified file 'lib/lp/registry/tests/test_accesspolicy.py'
--- lib/lp/registry/tests/test_accesspolicy.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/tests/test_accesspolicy.py	2012-03-23 03:40:17 +0000
@@ -468,7 +468,6 @@
             artifact=artifact_grant.abstract_artifact, policy=another_policy)
         self.assertContentEqual(
             [policy_grant.grantee, artifact_grant.grantee],
-<<<<<<< TREE
             apgfs.findGranteesByPolicy([
                 policy, another_policy, policy_with_no_grantees]))
 
@@ -537,60 +536,6 @@
             [(policy_grant.grantee, {policy: SharingPermission.ALL})],
             apgfs.findGranteePermissionsByPolicy(
                 [policy], [grantee_in_result]))
-=======
-            apgfs.findGranteesByPolicy([
-                policy, another_policy, policy_with_no_grantees]))
-
-    def findGranteePermissionsByPolicy(self):
-        # findGranteePermissionsByPolicy() returns anyone with a grant for any
-        # of the policies or the policies' artifacts.
-        apgfs = getUtility(IAccessPolicyGrantFlatSource)
-
-        # People with grants on the policy show up.
-        policy_with_no_grantees = self.factory.makeAccessPolicy()
-        policy = self.factory.makeAccessPolicy()
-        policy_grant = self.factory.makeAccessPolicyGrant(policy=policy)
-        self.assertContentEqual(
-            [(policy_grant.grantee, policy, 'ALL')],
-            apgfs.findGranteePermissionsByPolicy(
-                [policy, policy_with_no_grantees]))
-
-        # But not people with grants on artifacts.
-        artifact_grant = self.factory.makeAccessArtifactGrant()
-        self.assertContentEqual(
-            [(policy_grant.grantee, policy, 'ALL')],
-            apgfs.findGranteePermissionsByPolicy(
-                [policy, policy_with_no_grantees]))
-
-        # Unless the artifacts are linked to the policy.
-        another_policy = self.factory.makeAccessPolicy()
-        self.factory.makeAccessPolicyArtifact(
-            artifact=artifact_grant.abstract_artifact, policy=another_policy)
-        self.assertContentEqual(
-            [(policy_grant.grantee, policy, 'ALL'),
-            (artifact_grant.grantee, another_policy, 'SOME')],
-            apgfs.findGranteePermissionsByPolicy([
-                policy, another_policy, policy_with_no_grantees]))
-
-    def test_findGranteePermissionsByPolicy_filter_grantees(self):
-        # findGranteePermissionsByPolicy() returns anyone with a grant for any
-        # of the policies or the policies' artifacts so long as the grantee is
-        # in the specified list of grantees.
-        apgfs = getUtility(IAccessPolicyGrantFlatSource)
-
-        # People with grants on the policy show up.
-        policy = self.factory.makeAccessPolicy()
-        grantee_in_result = self.factory.makePerson()
-        grantee_not_in_result = self.factory.makePerson()
-        policy_grant = self.factory.makeAccessPolicyGrant(
-            policy=policy, grantee=grantee_in_result)
-        self.factory.makeAccessPolicyGrant(
-            policy=policy, grantee=grantee_not_in_result)
-        self.assertContentEqual(
-            [(policy_grant.grantee, policy, 'ALL')],
-            apgfs.findGranteePermissionsByPolicy(
-                [policy], [grantee_in_result]))
->>>>>>> MERGE-SOURCE
 
     def test_findArtifactsByGrantee(self):
         # findArtifactsByGrantee() returns the artifacts for grantee for any of

=== modified file 'lib/lp/registry/tests/test_pillar.py'
--- lib/lp/registry/tests/test_pillar.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/tests/test_pillar.py	2012-03-22 23:21:24 +0000
@@ -5,20 +5,11 @@
 
 from zope.component import getUtility
 
-<<<<<<< TREE
-from lp.registry.interfaces.pillar import (
-    IPillarNameSet,
-    IPillarPerson,
-    )
-from lp.registry.model.pillar import PillarPerson
-=======
-from lp.registry.interfaces.pillar import (
-    IPillarNameSet,
-    IPillarPerson,
-    )
-from lp.registry.model.pillar import PillarPerson
-
->>>>>>> MERGE-SOURCE
+from lp.registry.interfaces.pillar import (
+    IPillarNameSet,
+    IPillarPerson,
+    )
+from lp.registry.model.pillar import PillarPerson
 from lp.testing import (
     login,
     TestCaseWithFactory,

=== modified file 'lib/lp/registry/tests/test_productjob.py'
--- lib/lp/registry/tests/test_productjob.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/tests/test_productjob.py	2012-03-24 12:41:36 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -370,191 +369,3 @@
         self.assertEqual(subject, notifications[0]['Subject'])
         self.assertIn(
             'Launchpad <[e-mail]>', notifications[0]['From'])
-=======
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for ProductJobs."""
-
-__metaclass__ = type
-
-from datetime import (
-    datetime,
-    timedelta,
-    )
-
-import pytz
-
-from zope.interface import (
-    classProvides,
-    implements,
-    )
-from zope.security.proxy import removeSecurityProxy
-
-from lp.registry.enums import ProductJobType
-from lp.registry.interfaces.productjob import (
-    IProductJob,
-    IProductJobSource,
-    )
-from lp.registry.model.productjob import (
-    ProductJob,
-    ProductJobDerived,
-    )
-from lp.testing import TestCaseWithFactory
-from lp.testing.layers import (
-    DatabaseFunctionalLayer,
-    LaunchpadZopelessLayer,
-    )
-
-
-class ProductJobTestCase(TestCaseWithFactory):
-    """Test case for basic ProductJob class."""
-
-    layer = LaunchpadZopelessLayer
-
-    def test_init(self):
-        product = self.factory.makeProduct()
-        metadata = ('some', 'arbitrary', 'metadata')
-        product_job = ProductJob(
-            product, ProductJobType.REVIEWER_NOTIFICATION, metadata)
-        self.assertEqual(product, product_job.product)
-        self.assertEqual(
-            ProductJobType.REVIEWER_NOTIFICATION, product_job.job_type)
-        expected_json_data = '["some", "arbitrary", "metadata"]'
-        self.assertEqual(expected_json_data, product_job._json_data)
-
-    def test_metadata(self):
-        # The python structure stored as json is returned as python.
-        product = self.factory.makeProduct()
-        metadata = {
-            'a_list': ('some', 'arbitrary', 'metadata'),
-            'a_number': 1,
-            'a_string': 'string',
-            }
-        product_job = ProductJob(
-            product, ProductJobType.REVIEWER_NOTIFICATION, metadata)
-        metadata['a_list'] = list(metadata['a_list'])
-        self.assertEqual(metadata, product_job.metadata)
-
-
-class IProductThingJob(IProductJob):
-    """An interface for testing derived job classes."""
-
-
-class IProductThingJobSource(IProductJobSource):
-    """An interface for testing derived job source classes."""
-
-
-class FakeProductJob(ProductJobDerived):
-    """A class that reuses other interfaces and types for testing."""
-    class_job_type = ProductJobType.REVIEWER_NOTIFICATION
-    implements(IProductThingJob)
-    classProvides(IProductThingJobSource)
-
-
-class OtherFakeProductJob(ProductJobDerived):
-    """A class that reuses other interfaces and types for testing."""
-    class_job_type = ProductJobType.COMMERCIAL_EXPIRED
-    implements(IProductThingJob)
-    classProvides(IProductThingJobSource)
-
-
-class ProductJobDerivedTestCase(TestCaseWithFactory):
-    """Test case for the ProductJobDerived class."""
-
-    layer = DatabaseFunctionalLayer
-
-    def test_repr(self):
-        product = self.factory.makeProduct('fnord')
-        metadata = {'foo': 'bar'}
-        job = FakeProductJob.create(product, metadata)
-        self.assertEqual(
-            '<FakeProductJob for fnord status=Waiting>', repr(job))
-
-    def test_create_success(self):
-        # Create an instance of ProductJobDerived that delegates to
-        # ProductJob.
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        self.assertIs(True, IProductJobSource.providedBy(ProductJobDerived))
-        job = FakeProductJob.create(product, metadata)
-        self.assertIsInstance(job, ProductJobDerived)
-        self.assertIs(True, IProductJob.providedBy(job))
-        self.assertIs(True, IProductJob.providedBy(job.context))
-
-    def test_create_raises_error(self):
-        # ProductJobDerived.create() raises an error because it
-        # needs to be subclassed to work properly.
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        self.assertRaises(
-            AttributeError, ProductJobDerived.create, product, metadata)
-
-    def test_iterReady(self):
-        # iterReady finds job in the READY status that are of the same type.
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        job_1 = FakeProductJob.create(product, metadata)
-        job_2 = FakeProductJob.create(product, metadata)
-        job_2.start()
-        OtherFakeProductJob.create(product, metadata)
-        jobs = list(FakeProductJob.iterReady())
-        self.assertEqual(1, len(jobs))
-        self.assertEqual(job_1, jobs[0])
-
-    def test_find_product(self):
-        # Find all the jobs for a product regardless of date or job type.
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        job_1 = FakeProductJob.create(product, metadata)
-        job_2 = OtherFakeProductJob.create(product, metadata)
-        FakeProductJob.create(self.factory.makeProduct(), metadata)
-        jobs = list(ProductJobDerived.find(product=product))
-        self.assertEqual(2, len(jobs))
-        self.assertContentEqual([job_1.id, job_2.id], [job.id for job in jobs])
-
-    def test_find_job_type(self):
-        # Find all the jobs for a product and job_type regardless of date.
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        job_1 = FakeProductJob.create(product, metadata)
-        job_2 = FakeProductJob.create(product, metadata)
-        OtherFakeProductJob.create(product, metadata)
-        jobs = list(ProductJobDerived.find(
-            product, job_type=ProductJobType.REVIEWER_NOTIFICATION))
-        self.assertEqual(2, len(jobs))
-        self.assertContentEqual([job_1.id, job_2.id], [job.id for job in jobs])
-
-    def test_find_date_since(self):
-        # Find all the jobs for a product since a date regardless of job_type.
-        now = datetime.now(pytz.utc)
-        seven_days_ago = now - timedelta(7)
-        thirty_days_ago = now - timedelta(30)
-        product = self.factory.makeProduct()
-        metadata = {'foo': 'bar'}
-        job_1 = FakeProductJob.create(product, metadata)
-        removeSecurityProxy(job_1.job).date_created = thirty_days_ago
-        job_2 = FakeProductJob.create(product, metadata)
-        removeSecurityProxy(job_2.job).date_created = seven_days_ago
-        job_3 = OtherFakeProductJob.create(product, metadata)
-        removeSecurityProxy(job_3.job).date_created = now
-        jobs = list(ProductJobDerived.find(product, date_since=seven_days_ago))
-        self.assertEqual(2, len(jobs))
-        self.assertContentEqual([job_2.id, job_3.id], [job.id for job in jobs])
-
-    def test_log_name(self):
-        # The log_name is the name of the implementing class.
-        product = self.factory.makeProduct('fnord')
-        metadata = {'foo': 'bar'}
-        job = FakeProductJob.create(product, metadata)
-        self.assertEqual('FakeProductJob', job.log_name)
-
-    def test_getOopsVars(self):
-        # The project name is added to the oops vars.
-        product = self.factory.makeProduct('fnord')
-        metadata = {'foo': 'bar'}
-        job = FakeProductJob.create(product, metadata)
-        oops_vars = job.getOopsVars()
-        self.assertIs(True, len(oops_vars) > 1)
-        self.assertIn(('product', product.name), oops_vars)
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/registry/tests/test_subscribers.py'
--- lib/lp/registry/tests/test_subscribers.py	2012-03-29 14:36:36 +0000
+++ lib/lp/registry/tests/test_subscribers.py	2012-03-22 23:21:24 +0000
@@ -1,524 +1,260 @@
-<<<<<<< TREE
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test subscruber classes and functions."""
-
-__metaclass__ = type
-
-from datetime import datetime
-
-from lazr.lifecycle.event import ObjectModifiedEvent
-import pytz
-from zope.security.proxy import removeSecurityProxy
-
-from lp.registry.interfaces.product import License
-from lp.registry.subscribers import (
-    LicenseNotification,
-    product_licenses_modified,
-    )
-from lp.services.webapp.publisher import get_current_browser_request
-from lp.testing import (
-    login_person,
-    logout,
-    TestCaseWithFactory,
-    )
-from lp.testing.layers import DatabaseFunctionalLayer
-from lp.testing.mail_helpers import pop_notifications
-
-
-class ProductLicensesModifiedTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def make_product_event(self, licenses, edited_fields='licenses'):
-        product = self.factory.makeProduct(licenses=licenses)
-        pop_notifications()
-        login_person(product.owner)
-        event = ObjectModifiedEvent(
-            product, product, edited_fields, user=product.owner)
-        return product, event
-
-    def test_product_licenses_modified_licenses_not_edited(self):
-        product, event = self.make_product_event(
-            [License.OTHER_PROPRIETARY], edited_fields='_owner')
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(0, len(notifications))
-
-    def test_product_licenses_modified_licenses_common_license(self):
-        product, event = self.make_product_event([License.MIT])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(0, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_proprietary(self):
-        product, event = self.make_product_event([License.OTHER_PROPRIETARY])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_open_source(self):
-        product, event = self.make_product_event([License.OTHER_OPEN_SOURCE])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_dont_know(self):
-        product, event = self.make_product_event([License.DONT_KNOW])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-
-class LicenseNotificationTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def make_product_user(self, licenses):
-        # Setup an a view that implements ProductLicenseMixin.
-        super(LicenseNotificationTestCase, self).setUp()
-        user = self.factory.makePerson(
-            name='registrant', email='[e-mail]')
-        login_person(user)
-        product = self.factory.makeProduct(
-            name='ball', owner=user, licenses=licenses)
-        pop_notifications()
-        return product, user
-
-    def verify_whiteboard(self, product):
-        # Verify that the review whiteboard was updated.
-        naked_product = removeSecurityProxy(product)
-        entries = naked_product.reviewer_whiteboard.split('\n')
-        whiteboard, stamp = entries[-1].rsplit(' ', 1)
-        self.assertEqual(
-            'User notified of license policy on', whiteboard)
-
-    def verify_user_email(self, notification):
-        # Verify that the user was sent an email about the license change.
-        self.assertEqual(
-            'License information for ball in Launchpad',
-            notification['Subject'])
-        self.assertEqual(
-            'Registrant <[e-mail]>',
-            notification['To'])
-        self.assertEqual(
-            'Commercial <[e-mail]>',
-            notification['Reply-To'])
-
-    def test_send_known_license(self):
-        # A known license does not generate an email.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(False, result)
-        self.assertEqual(0, len(pop_notifications()))
-
-    def test_send_other_dont_know(self):
-        # An Other/I don't know license sends one email.
-        product, user = self.make_product_user([License.DONT_KNOW])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_send_other_open_source(self):
-        # An Other/Open Source license sends one email.
-        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_send_other_proprietary(self):
-        # An Other/Proprietary license sends one email.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_display_no_request(self):
-        # If there is no request, there is no reason to show a message in
-        # the browser.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        logout()
-        result = notification.display()
-        self.assertIs(False, result)
-
-    def test_display_no_message(self):
-        # A notification is not added if there is no message to show.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        self.assertEqual('', notification.getCommercialUseMessage())
-        self.assertIs(False, result)
-
-    def test_display_has_message(self):
-        # A notification is added if there is a message to show.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        message = notification.getCommercialUseMessage()
-        self.assertIs(True, result)
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-        self.assertIn(message, request.response.notifications[0].message)
-        self.assertIn(
-            '<a href="https://help.launchpad.net/CommercialHosting">',
-            request.response.notifications[0].message)
-
-    def test_display_escapee_user_data(self):
-        # A notification is added if there is a message to show.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        product.displayname = '<b>Look</b>'
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        self.assertIs(True, result)
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-        self.assertIn(
-            '&lt;b&gt;Look&lt;/b&gt;',
-            request.response.notifications[0].message)
-
-    def test_formatDate(self):
-        # Verify the date format.
-        now = datetime(2005, 6, 15, 0, 0, 0, 0, pytz.UTC)
-        result = LicenseNotification._formatDate(now)
-        self.assertEqual('2005-06-15', result)
-
-    def test_getTemplateName_other_dont_know(self):
-        product, user = self.make_product_user([License.DONT_KNOW])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-dont-know.txt',
-            notification.getTemplateName())
-
-    def test_getTemplateName_propietary(self):
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-other-proprietary.txt',
-            notification.getTemplateName())
-
-    def test_getTemplateName_other_open_source(self):
-        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-other-open-source.txt',
-            notification.getTemplateName())
-
-    def test_getCommercialUseMessage_without_commercial_subscription(self):
-        product, user = self.make_product_user([License.MIT])
-        notification = LicenseNotification(product, user)
-        self.assertEqual('', notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_complimentary_cs(self):
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's complimentary commercial subscription expires on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_commercial_subscription(self):
-        product, user = self.make_product_user([License.MIT])
-        self.factory.makeCommercialSubscription(product)
-        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's commercial subscription expires on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_expired_cs(self):
-        product, user = self.make_product_user([License.MIT])
-        self.factory.makeCommercialSubscription(product, expired=True)
-        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's commercial subscription expired on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-=======
-# Copyright 2012 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test subscruber classes and functions."""
-
-__metaclass__ = type
-
-from datetime import datetime
-
-import pytz
-
-from zope.security.proxy import removeSecurityProxy
-from lazr.lifecycle.event import ObjectModifiedEvent
-
-from lp.registry.interfaces.product import License
-from lp.registry.subscribers import (
-    LicenseNotification,
-    product_licenses_modified,
-    )
-from lp.services.webapp.publisher import get_current_browser_request
-from lp.testing import (
-    login_person,
-    logout,
-    TestCaseWithFactory,
-    )
-from lp.testing.layers import DatabaseFunctionalLayer
-from lp.testing.mail_helpers import pop_notifications
-
-
-class ProductLicensesModifiedTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def make_product_event(self, licenses, edited_fields='licenses'):
-        product = self.factory.makeProduct(licenses=licenses)
-        pop_notifications()
-        login_person(product.owner)
-        event = ObjectModifiedEvent(
-            product, product, edited_fields, user=product.owner)
-        return product, event
-
-    def test_product_licenses_modified_licenses_not_edited(self):
-        product, event = self.make_product_event(
-            [License.OTHER_PROPRIETARY], edited_fields='_owner')
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(0, len(notifications))
-
-    def test_product_licenses_modified_licenses_common_license(self):
-        product, event = self.make_product_event([License.MIT])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(0, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_proprietary(self):
-        product, event = self.make_product_event([License.OTHER_PROPRIETARY])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_open_source(self):
-        product, event = self.make_product_event([License.OTHER_OPEN_SOURCE])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-    def test_product_licenses_modified_licenses_other_dont_know(self):
-        product, event = self.make_product_event([License.DONT_KNOW])
-        product_licenses_modified(product, event)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        request = get_current_browser_request()
-        self.assertEqual(0, len(request.response.notifications))
-
-
-class LicenseNotificationTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def make_product_user(self, licenses):
-        # Setup an a view that implements ProductLicenseMixin.
-        super(LicenseNotificationTestCase, self).setUp()
-        user = self.factory.makePerson(
-            name='registrant', email='[e-mail]')
-        login_person(user)
-        product = self.factory.makeProduct(
-            name='ball', owner=user, licenses=licenses)
-        pop_notifications()
-        return product, user
-
-    def verify_whiteboard(self, product):
-        # Verify that the review whiteboard was updated.
-        naked_product = removeSecurityProxy(product)
-        entries = naked_product.reviewer_whiteboard.split('\n')
-        whiteboard, stamp = entries[-1].rsplit(' ', 1)
-        self.assertEqual(
-            'User notified of license policy on', whiteboard)
-
-    def verify_user_email(self, notification):
-        # Verify that the user was sent an email about the license change.
-        self.assertEqual(
-            'License information for ball in Launchpad',
-            notification['Subject'])
-        self.assertEqual(
-            'Registrant <[e-mail]>',
-            notification['To'])
-        self.assertEqual(
-            'Commercial <[e-mail]>',
-            notification['Reply-To'])
-
-    def test_send_known_license(self):
-        # A known license does not generate an email.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(False, result)
-        self.assertEqual(0, len(pop_notifications()))
-
-    def test_send_other_dont_know(self):
-        # An Other/I don't know license sends one email.
-        product, user = self.make_product_user([License.DONT_KNOW])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_send_other_open_source(self):
-        # An Other/Open Source license sends one email.
-        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_send_other_proprietary(self):
-        # An Other/Proprietary license sends one email.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        result = notification.send()
-        self.assertIs(True, result)
-        self.verify_whiteboard(product)
-        notifications = pop_notifications()
-        self.assertEqual(1, len(notifications))
-        self.verify_user_email(notifications.pop())
-
-    def test_display_no_request(self):
-        # If there is no request, there is no reason to show a message in
-        # the browser.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        logout()
-        result = notification.display()
-        self.assertIs(False, result)
-
-    def test_display_no_message(self):
-        # A notification is not added if there is no message to show.
-        product, user = self.make_product_user([License.GNU_GPL_V2])
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        self.assertEqual('', notification.getCommercialUseMessage())
-        self.assertIs(False, result)
-
-    def test_display_has_message(self):
-        # A notification is added if there is a message to show.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        message = notification.getCommercialUseMessage()
-        self.assertIs(True, result)
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-        self.assertIn(message, request.response.notifications[0].message)
-        self.assertIn(
-            '<a href="https://help.launchpad.net/CommercialHosting">',
-            request.response.notifications[0].message)
-
-    def test_display_escapee_user_data(self):
-        # A notification is added if there is a message to show.
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        product.displayname = '<b>Look</b>'
-        notification = LicenseNotification(product, user)
-        result = notification.display()
-        self.assertIs(True, result)
-        request = get_current_browser_request()
-        self.assertEqual(1, len(request.response.notifications))
-        self.assertIn(
-            '&lt;b&gt;Look&lt;/b&gt;',
-            request.response.notifications[0].message)
-
-    def test_formatDate(self):
-        # Verify the date format.
-        now = datetime(2005, 6, 15, 0, 0, 0, 0, pytz.UTC)
-        result = LicenseNotification._formatDate(now)
-        self.assertEqual('2005-06-15', result)
-
-    def test_getTemplateName_other_dont_know(self):
-        product, user = self.make_product_user([License.DONT_KNOW])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-dont-know.txt',
-            notification.getTemplateName())
-
-    def test_getTemplateName_propietary(self):
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-other-proprietary.txt',
-            notification.getTemplateName())
-
-    def test_getTemplateName_other_open_source(self):
-        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
-        notification = LicenseNotification(product, user)
-        self.assertEqual(
-            'product-license-other-open-source.txt',
-            notification.getTemplateName())
-
-    def test_getCommercialUseMessage_without_commercial_subscription(self):
-        product, user = self.make_product_user([License.MIT])
-        notification = LicenseNotification(product, user)
-        self.assertEqual('', notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_complimentary_cs(self):
-        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's complimentary commercial subscription expires on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_commercial_subscription(self):
-        product, user = self.make_product_user([License.MIT])
-        self.factory.makeCommercialSubscription(product)
-        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's commercial subscription expires on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-
-    def test_getCommercialUseMessage_with_expired_cs(self):
-        product, user = self.make_product_user([License.MIT])
-        self.factory.makeCommercialSubscription(product, expired=True)
-        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
-        notification = LicenseNotification(product, user)
-        message = (
-            "Ball's commercial subscription expired on %s." %
-            product.commercial_subscription.date_expires.date().isoformat())
-        self.assertEqual(message, notification.getCommercialUseMessage())
-        self.assertEqual(message, notification.getCommercialUseMessage())
->>>>>>> MERGE-SOURCE
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test subscruber classes and functions."""
+
+__metaclass__ = type
+
+from datetime import datetime
+
+from lazr.lifecycle.event import ObjectModifiedEvent
+import pytz
+from zope.security.proxy import removeSecurityProxy
+
+from lp.registry.interfaces.product import License
+from lp.registry.subscribers import (
+    LicenseNotification,
+    product_licenses_modified,
+    )
+from lp.services.webapp.publisher import get_current_browser_request
+from lp.testing import (
+    login_person,
+    logout,
+    TestCaseWithFactory,
+    )
+from lp.testing.layers import DatabaseFunctionalLayer
+from lp.testing.mail_helpers import pop_notifications
+
+
+class ProductLicensesModifiedTestCase(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def make_product_event(self, licenses, edited_fields='licenses'):
+        product = self.factory.makeProduct(licenses=licenses)
+        pop_notifications()
+        login_person(product.owner)
+        event = ObjectModifiedEvent(
+            product, product, edited_fields, user=product.owner)
+        return product, event
+
+    def test_product_licenses_modified_licenses_not_edited(self):
+        product, event = self.make_product_event(
+            [License.OTHER_PROPRIETARY], edited_fields='_owner')
+        product_licenses_modified(product, event)
+        notifications = pop_notifications()
+        self.assertEqual(0, len(notifications))
+
+    def test_product_licenses_modified_licenses_common_license(self):
+        product, event = self.make_product_event([License.MIT])
+        product_licenses_modified(product, event)
+        notifications = pop_notifications()
+        self.assertEqual(0, len(notifications))
+        request = get_current_browser_request()
+        self.assertEqual(0, len(request.response.notifications))
+
+    def test_product_licenses_modified_licenses_other_proprietary(self):
+        product, event = self.make_product_event([License.OTHER_PROPRIETARY])
+        product_licenses_modified(product, event)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        request = get_current_browser_request()
+        self.assertEqual(1, len(request.response.notifications))
+
+    def test_product_licenses_modified_licenses_other_open_source(self):
+        product, event = self.make_product_event([License.OTHER_OPEN_SOURCE])
+        product_licenses_modified(product, event)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        request = get_current_browser_request()
+        self.assertEqual(0, len(request.response.notifications))
+
+    def test_product_licenses_modified_licenses_other_dont_know(self):
+        product, event = self.make_product_event([License.DONT_KNOW])
+        product_licenses_modified(product, event)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        request = get_current_browser_request()
+        self.assertEqual(0, len(request.response.notifications))
+
+
+class LicenseNotificationTestCase(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def make_product_user(self, licenses):
+        # Setup an a view that implements ProductLicenseMixin.
+        super(LicenseNotificationTestCase, self).setUp()
+        user = self.factory.makePerson(
+            name='registrant', email='[e-mail]')
+        login_person(user)
+        product = self.factory.makeProduct(
+            name='ball', owner=user, licenses=licenses)
+        pop_notifications()
+        return product, user
+
+    def verify_whiteboard(self, product):
+        # Verify that the review whiteboard was updated.
+        naked_product = removeSecurityProxy(product)
+        entries = naked_product.reviewer_whiteboard.split('\n')
+        whiteboard, stamp = entries[-1].rsplit(' ', 1)
+        self.assertEqual(
+            'User notified of license policy on', whiteboard)
+
+    def verify_user_email(self, notification):
+        # Verify that the user was sent an email about the license change.
+        self.assertEqual(
+            'License information for ball in Launchpad',
+            notification['Subject'])
+        self.assertEqual(
+            'Registrant <[e-mail]>',
+            notification['To'])
+        self.assertEqual(
+            'Commercial <[e-mail]>',
+            notification['Reply-To'])
+
+    def test_send_known_license(self):
+        # A known license does not generate an email.
+        product, user = self.make_product_user([License.GNU_GPL_V2])
+        notification = LicenseNotification(product, user)
+        result = notification.send()
+        self.assertIs(False, result)
+        self.assertEqual(0, len(pop_notifications()))
+
+    def test_send_other_dont_know(self):
+        # An Other/I don't know license sends one email.
+        product, user = self.make_product_user([License.DONT_KNOW])
+        notification = LicenseNotification(product, user)
+        result = notification.send()
+        self.assertIs(True, result)
+        self.verify_whiteboard(product)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        self.verify_user_email(notifications.pop())
+
+    def test_send_other_open_source(self):
+        # An Other/Open Source license sends one email.
+        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
+        notification = LicenseNotification(product, user)
+        result = notification.send()
+        self.assertIs(True, result)
+        self.verify_whiteboard(product)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        self.verify_user_email(notifications.pop())
+
+    def test_send_other_proprietary(self):
+        # An Other/Proprietary license sends one email.
+        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
+        notification = LicenseNotification(product, user)
+        result = notification.send()
+        self.assertIs(True, result)
+        self.verify_whiteboard(product)
+        notifications = pop_notifications()
+        self.assertEqual(1, len(notifications))
+        self.verify_user_email(notifications.pop())
+
+    def test_display_no_request(self):
+        # If there is no request, there is no reason to show a message in
+        # the browser.
+        product, user = self.make_product_user([License.GNU_GPL_V2])
+        notification = LicenseNotification(product, user)
+        logout()
+        result = notification.display()
+        self.assertIs(False, result)
+
+    def test_display_no_message(self):
+        # A notification is not added if there is no message to show.
+        product, user = self.make_product_user([License.GNU_GPL_V2])
+        notification = LicenseNotification(product, user)
+        result = notification.display()
+        self.assertEqual('', notification.getCommercialUseMessage())
+        self.assertIs(False, result)
+
+    def test_display_has_message(self):
+        # A notification is added if there is a message to show.
+        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
+        notification = LicenseNotification(product, user)
+        result = notification.display()
+        message = notification.getCommercialUseMessage()
+        self.assertIs(True, result)
+        request = get_current_browser_request()
+        self.assertEqual(1, len(request.response.notifications))
+        self.assertIn(message, request.response.notifications[0].message)
+        self.assertIn(
+            '<a href="https://help.launchpad.net/CommercialHosting">',
+            request.response.notifications[0].message)
+
+    def test_display_escapee_user_data(self):
+        # A notification is added if there is a message to show.
+        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
+        product.displayname = '<b>Look</b>'
+        notification = LicenseNotification(product, user)
+        result = notification.display()
+        self.assertIs(True, result)
+        request = get_current_browser_request()
+        self.assertEqual(1, len(request.response.notifications))
+        self.assertIn(
+            '&lt;b&gt;Look&lt;/b&gt;',
+            request.response.notifications[0].message)
+
+    def test_formatDate(self):
+        # Verify the date format.
+        now = datetime(2005, 6, 15, 0, 0, 0, 0, pytz.UTC)
+        result = LicenseNotification._formatDate(now)
+        self.assertEqual('2005-06-15', result)
+
+    def test_getTemplateName_other_dont_know(self):
+        product, user = self.make_product_user([License.DONT_KNOW])
+        notification = LicenseNotification(product, user)
+        self.assertEqual(
+            'product-license-dont-know.txt',
+            notification.getTemplateName())
+
+    def test_getTemplateName_propietary(self):
+        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
+        notification = LicenseNotification(product, user)
+        self.assertEqual(
+            'product-license-other-proprietary.txt',
+            notification.getTemplateName())
+
+    def test_getTemplateName_other_open_source(self):
+        product, user = self.make_product_user([License.OTHER_OPEN_SOURCE])
+        notification = LicenseNotification(product, user)
+        self.assertEqual(
+            'product-license-other-open-source.txt',
+            notification.getTemplateName())
+
+    def test_getCommercialUseMessage_without_commercial_subscription(self):
+        product, user = self.make_product_user([License.MIT])
+        notification = LicenseNotification(product, user)
+        self.assertEqual('', notification.getCommercialUseMessage())
+
+    def test_getCommercialUseMessage_with_complimentary_cs(self):
+        product, user = self.make_product_user([License.OTHER_PROPRIETARY])
+        notification = LicenseNotification(product, user)
+        message = (
+            "Ball's complimentary commercial subscription expires on %s." %
+            product.commercial_subscription.date_expires.date().isoformat())
+        self.assertEqual(message, notification.getCommercialUseMessage())
+
+    def test_getCommercialUseMessage_with_commercial_subscription(self):
+        product, user = self.make_product_user([License.MIT])
+        self.factory.makeCommercialSubscription(product)
+        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
+        notification = LicenseNotification(product, user)
+        message = (
+            "Ball's commercial subscription expires on %s." %
+            product.commercial_subscription.date_expires.date().isoformat())
+        self.assertEqual(message, notification.getCommercialUseMessage())
+
+    def test_getCommercialUseMessage_with_expired_cs(self):
+        product, user = self.make_product_user([License.MIT])
+        self.factory.makeCommercialSubscription(product, expired=True)
+        product.licenses = [License.MIT, License.OTHER_PROPRIETARY]
+        notification = LicenseNotification(product, user)
+        message = (
+            "Ball's commercial subscription expired on %s." %
+            product.commercial_subscription.date_expires.date().isoformat())
+        self.assertEqual(message, notification.getCommercialUseMessage())
+        self.assertEqual(message, notification.getCommercialUseMessage())

=== modified file 'lib/lp/scripts/garbo.py'
--- lib/lp/scripts/garbo.py	2012-03-29 14:36:36 +0000
+++ lib/lp/scripts/garbo.py	2012-03-26 22:47:47 +0000
@@ -81,7 +81,6 @@
 from lp.services.librarian.model import TimeLimitedToken
 from lp.services.log.logger import PrefixFilter
 from lp.services.looptuner import TunableLoop
-from lp.services.memcache.interfaces import IMemcacheClient
 from lp.services.oauth.model import OAuthNonce
 from lp.services.openid.model.openidconsumer import OpenIDConsumerNonce
 from lp.services.propertycache import cachedproperty
@@ -1092,43 +1091,6 @@
         self.offset += chunk_size
 
 
-<<<<<<< TREE
-=======
-class BugLegacyAccessMirrorer(TunableLoop):
-    """A `TunableLoop` to populate the access policy schema for all bugs."""
-
-    maximum_chunk_size = 5000
-
-    def __init__(self, log, abort_time=None):
-        super(BugLegacyAccessMirrorer, self).__init__(log, abort_time)
-        watermark = getUtility(IMemcacheClient).get(
-            '%s:bug-legacy-access-mirrorer' % config.instance_name)
-        self.start_at = watermark or 0
-
-    def findBugIDs(self):
-        return IMasterStore(Bug).find(
-            (Bug.id,), Bug.id >= self.start_at).order_by(Bug.id)
-
-    def isDone(self):
-        return self.findBugIDs().is_empty()
-
-    def __call__(self, chunk_size):
-        ids = [row[0] for row in self.findBugIDs()[:chunk_size]]
-        list(IMasterStore(Bug).using(Bug).find(
-            SQL('bug_mirror_legacy_access(Bug.id)'),
-            Bug.id.is_in(ids)))
-
-        self.start_at = ids[-1] + 1
-        result = getUtility(IMemcacheClient).set(
-            '%s:bug-legacy-access-mirrorer' % config.instance_name,
-            self.start_at)
-        if not result:
-            self.log.warning('Failed to set start_at in memcache.')
-
-        transaction.commit()
-
-
->>>>>>> MERGE-SOURCE
 class BaseDatabaseGarbageCollector(LaunchpadCronScript):
     """Abstract base class to run a collection of TunableLoops."""
     script_name = None  # Script name for locking and database user. Override.
@@ -1380,10 +1342,6 @@
         UnusedSessionPruner,
         DuplicateSessionPruner,
         BugHeatUpdater,
-<<<<<<< TREE
-=======
-        BugLegacyAccessMirrorer,
->>>>>>> MERGE-SOURCE
         ]
     experimental_tunable_loops = []
 

=== modified file 'lib/lp/scripts/tests/test_garbo.py'
--- lib/lp/scripts/tests/test_garbo.py	2012-03-29 14:36:36 +0000
+++ lib/lp/scripts/tests/test_garbo.py	2012-03-26 22:47:47 +0000
@@ -54,10 +54,6 @@
     )
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportresult import CodeImportResult
-<<<<<<< TREE
-=======
-from lp.registry.interfaces.accesspolicy import IAccessArtifactSource
->>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.scripts.garbo import (
@@ -1108,29 +1104,6 @@
         self.assertEqual(whiteboard, spec.whiteboard)
         self.assertEqual(0, spec.work_items.count())
 
-<<<<<<< TREE
-=======
-    def test_BugLegacyAccessMirrorer(self):
-        # Private bugs without corresponding data in the access policy
-        # schema get mirrored.
-        switch_dbuser('testadmin')
-        bug = self.factory.makeBug(private=True)
-        # Remove the existing mirrored data.
-        getUtility(IAccessArtifactSource).delete([bug])
-        transaction.commit()
-        self.runHourly()
-        # Check that there's an artifact again, and delete it.
-        switch_dbuser('testadmin')
-        [artifact] = getUtility(IAccessArtifactSource).find([bug])
-        getUtility(IAccessArtifactSource).delete([bug])
-        transaction.commit()
-        self.runHourly()
-        # A watermark is kept in memcache, so a second run doesn't
-        # consider the same bug.
-        self.assertContentEqual(
-            [], getUtility(IAccessArtifactSource).find([bug]))
-
->>>>>>> MERGE-SOURCE
 
 class TestGarboTasks(TestCaseWithFactory):
     layer = LaunchpadZopelessLayer

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2012-03-29 14:36:36 +0000
+++ lib/lp/services/features/flags.py	2012-03-26 21:23:40 +0000
@@ -290,7 +290,6 @@
     ('disclosure.enhanced_sharing.enabled',
      'boolean',
      ('If true, will allow the use of the new sharing view and apis used '
-<<<<<<< TREE
       'for the new disclosure data model to view but not write data.'),
      '',
      'Sharing overview',
@@ -308,18 +307,6 @@
       'to edit the new disclosure data model.'),
      '',
      'Sharing management',
-=======
-      'for the new disclosure data model to view but not write data.'),
-     '',
-     'Sharing overview',
-     ''),
-    ('disclosure.enhanced_sharing.writable',
-     'boolean',
-     ('If true, will allow the use of the new sharing view and apis used '
-      'to edit the new disclosure data model.'),
-     '',
-     'Sharing management',
->>>>>>> MERGE-SOURCE
      ''),
     ('garbo.workitem_migrator.enabled',
      'boolean',

=== added file 'lib/lp/services/job/celeryconfig.py'
--- lib/lp/services/job/celeryconfig.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/job/celeryconfig.py	2012-03-29 14:36:38 +0000
@@ -0,0 +1,4 @@
+from lp.services.config import config
+BROKER_URL = "amqplib://%s" % config.rabbitmq.host
+CELERY_IMPORTS = ("lp.services.job.celeryjob", )
+CELERY_RESULT_BACKEND = "amqp"

=== added file 'lib/lp/services/job/celeryjob.py'
--- lib/lp/services/job/celeryjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/job/celeryjob.py	2012-03-29 14:36:38 +0000
@@ -0,0 +1,30 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Celery-specific Job code.
+
+Because celery sets up configuration at import time, code that is not designed
+to use Celery may break if this is used.
+"""
+
+__metaclass__ = type
+
+__all__ = ['CeleryRunJob']
+
+import os
+
+os.environ.setdefault('CELERY_CONFIG_MODULE', 'lp.services.job.celeryconfig')
+from lazr.jobrunner.celerytask import RunJob
+
+from lp.services.job.model.job import UniversalJobSource
+from lp.services.job.runner import BaseJobRunner
+
+
+class CeleryRunJob(RunJob):
+    """The Celery Task that runs a job."""
+
+    job_source = UniversalJobSource
+
+    def getJobRunner(self):
+        """Return a BaseJobRunner, to support customization."""
+        return BaseJobRunner()

=== modified file 'lib/lp/services/job/interfaces/job.py'
--- lib/lp/services/job/interfaces/job.py	2012-02-24 21:46:11 +0000
+++ lib/lp/services/job/interfaces/job.py	2012-03-29 14:36:38 +0000
@@ -13,7 +13,6 @@
     'IRunnableJob',
     'ITwistedJobSource',
     'JobStatus',
-    'LeaseHeld',
     ]
 
 
@@ -38,13 +37,6 @@
 from lp.registry.interfaces.person import IPerson
 
 
-class LeaseHeld(Exception):
-    """Raised when attempting to acquire a list that is already held."""
-
-    def __init__(self):
-        Exception.__init__(self, 'Lease is already held.')
-
-
 class JobStatus(DBEnumeratedType):
     """Values that ICodeImportJob.state can take."""
 

=== modified file 'lib/lp/services/job/model/job.py'
--- lib/lp/services/job/model/job.py	2012-03-14 16:32:59 +0000
+++ lib/lp/services/job/model/job.py	2012-03-29 14:36:38 +0000
@@ -4,13 +4,21 @@
 """ORM object representing jobs."""
 
 __metaclass__ = type
-__all__ = ['InvalidTransition', 'Job', 'JobStatus']
+__all__ = [
+    'EnumeratedSubclass',
+    'InvalidTransition',
+    'Job',
+    'JobStatus',
+    'UniversalJobSource',
+    ]
 
 
 from calendar import timegm
 import datetime
 import time
 
+from lazr.jobrunner.jobrunner import LeaseHeld
+
 import pytz
 from sqlobject import (
     IntCol,
@@ -28,16 +36,18 @@
 import transaction
 from zope.interface import implements
 
+from lp.services.config import dbconfig
 from lp.services.database import bulk
 from lp.services.database.constants import UTC_NOW
 from lp.services.database.datetimecol import UtcDateTimeCol
 from lp.services.database.enumcol import EnumCol
+from lp.services.database.lpstorm import IStore
 from lp.services.database.sqlbase import SQLBase
 from lp.services.job.interfaces.job import (
     IJob,
     JobStatus,
-    LeaseHeld,
     )
+from lp.services import scripts
 
 
 UTC = pytz.timezone('UTC')
@@ -201,6 +211,29 @@
         self.lease_expires = None
 
 
+class EnumeratedSubclass(type):
+    """Metaclass for when subclasses are assigned enums."""
+
+    def __init__(cls, name, bases, dict_):
+        if getattr(cls, '_subclass', None) is None:
+            cls._subclass = {}
+        job_type = dict_.get('class_job_type')
+        if job_type is not None:
+            value = cls._subclass.setdefault(job_type, cls)
+            assert value is cls, (
+                '%s already registered to %s.' % (
+                    job_type.name, value.__name__))
+        # Perform any additional set-up requested by class.
+        cls._register_subclass(cls)
+
+    @staticmethod
+    def _register_subclass(cls):
+        pass
+
+    def makeSubclass(cls, job):
+        return cls._subclass[job.job_type](job)
+
+
 Job.ready_jobs = Select(
     Job.id,
     And(
@@ -208,3 +241,29 @@
         Or(Job.lease_expires == None, Job.lease_expires < UTC_NOW),
         Or(Job.scheduled_start == None, Job.scheduled_start <= UTC_NOW),
         ))
+
+
+class UniversalJobSource:
+    """Returns the RunnableJob associated with a Job.id.
+
+    Only BranchJobs are supported at present.
+    """
+
+    memory_limit = 2 * (1024 ** 3)
+
+    needs_init = True
+
+    @classmethod
+    def get(cls, job_id):
+        if cls.needs_init:
+            scripts.execute_zcml_for_scripts(use_web_security=False)
+            cls.needs_init = False
+
+        dbconfig.override(
+            dbuser='branchscanner', isolation_level='read_committed')
+        from lp.code.model.branchjob import (
+            BranchJob,
+            )
+        store = IStore(BranchJob)
+        branch_job = store.find(BranchJob, BranchJob.job == job_id).one()
+        return branch_job.makeDerived()

=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py	2012-03-22 11:58:42 +0000
+++ lib/lp/services/job/runner.py	2012-03-29 14:36:38 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'BaseJobRunner',
     'BaseRunnableJob',
     'BaseRunnableJobSource',
     'JobCronScript',
@@ -38,7 +39,10 @@
     pool,
     )
 from lazr.delegates import delegates
-from lazr.jobrunner.jobrunner import JobRunner as LazrJobRunner
+from lazr.jobrunner.jobrunner import (
+    JobRunner as LazrJobRunner,
+    LeaseHeld,
+    )
 import transaction
 from twisted.internet import reactor
 from twisted.internet.defer import (
@@ -61,7 +65,6 @@
 from lp.services.job.interfaces.job import (
     IJob,
     IRunnableJob,
-    LeaseHeld,
     )
 from lp.services.mail.sendmail import (
     MailController,

=== added file 'lib/lp/services/job/tests/celeryconfig.py'
--- lib/lp/services/job/tests/celeryconfig.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/job/tests/celeryconfig.py	2012-03-29 14:36:38 +0000
@@ -0,0 +1,7 @@
+import os
+BROKER_VHOST = "/"
+CELERY_RESULT_BACKEND = "amqp"
+CELERY_IMPORTS = ("lp.services.job.celeryjob", )
+CELERYD_LOG_LEVEL = 'INFO'
+CELERYD_CONCURRENCY = 1
+BROKER_URL = os.environ['BROKER_URL']

=== added file 'lib/lp/services/job/tests/test_celeryjob.py'
--- lib/lp/services/job/tests/test_celeryjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/job/tests/test_celeryjob.py	2012-03-29 14:36:38 +0000
@@ -0,0 +1,42 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+
+import os
+
+import transaction
+
+from lp.code.model.branchjob import BranchScanJob
+from lp.testing import TestCaseWithFactory
+from lp.testing.layers import ZopelessAppServerLayer
+
+
+class TestCelery(TestCaseWithFactory):
+
+    layer = ZopelessAppServerLayer
+
+    def test_run_scan_job(self):
+        """Running a job via Celery succeeds and emits expected output."""
+        # Delay importing anything that uses Celery until RabbitMQLayer is
+        # running, so that config.rabbitmq.host is defined when
+        # lp.services.job.celeryconfig is loaded.
+        from lp.services.job.celeryjob import CeleryRunJob
+        from celery.exceptions import TimeoutError
+        from lazr.jobrunner.tests.test_celerytask import running
+        cmd_args = ('--config', 'lp.services.job.tests.celeryconfig')
+        env = dict(os.environ)
+        env['BROKER_URL'] = CeleryRunJob.app.conf['BROKER_URL']
+        with running('bin/celeryd', cmd_args, env=env) as proc:
+            self.useBzrBranches()
+            db_branch, bzr_tree = self.create_branch_and_tree()
+            bzr_tree.commit(
+                'First commit', rev_id='rev1', committer='[e-mail]')
+            job = BranchScanJob.create(db_branch)
+            transaction.commit()
+            try:
+                CeleryRunJob.delay(job.job_id).wait(30)
+            except TimeoutError:
+                pass
+        self.assertIn(
+            'Updating branch scanner status: 1 revs', proc.stderr.read())
+        self.assertEqual(db_branch.revision_count, 1)

=== modified file 'lib/lp/services/job/tests/test_job.py'
--- lib/lp/services/job/tests/test_job.py	2011-12-30 06:14:56 +0000
+++ lib/lp/services/job/tests/test_job.py	2012-03-29 14:36:38 +0000
@@ -7,6 +7,7 @@
 import time
 
 import pytz
+from lazr.jobrunner.jobrunner import LeaseHeld
 from storm.locals import Store
 
 from lp.services.database.constants import UTC_NOW
@@ -18,7 +19,6 @@
 from lp.services.job.model.job import (
     InvalidTransition,
     Job,
-    LeaseHeld,
     )
 from lp.services.webapp.testing import verifyObject
 from lp.testing import (

=== modified file 'lib/lp/services/job/tests/test_runner.py'
--- lib/lp/services/job/tests/test_runner.py	2012-03-29 14:36:36 +0000
+++ lib/lp/services/job/tests/test_runner.py	2012-03-29 14:36:38 +0000
@@ -8,7 +8,10 @@
 from textwrap import dedent
 from time import sleep
 
-from lazr.jobrunner.jobrunner import SuspendJobException
+from lazr.jobrunner.jobrunner import (
+    LeaseHeld,
+    SuspendJobException,
+    )
 from testtools.matchers import MatchesRegex
 from testtools.testcase import ExpectedException
 import transaction
@@ -19,7 +22,6 @@
 from lp.services.job.interfaces.job import (
     IRunnableJob,
     JobStatus,
-    LeaseHeld,
     )
 from lp.services.job.model.job import Job
 from lp.services.job.runner import (
@@ -554,20 +556,11 @@
         self.assertEqual(expected_exception, (oops['type'], oops['value']))
         self.assertThat(logger.getLogBuffer(), MatchesRegex(
             dedent("""\
-<<<<<<< TREE
                 INFO Running through Twisted.
                 INFO Running <StuckJob.*?> \(ID .*?\).
                 INFO Running <StuckJob.*?> \(ID .*?\).
                 INFO Job resulted in OOPS: .*
             """)))
-=======
-                INFO Running through Twisted.
-                INFO Running StuckJob \(ID .*\).
-                INFO Running StuckJob \(ID .*\).
-                ERROR OOPS while executing job \d+: \['OOPS-.*\] %s\('%s',\)
-                INFO Job resulted in OOPS: .*
-            """ % (expected_exception))))
->>>>>>> MERGE-SOURCE
 
     def test_timeout_short(self):
         """When a job exceeds its lease, an exception is raised.
@@ -590,16 +583,10 @@
             logger.getLogBuffer(), MatchesRegex(
                 dedent("""\
                 INFO Running through Twisted.
-<<<<<<< TREE
-                INFO Running <ShorterStuckJob.*?> \(ID .*?\).
-                INFO Running <ShorterStuckJob.*?> \(ID .*?\).
-=======
-                INFO Running ShorterStuckJob \(ID .*\).
-                INFO Running ShorterStuckJob \(ID .*\).
-                ERROR OOPS while executing job \d+: \['OOPS-.*\] %s\('%s',\)
->>>>>>> MERGE-SOURCE
+                INFO Running <ShorterStuckJob.*?> \(ID .*?\).
+                INFO Running <ShorterStuckJob.*?> \(ID .*?\).
                 INFO Job resulted in OOPS: %s
-                """) % ('TimeoutError', 'Job ran too long.', oops['id'])))
+                """) % oops['id']))
         self.assertEqual(('TimeoutError', 'Job ran too long.'),
                          (oops['type'], oops['value']))
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-03-29 14:36:36 +0000
+++ lib/lp/testing/factory.py	2012-03-29 14:36:38 +0000
@@ -1407,7 +1407,7 @@
         # We just remove the security proxies to be able to change the objects
         # here.
         removeSecurityProxy(branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', 'rev1', None, None, None, celery_scan=False)
         naked_series = removeSecurityProxy(product.development_focus)
         naked_series.branch = branch
         return branch
@@ -1422,7 +1422,7 @@
         # We just remove the security proxies to be able to change the branch
         # here.
         removeSecurityProxy(branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', 'rev1', None, None, None, celery_scan=False)
         with person_logged_in(package.distribution.owner):
             package.development_version.setBranch(
                 PackagePublishingPocket.RELEASE, branch,
@@ -1628,7 +1628,7 @@
         if branch.branch_type not in (BranchType.REMOTE, BranchType.HOSTED):
             branch.startMirroring()
         removeSecurityProxy(branch).branchChanged(
-            '', parent.revision_id, None, None, None)
+            '', parent.revision_id, None, None, None, celery_scan=False)
         branch.updateScannedDetails(parent, sequence)
 
     def makeBranchRevision(self, branch, revision_id=None, sequence=None,

=== modified file 'lib/lp/testing/yuixhr.py'
--- lib/lp/testing/yuixhr.py	2012-03-29 14:36:36 +0000
+++ lib/lp/testing/yuixhr.py	2012-03-23 18:07:23 +0000
@@ -235,7 +235,6 @@
         <!DOCTYPE html>
         <html>
           <head>
-<<<<<<< TREE
             <title>Test</title>
             %(javascript_block)s
             <script type="text/javascript">
@@ -253,45 +252,6 @@
             <link rel="stylesheet" href="/+icing/rev%(revno)s/combo.css"/>
             <script type="text/javascript" src="%(test_module)s"></script>
           </head>
-=======
-          <title>Test</title>
-          <script type="text/javascript"
-            src="/+icing/rev%(revno)s/build/launchpad.js"></script>
-          <script type="text/javascript">
-              YUI.GlobalConfig = {
-                  fetchCSS: false,
-                  timeout: 50,
-                  ignore: [
-                      'yui2-yahoo', 'yui2-event', 'yui2-dom',
-                      'yui2-calendar','yui2-dom-event'
-                  ]
-              }
-          </script>
-          <link rel="stylesheet"
-            href="/+icing/yui/assets/skins/sam/skin.css"/>
-          <link rel="stylesheet" href="/+icing/rev%(revno)s/combo.css"/>
-          <style>
-          /* Taken and customized from testlogger.css */
-          .yui-console-entry-src { display:none; }
-          .yui-console-entry.yui-console-entry-pass .yui-console-entry-cat {
-            background-color: green;
-            font-weight: bold;
-            color: white;
-          }
-          .yui-console-entry.yui-console-entry-fail .yui-console-entry-cat {
-            background-color: red;
-            font-weight: bold;
-            color: white;
-          }
-          .yui-console-entry.yui-console-entry-ignore .yui-console-entry-cat {
-            background-color: #666;
-            font-weight: bold;
-            color: white;
-          }
-          </style>
-          <script type="text/javascript" src="%(test_module)s"></script>
-        </head>
->>>>>>> MERGE-SOURCE
         <body class="yui3-skin-sam">
           <div id="log"></div>
           <p>Want to re-run your test?</p>

=== modified file 'lib/lp/translations/model/translationsharingjob.py'
--- lib/lp/translations/model/translationsharingjob.py	2011-12-30 06:14:56 +0000
+++ lib/lp/translations/model/translationsharingjob.py	2012-03-29 14:36:38 +0000
@@ -31,7 +31,10 @@
     IJob,
     JobStatus,
     )
-from lp.services.job.model.job import Job
+from lp.services.job.model.job import (
+    EnumeratedSubclass,
+    Job,
+    )
 from lp.translations.interfaces.translationsharingjob import (
     ITranslationSharingJob,
     )
@@ -108,21 +111,13 @@
         self.potemplate = potemplate
 
 
-class RegisteredSubclass(type):
-    """Metaclass for when subclasses should be registered."""
-
-    def __init__(cls, name, bases, dict_):
-        cls._register_subclass(cls)
-
-
 class TranslationSharingJobDerived:
     """Base class for specialized TranslationTemplate Job types."""
 
-    __metaclass__ = RegisteredSubclass
+    __metaclass__ = EnumeratedSubclass
 
     delegates(ITranslationSharingJob, 'job')
 
-    _subclass = {}
     _event_types = {}
 
     @property
@@ -136,12 +131,6 @@
         # TranslationPackagingJob) need to be able to override it and call
         # into it, and there's no syntax to call a base class's version of a
         # classmethod with the subclass as the first parameter.
-        job_type = getattr(cls, 'class_job_type', None)
-        if job_type is not None:
-            value = cls._subclass.setdefault(job_type, cls)
-            assert value is cls, (
-                '%s already registered to %s.' % (
-                    job_type.name, value.__name__))
         event_type = getattr(cls, 'create_on_event', None)
         if event_type is not None:
             cls._event_types.setdefault(event_type, []).append(cls)
@@ -215,7 +204,7 @@
             TranslationSharingJob.job == Job.id,
             Job.id.is_in(Job.ready_jobs),
             *extra_clauses)
-        return (cls._subclass[job.job_type](job) for job in jobs)
+        return (cls.makeSubclass(job) for job in jobs)
 
     @classmethod
     def getNextJobStatus(cls, packaging):

=== modified file 'versions.cfg'
--- versions.cfg	2012-03-29 14:36:36 +0000
+++ versions.cfg	2012-03-27 17:29:47 +0000
@@ -42,11 +42,7 @@
 lazr.config = 1.1.3
 lazr.delegates = 1.2.0
 lazr.enum = 1.1.3
-<<<<<<< TREE
 lazr.jobrunner = 0.2
-=======
-lazr.jobrunner = 0.1
->>>>>>> MERGE-SOURCE
 lazr.lifecycle = 1.1
 lazr.restful = 0.19.6
 lazr.restfulclient = 0.12.0
@@ -87,12 +83,8 @@
 pymongo = 2.1.1
 pyOpenSSL = 0.10
 pystache = 0.3.1
-<<<<<<< TREE
 python-dateutil = 1.5
 python-memcached = 1.48
-=======
-python-memcached = 1.48
->>>>>>> MERGE-SOURCE
 # 2.2.1 with the one-liner Expect: 100-continue fix from
 # lp:~wgrant/python-openid/python-openid-2.2.1-fix676372.
 python-openid = 2.2.1-fix676372