Differential D6813

fix Log keyword expansion with trailing whitespace in prefix
ClosedPublic
Actions

Authored by stsp on Dec 9 2021, 3:45 PM.

Details

Reviewers

ardumont

Group Reviewers

Reviewers

Maniphest Tasks

T3691: Implement CVS loader

Commits

rDLDCVSa66c6b4937d4: fix Log keyword expansion with trailing whitespace in prefix

Summary

Our expansion of the Log keyword was slightly wrong. We need to
trim trailing whitespace from the "prefix" line content which
preceeds the Log keyword when we write out line content which
followed the Log keyword. Update the Log expansion example given
in a comment to document this (see there for details; this behaviour
of CVS is hard to explain without illustration).

Found while testing conversion of the OpenBSD CVS repository.
Add a new test which uses an RCS file from this repository to
reproduce this problem.

Diff Detail

Repository

rDLDCVS CVS Loader

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

stsp created this revision.Dec 9 2021, 3:45 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptDec 9 2021, 3:45 PM

Build is green

Patch application report for D6813 (id=24691)

Rebasing onto dcb895ca2f...

Current branch diff-target is up to date.

Changes applied before test

commit a66c6b4937d4acfbd8791ebf7d97470fc5875707
Author: Stefan Sperling <stsp@stsp.name>
Date:   Thu Dec 9 14:15:02 2021 +0100

    fix Log keyword expansion with trailing whitespace in prefix
    
    Our expansion of the Log keyword was slightly wrong. We need to
    trim trailing whitespace from the "prefix" line content which
    preceeds the Log keyword when we write out line content which
    followed the Log keyword. Update the Log expansion example given
    in a comment to document this (see there for details; this behaviour
    of CVS is hard to explain without illustration).
    
    Found while testing conversion of the OpenBSD CVS repository.
    Add a new test which uses an RCS file from this repository to
    reproduce this problem.

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

Harbormaster completed remote builds in B25544: Diff 24691.Dec 9 2021, 3:47 PM

stsp requested review of this revision.Dec 9 2021, 3:47 PM

stsp added a task: T3691: Implement CVS loader.Dec 9 2021, 3:48 PM

lgtm, one suggestion inline.

swh/loader/cvs/cvs2gitdump/cvs2gitdump.py
678–682	since we are already doing some formatting strings, might as well go all the way?

This revision is now accepted and ready to land.Dec 10 2021, 9:49 AM

stsp added inline comments.Dec 10 2021, 11:32 AM

swh/loader/cvs/cvs2gitdump/cvs2gitdump.py
678–682	since we are already doing some formatting strings, might as well go all the way? This suggestion does not work as-is because of the .encode('ascii') call applied to the format string. The prefix is a byte string and not necessarily ASCII-encoded. Yet the data in the format string should contain ASCII characters only. There may be other ways to use a format string which would make it work, of course. (The author name encoded in this keyword is a UNIX account name which is usually ASCII but could in theory be encoded differently. This is one of numerous potential encoding-related issues in the CVS loader which we may have to address once we see a relevant failure. But it is out of scope for this patch.)