Commit Graph

107 Commits

Author SHA1 Message Date
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
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
590c411955 Import cvs-1.11 onto vendor branch. 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
peter
a87f5a3076 Zap files not in cvs-1.10 1999-04-05 06:36:11 +00:00
peter
058f51c772 Stray files that used to be in 1.9.x that are not in 1.10 1999-04-05 06:31:43 +00:00
peter
ba72c1aa08 Merge cvs-1.9.xx -> 1.10 changes onto mainline.
Changes of significance include the top level CVS directory being optional
and defaulting to off..
1999-03-18 09:32:46 +00:00
peter
27155f7a1d Merge cvs-1.9.xx -> 1.10 changes onto mainline.
The merge turned up a long-standing bug in local additions.  I'm not
quite sure it's right yet.  (the code in question is dealing with
diffs relative to "HEAD" and dead revisions).
1999-03-18 09:31:26 +00:00
peter
308b60f668 Import cvs-1.10 onto vendor branch. Merge to follow shortly.
Obtained from:	cyclic.com
1999-03-18 09:21:42 +00:00
peter
0d50adfc04 This commit was generated by cvs2svn to compensate for changes in r44852,
which included commits to RCS files with non-trunk default branches.
1999-03-18 09:21:42 +00:00
danny
0e3575bb77 Tidy logic in sccs2rcs,
Fix y2kbug "19$year" in log.pl
PR:		9501
Submitted by:	Peter Jeremy <peter.jeremy@alcatel.com.au>
1999-01-15 12:05:57 +00:00
danny
22fad7338c Yet another y2k bug. (printf("19%s %s", $3, $4);) 1999-01-15 05:15:41 +00:00
dillon
c29e99d226 Fixed typo in previous commit. oops. 1998-12-03 07:25:13 +00:00
dillon
32e8f491a8 Reviewed by: "Jordan K. Hubbard" <jkh@zippy.cdrom.com>, cvs-all@freebsd.org
Add '-g' main option to cvs to better support shared-group access
    to a common checked-out *working* set by multiple users.  See manual
    page for details.
1998-12-03 07:22:44 +00:00
obrien
1ea3337a36 -v to show compiled in paths doesn't seem to exist.
PR:		docs/7912
Submitted by:	Stephen J. Roznowski <sjr@home.net>
1998-10-04 11:09:08 +00:00
imp
587fe3b394 Use readlink correctly 1998-09-09 17:05:54 +00:00
jkoshy
15683e67b6 Spelling corrections.
PR: 6829
Submitted by: Josh Gilliam <josh@quick.net>
1998-06-03 04:21:41 +00:00
peter
d1817d351a If we are logging into a cvs pserver with the username of "anoncvs",
and we have not done an explicit 'cvs login', then use a default password
of "anoncvs".  This allows things like:
  setenv CVSROOT :pserver:anoncvs@anoncvs.freebsd.org:/cvs
  cvs checkout src  (without doing the normal 'cvs login' for pserver mode)
but this runs over the :pserver: protocol rather than the more troublesome
rsh.  Naturally, the server had better be running in -R (readonly) mode :-)
1998-05-27 16:55:49 +00:00
peter
815e5f2dfa Make cvs really ignore a pserver password when the passwd field of the
CVSROOT/passwd file is empty.  A 'cvs login' still seems to be required
since the cvs client doesn't seem to believe it's possible to not need
a password (yet :-).  This is intended for cheap anoncvs use.
1998-05-27 16:27:18 +00:00
peter
cae10d0ea1 It would help if it compiled. *blush* 1998-05-27 16:00:55 +00:00
peter
66f8d308b9 Add a new long flag that causes cvs to ignore the CVSROOT/passwd file.
This is mostly intended for use on freefall where we'd like to provide
a passwd file for easy anoncvs mirroring access, but don't want to open
up the pserver on freefall itself.

While here, some initial tweaks intended for allowing an empty pserver
password.  I'm not sure that this works yet.
1998-05-27 15:26:12 +00:00
peter
474b0e97b3 Remove my hacks for capturing stdout/stderr through the protocol channel
while calling libdiff.  It's too ugly and not worth the recursion problems
when there is a malloc failure (which writes to stderr - now diverted via
the buf system, which calls malloc, which causes another error message etc).

We can live with the standard artificial slowdown, but reduce the time a
bit and only delay when we really need to (ie: when running as a server).
The usleep time could probably use some tuning, it basically needs to
replace the time that it used to take to fork a large process, exec gnudiff
and the time that gnudiff took before writing the initial output.

This eliminates a whole mess of other hacks I was considering that changed
use of xmalloc to alloca() etc.  It was going too fast in the wrong
direction.
1998-05-27 15:19:23 +00:00
phk
4c734c0e4d .Sh ENVIRONMENT VARIABLES -> .Sh ENVIRONMENT
PR:		6599
Reviewed by:	phk
Submitted by:	Josh Gilliam <josh@quick.net>
1998-05-13 07:57:49 +00:00
peter
05ae376d90 Argh!.. Spot the deliberate mistake that was probably causing the
leftover files in /tmp..  (this commit brought to you by 'cvs update -j')
1998-04-11 16:12:07 +00:00
peter
d0208572aa Tweak from the cvs sources just after the 1.9.26 release:
1998-03-07  Tim Pierce  <twp@skepsis.com>
    * rcs.c (RCS_checkout): Negation bug when checking out symlinks:
    existence_error should be !existence_error.

This shouldn't cause any major merge problems later.
1998-03-11 09:30:51 +00:00
peter
6b449debea Merge changes from vendor branch into mainline 1998-03-10 13:58:02 +00:00
peter
0c111e2b51 Import cvs-1.9.26 onto vendor branch 1998-03-10 13:40:57 +00:00
peter
a194b78bd2 This commit was generated by cvs2svn to compensate for changes in r34461,
which included commits to RCS files with non-trunk default branches.
1998-03-10 13:40:57 +00:00
peter
d5c5dbdaff A hack to work around the sleep prior to calling the built-in diff. This
affects speed of doing 'cvs diff' (in all modes) and 'cvs update' over the
network.

1: don't pause at all unless running in server protocol mode.
2: if running in server protocol mode, do a kludge that intercepts the
   stdout and stderr write functions and diverts them to cvs_output() and
   cvs_outerr().  Yes, this might be done with fwopen() etc, but that also
   requires copying "FILE" structs since you can't freopen stdout etc and
   specify functions at the same time.

This HACK will go away once the cvs folks have done their changes to the
library version of gnu diff to use the callbacks as mentioned in the
comments.
1998-02-14 09:47:14 +00:00
peter
d7aa12e045 Reduce the sleep(1) inbetween each diff, as suggested by bde some time
ago.  The real fix is rather large.
1998-02-08 06:48:37 +00:00