[Cvs-cvs] ccvs/src ChangeLog client.c sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/02/26 18:08:20

Modified files:
        src            : ChangeLog client.c sanity.sh 

Log message:
        * client.c (call_in_directory): Remove unneeded code.
        * sanity.sh (toplevel-12): Compensate by failing to expect a redundant
        error message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.424&tr2=1.2336.2.425&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/client.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.318.4.32&tr2=1.318.4.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=cvs1-11-x-branch&tr1=1.752.2.187&tr2=1.752.2.188&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.424 ccvs/src/ChangeLog:1.2336.2.425
--- ccvs/src/ChangeLog:1.2336.2.424     Fri Feb 24 21:23:06 2006
+++ ccvs/src/ChangeLog  Sun Feb 26 18:08:19 2006
@@ -1,3 +1,9 @@
+2006-02-26  Derek Price  <address@hidden>
+
+       * client.c (call_in_directory): Remove unneeded code.
+       * sanity.sh (toplevel-12): Compensate by failing to expect a redundant
+       error message.
+
 2006-02-24  Mark D. Baushke  <address@hidden>
 
        * client.c (gzip_level): Move to...
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.318.4.32 ccvs/src/client.c:1.318.4.33
--- ccvs/src/client.c:1.318.4.32        Fri Feb 24 21:23:06 2006
+++ ccvs/src/client.c   Sun Feb 26 18:08:19 2006
@@ -1197,49 +1197,6 @@
     if (CVS_CHDIR (toplevel_wd) < 0)
        error (1, errno, "could not chdir to %s", toplevel_wd);
 
-    /* Create the CVS directory at the top level if needed.  The
-       isdir seems like an unneeded system call, but it *does*
-       need to be called both if the CVS_CHDIR below succeeds
-       (e.g.  "cvs co .") or if it fails (e.g. basicb-1a in
-       testsuite).  We only need to do this for the "." case,
-       since the server takes care of forcing this directory to be
-       created in all other cases.  If we don't create CVSADM
-       here, the call to Entries_Open below will fail.  FIXME:
-       perhaps this means that we should change our algorithm
-       below that calls Create_Admin instead of having this code
-       here? */
-    if (/* I think the reposdirname_absolute case has to do with
-          things like "cvs update /foo/bar".  In any event, the
-          code below which tries to put toplevel_repos into
-          CVS/Repository is almost surely unsuited to
-          the reposdirname_absolute case.  */
-       !reposdirname_absolute
-       && (strcmp (dir_name, ".") == 0)
-       && ! isdir (CVSADM))
-    {
-       char *repo;
-       char *r;
-
-       newdir = 1;
-
-       /* If toplevel_repos doesn't have at least one character, then the
-        * reference to r[-1] below could be out of bounds.
-        */
-       assert (*toplevel_repos);
-
-       repo = xmalloc (strlen (toplevel_repos)
-                       + 10);
-       strcpy (repo, toplevel_repos);
-       r = repo + strlen (repo);
-       if (r[-1] != '.' || r[-2] != '/')
-           strcpy (r, "/.");
-
-       Create_Admin (".", ".", repo, (char *) NULL,
-                     (char *) NULL, 0, 1, 1);
-
-       free (repo);
-    }
-
     if (CVS_CHDIR (dir_name) < 0)
     {
        char *dir;
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.187 ccvs/src/sanity.sh:1.752.2.188
--- ccvs/src/sanity.sh:1.752.2.187      Fri Feb 24 21:23:06 2006
+++ ccvs/src/sanity.sh  Sun Feb 26 18:08:19 2006
@@ -14582,7 +14582,6 @@
 "${PROG} checkout: warning: cannot make directory CVS in \.: Permission denied
 ${PROG} checkout: Updating top-dir" \
 "${PROG} checkout: warning: cannot make directory CVS in \.: Permission denied
-${PROG} checkout: warning: cannot make directory CVS in \.: Permission denied
 ${PROG} checkout: in directory \.:
 ${PROG} checkout: cannot open CVS/Entries for reading: No such file or 
directory
 ${PROG} checkout: Updating top-dir"