[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog add.c client.c commit.c entr...
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs/src ChangeLog add.c client.c commit.c entr... |
|
Date: |
Wed, 17 Sep 2008 19:53:32 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 08/09/17 19:53:31
Modified files:
src : ChangeLog add.c client.c commit.c entries.c
fileattr.c find_names.c hash.c lock.c logmsg.c
rcs.c repos.c sanity.sh server.c server.h
subr.c tag.c update.c watch.c
Log message:
* add.c (add), client.c (call_in_directory, update_entries,
send_repository, send_a_repository, client_send_expansions,
send_signature, send_fileproc, send_dirent_proc, send_file_names,
send_files), commit.c (find_fileproc, check_fileproc,
check_filesdoneproc), entries.c (Entnode_Create, Subdir_Register),
fileattr.c (fileattr_startdir, fileattr_set, fileattr_write,
fileattr_free), find_names.c (Find_Names, find_dirs,
Find_Directories), hash.c (dellist, findnode, findnode_fn), lock.c
(Reader_Lock), logmsg.c (do_editor), rcs.c (locate_rcs), repos.c
(Name_Repository), server.c (checked_in_response, server_checked_in,
server_update_entries), subr.c (free_names, dir_append_dirs), tag.c
(posttag_proc, pretag_proc, check_filesdoneproc), update.c
(update_dirleave_proc), watch.c (watch_modify_watchers,
addremove_fileproc, addremove_filesdoneproc, watch_addremove): Add
traces.
* server.h (TRACE_BOOL): New macro.
* sanity.sh (multiroot2): Update to compensate.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3596&r2=1.3597
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/add.c?cvsroot=cvs&r1=1.138&r2=1.139
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&r1=1.475&r2=1.476
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.284&r2=1.285
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/entries.c?cvsroot=cvs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/fileattr.c?cvsroot=cvs&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/find_names.c?cvsroot=cvs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/hash.c?cvsroot=cvs&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/lock.c?cvsroot=cvs&r1=1.128&r2=1.129
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/logmsg.c?cvsroot=cvs&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.395&r2=1.396
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/repos.c?cvsroot=cvs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1203&r2=1.1204
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.485&r2=1.486
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.h?cvsroot=cvs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/subr.c?cvsroot=cvs&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/watch.c?cvsroot=cvs&r1=1.54&r2=1.55
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3596
retrieving revision 1.3597
diff -u -b -r1.3596 -r1.3597
--- ChangeLog 17 Sep 2008 17:13:51 -0000 1.3596
+++ ChangeLog 17 Sep 2008 19:53:28 -0000 1.3597
@@ -1,5 +1,23 @@
2008-09-17 Derek R. Price <address@hidden>
+ * add.c (add), client.c (call_in_directory, update_entries,
+ send_repository, send_a_repository, client_send_expansions,
+ send_signature, send_fileproc, send_dirent_proc, send_file_names,
+ send_files), commit.c (find_fileproc, check_fileproc,
+ check_filesdoneproc), entries.c (Entnode_Create, Subdir_Register),
+ fileattr.c (fileattr_startdir, fileattr_set, fileattr_write,
+ fileattr_free), find_names.c (Find_Names, find_dirs,
+ Find_Directories), hash.c (dellist, findnode, findnode_fn), lock.c
+ (Reader_Lock), logmsg.c (do_editor), rcs.c (locate_rcs), repos.c
+ (Name_Repository), server.c (checked_in_response, server_checked_in,
+ server_update_entries), subr.c (free_names, dir_append_dirs), tag.c
+ (posttag_proc, pretag_proc, check_filesdoneproc), update.c
+ (update_dirleave_proc), watch.c (watch_modify_watchers,
+ addremove_fileproc, addremove_filesdoneproc, watch_addremove): Add
+ traces.
+ * server.h (TRACE_BOOL): New macro.
+ * sanity.sh (multiroot2): Update to compensate.
+
* watch.c: Some cleanup.
* fileattr.c: Some cleanup.
Index: add.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/add.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- add.c 16 Sep 2008 21:00:19 -0000 1.138
+++ add.c 17 Sep 2008 19:53:29 -0000 1.139
@@ -525,6 +525,10 @@
error (1, errno, "could not chdir to `%s'", finfo.update_dir);
}
+ TRACE (TRACE_DATA,
+ "add: Processing %s, set update_dir = %s, file = %s",
+ argv[i], finfo.update_dir, finfo.file);
+
/* Add wrappers for this directory. They exist only until
the next call to wrap_add_file. */
wrap_add_file (CVSDOTWRAPPER, 1);
Index: client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -b -r1.475 -r1.476
--- client.c 16 Sep 2008 21:00:20 -0000 1.475
+++ client.c 17 Sep 2008 19:53:29 -0000 1.476
@@ -758,11 +758,15 @@
struct file_info finfo;
assert (pathname && strlen (pathname));
+ assert (toplevel_repos);
reposname = NULL;
read_line (&reposname);
assert (reposname);
+ TRACE (TRACE_FLOW, "call_in_directory (%s, %s, %s)",
+ pathname, reposname, toplevel_repos);
+
reposdirname_absolute = 0;
if (!STRNEQ (reposname, toplevel_repos, strlen (toplevel_repos)))
{
@@ -1354,6 +1358,8 @@
int change_it_back = 0;
#endif
+ TRACE (TRACE_FUNCTION, "update_entries (%s)", finfo->fullname);
+
read_line (&entries_line);
/*
@@ -3053,6 +3059,9 @@
{
char *adm_name;
+ TRACE (TRACE_FUNCTION, "send_repository (%s, %s, %s)",
+ dir, repos, update_dir);
+
/* FIXME: this is probably not the best place to check; I wish I
* knew where in here's callers to really trap this bug. To
* reproduce the bug, just do this:
@@ -3189,6 +3198,10 @@
char *update_dir;
assert (update_dir_in);
+
+ TRACE (TRACE_FLOW, "send_a_repository (%s, %s, %s)",
+ dir, repository, update_dir_in);
+
update_dir = xstrdup (update_dir_in);
if (!toplevel_repos && repository)
@@ -3462,6 +3475,9 @@
int i;
char *argv[1];
+ TRACE (TRACE_FUNCTION, "client_send_expansions (%d, %s, %d)",
+ local, where, build_dirs);
+
/* Send the original module names. The "expanded" module name might
not be suitable as an argument to a co request (e.g. it might be
the result of a -d argument in the modules file). It might be
@@ -5190,6 +5206,9 @@
size_t len;
Node *n;
+ TRACE (TRACE_FUNCTION, "send_signature (%s, %s, %s, %s)",
+ srepos, filename, fullname, TRACE_BOOL (bin));
+
sigbuf = gen_signature (srepos, filename, bin, &len);
send_to_server ("Signature\012", 0);
@@ -5235,6 +5254,8 @@
const char *filename;
bool may_be_modified;
+ TRACE (TRACE_FLOW, "send_fileproc (%s)", finfo->fullname);
+
send_a_repository ("", finfo->repository, finfo->update_dir);
xfinfo = *finfo;
@@ -5464,6 +5485,9 @@
struct send_data *args = callerdat;
bool dir_exists;
+ TRACE (TRACE_FLOW, "send_dirent_proc (%s, %s, %s)",
+ dir, repository, update_dir);
+
if (ignore_directory (update_dir))
{
/* print the warm fuzzy message */
@@ -5566,6 +5590,9 @@
{
int i;
+ TRACE (TRACE_FUNCTION, "send_file_names (%d, %s, %u)",
+ argc, TRACE_PTR (argv, 0), flags);
+
/* The fact that we do this here as well as start_recursion is a bit
of a performance hit. Perhaps worth cleaning up someday. */
if (flags & SEND_EXPAND_WILD)
@@ -5789,6 +5816,9 @@
struct send_data args;
int err;
+ TRACE (TRACE_FUNCTION, "send_files (%d, %s, %d, %d, %u)",
+ argc, TRACE_PTR (argv, 0), local, aflag, flags);
+
send_max_dotdot (argc, argv);
/*
Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -b -r1.284 -r1.285
--- commit.c 16 Sep 2008 21:52:16 -0000 1.284
+++ commit.c 17 Sep 2008 19:53:29 -0000 1.285
@@ -235,6 +235,8 @@
struct logfile_info *data;
struct file_info xfinfo;
+ TRACE (TRACE_FLOW, "find_fileproc (%s)", finfo->fullname);
+
/* if this directory has an ignore list, add this file to it */
if (args->ignlist)
{
@@ -837,17 +839,20 @@
const char *xdir;
Node *p;
List *ulist, *cilist;
- Vers_TS *vers;
+ Vers_TS *vers = NULL;
struct commit_info *ci;
struct logfile_info *li;
int retval = 1;
size_t cvsroot_len = strlen (current_parsed_root->directory);
+ TRACE (TRACE_FLOW, "check_fileproc (%s)", finfo->fullname);
+
if (!finfo->repository)
{
error (0, 0, "Nothing known about %s", quote (finfo->fullname));
- return 1;
+ retval = 1;
+ goto out;
}
if (STRNEQ (finfo->repository, current_parsed_root->directory, cvsroot_len)
@@ -1092,8 +1097,8 @@
quote (finfo->fullname));
if (li) free (li);
if (p) freenode (p);
- freevers_ts (&vers);
- return 1;
+ retval = 1;
+ goto out;
}
li->tag = xstrdup (vers->tag);
@@ -1177,8 +1182,9 @@
retval = 0;
out:
+ if (vers) freevers_ts (&vers);
- freevers_ts (&vers);
+ TRACE (TRACE_DATA, "check_fileproc returning %d", retval);
return retval;
}
@@ -1376,6 +1382,9 @@
Node *p;
List *saved_ulist;
+ TRACE (TRACE_FLOW, "check_filesdoneproc (%d, %s, %s)",
+ err, repos, update_dir);
+
/* find the update list for this dir */
p = findnode (mulist, update_dir);
if (p != NULL)
@@ -1384,7 +1393,7 @@
saved_ulist = NULL;
/* skip the checks if there's nothing to do */
- if (saved_ulist == NULL || saved_ulist->list->next == saved_ulist->list)
+ if (list_isempty (saved_ulist))
return err;
/* run any pre-commit checks */
@@ -1641,6 +1650,9 @@
assert (repository);
+ TRACE (TRACE_FLOW, "commit_filesdoneproc (%d, %s, %s)",
+ err, repository, update_dir);
+
p = findnode (mulist, update_dir);
if (p == NULL)
return err;
Index: entries.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/entries.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- entries.c 16 Sep 2008 21:00:21 -0000 1.76
+++ entries.c 17 Sep 2008 19:53:29 -0000 1.77
@@ -71,8 +71,8 @@
Entnode *ent;
TRACE (TRACE_FLOW,
- "Entnode_Create (%s, %s, %s, %s, %s, %s, %s)",
- user, vn, ts, options, TRACE_NULL (tag), TRACE_NULL (date),
+ "Entnode_Create (%d, %s, %s, %s, %s, %s, %s, %s)",
+ type, user, vn, ts, options, TRACE_NULL (tag), TRACE_NULL (date),
TRACE_NULL (ts_conflict));
/* Note that timestamp and options must be non-NULL */
@@ -1105,6 +1105,8 @@
{
Entnode *entnode;
+ TRACE (TRACE_FUNCTION, "Subdir_Register (%s, %s)", parent, dir);
+
/* Ignore attempts to register ".". These can happen in the
server code. */
if (dir[0] == '.' && dir[1] == '\0')
Index: fileattr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/fileattr.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- fileattr.c 17 Sep 2008 16:29:24 -0000 1.42
+++ fileattr.c 17 Sep 2008 19:53:29 -0000 1.43
@@ -60,6 +60,8 @@
void
fileattr_startdir (const char *repos)
{
+ TRACE (TRACE_FUNCTION, "fileattr_startdir (%s)", repos);
+
assert (fileattr_stored_repos == NULL);
fileattr_stored_repos = xstrdup (repos);
assert (attrlist == NULL);
@@ -342,6 +344,8 @@
char *p;
assert (fileattr_stored_repos);
+ TRACE (TRACE_FUNCTION, "fileattr_set (%s, %s, %s, %s)",
+ filename, attrname, attrval, fileattr_stored_repos);
if (filename == NULL)
{
@@ -582,6 +586,8 @@
mode_t omask;
struct unrecog *p;
+ TRACE (TRACE_FUNCTION, "fileattr_write (%s)", fileattr_stored_repos);
+
if (!attrs_modified)
return;
@@ -692,6 +698,9 @@
void
fileattr_free (void)
{
+
+ TRACE (TRACE_MINUTIA, "fileattr_free()");
+
/* Note that attrs_modified will ordinarily be zero, but there are
a few cases in which fileattr_write will fail to zero it (if
noexec is set, or error conditions). This probably is the way
Index: find_names.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/find_names.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- find_names.c 20 Dec 2007 16:09:25 -0000 1.51
+++ find_names.c 17 Sep 2008 19:53:29 -0000 1.52
@@ -125,6 +125,9 @@
List *entries;
List *files;
+ TRACE (TRACE_FUNCTION, "Find_Names (%s, %s, %d, %d)",
+ repository, update_dir, which, aflag);
+
/* make a list for the files */
files = getlist ();
@@ -237,6 +240,8 @@
DIR *dirp;
int skip_emptydir = 0;
+ TRACE (TRACE_FUNCTION, "find_dirs (%s, %d)", dir, checkadm);
+
/* First figure out whether we need to skip directories named
Emptydir. Except in the CVSNULLREPOS case, Emptydir is just
a normal directory name. */
@@ -342,6 +347,9 @@
{
List *dirlist;
+ TRACE (TRACE_FUNCTION, "Find_Directories (%s, %s, %d)",
+ repository, update_dir, which);
+
/* make a list for the directories */
dirlist = getlist ();
Index: hash.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/hash.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- hash.c 17 Sep 2008 17:13:52 -0000 1.54
+++ hash.c 17 Sep 2008 19:53:29 -0000 1.55
@@ -100,6 +100,8 @@
Node *p;
List *tmp;
+ TRACE (TRACE_MINUTIA, "dellist()");
+
if (*listp == NULL)
return;
@@ -360,6 +362,7 @@
Node *head, *p;
assert (key);
+ TRACE (TRACE_DATA, "findnode (%s, %s)", TRACE_PTR (list, 0), key);
if (list_isempty (list))
return NULL;
@@ -386,6 +389,7 @@
Node *head, *p;
assert (key);
+ TRACE (TRACE_DATA, "findnode_fn (%s, %s)", TRACE_PTR (list, 0), key);
/* This probably should be "assert (list != NULL)" (or if not we
should document the current behavior), but only if we check all
Index: lock.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/lock.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- lock.c 16 Sep 2008 21:52:16 -0000 1.128
+++ lock.c 17 Sep 2008 19:53:30 -0000 1.129
@@ -668,7 +668,7 @@
int err = 0;
FILE *fp;
- TRACE (TRACE_FUNCTION, "Reader_Lock(%s)", xrepository);
+ TRACE (TRACE_FUNCTION, "Reader_Lock (%s)", xrepository);
if (noexec || readonlyfs)
return 0;
Index: logmsg.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/logmsg.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- logmsg.c 12 Sep 2008 19:55:28 -0000 1.112
+++ logmsg.c 17 Sep 2008 19:53:30 -0000 1.113
@@ -261,6 +261,9 @@
assert (!current_parsed_root->isremote != !repository);
+ TRACE (TRACE_FUNCTION, "do_editor (%s, %s, %s)",
+ dir, TRACE_NULL (*messagep), repository);
+
if (noexec || reuse_log_message)
return;
Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- rcs.c 15 Sep 2008 21:48:56 -0000 1.395
+++ rcs.c 17 Sep 2008 19:53:30 -0000 1.396
@@ -230,6 +230,8 @@
{
char *retval;
+ TRACE (TRACE_FUNCTION, "locate_rcs (%s, %s)", repository, file);
+
/* First, try to find the file as if we knew it existed on the trunk. */
retval = xmalloc (strlen (repository)
+ sizeof (CVSATTIC)
Index: repos.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/repos.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- repos.c 12 Sep 2007 18:27:08 -0000 1.44
+++ repos.c 17 Sep 2008 19:53:30 -0000 1.45
@@ -43,6 +43,9 @@
char *tmp;
char *cp;
+ TRACE (TRACE_FUNCTION, "Name_Repository (%s, %s)",
+ TRACE_NULL (dir), update_dir);
+
if (update_dir && *update_dir)
xupdate_dir = update_dir;
else
@@ -136,6 +139,7 @@
Sanitize_Repository_Name (repos);
+ TRACE (TRACE_DATA, "Name_Repository returning %s", repos);
return repos;
}
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -b -r1.1203 -r1.1204
--- sanity.sh 16 Sep 2008 21:00:22 -0000 1.1203
+++ sanity.sh 17 Sep 2008 19:53:30 -0000 1.1204
@@ -566,6 +566,9 @@
# Regexp to match an OpenPGP key id.
keyid="0x[0-9a-f]*"
+# Regexp to match a pointer in traces
+ptr="0x[0-9a-f]*"
+
# Regexp to match the name of a temporary file (from cvs_temp_name).
# This appears in certain diff output.
tempfile="cvs[-a-zA-Z0-9.%_]*"
@@ -31830,35 +31833,84 @@
*-> get_root_config (${TESTDIR}/root1)
*-> parse_config ($TESTDIR/root1)
*-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null),
(null), (null), (null), 1, (null))
+ *-> Name_Repository ((null), )
+ *-> fileattr_startdir ($TESTDIR/root1)
+ *-> fileattr_write ($TESTDIR/root1)
*-> Write_Template (\., ${TESTDIR}/root1)
${CPROG} update: Updating \.
- *-> Reader_Lock(${TESTDIR}/root1)
+ *-> Name_Repository ((null), )
+ *-> fileattr_startdir ($TESTDIR/root1)
+ *-> Find_Names ($TESTDIR/root1, , 3, 0)
+ *-> Find_Directories ($TESTDIR/root1, , 3)
+ *-> find_dirs ($TESTDIR/root1, 0)
+ *-> Reader_Lock ($TESTDIR/root1)
*-> Simple_Lock_Cleanup()
+ *-> fileattr_write ($TESTDIR/root1)
*-> Write_Template (dir1, ${TESTDIR}/root1/dir1)
${CPROG} update: Updating dir1
- *-> Reader_Lock(${TESTDIR}/root1/dir1)
+ *-> Name_Repository ((null), dir1)
+ *-> fileattr_startdir ($TESTDIR/root1/dir1)
+ *-> Find_Names ($TESTDIR/root1/dir1, dir1, 3, 0)
+ *-> Find_Directories ($TESTDIR/root1/dir1, dir1, 3)
+ *-> find_dirs ($TESTDIR/root1/dir1, 0)
+ *-> Reader_Lock ($TESTDIR/root1/dir1)
+ *-> locate_rcs ($TESTDIR/root1/dir1, file1)
*-> update_fileproc (dir1/file1)
*-> classify_file (dir1/file1, (null), (null), (null))
*-> Version_TS (dir1/file1, (null), (null), (null), 1, 0)
*-> Simple_Lock_Cleanup()
+ *-> fileattr_write ($TESTDIR/root1/dir1)
+ *-> Name_Repository ((null), dir1/sdir)
+ *-> fileattr_startdir ($TESTDIR/root1/sdir)
+ *-> Find_Directories ((null), dir1/sdir, 3)
+ *-> fileattr_write ($TESTDIR/root1/sdir)
+ *-> Name_Repository ((null), dir1/sdir/ssdir)
+ *-> fileattr_startdir ($TESTDIR/root1/sdir/ssdir)
+ *-> Find_Directories ((null), dir1/sdir/ssdir, 3)
+ *-> fileattr_write ($TESTDIR/root1/sdir/ssdir)
*-> main loop with CVSROOT=${TESTDIR}/root2
*-> get_root_config (${TESTDIR}/root2)
*-> parse_config ($TESTDIR/root2)
*-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null),
(null), (null), (null), 1, (null))
+ *-> Name_Repository ((null), )
+ *-> fileattr_startdir ($TESTDIR/root2)
+ *-> fileattr_write ($TESTDIR/root2)
+ *-> Name_Repository ((null), )
+ *-> fileattr_startdir ($TESTDIR/root2)
+ *-> Find_Directories ((null), , 3)
+ *-> fileattr_write ($TESTDIR/root2)
+ *-> Name_Repository ((null), dir1)
+ *-> fileattr_startdir ($TESTDIR/root2/dir1)
+ *-> Find_Directories ((null), dir1, 3)
+ *-> fileattr_write ($TESTDIR/root2/dir1)
*-> Write_Template (dir1/sdir, ${TESTDIR}/root2/dir1/sdir)
${CPROG} update: Updating dir1/sdir
- *-> Reader_Lock(${TESTDIR}/root2/sdir)
+ *-> Name_Repository ((null), dir1/sdir)
+ *-> fileattr_startdir ($TESTDIR/root2/sdir)
+ *-> Find_Names ($TESTDIR/root2/sdir, dir1/sdir, 3, 0)
+ *-> Find_Directories ($TESTDIR/root2/sdir, dir1/sdir, 3)
+ *-> find_dirs ($TESTDIR/root2/sdir, 0)
+ *-> Reader_Lock ($TESTDIR/root2/sdir)
+ *-> locate_rcs ($TESTDIR/root2/sdir, sfile)
*-> update_fileproc (dir1/sdir/sfile)
*-> classify_file (dir1/sdir/sfile, (null), (null), (null))
*-> Version_TS (dir1/sdir/sfile, (null), (null), (null), 1, 0)
*-> Simple_Lock_Cleanup()
+ *-> fileattr_write ($TESTDIR/root2/sdir)
*-> Write_Template (dir1/sdir/ssdir, ${TESTDIR}/root2/sdir/ssdir)
${CPROG} update: Updating dir1/sdir/ssdir
- *-> Reader_Lock(${TESTDIR}/root2/sdir/ssdir)
+ *-> Name_Repository ((null), dir1/sdir/ssdir)
+ *-> fileattr_startdir ($TESTDIR/root2/sdir/ssdir)
+ *-> Find_Names ($TESTDIR/root2/sdir/ssdir, dir1/sdir/ssdir, 3, 0)
+ *-> Find_Directories ($TESTDIR/root2/sdir/ssdir, dir1/sdir/ssdir, 3)
+ *-> find_dirs ($TESTDIR/root2/sdir/ssdir, 0)
+ *-> Reader_Lock ($TESTDIR/root2/sdir/ssdir)
+ *-> locate_rcs ($TESTDIR/root2/sdir/ssdir, ssfile)
*-> update_fileproc (dir1/sdir/ssdir/ssfile)
*-> classify_file (dir1/sdir/ssdir/ssfile, (null), (null), (null))
*-> Version_TS (dir1/sdir/ssdir/ssfile, (null), (null), (null), 1, 0)
*-> Simple_Lock_Cleanup()
+ *-> fileattr_write ($TESTDIR/root2/sdir/ssdir)
*-> Lock_Cleanup()
*-> Simple_Lock_Cleanup()" \
" *-> main: Session ID is ${commitid}
@@ -31866,19 +31918,19 @@
*-> parse_config ($TESTDIR/root1)
*-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null),
(null), (null), (null), 1, (null))
${CPROG} update: Updating \.
- *-> Reader_Lock(${TESTDIR}/root1)
+ *-> Reader_Lock ($TESTDIR/root1)
*-> Simple_Lock_Cleanup()
${CPROG} update: Updating dir1
- *-> Reader_Lock(${TESTDIR}/root1/dir1)
+ *-> Reader_Lock ($TESTDIR/root1/dir1)
*-> Simple_Lock_Cleanup()
*-> main loop with CVSROOT=${TESTDIR}/root2
*-> parse_config ($TESTDIR/root2)
*-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null),
(null), (null), (null), 1, (null))
${CPROG} update: Updating dir1/sdir
- *-> Reader_Lock(${TESTDIR}/root2/sdir)
+ *-> Reader_Lock ($TESTDIR/root2/sdir)
*-> Simple_Lock_Cleanup()
${CPROG} update: Updating dir1/sdir/ssdir
- *-> Reader_Lock(${TESTDIR}/root2/sdir/ssdir)
+ *-> Reader_Lock ($TESTDIR/root2/sdir/ssdir)
*-> Simple_Lock_Cleanup()
*-> Lock_Cleanup()
*-> Simple_Lock_Cleanup()"
Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -b -r1.485 -r1.486
--- server.c 16 Sep 2008 21:00:23 -0000 1.485
+++ server.c 17 Sep 2008 19:53:31 -0000 1.486
@@ -4581,6 +4581,9 @@
checked_in_response (const char *file, const char *update_dir,
const char *repository)
{
+ TRACE (TRACE_FUNCTION, "checked_in_response (%s, %s, %s)",
+ file, update_dir, repository);
+
if (supported_response ("Mode"))
{
struct stat sb;
@@ -4620,6 +4623,9 @@
assert (update_dir);
assert (repository);
+ TRACE (TRACE_FUNCTION, "server_checked_in (%s, %s, %s)",
+ file, update_dir, repository);
+
if (noexec)
return;
if (scratched_file != NULL && entries_line == NULL)
@@ -4649,6 +4655,9 @@
const char *repository,
enum server_updated_arg4 updated)
{
+ TRACE (TRACE_FUNCTION, "server_update_entries (%s, %s, %s, %d)",
+ file, update_dir, repository, updated);
+
if (noexec)
return;
if (updated == SERVER_UPDATED)
Index: server.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server.h 16 Sep 2008 21:00:23 -0000 1.51
+++ server.h 17 Sep 2008 19:53:31 -0000 1.52
@@ -26,8 +26,6 @@
#define STDERR_FILENO 2
#endif
-/* For printing strings which may be NULL in printf. */
-#define TRACE_NULL(str) ((str) ? (str) : "(null)")
/*
@@ -259,7 +257,10 @@
}
#define TRACE_PTR cvs_trace_ptr
-
+/* For printing strings which may be NULL in printf. */
+#define TRACE_NULL(str) ((str) ? (str) : "(null)")
+/* Make booleans readable as such in strings. */
+#define TRACE_BOOL(b) ((b) ? "true" : "false")
extern cvsroot_t *referrer;
Index: subr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/subr.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- subr.c 16 Sep 2008 19:24:40 -0000 1.172
+++ subr.c 17 Sep 2008 19:53:31 -0000 1.173
@@ -177,6 +177,8 @@
{
register int i;
+ TRACE (TRACE_MINUTIA, "free_names(%d)", *pargc);
+
for (i = 0; i < *pargc; i++)
{ /* only do through *pargc */
free (argv[i]);
@@ -2427,7 +2429,7 @@
{
char *new;
- TRACE (TRACE_DATA, "dir_append (%s, %s)", dir, append);
+ TRACE (TRACE_DATA, "dir_append_dirs (%s, %s)", dir, append);
if (!strlen (append) || STREQ (append, "."))
continue;
@@ -2447,6 +2449,7 @@
va_end (args);
+ TRACE (TRACE_DATA, "dir_append_dirs returning ", quote (retval));
return retval;
}
Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- tag.c 15 Sep 2008 16:38:13 -0000 1.157
+++ tag.c 17 Sep 2008 19:53:31 -0000 1.158
@@ -336,6 +336,9 @@
const char *srepos = Short_Repository (repository);
struct pretag_proc_data *ppd = closure;
+ TRACE (TRACE_FUNCTION, "posttag_proc (%s, %s, %s, %d)",
+ repository, filter, file, line);
+
/* %t = tag being added/moved/removed
* %o = operation = "add" | "mov" | "del"
* %b = branch mode = "?" (delete ops - unknown) | "T" (branch)
@@ -713,6 +716,9 @@
const char *srepos = Short_Repository (repository);
struct pretag_proc_data *ppd = closure;
+ TRACE (TRACE_FUNCTION, "pretag_proc (%s, %s, %s, %s)",
+ repository, filter, file, line);
+
#ifdef SUPPORT_OLD_INFO_FMT_STRINGS
if (!strchr (filter, '%'))
{
@@ -805,6 +811,9 @@
List *tlist;
struct pretag_proc_data ppd;
+ TRACE (TRACE_FLOW, "check_filesdoneproc (%d, %s, %s)",
+ err, repos, update_dir);
+
p = findnode (mtlist, update_dir);
if (p != NULL)
tlist = ((struct master_lists *) p->data)->tlist;
Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- update.c 16 Sep 2008 22:50:25 -0000 1.283
+++ update.c 17 Sep 2008 19:53:31 -0000 1.284
@@ -1032,6 +1032,9 @@
update_dirleave_proc (void *callerdat, const char *dir, int err,
const char *update_dir, List *entries)
{
+ TRACE (TRACE_FLOW, "update_dirleave_proc (%s, %d, %d)",
+ dir, err, update_dir);
+
/* Delete the ignore list if it hasn't already been done. */
if (ignlist)
dellist (&ignlist);
Index: watch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/watch.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- watch.c 17 Sep 2008 17:37:24 -0000 1.54
+++ watch.c 17 Sep 2008 19:53:31 -0000 1.55
@@ -75,7 +75,7 @@
int add_tunedit_pending;
int add_tcommit_pending;
- TRACE( TRACE_FUNCTION, "modify_watchers ( %s )", file );
+ TRACE (TRACE_FUNCTION, "watch_modify_watchers (%s)", file);
if (the_args.user && !STREQ (getcaller (), the_args.user) && !is_admin ())
{
@@ -246,6 +246,7 @@
static int
addremove_fileproc (void *callerdat, struct file_info *finfo)
{
+ TRACE (TRACE_FUNCTION, "addremove_fileproc (%s)", finfo->fullname);
watch_modify_watchers (finfo->file, &the_args);
return 0;
}
@@ -259,6 +260,9 @@
int set_default = the_args.setting_default;
int dir_check = 0;
+ TRACE (TRACE_FLOW, "addremove_filesdoneproc (%d, %s, %s)",
+ err, repository, update_dir);
+
while (!set_default && dir_check < the_args.num_dirs)
{
/* If we are recursing, then just see if the first part of update_dir
@@ -291,6 +295,8 @@
int arg_index;
int max_dirs;
+ TRACE (TRACE_FUNCTION, "watch_addremove (%d)", argc);
+
a_omitted = 1;
the_args.commit = 0;
the_args.edit = 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog add.c client.c commit.c entr...,
Derek Robert Price <=