Merge ~pappacena/launchpad:package-publishing-copied-from-archive into launchpad:master

[Thiago F. Pappacena]

Keeping track of the original archives of source and binary package copies on [Source|Binary]PackagePublishingHistory.

The tracking of "copied_from_archive" seems to be working fine, but it's missing showing this information on S/BPackagePublishingHistory page.

On the page, it's shown as "Previous archive was <archive>" text, right below where we show that the package was copied today. I'm not sure this is the right text to show to the user, but I couldn't think of anything different.

[Thiago F. Pappacena (pappacena)]

cjwatson, while checking the template to show the "copied_from_archive", I've noticed that we actually have this info displayed at some situations: basically, we show it if the archive of the PackagePublishingHistory is not the same as the sourcepackagename's (or build's) archive, or if the distroseries are different.

Is there any situation not covered by this condition? Why exactly do we need to have this "copied_from_package"?

[Thiago F. Pappacena (pappacena)]

It should be showing both the "root" original package's archive and it's first "parent", from where it was copied.

Of course, if it's the first copy of the package, it doesn't show the message twice.

[Colin Watson (cjwatson)]

Thanks! Good start, I think, but let's clean some things up.

review: Needs Fixing

ca7c4ac... by Thiago F. Pappacena on 2020-03-12

Renaming view property to avoid naming confusion

abc38a0... by Thiago F. Pappacena on 2020-03-12

Always setting copied_from_archive on package publishing history

29b3ab5... by Thiago F. Pappacena on 2020-03-16

Renaming variable to match other parts of the system

c061ee0... by Thiago F. Pappacena on 2020-03-16

Merge branch 'master' into package-publishing-copied-from-archive

bb0ba8f... by Thiago F. Pappacena on 2020-03-16

Better formatting the "copied from"/"originally uploaded to" message on pkg publishing history

84337d9... by Thiago F. Pappacena on 2020-03-16

Compatibility with packages publishing history without copied_from_archive attribute set"

[Thiago F. Pappacena (pappacena)]

cjwatson, I've just pushed the requested changes.

18a4491... by Thiago F. Pappacena on 2020-03-16

Code style

4397657... by Thiago F. Pappacena on 2020-03-16

Removing redundant condition

a9c5c06... by Thiago F. Pappacena on 2020-03-16

Showing creator at the current position if we didn't show at the new on, at the top

7915de6... by Thiago F. Pappacena on 2020-03-26

Merge branch 'master' into package-publishing-copied-from-archive

38d0dc2... by Thiago F. Pappacena on 2020-03-26

New test to check what is shown publishing history for change-override of copied packages

e01cf5c... by Thiago F. Pappacena on 2020-03-26

Fixing broken test and missing condition

[Colin Watson (cjwatson)]

review: Approve

da6875b... by Thiago F. Pappacena on 2020-03-27

Coding style adjustments

65a082f... by Thiago F. Pappacena on 2020-03-27

Adjusting when to show sponsor on package publishing history

[Thiago F. Pappacena (pappacena)]

Pushed the requested changes.

[Colin Watson (cjwatson)]

review: Approve

f4f3706... by Thiago F. Pappacena on 2020-03-27

Typo and coding style change

[Thiago F. Pappacena (pappacena)]

Pushed!

diff --git a/lib/lp/_schema_circular_imports.py b/lib/lp/_schema_circular_imports.py
index 46247fc..a50ddd2 100644
--- a/lib/lp/_schema_circular_imports.py
+++ b/lib/lp/_schema_circular_imports.py
@@ -363,6 +363,10 @@ patch_reference_property(
 patch_reference_property(
     ISourcePackagePublishingHistory, 'archive', IArchive)
 patch_reference_property(
+    IBinaryPackagePublishingHistory, 'copied_from_archive', IArchive)
+patch_reference_property(
+    ISourcePackagePublishingHistory, 'copied_from_archive', IArchive)
+patch_reference_property(
     ISourcePackagePublishingHistory, 'ancestor',
     ISourcePackagePublishingHistory)
 patch_reference_property(
diff --git a/lib/lp/soyuz/browser/publishing.py b/lib/lp/soyuz/browser/publishing.py
index 1a23bc3..7733190 100644
--- a/lib/lp/soyuz/browser/publishing.py
+++ b/lib/lp/soyuz/browser/publishing.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Browser views for Soyuz publishing records."""
@@ -202,6 +202,18 @@ class BasePublishingRecordView(LaunchpadView):
             return u"%d%% of users" % self.context.phased_update_percentage
         return u""
 
+    @property
+    def linkify_copied_from_archive(self):
+        """Return True if the copied_from_archive should be linkified.
+
+        The copied_from_archive should be linkified if it's a PPA and the
+        user has permission to see it.
+        """
+        archive = self.context.copied_from_archive
+        if archive is None:
+            return False
+        return archive.is_ppa and check_permission('launchpad.View', archive)
+
 
 class SourcePublishingRecordView(BasePublishingRecordView):
     """View class for `ISourcePackagePublishingHistory`."""
@@ -266,6 +278,15 @@ class SourcePublishingRecordView(BasePublishingRecordView):
         return False
 
     @property
+    def upload_archive(self):
+        """Get the original archive from this binary build if this was a
+        copied publication.
+        """
+        if not self.wasCopied():
+            return None
+        return self.context.sourcepackagerelease.upload_archive
+
+    @property
     def allow_selection(self):
         """Do not render the checkbox corresponding to this record."""
         return False
@@ -406,3 +427,12 @@ class BinaryPublishingRecordView(BasePublishingRecordView):
             return True
 
         return False
+
+    @property
+    def upload_archive(self):
+        """Get the original archive from this binary build if this was a
+        copied publication.
+        """
+        if not self.wasCopied():
+            return None
+        return self.context.binarypackagerelease.build.archive
diff --git a/lib/lp/soyuz/interfaces/publishing.py b/lib/lp/soyuz/interfaces/publishing.py
index 4697209..6945260 100644
--- a/lib/lp/soyuz/interfaces/publishing.py
+++ b/lib/lp/soyuz/interfaces/publishing.py
@@ -269,6 +269,13 @@ class ISourcePackagePublishingHistoryPublic(IPublishingView):
             Interface,
             title=_('Archive ID'), required=True, readonly=True,
             ))
+    copied_from_archive = exported(
+        Reference(
+            # Really IArchive (fixed in _schema_circular_imports.py).
+            Interface,
+            title=_('Original archive ID where this package was copied from.'),
+            required=False, readonly=True,
+            ))
     supersededby = Int(
             title=_('The sourcepackagerelease which superseded this one'),
             required=False, readonly=False,
@@ -711,6 +718,13 @@ class IBinaryPackagePublishingHistoryPublic(IPublishingView):
             description=_("The context archive for this publication."),
             required=True, readonly=True,
             ))
+    copied_from_archive = exported(
+        Reference(
+            # Really IArchive (fixed in _schema_circular_imports.py).
+            Interface,
+            title=_('Original archive ID where this package was copied from.'),
+            required=False, readonly=True,
+        ))
     removed_by = exported(
         Reference(
             IPerson,
@@ -875,7 +889,8 @@ class IBinaryPackagePublishingHistory(IBinaryPackagePublishingHistoryPublic,
 class IPublishingSet(Interface):
     """Auxiliary methods for dealing with sets of publications."""
 
-    def publishBinaries(archive, distroseries, pocket, binaries):
+    def publishBinaries(archive, distroseries, pocket, binaries,
+                        copied_from_archives=None):
         """Efficiently publish multiple BinaryPackageReleases in an Archive.
 
         Creates `IBinaryPackagePublishingHistory` records for each
@@ -889,6 +904,8 @@ class IPublishingSet(Interface):
         :param binaries: A dict mapping `BinaryPackageReleases` to their
             desired overrides as (`Component`, `Section`,
             `PackagePublishingPriority`, `phased_update_percentage`) tuples.
+        :param copied_from_archives: A dict mapping `BinaryPackageReleases`
+            to their original archives (for copy operations).
 
         :return: A list of new `IBinaryPackagePublishingHistory` records.
         """
@@ -913,7 +930,8 @@ class IPublishingSet(Interface):
 
     def newSourcePublication(archive, sourcepackagerelease, distroseries,
                              component, section, pocket, ancestor,
-                             create_dsd_job=True):
+                             create_dsd_job=True, copied_from_archive=None,
+                             creator=None, sponsor=None, packageupload=None):
         """Create a new `SourcePackagePublishingHistory`.
 
         :param archive: An `IArchive`
@@ -926,6 +944,8 @@ class IPublishingSet(Interface):
             version of this publishing record
         :param create_dsd_job: A boolean indicating whether or not a dsd job
              should be created for the new source publication.
+        :param copied_from_archive: For copy operations, this should be the
+            source archive (from where this new publication is coming from).
         :param creator: An optional `IPerson`. If this is None, the
             sourcepackagerelease's creator will be used.
         :param sponsor: An optional `IPerson` indicating the sponsor of this
diff --git a/lib/lp/soyuz/model/publishing.py b/lib/lp/soyuz/model/publishing.py
index ae7b414..fafd7f9 100644
--- a/lib/lp/soyuz/model/publishing.py
+++ b/lib/lp/soyuz/model/publishing.py
@@ -258,6 +258,8 @@ class SourcePackagePublishingHistory(SQLBase, ArchivePublisherBase):
                      default=PackagePublishingPocket.RELEASE,
                      notNull=True)
     archive = ForeignKey(dbName="archive", foreignKey="Archive", notNull=True)
+    copied_from_archive = ForeignKey(
+        dbName="copied_from_archive", foreignKey="Archive", notNull=False)
     removed_by = ForeignKey(
         dbName="removed_by", foreignKey="Person",
         storm_validator=validate_public_person, default=None)
@@ -531,6 +533,7 @@ class SourcePackagePublishingHistory(SQLBase, ArchivePublisherBase):
                 component = override.component
             if override.section is not None:
                 section = override.section
+
         return getUtility(IPublishingSet).newSourcePublication(
             archive,
             self.sourcepackagerelease,
@@ -542,6 +545,7 @@ class SourcePackagePublishingHistory(SQLBase, ArchivePublisherBase):
             create_dsd_job=create_dsd_job,
             creator=creator,
             sponsor=sponsor,
+            copied_from_archive=self.archive,
             packageupload=packageupload)
 
     def getStatusSummaryForBuilds(self):
@@ -643,6 +647,8 @@ class BinaryPackagePublishingHistory(SQLBase, ArchivePublisherBase):
     dateremoved = UtcDateTimeCol(default=None)
     pocket = EnumCol(dbName='pocket', schema=PackagePublishingPocket)
     archive = ForeignKey(dbName="archive", foreignKey="Archive", notNull=True)
+    copied_from_archive = ForeignKey(
+        dbName="copied_from_archive", foreignKey="Archive", notNull=False)
     removed_by = ForeignKey(
         dbName="removed_by", foreignKey="Person",
         storm_validator=validate_public_person, default=None)
@@ -1024,8 +1030,11 @@ def expand_binary_requests(distroseries, binaries):
 class PublishingSet:
     """Utilities for manipulating publications in batches."""
 
-    def publishBinaries(self, archive, distroseries, pocket, binaries):
+    def publishBinaries(self, archive, distroseries, pocket, binaries,
+                        copied_from_archives=None):
         """See `IPublishingSet`."""
+        if copied_from_archives is None:
+            copied_from_archives = {}
         # Expand the dict of binaries into a list of tuples including the
         # architecture.
         if distroseries.distribution != archive.distribution:
@@ -1076,11 +1085,13 @@ class PublishingSet:
 
         BPPH = BinaryPackagePublishingHistory
         return bulk.create(
-            (BPPH.archive, BPPH.distroarchseries, BPPH.pocket,
+            (BPPH.archive, BPPH.copied_from_archive,
+             BPPH.distroarchseries, BPPH.pocket,
              BPPH.binarypackagerelease, BPPH.binarypackagename,
              BPPH.component, BPPH.section, BPPH.priority,
              BPPH.phased_update_percentage, BPPH.status, BPPH.datecreated),
-            [(archive, das, pocket, bpr, bpr.binarypackagename,
+            [(archive, copied_from_archives.get(bpr), das, pocket, bpr,
+              bpr.binarypackagename,
               get_component(archive, das.distroseries, component),
               section, priority, phased_update_percentage,
               PackagePublishingStatus.PENDING, UTC_NOW)
@@ -1158,12 +1169,16 @@ class PublishingSet:
                  bpph.priority, None)) for bpph in bpphs)
         if not with_overrides:
             return list()
+        copied_from_archives = {
+            bpph.binarypackagerelease: bpph.archive for bpph in bpphs}
         return self.publishBinaries(
-            archive, distroseries, pocket, with_overrides)
+            archive, distroseries, pocket, with_overrides,
+            copied_from_archives)
 
     def newSourcePublication(self, archive, sourcepackagerelease,
                              distroseries, component, section, pocket,
                              ancestor=None, create_dsd_job=True,
+                             copied_from_archive=None,
                              creator=None, sponsor=None, packageupload=None):
         """See `IPublishingSet`."""
         # Circular import.
@@ -1179,6 +1194,7 @@ class PublishingSet:
         pub = SourcePackagePublishingHistory(
             distroseries=distroseries,
             pocket=pocket,
+            copied_from_archive=copied_from_archive,
             archive=archive,
             sourcepackagename=sourcepackagerelease.sourcepackagename,
             sourcepackagerelease=sourcepackagerelease,
diff --git a/lib/lp/soyuz/scripts/tests/test_copypackage.py b/lib/lp/soyuz/scripts/tests/test_copypackage.py
index b5bd4c6..388fcf7 100644
--- a/lib/lp/soyuz/scripts/tests/test_copypackage.py
+++ b/lib/lp/soyuz/scripts/tests/test_copypackage.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -11,6 +11,7 @@ from testtools.content import text_content
 from testtools.matchers import (
     Equals,
     LessThan,
+    MatchesListwise,
     MatchesStructure,
     )
 import transaction
@@ -1015,6 +1016,36 @@ class CopyCheckerTestCase(TestCaseWithFactory):
             copied_source, copied_source.distroseries, copied_source.pocket,
             None, False)
 
+    def test_copy_to_another_archive_tracks_source_archive(self):
+        """Checks that creating a copy of a package publishing keeps track
+        of origin archive.
+        """
+        # Create a source with binaries in ubuntutest/breezy-autotest.
+        source = self.test_publisher.getPubSource(architecturehintlist='i386')
+        binary = self.test_publisher.getPubBinaries(pub_source=source)[0]
+
+        hoary = self.test_publisher.ubuntutest.getSeries('hoary-test')
+        self.test_publisher.addFakeChroots(hoary)
+
+        target_archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest,
+            purpose=ArchivePurpose.PPA)
+
+        copied_source = source.copyTo(hoary, source.pocket, target_archive)
+        self.assertThat(
+            copied_source, MatchesStructure.byEquality(
+                    archive=target_archive,
+                    copied_from_archive=source.archive))
+
+        copied_binaries = binary.copyTo(hoary, source.pocket, target_archive)
+
+        self.assertThat(
+            copied_binaries, MatchesListwise([
+                MatchesStructure.byEquality(
+                    archive=target_archive,
+                    copied_from_archive=binary.archive),
+            ]))
+
 
 class BaseDoCopyTests:
 
diff --git a/lib/lp/soyuz/stories/ppa/xx-copy-packages.txt b/lib/lp/soyuz/stories/ppa/xx-copy-packages.txt
index 8159d2d..31d8915 100644
--- a/lib/lp/soyuz/stories/ppa/xx-copy-packages.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-copy-packages.txt
@@ -287,8 +287,8 @@ context.
     >>> jblack_extra_browser.open(expander_url)
     >>> print(extract_text(jblack_extra_browser.contents))
     Publishing details
-      Copied from ubuntu hoary in Primary Archive for Ubuntu Linux by James
-      Blackwell
+      Copied from PPA for Celso Providelo by James Blackwell
+      Originally uploaded to ubuntu hoary in Primary Archive for Ubuntu Linux
     Changelog
       pmount (0.1-1) hoary; urgency=low
       * Fix description (Malone #1)
diff --git a/lib/lp/soyuz/stories/soyuz/xx-packagepublishinghistory.txt b/lib/lp/soyuz/stories/soyuz/xx-packagepublishinghistory.txt
index 51a629b..0866dff 100644
--- a/lib/lp/soyuz/stories/soyuz/xx-packagepublishinghistory.txt
+++ b/lib/lp/soyuz/stories/soyuz/xx-packagepublishinghistory.txt
@@ -28,13 +28,91 @@ shows the complete history of a package in all series.
     >>> print(table.findAll("tr")[2].td["colspan"])
     8
 
-A change-override request should show who made the request
+Copy the package to a new distribution named "foo-distro". The publishing
+history page of Foo-distro should show that the package was copied, but no
+intermediate archive information.
+
+    >>> login('[e-mail]')
+    >>> from lp.soyuz.model.archive import ArchivePurpose
+    >>> copy_creator = stp.factory.makePerson(name='person123')
+    >>> new_distro = stp.factory.makeDistribution(name='foo-distro')
+    >>> new_distroseries = stp.factory.makeDistroSeries(
+    ...     name='foo-series', distribution=new_distro)
+    >>> new_archive = stp.factory.makeArchive(
+    ...     distribution=new_distro,
+    ...     purpose=ArchivePurpose.PRIMARY)
+    >>> new_pub1 = source_pub.copyTo(
+    ...     new_distroseries, source_pub.pocket, new_archive,
+    ...     creator=copy_creator)
+    >>> logout()
+
+    >>> anon_browser.open(
+    ...     'http://launchpad.test/%s/+source/test-history/'
+    ...     '+publishinghistory' % new_distro.name)
+
+    >>> table = find_tag_by_id(anon_browser.contents, 'publishing-summary')
+    >>> print(extract_text(table))
+    Date    Status    Target          Pocket   Component Section Version
+    ... UTC Pending   Foo-series      release  main      base    666
+    Copied from ubuntutest breezy-autotest in Primary Archive for Ubuntu Test by Person123
+
+
+Copying from "Foo-distro" to a new distribution "Another-distro". It should
+show the intermediate archive Foo-distro on Another-distro's history page,
+since we copied the package from there. It should also show that the
+original distribution was Ubuntutest breezy-autotest.
+
+    >>> login('[e-mail]')
+    >>> from lp.soyuz.model.archive import ArchivePurpose
+    >>> new_distro = stp.factory.makeDistribution(name='another-distro')
+    >>> new_distroseries = stp.factory.makeDistroSeries(
+    ...     name='another-series', distribution=new_distro)
+    >>> new_archive = stp.factory.makeArchive(
+    ...     distribution=new_distro,
+    ...     purpose=ArchivePurpose.PRIMARY)
+    >>> new_pub2 = new_pub1.copyTo(
+    ...     new_distroseries, source_pub.pocket, new_archive,
+    ...     creator=copy_creator)
+    >>> logout()
+
+    >>> anon_browser.open(
+    ...     'http://launchpad.test/%s/+source/test-history/'
+    ...     '+publishinghistory' % new_distro.name)
+    >>> table = find_tag_by_id(anon_browser.contents, 'publishing-summary')
+    >>> print(extract_text(table))
+    Date    Status    Target          Pocket   Component Section Version
+    ... UTC Pending   Another-series  release  main      base    666
+    Copied from Primary Archive for Foo-distro by Person123
+    Originally uploaded to ubuntutest breezy-autotest in Primary Archive for Ubuntu Test
+
+And in this new distro, a change-override on a copied archive should show both
+messages.
 
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from zope.component import getUtility
+    >>> from zope.security.proxy import removeSecurityProxy
 
     >>> login('[e-mail]')
     >>> person = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> new_pub2_changed = removeSecurityProxy(new_pub2).changeOverride(
+    ...     new_component='universe', creator=person)
+    >>> logout()
+    >>> anon_browser.open(
+    ...     'http://launchpad.test/%s/+source/test-history/'
+    ...     '+publishinghistory' % new_distro.name)
+    >>> table = find_tag_by_id(anon_browser.contents, 'publishing-summary')
+    >>> print(extract_text(table))
+    Date    Status    Target          Pocket   Component Section Version
+    ... UTC Pending   Another-series  release  universe  base    666
+    Copied from ubuntutest breezy-autotest in Primary Archive for Ubuntu Test by Foo Bar
+    ... UTC Pending   Another-series  release  main      base    666
+    Copied from Primary Archive for Foo-distro by Person123
+    Originally uploaded to ubuntutest breezy-autotest in Primary Archive for Ubuntu Test
+
+Going back to the original distribution, a change-override request should
+show who made the request.
+
+    >>> login('[e-mail]')
     >>> new_pub = source_pub.changeOverride(
     ...     new_component='universe', creator=person)
     >>> logout()
@@ -51,7 +129,6 @@ A change-override request should show who made the request
     Created ... ago by Foo Bar
     Published ... ago
 
-
 A publishing record will be shown as deleted in the publishing history after a
 request for deletion by a user.
 
diff --git a/lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt b/lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt
index 722c4c0..0d04c43 100644
--- a/lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt
+++ b/lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt
@@ -71,6 +71,7 @@ Each binary publication exposes a number of properties:
     binary_package_version: u'1.0'
     build_link: u'http://.../~cprov/+archive/ubuntu/ppa/+build/28'
     component_name: u'main'
+    copied_from_archive_link: None
     creator_link: None
     date_created: u'2007-08-10T13:00:00+00:00'
     date_made_pending: None
diff --git a/lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt b/lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt
index 0d47a00..b26e605 100644
--- a/lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt
+++ b/lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt
@@ -121,6 +121,7 @@ publication to play with first.
     >>> pprint_entry(pubs['entries'][0])
     archive_link: u'http://.../~cprov/+archive/ubuntu/ppa'
     component_name: u'main'
+    copied_from_archive_link: None
     creator_link: u'http://api.launchpad.test/beta/~name16'
     date_created: ...
     date_made_pending: None
diff --git a/lib/lp/soyuz/templates/packagepublishing-details.pt b/lib/lp/soyuz/templates/packagepublishing-details.pt
index 4c65323..b6a9a42 100644
--- a/lib/lp/soyuz/templates/packagepublishing-details.pt
+++ b/lib/lp/soyuz/templates/packagepublishing-details.pt
@@ -42,45 +42,90 @@
       <span tal:attributes="title context/datepublished/fmt:datetime"
             tal:content="context/datepublished/fmt:displaydate" />
     </li>
-    <li tal:condition="view/wasCopied">
-      Copied from
-      <tal:source_original_location condition="view/is_source">
-        <tal:define
-          define="linkify_archive view/linkify_source_archive;
-                  source context/sourcepackagerelease">
-          <tal:message
-            define="series source/upload_distroseries;
-                    distro series/distribution;
-                    message string:${distro/name} ${series/name} in "
-            replace="message" />
-          <a tal:condition="linkify_archive"
-             tal:attributes="href source/upload_archive/fmt:url"
-             tal:content="source/upload_archive/displayname" />
-          <tal:message
-            condition="not:linkify_archive"
-            define="archive source/upload_archive;
-                    message string:${archive/displayname}"
-            replace="message" />
-        </tal:define>
-        <tal:source_creator condition="context/creator">
-          by <a tal:replace="structure context/creator/fmt:link"/>
-        </tal:source_creator>
-        <tal:source_sponsor condition="context/sponsor">
-          (sponsored by <a tal:replace="structure context/sponsor/fmt:link"/>)
-        </tal:source_sponsor>
-      </tal:source_original_location>
-      <tal:binary_build_location condition="view/is_binary">
-        <tal:message
-          define="build context/binarypackagerelease/build;
-                  archive build/archive;
-                  pocket build/pocket;
-                  arch build/distro_arch_series;
-                  series arch/distroseries;
-                  distro series/distribution;
-                  message string:${distro/name} ${series/name}-${pocket/name/fmt:lower} ${arch/architecturetag} in ${archive/displayname}"
-          replace="message" />
-      </tal:binary_build_location>
-    </li>
 
+    <tal:comment condition="nothing">
+       For package copies, we have a distinction between what is the
+       "copied_from_archive" (the archive from where we directly copied a
+       publishing) and the "upload_archive" (the archive where the package
+       was originally uploaded to).
+    </tal:comment>
+    <tal:copied tal:define="
+          copied_from_archive context/copied_from_archive;
+          upload_archive view/upload_archive;
+          chained_copies python: copied_from_archive and copied_from_archive != upload_archive"
+          tal:condition="view/wasCopied">
+        <li tal:define="linkify_archive view/linkify_copied_from_archive"
+            tal:condition="chained_copies">
+              Copied from
+              <a tal:condition="linkify_archive"
+                 tal:attributes="href copied_from_archive/fmt:url"
+                 tal:content="copied_from_archive/displayname" />
+              <tal:message
+                condition="not:linkify_archive"
+                define="message string:${copied_from_archive/displayname}"
+                replace="message" />
+              <tal:creator condition="context/creator">
+                by <a tal:replace="structure context/creator/fmt:link"/>
+              </tal:creator>
+              <tal:source_sponsor condition="python: view.is_source and context.sponsor">
+                (sponsored by <a tal:replace="structure context/sponsor/fmt:link"/>)
+              </tal:source_sponsor>
+        </li>
+
+        <li>
+          <span tal:condition="chained_copies">
+            Originally
+            <p tal:replace="python: 'uploaded to' if view.is_source
+                                    else 'built as'" />
+          </span>
+          <span tal:condition="not: chained_copies">
+            Copied from
+          </span>
+
+          <tal:source_original_location condition="view/is_source">
+            <tal:define
+              define="linkify_archive view/linkify_source_archive;
+                      source context/sourcepackagerelease">
+              <tal:message
+                define="series source/upload_distroseries;
+                        distro series/distribution;
+                        message string:${distro/name} ${series/name} in "
+                replace="message" />
+              <a tal:condition="linkify_archive"
+                 tal:attributes="href upload_archive/fmt:url"
+                 tal:content="upload_archive/displayname" />
+              <tal:message
+                condition="not:linkify_archive"
+                define="message string:${upload_archive/displayname}"
+                replace="message" />
+            </tal:define>
+          </tal:source_original_location>
+
+          <tal:comment condition="nothing">
+              Only show "creator" if we didn't show above, at the
+              previous copied_from_archive "li" tag.
+          </tal:comment>
+
+          <tal:source_creator_and_sponsor condition="not: chained_copies">
+              <tal:source_creator condition="context/creator">
+                by <a tal:replace="structure context/creator/fmt:link"/>
+              </tal:source_creator>
+              <tal:source_sponsor condition="python: view.is_source and context.sponsor">
+                (sponsored by <a tal:replace="structure context/sponsor/fmt:link"/>)
+              </tal:source_sponsor>
+           </tal:source_creator_and_sponsor>
+
+          <tal:binary_build_location condition="view/is_binary">
+            <tal:message
+              define="build context/binarypackagerelease/build;
+                      pocket build/pocket;
+                      arch build/distro_arch_series;
+                      series arch/distroseries;
+                      distro series/distribution;
+                      message string:${distro/name} ${series/name}-${pocket/name/fmt:lower} ${arch/architecturetag} in ${upload_archive/displayname}"
+              replace="message" />
+          </tal:binary_build_location>
+        </li>
+    </tal:copied>
   </ul>
 </tal:root>