Commit Graph

28 Commits

Author SHA1 Message Date
Peter Wemm
676e0d5507 Fix a braino in the Attic/ removal code for $CVSHeader$ that originated
from XFree86.  I think this was harmless, the strncmp happened always
rather than being optimised out.

Submitted by: jdp
1997-08-22 06:57:30 +00:00
Peter Wemm
f86fcdade3 oops, missed a debug printf somehow.. 1997-08-19 11:29:01 +00:00
Peter Wemm
f9d4cf805b Redo the $CVSHeader$ support to use code similar to that from David Dawes
but adapted to run within cvs instead of rcs.
The stuff I hacked together didn't strip out "/Attic/" for files
on branches when the HEAD version was cvs rm'ed.
1997-08-19 11:21:34 +00:00
Peter Wemm
8338db6552 Apply Bill Fenner's patch for the lost vendor branch bug - I've looked
over the code too and it makes sense to me.

PR: 4033
1997-07-05 02:15:42 +00:00
Peter Wemm
6d4b6391fd remove some stray files 1997-06-22 12:50:33 +00:00
Peter Wemm
b4b1029478 merge conflicts 1997-06-22 10:59:24 +00:00
Peter Wemm
b4f08217a4 This commit was generated by cvs2svn to compensate for changes in r26801,
which included commits to RCS files with non-trunk default branches.
1997-06-22 10:55:49 +00:00
Peter Wemm
3398c9be05 Import cvs-1.9.10 1997-06-22 10:55:49 +00:00
Peter Wemm
a3faae319b If the localid is set, don't forget to expand it... 1997-06-02 07:06:35 +00:00
Peter Wemm
e393b6503f One of the new cvs's features is to be able to run a checker on the
log messages after they've been entered.  This is more flexible than
using the editinfo script since it works for all log message types
and doesn't have to deal with trying to run the editor for the user.

The problem is that the verifymsg script can't modify the file like
editinfo can, which makes it useless for cleaning up the message (as is
needed for remote commits etc).  This change causes the verifymsg handler
to read back the message after the verify script has run and returned an
"OK" exit code.
1997-05-26 05:15:29 +00:00
Peter Wemm
b599640220 Merge conflicts from 970523 import 1997-05-23 14:52:34 +00:00
Peter Wemm
aa134866ad Import a slightly newer version of 1.9.9 (as at 970523) that has fixed a
few more memory leaks and cleaned up getopt usage.  These were done shortly
after the last one I imported.  Very little has changed other than that.
(except for some doc updates)

Obtained from: cyclic.com
1997-05-23 14:48:05 +00:00
Peter Wemm
18c208774a This commit was generated by cvs2svn to compensate for changes in r26065,
which included commits to RCS files with non-trunk default branches.
1997-05-23 14:48:05 +00:00
Peter Wemm
348d458447 Attempt to work around the problem Bruce reported with 'cvs diff -rHEAD'
complaining about long-deleted files having been deleted and that there
is no diff available.
1997-05-21 16:21:08 +00:00
Peter Wemm
eac9eb60ad Implement a -R option to cvs to turn on read-only repository mode.
When using a local repository that is only written to by CVSup - which
I assume doesn't do the cvs locking protocol - this option might be a
speedup since cvs will not create lock files.
1997-05-17 14:20:33 +00:00
Peter Wemm
c5648cfb9a use xstrdup rather than strdup in case of malloc failure. 1997-05-17 14:14:47 +00:00
Peter Wemm
e7905b1443 Catch write-lock attempts immediately if running in read-only mode rather
than depending on getting a write fail.
1997-05-17 14:04:18 +00:00
Peter Wemm
484aca02e2 Pull in OpenBSD's support for checking out from a read-only repository,
such as within an anoncvs server, or from a CDROM repository.
Cyclic (the cvs maintainers) do not like this approach and have an
alternative read-only system, but that requires a read/write repository to
work (which rules out CDROM).

Obtained from: OpenBSD
1997-05-17 14:01:25 +00:00
Peter Wemm
16d2615d3e Complete the support for $FreeBSD$. Add an option "tagexpand=" which
controls the RCSINCEXC encironment variable for our rcs version, and
also convert the rest of the checkout enhancements from rcs into cvs's
fast checkout code.  (yes, cvs doesn't call 'co' anymore)
We now have fine grained individual keyword expansion control and can
set the keyword to anything the user wants.

Also, a new keyword, $CVSHeader$ comes in from rcs, it's like $Header$
except that it shows the pathname relative to the cvsroot.  eg:
  $FreeBSD: src/bin/ls/ls.c,v 1.10.2.14 1997/05/17 13:15:45 peter Exp $
	    ^^^^^^^^^^^^^^^^^
The idea for this comes from $XFree86$ which expands like $CVSHeader$.
The "local id" string can be set to expand like Id, Header or CVSHeader.
(Matching support for this is apparently happening in cvsup right now)
1997-05-17 13:38:45 +00:00
Peter Wemm
740a435538 Initial round of support for a local $Id$ keyword in cvs, eg: $FreeBSD$.
This is not complete yet in that it doesn't drive our version of RCS
completely, but it does work fine when you do the appropriate magic.

Obtained from: OpenBSD source tree
1997-05-16 00:12:16 +00:00
Peter Wemm
625799437a Merge import conflicts 1997-05-15 22:52:26 +00:00
Peter Wemm
4a59246031 Import of cvs-1.9.9-970515 onto vendor branch.
Obtained from: cyclic.com
1997-05-15 22:46:24 +00:00
Peter Wemm
474fb3aab4 This commit was generated by cvs2svn to compensate for changes in r25839,
which included commits to RCS files with non-trunk default branches.
1997-05-15 22:46:24 +00:00
Satoshi Asami
0aa19758df Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix. 1996-12-19 08:55:10 +00:00
Satoshi Asami
7565cfa2ea Fix the "moving head" problem. 1996-12-12 04:37:35 +00:00
John Polstra
1a3709045d Fix a bug in the "cvs init" command. It ignored the global "-H" option.
I.e., "cvs -H init" went ahead and initialized the repository, and did
not print out a usage message.  Not nice.

Also added the "init" command to the list that comes out when you type
"cvs --help-commands".  There is still not a word about it in the manual
page.

Yes, I am sending these fixes to the FSF.
1996-10-01 00:51:27 +00:00
Peter Wemm
a7d542e842 Implement a horrible (but simple) hack to allow some control over the
branch number that is assigned.  This is specifically to support the
local commit feature of cvsup.  If one sets $CVS_LOCAL_BRANCH_NUM to
(say) 1000 then branches the local repository, the revision numbers will
look like 1.66.1000.xx.  This is almost a dead-set certainty that there
will be no conflicts with version numbers. :-)

(This needs to be something more than an option to 'cvs tag' or 'cvs rtag'
as various parts of cvs "know" how to automatically branch files (eg: cvs
add).  Trying to remember state is getting "Too Hard (TM)")
1996-09-03 23:19:51 +00:00
Peter Wemm
18576028af Import of slightly trimmed cvs-1.8 distribution. Generated files
and non-unix code has been left out.
1996-08-20 23:46:10 +00:00