Bug 30423

Summary:

CVSROOT/modules has mistakenly single-line comments in some module-aliases

Product:

Base System

Reporter:

Giorgos Keramidas <charon>

Component:

misc

Assignee:

freebsd-bugs (Nobody) <bugs>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

5.0-CURRENT

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
patch.diff	none

Description Giorgos Keramidas 2001-09-07 23:40:01 UTC

	When using 'cvs co -c' on /home/ncvs (my local CVS mirror), I
	saw that a few lines were not actual module aliases, but plain
	empty lines, starting with whitespace and '#' characters.

	Looking at CVSROOT/modules, I found lines like:

	--------------------------------------------------------------
	bsd_apropos	src/usr.bin/apropos	#deleted files
	--------------------------------------------------------------

	The info page of CVS includes a detailed description of
	'module options' that can go after the module name in a line,
	but does not mention 'single line comments'.  It only mentions
	'comment lines' in the following context (in the section:
	Top -> Administrative files -> modules).

	    The `modules' file may contain blank lines and comments
	    (lines beginning with `#') as well as module definitions.

Fix: The attached patch removes the comments from those lines of
	CVSROOT/modules that contain such comment-like parts.

	Of course, instead of removing these lines altogether, one
	might prefer to move them `above' the relevant module lines.
How-To-Repeat: 
	The lines that include 'single line comments' in
	CVSROOT/modules cause 'cvs co -c' to list fake module entries
	like the ones shown below:

	    % cvs -R -d /home/ncvs co -c | grep '^[^a-zA-Z0-9]'
			#deleted files
			...

	This is obviously not a real module in the repository.
	And it is not a comment line either.

Comment 1 dima 2001-09-10 12:08:15 UTC

Giorgos Keramidas <charon@labs.gr> wrote:
> >Fix:
> 
> 	The attached patch removes the comments from those lines of
> 	CVSROOT/modules that contain such comment-like parts.
> 
> 	Of course, instead of removing these lines altogether, one
> 	might prefer to move them `above' the relevant module lines.

This would probably be best.  Actually, it'd probably be best if cvs
unsmoked its crack and allowed comments there, but I don't think
anybody wants to touch cvs any more than they have to :-).

Comment 2 Giorgos Keramidas 2001-09-10 19:35:10 UTC

Dima Dorfman <dima@unixfreak.org> wrote:

> Giorgos Keramidas <charon@labs.gr> wrote:
> > 	Of course, instead of removing these lines altogether, one
> > 	might prefer to move them `above' the relevant module lines.
> 
> This would probably be best.  Actually, it'd probably be best if cvs
> unsmoked its crack and allowed comments there, but I don't think
> anybody wants to touch cvs any more than they have to :-).

I chose to entirely remove these comments because converting them to
have the comments above the lines they refer to breaks the
sorted-alphabetically style of the rest of those modules.  Anyways, if
you want me to prepare a patch that moves the comment-lines above
those that they currently break, I can prepare one very easily.

Let's see.  The 'we should have CVS support this' option has to go
through the CVS developers list.  I will contact them, and if they
think this is a relatively useful thing to include in their next CVS
release, and I or one of them comes up with the proper diffs, I will
follow-up on this PR with the outcome of the discussion.

-giorgos

Comment 3 dd freebsd_committer

2001-09-15 17:17:13 UTC

State Changed
From-To: open->closed

Patch applied, but it would still be nice if cvs would grow the 
ability to handle comments where they were.