[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2] |
Date: |
Wed, 30 Nov 2005 15:25:42 -0500 |
Index: ccvs/src/update.c
diff -u ccvs/src/update.c:1.256.4.6 ccvs/src/update.c:1.256.4.7
--- ccvs/src/update.c:1.256.4.6 Wed Nov 30 19:58:46 2005
+++ ccvs/src/update.c Wed Nov 30 20:25:39 2005
@@ -244,12 +244,7 @@
case 'u':
#ifdef SERVER_SUPPORT
if (server_active)
- {
- if (server_use_bases ())
- bases = true;
- else
- rcs_diff_patches = server_use_rcs_diff ();
- }
+ rcs_diff_patches = server_use_rcs_diff ();
else
#endif
usage (update_usage);
@@ -488,6 +483,10 @@
preload_update_dir ? preload_update_dir : "(null)", xdotemplate,
repository ? repository : "(null)");
+ /* Set globals. */
+ if (server_active && server_use_bases ())
+ bases = true;
+
/* fill in the statics */
options = xoptions;
tag = xtag;
@@ -1985,13 +1984,17 @@
xcmp on the temporary files without much hassle, I think. */
if (!noexec && !bases && !xcmp (backup, finfo->file))
{
- /* The client will handle these messages when BASES. */
- cvs_output (finfo->fullname, 0);
- cvs_output (" already contains the differences between ", 0);
- cvs_output (vers->vn_user, 0);
- cvs_output (" and ", 0);
- cvs_output (vers->vn_rcs, 0);
- cvs_output ("\n", 1);
+ if (!quiet)
+ {
+ /* The client will handle these messages when BASES. */
+ cvs_output ("`", 1);
+ cvs_output (finfo->fullname, 0);
+ cvs_output ("' already contains the differences between ", 0);
+ cvs_output (vers->vn_user, 0);
+ cvs_output (" and ", 5);
+ cvs_output (vers->vn_rcs, 0);
+ cvs_output ("\n", 1);
+ }
retval = 0;
goto out;
@@ -2276,12 +2279,13 @@
&& strcmp (vers->ts_user, vers->ts_rcs) == 0
&& strcmp (rev2, vers->vn_user) == 0)
{
- if (!really_quiet)
+ if (!quiet)
{
+ cvs_output ("`", 1);
cvs_output (finfo->fullname, 0);
- cvs_output (" already contains the differences between ", 0);
+ cvs_output ("' already contains the differences between ", 0);
cvs_output (rev1 ? rev1 : "creation", 0);
- cvs_output (" and ", 0);
+ cvs_output (" and ", 5);
cvs_output (rev2, 0);
cvs_output ("\n", 1);
}
@@ -2500,7 +2504,7 @@
xcmp on the temporary files without much hassle, I think. */
if (!noexec && !xcmp (backup, finfo->file))
{
- if (!really_quiet)
+ if (!quiet)
{
cvs_output ("`", 1);
cvs_output (finfo->fullname, 0);
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/update.c [signed-commits2], Derek Robert Price, 2005/11/30