[Cvs-cvs] ccvs/src ChangeLog sanity.sh tag.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     09/11/12 02:27:17

Modified files:
        src            : ChangeLog sanity.sh tag.c 

Log message:
        * tag.c (pretag_proc): Use a default string expansion matching 1.11.x.
        * sanity.sh (taginfo): Update to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3643&r2=1.3644
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1218&r2=1.1219
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.161&r2=1.162

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3643
retrieving revision 1.3644
diff -u -b -r1.3643 -r1.3644
--- ChangeLog   29 Aug 2009 18:18:01 -0000      1.3643
+++ ChangeLog   12 Nov 2009 02:27:15 -0000      1.3644
@@ -1,3 +1,8 @@
+2009-11-11  Derek R. Price  <address@hidden>
+
+       * tag.c (pretag_proc): Use a default string expansion matching 1.11.x.
+       * sanity.sh (taginfo): Update to compensate.
+
 2009-08-29  Derek R. Price  <address@hidden>
 
        * parseinfo.c (new_config): Initialize new property.

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1218
retrieving revision 1.1219
diff -u -b -r1.1218 -r1.1219
--- sanity.sh   19 Nov 2008 23:10:35 -0000      1.1218
+++ sanity.sh   12 Nov 2009 02:27:16 -0000      1.1219
@@ -21026,12 +21026,12 @@
 leisure\."
          dotest taginfo-6 "$testcvs -q tag tag1" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 T file1"
          dotest taginfo-7 "$testcvs -q tag -b br" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 T file1"
          dotest taginfo-8 "$testcvs -q update -r br" 'U file1'
@@ -21049,13 +21049,13 @@
 leisure\."
          dotest taginfo-10 "$testcvs -q tag -F -c brtag" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 T file1"
 
          dotest_fail taginfo-11 "$testcvs -q tag rejectme" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 $SPROG tag: Pre-tag check failed
 $SPROG \[tag aborted\]: correct the above errors first!"
@@ -21065,7 +21065,7 @@
          # the allow/disallow functionality is working as expected.
          dotest taginfo-12 "$testcvs -nq tag rejectme" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 T file1"
 
@@ -21074,7 +21074,7 @@
          # specified or not.
          dotest taginfo-13 "$testcvs -nq tag would-be-tag" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 T file1"
 
@@ -21082,26 +21082,26 @@
          # or it didn't exist.
          dotest taginfo-14 "$testcvs -q tag -d tag1" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\.
 D file1"
          dotest taginfo-15 "$testcvs -q tag -d tag1" \
 "$SPROG tag: taginfo:[0-9]*: warning: taginfo line contains no format strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\."
 
          # Likewise with rtag.
          dotest taginfo-16 "$testcvs -q rtag tag1 first-dir" \
 "$SPROG rtag: taginfo:[0-9]*: warning: taginfo line contains no format 
strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\."
          dotest taginfo-17 "$testcvs -q rtag -d tag1 first-dir" \
 "$SPROG rtag: taginfo:[0-9]*: warning: taginfo line contains no format 
strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\."
          dotest taginfo-18 "$testcvs -q rtag -d tag1 first-dir" \
 "$SPROG rtag: taginfo:[0-9]*: warning: taginfo line contains no format 
strings\.
-Filling in old defaults (\` %t %o %p %{sv}'), but please be aware that this
+Filling in old defaults (\` %t %o %r/%p %{sv}'), but please be aware that this
 usage is deprecated\."
 
          # The "br" example should be passing 1.1.2 or 1.1.0.2.
@@ -21116,14 +21116,14 @@
          # I suppose passing "1.1.branch" or "branch" for "br"
          # would be an improvement.
          dotest taginfo-examine-1 "cat ${TESTDIR}/1/taglog" \
-"tag1 add first-dir file1 1\.1
-br add first-dir file1 1\.1
-brtag mov first-dir file1 1\.1\.2\.1
-tag1 del first-dir file1 1\.1
-tag1 del first-dir
-tag1 add first-dir file1 1\.1
-tag1 del first-dir file1 1\.1
-tag1 del first-dir"
+"tag1 add $CVSROOT_DIRNAME/first-dir file1 1\.1
+br add $CVSROOT_DIRNAME/first-dir file1 1\.1
+brtag mov $CVSROOT_DIRNAME/first-dir file1 1\.1\.2\.1
+tag1 del $CVSROOT_DIRNAME/first-dir file1 1\.1
+tag1 del $CVSROOT_DIRNAME/first-dir
+tag1 add $CVSROOT_DIRNAME/first-dir file1 1\.1
+tag1 del $CVSROOT_DIRNAME/first-dir file1 1\.1
+tag1 del $CVSROOT_DIRNAME/first-dir"
 
          # now that we've tested the default operation, try a new
          # style fmt string.

Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- tag.c       18 Nov 2008 22:56:55 -0000      1.161
+++ tag.c       12 Nov 2009 02:27:16 -0000      1.162
@@ -733,7 +733,7 @@
 #ifdef SUPPORT_OLD_INFO_FMT_STRINGS
     if (!strchr (filter, '%'))
     {
-       const char *default_format = " %t %o %p %{sv}";
+       const char *default_format = " %t %o %r/%p %{sv}";
        error (0,0,
 "%s:%d: warning: taginfo line contains no format strings.\n"
 "Filling in old defaults (%s), but please be aware that this\n"