[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog NEWS doc/ChangeLog doc/cvs.1 doc... [cvs1-11-x-
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs ChangeLog NEWS doc/ChangeLog doc/cvs.1 doc... [cvs1-11-x-branch] |
|
Date: |
Fri, 25 Jan 2008 00:11:35 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Mark D. Baushke <mdb> 08/01/25 00:11:32
Modified files:
. : ChangeLog NEWS
doc : ChangeLog cvs.1 cvs.texinfo stamp-1 stamp-vti
version-client.texi version.texi
src : ChangeLog client.c client.h edit.c edit.h log.c
main.c recurse.c root.c sanity.sh
Log message:
* NEWS: Note that :extssh: method was fixed. New `cvs blame' as an
alias for `cvs annotate' command. New `cvs log -n' switch to undo
a `log -N' entry in a .cvsrc file.
* doc/cvs.texinfo (log options): Document the new cvs log -n
switch to reverse the -N switch.
* doc/cvs.texinfo (annotate & rannotate): Document "blame" as a
synonym for the "annotate" command.
(Patch suggested by "David O'Brien" <address@hidden>)
* doc/cvs.1, doc/stamp-1, doc/stamp-vti, doc/version-client.texi,
doc/version.texi: Regenerated.
* src/log.c (cvslog): New -n option to revert the -N switch.
(log_usage): Add -n to the help string.
* src/main.c (cmds[]): Add "blame" as a synonym for the
"annotate" command.
* src/sanity.sh (cvs-log): New tests for 'cvs log -N -n' validation.
(ann-10w1blame): Test the 'cvs blame' synonym for annotate.
(Patch suggested by "David O'Brien" <address@hidden>)
* src/edit.c (notify_check): Rename to...
(cvs_notify_check): ...this to avoid Mac OSX symbol conflicts.
* src/client.h, src/edit.h, src/recurse.c: Change all references.
* src/client.c (start_rsh_server): Use RSH_DFLT not a hardcoded "rsh"
* src/root.c (parse_cvsroot): Fix parsing for the :extssh: method.
* src/sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr
implementations.
(CVSROOTDIR): Use 'cvsrootdir' instead of 'cvsroot' to
avoid problems on case preserving and/or case insensitive
filesystems (e.g., HFS+).
(CVSROOT_DIRNAME): Use ${TESTDIR}/${CVSROOTDIR} instead of
${TESTDIR}/cvsroot to avoid filesystem case sensitivity problems.
(crerepos-extssh): Clone of crerepos tests, but use the :extssh:
method.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.692.2.259&r2=1.692.2.260
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.116.2.166&r2=1.116.2.167
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.721.2.128&r2=1.721.2.129
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.1?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.1.2.26&r2=1.1.2.27
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.545.2.70&r2=1.545.2.71
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-1?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.9.2.50&r2=1.9.2.51
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.19.2.95&r2=1.19.2.96
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version-client.texi?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.9.2.50&r2=1.9.2.51
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.20.2.95&r2=1.20.2.96
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.496&r2=1.2336.2.497
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.318.4.46&r2=1.318.4.47
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.h?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.39.6.5&r2=1.39.6.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.57.4.8&r2=1.57.4.9
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.h?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.4.8.1&r2=1.4.8.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/log.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.79.4.21&r2=1.79.4.22
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/main.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.172.4.20&r2=1.172.4.21
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.77.4.11&r2=1.77.4.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/root.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.60.2.17&r2=1.60.2.18
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.752.2.214&r2=1.752.2.215
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.692.2.259
retrieving revision 1.692.2.260
diff -u -b -r1.692.2.259 -r1.692.2.260
--- ChangeLog 14 Dec 2007 17:22:53 -0000 1.692.2.259
+++ ChangeLog 25 Jan 2008 00:11:26 -0000 1.692.2.260
@@ -1,3 +1,9 @@
+2008-01-24 Mark D. Baushke <address@hidden>
+
+ * NEWS: Note that :extssh: method was fixed. New `cvs blame' as an
+ alias for `cvs annotate' command. New `cvs log -n' switch to undo
+ a `log -N' entry in a .cvsrc file.
+
2007-12-14 Larry Jones <address@hidden>
* configure.in: Add --disable-mmap.
Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.116.2.166
retrieving revision 1.116.2.167
diff -u -b -r1.116.2.166 -r1.116.2.167
--- NEWS 22 Aug 2007 21:34:46 -0000 1.116.2.166
+++ NEWS 25 Jan 2008 00:11:26 -0000 1.116.2.167
@@ -1,6 +1,13 @@
Changes since 1.11.22:
**********************
+NEW FEATURES
+
+* A new log option -n reverts the -N option which may be in a .cvsrc
+ file.
+
+* The `cvs blame' command is now a synonym for the `cvs annotate' command.
+
BUG FIXES
* `cvs add' checks more thoroughly for `CVS' directories in the argument list.
@@ -33,6 +40,8 @@
* Thanks to a report and patch from <address@hidden>, potential stack
corruption during pserver login is avoided (bug #16961).
+* The :extssh: method is now properly recognized as an alias for :ext:.
+
DEVELOPER ISSUES
* We've standardized on Autoconf version 2.61 to get a bug fix that notes
Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.721.2.128
retrieving revision 1.721.2.129
diff -u -b -r1.721.2.128 -r1.721.2.129
--- doc/ChangeLog 7 May 2007 13:14:43 -0000 1.721.2.128
+++ doc/ChangeLog 25 Jan 2008 00:11:26 -0000 1.721.2.129
@@ -1,3 +1,14 @@
+2008-01-23 Mark D. Baushke <address@hidden>
+
+ * cvs.texinfo (log options): Document the new cvs log -n
+ switch to reverse the -N switch.
+ * cvs.texinfo (annotate & rannotate): Document "blame" as a
+ synonym for the "annotate" command.
+ (Patch suggested by "David O'Brien" <address@hidden>)
+
+ * cvs.1, stamp-1, stamp-vti, version-client.texi, version.texi:
+ Regenerated.
+
2007-05-07 Derek Price <address@hidden>
* cvsclient.text: Remove references to remote `init' command.
Index: doc/cvs.1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -b -r1.1.2.26 -r1.1.2.27
--- doc/cvs.1 21 Aug 2006 21:33:09 -0000 1.1.2.26
+++ doc/cvs.1 25 Jan 2008 00:11:26 -0000 1.1.2.27
@@ -1171,6 +1171,8 @@
.IP "\(bu" 2
Requires: repository.
.IP "\(bu" 2
+Synonym: blame
+.IP "\(bu" 2
Changes: nothing.
.SP
For each file in \fIfiles\fR, print the head revision
@@ -3141,6 +3143,14 @@
tags at all.
.SP
.IP "" 0
+\fB-n\fR
+.IP "" 2
+Print the list of tags for this file. This option can
+be very useful when your \fB.cvsrc\fR file has a
+\fBlog -N\fR entry as a way to get a full list of all
+of the tags.
+.SP
+.IP "" 0
\fB-R\fR
.IP "" 2
Print only the name of the \fBrcs\fR file.
Index: doc/cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.545.2.70
retrieving revision 1.545.2.71
diff -u -b -r1.545.2.70 -r1.545.2.71
--- doc/cvs.texinfo 28 Oct 2007 16:16:36 -0000 1.545.2.70
+++ doc/cvs.texinfo 25 Jan 2008 00:11:27 -0000 1.545.2.71
@@ -8753,6 +8753,8 @@
@item
Requires: repository.
@item
+Synonym: blame
address@hidden
Changes: nothing.
@end itemize
@@ -10463,6 +10465,12 @@
information, the log information is presented without
tags at all.
address@hidden -n
+Print the list of tags for this file. This option can
+be very useful when your @file{.cvsrc} file has a
address@hidden -N} entry as a way to get a full list of all
+of the tags.
+
@item -R
Print only the name of the @sc{rcs} file.
Index: doc/stamp-1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-1,v
retrieving revision 1.9.2.50
retrieving revision 1.9.2.51
diff -u -b -r1.9.2.50 -r1.9.2.51
--- doc/stamp-1 22 Aug 2007 21:24:55 -0000 1.9.2.50
+++ doc/stamp-1 25 Jan 2008 00:11:27 -0000 1.9.2.51
@@ -1,4 +1,4 @@
address@hidden UPDATED 22 August 2007
address@hidden UPDATED-MONTH August 2007
address@hidden UPDATED 7 May 2007
address@hidden UPDATED-MONTH May 2007
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.19.2.95
retrieving revision 1.19.2.96
diff -u -b -r1.19.2.95 -r1.19.2.96
--- doc/stamp-vti 28 Oct 2007 16:16:37 -0000 1.19.2.95
+++ doc/stamp-vti 25 Jan 2008 00:11:27 -0000 1.19.2.96
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 October 2007
address@hidden UPDATED-MONTH October 2007
address@hidden UPDATED 23 January 2008
address@hidden UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: doc/version-client.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version-client.texi,v
retrieving revision 1.9.2.50
retrieving revision 1.9.2.51
diff -u -b -r1.9.2.50 -r1.9.2.51
--- doc/version-client.texi 22 Aug 2007 21:24:56 -0000 1.9.2.50
+++ doc/version-client.texi 25 Jan 2008 00:11:27 -0000 1.9.2.51
@@ -1,4 +1,4 @@
address@hidden UPDATED 22 August 2007
address@hidden UPDATED-MONTH August 2007
address@hidden UPDATED 7 May 2007
address@hidden UPDATED-MONTH May 2007
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.20.2.95
retrieving revision 1.20.2.96
diff -u -b -r1.20.2.95 -r1.20.2.96
--- doc/version.texi 28 Oct 2007 16:16:37 -0000 1.20.2.95
+++ doc/version.texi 25 Jan 2008 00:11:27 -0000 1.20.2.96
@@ -1,4 +1,4 @@
address@hidden UPDATED 28 October 2007
address@hidden UPDATED-MONTH October 2007
address@hidden UPDATED 23 January 2008
address@hidden UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.2336.2.496
retrieving revision 1.2336.2.497
diff -u -b -r1.2336.2.496 -r1.2336.2.497
--- src/ChangeLog 19 Dec 2007 20:44:15 -0000 1.2336.2.496
+++ src/ChangeLog 25 Jan 2008 00:11:28 -0000 1.2336.2.497
@@ -1,3 +1,30 @@
+2008-01-24 Mark D. Baushke <address@hidden>
+
+ * log.c (cvslog): New -n option to revert the -N switch.
+ (log_usage): Add -n to the help string.
+ * main.c (cmds[]): Add "blame" as a synonym for the
+ "annotate" command.
+ * sanity.sh (cvs-log): New tests for 'cvs log -N -n' validation.
+ (ann-10w1blame): Test the 'cvs blame' synonym for annotate.
+ (Patch suggested by "David O'Brien" <address@hidden>)
+
+ * edit.c (notify_check): Rename to...
+ (cvs_notify_check): ...this to avoid Mac OSX symbol conflicts.
+ * client.h, edit.h, recurse.c: Change all references.
+
+ * client.c (start_rsh_server): Use RSH_DFLT not a hardcoded "rsh"
+ * root.c (parse_cvsroot): Fix parsing for the :extssh: method.
+
+ * sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr
+ implementations.
+ (CVSROOTDIR): Use 'cvsrootdir' instead of 'cvsroot' to
+ avoid problems on case preserving and/or case insensitive
+ filesystems (e.g., HFS+).
+ (CVSROOT_DIRNAME): Use ${TESTDIR}/${CVSROOTDIR} instead of
+ ${TESTDIR}/cvsroot to avoid filesystem case sensitivity problems.
+ (crerepos-extssh): Clone of crerepos tests, but use the :extssh:
+ method.
+
2007-12-19 Larry Jones <address@hidden>
* client.c, import.c, lock.c, login.c, mkmodules.c, modules.c,
Index: src/client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.46
retrieving revision 1.318.4.47
diff -u -b -r1.318.4.46 -r1.318.4.47
--- src/client.c 19 Dec 2007 20:44:15 -0000 1.318.4.46
+++ src/client.c 25 Jan 2008 00:11:28 -0000 1.318.4.47
@@ -4795,7 +4795,7 @@
int child_pid;
if (!cvs_rsh)
- cvs_rsh = "rsh";
+ cvs_rsh = RSH_DFLT;
if (!cvs_server)
cvs_server = "cvs";
Index: src/client.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.h,v
retrieving revision 1.39.6.5
retrieving revision 1.39.6.6
diff -u -b -r1.39.6.5 -r1.39.6.6
--- src/client.h 12 Jul 2005 14:07:54 -0000 1.39.6.5
+++ src/client.h 25 Jan 2008 00:11:29 -0000 1.39.6.6
@@ -65,7 +65,7 @@
#ifdef CLIENT_SUPPORT
/*
* Flag variable for seeing whether the server has been started yet.
- * As of this writing, only edit.c:notify_check() uses it.
+ * As of this writing, only edit.c:cvs_notify_check() uses it.
*/
extern int server_started;
Index: src/edit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.c,v
retrieving revision 1.57.4.8
retrieving revision 1.57.4.9
diff -u -b -r1.57.4.8 -r1.57.4.9
--- src/edit.c 26 May 2006 16:25:25 -0000 1.57.4.8
+++ src/edit.c 25 Jan 2008 00:11:29 -0000 1.57.4.9
@@ -147,8 +147,8 @@
struct file_info *finfo;
{
/* This is a pretty hideous hack, but the gist of it is that recurse.c
- won't call notify_check unless there is a fileproc, so we can't just
- pass NULL for fileproc. */
+ won't call cvs_notify_check unless there is a fileproc, so we
+ can't just pass NULL for fileproc. */
return 0;
}
@@ -991,7 +991,7 @@
#ifdef CLIENT_SUPPORT
/* Check and send notifications. This is only for the client. */
void
-notify_check (repository, update_dir)
+cvs_notify_check (repository, update_dir)
const char *repository;
const char *update_dir;
{
Index: src/edit.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.h,v
retrieving revision 1.4.8.1
retrieving revision 1.4.8.2
diff -u -b -r1.4.8.1 -r1.4.8.2
--- src/edit.h 20 Mar 2004 18:14:56 -0000 1.4.8.1
+++ src/edit.h 25 Jan 2008 00:11:29 -0000 1.4.8.2
@@ -17,7 +17,7 @@
/* Check to see if any notifications are sitting around in need of being
sent. These are the notifications stored in CVSADM_NOTIFY (edit,unedit);
commit calls notify_do directly. */
-extern void notify_check PROTO ((const char *repository,
+extern void cvs_notify_check PROTO ((const char *repository,
const char *update_dir));
#endif /* CLIENT_SUPPORT */
Index: src/log.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/log.c,v
retrieving revision 1.79.4.21
retrieving revision 1.79.4.22
diff -u -b -r1.79.4.21 -r1.79.4.22
--- src/log.c 11 Jul 2006 19:52:50 -0000 1.79.4.21
+++ src/log.c 25 Jan 2008 00:11:29 -0000 1.79.4.22
@@ -161,6 +161,7 @@
"\t-R\tOnly print name of RCS file.\n",
"\t-t\tOnly print header and descriptive text.\n",
"\t-N\tDo not list tags.\n",
+ "\t-n\tList tags (default).\n",
"\t-S\tDo not print name/header if no revisions selected. -d, -r,\n",
"\t\t-s, & -w have little effect in conjunction with -b, -h, -R, and\n",
"\t\t-t without this option.\n",
@@ -242,7 +243,7 @@
prl = &log_data.revlist;
optind = 0;
- while ((c = getopt (argc, argv, "+bd:hlNSRr::s:tw::")) != -1)
+ while ((c = getopt (argc, argv, "+bd:hlNnSRr::s:tw::")) != -1)
{
switch (c)
{
@@ -261,6 +262,9 @@
case 'N':
log_data.notags = 1;
break;
+ case 'n':
+ log_data.notags = 0;
+ break;
case 'S':
log_data.sup_header = 1;
break;
Index: src/main.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/main.c,v
retrieving revision 1.172.4.20
retrieving revision 1.172.4.21
diff -u -b -r1.172.4.20 -r1.172.4.21
--- src/main.c 16 May 2006 03:13:37 -0000 1.172.4.20
+++ src/main.c 25 Jan 2008 00:11:29 -0000 1.172.4.21
@@ -108,7 +108,7 @@
{
{ "add", "ad", "new", add,
CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "admin", "adm", "rcs", admin,
CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
- { "annotate", "ann", NULL, annotate, CVS_CMD_USES_WORK_DIR },
+ { "annotate", "ann", "blame", annotate, CVS_CMD_USES_WORK_DIR },
{ "checkout", "co", "get", checkout, 0 },
{ "commit", "ci", "com", commit,
CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "diff", "di", "dif", diff, CVS_CMD_USES_WORK_DIR },
Index: src/recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.77.4.11
retrieving revision 1.77.4.12
diff -u -b -r1.77.4.11 -r1.77.4.12
--- src/recurse.c 28 Aug 2006 19:56:45 -0000 1.77.4.11
+++ src/recurse.c 25 Jan 2008 00:11:29 -0000 1.77.4.12
@@ -764,7 +764,7 @@
have writelocks in place, and there is no way to get writelocks
here. */
if (current_parsed_root->isremote)
- notify_check (repository, update_dir);
+ cvs_notify_check (repository, update_dir);
#endif /* CLIENT_SUPPORT */
finfo_struct.repository = repository;
Index: src/root.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/root.c,v
retrieving revision 1.60.2.17
retrieving revision 1.60.2.18
diff -u -b -r1.60.2.17 -r1.60.2.18
--- src/root.c 16 Aug 2007 18:28:30 -0000 1.60.2.17
+++ src/root.c 25 Jan 2008 00:11:29 -0000 1.60.2.18
@@ -444,6 +444,8 @@
newroot->method = server_method;
else if (strcmp (method, "ext") == 0)
newroot->method = ext_method;
+ else if (strcmp (method, "extssh") == 0)
+ newroot->method = extssh_method;
else if (strcmp (method, "fork") == 0)
newroot->method = fork_method;
else
@@ -673,6 +675,7 @@
# endif
case server_method:
case ext_method:
+ case extssh_method:
no_port = 1;
/* no_password already set */
check_hostname = 1;
Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.214
retrieving revision 1.752.2.215
diff -u -b -r1.752.2.214 -r1.752.2.215
--- src/sanity.sh 22 Aug 2007 21:42:54 -0000 1.752.2.214
+++ src/sanity.sh 25 Jan 2008 00:11:30 -0000 1.752.2.215
@@ -527,7 +527,7 @@
if $expr 'a
b' : 'a
c' >/dev/null; then
- echo 'Warning: you are using a version of expr that does not correctly'
+ echo 'WARNING: you are using a version of expr that does not correctly'
echo 'match multi-line patterns. Some tests may spuriously pass or fail.'
echo 'You may wish to make sure GNU expr is in your path.'
return 1
@@ -553,13 +553,13 @@
if $expr "`cat ${TESTDIR}/bar`" : "`cat ${TESTDIR}/bar`" >/dev/null; then
: good, it works
else
- echo 'Warning: you are using a version of expr that does not correctly'
+ echo 'WARNING: you are using a version of expr that does not correctly'
echo 'match large patterns. Some tests may spuriously pass or fail.'
echo 'You may wish to make sure GNU expr is in your path.'
return 1
fi
if $expr "`cat ${TESTDIR}/bar`x" : "`cat ${TESTDIR}/bar`y" >/dev/null; then
- echo 'Warning: you are using a version of expr that does not correctly'
+ echo 'WARNING: you are using a version of expr that does not correctly'
echo 'match large patterns. Some tests may spuriously pass or fail.'
echo 'You may wish to make sure GNU expr is in your path.'
return 1
@@ -622,13 +622,46 @@
# good, it works
return 0
else
- echo 'Warning: you are using a version of expr that does not correctly'
+ echo 'WARNING: you are using a version of expr that does not correctly'
echo 'match large patterns. Some tests may spuriously pass or fail.'
echo 'You may wish to make sure GNU expr is in your path.'
return 77
fi
}
+# FreeBSD 5.2 and 6.1 support 'expr [-e] expression'
+# They get confused unless '--' is used before the expressions
+# when those expressions begin with a '-' character, such as the
+# output of an ls -l command. The EXPR_COMPAT environment variable may
+# be used to go back to the non-POSIX behavior as an alternative.
+# (GNU expr appears to accept the '--' argument and work correctly or
+# not have it and still get the results we want.)
+exprDASHDASH='false'
+expr_set_DASHDASH ()
+{
+expr=$1
+exprDASHDASH='false'
+# Not POSIX, but works on a lot of expr versions.
+if $expr "-rw-rw-r--" : "-rw-rw-r--" >/dev/null 2>&1; then
+ # good, it works
+ return 0
+else
+ # Do things in the POSIX manner.
+ if $expr -- "-rw-rw-r--" : "-rw-rw-r--" >/dev/null 2>&1; then
+ exprDASHDASH=':'
+ return 0
+ else
+ echo 'WARNING: Your $expr does not correctly handle'
+ echo 'leading "-" characters in regular expressions to'
+ echo 'be matched. You may wish to see if there is an'
+ echo 'environment variable or other setting to allow'
+ echo 'POSIX functionality to be enabled.'
+ return 77
+ fi
+fi
+}
+
+
EXPR=`find_tool ${EXPR}:gexpr \
version_test expr_tooltest1 expr_tooltest2 expr_tooltest3 \
expr_set_ENDANCHOR expr_set_DOTSTAR expr_tooltest_DOTSTAR`
@@ -637,6 +670,11 @@
expr_set_ENDANCHOR ${EXPR} >/dev/null
expr_tooltest_DOTSTAR ${EXPR} >/dev/null
+# Is $EXPR a POSIX or non-POSIX implementation
+# with regard to command-line arguments?
+expr_set_DASHDASH ${EXPR}
+$exprDASHDASH && EXPR="$EXPR --"
+
echo "Using EXPR=$EXPR" >>$LOGFILE
echo "Using ENDANCHOR=$ENDANCHOR" >>$LOGFILE
echo "Using DOTSTAR=$DOTSTAR" >>$LOGFILE
@@ -1129,7 +1167,8 @@
tests="${tests} rdiff rdiff-short"
tests="${tests} rdiff2 diff diffnl death death2 death-rtag"
tests="${tests} rm-update-message rmadd rmadd2 rmadd3 resurrection"
- tests="${tests} dirs dirs2 branches branches2 tagc tagf tag-space"
+ tests="${tests} dirs dirs2 branches branches2 tagc tagf "
+ tests="${tests} tag-log tag-space"
tests="${tests} rcslib multibranch import importb importc import-CVS"
tests="$tests import-quirks"
tests="${tests} update-p import-after-initial branch-after-import"
@@ -1154,7 +1193,7 @@
tests="${tests} serverpatch log log2 logopt ann ann-id"
# Repository Storage (RCS file format, CVS lock files, creating
# a repository without "cvs init", &c).
- tests="${tests} crerepos rcs rcs2 rcs3 rcs4 rcs5 rcs6"
+ tests="${tests} crerepos crerepos-extssh rcs rcs2 rcs3 rcs4 rcs5 rcs6"
tests="$tests lockfiles backuprecover"
tests="${tests} sshstdio"
# More history browsing, &c.
@@ -2086,11 +2125,14 @@
# sensitive server and visa versa.
: ${CVS_SERVER=$testcvs}; export CVS_SERVER
+# Use a name which will be different than CVSROOT on case insensitive
+# filesystems (e.g., HFS+)
+CVSROOTDIR=cvsrootdir
if $linkroot; then
mkdir ${TESTDIR}/realcvsroot
- ln -s realcvsroot ${TESTDIR}/cvsroot
+ ln -s realcvsroot ${TESTDIR}/${CVSROOTDIR}
fi
-CVSROOT_DIRNAME=${TESTDIR}/cvsroot
+CVSROOT_DIRNAME=${TESTDIR}/${CVSROOTDIR}
CVSROOT=`newroot $CVSROOT_DIRNAME`; export CVSROOT
@@ -7553,6 +7595,103 @@
rm -rf ${CVSROOT_DIRNAME}/first-dir
;;
+ tag-log)
+ # Test log output for tags
+ mkdir 1; cd 1
+ dotest tag-log-init-1 "$testcvs -q co -l ."
+ mkdir first-dir
+ dotest tag-log-init-2 "$testcvs add first-dir" \
+"Directory $CVSROOT_DIRNAME/first-dir added to the repository"
+ cd first-dir
+ touch file1
+ dotest tag-log-init-3 "$testcvs add file1" \
+"${PROG}"' add: scheduling file `file1'\'' for addition
+'"${PROG}"' add: use .'"${PROG}"' commit. to add this file permanently'
+ dotest tag-log-init-4 "$testcvs -Q ci -m add" \
+"RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+done
+Checking in file1;
+${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1
+initial revision: 1\.1
+done"
+
+ dotest tag-log-1 "$testcvs -Q tag mytag file1" ''
+ dotest tag-log-2 "$testcvs log -N file1" \
+"
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+Working file: file1
+head: 1\.1
+branch:
+locks: strict
+access list:
+keyword substitution: kv
+total revisions: 1; selected revisions: 1
+description:
+----------------------------
+revision 1\.1
+date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
+add
+============================================================================="
+ dotest tag-log-3 "$testcvs log -N -n file1" \
+"
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+Working file: file1
+head: 1\.1
+branch:
+locks: strict
+access list:
+symbolic names:
+ mytag: 1\.1
+keyword substitution: kv
+total revisions: 1; selected revisions: 1
+description:
+----------------------------
+revision 1\.1
+date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
+add
+============================================================================="
+ dotest tag-log-4 "$testcvs log file1" \
+"
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+Working file: file1
+head: 1\.1
+branch:
+locks: strict
+access list:
+symbolic names:
+ mytag: 1\.1
+keyword substitution: kv
+total revisions: 1; selected revisions: 1
+description:
+----------------------------
+revision 1\.1
+date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
+add
+============================================================================="
+ dotest tag-log-5 "$testcvs log -n file1" \
+"
+RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+Working file: file1
+head: 1\.1
+branch:
+locks: strict
+access list:
+symbolic names:
+ mytag: 1\.1
+keyword substitution: kv
+total revisions: 1; selected revisions: 1
+description:
+----------------------------
+revision 1\.1
+date: [0-9/]* [0-9:]*; author: ${username}; state: Exp;
+add
+============================================================================="
+
+ cd ../..
+ rm -fr 1
+ rm -rf ${CVSROOT_DIRNAME}/first-dir
+ ;;
+
tag-space)
# Test tags with spaces in the names.
#
@@ -19726,6 +19865,19 @@
1\.2 ($username8 *[0-9a-zA-Z-]*): a
1\.2 ($username8 *[0-9a-zA-Z-]*): blank
1\.2 ($username8 *[0-9a-zA-Z-]*): line"
+ dotest ann-10blame "${testcvs} blame" \
+"
+Annotations for file1
+\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
+1\.1 ($username8 *[0-9a-zA-Z-]*): this
+1\.1 ($username8 *[0-9a-zA-Z-]*): is
+1\.2 ($username8 *[0-9a-zA-Z-]*): a
+1\.3 ($username8 *[0-9a-zA-Z-]*): trunk file
+1\.2 ($username8 *[0-9a-zA-Z-]*):
+1\.2 ($username8 *[0-9a-zA-Z-]*): with
+1\.2 ($username8 *[0-9a-zA-Z-]*): a
+1\.2 ($username8 *[0-9a-zA-Z-]*): blank
+1\.2 ($username8 *[0-9a-zA-Z-]*): line"
dotest ann-11 "${testcvs} ann -r br" \
"
Annotations for file1
@@ -20059,6 +20211,202 @@
+ crerepos-extssh)
+ # Various tests relating to creating repositories, operating
+ # on repositories created with old versions of CVS, etc.
+
+ CVS_SERVER_save=$CVS_SERVER
+
+ # Because this test is all about -d options and such, it
+ # at least to some extent needs to be different for remote vs.
+ # local.
+ if $remote; then
+
+ # Use :extssh: rather than :fork:. Most of the tests use :fork:,
+ # so we want to make sure that we test :extssh: _somewhere_.
+ # Make sure 'ssh' works first.
+ depends_on_rsh "$CVS_RSH"
+ if test $? -eq 77; then
+ skip crerepos "$skipreason"
+ continue
+ fi
+
+ # For remote, just create the repository. We don't yet do
+ # the various other tests above for remote but that should be
+ # changed.
+ mkdir crerepos
+ mkdir crerepos/CVSROOT
+
+ # Make sure server ignores real ${HOME}/.cvsrc:
+ cat >$TESTDIR/cvs-setHome <<EOF
+#!/bin/sh
+HOME=$HOME
+export HOME
+exec $CVS_SERVER_save "\$@"
+EOF
+ chmod a+x $TESTDIR/cvs-setHome
+
+ # Note that we set CVS_SERVER at the beginning.
+ CVS_SERVER=$TESTDIR/cvs-setHome; export CVS_SERVER
+ CREREPOS_ROOT=:extssh:$host$TESTDIR/crerepos
+ else
+
+ # First, if the repository doesn't exist at all...
+ dotest_fail crerepos-extssh-1 \
+"${testcvs} -d ${TESTDIR}/crerepos co cvs-sanity" \
+"${PROG} \[checkout aborted\]: ${TESTDIR}/crerepos/CVSROOT: .*"
+ mkdir crerepos
+
+ # The repository exists but CVSROOT doesn't.
+ dotest_fail crerepos-extssh-2 \
+"${testcvs} -d ${TESTDIR}/crerepos co cvs-sanity" \
+"${PROG} \[checkout aborted\]: ${TESTDIR}/crerepos/CVSROOT: .*"
+ mkdir crerepos/CVSROOT
+
+ # Checkout of nonexistent module
+ dotest_fail crerepos-extssh-3 \
+"${testcvs} -d ${TESTDIR}/crerepos co cvs-sanity" \
+"${PROG} checkout: cannot find module .cvs-sanity. - ignored"
+
+ # Now test that CVS works correctly without a modules file
+ # or any of that other stuff. In particular, it *must*
+ # function if administrative files added to CVS recently (since
+ # CVS 1.3) do not exist, because the repository might have
+ # been created with an old version of CVS.
+ mkdir 1; cd 1
+ dotest crerepos-extssh-4 \
+"${testcvs} -q -d ${TESTDIR}/crerepos co CVSROOT" \
+''
+ if echo yes | \
+${testcvs} -d ${TESTDIR}/crerepos release -d CVSROOT >>${LOGFILE}; then
+ pass crerepos-extssh-5
+ else
+ fail crerepos-extssh-5
+ fi
+ rm -rf CVS
+ cd ..
+ # The directory 1 should be empty
+ dotest crerepos-extssh-6 "rmdir 1"
+
+ CREREPOS_ROOT=${TESTDIR}/crerepos
+
+ fi
+
+ if $remote; then
+ # Test that CVS rejects a relative path in CVSROOT.
+ mkdir 1; cd 1
+ # Note that having the client reject the pathname (as :fork:
+ # does), does _not_ test for the bugs we are trying to catch
+ # here. The point is that malicious clients might send all
+ # manner of things and the server better protect itself.
+ dotest_fail crerepos-extssh-6a-r \
+"${testcvs} -q -d :extssh:`hostname`:../crerepos get ." \
+"${PROG} [a-z]*: CVSROOT may only specify a positive, non-zero, integer port
(not .\.\..)\.
+${PROG} [a-z]*: Perhaps you entered a relative pathname${QUESTION}
+${PROG} \[[a-z]* aborted\]: Bad CVSROOT: .:extssh:${hostname}:\.\./crerepos.\."
+ cd ..
+ rm -r 1
+ else # local
+ # Test that CVS rejects a relative path in CVSROOT.
+
+ mkdir 1; cd 1
+ # Set CVS_RSH=false since ocassionally (e.g. when CVS_RSH=ssh on
+ # some systems) some rsh implementations will block because they
+ # can look up '..' and want to ask the user about the unknown host
+ # key or somesuch. Which error message we get depends on whether
+ # false finishes running before we try to talk to it or not.
+ dotest_fail crerepos-extssh-6a "CVS_RSH=false ${testcvs} -q -d
../crerepos get ." \
+"${PROG} \[checkout aborted\]: .*" \
+"${PROG} checkout: CVSROOT is set for a remote access method but your
+${PROG} checkout: CVS executable doesn't support it\.
+${PROG} \[checkout aborted\]: Bad CVSROOT: .\.\./crerepos.\."
+ cd ..
+ rm -r 1
+
+ mkdir 1; cd 1
+ dotest_fail crerepos-extssh-6b "${testcvs} -d crerepos init" \
+"${PROG} init: CVSROOT must be an absolute pathname (not .crerepos.)
+${PROG} init: when using local access method\.
+${PROG} \[init aborted\]: Bad CVSROOT: .crerepos.\."
+ cd ..
+ rm -r 1
+ fi # end of tests to be skipped for remote
+
+ # CVS better not create a history file--if the administrator
+ # doesn't need it and wants to save on disk space, they just
+ # delete it.
+ dotest_fail crerepos-extssh-7 \
+"test -f ${TESTDIR}/crerepos/CVSROOT/history" ''
+
+ # Now test mixing repositories. This kind of thing tends to
+ # happen accidentally when people work with several repositories.
+ mkdir 1; cd 1
+ dotest crerepos-extssh-8 "${testcvs} -q co -l ." ''
+ mkdir first-dir
+ dotest crerepos-extssh-9 "${testcvs} add first-dir" \
+"Directory ${CVSROOT_DIRNAME}/first-dir added to the repository"
+ cd first-dir
+ touch file1
+ dotest crerepos-extssh-10 "${testcvs} add file1" \
+"${PROG} add: scheduling file .file1. for addition
+${PROG} add: use .${PROG} commit. to add this file permanently"
+ dotest crerepos-extssh-11 "${testcvs} -q ci -m add-it" \
+"RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
+done
+Checking in file1;
+${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1
+initial revision: 1\.1
+done"
+ cd ../..
+ rm -r 1
+
+ mkdir 1; cd 1
+ dotest crerepos-extssh-12 "${testcvs} -d ${CREREPOS_ROOT} -q co -l ."
''
+ mkdir crerepos-dir
+ dotest crerepos-extssh-13 "${testcvs} add crerepos-dir" \
+"Directory ${TESTDIR}/crerepos/crerepos-dir added to the repository"
+ cd crerepos-dir
+ touch cfile
+ dotest crerepos-extssh-14 "${testcvs} add cfile" \
+"${PROG} add: scheduling file .cfile. for addition
+${PROG} add: use .${PROG} commit. to add this file permanently"
+ dotest crerepos-extssh-15 "${testcvs} -q ci -m add-it" \
+"RCS file: ${TESTDIR}/crerepos/crerepos-dir/cfile,v
+done
+Checking in cfile;
+${TESTDIR}/crerepos/crerepos-dir/cfile,v <-- cfile
+initial revision: 1\.1
+done"
+ cd ../..
+ rm -r 1
+
+ mkdir 1; cd 1
+ dotest crerepos-extssh-16 "${testcvs} co first-dir" \
+"${PROG} checkout: Updating first-dir
+U first-dir/file1"
+ dotest crerepos-extssh-17 "${testcvs} -d ${CREREPOS_ROOT} co
crerepos-dir" \
+"${PROG} checkout: Updating crerepos-dir
+U crerepos-dir/cfile"
+ dotest crerepos-extssh-18 "${testcvs} update" \
+"${PROG} update: Updating first-dir
+${PROG} update: Updating crerepos-dir"
+
+ cd ..
+
+ CVS_SERVER=$CVS_SERVER_save; export CVS_SERVER
+
+ if $keep; then
+ echo Keeping ${TESTDIR} and exiting due to --keep
+ exit 0
+ fi
+
+ rm -f $TESTDIR/cvs-setHome
+ rm -r 1
+ rm -rf ${CVSROOT_DIRNAME}/first-dir ${TESTDIR}/crerepos
+ ;;
+
+
+
rcs)
# Test ability to import an RCS file. Note that this format
# is fixed--files written by RCS5, and other software which
@@ -24378,7 +24726,7 @@
# In the remote case, we are cd'd off into the temp directory
# and so these tests give "No such file or directory" errors.
if $remote; then :; else
- dotest admin-19a-admin "${testcvs} -q admin
-A../../cvsroot/first-dir/file2,v file1" \
+ dotest admin-19a-admin "${testcvs} -q admin
-A../../${CVSROOTDIR}/first-dir/file2,v file1" \
"RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
done"
dotest admin-19a-log "${testcvs} -q log -h -N file1" "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ChangeLog NEWS doc/ChangeLog doc/cvs.1 doc... [cvs1-11-x-branch],
Mark D. Baushke <=