cvsclient: Do not abort checkout when skipping $Log$ keyword expansion
ClosedPublic
Actions

Authored by anlambert on Oct 20 2022, 3:00 PM.

Details

Reviewers

Group Reviewers

Maniphest Tasks

T4646: CVSProtocolError: Error from CVS server: b"E cvs checkout: Skipping `$Log$' keyword due to excessive comment leader...

Commits

rDLDCVSd00badc39fa3: cvsclient: Do not abort checkout when skipping $Log$ keyword expansion

Summary

Some CVS servers have restriction regarding the expansion of the $Log$
keyword in file to checkout and might skip that operation (see doc).

Nevertheless, official CVS client will still checkout the file but
without expanding the $Log$ keyword so we should have the same behavior
in the loader.

$ export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
$ export CVS_RSH="ssh"
$ cvs checkout -r 1.1.1.1 src/usr.bin/rcs/doc/rcs.ms
cvs checkout: Skipping `$Log$' keyword due to excessive comment leader.
U src/usr.bin/rcs/doc/rcs.ms

Closes T4646

Diff Detail

Repository

rDLDCVS CVS Loader

Branch

cvs-checkout-skip-log-expansion-continue

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 32484
Build 50870: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 50869: arc lint + arc unit

Event Timeline

anlambert created this revision.Oct 20 2022, 3:00 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptOct 20 2022, 3:00 PM

Build is green

Patch application report for D8750 (id=31530)

Rebasing onto adb3199b1d...

Current branch diff-target is up to date.

Changes applied before test

commit d00badc39fa306b2032bbca3d2c3ccd0a98c518f
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Oct 20 14:53:09 2022 +0200

    cvsclient: Do not abort checkout when skipping $Log$ keyword expansion
    
    Some CVS servers have restriction regarding the expansion of the $Log$
    keyword in file to checkout and might skip that operation.
    
    Nevertheless, official CVS client will still checkout the file but
    without expanding the $Log$ keyword so we should have the same behavior
    in the loader.
    
    Closes T4646

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

Harbormaster completed remote builds in B32484: Diff 31530.Oct 20 2022, 3:02 PM

anlambert requested review of this revision.Oct 20 2022, 3:02 PM

ardumont accepted this revision.Oct 21 2022, 10:42 AM

This revision is now accepted and ready to land.Oct 21 2022, 10:42 AM

Closed by commit rDLDCVSd00badc39fa3: cvsclient: Do not abort checkout when skipping $Log$ keyword expansion (authored by anlambert). · Explain WhyOct 21 2022, 10:45 AM

This revision was automatically updated to reflect the committed changes.

anlambert added a commit: rDLDCVSd00badc39fa3: cvsclient: Do not abort checkout when skipping $Log$ keyword expansion.