Paths

Table of Contentst

Differential D6589

ra: Fix edge case in svn:eol-style property handling
ClosedPublic
Actions

Authored by anlambert on Oct 29 2021, 8:27 PM.

Details

Reviewers

None

Group Reviewers

Reviewers

Maniphest Tasks

T3695: Investigate revision reconstruction discrepancy with subversion export

Commits

rDLDSVN3bde065e0b64: ra: Fix edge case in svn:eol-style property handling

Summary

In a subversion repository, files contained in a directory can have the
svn:eol-style property set in order to define which line endings should
be used when exporting a revision.

Nevertheless, the directory and its content can be removed in another
revision and added again in another one without setting the svn:eol-style
property this time.

The subversion loader already handles that property to ensure reconstructed
filesystem for a revision through the svn_ra API will be identical to the one
obtained by exporting that revision. But it did not handle properly the case
when a directory and its content are removed recursively, resulting in eol-style
mapping for the concerned files not cleared. This was leading to invalid
reconstructed filesystem when files get added again without the property
set as end of lines are replaced while they should not.

So ensure to properly handle the recursive removal of a directory and its
content by clearing the eol-style mapping for removed files.

Related to T3695

Issue found by analyzing load failures reported in that sentry issue.

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

anlambert created this revision.Oct 29 2021, 8:27 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptOct 29 2021, 8:27 PM

Build is green

Patch application report for D6589 (id=23951)

Rebasing onto ed8c189b82...

Current branch diff-target is up to date.

Changes applied before test

commit d424bd121af6ba2da53f4665ea9291761bcb4798
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 29 20:09:56 2021 +0200

    ra: Fix edge case in svn:eol-style property handling
    
    In a subversion repository, files contained in a directory can have the
    svn:eol-style property set in order to define which line endings should
    be used when exporting a revision.
    
    Nevertheless, the directory and its content can be removed in another
    revision and added again in another one without setting the svn:eol-style
    property this time.
    
    The subversion loader already handles that property to ensure reconstructed
    filesystem for a revision through the svn_ra API will be identical to the one
    obtained by exporting that revision. But it did not handle properly the case
    when a directory and its content are removed recursively, resulting in eol-style
    mapping for the concerned files not cleared. This was leading to invalid
    reconstructed filesystem when files get added again without the property
    set as end of lines are replaced while they should not.
    
    So ensure to properly handle the recursive removal of a directory and its
    content by clearing the eol-style mapping for removed files.
    
    Related to T3695

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

Harbormaster completed remote builds in B24828: Diff 23951.Oct 29 2021, 8:29 PM

anlambert requested review of this revision.Oct 29 2021, 8:29 PM

anlambert mentioned this in T3695: Investigate revision reconstruction discrepancy with subversion export.Nov 2 2021, 1:50 PM

anlambert added a child revision: D6595: ra: Do not process end of lines for svn links.Nov 2 2021, 6:14 PM

Update: Add function add_commit to ease tests implementation and readability

Build has FAILED

Patch application report for D6589 (id=23969)

Rebasing onto ed8c189b82...

Current branch diff-target is up to date.

Changes applied before test

commit 646a63a741259e672d3a5e4001a13a5303a4747e
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 29 20:09:56 2021 +0200

    ra: Fix edge case in svn:eol-style property handling
    
    In a subversion repository, files contained in a directory can have the
    svn:eol-style property set in order to define which line endings should
    be used when exporting a revision.
    
    Nevertheless, the directory and its content can be removed in another
    revision and added again in another one without setting the svn:eol-style
    property this time.
    
    The subversion loader already handles that property to ensure reconstructed
    filesystem for a revision through the svn_ra API will be identical to the one
    obtained by exporting that revision. But it did not handle properly the case
    when a directory and its content are removed recursively, resulting in eol-style
    mapping for the concerned files not cleared. This was leading to invalid
    reconstructed filesystem when files get added again without the property
    set as end of lines are replaced while they should not.
    
    So ensure to properly handle the recursive removal of a directory and its
    content by clearing the eol-style mapping for removed files.
    
    Related to T3695

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

Harbormaster failed remote builds in B24845: Diff 23969!Nov 3 2021, 1:45 PM

Update: Fix for Python 3.7

Build is green

Patch application report for D6589 (id=23973)

Rebasing onto ed8c189b82...

Current branch diff-target is up to date.

Changes applied before test

commit 3bde065e0b64b573d650f4c328750e50ba0daae2
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 29 20:09:56 2021 +0200

    ra: Fix edge case in svn:eol-style property handling
    
    In a subversion repository, files contained in a directory can have the
    svn:eol-style property set in order to define which line endings should
    be used when exporting a revision.
    
    Nevertheless, the directory and its content can be removed in another
    revision and added again in another one without setting the svn:eol-style
    property this time.
    
    The subversion loader already handles that property to ensure reconstructed
    filesystem for a revision through the svn_ra API will be identical to the one
    obtained by exporting that revision. But it did not handle properly the case
    when a directory and its content are removed recursively, resulting in eol-style
    mapping for the concerned files not cleared. This was leading to invalid
    reconstructed filesystem when files get added again without the property
    set as end of lines are replaced while they should not.
    
    So ensure to properly handle the recursive removal of a directory and its
    content by clearing the eol-style mapping for removed files.
    
    Related to T3695

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

Harbormaster completed remote builds in B24849: Diff 23973.Nov 3 2021, 2:02 PM

This revision was not accepted when it landed; it landed in state Needs Review.Nov 3 2021, 3:38 PM

Closed by commit rDLDSVN3bde065e0b64: ra: Fix edge case in svn:eol-style property handling (authored by anlambert). · Explain Why

This revision was automatically updated to reflect the committed changes.

anlambert added a commit: rDLDSVN3bde065e0b64: ra: Fix edge case in svn:eol-style property handling.