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

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/22 19:17:39

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

Log message:
        * rcscmds.c (RCS_output_diff_options): Always output the file name on a
        diff line, even with two -r options, so that the file path is available
        in a multiple file diff, even without -c or -u.
        * sanity.sh: Update to compensate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3422&tr2=1.3423&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcscmds.c.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1139&tr2=1.1140&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3422 ccvs/src/ChangeLog:1.3423
--- ccvs/src/ChangeLog:1.3422   Mon May 22 19:00:44 2006
+++ ccvs/src/ChangeLog  Mon May 22 19:17:39 2006
@@ -1,3 +1,10 @@
+2006-05-22  Derek Price  <address@hidden>
+
+       * rcscmds.c (RCS_output_diff_options): Always output the file name on a
+       diff line, even with two -r options, so that the file path is available
+       in a multiple file diff, even without -c or -u.
+       * sanity.sh: Update to compensate.
+
 2006-05-22  Lawrence Jones  <address@hidden>
 
        * subr.c (is_admin): Older systems do not necessarily set errno
Index: ccvs/src/rcscmds.c
diff -u ccvs/src/rcscmds.c:1.73 ccvs/src/rcscmds.c:1.74
--- ccvs/src/rcscmds.c:1.73     Mon Apr 24 18:50:27 2006
+++ ccvs/src/rcscmds.c  Mon May 22 19:17:39 2006
@@ -196,12 +196,9 @@
        cvs_output (rev2, 0);
     }
 
-    if (!rev1 || !rev2)
-    {
-       assert (workfile);
-       cvs_output (" ", 1);
-       cvs_output (workfile, 0);
-    }
+    assert (workfile);
+    cvs_output (" ", 1);
+    cvs_output (workfile, 0);
 
     cvs_output ("\n", 1);
 }
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1139 ccvs/src/sanity.sh:1.1140
--- ccvs/src/sanity.sh:1.1139   Thu May 18 00:25:47 2006
+++ ccvs/src/sanity.sh  Mon May 22 19:17:39 2006
@@ -6517,7 +6517,7 @@
 ${SPROG} diff: No comparison available\.  Pass .-N. to .${SPROG} 
diff.${QUESTION}"
          dotest_fail death2-diff-4 \
 "${testcvs} -q diff -r1.1 -rbranch -N -c file1" \
-"diff -c -N -r1\.1 -r1\.1\.2\.1
+"diff -c -N -r1\.1 -r1\.1\.2\.1 file1
 \*\*\* file1   ${RFCDATE}      [0-9.]*
 --- /dev/null  ${RFCDATE_EPOCH}
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6527,7 +6527,7 @@
          # and in reverse
          dotest_fail death2-diff-4a \
 "${testcvs} -q diff -rbranch -r1.1 -N -c file1" \
-"diff -c -N -r1\.1\.2\.1 -r1\.1
+"diff -c -N -r1\.1\.2\.1 -r1\.1 file1
 \*\*\* /dev/null       ${RFCDATE_EPOCH}
 --- file1      ${RFCDATE}      [0-9.]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6654,7 +6654,7 @@
 ${PLUS} first revision"
 
          dotest_fail death2-diff-11 "${testcvs} -q diff -rtag -c ." \
-"diff -c -r1\.1 -r1\.1\.2\.2
+"diff -c -r1\.1 -r1\.1\.2\.2 file1
 \*\*\* file1   ${RFCDATE}      [0-9.]*
 --- file1      ${RFCDATE}      [0-9.]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6667,7 +6667,7 @@
 ${SPROG} diff: file4 no longer exists, no comparison available"
 
          dotest_fail death2-diff-12 "${testcvs} -q diff -rtag -c -N ." \
-"diff -c -N -r1\.1 -r1\.1\.2\.2
+"diff -c -N -r1\.1 -r1\.1\.2\.2 file1
 \*\*\* file1   ${RFCDATE}      [0-9.]*
 --- file1      ${RFCDATE}      [0-9.]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -6712,7 +6712,7 @@
 ${SPROG} diff: No comparison available\.  Pass .-N. to .${SPROG} 
diff.${QUESTION}"
 
          dotest_fail death2-diff-14 "${testcvs} -q diff -r rdiff-tag -c -N" \
-"diff -c -N -r1\.1\.2\.1 -r1\.1
+"diff -c -N -r1\.1\.2\.1 -r1\.1 file1
 \*\*\* /dev/null       ${RFCDATE_EPOCH}
 --- file1      ${RFCDATE}      [0-9.]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -7627,7 +7627,7 @@
 ============================================================================="
          dotest_fail branches-14.4 \
            "${testcvs} diff -c -r 1.1 -r 1.3 file4" \
-"diff -c -r1\.1 -r1\.3
+"diff -c -r1\.1 -r1\.3 file4
 \*\*\* file4   ${RFCDATE}      1\.1
 --- file4      ${RFCDATE}      1\.3
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -7637,7 +7637,7 @@
 ! 4:trunk-3"
          dotest_fail branches-14.5 \
            "${testcvs} diff -c -r 1.1 -r 1.2.2.1 file4" \
-"diff -c -r1\.1 -r1\.2\.2\.1
+"diff -c -r1\.1 -r1\.2\.2\.1 file4
 \*\*\* file4   ${RFCDATE}      1\.1
 --- file4      ${RFCDATE}      1\.2\.2\.1
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -8830,7 +8830,7 @@
 
        dotest_fail rcslib-diff9 "${testcvs} diff -r first -r second" \
 "${SPROG} diff: Diffing \.
-diff -r1\.1 -r1\.2
+diff -r1\.1 -r1\.2 foo.c
 1c1
 < I am the first foo, and my name is \$""Name: first \$\.
 ---
@@ -25803,7 +25803,7 @@
          # and diff thinks so too.  Case (a) from the comment in
          # cvs.texinfo (Common options).
          dotest_fail head-trunk-diff "${testcvs} -q diff -c -r HEAD -r br1" \
-"diff -c -r1\.3 -r1\.3\.2\.2
+"diff -c -r1\.3 -r1\.3\.2\.2 file1
 \*\*\* file1   ${RFCDATE}      1\.3
 --- file1      ${RFCDATE}      1\.3\.2\.2
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -25851,7 +25851,7 @@
          # Like head-brtag-diff, there is a non-branch sticky tag.
          dotest_fail head-trunktag-diff \
            "${testcvs} -q diff -c -r HEAD -r br1" \
-"diff -c -r1\.3 -r1\.3\.2\.2
+"diff -c -r1\.3 -r1\.3\.2\.2 file1
 \*\*\* file1   ${RFCDATE}      1\.3
 --- file1      ${RFCDATE}      1\.3\.2\.2
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
@@ -25968,7 +25968,7 @@
          # Test diff -r<tag>:<date> with two revisions specified.
          dotest_fail tagdate-13b \
 "$testcvs -q diff -u -rbr2:'$date_T3' -rbr2:now file1" \
-"diff -u -r1\.1\.4\.1 -r1\.1\.4\.2
+"diff -u -r1\.1\.4\.1 -r1\.1\.4\.2 file1
 --- file1      $RFCDATE        1\.1\.4\.1
 +++ file1      $RFCDATE        1\.1\.4\.2
 @@ -1 ${PLUS}1 @@
@@ -30534,13 +30534,13 @@
 T dir1/sdir/ssdir/ssfile"
          dotest_fail multiroot2-12 \
 "${testcvs} -q diff -u -r tag1 -r tag2" \
-"diff -u -r1\.1\.1\.1 -r1\.2
+"diff -u -r1\.1\.1\.1 -r1\.2 dir1/file1
 --- dir1/file1 ${RFCDATE}      1\.1\.1\.1
 ${PLUS}${PLUS}${PLUS} dir1/file1       ${RFCDATE}      1\.2
 @@ -1 ${PLUS}1,2 @@
  file1
 ${PLUS}change it
-diff -u -r1\.1\.1\.1 -r1\.2
+diff -u -r1\.1\.1\.1 -r1\.2 dir1/sdir/sfile
 --- dir1/sdir/sfile    ${RFCDATE}      1\.1\.1\.1
 ${PLUS}${PLUS}${PLUS} dir1/sdir/sfile  ${RFCDATE}      1\.2
 @@ -1 ${PLUS}1,2 @@