Page MenuHomeSoftware Heritage

Deduplicate 'mapping_status' and mapping logic from functions called by map_harvest
ClosedPublic

Authored by vlorentz on Tue, Feb 16, 10:01 AM.

Details

Summary

Instead, make these functions only process what is specific to each tool type
(ie. the layout of the metadata listing the files), and let map_harvest
deal with what is in common (mapping_status + calling map_sha1_and_add_in_data)

This is what I meant in our chat on 2021-02-01 about deduplicating
(and in the end, we don't need a generator to do it)

Diff Detail

Repository
rDMFCD ClearlyDefined metadata fetcher
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build has FAILED

Patch application report for D5079 (id=18129)

Rebasing onto f2c1b0bea0...

Current branch diff-target is up to date.
Changes applied before test
commit 982c80bbdc30e4dff4924141f49625c504f1460c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Feb 16 09:59:23 2021 +0100

    Deduplicate 'mapping_status' and mapping logic from functions called by map_harvest
    
    Instead, make these functions only process what is specific to each tool type
    (ie. the layout of the metadata listing the files), and let map_harvest
    deal with what is in common (mapping_status + calling map_sha1_and_add_in_data)

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

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, Feb 16, 10:01 AM
Harbormaster failed remote builds in B19233: Diff 18129!

Build is green

Patch application report for D5079 (id=18130)

Rebasing onto f2c1b0bea0...

Current branch diff-target is up to date.
Changes applied before test
commit 10e391971803c458815422099f681195a4bb4967
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Tue Feb 16 09:59:23 2021 +0100

    Deduplicate 'mapping_status' and mapping logic from functions called by map_harvest
    
    Instead, make these functions only process what is specific to each tool type
    (ie. the layout of the metadata listing the files), and let map_harvest
    deal with what is in common (mapping_status + calling map_sha1_and_add_in_data)

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

This revision is now accepted and ready to land.Tue, Feb 16, 10:08 AM