[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog rcs.c sanity.sh update.c [newtags2]
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs/src ChangeLog rcs.c sanity.sh update.c [newtags2] |
|
Date: |
Sat, 10 Nov 2007 20:51:50 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: newtags2
Changes by: Mark D. Baushke <mdb> 07/11/10 20:51:49
Modified files:
src : ChangeLog rcs.c sanity.sh update.c
Log message:
* rcs.c (RCS_getdate): Remove unused local variables.
(RCS_getprevious, RCS_getorigin, RCS_getroot): Silence gcc warning.
(RCS_getorigin): Logic cleanup.
(translate_tag): Silence gcc warning. Remove unused local
variables.
* update.c (join_file): j1 and j2 are const.
* sanity.sh: Update tests for tag-ext-70 thru tag-ext-92
(Patch from Frank Hemer <address@hidden>.)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=newtags2&r1=1.3337.2.1&r2=1.3337.2.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&only_with_tag=newtags2&r1=1.357.2.1&r2=1.357.2.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&only_with_tag=newtags2&r1=1.1108.2.1&r2=1.1108.2.2
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/update.c?cvsroot=cvs&only_with_tag=newtags2&r1=1.260.2.1&r2=1.260.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3337.2.1
retrieving revision 1.3337.2.2
diff -u -b -r1.3337.2.1 -r1.3337.2.2
--- ChangeLog 17 Jan 2006 15:41:23 -0000 1.3337.2.1
+++ ChangeLog 10 Nov 2007 20:51:47 -0000 1.3337.2.2
@@ -1,3 +1,14 @@
+2007-11-10 Mark D. Baushke <address@hidden>
+
+ * rcs.c (RCS_getdate): Remove unused local variables.
+ (RCS_getprevious, RCS_getorigin, RCS_getroot): Silence gcc warning.
+ (RCS_getorigin): Logic cleanup.
+ (translate_tag): Silence gcc warning. Remove unused local
+ variables.
+ * update.c (join_file): j1 and j2 are const.
+ * sanity.sh: Update tests for tag-ext-70 thru tag-ext-92
+ (Patch from Frank Hemer <address@hidden>.)
+
2006-01-16 Derek Price <address@hidden>
* cvs.h: New fn (Version_release_relTag)
Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.357.2.1
retrieving revision 1.357.2.2
diff -u -b -r1.357.2.1 -r1.357.2.2
--- rcs.c 17 Jan 2006 15:41:23 -0000 1.357.2.1
+++ rcs.c 10 Nov 2007 20:51:48 -0000 1.357.2.2
@@ -2998,10 +2998,7 @@
char *
RCS_getdate (RCSNode *rcs, const char *date, int force_tag_match)
{
- char *cur_rev = NULL;
char *retval = NULL;
- Node *p;
- RCSVers *vers = NULL;
/* make sure we have something to look at... */
assert (rcs != NULL);
@@ -3388,7 +3385,7 @@
Node *br;
for (br = head->next; br != head; br = br->next)
{
- if (node = findnode (rcs->versions, br->key))
+ if ((node = findnode (rcs->versions, br->key)))
{
if (strncmp (((RCSVers *)node->data)->version, trev, len))
continue;
@@ -3471,7 +3468,7 @@
for (br = head->next; br != head; br = br->next)
{
Node *node = NULL;
- if (node = findnode (rcs->versions, br->key))
+ if ((node = findnode (rcs->versions, br->key)))
{
vers = node->data;
if (!vers->dead
@@ -3601,21 +3598,15 @@
if (!(dots & 1)) /* branch handling => turn into a head revision */
{
trev = RCS_branch_head (rcs, rev);
- if (trev)
- {
- if (dots > (dots = numdots (trev)))
+ if (!trev)
{
- /* Got the root revision. The first commit to the branch is
- * defined as the origin, so return NULL.
+ /* Head not found, so there are no commits on this branch
+ * Only the tag exists ... take its revision
*/
- free (trev);
- return NULL;
- }
- /* Else, we have a head revision on the branch. */
+ trev = xstrdup (rev);
+ truncate_revnum_in_place (trev);
}
- else
- /* Error - branch not found... */
- return NULL;
+ dots = numdots (trev);
}
else
trev = xstrdup (rev);
@@ -3656,7 +3647,7 @@
if (!strncmp (tmp, br->key, len))
{
Node *bn = NULL;
- if (bn = findnode (rcs->versions, br->key))
+ if ((bn = findnode (rcs->versions, br->key)))
{
RCSVers *cv = bn->data;
if (cv->dead)
@@ -3783,7 +3774,7 @@
//check if br->key is on branch rev
if (!strncmp (rev, br->key, len))
{
- if (node = findnode (rcs->versions, br->key))
+ if ((node = findnode (rcs->versions, br->key)))
{
vers = node->data;
if (vers->dead && !RCS_datecmp (rootdate,
vers->date))
@@ -3909,10 +3900,8 @@
translate_tag (RCSNode *rcs, const char *tag, bool keepmagic)
{
/* printf("translate_tag: %s\n",tag); */
- char c;
char *retval = NULL;
char *tmp, *tmpval;
- bool dotstart = false;
assert (rcs && tag);
@@ -4013,7 +4002,7 @@
else if (STREQ (token, TAG_COMMITID))
{
char *commitid = strtok (NULL,".");
- if (token = strtok (NULL,"."))
+ if ((token = strtok (NULL,".")))
/* The next token needs to be evaluated here because
* RCS_getcommitid needs to know whether a previous
* revision is requested (performance enhancement).
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1108.2.1
retrieving revision 1.1108.2.2
diff -u -b -r1.1108.2.1 -r1.1108.2.2
--- sanity.sh 17 Jan 2006 15:41:23 -0000 1.1108.2.1
+++ sanity.sh 10 Nov 2007 20:51:48 -0000 1.1108.2.2
@@ -12955,7 +12955,31 @@
"cvs diff: Tag \.root\.head refers to a dead (removed) revision in file
\`file3'\.
cvs diff: No comparison available\. Pass \`-N' to \`cvs diff'?"
- dotest_fail tag-ext-70 "$testcvs diff -r
\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev file3" \
+ dotest_fail tag-ext-70 "$testcvs diff -r BRANCH1\.origin file1" \
+"Index: file1
+===================================================================
+RCS file: /tmp/cvs-sanity/cvsroot/tag-ext/file1,v
+retrieving revision 1\.1
+retrieving revision 1\.3
+diff -r1\.1 -r1\.3
+1c1
+< content
+---
+> content3"
+
+ dotest_fail tag-ext-71 "$testcvs diff -r BRANCH1-2-1-1\.origin
file3" \
+"Index: file3
+===================================================================
+RCS file: $CVSROOT_DIRNAME/$module/file3,v
+retrieving revision 1\.1\.2\.1
+retrieving revision 1\.1\.2\.2\.2\.2\.2\.9\.2\.3
+diff -r1\.1\.2\.1 -r1\.1\.2\.2\.2\.2\.2\.9\.2\.3
+1c1
+< b1content
+---
+> b1-2-1-1content3"
+
+ dotest_fail tag-ext-72 "$testcvs diff -r
\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev\.prev file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -12970,7 +12994,7 @@
date_T1=`getrlogdate -r1\.2 tag-ext/file3`
date_T2=`getrlogdate -r1\.1\.2\.2\.2\.2\.2\.8 tag-ext/file3`
- dotest_fail tag-ext-71 "$testcvs diff -r \.trunk:'$date_T1' file3" \
+ dotest_fail tag-ext-73 "$testcvs diff -r \.trunk:'$date_T1' file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -12982,7 +13006,7 @@
---
> b1-2-1-1content3"
- dotest_fail tag-ext-72 "$testcvs diff -r BRANCH1-2-1:'$date_T2'
file3" \
+ dotest_fail tag-ext-74 "$testcvs diff -r BRANCH1-2-1:'$date_T2'
file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -12994,7 +13018,7 @@
---
> b1-2-1-1content3"
- dotest_fail tag-ext-73 "$testcvs diff -rBRANCH1.prev file1" \
+ dotest_fail tag-ext-75 "$testcvs diff -rBRANCH1.prev file1" \
"Index: file1
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file1,v
@@ -13008,7 +13032,7 @@
COMMITID=$(cat $CVSROOT_DIRNAME/tag-ext/file3,v | grep -m 21
commitid | tail -n 1);
COMMITID=`expr match ${COMMITID:9} '\([a-zA-Z0-9]*\)'`
- dotest_fail tag-ext-74 "$testcvs diff -r .commitid.$COMMITID file3" \
+ dotest_fail tag-ext-76 "$testcvs diff -r .commitid.$COMMITID file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -13020,7 +13044,7 @@
---
> b1-2-1-1content3"
- dotest_fail tag-ext-75 "$testcvs diff -r @$COMMITID file3" \
+ dotest_fail tag-ext-77 "$testcvs diff -r @$COMMITID file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -13032,7 +13056,7 @@
---
> b1-2-1-1content3"
- dotest_fail tag-ext-76 "$testcvs diff -r '@<$COMMITID' file3" \
+ dotest_fail tag-ext-78 "$testcvs diff -r '@<$COMMITID' file3" \
"Index: file3
===================================================================
RCS file: $CVSROOT_DIRNAME/$module/file3,v
@@ -13046,34 +13070,34 @@
COMMITID=$(cat $CVSROOT_DIRNAME/tag-ext/file1,v | grep -m 3 commitid
| tail -n 1);
COMMITID=`expr match ${COMMITID:9} '\([a-zA-Z0-9]*\)'`
- dotest tag-ext-77 "$testcvs update -r .commitid.$COMMITID" \
+ dotest tag-ext-79 "$testcvs update -r .commitid.$COMMITID" \
"cvs update: Updating .
U file1
U file2
cvs update: \`file3' is no longer in the repository"
- dotest tag-ext-78 "cat CVS/Entries && cat CVS/Tag" \
+ dotest tag-ext-80 "cat CVS/Entries && cat CVS/Tag" \
"/file1/1\.1/[a-zA-Z0-9 :]*//T\.commitid\.$COMMITID
/file2/1\.1/[a-zA-Z0-9 :]*//T\.commitid\.$COMMITID
D
N\.commitid\.$COMMITID"
- dotest tag-ext-79 "$testcvs update -r @$COMMITID" \
+ dotest tag-ext-81 "$testcvs update -r @$COMMITID" \
"cvs update: Updating ."
- dotest tag-ext-80 "cat CVS/Entries && cat CVS/Tag" \
+ dotest tag-ext-82 "cat CVS/Entries && cat CVS/Tag" \
"/file1/1\.1/[a-zA-Z0-9 :]*//address@hidden
/file2/1\.1/[a-zA-Z0-9 :]*//address@hidden
D
address@hidden"
- dotest tag-ext-81 "$testcvs -Q update -r BRANCH1-1"
+ dotest tag-ext-83 "$testcvs -Q update -r BRANCH1-1"
- dotest tag-ext-82 "$testcvs -Q update -r BRANCH1 file1"
+ dotest tag-ext-84 "$testcvs -Q update -r BRANCH1 file1"
COMMITID=$(cat $CVSROOT_DIRNAME/tag-ext/file3,v | grep -m 3 commitid
| tail -n 1);
COMMITID=`expr match ${COMMITID:9} '\([a-zA-Z0-9]*\)'`
- dotest_fail tag-ext-83 "$testcvs diff -r .commitid.$COMMITID" \
+ dotest_fail tag-ext-85 "$testcvs diff -r .commitid.$COMMITID" \
"cvs diff: Diffing .
cvs diff: tag .commitid.$COMMITID is not in file file1
cvs diff: tag .commitid.$COMMITID is not in file file2
@@ -13088,7 +13112,7 @@
---
> b1-1content2"
- dotest_fail tag-ext-84 "$testcvs diff -r '@<$COMMITID'" \
+ dotest_fail tag-ext-86 "$testcvs diff -r '@<$COMMITID'" \
"cvs diff: Diffing .
cvs diff: tag @<$COMMITID is not in file file1
cvs diff: tag @<$COMMITID is not in file file2
@@ -13096,7 +13120,7 @@
COMMITID=$(cat $CVSROOT_DIRNAME/tag-ext/file3,v | grep -m 2 commitid
| tail -n 1);
COMMITID=`expr match ${COMMITID:9} '\([a-zA-Z0-9]*\)'`
- dotest_fail tag-ext-85 "$testcvs diff -r '@<$COMMITID'" \
+ dotest_fail tag-ext-87 "$testcvs diff -r '@<$COMMITID'" \
"cvs diff: Diffing .
cvs diff: tag @<$COMMITID is not in file file1
cvs diff: tag @<$COMMITID is not in file file2
@@ -13111,7 +13135,7 @@
---
> b1-1content2"
- dotest tag-ext-86 "$testcvs update -j .origin -j .prev file1 file2
file3" \
+ dotest tag-ext-88 "$testcvs update -j .origin -j .prev file1 file2
file3" \
"RCS file: /tmp/cvs-sanity/cvsroot/tag-ext/file1,v
retrieving revision 1\.1
retrieving revision 1\.2\.2\.1
@@ -13128,22 +13152,22 @@
Merging differences between 1\.1\.2\.1 and 1\.1\.2\.1\.2\.1 into file3
rcsmerge: warning: conflicts during merge"
- dotest tag-ext-87 "cat CVS/Entries && cat CVS/Tag" \
+ dotest tag-ext-89 "cat CVS/Entries && cat CVS/Tag" \
"/file1/1\.2\.2\.2/Result of merge+[a-zA-Z0-9 :]*//TBRANCH1
/file2/1\.2\.2\.1\.2\.2/Result of merge+[a-zA-Z0-9 :]*//TBRANCH1-1
/file3/1\.1\.2\.1\.2\.2/Result of merge+[a-zA-Z0-9 :]*//TBRANCH1-1
D
TBRANCH1-1"
- dotest tag-ext-88 "$testcvs tag -r .prev atag file1 file2 file3" \
+ dotest tag-ext-90 "$testcvs tag -r .prev atag file1 file2 file3" \
"T file1
T file2
T file3"
- dotest tag-ext-89 "$testcvs rtag -r BRANCH1-1.root.next btag
tag-ext" \
+ dotest tag-ext-91 "$testcvs rtag -r BRANCH1-1.root.next btag
tag-ext" \
"cvs rtag: Tagging tag-ext"
- dotest tag-ext-90 "$testcvs rlog tag-ext" \
+ dotest tag-ext-92 "$testcvs rlog tag-ext" \
"cvs rlog: Logging tag-ext
RCS file: $CVSROOT_DIRNAME/$module/file1,v
Index: update.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/update.c,v
retrieving revision 1.260.2.1
retrieving revision 1.260.2.2
diff -u -b -r1.260.2.1 -r1.260.2.2
--- update.c 17 Jan 2006 15:41:24 -0000 1.260.2.1
+++ update.c 10 Nov 2007 20:51:49 -0000 1.260.2.2
@@ -78,7 +78,7 @@
static int get_linkinfo_proc( void *_callerdat, struct _finfo * );
#endif
static void join_file (struct file_info *finfo, Vers_TS *vers_ts,
- const char *j1, const char *j2);
+ char *j1, char *j2);
static char *options = NULL;
static char *tag = NULL;
@@ -2089,7 +2089,7 @@
* 1. Is not called in client mode.
*/
static void
-join_file (struct file_info *finfo, Vers_TS *vers, const char *j1, const char
*j2)
+join_file (struct file_info *finfo, Vers_TS *vers, char *j1, char *j2)
{
char *backup;
char *t_options;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/src ChangeLog rcs.c sanity.sh update.c [newtags2],
Mark D. Baushke <=