[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2] |
Date: |
Tue, 22 Nov 2005 20:46:57 -0500 |
Index: ccvs/src/client.c
diff -u ccvs/src/client.c:1.433.4.4 ccvs/src/client.c:1.433.4.5
--- ccvs/src/client.c:1.433.4.4 Tue Nov 22 18:03:44 2005
+++ ccvs/src/client.c Wed Nov 23 01:46:53 2005
@@ -1861,14 +1861,23 @@
else if (data->contents == UPDATE_ENTRIES_BASE)
{
Node *n;
- if ((n = findnode_fn (ent_list, filename)))
+ if (!noexec && (n = findnode_fn (ent_list, filename)))
{
Entnode *e = n->data;
base_remove (filename, e->version);
}
rename_file (temp_filename, filename);
+ if (updated_fname)
+ {
+ cvs_output ("U ", 0);
+ cvs_output (updated_fname, 0);
+ cvs_output ("\n", 1);
+ free (updated_fname);
+ updated_fname = NULL;
+ }
}
- else if (data->contents == UPDATE_ENTRIES_CHECKIN && strcmp (vn, "0"))
+ else if (!noexec && data->contents == UPDATE_ENTRIES_CHECKIN
+ && strcmp (vn, "0") && *vn != '-')
{
/* On checkin, create the base file. */
char *basefile = make_base_file_name (filename, vn);
@@ -2094,6 +2103,8 @@
bool bin;
bool patch_failed;
+ TRACE (TRACE_FUNCTION, "client_base_checkout (%s)", short_pathname);
+
/* Read OPTIONS, PREV, and REV from the server. */
read_line (&options);
read_line (&prev);
@@ -2199,15 +2210,16 @@
FILE *e;
int status;
+ mkdir_if_needed (CVSADM_BASE);
e = xfopen (basefile, bin ? FOPEN_BINARY_WRITE : "w");
if (fwrite (buf, sizeof *buf, size, e) != size)
- error (1, errno, "cannot write %s", fullbase);
+ error (1, errno, "cannot write `%s'", fullbase);
if (fclose (e) == EOF)
- error (0, errno, "cannot close %s", fullbase);
+ error (0, errno, "cannot close `%s'", fullbase);
status = change_mode (basefile, mode_string, 1);
if (status != 0)
- error (0, status, "cannot change mode of %s", fullbase);
+ error (0, status, "cannot change mode of `%s'", fullbase);
}
/* FIXME: When enabled, verify base file via openpgp signature. */
@@ -2251,6 +2263,8 @@
char *rev, *exists;
char *basefile;
char *temp_filename;
+
+ TRACE (TRACE_FUNCTION, "client_base_copy (%s)", short_pathname);
read_line (&rev);
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/17
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/client.c [signed-commits2], Derek Robert Price, 2005/11/30