Commit Graph

83 Commits

Author SHA1 Message Date
Peter Wemm
16f9c40248 Zap files not in cvs-1.10 1999-04-05 06:36:11 +00:00
Peter Wemm
feeca969b0 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 Wemm
46a2066259 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 Wemm
b791882da9 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 Wemm
6a2d2db53b 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
Peter Wemm
0008866e58 Import cvs-1.10 onto vendor branch. Merge to follow shortly.
Obtained from:	cyclic.com
1999-03-18 09:21:42 +00:00
Daniel O'Callaghan
6af24c708d 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
Daniel O'Callaghan
63688efca7 Yet another y2k bug. (printf("19%s %s", $3, $4);) 1999-01-15 05:15:41 +00:00
Matthew Dillon
467e41453a Fixed typo in previous commit. oops. 1998-12-03 07:25:13 +00:00
Matthew Dillon
da1852b35a 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
David E. O'Brien
96136e4f8a -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
Warner Losh
74542ae78c Use readlink correctly 1998-09-09 17:05:54 +00:00
Joseph Koshy
9595a75afa Spelling corrections.
PR: 6829
Submitted by: Josh Gilliam <josh@quick.net>
1998-06-03 04:21:41 +00:00
Peter Wemm
989c137029 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 Wemm
0e202e40d7 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 Wemm
41f4688892 It would help if it compiled. *blush* 1998-05-27 16:00:55 +00:00
Peter Wemm
07870b45ae 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 Wemm
f07a3e4e23 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
Poul-Henning Kamp
84717b42e8 .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 Wemm
044b7805a9 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 Wemm
ab10ac1949 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 Wemm
bde4819bd2 Merge changes from vendor branch into mainline 1998-03-10 13:58:02 +00:00
Peter Wemm
4b06c89291 Import cvs-1.9.26 onto vendor branch 1998-03-10 13:40:57 +00:00
Peter Wemm
f380a4f2e1 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 Wemm
950fca26ed 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 Wemm
8f3f2b2e9d 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
Peter Wemm
178f53ff27 Cosmetic cleanups for the local tag support. Since rcs isn't called
anymore, don't do all the putenv's for it's benefit.
1998-01-31 01:39:40 +00:00
Peter Wemm
b1408ba741 Merge vendor changes to files that we've touched onto mainline.
(If only all import/merges were this trivial :-)
1998-01-30 15:35:26 +00:00
Peter Wemm
7b9d411405 Import cvs-1.9.24 since it came quite soon after the snapshot that was
imported a few days ago.  There is very little difference, except that
the remote protocol apparently supports wrappers and -k options better.
1998-01-30 15:31:47 +00:00
Peter Wemm
a0c60322a8 This commit was generated by cvs2svn to compensate for changes in r32896,
which included commits to RCS files with non-trunk default branches.
1998-01-30 15:31:47 +00:00
Peter Wemm
9b9b7eea08 Update import instructions from last time. 1998-01-30 15:09:55 +00:00
Peter Wemm
f5c9b8cbc7 Merge CYCLIC branch changes 1998-01-26 04:50:17 +00:00
Peter Wemm
4665b7b2d1 Restore file that was inadvertently deleted last time 1998-01-26 04:48:56 +00:00
Peter Wemm
3d0e86bdb6 Remove stray files 1998-01-26 04:47:16 +00:00
Peter Wemm
2dfc3bcde9 missing bracket 1998-01-26 03:54:53 +00:00
Peter Wemm
64c8118794 Merge changes from CYCLIC onto main branch 1998-01-26 03:29:29 +00:00
Peter Wemm
d302a0c08c Merge changes from CYCLIC branch onto mainline. rcs.[ch] still to come. 1998-01-26 03:24:11 +00:00
Peter Wemm
57e58c3aa7 Import cvs-1.9.23 as at 19980123. There are a number of really nice
things fixed in here, including the '-ko' vs. -A problem with
remote cvs which caused all files with -ko to be resent each time
(which is damn painful over a modem, I can tell you).  It also found a
heap of stray empty directories that should have been pruned with the -P
flag to cvs update but were not for some reason.

It also has the fully integrated rcs and diff, so no more fork/exec
overheads for rcs,ci,patch,diff,etc.  This means that it parses the control
data in the rcs files only once rather than twice or more.

If the 'cvs diff' vs. Index thing is going to be fixed for future patch
compatability, this is the place to do it.
1998-01-26 03:09:57 +00:00
Peter Wemm
edd1d86130 This commit was generated by cvs2svn to compensate for changes in r32785,
which included commits to RCS files with non-trunk default branches.
1998-01-26 03:09:57 +00:00
Andrey A. Chernov
e562327407 Back out my -L change, now "patch -I" usage supposed to get Index:
precedence
1998-01-21 15:20:29 +00:00
Andrey A. Chernov
0d913a0d1a Fix wrong ---/*** names produced using -L diff option
CVS gurus from info-cvs agrees that previous Index: usage is bogus
1998-01-16 06:00:36 +00:00
Julian Elischer
34bda5731d Allow a -D'date' option to be included with a -r'branch'
on a checkout.
this allows us to do:
cd /usr/src/sys
cvs update -rRELENGE_2_2 -D"Yesterday"
which has been a feature sorely needed for any project with active branches.

warning: this breaks on usr.sbin/pkg_install for some reason.
everything else works as advertised.
(other things allready break on pkg_install, so it's not the fault of
this patch, it just falls faul of another bug somewhere)
If I had more time I'd make -r always accept the same syntax as -j (tag:data)
1998-01-12 06:51:07 +00:00
Peter Wemm
13aee6bd41 Fix a serious bug in the recursion processor. When descending a tree,
the descend can jump several directories down in one hit, eg: when a user
mentions multiple directories on the command line, eg: "cvs diff
sys/i386/isa/snd sys/sys".  The problem is that the chdir()s are
pushed/popped to account for this, but the "full path" merely has
the last component chopped off on the way back up.  This busts lots
of things when the recursion is backing up more than one directory (such
as in the example).  This causes 'cvs diff' to emit bogus Index: lines,
'cvs update' to do really stupid things, 'cvs commit' to record incorrect
pathnames etc.  I'm not sure that what I've done is quite correct, there
seems to be a comment that implies some sort of problem with "." vs. ""
equivalence or not, perhaps this is a problem on some other OS's, but
I've not (yet) found any problems.  This bug has been present since
at least cvs-1.8.1.

This should fix problems noted by several people including asami and jmg.
1997-10-12 12:47:05 +00:00
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
c222d4bb39 update the 'zapped files' list 1997-06-22 11:06:30 +00:00
Peter Wemm
b4b1029478 merge conflicts 1997-06-22 10:59:24 +00:00