Page MenuHomeSoftware Heritage

replay: Fix links restoration in DirEditor.remove_external_path
ClosedPublic

Authored by anlambert on Jan 26 2022, 3:36 PM.

Details

Summary

The restoration of this type of file was not correctly handled
in the remove_external_path method of the DirEditor class.

Depends on D7041

Diff Detail

Repository
rDLDSVN Subversion (SVN) loader
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D7042 (id=25530)

Could not rebase; Attempt merge onto afdee6dbee...

Updating afdee6d..2bbbd6f
Fast-forward
 swh/loader/svn/replay.py            |  2 +-
 swh/loader/svn/svn.py               | 27 +++++++++++++++++++--------
 swh/loader/svn/tests/test_loader.py | 22 ++++++++++++++++++----
 3 files changed, 38 insertions(+), 13 deletions(-)
Changes applied before test
commit 2bbbd6f99f9cd64718bac40a7e78a04c3026c6c3
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Jan 26 15:33:17 2022 +0100

    replay: Fix links restoration in DirEditor.remove_external_path
    
    The restoration of this type of file was not correctly handled
    in the remove_external_path method of the DirEditor class.

commit 34f61cb58157e0cf4a70810a6ef66364b3c2b24e
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Jan 26 15:28:54 2022 +0100

    svn: Ignore externals parsing related errors when exporting
    
    Those are not critical for a successfull loading of repositories with
    malformed external definitions so we can safely ignore them.
    
    Related to T3875

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

This revision is now accepted and ready to land.Jan 26 2022, 4:20 PM