[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh |
Date: |
Thu, 29 Jun 2006 17:03:09 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 06/06/29 17:03:09
Modified files:
src : ChangeLog client.c sanity.sh
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3461&r2=1.3462
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.455&r2=1.456
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1159&r2=1.1160
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3461
retrieving revision 1.3462
diff -u -b -r1.3461 -r1.3462
--- ChangeLog 29 Jun 2006 02:37:06 -0000 1.3461
+++ ChangeLog 29 Jun 2006 17:03:09 -0000 1.3462
@@ -1,3 +1,9 @@
+2006-06-29 Derek Price <address@hidden>
+
+ * client.c (is_arg_a_parent_or_listed_dir): Strip trailing slashes from
+ dir name defore searching for it. Partially addresses TODO #205.
+ * sanity.sh (trailingslashes): Update to compensate.
+
2006-06-28 Larry Jones <address@hidden>
* error.c (error): Downgrade syslog message priority from
Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -b -r1.455 -r1.456
--- client.c 21 Jun 2006 18:55:21 -0000 1.455
+++ client.c 29 Jun 2006 17:03:09 -0000 1.456
@@ -128,21 +128,30 @@
server. This list, along with the current CVSROOT, will help us
decide which command-line arguments to send. */
List *dirs_sent_to_server;
+
+/* walklist() callback for determining if a D is a dir name already sent to the
+ * server or the parent of one.
+ */
static int
is_arg_a_parent_or_listed_dir (Node *n, void *d)
{
char *directory = n->key; /* name of the dir sent to server */
- char *this_argv_elem = d; /* this argv element */
+ char *this_argv_elem = xstrdup (d); /* this argv element */
+ int retval;
/* Say we should send this argument if the argument matches the
beginning of a directory name sent to the server. This way,
the server will know to start at the top of that directory
hierarchy and descend. */
+ strip_trailing_slashes (this_argv_elem);
if (!strncmp (directory, this_argv_elem, strlen (this_argv_elem)))
- return 1;
+ retval = 1;
+ else
+ retval = 0;
- return 0;
+ free (this_argv_elem);
+ return retval;
}
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1159
retrieving revision 1.1160
diff -u -b -r1.1159 -r1.1160
--- sanity.sh 26 Jun 2006 21:23:53 -0000 1.1159
+++ sanity.sh 29 Jun 2006 17:03:09 -0000 1.1160
@@ -15976,18 +15976,10 @@
dotest trailingslashes-1 "$testcvs -q up CVSROOT"
dotest_fail trailingslashes-1a "test -f topfile"
- # FIXCVS:
- # Now the one that fails in remote mode.
- # This highlights one of the failure cases mentioned in TODO item
- # #205.
- if $remote; then
- dotest trailingslashes-2 "$testcvs -q up CVSROOT/" \
-"U topfile"
- dotest trailingslashes-2a "test -f topfile"
- else
+ # Now the one that used to fail in remote mode prior to 1.11.24
+ # & 1.12.14. Formerly TODO item #205.
dotest trailingslashes-2 "$testcvs -q up CVSROOT/"
dotest_fail trailingslashes-2a "test -f topfile"
- fi
dokeep
cd ../..
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh,
Derek Robert Price <=