Auto-merging swh/indexer/tests/conftest.py
Merge made by the 'recursive' strategy.
 swh/indexer/indexer.py                    |  48 ++++++-----
 swh/indexer/metadata.py                   | 115 ++++++++++++-------------
 swh/indexer/sql/30-schema.sql             |  20 ++---
 swh/indexer/sql/50-func.sql               |  30 +++----
 swh/indexer/sql/60-indexes.sql            |  10 +--
 swh/indexer/sql/upgrades/134.sql          |  18 ++++
 swh/indexer/storage/__init__.py           |  38 +++++----
 swh/indexer/storage/db.py                 |  26 +++---
 swh/indexer/storage/in_memory.py          |  24 +++---
 swh/indexer/storage/interface.py          |  22 ++---
 swh/indexer/storage/model.py              |   6 +-
 swh/indexer/tests/conftest.py             |   2 +-
 swh/indexer/tests/storage/conftest.py     |   6 +-
 swh/indexer/tests/storage/test_storage.py | 134 +++++++++++++++---------------
 swh/indexer/tests/tasks.py                |  10 +--
 swh/indexer/tests/test_cli.py             |  20 ++---
 swh/indexer/tests/test_indexer.py         |  16 ++--
 swh/indexer/tests/test_metadata.py        |  59 ++++++-------
 swh/indexer/tests/test_origin_metadata.py |  54 ++++++------
 swh/indexer/tests/utils.py                |  30 +++----
 20 files changed, 353 insertions(+), 335 deletions(-)
 create mode 100644 swh/indexer/sql/upgrades/134.sql

commit 55f534a56636979cdb5edc00a7c5d6ac3b6fb39e
Merge: d3f6815 5f72e67
Author: Jenkins user <jenkins@localhost>
Date:   Wed Jun 1 13:36:27 2022 +0000

    Merge branch 'diff-target' into HEAD

commit 5f72e67ad5647716e8ea5c83c60e3ed09424070d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jun 1 15:35:53 2022 +0200

    tests: Simplify definition of ORIGINS list

commit b0b5589eb540cedec8b8ca362e4f3a2683d0d317
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jun 1 14:42:37 2022 +0200

    Replace RevisionMetadataIndexer with DirectoryMetadataIndexer
    
    This will make it easier to support indexing from releases in the future,
    as it will remove the strong dependency on revision ids in the database
    and interfaces.
    
    The existence of the indexer/table  is mostly to deduplicate work between
    origins with the same head revision, and we do not use it outside this
    context, so this should have no impact.
    
    The DB migration works by dropping both tables and re-indexing from
    scratch; which is necessary as we need to replace revision ids with
    directory ids.

First, rewinding head to replay your work on top of it...
Applying: tests: Simplify definition of ORIGINS list

commit 8eb0b1bcb195f4c0618bcd026aba8939c500fba0
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Jun 1 15:35:53 2022 +0200

    tests: Simplify definition of ORIGINS list

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