Commit Graph

233 Commits

Author SHA1 Message Date
des
0e2eb33ac3 Add an "iso8601" option keyword which causes 'cvs log' etc. to print
dates in ISO 8601 format.

Approved by:	peter
MFC after:	2 weeks
2004-07-06 08:10:38 +00:00
peter
b04a2d6a7a Merge 1.11.15+ -> 1.11.17 changes onto mainline. I've left cvs.1 alone
for now.
2004-06-10 19:12:50 +00:00
peter
8416bda1d2 Import cvs-1.11.17 onto vendor branch. 2004-06-10 19:05:38 +00:00
peter
1ca65160a6 This commit was generated by cvs2svn to compensate for changes in r130303,
which included commits to RCS files with non-trunk default branches.
2004-06-10 19:05:38 +00:00
des
186c7aa46c The list of files / directories to remove has moved to FREEBSD-Xlist. 2004-06-09 20:51:26 +00:00
des
1236d175c6 List of files and directories to delete before importing a new release. 2004-06-09 20:14:53 +00:00
des
4dcedfc486 Merge updated patch from vendor branch (1.1.1.17) 2004-05-20 13:17:16 +00:00
des
3d101ef985 The previous commit broke compatibility with certain buggy third-party
CVS clients.  This commit fixes that and brings this file up-to-date
with CVS 1.1.16.

Obtained from:	ccvs.cvshome.org
2004-05-20 13:11:32 +00:00
des
8f2e3e022b Merge parser fix from vendor branch (rev 1.1.1.16) 2004-05-19 06:21:56 +00:00
des
52b98bc9df Fix a couple of parser bugs. 2004-05-19 06:11:44 +00:00
peter
f38d95d303 Change WriteTemplate to take const char * args.
The Name_Root() call seems to be defunct, remove it because it was
causing compile problems.  The real magic seems to be in the Parse_Info()
callback (which was also updated for const char * args).
2004-04-15 01:41:05 +00:00
peter
ad4edd00d3 Fix merge typo. Add missing ",". 2004-04-15 01:31:28 +00:00
peter
a79695e04d File removed from vendor branch 2004-04-15 01:19:11 +00:00
peter
e521a8e42c This commit was generated by cvs2svn to compensate for changes in r128270,
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:19:11 +00:00
peter
39ae581ddb Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline 2004-04-15 01:17:28 +00:00
peter
6045cae71a Import cvs-1.11.15 2004-04-15 01:01:56 +00:00
peter
3aa249bff6 This commit was generated by cvs2svn to compensate for changes in r128266,
which included commits to RCS files with non-trunk default branches.
2004-04-15 01:01:56 +00:00
nectar
de2beba6ff Merge security fix from vendor branch (revision 1.1.1.14). 2004-01-21 16:29:16 +00:00
nectar
0de1aa939e Incorporate two security fixes from later versions of CVS.
From the NEWS file of cvs 1.11.11:

  * pserver can no longer be configured to run as root via the
    $CVSROOT/CVSROOT/passwd file, so if your passwd file is
    compromised, it no longer leads directly to a root hack.  Attempts
    to root will also be logged via the syslog.

  * Malformed module requests could cause the CVS server to attempt
    to create directories and possibly files at the root of the
    filesystem holding the CVS repository.  Filesystem permissions
    usually prevent the creation of these misplaced directories, but
    nevertheless, the CVS server now rejects the malformed requests.

Obtained from:	ccvs.cvshome.org
2004-01-21 16:27:56 +00:00
nectar
cf29303145 This commit was generated by cvs2svn to compensate for changes in r124793,
which included commits to RCS files with non-trunk default branches.
2004-01-21 16:27:56 +00:00
obrien
b876c3cd17 Document CVS_CLIENT_PORT. 2003-11-13 17:57:53 +00:00
obrien
58bbb89074 Add "blame" as an "annotate" alias for interoperability with subversion. 2003-07-07 19:15:36 +00:00
des
0077bc4bf0 Add support for OpenBSD extensions to the $CVSROOT/config syntax.
Approved by:	peter
Obtained from:	OpenBSD
2003-03-20 11:05:48 +00:00
peter
93e8ee0f1a Turn off Checkin-prog and Update-prog. 2003-01-21 22:10:13 +00:00
peter
9d868620cc This file is gone on the vendor branch and no longer referenced in the
source.
2003-01-21 22:02:26 +00:00
peter
aa1e88ae9b This commit was generated by cvs2svn to compensate for changes in r109661,
which included commits to RCS files with non-trunk default branches.
2003-01-21 22:02:26 +00:00
peter
b1cdaf4815 Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainline 2003-01-21 22:01:38 +00:00
peter
8e2371092e This should never have been imported. Nuke from vendor branch. 2003-01-21 21:58:47 +00:00
peter
a98d2f0a90 This commit was generated by cvs2svn to compensate for changes in r109658,
which included commits to RCS files with non-trunk default branches.
2003-01-21 21:58:47 +00:00
peter
821118cc49 Import cvs-1.11.5 onto vendor branch 2003-01-21 21:53:03 +00:00
peter
245f20f1d1 This commit was generated by cvs2svn to compensate for changes in r109655,
which included commits to RCS files with non-trunk default branches.
2003-01-21 21:53:03 +00:00
peter
ce098c03a4 Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainline
Approved by:	re
2002-12-02 03:17:49 +00:00
peter
3dc96f7243 Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all
of the bugs that I know of.  We've been running a slightly older version
of this on freefall/repoman, where it was afflicted by a silly merge error
on my part (fixed).

Approved by:  re
2002-12-02 03:13:37 +00:00
peter
c88e730141 This commit was generated by cvs2svn to compensate for changes in r107484,
which included commits to RCS files with non-trunk default branches.
2002-12-02 03:13:37 +00:00
peter
9ebea44a28 Fix a cvs server bug introduced in 1.11.2, in the words of the author:
---
Fix communication hanging in communication shutdown phase, caused by at
least older CVS clients (version < 1.11.2) and a semantically incorrect
usage of getc() by the server.
---

getc() was being used on a blocking socket/pipe.

Submitted by:   rse
2002-09-02 07:58:04 +00:00
peter
a34725cd3a Repo copy these files to the bmake area, these are not part of the
cvs vendor release and should not have been 'cvs add'ed there in
the first place.
2002-09-02 06:09:03 +00:00
peter
ca4ebacf48 Remove these files from the vendor branch, they are no longer in 1.11.2 2002-09-02 06:02:40 +00:00
peter
1ab798bddc Minor updates after 1.11.2 import 2002-09-02 05:58:30 +00:00
peter
a2b6a3a9b8 Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline 2002-09-02 05:57:14 +00:00
peter
cf46dfb750 Import cvs-1.11.2 onto vendor branch
Obtained from: http://www.cvshome.org/
2002-09-02 05:50:28 +00:00
peter
9977823bcf This commit was generated by cvs2svn to compensate for changes in r102840,
which included commits to RCS files with non-trunk default branches.
2002-09-02 05:50:28 +00:00
fenner
aeccf286e8 Always upload new files, even if the timestamps match. This is a workaround
for the trouble that DES and I had with MFCs: when "cvs update -jfoo -jbar"
creates a new file, it sets the version to 0 ("new") but sets the timestamp
in the Entries file to the timestamp of the file that's new on the branch.
The CVS client doesn't upload files whose timestamps match with the Entries
file, so these new files don't get uploaded to the server and the server
fails when trying to check them in.

PR:		bin/40227
Approved by:	peter
MFC after:	2 weeks
2002-07-08 10:05:26 +00:00
keramida
97d1ceb026 CVS_RSH defaults to 'ssh' these days, and not 'rsh'.
PR:		docs/37429
Submitted by:	Martin v. Löwis <martin@v.loewis.de>
Reviewed by:	peter
2002-05-12 02:12:04 +00:00
dillon
e67d87ef7c oops, forgot to commit man page for cvs changes 2001-09-21 19:05:36 +00:00
dillon
903a77c857 Implement comprehensive CVS/Template support to complement the Template
support that already exists for checkout.  The -T option for cvs update
and cvs checkout may be used to cause CVS to retrieve/update the checkin
template when possible.

MFC after:	1 week
2001-09-15 05:57:52 +00:00
dillon
41d5a1c2e8 Implement -j for cvs diff, allowing tag:date based diffs (normally date-based
diffs are against the head branch only).

MFC after:	1 week
2001-09-15 05:50:59 +00:00
peter
cc58cb8636 Merge vendor branch onto mainline (try to fix HAVE_KERBEROS) 2001-08-20 08:47:21 +00:00
peter
92c0df1bed Fix the HAVE_KERBEROS case. It seems somebody got carried away
with cut/paste in the last release.

Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
Obtained from:	http://ccvs.cvshome.org/source/browse/ccvs/src/client.c.diff?r1=1.302&r2=1.303
2001-08-20 08:42:00 +00:00
peter
6696e00e0f Revert part of the 1.11->1.11.1p1 change. Put the blank line back in
the beginning of constructed log messages being passed to $EDITOR.  This
is where folks start typing.
2001-08-13 21:21:13 +00:00
peter
42325ad854 Argh, this could not possibly have worked as it existed in the tree. 2001-08-10 11:14:53 +00:00
peter
b52f372000 Copy our changes from sccs2rcs.csh to sccs2rcs.in 2001-08-10 11:14:18 +00:00
peter
f406110b8f Removed in cvs-1.11.1p1 import 2001-08-10 11:04:36 +00:00
peter
27d520da05 This commit was generated by cvs2svn to compensate for changes in r81440,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:04:36 +00:00
peter
849a12e500 Another stray file that got imported a long time ago and never cleaned up. 2001-08-10 11:02:03 +00:00
peter
8e62bd79e3 This commit was generated by cvs2svn to compensate for changes in r81437,
which included commits to RCS files with non-trunk default branches.
2001-08-10 11:02:03 +00:00
peter
4d6f4adb8c This file is gone in cvs-1.11.1p1 (replaced by log.in) 2001-08-10 11:00:14 +00:00
peter
3e5eeb8744 These files have been replaced by .in versions in cvs-1.11.1p1 2001-08-10 10:55:45 +00:00
peter
43f9c4ed31 This commit was generated by cvs2svn to compensate for changes in r81434,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:55:45 +00:00
peter
51dcafc969 Re-kill this file. It got whiplash being killed and restored on the
mainline, it is truely dead now.
2001-08-10 10:39:29 +00:00
peter
36dac7a113 Nuke some stray files that stopped getting imported ages ago. 2001-08-10 10:38:11 +00:00
peter
15024f87a2 This commit was generated by cvs2svn to compensate for changes in r81426,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:38:11 +00:00
peter
5dd04d4ff6 Remove some expired files no longer in current cvs 2001-08-10 10:33:41 +00:00
peter
55acc2cedc This commit was generated by cvs2svn to compensate for changes in r81424,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:33:41 +00:00
peter
c9c973b345 Generate version.c on the fly rather than using a generated file. 2001-08-10 10:29:04 +00:00
peter
81a09b283d This commit was generated by cvs2svn to compensate for changes in r81422,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:29:04 +00:00
peter
090346d906 Get the version source from the (more) correct place.
Remove the obsolete cvsbug.sh script
2001-08-10 10:22:43 +00:00
peter
3d7368c400 This commit was generated by cvs2svn to compensate for changes in r81420,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:22:43 +00:00
peter
756926d0a8 Remove another obsolete file, last used in cvs-1.10 2001-08-10 10:05:43 +00:00
peter
f44cc288f5 This commit was generated by cvs2svn to compensate for changes in r81414,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:05:43 +00:00
peter
016761c692 Remove file obsoleted in 1.11.1p1 import 2001-08-10 10:02:36 +00:00
peter
207e92ada7 This commit was generated by cvs2svn to compensate for changes in r81412,
which included commits to RCS files with non-trunk default branches.
2001-08-10 10:02:36 +00:00
peter
51bd4f3eee Tweak for 1.11.1p1 2001-08-10 09:53:53 +00:00
peter
75f7ac20d0 Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is
still some suspicious and/or broken stuff to fix yet.
2001-08-10 09:53:06 +00:00
peter
a037ef8f32 Import cvs-1.11.1p1 onto vendor branch 2001-08-10 09:43:22 +00:00
peter
c132709d18 This commit was generated by cvs2svn to compensate for changes in r81404,
which included commits to RCS files with non-trunk default branches.
2001-08-10 09:43:22 +00:00
peter
013c530653 Flip the default for CVS_RSH to "ssh". I am tired of getting asked this
all the time, and IMHO it is long overdue.
2001-02-23 04:52:30 +00:00
jdp
e6f3651c03 Fix a bug that shows up when checking out files by date with the
"-D date" command line option.  There is code in the original to
handle a special case.  If the date search finds revision 1.1 it
is supposed to check whether revision 1.1.1.1 has the same date
stamp, which would indicate that the file was originally brought
in with "cvs import".  In that case it is supposed to return the
vendor branch version 1.1.1.1.

However, there is a bug in the code.  It actually compares the date
of revision 1.1 for equality with the date given on the command
line -- clearly wrong.  This commit fixes the coding bug.

There is an additional bug which is _not_ fixed in this commit.
The date comparison should not be a strict equality test.  It should
allow a fudge factor of, say, 2-3 seconds.  Old versions of CVS
created the two revisions with two separate invocations of the RCS
"ci" command.  We have many old files in the tree in which the
dates of revisions 1.1 and 1.1.1.1 differ by 1 second.

Approved by:	peter
2000-10-29 03:56:49 +00:00
peter
a152a7ef82 Merge changes from 1.10.7 -> 1.11 into mainline. Note that the old
anoncvs no-password hack is gone and is replaced by the official version.
2000-10-02 06:43:58 +00:00
peter
590c411955 Import cvs-1.11 onto vendor branch. 2000-10-02 06:33:59 +00:00
peter
e0aa09eb34 This commit was generated by cvs2svn to compensate for changes in r66525,
which included commits to RCS files with non-trunk default branches.
2000-10-02 06:33:59 +00:00
peter
a9a721b706 Missing quote
PR:		misc/19745
Submitted by:	Tony Finch <dot@dotat.at>
2000-09-25 18:23:34 +00:00
kris
3b6a5fa38a Use X x X's in mkstemp(). 2000-01-10 08:56:01 +00:00
peter
d8b8a4a2a7 I believe this fixes the problem certain people have been seeing when doing
checkouts from a local repo and committing via remote cvs.  A cvs -d
override of the mismatched CVS/Root files was missing.  This is a client
side fix, I'd appreciate it if the folks having trouble with this would
update their cvs client and pay particular attention next time..
2000-01-06 17:57:24 +00:00
peter
f76c207acb Unmangle cvs's MD5* calls. 1999-12-11 15:10:02 +00:00
peter
17ef7b81d6 Take a shot at using mkstemp() since we have a __warn_references() on
the other temporary file creation functions..
1999-12-11 14:58:02 +00:00
peter
702fe2212d Merge error. rcs_lockfile is freed after unlock. 1999-12-11 13:19:17 +00:00
peter
d47f395242 Update for 1.10.7 update. 1999-12-11 13:11:47 +00:00
peter
aab6aeadd4 Merge cyclic changes from 1.10.7 into our mainline. I did this seperately
as cvs update -j had kittens over the whole thing and I ended up merging
it by hand.
1999-12-11 13:00:18 +00:00
peter
206fbe27a1 Merge cyclic changes for 1.10.7 only our mainline. 1999-12-11 12:50:10 +00:00
peter
474a3106d4 Revert to vendor version. Sigh, this left the vendor branch because
of a fix for a y2k non-problem. :-(
1999-12-11 12:42:49 +00:00
peter
784ea5066c Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.
Obtained from:  cyclic.com
1999-12-11 12:24:21 +00:00
peter
b38569ff99 This commit was generated by cvs2svn to compensate for changes in r54427,
which included commits to RCS files with non-trunk default branches.
1999-12-11 12:24:21 +00:00
peter
e739339ea1 Add maintainer tag, and add a description of a few more things we've
added/changed locally for FreeBSD.
1999-12-08 16:49:38 +00:00
obrien
4dbe46020b Call isspace() directly to get rid of an objectionable include. 1999-12-04 08:44:05 +00:00
peter
370aed25b5 Document the .cvsrc "cvs" option for global options. 1999-12-04 02:15:30 +00:00
obrien
63450d9255 Support the environtmental var "CVS_OPTIONS". Which can hold a set of
default options for cvs.  These options are interpreted first and can be
overwritten by explicit command line parameters.

Obtained from:	GNU Grep 2.3
1999-12-04 01:23:26 +00:00
peter
6976901e20 If running on the client side of a remote commit, don't reject root when
trying to do a commit.  The server side will use the correct name, and the
client side restriction is just an annoyance.

Requested by:  lots of folks
1999-10-25 06:24:11 +00:00
obrien
587e83e810 Document -R. 1999-09-11 13:33:18 +00:00
bde
5e316e4dee Fixed style bugs in FreeBSD changes. KNF style doesn't apply to gnu
sources.
1999-07-04 15:46:44 +00:00
peter
61eefd2271 Don't assume branch heads are alive.. (related to previous change to the
older 1.9.26 baseline)
1999-05-10 13:49:51 +00:00