[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog server.c server.h update.c
From: |
Jim Hyslop |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog server.c server.h update.c |
Date: |
Mon, 12 Jun 2006 02:33:15 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Jim Hyslop <jhyslop> 06/06/12 02:33:14
Modified files:
src : ChangeLog server.c server.h update.c
Log message:
Misc. changes to fix broken Windows build, see ChangeLog files for
details
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3445&r2=1.3446
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.465&r2=1.466
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.h?cvsroot=cvs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.263&r2=1.264
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3445
retrieving revision 1.3446
diff -u -b -r1.3445 -r1.3446
--- ChangeLog 11 Jun 2006 14:35:16 -0000 1.3445
+++ ChangeLog 12 Jun 2006 02:33:14 -0000 1.3446
@@ -1,3 +1,8 @@
+2006-06-11 Jim Hyslop <address@hidden>
+
+ * server.h, server.c, update.c: wrap various server-related functions
+ in #ifdef SERVER_SUPPORT directives, to allow clients to compile.
+
2006-06-10 Derek Price <address@hidden>
* sanity.sh (conflicts4): Don't expect specific file permissions. Use
Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -b -r1.465 -r1.466
--- server.c 8 Jun 2006 20:20:13 -0000 1.465
+++ server.c 12 Jun 2006 02:33:14 -0000 1.466
@@ -8267,22 +8267,15 @@
}
}
-
-
+#ifdef SERVER_SUPPORT
/* Return whether we should send operations on base files. */
bool
server_use_bases (void)
{
-#ifdef SERVER_SUPPORT
return supported_response ("Base-checkout");
-#else /* !SERVER_SUPPORT */
- return 0;
-#endif
}
-
-#ifdef SERVER_SUPPORT
static void
server_send_signatures (struct file_info *finfo, const char *rev)
{
Index: server.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server.h 24 Apr 2006 18:50:27 -0000 1.46
+++ server.h 12 Jun 2006 02:33:14 -0000 1.47
@@ -254,7 +254,12 @@
void server_base_diff (struct file_info *finfo, const char *f1,
const char *rev1, const char *label1, const char *f2,
const char *rev2, const char *label2);
+
+#ifdef SERVER_SUPPORT
bool server_use_bases (void);
+#else
+#define server_use_bases() false
+#endif
void cvs_output (const char *, size_t);
void cvs_output_binary (char *, size_t);
Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -b -r1.263 -r1.264
--- update.c 17 May 2006 20:53:45 -0000 1.263
+++ update.c 12 Jun 2006 02:33:14 -0000 1.264
@@ -488,10 +488,11 @@
preload_update_dir ? preload_update_dir : "(null)", xdotemplate,
repository ? repository : "(null)");
+#ifdef SERVER_SUPPORT
/* Set globals. */
if (server_active && server_use_bases ())
bases = true;
-
+#endif /* SERVER_SUPPORT */
/* fill in the statics */
options = xoptions;
tag = xtag;
@@ -2009,7 +2010,11 @@
/* FIXME: the noexec case is broken. RCS_merge could be doing the
xcmp on the temporary files without much hassle, I think. */
- if (!noexec && !bases && !xcmp (backup, finfo->file))
+ if (!noexec &&
+#ifdef SERVER_SUPPORT
+ !bases &&
+#endif /* SERVER_SUPPORT */
+ !xcmp (backup, finfo->file))
{
if (!quiet)
{
@@ -2027,11 +2032,13 @@
goto out;
}
+#ifdef SERVER_SUPPORT
if (!bases)
/* The client may determine this is a conflict rather than
* modified. Let it write the correct message.
*/
write_letter (finfo, 'M');
+#endif /* SERVER_SUPPORT */
}
retval = 0;
out:
@@ -2378,7 +2385,6 @@
server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
NULL, NULL);
#endif /* SERVER_SUPPORT */
-
freevers_ts (&xvers);
return;
}
@@ -2513,7 +2519,11 @@
/* FIXME: It would be more consistent if the client printed this
* message when BASES.
*/
- if (!really_quiet && bases)
+ if (!really_quiet
+#ifdef SERVER_SUPPORT
+ && bases
+#endif
+ )
write_letter (finfo, 'M');
status = 0;
}
@@ -2548,6 +2558,7 @@
*/
write_letter (finfo, 'C');
}
+#ifdef SERVER_SUPPORT
else if (!bases) /* status == 0 */
{
bool unchanged, isbase;
@@ -2591,6 +2602,7 @@
*/
goto out;
}
+#endif /* SERVER_SUPPORT */
/* The file has changed, but if we just checked it out it may
still have the same timestamp it did when it was first
@@ -2604,7 +2616,9 @@
again won't cost much in that case. */
RegisterMerge (finfo, vers, backup, status, false);
+#ifdef SERVER_SUPPORT
out:
+#endif /* SERVER_SUPPORT */
free (rev1);
free (rev2);
free (backup);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog server.c server.h update.c,
Jim Hyslop <=