[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/import.c
From: |
Larry Jones |
Subject: |
[Cvs-cvs] Changes to ccvs/src/import.c |
Date: |
Fri, 02 Sep 2005 17:51:14 -0400 |
Index: ccvs/src/import.c
diff -u ccvs/src/import.c:1.174 ccvs/src/import.c:1.175
--- ccvs/src/import.c:1.174 Wed Aug 31 16:10:40 2005
+++ ccvs/src/import.c Fri Sep 2 21:51:08 2005
@@ -105,17 +105,14 @@
{
case 'Q':
case 'q':
-#ifdef SERVER_SUPPORT
/* The CVS 1.5 client sends these options (in addition to
Global_option requests), so we must ignore them. */
if (!server_active)
-#endif
error (1, 0,
"-q or -Q must be specified before \"%s\"",
cvs_cmd_name);
break;
case 'd':
-#ifdef SERVER_SUPPORT
if (server_active)
{
/* CVS 1.10 and older clients will send this, but it
@@ -125,7 +122,6 @@
"warning: not setting the time of import from the
file");
error (0, 0, "due to client limitations");
}
-#endif
use_file_modtime = 1;
break;
case 'b':
@@ -168,7 +164,6 @@
if (argc < 3)
usage (import_usage);
-#ifdef SERVER_SUPPORT
/* This is for handling the Checkin-time request. It might seem a
bit odd to enable the use_file_modtime code even in the case
where Checkin-time was not sent for a particular file. The
@@ -180,7 +175,6 @@
if (server_active)
use_file_modtime = 1;
-#endif
/* Don't allow "CVS" as any directory in module path.
*
@@ -258,17 +252,10 @@
}
#endif
- if (
-#ifdef SERVER_SUPPORT
- !server_active &&
-#endif
- use_editor)
+ if (!server_active && use_editor)
{
do_editor (NULL, &message,
-#ifdef CLIENT_SUPPORT
- current_parsed_root->isremote ? NULL :
-#endif
- repository,
+ current_parsed_root->isremote ? NULL : repository,
NULL);
}
msglen = message == NULL ? 0 : strlen (message);
@@ -482,13 +469,13 @@
{
if (strcmp (dp->d_name, ".") == 0 || strcmp (dp->d_name, "..") == 0)
goto one_more_time_boys;
-#ifdef SERVER_SUPPORT
+
/* CVS directories are created in the temp directory by
server.c because it doesn't special-case import. So
don't print a message about them, regardless of -I!. */
if (server_active && strcmp (dp->d_name, CVSADM) == 0)
goto one_more_time_boys;
-#endif
+
if (ign_name (dp->d_name))
{
add_log ('I', dp->d_name);
@@ -1740,11 +1727,7 @@
repository = new;
}
-#ifdef CLIENT_SUPPORT
if (!quiet && !current_parsed_root->isremote)
-#else
- if (!quiet)
-#endif
error (0, 0, "Importing %s", repository);
if (CVS_CHDIR (dir) < 0)
@@ -1755,11 +1738,7 @@
err = 1;
goto out;
}
-#ifdef CLIENT_SUPPORT
if (!current_parsed_root->isremote && !isdir (repository))
-#else
- if (!isdir (repository))
-#endif
{
rcs = Xasprintf ("%s%s", repository, RCSEXT);
if (isfile (repository) || isfile (rcs))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] Changes to ccvs/src/import.c,
Larry Jones <=