Page MenuHomeSoftware Heritage
Differential D5286

debian: Split original_artifact parsing out of resolve_revision_from
ClosedPublic
Actions

Authored by vlorentz on Mar 19 2021, 2:21 PM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Maniphest Tasks
T3141: Make loaders pass ExtId objects between functions instead of "known_artifact"
Commits
rDLDBASEe7ae6364c06a: debian: Split original_artifact parsing out of resolve_revision_from
Summary

We will need it independently in a future commit

Diff Detail

Event Timeline

vlorentz created this revision.Mar 19 2021, 2:21 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 19 2021, 2:21 PM
swh-public-ci added a comment.Mar 19 2021, 2:25 PM

Build is green

Patch application report for D5286 (id=18933)

Could not rebase; Attempt merge onto 132522e42e...

Merge made by the 'recursive' strategy.
 swh/loader/package/debian/loader.py              | 53 +++++++++++++----------
 swh/loader/package/debian/tests/test_debian.py   | 55 ++++++++++++++++++++++++
 swh/loader/package/nixguix/tests/test_nixguix.py | 33 ++++++++------
 3 files changed, 106 insertions(+), 35 deletions(-)
Changes applied before test
commit cc01ff996dafb644becdc5402117646c502d9b78
Merge: 132522e 93c9aa8
Author: Jenkins user <jenkins@localhost>
Date:   Fri Mar 19 13:23:14 2021 +0000

    Merge branch 'diff-target' into HEAD

commit 93c9aa8e014c19b02887e6c05a671ad7430235dd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Mar 18 16:18:40 2021 +0100

    debian: Split original_artifact parsing out of resolve_revision_from
    
    We will need it independently in a future commit

commit 9a4991b391e6b825f9dee3008a410650d434ca6d
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Mar 17 10:02:21 2021 +0100

    debian: Make resolve_revision_from use the sha256 of the .dsc
    
    Instead of the sha256 + name + ... of all the files of a package.
    
    This will be needed to transition to ExtID, as we can't reasonably write
    this large set in the ExtID storage; and the sha256 of the .dsc is good
    enough, as the .dsc contains hashes and names of other files.

commit 455e05837dc2fb59b4adcf01df27c6f7d64781dd
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Mar 16 14:44:33 2021 +0100

    test_load_nixguix_one_common_artifact_from_other_loader: Test all log lines, not just the last one
    
    It's stricter and more readable.

See https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/404/ for more details.

Harbormaster completed remote builds in B20013: Diff 18933.Mar 19 2021, 2:25 PM
vlorentz requested review of this revision.Mar 19 2021, 2:25 PM
vlorentz added a task: T3141: Make loaders pass ExtId objects between functions instead of "known_artifact".Mar 19 2021, 2:48 PM
ardumont accepted this revision.Mar 20 2021, 10:08 AM
This revision is now accepted and ready to land.Mar 20 2021, 10:08 AM
vlorentz updated this revision to Diff 18997.Mar 23 2021, 10:20 AM

rebase

swh-public-ci added a comment.Mar 23 2021, 10:25 AM

Build has FAILED

Patch application report for D5286 (id=18997)

Could not rebase; Attempt merge onto 132522e42e...

Updating 132522e..3190406
Fast-forward
 swh/loader/package/debian/loader.py              | 53 +++++++++++++----------
 swh/loader/package/debian/tests/test_debian.py   | 55 ++++++++++++++++++++++++
 swh/loader/package/nixguix/tests/test_nixguix.py | 33 ++++++++------
 3 files changed, 106 insertions(+), 35 deletions(-)
Changes applied before test
commit 3190406239d231d62b8583bb1aeb74def1016a08
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Mar 18 16:18:40 2021 +0100

    debian: Split original_artifact parsing out of resolve_revision_from
    
    We will need it independently in a future commit

commit 4960aa38b10b29d249b28b92e78e0308f482e551
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Mar 17 10:02:21 2021 +0100

    debian: Make resolve_revision_from use the sha256 of the .dsc
    
    Instead of the sha256 + name + ... of all the files of a package.
    
    This will be needed to transition to ExtID, as we can't reasonably write
    this large set in the ExtID storage; and the sha256 of the .dsc is good
    enough, as the .dsc contains hashes and names of other files.

commit cf8fc9e9bd19b4f303b33ddeb73dc285d835bfcc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Mar 16 14:44:33 2021 +0100

    test_load_nixguix_one_common_artifact_from_other_loader: Test all log lines, not just the last one
    
    It's stricter and more readable.

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/412/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/412/console

Harbormaster failed remote builds in B20074: Diff 18997!Mar 23 2021, 10:25 AM
swh-public-ci added a comment.Mar 23 2021, 10:31 AM

Build has FAILED

Patch application report for D5286 (id=18997)

Could not rebase; Attempt merge onto 132522e42e...

Updating 132522e..3190406
Fast-forward
 swh/loader/package/debian/loader.py              | 53 +++++++++++++----------
 swh/loader/package/debian/tests/test_debian.py   | 55 ++++++++++++++++++++++++
 swh/loader/package/nixguix/tests/test_nixguix.py | 33 ++++++++------
 3 files changed, 106 insertions(+), 35 deletions(-)
Changes applied before test
commit 3190406239d231d62b8583bb1aeb74def1016a08
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Mar 18 16:18:40 2021 +0100

    debian: Split original_artifact parsing out of resolve_revision_from
    
    We will need it independently in a future commit

commit 4960aa38b10b29d249b28b92e78e0308f482e551
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Mar 17 10:02:21 2021 +0100

    debian: Make resolve_revision_from use the sha256 of the .dsc
    
    Instead of the sha256 + name + ... of all the files of a package.
    
    This will be needed to transition to ExtID, as we can't reasonably write
    this large set in the ExtID storage; and the sha256 of the .dsc is good
    enough, as the .dsc contains hashes and names of other files.

commit cf8fc9e9bd19b4f303b33ddeb73dc285d835bfcc
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Mar 16 14:44:33 2021 +0100

    test_load_nixguix_one_common_artifact_from_other_loader: Test all log lines, not just the last one
    
    It's stricter and more readable.

Link to build: https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/417/
See console output for more information: https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/417/console

vlorentz updated this revision to Diff 19024.Mar 23 2021, 12:27 PM

rebase

swh-public-ci added a comment.Mar 23 2021, 12:31 PM

Build is green

Patch application report for D5286 (id=19024)

Could not rebase; Attempt merge onto 9a339e981a...

Updating 9a339e9..e7ae636
Fast-forward
 swh/loader/package/debian/loader.py            | 53 ++++++++++++++-----------
 swh/loader/package/debian/tests/test_debian.py | 55 ++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 23 deletions(-)
Changes applied before test
commit e7ae6364c06a4d1e1863e8c1e948cd3a82ca4286
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Thu Mar 18 16:18:40 2021 +0100

    debian: Split original_artifact parsing out of resolve_revision_from
    
    We will need it independently in a future commit

commit 268f83e943a439958840b4d8cdcff5c9eb16429e
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Wed Mar 17 10:02:21 2021 +0100

    debian: Make resolve_revision_from use the sha256 of the .dsc
    
    Instead of the sha256 + name + ... of all the files of a package.
    
    This will be needed to transition to ExtID, as we can't reasonably write
    this large set in the ExtID storage; and the sha256 of the .dsc is good
    enough, as the .dsc contains hashes and names of other files.

See https://jenkins.softwareheritage.org/job/DLDBASE/job/tests-on-diff/424/ for more details.

Harbormaster completed remote builds in B20100: Diff 19024.Mar 23 2021, 12:31 PM
Closed by commit rDLDBASEe7ae6364c06a: debian: Split original_artifact parsing out of resolve_revision_from (authored by vlorentz). · Explain WhyMar 23 2021, 4:33 PM
This revision was automatically updated to reflect the committed changes.
vlorentz added a commit: rDLDBASEe7ae6364c06a: debian: Split original_artifact parsing out of resolve_revision_from.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
loader/
package/
debian/
33 lines94%
Loading...

Diff 19024

View Options

swh/loader/package/debian/loader.py

Loading...
About · Developer information · Legal