Merge lp:~julian-edwards/launchpad/publish-copy-archives-bug-520520-publish-distro into lp:launchpad/db-devel

[Julian Edwards]

Add support for publishing of copy archives to the publish-distro script.

[Julian Edwards (julian-edwards)]

This is a simple branch that adds support for publishing of copy archives to
the publish-distro script.

It adds the option --copy-archive which will cause all archives with
ArchivePurpose.COPY to be published, provided their "publish" flag is set.

There's also a simple test case added.

=== modified file 'lib/canonical/launchpad/doc/product-update-remote-product.txt'
--- lib/canonical/launchpad/doc/product-update-remote-product.txt	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/doc/product-update-remote-product.txt	2010-02-24 10:59:32 +0000
@@ -17,12 +17,7 @@
     ...     FakeLogger, QuietFakeLogger)
     >>> from canonical.launchpad.scripts.updateremoteproduct import (
     ...     RemoteProductUpdater)
-    >>> class FakeTransaction:
-    ...     def __init__(self, log_calls=False):
-    ...         self.log_calls = log_calls
-    ...     def commit(self):
-    ...         if self.log_calls:
-    ...             print "COMMIT"
+    >>> from lp.testing.faketransaction import FakeTransaction
     >>> updater = RemoteProductUpdater(FakeTransaction(), QuietFakeLogger())
 
 

=== modified file 'lib/lp/bugs/doc/bugzilla-import.txt'
--- lib/lp/bugs/doc/bugzilla-import.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/doc/bugzilla-import.txt	2010-02-24 10:59:32 +0000
@@ -522,12 +522,8 @@
 The Bugzilla duplicate bugs table can be used to mark the
 corresponding Launchpad bugs as duplicates too:
 
-  >>> class FakeTransactionManager:
-  ...     def begin(self):
-  ...         pass
-  ...     abort = commit = begin
-  ...
-  >>> bz.processDuplicates(FakeTransactionManager())
+  >>> from lp.testing.faketransaction import FakeTransaction
+  >>> bz.processDuplicates(FakeTransaction())
 
 Now check that the bugs have been marked duplicate:
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker.txt'
--- lib/lp/bugs/doc/externalbugtracker.txt	2010-02-19 12:05:10 +0000
+++ lib/lp/bugs/doc/externalbugtracker.txt	2010-02-24 10:59:32 +0000
@@ -27,17 +27,9 @@
     ...         print "initializeRemoteBugDB() called: %r" % (
     ...             remote_bug_ids, )
 
-    >>> class FakeTransaction:
-    ...     """Transaction class to track transaction boundaries."""
-    ...     def commit(self):
-    ...         print "COMMIT"
-    ...     def abort(self):
-    ...         print "ABORT"
-    ...     def begin(self):
-    ...         print "BEGIN"
-
+    >>> from lp.testing.faketransaction import FakeTransaction
     >>> from lp.bugs.scripts.checkwatches import BugWatchUpdater
-    >>> bug_watch_updater = BugWatchUpdater(FakeTransaction())
+    >>> bug_watch_updater = BugWatchUpdater(FakeTransaction(log_calls=True))
     >>> bug_watch_updater.updateBugWatches(
     ...     InitializingExternalBugTracker(), [])
     COMMIT
@@ -305,7 +297,7 @@
 and the remote system is never asked about product information.
 
     >>> bug_watch_updater = BugWatchUpdater(
-    ...     FakeTransaction(), syncable_gnome_products=[])
+    ...     FakeTransaction(log_calls=True), syncable_gnome_products=[])
 
     >>> trackers_and_watches = get_trackers_and_watches(
     ...     gnome_bugzilla, bug_watches)
@@ -506,16 +498,12 @@
     ...     external_bugtracker, bug_watches)
     COMMIT
     initializeRemoteBugDB() called: [u'1', u'2', u'3', u'4']
-    BEGIN
     getRemoteStatus() called: u'1'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'2'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'3'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'4'
     COMMIT
 
@@ -549,14 +537,10 @@
     last_checked: 2007-03-17 15:...:...
     getModifiedRemoteBugs() called: [u'1', u'2', u'3', u'4']
     initializeRemoteBugDB() called: [u'1', u'4']
-    BEGIN
     getRemoteStatus() called: u'1'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'4'
     COMMIT
-    BEGIN
-    BEGIN
 
 The bug watches that are deemed as not being modified are still marked
 as being checked.
@@ -604,16 +588,12 @@
     last_checked: 2007-03-16 15:...:...
     getModifiedRemoteBugs() called: [u'1', u'4']
     initializeRemoteBugDB() called: [u'1', u'2', u'3', u'4']
-    BEGIN
     getRemoteStatus() called: u'1'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'2'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'3'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'4'
     COMMIT
 
@@ -631,16 +611,12 @@
     ...     TimeUnknownExternalBugTracker(), bug_watches)
     COMMIT
     initializeRemoteBugDB() called: [u'1', u'2', u'3', u'4']
-    BEGIN
     getRemoteStatus() called: u'1'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'2'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'3'
     COMMIT
-    BEGIN
     getRemoteStatus() called: u'4'
     COMMIT
 

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-02-24 10:18:16 +0000
+++ lib/lp/code/browser/branch.py	2010-02-24 10:59:32 +0000
@@ -514,10 +514,10 @@
 
     def iconForCodeImportResultStatus(self, status):
         """The icon to represent the `CodeImportResultStatus` `status`."""
-        if status in CodeImportResultStatus.successes:
+        if status == CodeImportResultStatus.SUCCESS_PARTIAL:
+            return "/@@/yes-gray"
+        elif status in CodeImportResultStatus.successes:
             return "/@@/yes"
-        elif status == CodeImportResultStatus.SUCCESS_PARTIAL:
-            return "/@@/yes-gray"
         else:
             return "/@@/no"
 

=== modified file 'lib/lp/code/doc/xmlrpc-branch-puller.txt'
--- lib/lp/code/doc/xmlrpc-branch-puller.txt	2009-10-22 11:55:51 +0000
+++ lib/lp/code/doc/xmlrpc-branch-puller.txt	2010-02-24 10:59:32 +0000
@@ -28,19 +28,4 @@
     True
 
 The IBranchPuller interface defines some methods, for which see the unit
-tests.  To allow a minimal test here, we call getBranchPullQueue,
-which will return an empty list.
-
-    >>> from lp.code.enums import BranchType
-    >>> branch_puller.getBranchPullQueue(BranchType.HOSTED.name)
-    []
-
-This remains true when it is accessed over XMLRPC.
-
-    >>> import xmlrpclib
-    >>> from canonical.functional import XMLRPCTestTransport
-    >>> puller = xmlrpclib.ServerProxy(
-    ...     'http://xmlrpc-private.launchpad.dev:8087/branch_puller',
-    ...     transport=XMLRPCTestTransport())
-    >>> puller.getBranchPullQueue(BranchType.HOSTED.name)
-    []
+tests.

=== modified file 'lib/lp/code/enums.py'
--- lib/lp/code/enums.py	2010-02-17 04:28:48 +0000
+++ lib/lp/code/enums.py	2010-02-24 10:59:32 +0000
@@ -871,7 +871,7 @@
         job, or the deletion of a CodeImport which had a running job.
         """)
 
-    successes = [SUCCESS, SUCCESS_NOCHANGE]
+    successes = [SUCCESS, SUCCESS_NOCHANGE, SUCCESS_PARTIAL]
 
 
 class CodeReviewVote(DBEnumeratedType):

=== modified file 'lib/lp/code/interfaces/branchpuller.py'
--- lib/lp/code/interfaces/branchpuller.py	2009-06-30 16:56:07 +0000
+++ lib/lp/code/interfaces/branchpuller.py	2010-02-24 10:59:32 +0000
@@ -23,12 +23,6 @@
     MIRROR_TIME_INCREMENT = Attribute(
         "How frequently we mirror branches.")
 
-    def getPullQueue(branch_type):
-        """Return a queue of branches to mirror using the puller.
-
-        :param branch_type: A value from the `BranchType` enum.
-        """
-
     def acquireBranchToPull():
         """Return a Branch to pull and mark it as mirror-started.
 

=== modified file 'lib/lp/code/interfaces/codehosting.py'
--- lib/lp/code/interfaces/codehosting.py	2009-06-25 04:06:00 +0000
+++ lib/lp/code/interfaces/codehosting.py	2010-02-24 10:59:32 +0000
@@ -58,20 +58,6 @@
     Published at 'branch_puller' on the private XML-RPC server.
     """
 
-    def getBranchPullQueue(branch_type):
-        """Get the list of branches to be mirrored.
-
-        :param branch_type: One of 'HOSTED', 'MIRRORED', or 'IMPORTED'.
-
-        :raise UnknownBranchTypeError: if the branch type is unrecognized.
-
-        :returns: a list of (branch_id, pull_url, unique_name, default_branch)
-            4-tuples.  branch_id is the database id of the branch, pull_url is
-            where to pull from, unique_name is the unique_name of the branch
-            and default_branch is the default stacked on branch for the
-            branch's target.
-        """
-
     def acquireBranchToPull():
         """Return a Branch to pull and mark it as mirror-started.
 

=== modified file 'lib/lp/code/model/branchpuller.py'
--- lib/lp/code/model/branchpuller.py	2009-08-04 05:14:32 +0000
+++ lib/lp/code/model/branchpuller.py	2010-02-24 10:59:32 +0000
@@ -9,17 +9,13 @@
 
 from datetime import timedelta
 
-from storm.expr import LeftJoin, Join
 from zope.component import getUtility
 from zope.interface import implements
 
 from canonical.database.constants import UTC_NOW
 from lp.code.enums import BranchType
 from lp.code.model.branch import Branch
-from lp.code.interfaces.branch import BranchTypeError
 from lp.code.interfaces.branchpuller import IBranchPuller
-from lp.registry.model.person import Owner
-from lp.registry.model.product import Product
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
@@ -32,24 +28,6 @@
     MAXIMUM_MIRROR_FAILURES = 5
     MIRROR_TIME_INCREMENT = timedelta(hours=6)
 
-    def getPullQueue(self, branch_type):
-        """See `IBranchPuller`."""
-        if branch_type == BranchType.REMOTE:
-            raise BranchTypeError("No pull queue for REMOTE branches.")
-        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        # Prejoin on owner and product to preserve existing behaviour.
-        # XXX: JonathanLange 2009-03-22 spec=package-branches: This prejoin is
-        # inappropriate in the face of package branches.
-        prejoin = store.using(
-            Branch,
-            LeftJoin(Product, Branch.product == Product.id),
-            Join(Owner, Branch.owner == Owner.id))
-        return prejoin.find(
-            Branch,
-            Branch.branch_type == branch_type,
-            Branch.next_mirror_time <= UTC_NOW).order_by(
-                Branch.next_mirror_time)
-
     def acquireBranchToPull(self):
         """See `IBranchPuller`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-02-22 12:26:18 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-02-24 10:59:32 +0000
@@ -867,22 +867,6 @@
         self.assertFalse(job.generateDiffs())
 
 
-def all_dirs(directory):
-    """Generate all parent directories and the directory itself.
-
-    Passing 'a/b/c/d' produces ['a', 'a/b', 'a/b/c', 'a/b/c/d'].
-    """
-    if directory == '':
-        return []
-    dirs = [directory]
-    while(1):
-        head, tail = os.path.split(directory)
-        if head == '':
-            return reversed(dirs)
-        directory = head
-        dirs.append(directory)
-
-
 class TestRosettaUploadJob(TestCaseWithFactory):
     """Tests for RosettaUploadJob."""
 
@@ -937,21 +921,18 @@
         seen_dirs = set()
         for file_pair in files:
             file_name = file_pair[0]
-            dname, fname = os.path.split(file_name)
-            for adir in all_dirs(dname):
-                if adir in seen_dirs:
-                    continue
-                self.tree.bzrdir.root_transport.mkdir(adir)
-                self.tree.add(adir)
-                seen_dirs.add(adir)
             try:
                 file_content = file_pair[1]
                 if file_content is None:
                     raise IndexError # Same as if missing.
             except IndexError:
                 file_content = self.factory.getUniqueString()
+            dname = os.path.dirname(file_name)
+            self.tree.bzrdir.root_transport.clone(dname).create_prefix()
             self.tree.bzrdir.root_transport.put_bytes(file_name, file_content)
-            self.tree.add(file_name)
+        if len(files) > 0:
+            self.tree.smart_add(
+                [self.tree.abspath(file_pair[0]) for file_pair in files])
         if commit_message is None:
             commit_message = self.factory.getUniqueString('commit')
         revision_id = self.tree.commit(commit_message)

=== modified file 'lib/lp/code/model/tests/test_branchpuller.py'
--- lib/lp/code/model/tests/test_branchpuller.py	2009-09-28 23:51:54 +0000
+++ lib/lp/code/model/tests/test_branchpuller.py	2010-02-24 10:59:32 +0000
@@ -17,7 +17,6 @@
 from canonical.database.constants import UTC_NOW
 from canonical.testing.layers import DatabaseFunctionalLayer
 from lp.code.enums import BranchType
-from lp.code.interfaces.branch import BranchTypeError
 from lp.code.interfaces.branchpuller import IBranchPuller
 from lp.testing import TestCaseWithFactory, login_person
 
@@ -78,37 +77,6 @@
         branch.requestMirror()
         self.assertEqual(UTC_NOW, branch.next_mirror_time)
 
-    def test_requestMirrorDuringPull(self):
-        """Branches can have mirrors requested while they are being mirrored.
-        If so, they should not be removed from the pull queue when the mirror
-        is complete.
-        """
-        # We run these in separate transactions so as to have the times set to
-        # different values. This is closer to what happens in production.
-        branch = self.makeAnyBranch()
-        branch.startMirroring()
-        self.assertEqual(
-            [], list(self.branch_puller.getPullQueue(branch.branch_type)))
-        branch.requestMirror()
-        self.assertEqual(
-            [branch],
-            list(self.branch_puller.getPullQueue(branch.branch_type)))
-        branch.mirrorComplete('rev1')
-        self.assertEqual(
-            [branch],
-            list(self.branch_puller.getPullQueue(branch.branch_type)))
-
-    def test_startMirroringRemovesFromPullQueue(self):
-        # Starting a mirror removes the branch from the pull queue.
-        branch = self.makeAnyBranch()
-        branch.requestMirror()
-        self.assertEqual(
-            set([branch]),
-            set(self.branch_puller.getPullQueue(branch.branch_type)))
-        branch.startMirroring()
-        self.assertEqual(
-            set(), set(self.branch_puller.getPullQueue(branch.branch_type)))
-
     def test_mirroringResetsMirrorRequest(self):
         """Mirroring branches resets their mirror request times."""
         branch = self.makeAnyBranch()
@@ -129,44 +97,6 @@
         self.assertEqual(1, branch.mirror_failures)
         self.assertEqual(None, branch.next_mirror_time)
 
-    def test_pullQueueEmpty(self):
-        """Branches with no next_mirror_time are not in the pull queue."""
-        branch = self.makeAnyBranch()
-        self.assertIs(None, branch.next_mirror_time)
-        self.assertEqual(
-            [], list(self.branch_puller.getPullQueue(self.branch_type)))
-
-    def test_pastNextMirrorTimeInQueue(self):
-        """Branches with next_mirror_time in the past are mirrored."""
-        transaction.begin()
-        branch = self.makeAnyBranch()
-        branch.requestMirror()
-        queue = self.branch_puller.getPullQueue(branch.branch_type)
-        self.assertEqual([branch], list(queue))
-
-    def test_futureNextMirrorTimeInQueue(self):
-        """Branches with next_mirror_time in the future are not mirrored."""
-        transaction.begin()
-        branch = removeSecurityProxy(self.makeAnyBranch())
-        tomorrow = self.getNow() + timedelta(1)
-        branch.next_mirror_time = tomorrow
-        branch.syncUpdate()
-        transaction.commit()
-        self.assertEqual(
-            [], list(self.branch_puller.getPullQueue(branch.branch_type)))
-
-    def test_pullQueueOrder(self):
-        """Pull queue has the oldest mirror request times first."""
-        branches = []
-        for i in range(3):
-            branch = removeSecurityProxy(self.makeAnyBranch())
-            branch.next_mirror_time = self.getNow() - timedelta(hours=i+1)
-            branch.sync()
-            branches.append(branch)
-        self.assertEqual(
-            list(reversed(branches)),
-            list(self.branch_puller.getPullQueue(self.branch_type)))
-
 
 class TestMirroringForMirroredBranches(TestMirroringForHostedBranches):
 
@@ -231,18 +161,6 @@
     branch_type = BranchType.IMPORTED
 
 
-class TestRemoteBranches(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def test_raises_branch_type_error(self):
-        # getPullQueue raises `BranchTypeError` if passed BranchType.REMOTE.
-        # It's impossible to mirror remote branches, so we shouldn't even try.
-        puller = getUtility(IBranchPuller)
-        self.assertRaises(
-            BranchTypeError, puller.getPullQueue, BranchType.REMOTE)
-
-
 class AcquireBranchToPullTests:
     """Tests for acquiring branches to pull.
 

=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-02-22 10:31:50 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-02-24 10:59:32 +0000
@@ -432,6 +432,15 @@
             code_import, CodeImportResultStatus.SUCCESS_NOCHANGE)
         self.assertEqual(0, code_import.consecutive_failure_count)
 
+    def test_consecutive_failure_count_succeed_succeed_partial(self):
+        # A code import that has succeeded then succeeded with no changes has
+        # a consecutive_failure_count of 0.
+        code_import = self.factory.makeCodeImport()
+        self.succeedImport(code_import)
+        self.succeedImport(
+            code_import, CodeImportResultStatus.SUCCESS_NOCHANGE)
+        self.assertEqual(0, code_import.consecutive_failure_count)
+
     def test_consecutive_failure_count_fail_fail(self):
         # A code import that has failed twice has a consecutive_failure_count
         # of 2.

=== modified file 'lib/lp/code/model/tests/test_codeimportjob.py'
--- lib/lp/code/model/tests/test_codeimportjob.py	2010-02-24 10:18:16 +0000
+++ lib/lp/code/model/tests/test_codeimportjob.py	2010-02-24 10:59:32 +0000
@@ -946,7 +946,8 @@
             code_import = job.code_import
             self.assertTrue(code_import.date_last_successful is None)
             getUtility(ICodeImportJobWorkflow).finishJob(job, status, None)
-            if status in CodeImportResultStatus.successes:
+            if status in [CodeImportResultStatus.SUCCESS,
+                          CodeImportResultStatus.SUCCESS_NOCHANGE]:
                 self.assertTrue(code_import.date_last_successful is not None)
             else:
                 self.assertTrue(code_import.date_last_successful is None)

=== modified file 'lib/lp/code/xmlrpc/codehosting.py'
--- lib/lp/code/xmlrpc/codehosting.py	2009-11-23 22:39:21 +0000
+++ lib/lp/code/xmlrpc/codehosting.py	2010-02-24 10:59:32 +0000
@@ -12,7 +12,6 @@
 
 
 import datetime
-import urllib
 
 import pytz
 
@@ -25,8 +24,7 @@
 
 from canonical.launchpad.ftests import login_person, logout
 from lp.code.enums import BranchType
-from lp.code.interfaces.branch import (
-    BranchCreationException, UnknownBranchTypeError)
+from lp.code.interfaces.branch import BranchCreationException
 from lp.code.interfaces.branchlookup import IBranchLookup
 from lp.code.interfaces.branchnamespace import (
     InvalidNamespace, lookup_branch_namespace, split_unique_name)
@@ -56,46 +54,6 @@
 
     implements(IBranchPuller)
 
-    def _getBranchPullInfo(self, branch):
-        """Return information the branch puller needs to pull this branch.
-
-        This is outside of the IBranch interface so that the authserver can
-        access the information without logging in as a particular user.
-
-        :return: (id, url, unique_name, default_stacked_on_url), where 'id'
-            is the branch database ID, 'url' is the URL to pull from,
-            'unique_name' is the `unique_name` property and
-            'default_stacked_on_url' is the URL of the branch to stack on by
-            default (normally of the form '/~foo/bar/baz'). If there is no
-            default stacked-on branch, then it's ''.
-        """
-        branch = removeSecurityProxy(branch)
-        if branch.branch_type == BranchType.REMOTE:
-            raise AssertionError(
-                'Remote branches should never be in the pull queue.')
-        default_branch = branch.target.default_stacked_on_branch
-        if default_branch is None:
-            default_branch = ''
-        elif (branch.branch_type == BranchType.MIRRORED
-              and default_branch.private):
-            default_branch = ''
-        else:
-            default_branch = '/' + default_branch.unique_name
-        return (
-            branch.id, branch.getPullURL(), branch.unique_name,
-            default_branch)
-
-    def getBranchPullQueue(self, branch_type):
-        """See `IBranchPuller`."""
-        try:
-            branch_type = BranchType.items[branch_type]
-        except KeyError:
-            raise UnknownBranchTypeError(
-                'Unknown branch type: %r' % (branch_type,))
-        branches = getUtility(branchpuller.IBranchPuller).getPullQueue(
-            branch_type)
-        return [self._getBranchPullInfo(branch) for branch in branches]
-
     def acquireBranchToPull(self):
         """See `IBranchPuller`."""
         branch = getUtility(branchpuller.IBranchPuller).acquireBranchToPull()

=== modified file 'lib/lp/code/xmlrpc/tests/test_codehosting.py'
--- lib/lp/code/xmlrpc/tests/test_codehosting.py	2010-02-18 03:11:03 +0000
+++ lib/lp/code/xmlrpc/tests/test_codehosting.py	2010-02-24 10:59:32 +0000
@@ -399,105 +399,6 @@
         self.assertFaultEqual(faults.NoBranchWithID(branch_id), fault)
 
 
-class BranchPullQueueTest(TestCaseWithFactory):
-    """Tests for the pull queue methods of `IBranchPuller`."""
-
-    def setUp(self):
-        super(BranchPullQueueTest, self).setUp()
-        frontend = self.frontend()
-        self.storage = frontend.getPullerEndpoint()
-        self.factory = frontend.getLaunchpadObjectFactory()
-
-    def assertBranchQueues(self, hosted, mirrored, imported):
-        expected_hosted = [
-            self.storage._getBranchPullInfo(branch) for branch in hosted]
-        expected_mirrored = [
-            self.storage._getBranchPullInfo(branch) for branch in mirrored]
-        expected_imported = [
-            self.storage._getBranchPullInfo(branch) for branch in imported]
-        self.assertEqual(
-            expected_hosted, self.storage.getBranchPullQueue('HOSTED'))
-        self.assertEqual(
-            expected_mirrored, self.storage.getBranchPullQueue('MIRRORED'))
-        self.assertEqual(
-            expected_imported, self.storage.getBranchPullQueue('IMPORTED'))
-
-    def test_pullQueuesEmpty(self):
-        """getBranchPullQueue returns an empty list when there are no branches
-        to pull.
-        """
-        self.assertBranchQueues([], [], [])
-
-    def makeBranchAndRequestMirror(self, branch_type):
-        """Make a branch of the given type and call requestMirror on it."""
-        branch = self.factory.makeAnyBranch(branch_type=branch_type)
-        branch.requestMirror()
-        # The pull queues contain branches that have next_mirror_time strictly
-        # in the past, but requestMirror sets this field to UTC_NOW, so we
-        # push the time back slightly here to get the branch to show up in the
-        # queue.
-        naked_branch = removeSecurityProxy(branch)
-        naked_branch.next_mirror_time -= datetime.timedelta(seconds=1)
-        return branch
-
-    def test_getBranchPullInfo_no_default_stacked_branch(self):
-        # If there's no default stacked branch for the project that a branch
-        # is on, then _getBranchPullInfo returns (id, url, unique_name, '').
-        branch = self.factory.makeAnyBranch()
-        info = self.storage._getBranchPullInfo(branch)
-        self.assertEqual(
-            (branch.id, branch.getPullURL(), branch.unique_name, ''), info)
-
-    def test_getBranchPullInfo_default_stacked_branch(self):
-        # If there's a default stacked branch for the project that a branch is
-        # on, then _getBranchPullInfo returns (id, url, unique_name,
-        # default_branch_unique_name).
-        product = self.factory.makeProduct()
-        default_branch = self.factory.enableDefaultStackingForProduct(product)
-        branch = self.factory.makeProductBranch(product=product)
-        info = self.storage._getBranchPullInfo(branch)
-        self.assertEqual(
-            (branch.id, branch.getPullURL(), branch.unique_name,
-             '/' + default_branch.unique_name), info)
-
-    def test_getBranchPullInfo_private_branch(self):
-        # We don't want to stack mirrored branches onto private branches:
-        # mirrored branches are public by their nature. Thus, if the default
-        # stacked-on branch for the project is private and the branch is
-        # MIRRORED then we don't include the default stacked-on branch's
-        # details in the tuple.
-        product = self.factory.makeProduct()
-        default_branch = self.factory.makeProductBranch(
-            product=product, private=True)
-        self.factory.enableDefaultStackingForProduct(product, default_branch)
-        mirrored_branch = self.factory.makeProductBranch(
-            branch_type=BranchType.MIRRORED, product=product)
-        info = self.storage._getBranchPullInfo(mirrored_branch)
-        self.assertEqual(
-            (mirrored_branch.id, mirrored_branch.getPullURL(),
-             mirrored_branch.unique_name, ''), info)
-
-    def test_getBranchPullInfo_junk(self):
-        # _getBranchPullInfo returns (id, url, unique_name, '') for junk
-        # branches.
-        branch = self.factory.makePersonalBranch()
-        info = self.storage._getBranchPullInfo(branch)
-        self.assertEqual(
-            (branch.id, branch.getPullURL(), branch.unique_name, ''), info)
-
-    def test_requestMirrorPutsBranchInQueue_hosted(self):
-        branch = self.makeBranchAndRequestMirror(BranchType.HOSTED)
-        self.assertBranchQueues([branch], [], [])
-
-    def test_requestMirrorPutsBranchInQueue_mirrored(self):
-        branch = self.makeBranchAndRequestMirror(BranchType.MIRRORED)
-        self.assertBranchQueues([], [branch], [])
-
-    def test_requestMirrorPutsBranchInQueue_imported(self):
-        branch = self.makeBranchAndRequestMirror(BranchType.IMPORTED)
-        self.assertBranchQueues([], [], [branch])
-
-
 class AcquireBranchToPullTestsViaEndpoint(TestCaseWithFactory,
                                           AcquireBranchToPullTests):
     """Tests for `acquireBranchToPull` method of `IBranchPuller`."""
@@ -1175,7 +1076,6 @@
     suite = unittest.TestSuite()
     puller_tests = unittest.TestSuite(
         [loader.loadTestsFromTestCase(BranchPullerTest),
-         loader.loadTestsFromTestCase(BranchPullQueueTest),
          loader.loadTestsFromTestCase(AcquireBranchToPullTestsViaEndpoint),
          loader.loadTestsFromTestCase(BranchFileSystemTest),
          ])

=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2010-02-22 05:37:36 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2010-02-24 10:59:32 +0000
@@ -254,6 +254,31 @@
             store._getMirrorURL(self.arbitrary_branch_id),
             sftp_prefix_noslash + '/' + '%08x' % self.arbitrary_branch_id)
 
+    def test_all_revisions_saved(self):
+        # All revisions in the branch's repo are transferred, not just those
+        # in the ancestry of the tip.
+        # Consider a branch with two heads in its repo:
+        #            revid
+        #           /     \
+        #       revid1   revid2 <- branch tip
+        # A naive push/pull would just store 'revid' and 'revid2' in the
+        # branch store -- we need to make sure all three revisions are stored
+        # and retrieved.
+        builder = self.make_branch_builder('tree')
+        revid = builder.build_snapshot(
+            None, None, [('add', ('', 'root-id', 'directory', ''))])
+        revid1 = builder.build_snapshot(None, [revid], [])
+        revid2 = builder.build_snapshot(None, [revid], [])
+        branch = builder.get_branch()
+        source_tree = branch.bzrdir.create_workingtree()
+        store = self.makeBranchStore()
+        store.push(self.arbitrary_branch_id, source_tree, default_format)
+        retrieved_tree = store.pull(
+            self.arbitrary_branch_id, 'pulled', default_format)
+        self.assertEqual(
+            set([revid, revid1, revid2]),
+            set(retrieved_tree.branch.repository.all_revision_ids()))
+
 
 class TestImportDataStore(WorkerTest):
     """Tests for `ImportDataStore`."""

=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2010-02-19 03:32:39 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2010-02-24 10:59:32 +0000
@@ -71,20 +71,26 @@
         """
         remote_url = self._getMirrorURL(db_branch_id)
         try:
-            bzr_dir = BzrDir.open(remote_url)
+            remote_bzr_dir = BzrDir.open(remote_url)
         except NotBranchError:
             return BzrDir.create_standalone_workingtree(
                 target_path, required_format)
         # XXX Tim Penhey 2009-09-18 bug 432217 Automatic upgrade of import
         # branches disabled.  Need an orderly upgrade process.
-        if False and bzr_dir.needs_format_conversion(format=required_format):
+        if False and remote_bzr_dir.needs_format_conversion(
+            format=required_format):
             try:
-                bzr_dir.root_transport.delete_tree('backup.bzr')
+                remote_bzr_dir.root_transport.delete_tree('backup.bzr')
             except NoSuchFile:
                 pass
             upgrade(remote_url, required_format)
-        bzr_dir.sprout(target_path)
-        return BzrDir.open(target_path).open_workingtree()
+        local_bzr_dir = remote_bzr_dir.sprout(target_path)
+        # Because of the way we do incremental imports, there may be revisions
+        # in the branch's repo that are not in the ancestry of the branch tip.
+        # We need to transfer them too.
+        local_bzr_dir.open_repository().fetch(
+            remote_bzr_dir.open_repository())
+        return local_bzr_dir.open_workingtree()
 
     def push(self, db_branch_id, bzr_tree, required_format):
         """Push up `bzr_tree` as the Bazaar branch for `code_import`.
@@ -101,6 +107,10 @@
             branch_to = BzrDir.create_branch_and_repo(
                 target_url, format=required_format)
         pull_result = branch_to.pull(branch_from, overwrite=True)
+        # Because of the way we do incremental imports, there may be revisions
+        # in the branch's repo that are not in the ancestry of the branch tip.
+        # We need to transfer them too.
+        branch_to.repository.fetch(branch_from.repository)
         return pull_result.old_revid != pull_result.new_revid
 
 

=== modified file 'lib/lp/codehosting/inmemory.py'
--- lib/lp/codehosting/inmemory.py	2010-02-19 03:06:12 +0000
+++ lib/lp/codehosting/inmemory.py	2010-02-24 10:59:32 +0000
@@ -442,29 +442,6 @@
         self._branch_set = branch_set
         self._script_activity_set = script_activity_set
 
-    def _getBranchPullInfo(self, branch):
-        default_branch = ''
-        if branch.product is not None:
-            series = branch.product.development_focus
-            user_branch = series.branch
-            if (user_branch is not None
-                and not (
-                    user_branch.private
-                    and branch.branch_type == BranchType.MIRRORED)):
-                default_branch = '/' + user_branch.unique_name
-        return (
-            branch.id, branch.getPullURL(), branch.unique_name,
-            default_branch)
-
-    def getBranchPullQueue(self, branch_type):
-        queue = []
-        branch_type = BranchType.items[branch_type]
-        for branch in self._branch_set:
-            if (branch.branch_type == branch_type
-                and branch.next_mirror_time < UTC_NOW):
-                queue.append(self._getBranchPullInfo(branch))
-        return queue
-
     def acquireBranchToPull(self):
         branches = sorted(
             [branch for branch in self._branch_set

=== modified file 'lib/lp/soyuz/scripts/publishdistro.py'
--- lib/lp/soyuz/scripts/publishdistro.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/publishdistro.py	2010-02-24 10:59:32 +0000
@@ -69,6 +69,11 @@
                       dest="partner", metavar="PARTNER", default=False,
                       help="Run only over the partner archive.")
 
+    parser.add_option("--copy-archive", action="store_true",
+                      dest="copy_archive", metavar="COPYARCHIVE",
+                      default=False,
+                      help="Run only over the copy archives.")
+
     parser.add_option(
         "--primary-debug", action="store_true", default=False,
         dest="primary_debug", metavar="PRIMARYDEBUG",
@@ -103,12 +108,13 @@
 
     exclusive_options = (
         options.partner, options.ppa, options.private_ppa,
-        options.primary_debug)
+        options.primary_debug, options.copy_archive)
+
     num_exclusive = [flag for flag in exclusive_options if flag]
     if len(num_exclusive) > 1:
         raise LaunchpadScriptFailure(
-            "Can only specify one of partner, ppa, private-ppa and "
-            "primary-debug.")
+            "Can only specify one of partner, ppa, private-ppa, copy-archive"
+            " and primary-debug.")
 
     log.debug("  Distribution: %s" % options.distribution)
     log.debug("    Publishing: %s" % careful_msg(options.careful_publishing))
@@ -161,6 +167,13 @@
             raise LaunchpadScriptFailure(
                 "Could not find DEBUG archive for %s" % distribution.name)
         archives = [debug_archive]
+    elif options.copy_archive:
+        archives = getUtility(IArchiveSet).getArchivesForDistribution(
+            distribution, purposes=[ArchivePurpose.COPY])
+        # Fix this to use bool when Storm fixes __nonzero__ on sqlobj
+        # result sets.
+        if archives.count() == 0:
+            raise LaunchpadScriptFailure("Could not find any COPY archives")
     else:
         archives = [distribution.main_archive]
 
@@ -185,9 +198,9 @@
         try_and_commit("dominating", publisher.B_dominate,
                        options.careful or options.careful_domination)
 
-        # The primary archive uses apt-ftparchive to generate the indexes,
-        # everything else uses the newer internal LP code.
-        if archive.purpose == ArchivePurpose.PRIMARY:
+        # The primary and copy archives use apt-ftparchive to generate the
+        # indexes, everything else uses the newer internal LP code.
+        if archive.purpose in (ArchivePurpose.PRIMARY, ArchivePurpose.COPY):
             try_and_commit("doing apt-ftparchive", publisher.C_doFTPArchive,
                            options.careful or options.careful_apt)
         else:

=== modified file 'lib/lp/soyuz/scripts/tests/test_publishdistro.py'
--- lib/lp/soyuz/scripts/tests/test_publishdistro.py	2010-01-11 05:01:32 +0000
+++ lib/lp/soyuz/scripts/tests/test_publishdistro.py	2010-02-24 10:59:32 +0000
@@ -308,6 +308,47 @@
         self.assertEqual(
             open(debug_index_path).readlines()[0], 'Package: foo-bin\n')
 
+    def testPublishCopyArchive(self):
+        """Run publish-distro in copy archive mode.
+
+        It should only publish copy archives.
+        """
+        ubuntutest = getUtility(IDistributionSet)['ubuntutest']
+        cprov = getUtility(IPersonSet).getByName('cprov')
+        copy_archive_name = 'test-copy-publish'
+
+        # The COPY repository path is not created yet.
+        repo_path = os.path.join(
+            config.archivepublisher.root,
+            ubuntutest.name + '-' + copy_archive_name)
+        self.assertNotExists(repo_path)
+
+        copy_archive = getUtility(IArchiveSet).new(
+            distribution=ubuntutest, owner=cprov, name=copy_archive_name,
+            purpose=ArchivePurpose.COPY, enabled=True)
+        # Save some test CPU cycles by avoiding logging in as the user
+        # necessary to alter the publish flag.
+        removeSecurityProxy(copy_archive).publish = True
+
+        # Publish something.
+        pub_source =  self.getPubSource(
+            sourcename='baz', filecontent='baz', archive=copy_archive)
+
+        # Try a plain PPA run, to ensure the copy archive is not published.
+        self.runPublishDistro(['--ppa'])
+
+        self.assertEqual(pub_source.status, PackagePublishingStatus.PENDING)
+
+        # Now publish the copy archives and make sure they are really
+        # published.
+        self.runPublishDistro(['--copy-archive'])
+
+        self.assertEqual(pub_source.status, PackagePublishingStatus.PUBLISHED)
+
+        # Make sure that the files were published in the right place.
+        pool_path = os.path.join(repo_path, 'pool/main/b/baz/baz_666.dsc')
+        self.assertExists(pool_path)
+
     def testRunWithEmptySuites(self):
         """Try a publish-distro run on empty suites in careful_apt mode
 
@@ -347,7 +388,8 @@
         """Test that some command line options are mutually exclusive."""
         self.assertRaises(
             LaunchpadScriptFailure,
-            self.runPublishDistro, ['--ppa', '--partner', '--primary-debug'])
+            self.runPublishDistro,
+            ['--ppa', '--partner', '--primary-debug', '--copy-archive'])
         self.assertRaises(
             LaunchpadScriptFailure,
             self.runPublishDistro, ['--ppa', '--partner'])
@@ -359,10 +401,19 @@
             self.runPublishDistro, ['--ppa', '--primary-debug'])
         self.assertRaises(
             LaunchpadScriptFailure,
+            self.runPublishDistro, ['--ppa', '--copy-archive'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
             self.runPublishDistro, ['--partner', '--private-ppa'])
         self.assertRaises(
             LaunchpadScriptFailure,
             self.runPublishDistro, ['--partner', '--primary-debug'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
+            self.runPublishDistro, ['--partner', '--copy-archive'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
+            self.runPublishDistro, ['--primary-debug', '--copy-archive'])
 
 
 def test_suite():

=== added file 'lib/lp/testing/faketransaction.py'
--- lib/lp/testing/faketransaction.py	1970-01-01 00:00:00 +0000
+++ lib/lp/testing/faketransaction.py	2010-02-24 10:59:32 +0000
@@ -0,0 +1,35 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Fake transaction manager."""
+
+__metaclass__ = type
+__all__ = ['FakeTransaction']
+
+
+class FakeTransaction:
+    """Fake transaction manager.
+
+    Use this instead of `transaction` (or the old Zopeless transaction
+    manager) in tests if you don't really want to commit anything.
+
+    Set `log_calls` to True to enable printing of commits and aborts.
+    """
+    def __init__(self, log_calls=False):
+        self.log_calls = log_calls
+
+    def _log(self, call):
+        """Print calls that are being made, if desired."""
+        if self.log_calls:
+            print call
+
+    def begin(self):
+        """Pretend to begin a transaction.  Does not log."""
+
+    def commit(self):
+        """Pretend to commit."""
+        self._log("COMMIT")
+
+    def abort(self):
+        """Pretend to roll back."""
+        self._log("ABORT")

=== modified file 'lib/lp/translations/browser/poexportrequest.py'
--- lib/lp/translations/browser/poexportrequest.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/browser/poexportrequest.py	2010-02-24 10:59:32 +0000
@@ -7,10 +7,13 @@
 __all__ = ['BaseExportView']
 
 
+from datetime import timedelta
+
 from zope.component import getUtility
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
+from canonical.launchpad.webapp.tales import DurationFormatterAPI
 from lp.translations.interfaces.poexportrequest import (
     IPOExportRequestSet)
 from lp.translations.interfaces.potemplate import (
@@ -29,6 +32,38 @@
     def uses_translations(self):
         return self.context.has_current_translation_templates
 
+    @property
+    def export_queue_status(self):
+        """Summary of queue status."""
+        queue_size = self.request_set.entry_count
+        estimated_backlog = self.request_set.estimateBacklog()
+
+        size_text = self.describeQueueSize(queue_size)
+        backlog_text = self.describeBacklog(estimated_backlog)
+
+        return " ".join((size_text, backlog_text))
+
+    def describeQueueSize(self, queue_size):
+        """Return string describing the given queue size."""
+        if queue_size == 0:
+            return "The export queue is currently empty."
+        elif queue_size == 1:
+            return "There is 1 file request on the export queue."
+        else:
+            return (
+                "There are %d file requests on the export queue."
+                % queue_size)
+
+    def describeBacklog(self, estimated_backlog):
+        """Return string describing the current export backlog."""
+        threshold = timedelta(minutes=10)
+        if estimated_backlog is None or estimated_backlog < threshold:
+            return ""
+
+        formatter = DurationFormatterAPI(estimated_backlog)
+        time_string = formatter.approximateduration()
+        return "The backlog is approximately %s." % time_string
+
     def getDefaultFormat(self):
         """Overridable: return default file format to use for the export."""
         if not IHasTranslationTemplates.providedBy(self.context):

=== modified file 'lib/lp/translations/browser/tests/test_baseexportview.py'
--- lib/lp/translations/browser/tests/test_baseexportview.py	2009-07-17 02:25:09 +0000
+++ lib/lp/translations/browser/tests/test_baseexportview.py	2010-02-24 10:59:32 +0000
@@ -1,8 +1,10 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
 
+from datetime import timedelta
+import transaction
 import unittest
 
 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
@@ -16,6 +18,12 @@
 from lp.testing import TestCaseWithFactory
 
 
+def wipe_queue(queue):
+    """Erase all export queue entries."""
+    while queue.entry_count > 0:
+        queue.popRequest()
+
+
 class BaseExportViewMixin(TestCaseWithFactory):
     """Test behaviour of objects subclassing BaseExportView."""
 
@@ -122,7 +130,6 @@
             [pofile_sr.id, pofile_es.id, pofile_sr2.id],
             translations)
 
-
 class TestProductSeries(BaseExportViewMixin):
     """Test implementation of BaseExportView on ProductSeries."""
 
@@ -158,9 +165,68 @@
             self.container, LaunchpadTestRequest())
 
 
+class TestPOExportQueueStatusDescriptions(TestCaseWithFactory):
+
+    layer = ZopelessDatabaseLayer
+
+    def setUp(self):
+        super(TestPOExportQueueStatusDescriptions, self).setUp()
+        self.container = self.factory.makeProductSeries()
+        self.container.product.official_rosetta = True
+        self.view = ProductSeriesTranslationsExportView(
+            self.container, LaunchpadTestRequest())
+
+    def test_describeQueueSize(self):
+        self.assertEqual(
+            "The export queue is currently empty.",
+            self.view.describeQueueSize(0))
+
+        self.assertEqual(
+            "There is 1 file request on the export queue.",
+            self.view.describeQueueSize(1))
+
+        self.assertEqual(
+            "There are 2 file requests on the export queue.",
+            self.view.describeQueueSize(2))
+
+    def test_describeBacklog(self):
+        backlog = None
+        self.assertEqual("", self.view.describeBacklog(backlog).strip())
+
+        backlog = timedelta(hours=2)
+        self.assertEqual(
+            "The backlog is approximately two hours.",
+            self.view.describeBacklog(backlog).strip())
+
+    def test_export_queue_status(self):
+        self.view.initialize()
+        queue = self.view.request_set
+        wipe_queue(queue)
+
+        requester = self.factory.makePerson()
+
+        size = self.view.describeQueueSize(0)
+        backlog = self.view.describeBacklog(None)
+        status = "%s %s" % (size, backlog)
+        self.assertEqual(
+            status.strip(), self.view.export_queue_status.strip())
+
+        potemplate = self.factory.makePOTemplate()
+        queue.addRequest(requester, potemplates=[potemplate])
+        transaction.commit()
+
+        size = self.view.describeQueueSize(1)
+        backlog = self.view.describeBacklog(queue.estimateBacklog())
+        status = "%s %s" % (size, backlog)
+        self.assertEqual(
+            status.strip(), self.view.export_queue_status.strip())
+
+
 def test_suite():
     suite = unittest.TestSuite()
     loader = unittest.TestLoader()
     suite.addTest(loader.loadTestsFromTestCase(TestProductSeries))
     suite.addTest(loader.loadTestsFromTestCase(TestSourcePackage))
+    suite.addTest(loader.loadTestsFromTestCase(
+        TestPOExportQueueStatusDescriptions))
     return suite

=== modified file 'lib/lp/translations/doc/distroseries-translations-copy.txt'
--- lib/lp/translations/doc/distroseries-translations-copy.txt	2009-07-03 17:01:24 +0000
+++ lib/lp/translations/doc/distroseries-translations-copy.txt	2010-02-24 10:59:32 +0000
@@ -65,13 +65,8 @@
 
 We need a transaction manager (in this case a fake one) to make the copy work.
 
-    >>> class FakeTransactionManager:
-    ...     """Mock transaction manager for test."""
-    ...     def begin(self):
-    ...         pass
-    ...     def commit(self):
-    ...         pass
-    >>> transaction_stub = FakeTransactionManager()
+    >>> from lp.testing.faketransaction import FakeTransaction
+    >>> transaction_stub = FakeTransaction()
 
 
 == Preconditions for migrating translations between distro series ==

=== modified file 'lib/lp/translations/doc/gettext-check-messages.txt'
--- lib/lp/translations/doc/gettext-check-messages.txt	2009-07-01 20:45:39 +0000
+++ lib/lp/translations/doc/gettext-check-messages.txt	2010-02-24 10:59:32 +0000
@@ -29,15 +29,7 @@
     >>> from lp.translations.scripts.gettext_check_messages import (
     ...     GettextCheckMessages)
     >>> from canonical.launchpad.scripts.logger import FakeLogger
-
-    >>> class MockTransactionManager:
-    ...     """"Print out commits and aborts, ignore them otherwise."""
-    ...     def begin(self):
-    ...         pass
-    ...     def commit(self):
-    ...         print "Committing."
-    ...     def abort(self):
-    ...         print "Aborting."
+    >>> from lp.testing.faketransaction import FakeTransaction
 
     >>> class InstrumentedGettextCheckMessages(GettextCheckMessages):
     ...     _commit_interval = 3
@@ -49,7 +41,7 @@
     ...     checker = InstrumentedGettextCheckMessages(
     ...         'gettext-check-messages-test', test_args=options)
     ...     checker.logger = FakeLogger()
-    ...     checker.txn = MockTransactionManager()
+    ...     checker.txn = FakeTransaction(log_calls=True)
     ...     if commit_interval is not None:
     ...         checker._commit_interval = commit_interval
     ...     checker.main()
@@ -101,9 +93,9 @@
 
     >>> run_checker(['-vv', "-w id=%s" % quote(current_message.id)])
     DEBUG Checking messages matching:  id=...
-    DEBUG Checking message ....
+    DEBUG Checking message ...
     DEBUG Commit point.
-    Committing.
+    COMMIT
     INFO Done.
     INFO Messages checked: 1
     INFO Validation errors: 0
@@ -128,7 +120,7 @@
     INFO ... (current): format specifications ... are not the same
     INFO ...: unmasked ...
     DEBUG Commit point.
-    Committing.
+    COMMIT
     INFO Done.
     INFO Messages checked: 1
     INFO Validation errors: 1
@@ -160,9 +152,9 @@
     DEBUG Checking message ...
     INFO ... (current): format specifications ... are not the same
     DEBUG Commit point.
-    Committing.
+    COMMIT
     DEBUG Commit point.
-    Committing.
+    COMMIT
     INFO Done.
     INFO Messages checked: 1
     INFO Validation errors: 2
@@ -189,11 +181,11 @@
     DEBUG Checking message ...
     INFO ... (unused): format specifications ... are not the same
     DEBUG Commit point.
-    Committing.
+    COMMIT
     DEBUG Checking message ...
     INFO ... (imported): number of format specifications ... does not match...
     DEBUG Commit point.
-    Committing.
+    COMMIT
     INFO Done.
     INFO Messages checked: 2
     INFO Validation errors: 3
@@ -226,9 +218,9 @@
     DEBUG Checking message ...
     INFO ... (current): format specifications ... are not the same
     DEBUG Commit point.
-    Aborting.
+    ABORT
     DEBUG Commit point.
-    Aborting.
+    ABORT
     INFO Done.
     INFO Messages checked: 1
     INFO Validation errors: 2
@@ -250,13 +242,13 @@
     DEBUG Checking message ...
     INFO ... (...): number of format specifications ...
     DEBUG Commit point.
-    Committing.
+    COMMIT
     DEBUG Checking message ...
     INFO ... (...): format specifications ... are not the same
     DEBUG Commit point.
-    Committing.
+    COMMIT
     DEBUG Commit point.
-    Committing.
+    COMMIT
     INFO Done.
     INFO Messages checked: 2
     INFO Validation errors: 3

=== modified file 'lib/lp/translations/doc/poexport-queue.txt'
--- lib/lp/translations/doc/poexport-queue.txt	2009-08-17 16:54:40 +0000
+++ lib/lp/translations/doc/poexport-queue.txt	2010-02-24 10:59:32 +0000
@@ -12,10 +12,12 @@
     >>> import transaction
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from lp.testing.faketransaction import FakeTransaction
     >>> from lp.testing.mail_helpers import pop_notifications, print_emails
     >>> from lp.translations.scripts.po_export_queue import ExportResult
     >>> import logging
     >>> logger = logging.getLogger()
+    >>> fake_transaction = FakeTransaction()
 
 When there is an error, the system will notify it.
 
@@ -273,7 +275,7 @@
 
 Once the queue is processed, the queue is empty again.
 
-    >>> process_queue(transaction, logging.getLogger())
+    >>> process_queue(fake_transaction, logging.getLogger())
     INFO:...Stored file at http://.../po_evolution-2.2.pot
 
     >>> export_request_set.entry_count
@@ -331,7 +333,7 @@
 
     >>> export_request_set.addRequest(
     ...     carlos, pofiles=[pofile], format=TranslationFileFormat.PO)
-    >>> process_queue(transaction, logging.getLogger())
+    >>> process_queue(fake_transaction, logging.getLogger())
     INFO:root:Stored file at http://...eo.po
 
     >>> transaction.commit()
@@ -352,7 +354,7 @@
 
     >>> export_request_set.addRequest(
     ...     carlos, pofiles=[pofile], format=TranslationFileFormat.POCHANGED)
-    >>> process_queue(transaction, logging.getLogger())
+    >>> process_queue(fake_transaction, logging.getLogger())
     INFO:root:Stored file at http://...eo.po
 
     >>> transaction.commit()
@@ -372,6 +374,6 @@
 Finally, if we try to do an export with an empty queue, we don't do
 anything:
 
-    >>> process_queue(transaction, logging.getLogger())
+    >>> process_queue(fake_transaction, logging.getLogger())
     >>> len(pop_notifications())
     0

=== modified file 'lib/lp/translations/doc/poexport-request-productseries.txt'
--- lib/lp/translations/doc/poexport-request-productseries.txt	2009-08-17 13:42:00 +0000
+++ lib/lp/translations/doc/poexport-request-productseries.txt	2010-02-24 10:59:32 +0000
@@ -34,15 +34,12 @@
 
 Now we request that the queue be processed.
 
-    >>> class MockTransactionManager:
-    ...     def commit(self):
-    ...         pass
-
     >>> import logging
+    >>> from lp.testing.faketransaction import FakeTransaction
     >>> from lp.translations.scripts.po_export_queue import process_queue
     >>> logger = MockLogger()
     >>> logger.setLevel(logging.DEBUG)
-    >>> process_queue(MockTransactionManager(), logger)
+    >>> process_queue(FakeTransaction(), logger)
     log> Exporting objects for ..., related to template evolution-2.2 in
     Evolution trunk
     log> Exporting objects for ..., related to template evolution-2.2-test in

=== modified file 'lib/lp/translations/doc/poexport-request.txt'
--- lib/lp/translations/doc/poexport-request.txt	2009-08-17 23:37:19 +0000
+++ lib/lp/translations/doc/poexport-request.txt	2010-02-24 10:59:32 +0000
@@ -53,12 +53,9 @@
 
 Now we request that the queue be processed.
 
-    >>> class MockTransactionManager:
-    ...     def commit(self):
-    ...         pass
-
+    >>> from lp.testing.faketransaction import FakeTransaction
     >>> from lp.translations.scripts.po_export_queue import process_queue
-    >>> process_queue(MockTransactionManager(), MockLogger())
+    >>> process_queue(FakeTransaction(), MockLogger())
     log> Exporting objects for Happy Downloader, related to template pmount
     in Ubuntu Hoary package "pmount"
     log> Stored file at http://.../launchpad-export.tar.gz
@@ -188,7 +185,7 @@
     >>> from lp.translations.interfaces.translationfileformat import (
     ...     TranslationFileFormat)
     >>> request_set.addRequest(person, None, [cs], TranslationFileFormat.MO)
-    >>> process_queue(MockTransactionManager(), MockLogger())
+    >>> process_queue(FakeTransaction(), MockLogger())
     log> Exporting objects for Happy Downloader, related to template pmount
     in Ubuntu Hoary package "pmount"
     log> Stored file at http://.../cs_LC_MESSAGES_pmount.mo

=== modified file 'lib/lp/translations/doc/poimport.txt'
--- lib/lp/translations/doc/poimport.txt	2009-11-17 09:51:40 +0000
+++ lib/lp/translations/doc/poimport.txt	2010-02-24 10:59:32 +0000
@@ -103,14 +103,7 @@
 To prevent this, the importer now does intermediate commits while
 recomputing statistics.
 
-    >>> class FakeTransactionManager:
-    ...     """Pretend to manage a transaction, log what happens."""
-    ...     def begin(self):
-    ...         pass
-    ...     def commit(self):
-    ...         print "Committing."
-    ...     def abort(self):
-    ...         print "Aborting."
+    >>> from lp.testing.faketransaction import FakeTransaction
 
 Attach the import to the translations import queue:
 
@@ -136,8 +129,7 @@
 Now, we tell the PO template to import from the file data it has.
 
     >>> (subject, body) = potemplate.importFromQueue(
-    ...     entry, FakeLogger(), txn=FakeTransactionManager())
-    Committing.
+    ...     entry, FakeLogger(), txn=FakeTransaction())
 
 Our request has now been serviced.
 

=== modified file 'lib/lp/translations/interfaces/poexportrequest.py'
--- lib/lp/translations/interfaces/poexportrequest.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/interfaces/poexportrequest.py	2010-02-24 10:59:32 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -18,11 +18,16 @@
 from lp.translations.interfaces.potemplate import IPOTemplate
 from lp.translations.interfaces.translationfileformat import (
     TranslationFileFormat)
+
+
 class IPOExportRequestSet(Interface):
     entry_count = Int(
         title=u'Number of entries waiting in the queue.',
         required=True, readonly=True)
 
+    def estimateBacklog():
+        """Return approximate age of oldest request on the export queue."""
+
     def addRequest(person, potemplates=None, pofiles=None,
                    format=TranslationFileFormat.PO):
         """Add a request to export a set of files.
@@ -40,6 +45,7 @@
         objects to export.
         """
 
+
 class IPOExportRequest(Interface):
     person = Object(
         title=u'The person who made the request.',

=== modified file 'lib/lp/translations/model/poexportrequest.py'
--- lib/lp/translations/model/poexportrequest.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/model/poexportrequest.py	2010-02-24 10:59:32 +0000
@@ -1,17 +1,21 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212
 
 __metaclass__ = type
 
-__all__ = ('POExportRequestSet', 'POExportRequest')
+__all__ = [
+    'POExportRequest',
+    'POExportRequestSet',
+    ]
 
 from sqlobject import ForeignKey
 
+from zope.component import getUtility
 from zope.interface import implements
 
-from canonical.database.sqlbase import cursor, quote, SQLBase, sqlvalues
+from canonical.database.sqlbase import quote, SQLBase, sqlvalues
 from canonical.database.enumcol import EnumCol
 
 from lp.translations.interfaces.poexportrequest import (
@@ -19,6 +23,8 @@
 from lp.translations.interfaces.potemplate import IPOTemplate
 from lp.translations.interfaces.translationfileformat import (
     TranslationFileFormat)
+from canonical.launchpad.webapp.interfaces import (
+    DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, MASTER_FLAVOR)
 from lp.registry.interfaces.person import validate_public_person
 
 
@@ -28,7 +34,17 @@
     @property
     def entry_count(self):
         """See `IPOExportRequestSet`."""
-        return POExportRequest.select().count()
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        return store.find(POExportRequest, True).count()
+
+    def estimateBacklog(self):
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        row = store.execute(
+            "SELECT now() - min(date_created) FROM POExportRequest").get_one()
+        if row is None:
+            return None
+        else:
+            return row[0]
 
     def addRequest(self, person, potemplates=None, pofiles=None,
             format=TranslationFileFormat.PO):
@@ -58,13 +74,13 @@
             'pofiles': pofile_ids,
             }
 
-        cur = cursor()
+        store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
 
         if potemplates:
             # Create requests for all these templates, insofar as the same
             # user doesn't already have requests pending for them in the same
             # format.
-            cur.execute("""
+            store.execute("""
                 INSERT INTO POExportRequest(person, potemplate, format)
                 SELECT %(person)s, template.id, %(format)s
                 FROM POTemplate AS template
@@ -81,7 +97,7 @@
         if pofiles:
             # Create requests for all these translations, insofar as the same
             # user doesn't already have identical requests pending.
-            cur.execute("""
+            store.execute("""
                 INSERT INTO POExportRequest(
                     person, potemplate, pofile, format)
                 SELECT %(person)s, template.id, pofile.id, %(format)s

=== modified file 'lib/lp/translations/scripts/tests/test_copy_distroseries_translations.py'
--- lib/lp/translations/scripts/tests/test_copy_distroseries_translations.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/scripts/tests/test_copy_distroseries_translations.py	2010-02-24 10:59:32 +0000
@@ -13,24 +13,16 @@
 
 from canonical.launchpad.ftests import syncUpdate
 from lp.registry.interfaces.distroseries import IDistroSeriesSet
+from lp.testing.faketransaction import FakeTransaction
 from lp.translations.scripts.copy_distroseries_translations import (
     copy_distroseries_translations)
 
 from canonical.testing import LaunchpadZopelessLayer
 
 
-class MockTransactionManager:
-    def begin(self):
-        pass
-    def commit(self):
-        pass
-    def abort(self):
-        pass
-
-
 class TestCopying(TestCase):
     layer = LaunchpadZopelessLayer
-    txn = MockTransactionManager()
+    txn = FakeTransaction()
 
     def test_flagsHandling(self):
         """Flags are correctly restored, no matter what their values."""

=== modified file 'lib/lp/translations/templates/translations-export.pt'
--- lib/lp/translations/templates/translations-export.pt	2009-09-17 21:07:36 +0000
+++ lib/lp/translations/templates/translations-export.pt	2010-02-24 10:59:32 +0000
@@ -38,6 +38,11 @@
         This message will tell you where you can download your file.
       </p>
 
+      <p tal:content="view/export_queue_status">
+        There are 201 file reequests on the export queue.  The backlog is
+        approximately 25 minutes.
+      </p>
+
       <div class="actions">
         <p>
          <input type="submit" value="Request Download" />