[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog client.c main.c sanity.sh
From: |
Mark D. Baushke |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog client.c main.c sanity.sh |
Date: |
Sat, 25 Feb 2006 07:41:50 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Mark D. Baushke <address@hidden> 06/02/25 07:41:50
Modified files:
src : ChangeLog client.c main.c sanity.sh
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3344&tr2=1.3345&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?tr1=1.438&tr2=1.439&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?tr1=1.262&tr2=1.263&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1110&tr2=1.1111&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3344 ccvs/src/ChangeLog:1.3345
--- ccvs/src/ChangeLog:1.3344 Mon Feb 13 21:52:00 2006
+++ ccvs/src/ChangeLog Sat Feb 25 07:41:50 2006
@@ -1,3 +1,14 @@
+2006-02-24 Mark D. Baushke <address@hidden>
+
+ * client.c (gzip_level): Move to...
+ * main.c (gzip_level): ...here.
+ (main): Revert previous change in '-z' argument processing and
+ remove CLIENT_SUPPORT ifdef/endif.
+ * sanity.h (crerepos-6a): Deal with --disable-client output.
+
+ * main.c (main): Validate the gzip compression level for
+ --disable-client configurations.
+
2006-02-13 Derek Price <address@hidden>
* sanity.sh (sshstdio-6): Rewrite using more portable sed script.
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.438 ccvs/src/client.c:1.439
--- ccvs/src/client.c:1.438 Thu Dec 8 00:53:08 2005
+++ ccvs/src/client.c Sat Feb 25 07:41:50 2006
@@ -430,12 +430,6 @@
#if defined(CLIENT_SUPPORT) || defined(SERVER_SUPPORT)
/*
- * Zero if compression isn't supported or requested; non-zero to indicate
- * a compression level to request from gzip.
- */
-int gzip_level;
-
-/*
* Level of compression to use when running gzip on a single file.
*/
int file_gzip_level;
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.262 ccvs/src/main.c:1.263
--- ccvs/src/main.c:1.262 Thu Sep 29 22:11:47 2005
+++ ccvs/src/main.c Sat Feb 25 07:41:50 2006
@@ -44,6 +44,11 @@
int readonlyfs = 0;
int logoff = 0;
+/*
+ * Zero if compression isn't supported or requested; non-zero to indicate
+ * a compression level to request from gzip.
+ */
+int gzip_level;
/***
@@ -717,12 +722,10 @@
use_cvsrc = 0; /* unnecessary, since we've done it above */
break;
case 'z':
-#ifdef CLIENT_SUPPORT
gzip_level = strtol (optarg, &end, 10);
if (*end != '\0' || gzip_level < 0 || gzip_level > 9)
error (1, 0,
"gzip compression level must be between 0 and 9");
-#endif /* CLIENT_SUPPORT */
/* If no CLIENT_SUPPORT, we just silently ignore the gzip
* level, so that users can have it in their .cvsrc and not
* cause any trouble.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1110 ccvs/src/sanity.sh:1.1111
--- ccvs/src/sanity.sh:1.1110 Mon Feb 13 21:52:01 2006
+++ ccvs/src/sanity.sh Sat Feb 25 07:41:50 2006
@@ -22170,8 +22170,10 @@
# 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-6a "CVS_RSH=false ${testcvs} -q -d ../crerepos
get ." \
-"${SPROG} \[checkout aborted\]: end of file from server (consult above
messages if any)" \
-"${SPROG} \[checkout aborted\]: received broken pipe signal"
+"${SPROG} \[checkout aborted\]: .*" \
+"${SPROG} checkout: CVSROOT is set for a remote access method but your
+${SPROG} checkout: CVS executable doesn't support it\.
+${SPROG} \[checkout aborted\]: Bad CVSROOT: .\.\./crerepos.\."
cd ..
rm -r 1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog client.c main.c sanity.sh,
Mark D. Baushke <=