Merge made by the 'recursive' strategy.
 swh/storage/migrate_extrinsic_metadata.py          | 50 ++++++++++----
 swh/storage/retry.py                               |  2 +
 .../tests/migrate_extrinsic_metadata/test_cran.py  | 76 ++++++++++++++++++++++
 .../migrate_extrinsic_metadata/test_deposit.py     | 32 ++++-----
 .../tests/migrate_extrinsic_metadata/test_pypi.py  |  9 +++
 swh/storage/tests/test_retry.py                    | 18 +++++
 6 files changed, 159 insertions(+), 28 deletions(-)

commit 43fce12ed681fdbb8196bfe20856ae622046aab7
Merge: bef08d63 6499feba
Author: Jenkins user <jenkins@localhost>
Date:   Thu Oct 1 18:08:00 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 6499feba9948c7a43a40439433b1f16bdec2a1d1
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 20:03:44 2020 +0200

    retry: don't retry on keyboardinterrupt.
    
    Otherwise, Ctrl-C is ignored if pressed while sending a request.

commit e393edd17272e0cd6e23a3668fc08db4d7151ddf
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:57:29 2020 +0200

    migrate_extrinsic_metadata: add support for guessing the origin of more PyPI packages from filenames.
    
    It now supports all pypi revisions with an id starting with 0, 1, or 2.

commit b6a10e5ee038c2dcd5748fe924d9cf8cb0fe40fc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:54:57 2020 +0200

    migrate_extrinsic_metadata: allow dash in deposit client and collection names.

commit 5fa348ba82c9d8449db40dfe67285137f8d66703
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Oct 1 19:53:53 2020 +0200

    migrate_extrinsic_metadata: update name of column deposit.swhid_context.
    
    It was renamed in 4d72d1be529a568784842f5c0864e862a4b4705c.

commit a56dbbc055dc233841cc9fdb5c37ca622a7d121d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Sep 30 13:07:49 2020 +0200

    migrate_extrinsic_metadata: Add support for the current format of original_artifacts written by the CRAN loader.

First, rewinding head to replay your work on top of it...
Fast-forwarded diff-target to base-revision-1000-D4123.