cvs diff within verifymsg

[Ryan Thompson]

Hello,

I have a verifymsg script that runs the changed source code hunks
through a series of checks, exiting with an error if any of those checks
fail. In order to determine what has been changed, the verifymsg script
runs "cvs diff" (without any filename arguments) and parses that output.

I'm aware that locking is already enabled by the time verifymsg is run.
However, if a plain "cvs commit" or "cvs commit -m 'message'" is run,
the diff works fine without any errors or warnings. If instead "cvs
commit file.c" is run (even if file.c was the same file that would have
been implicitly checked in by the plain "cvs commit"), the whole thing
deadlocks with the usual message:

cvs diff: [00:32:20] waiting for username's lock in
/path/to/repo/module

I'm not surprised by this, but I am surprised that it works when no
explicit filenames are given to commit.

More to the point, how can I circumvent the locking for this use case so
I can get cvs diff output in verifymsg?

Thanks,
- R

[Jones, Larry]

Use cvs -n diff.

-Larry Jones

-----Original Message-----
From: info-cvs-bounces+lawrence.jones=***@nongnu.org [mailto:info-cvs-bounces+lawrence.jones=***@nongnu.org] On Behalf Of Ryan Thompson
Sent: Monday, June 17, 2013 8:50 PM
To: info-***@nongnu.org
Subject: cvs diff within verifymsg

Hello,

I have a verifymsg script that runs the changed source code hunks through a series of checks, exiting with an error if any of those checks fail. In order to determine what has been changed, the verifymsg script runs "cvs diff" (without any filename arguments) and parses that output.

I'm aware that locking is already enabled by the time verifymsg is run.
However, if a plain "cvs commit" or "cvs commit -m 'message'" is run, the diff works fine without any errors or warnings. If instead "cvs commit file.c" is run (even if file.c was the same file that would have been implicitly checked in by the plain "cvs commit"), the whole thing deadlocks with the usual message:

cvs diff: [00:32:20] waiting for username's lock in /path/to/repo/module

I'm not surprised by this, but I am surprised that it works when no explicit filenames are given to commit.

More to the point, how can I circumvent the locking for this use case so I can get cvs diff output in verifymsg?

Thanks,
- R

[Ryan Thompson]

Post by Jones, Larry

Post by Ryan Thompson
More to the point, how can I circumvent the locking for this
use case so I can get cvs diff output in verifymsg?

Use cvs -n diff.
-Larry Jones

Right. Completely forgot about -n. Thanks!

- R